diff options
author | Bernhard Reutner-Fischer <rep.dot.nop@gmail.com> | 2006-04-12 07:35:12 +0000 |
---|---|---|
committer | Bernhard Reutner-Fischer <rep.dot.nop@gmail.com> | 2006-04-12 07:35:12 +0000 |
commit | cb44816ba32a3bbf598aab6d7cb1eabfd6619f5f (patch) | |
tree | 4459d66dd948b019c4a96730eea224f79520ad8c /procps | |
parent | d0ea52ee041ca4d8d00cc5212d54328689b1a3c4 (diff) | |
download | busybox-w32-cb44816ba32a3bbf598aab6d7cb1eabfd6619f5f.tar.gz busybox-w32-cb44816ba32a3bbf598aab6d7cb1eabfd6619f5f.tar.bz2 busybox-w32-cb44816ba32a3bbf598aab6d7cb1eabfd6619f5f.zip |
- 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.c | 13 |
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 @@ | |||
4 | * | 4 | * |
5 | * | 5 | * |
6 | * "Copyright 1999 George Staikos | 6 | * "Copyright 1999 George Staikos |
7 | * This file may be used subject to the terms and conditions of the | 7 | * |
8 | * GNU General Public License Version 2, or any later version | 8 | * Licensed under GPLv2 or later, see file LICENSE in this tarball for details. |
9 | * at your option, as published by the Free Software Foundation. | ||
10 | * This program is distributed in the hope that it will be useful, | ||
11 | * but WITHOUT ANY WARRANTY; without even the implied warranty of | ||
12 | * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the | ||
13 | * GNU General Public License for more details." | ||
14 | * | 9 | * |
15 | * Changelog: | 10 | * Changelog: |
16 | * v1.01: | 11 | * v1.01: |
@@ -57,7 +52,6 @@ static const char ERR_UNKNOWN_READING[] = | |||
57 | "error: unknown error %d reading key '%s'\n"; | 52 | "error: unknown error %d reading key '%s'\n"; |
58 | static const char ERR_PERMISSION_DENIED[] = | 53 | static const char ERR_PERMISSION_DENIED[] = |
59 | "error: permission denied on key '%s'\n"; | 54 | "error: permission denied on key '%s'\n"; |
60 | static const char ERR_OPENING_DIR[] = "error: unable to open directory '%s'\n"; | ||
61 | static const char ERR_PRELOAD_FILE[] = | 55 | static const char ERR_PRELOAD_FILE[] = |
62 | "error: unable to open preload file '%s'\n"; | 56 | "error: unable to open preload file '%s'\n"; |
63 | static const char WARN_BAD_LINE[] = | 57 | static const char WARN_BAD_LINE[] = |
@@ -316,8 +310,7 @@ int sysctl_display_all(const char *path, int output, int show_table) | |||
316 | char *tmpdir; | 310 | char *tmpdir; |
317 | struct stat ts; | 311 | struct stat ts; |
318 | 312 | ||
319 | if (!(dp = opendir(path))) { | 313 | if (!(dp = bb_opendir(path))) { |
320 | bb_perror_msg(ERR_OPENING_DIR, path); | ||
321 | retval = -1; | 314 | retval = -1; |
322 | } else { | 315 | } else { |
323 | while ((de = readdir(dp)) != NULL) { | 316 | while ((de = readdir(dp)) != NULL) { |