Merge commit '066f39956641300c1e5c6bfe6c11a115cea3e2cf' into merge

Conflicts:
	procps/ps.c

6 files changed, 163 insertions, 111 deletions

diff --git a/libbb/Kbuild.src b/libbb/Kbuild.src
index d110a3265..fcab184e0 100644
--- a/libbb/Kbuild.src
+++ b/libbb/Kbuild.src
@@ -57,9 +57,7 @@ lib-y += hash_md5_sha.o
 #lib-y += hash_md5prime.o
 lib-y += messages.o
 lib-y += mode_string.o
-lib-y += obscure.o
 lib-y += parse_mode.o
-lib-y += parse_config.o
 lib-y += perror_msg.o
 lib-y += perror_nomsg.o
 lib-y += perror_nomsg_and_die.o
@@ -138,7 +136,7 @@ lib-$(CONFIG_ADDUSER) += update_passwd.o
 lib-$(CONFIG_DELGROUP) += update_passwd.o
 lib-$(CONFIG_DELUSER) += update_passwd.o
 
-lib-$(CONFIG_PASSWD) += pw_encrypt.o update_passwd.o
+lib-$(CONFIG_PASSWD) += pw_encrypt.o update_passwd.o obscure.o
 lib-$(CONFIG_CHPASSWD) += pw_encrypt.o update_passwd.o
 lib-$(CONFIG_CRYPTPW) += pw_encrypt.o
 lib-$(CONFIG_SULOGIN) += pw_encrypt.o
diff --git a/libbb/appletlib.c b/libbb/appletlib.c
index d4025b9c7..b824b4775 100644
--- a/libbb/appletlib.c
+++ b/libbb/appletlib.c
@@ -34,17 +34,6 @@
 # include <malloc.h> /* for mallopt */
 #endif
 
-/* Try to pull in PAGE_SIZE */
-#ifdef __linux__
-# include <sys/user.h>
-#endif
-#ifdef __GNU__ /* Hurd */
-# include <mach/vm_param.h>
-#endif
-#ifndef PAGE_SIZE
-# define PAGE_SIZE (4*1024) /* guess */
-#endif
-
 
 /* Declare <applet>_main() */
 #define PROTOTYPES
@@ -788,13 +777,13 @@ int main(int argc UNUSED_PARAM, char **argv)
          * to keep before releasing to the OS
          * Default is way too big: 256k
          */
-        mallopt(M_TRIM_THRESHOLD, 2 * PAGE_SIZE);
+        mallopt(M_TRIM_THRESHOLD, 8 * 1024);
 #endif
 #ifdef M_MMAP_THRESHOLD
         /* M_MMAP_THRESHOLD is the request size threshold for using mmap()
          * Default is too big: 256k
          */
-        mallopt(M_MMAP_THRESHOLD, 8 * PAGE_SIZE - 256);
+        mallopt(M_MMAP_THRESHOLD, 32 * 1024 - 256);
 #endif
 
 #if !BB_MMU
diff --git a/libbb/get_line_from_file.c b/libbb/get_line_from_file.c
index 9be10687b..a98dd35eb 100644
--- a/libbb/get_line_from_file.c
+++ b/libbb/get_line_from_file.c
@@ -11,45 +11,24 @@
 
 #include "libbb.h"
 
