diff options
Diffstat (limited to 'procps')
| -rw-r--r-- | procps/fuser.c | 4 | ||||
| -rw-r--r-- | procps/sysctl.c | 11 | ||||
| -rw-r--r-- | procps/top.c | 6 |
3 files changed, 11 insertions, 10 deletions
diff --git a/procps/fuser.c b/procps/fuser.c index ca7c7e267..d2ac9ebfc 100644 --- a/procps/fuser.c +++ b/procps/fuser.c @@ -109,7 +109,7 @@ static inode_list *scan_proc_net(const char *proto, tmp_dev = find_socket_dev(); sprintf(path, "/proc/net/%s", proto); - f = fopen(path, "r"); + f = fopen_for_read(path); if (!f) return ilist; @@ -158,7 +158,7 @@ static pid_list *scan_pid_maps(const char *fname, pid_t pid, long long uint64_inode; dev_t dev; - file = fopen(fname, "r"); + file = fopen_for_read(fname); if (!file) return plist; while (fgets(line, MAX_LINE, file)) { diff --git a/procps/sysctl.c b/procps/sysctl.c index 6e582b0f9..3fe6f6f3e 100644 --- a/procps/sysctl.c +++ b/procps/sysctl.c @@ -98,10 +98,11 @@ static int sysctl_preload_file_and_exit(const char *filename) if (!parser) return 1; - while (config_read(parser, token, 2, 0, "# \t=", PARSE_LAST_IS_GREEDY)) { // TODO: ';' is comment char too - if (!token[1]) { - bb_error_msg(WARN_BAD_LINE, filename, parser->lineno); - } else { + while (config_read(parser, token, 2, 2, "# \t=", PARSE_LAST_IS_GREEDY)) { // TODO: ';' is comment char too +// if (!token[1]) { +// bb_error_msg(WARN_BAD_LINE, filename, parser->lineno); +// } else { + { #if 0 char *s = xasprintf("%s=%s", token[0], token[1]); sysctl_write_setting(s); @@ -205,7 +206,7 @@ static int sysctl_read_setting(const char *name) while ((cptr = strchr(outname, '/')) != NULL) *cptr = '.'; - fp = fopen(tmpname, "r"); + fp = fopen_for_read(tmpname); if (fp == NULL) { switch (errno) { case ENOENT: diff --git a/procps/top.c b/procps/top.c index 392a3c82b..1a6b8abb2 100644 --- a/procps/top.c +++ b/procps/top.c @@ -164,7 +164,7 @@ static int mult_lvl_cmp(void* a, void* b) static void get_jiffy_counts(void) { - FILE* fp = xfopen("stat", "r"); + FILE* fp = xfopen_for_read("stat"); prev_jif = jif; if (fscanf(fp, "cpu %lld %lld %lld %lld %lld %lld %lld %lld", &jif.usr,&jif.nic,&jif.sys,&jif.idle, @@ -268,7 +268,7 @@ static unsigned long display_header(int scr_width) #endif /* read memory info */ - fp = xfopen("meminfo", "r"); + fp = xfopen_for_read("meminfo"); /* * Old kernels (such as 2.4.x) had a nice summary of memory info that @@ -617,7 +617,7 @@ static void display_topmem_header(int scr_width) memset(&Z, 0, sizeof(Z)); /* read memory info */ - fp = xfopen("meminfo", "r"); + fp = xfopen_for_read("meminfo"); while (fgets(linebuf, sizeof(linebuf), fp)) { char *p; |