Fix generic_proc_open() of command 'nstat' and 'rtacct'

Fix a bug of generic_proc_open(), so environment variables
(e.g. PROC_NET_SNMP, PROC_NET_RTACCT) can be used to specify procfile.

Signed-off-by: Yu Zhiguo <yuzg@cn.fujitsu.com>

diff --git a/misc/nstat.c b/misc/nstat.c
index 228bce22a612fee1d87d1b8006e7b30ca424915d..80e695fca9c50b502e9c6a6ad6fd9d78a4120fed 100644 (file)
--- a/misc/nstat.c
+++ b/misc/nstat.c
@@ -43,7 +43,7 @@ int npatterns;
 char info_source[128];
 int source_mismatch;
 
-int generic_proc_open(char *env, char *name)
+static int generic_proc_open(const char *env, char *name)
 {
        char store[128];
        char *p = getenv(env);
@@ -52,7 +52,7 @@ int generic_proc_open(char *env, char *name)
                snprintf(store, sizeof(store)-1, "%s/%s", p, name);
                p = store;
        }
-       return open(store, O_RDONLY);
+       return open(p, O_RDONLY);
 }
 
 int net_netstat_open(void)

diff --git a/misc/rtacct.c b/misc/rtacct.c
index e6399d00d36e71a712595f6d0522482d341c1687..eb3ea9ecf9edbbdc02b9faed9ac3e34116e96067 100644 (file)
--- a/misc/rtacct.c
+++ b/misc/rtacct.c
@@ -43,7 +43,7 @@ int dump_zeros = 0;
 unsigned long magic_number = 0;
 double W;
 
-int generic_proc_open(char *env, char *name)
+static int generic_proc_open(const char *env, const char *name)
 {
        char store[1024];
        char *p = getenv(env);
@@ -52,7 +52,7 @@ int generic_proc_open(char *env, char *name)
                snprintf(store, sizeof(store)-1, "%s/%s", p, name);
                p = store;
        }
-       return open(store, O_RDONLY);
+       return open(p, O_RDONLY);
 }
 
 int net_rtacct_open(void)