Merge remote-tracking branch \'toybox/master\' into HEAD

am: c615678676

Change-Id: I9e2998e71daa88eddf99889016fe899be695ce15

diff --git a/generated/flags.h b/generated/flags.h
index b56de72..7035bb6 100644 (file)
--- a/generated/flags.h
+++ b/generated/flags.h
@@ -1642,9 +1642,9 @@
 #undef FLAG_t
 #endif
 
-// netstat pWrxwutneal pWrxwutneal
+// netstat pWrxwutneal[-al] pWrxwutneal[-al]
 #undef OPTSTR_netstat
-#define OPTSTR_netstat "pWrxwutneal"
+#define OPTSTR_netstat "pWrxwutneal[-al]"
 #ifdef CLEANUP_netstat
 #undef CLEANUP_netstat
 #undef FOR_netstat

diff --git a/generated/help.h b/generated/help.h
index 941c357..dcd5ef2 100644 (file)
--- a/generated/help.h
+++ b/generated/help.h
@@ -462,7 +462,7 @@
 
 #define HELP_top "usage: top [-H] [-k FIELD,] [-o FIELD,] [-s SORT]\n\nShow process activity in real time.\n\n-H       Show threads\n-k        Fallback sort FIELDS (default -S,-%CPU,-ETIME,-PID)\n-o Show FIELDS (def PID,USER,PR,NI,VIRT,RES,SHR,S,%CPU,%MEM,TIME+,CMDLINE)\n-O     Add FIELDS (replacing PR,NI,VIRT,RES,SHR,S from default)\n-s    Sort by field number (1-X, default 9)\n\n"
 
-#define HELP_ps "usage: ps [-AadefLlnwZ] [-gG GROUP,] [-k FIELD,] [-o FIELD,] [-p PID,] [-t TTY,] [-uU USER,]\n\nList processes.\n\nWhich processes to show (selections may be comma separated lists):\n\n-A   All processes\n-a       Processes with terminals that aren't session leaders\n-d        All processes that aren't session leaders\n-e   Same as -A\n-g  Belonging to GROUPs\n-G Belonging to real GROUPs (before sgid)\n-p      PIDs (--pid)\n-P        Parent PIDs (--ppid)\n-s        In session IDs\n-t      Attached to selected TTYs\n-T   Show threads\n-u        Owned by USERs\n-U      Owned by real USERs (before suid)\n\nOutput modifiers:\n\n-k    Sort FIELDs in +increasing or -decreasting order (--sort)\n-M   Measure field widths (expanding as necessary)\n-n       Show numeric USER and GROUP\n-w Wide output (don't truncate at terminal width)\n\nWhich FIELDs to show. (Default = -o PID,TTY,TIME,CMD)\n\n-f   Full listing (-o USER:8=UID,PID,PPID,C,STIME,TTY,TIME,CMD)\n-l  Long listing (-o F,S,UID,PID,PPID,C,PRI,NI,ADDR,SZ,WCHAN,TTY,TIME,CMD)\n-o      Output FIELDs instead of defaults, each with optional :size and =title\n-O      Add FIELDS to defaults\n-Z      Include LABEL\n\nCommand line -o fields:\n\n  ARGS     Command line (argv[] -path)    CMD    COMM, or ARGS with -f\n  CMDLINE  Command line (argv[])          COMM   Original command name (stat[2])\n  COMMAND  Command name (/proc/$PID/exe)  NAME   Command name (COMMAND -path)\n  TNAME    Thread name (argv[0] of $PID)\n\nProcess attribute -o FIELDs:\n\n  ADDR  Instruction pointer               BIT   Is this process 32 or 64 bits\n  CPU   Which processor running on        ETIME   Elapsed time since PID start\n  F     Flags (1=FORKNOEXEC 4=SUPERPRIV)  GID     Group id\n  GROUP Group name                        LABEL   Security label\n  MAJFL Major page faults                 MINFL   Minor page faults\n  NI    Niceness (lower is faster)\n  PCPU  Percentage of CPU time used       PCY     Android scheduling policy\n  PGID  Process Group ID\n  PID   Process ID                        PPID    Parent Process ID\n  PRI   Priority (higher is faster)       PSR     Processor last executed on\n  RGID  Real (before sgid) group ID       RGROUP  Real (before sgid) group name\n  RSS   Resident Set Size (pages in use)  RTPRIO  Realtime priority\n  RUID  Real (before suid) user ID        RUSER   Real (before suid) user name\n  S     Process state:\n        R (running) S (sleeping) D (device I/O) T (stopped)  t (traced)\n        Z (zombie)  X (deader)   x (dead)       K (wakekill) W (waking)\n  SCHED Scheduling policy (0=other, 1=fifo, 2=rr, 3=batch, 4=iso, 5=idle)\n  STAT  Process state (S) plus:\n        < high priority          N low priority L locked memory\n        s session leader         + foreground   l multithreaded\n  STIME Start time of process in hh:mm (size :19 shows yyyy-mm-dd hh:mm:ss)\n  SZ    Memory Size (4k pages needed to completely swap out process)\n  TCNT  Thread count                      TID     Thread ID\n  TIME  CPU time consumed                 TTY     Controlling terminal\n  UID   User id                           USER    User name\n  VSZ   Virtual memory size (1k units)    %VSZ    VSZ as % of physical memory\n  WCHAN What are we waiting in kernel for\n\n"
+#define HELP_ps "usage: ps [-AadefLlnwZ] [-gG GROUP,] [-k FIELD,] [-o FIELD,] [-p PID,] [-t TTY,] [-uU USER,]\n\nList processes.\n\nWhich processes to show (selections may be comma separated lists):\n\n-A   All processes\n-a       Processes with terminals that aren't session leaders\n-d        All processes that aren't session leaders\n-e   Same as -A\n-g  Belonging to GROUPs\n-G Belonging to real GROUPs (before sgid)\n-p      PIDs (--pid)\n-P        Parent PIDs (--ppid)\n-s        In session IDs\n-t      Attached to selected TTYs\n-T   Show threads\n-u        Owned by USERs\n-U      Owned by real USERs (before suid)\n\nOutput modifiers:\n\n-k    Sort FIELDs in +increasing or -decreasting order (--sort)\n-M   Measure field widths (expanding as necessary)\n-n       Show numeric USER and GROUP\n-w Wide output (don't truncate at terminal width)\n\nWhich FIELDs to show. (Default = -o PID,TTY,TIME,CMD)\n\n-f   Full listing (-o USER:8=UID,PID,PPID,C,STIME,TTY,TIME,ARGS=CMD)\n-l     Long listing (-o F,S,UID,PID,PPID,C,PRI,NI,ADDR,SZ,WCHAN,TTY,TIME,CMD)\n-o      Output FIELDs instead of defaults, each with optional :size and =title\n-O      Add FIELDS to defaults\n-Z      Include LABEL\n\nCommand line -o fields:\n\n  ARGS     CMDLINE minus initial path     CMD  Command name (stat2)\n  CMDLINE  Command line (argv[])          COMM Command filename (/proc/$PID/exe)\n  COMMAND  Command file (/proc/$PID/exe)  NAME Process name (argv[0] of $PID)\n\nProcess attribute -o FIELDs:\n\n  ADDR  Instruction pointer               BIT   Is this process 32 or 64 bits\n  CPU   Which processor running on        ETIME   Elapsed time since PID start\n  F     Flags (1=FORKNOEXEC 4=SUPERPRIV)  GID     Group id\n  GROUP Group name                        LABEL   Security label\n  MAJFL Major page faults                 MINFL   Minor page faults\n  NI    Niceness (lower is faster)\n  PCPU  Percentage of CPU time used       PCY     Android scheduling policy\n  PGID  Process Group ID\n  PID   Process ID                        PPID    Parent Process ID\n  PRI   Priority (higher is faster)       PSR     Processor last executed on\n  RGID  Real (before sgid) group ID       RGROUP  Real (before sgid) group name\n  RSS   Resident Set Size (pages in use)  RTPRIO  Realtime priority\n  RUID  Real (before suid) user ID        RUSER   Real (before suid) user name\n  S     Process state:\n        R (running) S (sleeping) D (device I/O) T (stopped)  t (traced)\n        Z (zombie)  X (deader)   x (dead)       K (wakekill) W (waking)\n  SCHED Scheduling policy (0=other, 1=fifo, 2=rr, 3=batch, 4=iso, 5=idle)\n  STAT  Process state (S) plus:\n        < high priority          N low priority L locked memory\n        s session leader         + foreground   l multithreaded\n  STIME Start time of process in hh:mm (size :19 shows yyyy-mm-dd hh:mm:ss)\n  SZ    Memory Size (4k pages needed to completely swap out process)\n  TCNT  Thread count                      TID     Thread ID\n  TIME  CPU time consumed                 TTY     Controlling terminal\n  UID   User id                           USER    User name\n  VSZ   Virtual memory size (1k units)    %VSZ    VSZ as % of physical memory\n  WCHAN What are we waiting in kernel for\n\n"
 
 #define HELP_printf "usage: printf FORMAT [ARGUMENT...]\n\nFormat and print ARGUMENT(s) according to FORMAT, using C printf syntax\n(% escapes for cdeEfgGiosuxX, \\ escapes for abefnrtv0 or \\OCTAL or \\xHEX).\n\n"
 

