shrink F to one column

diff --git a/ps/output.c b/ps/output.c
index ad416724bfae531811c4008f6b92fe5237a28bde..bd9bc89a4333986863b35d2a449fb524fa5a42af 100644 (file)
--- a/ps/output.c
+++ b/ps/output.c
@@ -584,8 +584,9 @@ static int pr_s(void){
 }
 
 static int pr_flag(void){
-    /* Unix98 requires octal -- good thing Linux hex looks octal! */
-    return snprintf(outbuf, COLWID, "%03lx", (pp->flags)&0x777);
+    /* Unix98 requires octal flags */
+    /* this user-hostile and volatile junk gets 1 character */
+    return snprintf(outbuf, COLWID, "%o", (pp->flags>>6)&0x7);
 }
 
 static int pr_euid(void){
@@ -999,11 +1000,11 @@ static const format_struct format_array[] = {
 {"etime",     "ELAPSED", pr_etime,    sr_nop,    11,   0,    U98, RIGHT}, /* was 7 wide */
 {"euid",      "EUID",    pr_euid,     sr_euid,    5,   0,    LNX, RIGHT},
 {"euser",     "EUSER",   pr_euser,    sr_euser,   8,   0,    LNX, USER},
-{"f",         "F",       pr_flag,     sr_nop,     3,   0,    XXX, RIGHT}, /*flags*/
+{"f",         "F",       pr_flag,     sr_nop,     1,   0,    XXX, RIGHT}, /*flags*/
 {"fgid",      "FGID",    pr_fgid,     sr_fgid,    5,   0,    LNX, RIGHT},
 {"fgroup",    "FGROUP",  pr_fgroup,   sr_fgroup,  8,   0,    LNX, USER},
-{"flag",      "F",       pr_flag,     sr_flags,   3,   0,    DEC, RIGHT},
-{"flags",     "F",       pr_flag,     sr_flags,   3,   0,    BSD, RIGHT}, /*f*/ /* was FLAGS, 8 wide */
+{"flag",      "F",       pr_flag,     sr_flags,   1,   0,    DEC, RIGHT},
+{"flags",     "F",       pr_flag,     sr_flags,   1,   0,    BSD, RIGHT}, /*f*/ /* was FLAGS, 8 wide */
 {"fname",     "COMMAND", pr_fname,    sr_nop,     8,   0,    SUN, LEFT},
 {"fsgid",     "FSGID",   pr_fgid,     sr_fgid,    5,   0,    LNX, RIGHT},
 {"fsgroup",   "FSGROUP", pr_fgroup,   sr_fgroup,  8,   0,    LNX, USER},

diff --git a/ps/ps.1 b/ps/ps.1
index 2206872dfe45541ec31b8f7a8a5a64214fd369e0..1cae9c84f5f9c29c4a073d3680c5affef6b5d88b 100644 (file)
--- a/ps/ps.1
+++ b/ps/ps.1
@@ -224,15 +224,9 @@ will be destroyed by init(8) if the parent process exits.
 
 PROCESS FLAGS
 
-ALIGNWARN    001    print alignment warning msgs
-STARTING     002    being created
-EXITING      004    getting shut down
-PTRACED      010    set if ptrace (0) has been called
-TRACESYS     020    tracing system calls
-FORKNOEXEC   040    forked but didn't exec
-SUPERPRIV    100    used super-user privileges
-DUMPCORE     200    dumped core
-SIGNALED     400    killed by a signal
+FORKNOEXEC   1    forked but didn't exec
+SUPERPRIV    2    used super-user privileges
+DUMPCORE     4    dumped core
 
 
 PROCESS STATE CODES