aboutsummaryrefslogtreecommitdiff
path: root/procps
diff options
context:
space:
mode:
authorBernhard Reutner-Fischer <rep.dot.nop@gmail.com>2006-04-12 07:35:12 +0000
committerBernhard Reutner-Fischer <rep.dot.nop@gmail.com>2006-04-12 07:35:12 +0000
commitcb44816ba32a3bbf598aab6d7cb1eabfd6619f5f (patch)
tree4459d66dd948b019c4a96730eea224f79520ad8c /procps
parentd0ea52ee041ca4d8d00cc5212d54328689b1a3c4 (diff)
downloadbusybox-cb44816ba32a3bbf598aab6d7cb1eabfd6619f5f.tar.gz
- add and use bb_opendir(), bb_xopendir().
text data bss dec hex filename 889445 9392 1035784 1934621 1d851d busybox.gcc-4.2.orig 889297 9392 1035784 1934473 1d8489 busybox.gcc-4.2 889009 9820 1037860 1936689 1d8d31 busybox.gcc-4.1.orig 888817 9820 1037860 1936497 1d8c71 busybox.gcc-4.1
Diffstat (limited to 'procps')
-rw-r--r--procps/sysctl.c13
1 files changed, 3 insertions, 10 deletions
diff --git a/procps/sysctl.c b/procps/sysctl.c
index b8835c0d8..bcd229fdd 100644
--- a/procps/sysctl.c
+++ b/procps/sysctl.c
@@ -4,13 +4,8 @@
*
*
* "Copyright 1999 George Staikos
- * This file may be used subject to the terms and conditions of the
- * GNU General Public License Version 2, or any later version
- * at your option, as published by the Free Software Foundation.
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details."
+ *
+ * Licensed under GPLv2 or later, see file LICENSE in this tarball for details.
*
* Changelog:
* v1.01:
@@ -57,7 +52,6 @@ static const char ERR_UNKNOWN_READING[] =
"error: unknown error %d reading key '%s'\n";
static const char ERR_PERMISSION_DENIED[] =
"error: permission denied on key '%s'\n";
-static const char ERR_OPENING_DIR[] = "error: unable to open directory '%s'\n";
static const char ERR_PRELOAD_FILE[] =
"error: unable to open preload file '%s'\n";
static const char WARN_BAD_LINE[] =
@@ -316,8 +310,7 @@ int sysctl_display_all(const char *path, int output, int show_table)
char *tmpdir;
struct stat ts;
- if (!(dp = opendir(path))) {
- bb_perror_msg(ERR_OPENING_DIR, path);
+ if (!(dp = bb_opendir(path))) {
retval = -1;
} else {
while ((de = readdir(dp)) != NULL) {