diff --git a/generated/newtoys.h b/generated/newtoys.h
index f254710..2b7a80c 100644 (file)
--- a/generated/newtoys.h
+++ b/generated/newtoys.h
@@ -151,7 +151,7 @@ USE_NBD_CLIENT(OLDTOY(nbd-client, nbd_client, TOYFLAG_USR|TOYFLAG_BIN))
 USE_NBD_CLIENT(NEWTOY(nbd_client, "<3>3ns", 0))
 USE_NETCAT(OLDTOY(nc, netcat, TOYFLAG_USR|TOYFLAG_BIN))
 USE_NETCAT(NEWTOY(netcat, USE_NETCAT_LISTEN("^tlL")"w#p#s:q#f:", TOYFLAG_BIN))
-USE_NETSTAT(NEWTOY(netstat, "pWrxwutneal", TOYFLAG_BIN))
+USE_NETSTAT(NEWTOY(netstat, "pWrxwutneal[-al]", TOYFLAG_BIN))
 USE_NICE(NEWTOY(nice, "^<1n#", TOYFLAG_USR|TOYFLAG_BIN))
 USE_NL(NEWTOY(nl, "v#<1=1l#b:n:s:w#<0=6E", TOYFLAG_BIN))
 USE_NOHUP(NEWTOY(nohup, "<1^", TOYFLAG_USR|TOYFLAG_BIN))

diff --git a/generated/tags.h b/generated/tags.h
index a972842..31e7773 100644 (file)
--- a/generated/tags.h
+++ b/generated/tags.h
@@ -56,76 +56,74 @@
 #define _PS_COMM                                    (1<<22)
 #define PS_NAME                                     23
 #define _PS_NAME                                    (1<<23)
