aboutsummaryrefslogtreecommitdiff
path: root/procps
diff options
context:
space:
mode:
Diffstat (limited to 'procps')
-rw-r--r--procps/fuser.c4
-rw-r--r--procps/sysctl.c11
-rw-r--r--procps/top.c6
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,
109 tmp_dev = find_socket_dev(); 109 tmp_dev = find_socket_dev();
110 110
111 sprintf(path, "/proc/net/%s", proto); 111 sprintf(path, "/proc/net/%s", proto);
112 f = fopen(path, "r"); 112 f = fopen_for_read(path);
113 if (!f) 113 if (!f)
114 return ilist; 114 return ilist;
115 115
@@ -158,7 +158,7 @@ static pid_list *scan_pid_maps(const char *fname, pid_t pid,
158 long long uint64_inode; 158 long long uint64_inode;
159 dev_t dev; 159 dev_t dev;
160 160
161 file = fopen(fname, "r"); 161 file = fopen_for_read(fname);
162 if (!file) 162 if (!file)
163 return plist; 163 return plist;
164 while (fgets(line, MAX_LINE, file)) { 164 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)
98 if (!parser) 98 if (!parser)
99 return 1; 99 return 1;
100 100
101 while (config_read(parser, token, 2, 0, "# \t=", PARSE_LAST_IS_GREEDY)) { // TODO: ';' is comment char too 101 while (config_read(parser, token, 2, 2, "# \t=", PARSE_LAST_IS_GREEDY)) { // TODO: ';' is comment char too
102 if (!token[1]) { 102// if (!token[1]) {
103 bb_error_msg(WARN_BAD_LINE, filename, parser->lineno); 103// bb_error_msg(WARN_BAD_LINE, filename, parser->lineno);
104 } else { 104// } else {
105 {
105#if 0 106#if 0
106 char *s = xasprintf("%s=%s", token[0], token[1]); 107 char *s = xasprintf("%s=%s", token[0], token[1]);
107 sysctl_write_setting(s); 108 sysctl_write_setting(s);
@@ -205,7 +206,7 @@ static int sysctl_read_setting(const char *name)
205 while ((cptr = strchr(outname, '/')) != NULL) 206 while ((cptr = strchr(outname, '/')) != NULL)
206 *cptr = '.'; 207 *cptr = '.';
207 208
208 fp = fopen(tmpname, "r"); 209 fp = fopen_for_read(tmpname);
209 if (fp == NULL) { 210 if (fp == NULL) {
210 switch (errno) { 211 switch (errno) {
211 case ENOENT: 212 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)
164 164
165static void get_jiffy_counts(void) 165static void get_jiffy_counts(void)
166{ 166{
167 FILE* fp = xfopen("stat", "r"); 167 FILE* fp = xfopen_for_read("stat");
168 prev_jif = jif; 168 prev_jif = jif;
169 if (fscanf(fp, "cpu %lld %lld %lld %lld %lld %lld %lld %lld", 169 if (fscanf(fp, "cpu %lld %lld %lld %lld %lld %lld %lld %lld",
170 &jif.usr,&jif.nic,&jif.sys,&jif.idle, 170 &jif.usr,&jif.nic,&jif.sys,&jif.idle,
@@ -268,7 +268,7 @@ static unsigned long display_header(int scr_width)
268#endif 268#endif
269 269
270 /* read memory info */ 270 /* read memory info */
271 fp = xfopen("meminfo", "r"); 271 fp = xfopen_for_read("meminfo");
272 272
273 /* 273 /*
274 * Old kernels (such as 2.4.x) had a nice summary of memory info that 274 * 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)
617 memset(&Z, 0, sizeof(Z)); 617 memset(&Z, 0, sizeof(Z));
618 618
619 /* read memory info */ 619 /* read memory info */
620 fp = xfopen("meminfo", "r"); 620 fp = xfopen_for_read("meminfo");
621 while (fgets(linebuf, sizeof(linebuf), fp)) { 621 while (fgets(linebuf, sizeof(linebuf), fp)) {
622 char *p; 622 char *p;
623 623