679c30e73
Denys Vlasenko
2019-02-08
Subject
sysctl: avoid stat() on every item if in -w mode
Binary
No binary (build failed)
Architecture & Compiler Flags
—
Build Log
(log yok)
Commit Diff GitHub →
procps/sysctl.c+10 -6
| @@ -205,19 +205,21 @@ static int sysctl_act_on_setting(char *setting) | |
| static int sysctl_act_recursive(const char *path) | |
| { | |
| - | DIR *dirp; |
| struct stat buf; | |
| - | struct dirent *entry; |
| - | char *next; |
| int retval = 0; | |
| - | stat(path, &buf); |
| - | if (S_ISDIR(buf.st_mode) && !(option_mask32 & FLAG_WRITE)) { |
| + | if (!(option_mask32 & FLAG_WRITE) |
| + | && stat(path, &buf) == 0 |
| + | && S_ISDIR(buf.st_mode) |
| + | ) { |
| + | struct dirent *entry; |
| + | DIR *dirp; |
| + | |
| dirp = opendir(path); | |
| if (dirp == NULL) | |
| return -1; | |
| while ((entry = readdir(dirp)) != NULL) { | |
| - | next = concat_subpath_file(path, entry->d_name); |
| + | char *next = concat_subpath_file(path, entry->d_name); |
| if (next == NULL) | |
| continue; /* d_name is "." or ".." */ | |
| /* if path was ".", drop "./" prefix: */ | |
| @@ -305,6 +307,8 @@ int sysctl_main(int argc UNUSED_PARAM, char **argv) | |
| return sysctl_act_recursive("."); | |
| } | |
| + | //TODO: if(!argv[0]) bb_show_usage() ? |
| + | |
| retval = 0; | |
| while (*argv) { | |
| sysctl_dots_to_slashes(*argv); | |