-#define PS_TNAME                                    24
-#define _PS_TNAME                                   (1<<24)
-#define PS_COMMAND                                  25
-#define _PS_COMMAND                                 (1<<25)
-#define PS_CMDLINE                                  26
-#define _PS_CMDLINE                                 (1<<26)
-#define PS_ARGS                                     27
-#define _PS_ARGS                                    (1<<27)
-#define PS_CMD                                      28
-#define _PS_CMD                                     (1<<28)
-#define PS_UID                                      29
-#define _PS_UID                                     (1<<29)
-#define PS_USER                                     30
-#define _PS_USER                                    (1<<30)
-#define PS_RUID                                     31
-#define _PS_RUID                                    (1<<31)
-#define PS_RUSER                                    32
-#define _PS_RUSER                                   (1LL<<32)
-#define PS_GID                                      33
-#define _PS_GID                                     (1LL<<33)
-#define PS_GROUP                                    34
-#define _PS_GROUP                                   (1LL<<34)
-#define PS_RGID                                     35
-#define _PS_RGID                                    (1LL<<35)
-#define PS_RGROUP                                   36
-#define _PS_RGROUP                                  (1LL<<36)
-#define PS_TIME                                     37
-#define _PS_TIME                                    (1LL<<37)
-#define PS_ELAPSED                                  38
-#define _PS_ELAPSED                                 (1LL<<38)
-#define PS_TIME_                                    39
-#define _PS_TIME_                                   (1LL<<39)
-#define PS_C                                        40
-#define _PS_C                                       (1LL<<40)
-#define PS__VSZ                                     41
-#define _PS__VSZ                                    (1LL<<41)
-#define PS__MEM                                     42
-#define _PS__MEM                                    (1LL<<42)
-#define PS__CPU                                     43
-#define _PS__CPU                                    (1LL<<43)
-#define PS_VIRT                                     44
-#define _PS_VIRT                                    (1LL<<44)
-#define PS_RES                                      45
-#define _PS_RES                                     (1LL<<45)
-#define PS_SHR                                      46
-#define _PS_SHR                                     (1LL<<46)
-#define PS_READ                                     47
-#define _PS_READ                                    (1LL<<47)
-#define PS_WRITE                                    48
-#define _PS_WRITE                                   (1LL<<48)
-#define PS_IO                                       49
-#define _PS_IO                                      (1LL<<49)
-#define PS_DREAD                                    50
-#define _PS_DREAD                                   (1LL<<50)
-#define PS_DWRITE                                   51
-#define _PS_DWRITE                                  (1LL<<51)
-#define PS_SWAP                                     52
-#define _PS_SWAP                                    (1LL<<52)
-#define PS_DIO                                      53
-#define _PS_DIO                                     (1LL<<53)
-#define PS_STIME                                    54
-#define _PS_STIME                                   (1LL<<54)
-#define PS_F                                        55
-#define _PS_F                                       (1LL<<55)
-#define PS_S                                        56
-#define _PS_S                                       (1LL<<56)
-#define PS_STAT                                     57
-#define _PS_STAT                                    (1LL<<57)
-#define PS_PCY                                      58
-#define _PS_PCY                                     (1LL<<58)
+#define PS_COMMAND                                  24
+#define _PS_COMMAND                                 (1<<24)
+#define PS_CMDLINE                                  25
+#define _PS_CMDLINE                                 (1<<25)
+#define PS_ARGS                                     26
+#define _PS_ARGS                                    (1<<26)
+#define PS_CMD                                      27
+#define _PS_CMD                                     (1<<27)
+#define PS_UID                                      28
+#define _PS_UID                                     (1<<28)
+#define PS_USER                                     29
+#define _PS_USER                                    (1<<29)
+#define PS_RUID                                     30
+#define _PS_RUID                                    (1<<30)
+#define PS_RUSER                                    31
+#define _PS_RUSER                                   (1<<31)
+#define PS_GID                                      32
+#define _PS_GID                                     (1LL<<32)
+#define PS_GROUP                                    33
+#define _PS_GROUP                                   (1LL<<33)
+#define PS_RGID                                     34
+#define _PS_RGID                                    (1LL<<34)
+#define PS_RGROUP                                   35
+#define _PS_RGROUP                                  (1LL<<35)
+#define PS_TIME                                     36
+#define _PS_TIME                                    (1LL<<36)
+#define PS_ELAPSED                                  37
+#define _PS_ELAPSED                                 (1LL<<37)
+#define PS_TIME_                                    38
+#define _PS_TIME_                                   (1LL<<38)
+#define PS_C                                        39
+#define _PS_C                                       (1LL<<39)
+#define PS__VSZ                                     40
+#define _PS__VSZ                                    (1LL<<40)
+#define PS__MEM                                     41
+#define _PS__MEM                                    (1LL<<41)
+#define PS__CPU                                     42
+#define _PS__CPU                                    (1LL<<42)
+#define PS_VIRT                                     43
+#define _PS_VIRT                                    (1LL<<43)
+#define PS_RES                                      44
+#define _PS_RES                                     (1LL<<44)
+#define PS_SHR                                      45
+#define _PS_SHR                                     (1LL<<45)
+#define PS_READ                                     46
+#define _PS_READ                                    (1LL<<46)
+#define PS_WRITE                                    47
+#define _PS_WRITE                                   (1LL<<47)
+#define PS_IO                                       48
+#define _PS_IO                                      (1LL<<48)
+#define PS_DREAD                                    49
+#define _PS_DREAD                                   (1LL<<49)
+#define PS_DWRITE                                   50
+#define _PS_DWRITE                                  (1LL<<50)
+#define PS_SWAP                                     51
+#define _PS_SWAP                                    (1LL<<51)
+#define PS_DIO                                      52
+#define _PS_DIO                                     (1LL<<52)
+#define PS_STIME                                    53
+#define _PS_STIME                                   (1LL<<53)
+#define PS_F                                        54
+#define _PS_F                                       (1LL<<54)
+#define PS_S                                        55
+#define _PS_S                                       (1LL<<55)
+#define PS_STAT                                     56
+#define _PS_STAT                                    (1LL<<56)
+#define PS_PCY                                      57
+#define _PS_PCY                                     (1LL<<57)
 #define KEY_UP                                       0
 #define _KEY_UP                                      (1<<0)
 #define KEY_DOWN                                     1

diff --git a/toys/other/stat.c b/toys/other/stat.c
index 47c10b4..9f77a60 100644 (file)
--- a/toys/other/stat.c
+++ b/toys/other/stat.c
@@ -114,8 +114,8 @@ static void print_stat(char type)
         xprintf(" -> `%s'", toybuf);
   } else if (type == 'o') out('u', stat->st_blksize);
   else if (type == 's') out('u', stat->st_size);