-/* This function reads an entire line from a text file, up to a newline
- * or NUL byte, inclusive.  It returns a malloc'ed char * which
- * must be free'ed by the caller.  If end is NULL '\n' isn't considered
- * end of line.  If end isn't NULL, length of the chunk is stored in it.
- * If lineno is not NULL, *lineno is incremented for each line,
- * and also trailing '\' is recognized as line continuation.
- *
- * Returns NULL if EOF/error. */
-char* FAST_FUNC bb_get_chunk_with_continuation(FILE *file, int *end, int *lineno)
+char* FAST_FUNC bb_get_chunk_from_file(FILE *file, int *end)
 {
         int ch;
-        int idx = 0;
+        unsigned idx = 0;
         char *linebuf = NULL;
-        int linebufsz = 0;
 
         while ((ch = getc(file)) != EOF) {
                 /* grow the line buffer as necessary */
-                if (idx >= linebufsz) {
-                        linebufsz += 256;
-                        linebuf = xrealloc(linebuf, linebufsz);
-                }
+                if (!(idx & 0xff))
+                        linebuf = xrealloc(linebuf, idx + 0x100);
                 linebuf[idx++] = (char) ch;
-                if (!ch)
+                if (ch == '\0')
+                        break;
+                if (end && ch == '\n')
                         break;
-                if (end && ch == '\n') {
-                        if (lineno == NULL)
-                                break;
-                        (*lineno)++;
-                        if (idx < 2 || linebuf[idx-2] != '\\')
-                                break;
-                        idx -= 2;
-                }
         }
-        if (end) {
+        if (end)
                 *end = idx;
-                /* handle corner case when the file is not ended with '\n' */
-                if (ch == EOF && lineno != NULL)
-                        (*lineno)++;
-        }
         if (linebuf) {
                 // huh, does fgets discard prior data on error like this?
                 // I don't think so....
@@ -63,11 +42,6 @@ char* FAST_FUNC bb_get_chunk_with_continuation(FILE *file, int *end, int *lineno
         return linebuf;
 }
 
-char* FAST_FUNC bb_get_chunk_from_file(FILE *file, int *end)
-{
-        return bb_get_chunk_with_continuation(file, end, NULL);
-}
-
 /* Get line, including trailing \n if any */
 char* FAST_FUNC xmalloc_fgets(FILE *file)
 {
diff --git a/libbb/parse_config.c b/libbb/parse_config.c
index 4b0236028..cf5ba4deb 100644
--- a/libbb/parse_config.c
+++ b/libbb/parse_config.c
@@ -8,11 +8,27 @@
  * Also for use in uClibc (http://uclibc.org/) licensed under LGPLv2.1 or later.
  */
 
-/*
+/* Uncomment to enable test applet */
+////config:config PARSE
+////config:     bool "Uniform config file parser debugging applet: parse"
+////config:     default n
+////config:     help
+////config:       Typical usage of parse API:
+////config:             char *t[3];
+////config:             parser_t *p = config_open(filename);
+////config:             while (config_read(p, t, 3, 0, delimiters, flags)) { // 1..3 tokens
+////config:                     bb_error_msg("TOKENS: '%s''%s''%s'", t[0], t[1], t[2]);
+////config:             }
+////config:             config_close(p);
+
+////applet:IF_PARSE(APPLET(parse, BB_DIR_USR_BIN, BB_SUID_DROP))
+
+//kbuild:lib-y += parse_config.o
+
 //usage:#define parse_trivial_usage
-//usage:       "[-n MAXTOKENS] [-m MINTOKENS] [-d DELIMS] [-f FLAGS] FILE..."
-//usage:#define parse_full_usage ""
-*/
+//usage:       "[-x] [-n MAXTOKENS] [-m MINTOKENS] [-d DELIMS] [-f FLAGS] FILE..."
+//usage:#define parse_full_usage "\n\n"
+//usage:       "        -x      Suppress output (for benchmarking)"
 
 #include "libbb.h"
 
@@ -21,52 +37,34 @@ int parse_main(int argc, char **argv) MAIN_EXTERNALLY_VISIBLE;
 int parse_main(int argc UNUSED_PARAM, char **argv)
 {
         const char *delims = "# \t";
+        char **t;
         unsigned flags = PARSE_NORMAL;
         int mintokens = 0, ntokens = 128;
+        unsigned noout;
 
         opt_complementary = "-1:n+:m+:f+";
-        getopt32(argv, "n:m:d:f:", &ntokens, &mintokens, &delims, &flags);
+        noout = 1 & getopt32(argv, "xn:m:d:f:", &ntokens, &mintokens, &delims, &flags);
         //argc -= optind;
         argv += optind;
+
+        t = xmalloc(sizeof(t[0]) * ntokens);
         while (*argv) {
+                int n;
                 parser_t *p = config_open(*argv);
-                if (p) {
-                        int n;
-                        char **t = xmalloc(sizeof(char *) * ntokens);
-                        while ((n = config_read(p, t, ntokens, mintokens, delims, flags)) != 0) {
+                while ((n = config_read(p, t, ntokens, mintokens, delims, flags)) != 0) {
+                        if (!noout) {
                                 for (int i = 0; i < n; ++i)
                                         printf("[%s]", t[i]);
                                 puts("");
                         }
-                        config_close(p);
                 }
+                config_close(p);
                 argv++;
         }
         return EXIT_SUCCESS;
 }
 #endif
 
-/*
-
-Typical usage:
-
------ CUT -----
-        char *t[3];  // tokens placeholder
-        parser_t *p = config_open(filename);
-        if (p) {
-                // parse line-by-line
-                while (config_read(p, t, 3, 0, delimiters, flags)) { // 1..3 tokens
-                        // use tokens
-                        bb_error_msg("TOKENS: [%s][%s][%s]", t[0], t[1], t[2]);
-                }
-                ...
-                // free parser
-                config_close(p);
-        }
------ CUT -----
-
-*/
-
 parser_t* FAST_FUNC config_open2(const char *filename, FILE* FAST_FUNC (*fopen_func)(const char *path))
 {
         FILE* fp;
@@ -85,25 +83,58 @@ parser_t* FAST_FUNC config_open(const char *filename)
         return config_open2(filename, fopen_or_warn_stdin);
 }
 
-static void config_free_data(parser_t *parser)
-{
-        free(parser->line);
-        parser->line = NULL;
-        if (PARSE_KEEP_COPY) { /* compile-time constant */
-                free(parser->data);
-                parser->data = NULL;
-        }
-}
-
 void FAST_FUNC config_close(parser_t *parser)
 {
         if (parser) {
-                config_free_data(parser);
+                if (PARSE_KEEP_COPY) /* compile-time constant */
+                        free(parser->data);
                 fclose(parser->fp);
+                free(parser->line);
+                free(parser->nline);
                 free(parser);
         }
 }
 
+/* This function reads an entire line from a text file,
+ * up to a newline, exclusive.
+ * Trailing '\' is recognized as line continuation.
+ * Returns -1 if EOF/error.
+ */
+static int get_line_with_continuation(parser_t *parser)
+{
+        ssize_t len, nlen;
+        char *line;
+
+        len = getline(&parser->line, &parser->line_alloc, parser->fp);
+        if (len <= 0)
+                return len;
+
+        line = parser->line;
+        for (;;) {
+                parser->lineno++;
+                if (line[len - 1] == '\n')
+                        len--;
+                if (len == 0 || line[len - 1] != '\\')
+                        break;
+                len--;
+
+                nlen = getline(&parser->nline, &parser->nline_alloc, parser->fp);
+                if (nlen <= 0)
+                        break;
+
+                if (parser->line_alloc < len + nlen + 1) {
+                        parser->line_alloc = len + nlen + 1;
+                        line = parser->line = xrealloc(line, parser->line_alloc);
+                }
+                memcpy(&line[len], parser->nline, nlen);
+                len += nlen;
+        }
+
+        line[len] = '\0';
+        return len;
+}
+
+
 /*
 0. If parser is NULL return 0.
 1. Read a line from config file. If nothing to read then return 0.
@@ -132,27 +163,22 @@ int FAST_FUNC config_read(parser_t *parser, char **tokens, unsigned flags, const
 {
         char *line;
         int ntokens, mintokens;
-        int t, len;
+        int t;
+
+        if (!parser)
+                return 0;
 
         ntokens = (uint8_t)flags;
         mintokens = (uint8_t)(flags >> 8);
 
-        if (parser == NULL)
-                return 0;
-
-again:
+ again:
         memset(tokens, 0, sizeof(tokens[0]) * ntokens);
-        config_free_data(parser);
 
         /* Read one line (handling continuations with backslash) */
-        line = bb_get_chunk_with_continuation(parser->fp, &len, &parser->lineno);
-        if (line == NULL)
+        if (get_line_with_continuation(parser) < 0)
                 return 0;
-        parser->line = line;
 
-        /* Strip trailing line-feed if any */
-        if (len && line[len-1] == '\n')
-                line[len-1] = '\0';
+        line = parser->line;
 
         /* Skip token in the start of line? */
         if (flags & PARSE_TRIM)
@@ -161,8 +187,10 @@ again:
         if (line[0] == '\0' || line[0] == delims[0])
                 goto again;
 
-        if (flags & PARSE_KEEP_COPY)
+        if (flags & PARSE_KEEP_COPY) {
+                free(parser->data);
                 parser->data = xstrdup(line);
+        }
 
         /* Tokenize the line */
         t = 0;
@@ -208,8 +236,6 @@ again:
                                 parser->lineno, t, mintokens);
                 if (flags & PARSE_MIN_DIE)
                         xfunc_die();
-                if (flags & PARSE_KEEP_COPY)
-                        free(parser->data);
                 goto again;
         }
 
diff --git a/libbb/platform.c b/libbb/platform.c
index c594dcb4a..3cb41347f 100644
--- a/libbb/platform.c
+++ b/libbb/platform.c
@@ -158,3 +158,32 @@ char* FAST_FUNC stpcpy(char *p, const char *to_add)
         return p;
 }
 #endif
+
+#ifndef HAVE_GETLINE
+ssize_t FAST_FUNC getline(char **lineptr, size_t *n, FILE *stream)
+{
+        int ch;
+        char *line = *lineptr;
+        size_t alloced = *n;
+        size_t len = 0;
+
+        do {
+                ch = fgetc(stream);
+                if (ch == EOF)
+                        break;
+                if (len + 1 >= alloced) {
+                        alloced += alloced/4 + 64;
+                        line = xrealloc(line, alloced);
+                }
+                line[len++] = ch;
+        } while (ch != '\n');
+
+        if (len == 0)
+                return -1;
+
+        line[len] = '\0';
+        *lineptr = line;
+        *n = alloced;
+        return len;
+}
+#endif
diff --git a/libbb/procps.c b/libbb/procps.c
index 58772d4e9..b5582edfa 100644
--- a/libbb/procps.c
+++ b/libbb/procps.c
@@ -358,7 +358,14 @@ procps_status_t* FAST_FUNC procps_scan(procps_status_t* sp, int flags)
                         sp->gid = sb.st_gid;
                 }
 
-                if (flags & PSSCAN_STAT) {
+                /* These are all retrieved from proc/NN/stat in one go: */
+                if (flags & (PSSCAN_PPID | PSSCAN_PGID | PSSCAN_SID
+                        | PSSCAN_COMM | PSSCAN_STATE
+                        | PSSCAN_VSZ | PSSCAN_RSS
+                        | PSSCAN_STIME | PSSCAN_UTIME | PSSCAN_START_TIME
+                        | PSSCAN_TTY | PSSCAN_NICE
+                        | PSSCAN_CPU)
+                ) {
                         char *cp, *comm1;
                         int tty;
 #if !ENABLE_FEATURE_FAST_TOP
@@ -562,18 +569,47 @@ procps_status_t* FAST_FUNC procps_scan(procps_status_t* sp, int flags)
 void FAST_FUNC read_cmdline(char *buf, int col, unsigned pid, const char *comm)
 {
         int sz;
-        char filename[sizeof("/proc//cmdline") + sizeof(int)*3];
+        char filename[sizeof("/proc/%u/cmdline") + sizeof(int)*3];
 
         sprintf(filename, "/proc/%u/cmdline", pid);
         sz = open_read_close(filename, buf, col - 1);
         if (sz > 0) {
+                const char *base;
+                int comm_len;
+
                 buf[sz] = '\0';
                 while (--sz >= 0 && buf[sz] == '\0')
                         continue;
-                do {
+                base = bb_basename(buf); /* before we replace argv0's NUL with space */
+                while (sz >= 0) {
                         if ((unsigned char)(buf[sz]) < ' ')
                                 buf[sz] = ' ';
-                } while (--sz >= 0);
+                        sz--;
+                }
+
+                /* If comm differs from argv0, prepend "{comm} ".
+                 * It allows to see thread names set by prctl(PR_SET_NAME).
+                 */
+                if (base[0] == '-') /* "-sh" (login shell)? */
+                        base++;
+                comm_len = strlen(comm);
+                /* Why compare up to comm_len, not COMM_LEN-1?
+                 * Well, some processes rewrite argv, and use _spaces_ there
+                 * while rewriting. (KDE is observed to do it).
+                 * I prefer to still treat argv0 "process foo bar"
+                 * as 'equal' to comm "process".
+                 */
+                if (strncmp(base, comm, comm_len) != 0) {
+                        comm_len += 3;
+                        if (col > comm_len)
+                                memmove(buf + comm_len, buf, col - comm_len);
+                        snprintf(buf, col, "{%s}", comm);
+                        if (col <= comm_len)
+                                return;
+                        buf[comm_len - 1] = ' ';
+                        buf[col - 1] = '\0';
+                }
+
         } else {
                 snprintf(buf, col, "[%s]", comm);
         }