man: use default MANPATH of "/usr/man"; do not search paths twice

[oweals/busybox.git] / libbb / procps.c

diff --git a/libbb/procps.c b/libbb/procps.c
index f799099fd33cb8887fd6980ade421ee32a7a1481..fd19621db00be01eedf72d2402ad2875abadbc7d 100644 (file)
--- a/libbb/procps.c
+++ b/libbb/procps.c
@@ -45,8 +45,8 @@ static int get_cached(cache_t *cp, unsigned id)
        for (i = 0; i < cp->size; i++)
                if (cp->cache[i].id == id)
                        return i;
-       i = cp->size;
-       cp->cache = xrealloc_vector(cp->cache, 2, cp->size++);
+       i = cp->size++;
+       cp->cache = xrealloc_vector(cp->cache, 2, i);
        cp->cache[i++].id = id;
        return -i;
 }
@@ -59,8 +59,8 @@ static char* get_cached(cache_t *cp, unsigned id, ug_func* fp)
        for (i = 0; i < cp->size; i++)
                if (cp->cache[i].id == id)
                        return cp->cache[i].name;
-       i = cp->size;
-       cp->cache = xrealloc_vector(cp->cache, 2, cp->size++);
+       i = cp->size++;
+       cp->cache = xrealloc_vector(cp->cache, 2, i);
        cp->cache[i].id = id;
        /* Never fails. Generates numeric string if name isn't found */
        fp(cp->cache[i].name, sizeof(cp->cache[i].name), id);
@@ -308,7 +308,7 @@ procps_status_t* FAST_FUNC procps_scan(procps_status_t* sp, int flags)
                        FILE *file;
 
                        strcpy(filename_tail, "/smaps");
-                       file = fopen(filename, "r");
+                       file = fopen_for_read(filename);
                        if (!file)
                                break;
                        while (fgets(buf, sizeof(buf), file)) {