-  else if (type == 't') out('x', major(stat->st_rdev));
-  else if (type == 'T') out('x', minor(stat->st_rdev));
+  else if (type == 't') out('x', dev_major(stat->st_rdev));
+  else if (type == 'T') out('x', dev_minor(stat->st_rdev));
   else if (type == 'u') out('u', stat->st_uid);
   else if (type == 'U') xprintf("%8s", TT.user_name->pw_name);
   else if (type == 'x') date_stat_format((void *)&stat->st_atime);

diff --git a/toys/pending/lsof.c b/toys/pending/lsof.c
index e99b011..436fdd2 100644 (file)
--- a/toys/pending/lsof.c
+++ b/toys/pending/lsof.c
@@ -277,8 +277,8 @@ static void fill_stat(struct file_info *fi, const char *path)
   // Fill DEVICE.
   dev = (S_ISBLK(sb.st_mode) || S_ISCHR(sb.st_mode)) ? sb.st_rdev : sb.st_dev;
   if (!S_ISSOCK(sb.st_mode))
-    snprintf(fi->device, sizeof(fi->device), "%ld,%ld",
-             (long)major(dev), (long)minor(dev));
+    snprintf(fi->device, sizeof(fi->device), "%d,%d",
+             dev_major(dev), dev_minor(dev));
 
   // Fill SIZE/OFF.
   if (S_ISREG(sb.st_mode) || S_ISDIR(sb.st_mode))

diff --git a/toys/pending/netstat.c b/toys/pending/netstat.c
index 02ab4fc..a409665 100644 (file)
--- a/toys/pending/netstat.c
+++ b/toys/pending/netstat.c
@@ -5,7 +5,7 @@
  *
  * Not in SUSv4.
  *
-USE_NETSTAT(NEWTOY(netstat, "pWrxwutneal", TOYFLAG_BIN))
+USE_NETSTAT(NEWTOY(netstat, "pWrxwutneal[-al]", TOYFLAG_BIN))
 config NETSTAT
   bool "netstat"
   default n
@@ -54,13 +54,6 @@ typedef union _iaddr6 {
 
 #define ADDR_LEN (INET6_ADDRSTRLEN + 1 + 5 + 1)//IPv6 addr len + : + port + '\0'
 
-//For unix states
-enum {
-       SOCK_ACCEPTCON = (1 << 16),  //performed a listen.
-       SOCK_WAIT_DATA = (1 << 17),  //wait data to read.
-       SOCK_NO_SPACE = (1 << 18),  //no space to write.
-};
-
 #define SOCK_NOT_CONNECTED 1
 
 typedef struct _pidlist {
@@ -147,9 +140,9 @@ static void display_data(unsigned rport, char *label,
   xprintf("%3s   %6d %6d ", label, rxq, txq);
   xprintf((toys.optflags & FLAG_W) ? "%-51.51s %-51.51s " : "%-23.23s %-23.23s "
            , lip, rip);
-  xprintf("%-11s ", ss_state);
-  if ((toys.optflags & FLAG_e)) xprintf("%-10s %-11ld ", user, inode);
-  if ((toys.optflags & FLAG_p)) xprintf("%s", get_pid_name(inode));
+  xprintf("%-11s", ss_state);
+  if ((toys.optflags & FLAG_e)) xprintf(" %-10s %-11ld", user, inode);
+  if ((toys.optflags & FLAG_p)) xprintf(" %s", get_pid_name(inode));
   xputc('\n');
 }
 
@@ -273,8 +266,8 @@ static void show_ipv6(char *fname, char *label)
 {
   FILE *fp = fopen(fname, "r");
   if (!fp) {
-    perror_msg("'%s'", fname);
-    return;
+     perror_msg("'%s'", fname);
+     return;
   }
 
   if(!fgets(toybuf, sizeof(toybuf), fp)) return; //skip header.
@@ -284,6 +277,7 @@ static void show_ipv6(char *fname, char *label)
     iaddr6 laddr6, raddr6;
     unsigned lport, rport, state, txq, rxq, num, uid;
     unsigned long inode;
+
     int nitems = sscanf(toybuf, " %d: %8x%8x%8x%8x:%x %8x%8x%8x%8x:%x %x %x:%x "
                                 "%*X:%*X %*X %d %*d %ld",
                         &num, &laddr6.u.a, &laddr6.u.b, &laddr6.u.c,
@@ -299,72 +293,48 @@ static void show_ipv6(char *fname, char *label)
   fclose(fp);
 }
 
-/*
- * display unix socket info.
- */
-static void show_unix_sockets(char *fname, char *label)
+static void show_unix_sockets(void)
 {
-  FILE *fp = fopen((char *)fname, "r");
-  if (!fp) {
-    perror_msg("'%s'", fname);
-    return;
-  }
+  char *types[] = {"","STREAM","DGRAM","RAW","RDM","SEQPACKET","DCCP","PACKET"},
+       *states[] = {"","LISTENING","CONNECTING","CONNECTED","DISCONNECTING"};
+  unsigned long refcount, flags, type, state, inode;
+  FILE *fp = xfopen("/proc/net/unix", "r");
 
   if(!fgets(toybuf, sizeof(toybuf), fp)) return; //skip header.
 
   while (fgets(toybuf, sizeof(toybuf), fp)) {
-    unsigned long refcount, label, flags, inode;
-    int nitems = 0, path_offset = 0, type, state;
-    char sock_flags[32] = {0,}, *sock_type, *sock_state, *bptr = toybuf, *term;
+    unsigned offset = 0;
 
-    if (!toybuf[0]) continue;
+    // count = 6 or 7 (first field ignored, sockets don't always have filenames)
+    if (6<sscanf(toybuf, "%*p: %lX %*X %lX %lX %lX %lu %n",
+      &refcount, &flags, &type, &state, &inode, &offset))
+        continue;
 
-    nitems = sscanf(toybuf, "%*p: %lX %lX %lX %X %X %lu %n",
-        &refcount, &label, &flags, &type, &state, &inode, &path_offset);
+    // Linux exports only SO_ACCEPTCON since 2.3.15pre3 in 1999, but let's
+    // filter in case they add more someday.
+    flags &= 1<<16;
 
-    //for state one less
-    if (nitems < 6) break;
+    // Only show unconnected listening sockets with -a
+    if (state==1 && flags && !(toys.optflags&FLAG_a)) continue;
 
-    if (toys.optflags & FLAG_l) {
-      if ( !((state == SOCK_NOT_CONNECTED) && (flags & SOCK_ACCEPTCON)) )
-        continue;
-    } else if (!(toys.optflags & FLAG_a)) {
-      if ((state == SOCK_NOT_CONNECTED) && (flags & SOCK_ACCEPTCON)) continue;
-    }
+    if (type==10) type = 7; // move SOCK_PACKET into line
+    if (type>ARRAY_LEN(types)) type = 0;
+    if (state>ARRAY_LEN(states)) state = 0;
+    sprintf(toybuf, "[ %s]", flags ? "ACC " : "");
 
-    //prepare socket type, state and flags.
-    {
-      char *ss_type[] = { "", "STREAM", "DGRAM", "RAW", "RDM", "SEQPACKET",
-                          "UNKNOWN"};
-      char *ss_state[] = { "FREE", "LISTENING", "CONNECTING", "CONNECTED",
-                           "DISCONNECTING", "UNKNOWN"};
-
-      int sz = ARRAY_LEN(ss_type);//sizeof(ss_type)/sizeof(ss_type[0]);
-      if ( (type < SOCK_STREAM) || (type > SOCK_SEQPACKET) )
-        sock_type = ss_type[sz-1];
-      else sock_type = ss_type[type];
-
-      sz = ARRAY_LEN(ss_state);//sizeof(ss_state)/sizeof(ss_state[0]);
-      if ((state < 0) || (state > sz-2)) sock_state = ss_state[sz-1];
-      else if (state == SOCK_NOT_CONNECTED) {
-        if (flags & SOCK_ACCEPTCON) sock_state = ss_state[state];
-        else sock_state = " ";
-      } else sock_state = ss_state[state];
-
-      strcpy(sock_flags, "[ ");
-      if (flags & SOCK_ACCEPTCON) strcat(sock_flags, "ACC ");
-      if (flags & SOCK_WAIT_DATA) strcat(sock_flags, "W ");
-      if (flags & SOCK_NO_SPACE) strcat(sock_flags, "N ");
-      strcat(sock_flags, "]");
+    printf("unix  %-6ld %-11s %-10s %-13s %8lu ",
+      refcount, toybuf, types[type], states[state], inode);
+    if (toys.optflags & FLAG_p) printf("%-20s", get_pid_name(inode));
+
+    if (offset) {
+      char *s = toybuf+offset, *ss;
+
+      if ((ss = strrchr(s, '\n'))) *ss = 0;
+      xprintf("%s", s);
     }
-    xprintf("%-5s %-6ld %-11s %-10s %-13s %8lu ", (!label ? "unix" : "??"),
-      refcount, sock_flags, sock_type, sock_state, inode);
-    if (toys.optflags & FLAG_p) xprintf("%-20s", get_pid_name(inode));
-
-    bptr += path_offset;
-    if ((term = strchr(bptr, '\n'))) *term = '\0';
-    xprintf("%s\n", bptr);
-  }//End of while
+    xputc('\n');
+  }
+
   fclose(fp);
 }
 
@@ -424,8 +394,8 @@ static void scan_pid_inodes(char *path)
 
     if (!isdigit(entry->d_name[0])) continue;
     snprintf(link_name, sizeof(link_name), "%s/%s", path, entry->d_name);
-    link = xreadlink(link_name);
-    if ((inode = ss_inode(link)) != -1) add2list(inode);
+    if ((link = xreadlink(link_name)) && (inode = ss_inode(link))!=-1)
+      add2list(inode);
     free(link);
   }
   closedir(dp);
@@ -472,111 +442,69 @@ static void clean_pid_list(void)
 }
 
 /*
- * For TCP/UDP/RAW show the header.
- */
-static void show_header(void)
-{
-  xprintf("Proto Recv-Q Send-Q ");
-  xprintf((toys.optflags & FLAG_W) ? "%-51s %-51s" : "%-23s %-23s",
-          "Local Address", "Foreign Address");
-  xprintf(" State      ");
-  if (toys.optflags & FLAG_e) xprintf(" User       Inode      ");
-  if (toys.optflags & FLAG_p) xprintf(" PID/Program Name");
-  xputc('\n');
-}
-
-/*
- * used to get the flag values for route command.
+ * extract inet4 route info from /proc/net/route file and display it.
  */
-static void get_flag_value(char *flagstr, int flags)
+static void display_routes(void)
 {
-  int i = 0;
-  char *str = flagstr;
   static const char flagchars[] = "GHRDMDAC";
   static const unsigned flagarray[] = {
-    RTF_GATEWAY,
-    RTF_HOST,
-    RTF_REINSTATE,
-    RTF_DYNAMIC,
-    RTF_MODIFIED,
-    RTF_DEFAULT,
-    RTF_ADDRCONF,
-    RTF_CACHE
+    RTF_GATEWAY, RTF_HOST, RTF_REINSTATE, RTF_DYNAMIC, RTF_MODIFIED
   };
-  *str++ = 'U';
-
-  while ( (*str = flagchars[i]) ) {
-    if (flags & flagarray[i++]) ++str;
-  }
-}
-
-/*
- * extract inet4 route info from /proc/net/route file and display it.
- */
-static void display_routes(int is_more_info, int notresolve)
-{
-#define IPV4_MASK (RTF_GATEWAY|RTF_HOST|RTF_REINSTATE|RTF_DYNAMIC|RTF_MODIFIED)
   unsigned long dest, gate, mask;
   int flags, ref, use, metric, mss, win, irtt;
-  char iface[64]={0,};
-  char flag_val[10]={0,}; //there are 9 flags "UGHRDMDAC" for route.
-
+  char *out = toybuf, *flag_val;
+  char iface[64]={0};
   FILE *fp = xfopen("/proc/net/route", "r");
 
   if(!fgets(toybuf, sizeof(toybuf), fp)) return; //skip header.
 
   xprintf("Kernel IP routing table\n"
           "Destination     Gateway         Genmask         Flags %s Iface\n",
-          is_more_info ? "  MSS Window  irtt" : "Metric Ref    Use");
+          !(toys.optflags&FLAG_e) ? "  MSS Window  irtt" : "Metric Ref    Use");
 
   while (fgets(toybuf, sizeof(toybuf), fp)) {
-     int nitems = 0;
-     char *destip = NULL, *gateip = NULL, *maskip = NULL;
-
-     nitems = sscanf(toybuf, "%63s%lx%lx%X%d%d%d%lx%d%d%d\n", iface, &dest,
-       &gate, &flags, &ref, &use, &metric, &mask, &mss, &win, &irtt);
-     if (nitems != 11) {//EOF with no (nonspace) chars read.
-       if ((nitems < 0) && feof(fp)) break;
-      perror_exit("sscanf");
-    }
+     char *destip = 0, *gateip = 0, *maskip = 0;
 
-    //skip down interfaces.
+     if (11 != sscanf(toybuf, "%63s%lx%lx%X%d%d%d%lx%d%d%d", iface, &dest,
+       &gate, &flags, &ref, &use, &metric, &mask, &mss, &win, &irtt))
+         break;
+
+    // skip down interfaces.
     if (!(flags & RTF_UP)) continue;
 
-    if (dest) {//For Destination
-      if (inet_ntop(AF_INET, &dest, toybuf, sizeof(toybuf)) )
-        destip = xstrdup(toybuf);
-    } else {
-      if (!notresolve) destip = xstrdup("default");
-      else destip = xstrdup("0.0.0.0");
-    }
+// TODO /proc/net/ipv6_route
 
-    if (gate) {//For Gateway
-      if (inet_ntop(AF_INET, &gate, toybuf, sizeof(toybuf)) )
-        gateip = xstrdup(toybuf);
-    } else {
-      if (!notresolve) gateip = xstrdup("*");
-      else gateip = xstrdup("0.0.0.0");
-    }
+    if (dest) {
+      if (inet_ntop(AF_INET, &dest, out, 16)) destip = out;
+    } else destip = (toys.optflags&FLAG_n) ? "0.0.0.0" : "default";
+    out += 16;
 
+    if (gate) {
+      if (inet_ntop(AF_INET, &gate, out, 16)) gateip = out;
+    } else gateip = (toys.optflags&FLAG_n) ? "0.0.0.0" : "*";
+    out += 16;
+
+// TODO /24
     //For Mask
-    if (inet_ntop(AF_INET, &mask, toybuf, sizeof(toybuf)) )
-      maskip = xstrdup(toybuf);
+    if (inet_ntop(AF_INET, &mask, out, 16)) maskip = out;
+    else maskip = "?";
+    out += 16;
 
     //Get flag Values
-    get_flag_value(flag_val, flags & IPV4_MASK);
-    if (flags & RTF_REJECT) flag_val[0] = '!';
+    flag_val = out;
+    *out++ = 'U';
+    for (dest = 0; dest < ARRAY_LEN(flagarray); dest++)
+      if (flags&flagarray[dest]) *out++ = flagchars[dest];
+    *out = 0;
+    if (flags & RTF_REJECT) *flag_val = '!';
 
     xprintf("%-15.15s %-15.15s %-16s%-6s", destip, gateip, maskip, flag_val);
-    if (is_more_info) xprintf("%5d %-5d %6d %s\n", mss, win, irtt, iface);
+    if (!(toys.optflags & FLAG_e))
+      xprintf("%5d %-5d %6d %s\n", mss, win, irtt, iface);
     else xprintf("%-6d %-2d %7d %s\n", metric, ref, use, iface);
+  }
 
-    if (destip) free(destip);
-    if (gateip) free(gateip);
-    if (maskip) free(maskip);
-  }//end of while.
   fclose(fp);
-#undef IPV4_MASK
 }
 
 /*
@@ -584,30 +512,20 @@ static void display_routes(int is_more_info, int notresolve)
  */
 void netstat_main(void)
 {
-#define IS_NETSTAT_PROTO_FLAGS_UP (toys.optflags & (FLAG_t | FLAG_u | FLAG_w \
-                                                    | FLAG_x))
-
-  // For no parameter, add 't', 'u', 'w', 'x' options as default
-  if (!toys.optflags) toys.optflags = FLAG_t | FLAG_u | FLAG_w | FLAG_x;
+  char *type = "w/o";
 
-  // For both 'a' and 'l' are set, remove 'l' option
-  if (toys.optflags & FLAG_a && toys.optflags & FLAG_l)
-      toys.optflags &= ~FLAG_l;
-
-  // For each 'a', 'l', 'e', 'n', 'W', 'p' options
-  // without any 't', 'u', 'w', 'x' option, add 't', 'u', 'w', 'x' options
-  if (((toys.optflags & FLAG_a) || (toys.optflags & FLAG_l) ||
-       (toys.optflags & FLAG_e) || (toys.optflags & FLAG_n) ||
-       (toys.optflags & FLAG_W) || (toys.optflags & FLAG_p)) &&
-         (!IS_NETSTAT_PROTO_FLAGS_UP) )
-    toys.optflags |= FLAG_t | FLAG_u | FLAG_w | FLAG_x;
-
-  //Display routing table.
   if (toys.optflags & FLAG_r) {
-    display_routes(!(toys.optflags & FLAG_e), (toys.optflags & FLAG_n));
+    display_routes();
+
     return;
   }
 
+  if (!(toys.optflags&(FLAG_t|FLAG_u|FLAG_w|FLAG_x)))
+    toys.optflags |= FLAG_t|FLAG_u|FLAG_w|FLAG_x;
+
+  if (toys.optflags & FLAG_a) type = "established and";
+  else if (toys.optflags & FLAG_l) type = "only";
+
   if (toys.optflags & FLAG_p) {
     dirtree_read("/proc", scan_pids);
     // TODO: we probably shouldn't warn if all the processes we're going to
@@ -618,16 +536,17 @@ void netstat_main(void)
         " will not be shown, you would have to be root to see it all.)\n");
   }
 
-  //For TCP/UDP/RAW.
-  if ( (toys.optflags & FLAG_t) || (toys.optflags & FLAG_u) ||
-       (toys.optflags & FLAG_w) ) {
-    xprintf("Active Internet connections ");
+  if (toys.optflags&(FLAG_t|FLAG_u|FLAG_w)) {
+    int pad = (toys.optflags&FLAG_W) ? -51 : -23;
+
+    printf("Active %s (%s servers)\n", "Internet connections", type);
 
-    if (toys.optflags & FLAG_a) xprintf("(servers and established)\n");
-    else if (toys.optflags & FLAG_l) xprintf("(only servers)\n");
-    else xprintf("(w/o servers)\n");
+    printf("Proto Recv-Q Send-Q %*s %*s State      ", pad, "Local Addres",
+      pad, "Foreign Address");
+    if (toys.optflags & FLAG_e) printf(" User       Inode      ");
+    if (toys.optflags & FLAG_p) printf(" PID/Program Name");
+    xputc('\n');
 
-    show_header();
     if (toys.optflags & FLAG_t) {//For TCP
       show_ipv4("/proc/net/tcp",  "tcp");
       show_ipv6("/proc/net/tcp6", "tcp");
@@ -641,21 +560,15 @@ void netstat_main(void)
       show_ipv6("/proc/net/raw6", "raw");
     }
   }
-  if (toys.optflags & FLAG_x) {//For UNIX
-    xprintf("Active UNIX domain sockets ");
-    if (toys.optflags & FLAG_a) xprintf("(servers and established)\n");
-    else if (toys.optflags & FLAG_l) xprintf("(only servers)\n");
-    else xprintf("(w/o servers)\n");
-
-    if (toys.optflags & FLAG_p)
-      xprintf("Proto RefCnt Flags       Type       State           "
-              "I-Node PID/Program Name    Path\n");
-    else
-      xprintf("Proto RefCnt Flags       Type       State           "
-              "I-Node Path\n");
-    show_unix_sockets("/proc/net/unix", "unix");
+
+  if (toys.optflags & FLAG_x) {
+    xprintf("Active %s (%s servers)\n", "UNIX domain sockets", type);
+
+    xprintf("Proto RefCnt Flags       Type       State           I-Node %s Path\n",
+      (toys.optflags&FLAG_p) ? "PID/Program Name" : "I-Node");
+    show_unix_sockets();
   }
+
   if (toys.optflags & FLAG_p) clean_pid_list();
-  if (toys.exitval) toys.exitval = 0;
-#undef IS_NETSTAT_PROTO_FLAGS_UP
+  toys.exitval = 0;
 }

diff --git a/toys/posix/ps.c b/toys/posix/ps.c
index 9402b77..8ac6eef 100644 (file)
--- a/toys/posix/ps.c
+++ b/toys/posix/ps.c
@@ -83,7 +83,7 @@ config PS
 
     Which FIELDs to show. (Default = -o PID,TTY,TIME,CMD)
 
-    -f Full listing (-o USER:8=UID,PID,PPID,C,STIME,TTY,TIME,CMD)
+    -f Full listing (-o USER:8=UID,PID,PPID,C,STIME,TTY,TIME,ARGS=CMD)
     -l Long listing (-o F,S,UID,PID,PPID,C,PRI,NI,ADDR,SZ,WCHAN,TTY,TIME,CMD)
     -o Output FIELDs instead of defaults, each with optional :size and =title
     -O Add FIELDS to defaults
@@ -91,10 +91,9 @@ config PS
 
     Command line -o fields:
 
-      ARGS     Command line (argv[] -path)    CMD    COMM, or ARGS with -f
-      CMDLINE  Command line (argv[])          COMM   Original command name (stat[2])
-      COMMAND  Command name (/proc/$PID/exe)  NAME   Command name (COMMAND -path)
-      TNAME    Thread name (argv[0] of $PID)
+      ARGS     CMDLINE minus initial path     CMD  Command name (stat2)
+      CMDLINE  Command line (argv[])          COMM Command filename (/proc/$PID/exe)
+      COMMAND  Command file (/proc/$PID/exe)  NAME Process name (argv[0] of $PID)
 
     Process attribute -o FIELDs:
 
@@ -346,9 +345,9 @@ struct typography {
   {"TID", 5, SLOT_tid}, {"TCNT", 4, SLOT_tcount}, {"BIT", 3, SLOT_bits},
 
   // String fields
-  {"TTY", -8, -2}, {"WCHAN", -6, -3}, {"LABEL", -30, -4}, {"COMM", -15, -1},
-  {"NAME", -15, -5}, {"TNAME", -27, -7}, {"COMMAND", -27, -5},
-  {"CMDLINE", -27, -6}, {"ARGS", -27, -6}, {"CMD", -27, -1},
+  {"TTY", -8, -2}, {"WCHAN", -6, -3}, {"LABEL", -30, -4}, {"COMM", -27, -5},
+  {"NAME", -27, -7}, {"COMMAND", -27, -5}, {"CMDLINE", -27, -6},
+  {"ARGS", -27, -6}, {"CMD", -15, -1},
 
   // user/group
   {"UID", 5, SLOT_uid}, {"USER", -8, 64|SLOT_uid}, {"RUID", 4, SLOT_ruid},
@@ -443,24 +442,13 @@ static char *string_field(struct carveup *tb, struct strawberry *field)
     sl *= -1;
     // First string slot has offset 0, others are offset[-slot-2]
     if (--sl) out += tb->offset[--sl];
-    // If TNAME is blank, show ARGS instead
-    if (which==PS_ARGS && !*out)
-      out = tb->str+tb->offset[-2-typos[which = PS_ARGS].slot];
-    if (which==PS_ARGS || which==PS_NAME) {
-      int i, j;
+    if (which==PS_ARGS || which==PS_COMM) {
+      int i;
 
       s = out;
       for (i = 0; (which==PS_ARGS) ? i < slot[SLOT_argv0len] : out[i]; i++)
         if (out[i] == '/') s = out+i+1;
-      i = s - out;
       out = s;
-      if (which != field->which) {
-        j = slot[SLOT_argv0len]-i;
-        if (j > 259) j = 259;
-        memcpy(buf, out+i, j);
-        buf[j] = 0;
-        out = buf;
-      }
     }
     if (which>=PS_COMM && !*out) sprintf(out = buf, "[%s]", tb->str);
 
@@ -616,8 +604,8 @@ static int get_ps(struct dirtree *new)
   } fetch[] = {
     // sources for carveup->offset[] data
     {"fd/", _PS_TTY}, {"wchan", _PS_WCHAN}, {"attr/current", _PS_LABEL},
-    {"exe", _PS_COMMAND|_PS_NAME}, {"cmdline", _PS_CMDLINE|_PS_ARGS|_PS_TNAME},
-    {"", _PS_TNAME}
+    {"exe", _PS_COMMAND|_PS_COMM}, {"cmdline", _PS_CMDLINE|_PS_ARGS|_PS_NAME},
+    {"", _PS_NAME}
   };
   struct carveup *tb = (void *)toybuf;
   long long *slot = tb->slot;
@@ -1189,12 +1177,12 @@ void ps_main(void)
   // Figure out which fields to display
   not_o = "%sTTY,TIME,CMD";
   if (toys.optflags&FLAG_f)
-    sprintf(not_o = toybuf+128, "USER:8=UID,%%sPPID,%s,STIME,TTY,TIME,CMD",
+    sprintf(not_o = toybuf+128, "USER:8=UID,%%sPPID,%s,STIME,TTY,TIME,ARGS=CMD",
       (toys.optflags&FLAG_T) ? "TCNT" : "C");
   else if (toys.optflags&FLAG_l)
     not_o = "F,S,UID,%sPPID,C,PRI,NI,ADDR,SZ,WCHAN,TTY,TIME,CMD";
   else if (CFG_TOYBOX_ON_ANDROID)
-    not_o = "USER,%sPPID,VSIZE,RSS,WCHAN:10,ADDR:10=PC,S,TNAME";
+    not_o = "USER,%sPPID,VSIZE,RSS,WCHAN:10,ADDR:10=PC,S,NAME";
   sprintf(toybuf, not_o, (toys.optflags & FLAG_T) ? "PID,TID," : "PID,");
 
   // Init TT.fields. This only uses toybuf if TT.ps.o is NULL
@@ -1213,7 +1201,6 @@ void ps_main(void)
     struct strawberry *ever;
 
     for (ever = TT.fields; ever; ever = ever->next) {
-      if ((toys.optflags&FLAG_f) && ever->which==PS_CMD) ever->which = PS_ARGS;
       if ((toys.optflags&FLAG_n) && ever->which>=PS_UID
         && ever->which<=PS_RGROUP && (typos[ever->which].slot&64))
           ever->which--;
@@ -1227,7 +1214,7 @@ void ps_main(void)
   if (!(toys.optflags&(FLAG_k|FLAG_M))) TT.show_process = (void *)show_ps;
   TT.match_process = ps_match_process;
   dt = dirtree_read("/proc",
-    ((toys.optflags&FLAG_T) || (TT.bits&(_PS_TID|_PS_TCNT/*|_PS_TNAME*/)))
+    ((toys.optflags&FLAG_T) || (TT.bits&(_PS_TID|_PS_TCNT)))
       ? get_threads : get_ps);
 
   if (toys.optflags&(FLAG_k|FLAG_M)) {

diff --git a/www/roadmap.html b/www/roadmap.html
index 5606731..3accce7 100755 (executable)
--- a/www/roadmap.html
+++ b/www/roadmap.html
@@ -269,11 +269,14 @@ system/core/toolbox/Android.mk</a> the toolbox directory builds the
 following commands:</p>
 
 <blockquote><b>
-dd getevent ioctl log
+dd getevent log
 nandread newfs_msdos
 sendevent start stop top
 </b></blockquote>
 
+<p>The toolbox makefile also builds the BSD grep right now, because toybox
+grep is missing <code>--color</code>.</p>
+
 <h3>Other Android core commands</h3>
 
 <p>Other than the toolbox directory, the currently interesting
@@ -297,7 +300,7 @@ implementing the full commands (fdisk, init, and sudo) come first.</p>
 <p>For reference, combining everything listed above, we get:</p>
 
 <blockquote><b>
-dd getevent init ioctl
+dd getevent init
 log logcat logwrapper nandread
 newfs_msdos reboot run-as
 sendevent start stop top
@@ -312,7 +315,7 @@ for later).</p>
 <p>This means toybox should implement (or finish implementing):</p>
 <blockquote><b>
 <span id=toolbox>
-dd getevent ioctl log logcat logwrapper
+dd getevent log logcat logwrapper
 nandread newfs_msdos sendevent start stop
 </span>
 </b></blockquote>