This is vodz' latest patch. Sorry it took so long...

[oweals/busybox.git] / ps.c

diff --git a/ps.c b/ps.c
index 4ff7a8a58cab7b47137a4f8900f2c0dc76f877d1..7afb0091f67f18e8c9ec53e8463885c6062a0284 100644 (file)
--- a/ps.c
+++ b/ps.c
@@ -28,7 +28,6 @@
  *
  */
 
-#include "busybox.h"
 #include <stdio.h>
 #include <stdlib.h>
 #include <unistd.h>
@@ -38,9 +37,7 @@
 #include <ctype.h>
 #include <string.h>
 #include <sys/ioctl.h>
-#define BB_DECLARE_EXTERN
-#define bb_need_help
-#include "messages.c"
+#include "busybox.h"
 
 static const int TERMINAL_WIDTH = 79;      /* not 80 in case terminal has linefold bug */
 
@@ -52,15 +49,11 @@ static const int TERMINAL_WIDTH = 79;      /* not 80 in case terminal has linefo
  * the one using the /proc virtual filesystem.
  */
 
-#if ! defined BB_FEATURE_USE_PROCFS
-#error Sorry, I depend on the /proc filesystem right now.
-#endif
-
 typedef struct proc_s {
        char
         cmd[16];                                       /* basename of executable file in call to exec(2) */
        int
-        ruid, rgid,                            /* real only (sorry) */
+        ruid,                                          /* real only (sorry) */
         pid,                                           /* process id */
         ppid;                                          /* pid of parent process */
        char
@@ -101,18 +94,13 @@ static void parse_proc_status(char *S, proc_t * P)
        else
                error_msg("Internal error!");
 
-       /* For busybox, ignoring effective, saved, etc */
+       /* For busybox, ignoring effective, saved, etc. */
        tmp = strstr(S, "Uid:");
        if (tmp)
                sscanf(tmp, "Uid:\t%d", &P->ruid);
        else
                error_msg("Internal error!");
 
-       tmp = strstr(S, "Gid:");
-       if (tmp)
-               sscanf(tmp, "Gid:\t%d", &P->rgid);
-       else
-               error_msg("Internal error!");
 
 }
 
@@ -124,7 +112,6 @@ extern int ps_main(int argc, char **argv)
        struct dirent *entry;
        char path[32], sbuf[512];
        char uidName[9];
-       char groupName[9];
        int len, i, c;
 #ifdef BB_FEATURE_AUTOWIDTH
        struct winsize win = { 0, 0, 0, 0 };
@@ -145,7 +132,7 @@ extern int ps_main(int argc, char **argv)
                        terminal_width = win.ws_col - 1;
 #endif
 
-       printf("%5s  %-8s %-3s %5s %s\n", "PID", "Uid", "Gid", "State", "Command");
+       printf("  PID  Uid     Stat Command\n");
        while ((entry = readdir(dir)) != NULL) {
                if (!isdigit(*entry->d_name))
                        continue;
@@ -158,16 +145,13 @@ extern int ps_main(int argc, char **argv)
                my_getpwuid(uidName, p.ruid);
                if (*uidName == '\0')
                        sprintf(uidName, "%d", p.ruid);
-               my_getgrgid(groupName, p.rgid);
-               if (*groupName == '\0')
-                       sprintf(groupName, "%d", p.rgid);
 
                sprintf(path, "/proc/%s/cmdline", entry->d_name);
                file = fopen(path, "r");
                if (file == NULL)
                        continue;
                i = 0;
-               len = printf("%5d %-8s %-8s %c ", p.pid, uidName, groupName, p.state);
+               len = printf("%5d %-8s %c    ", p.pid, uidName, p.state);
                while (((c = getc(file)) != EOF) && (i < (terminal_width-len))) {
                        i++;
                        if (c == '\0')
@@ -202,7 +186,6 @@ extern int ps_main(int argc, char **argv)
        pid_t* pid_array = NULL;
        struct pid_info info;
        char uidName[9];
-       char groupName[9];
 #ifdef BB_FEATURE_AUTOWIDTH
        struct winsize win = { 0, 0, 0, 0 };
        int terminal_width = TERMINAL_WIDTH;
@@ -211,7 +194,7 @@ extern int ps_main(int argc, char **argv)
 #endif
 
        if (argc > 1 && **(argv + 1) == '-') 
-               usage(ps_usage);
+               show_usage();
 
        /* open device */ 
        fd = open(device, O_RDONLY);
@@ -240,7 +223,7 @@ extern int ps_main(int argc, char **argv)
 #endif
 
        /* Print up a ps listing */
-       printf("%5s  %-8s %-3s %5s %s\n", "PID", "Uid", "Gid", "State", "Command");
+       printf("  PID  Uid     Stat Command\n");
 
        for (i=1; i<pid_array[0] ; i++) {
            info.pid = pid_array[i];
@@ -252,11 +235,8 @@ extern int ps_main(int argc, char **argv)
                my_getpwuid(uidName, info.euid);
                if (*uidName == '\0')
                        sprintf(uidName, "%ld", info.euid);
-               my_getgrgid(groupName, info.egid);
-               if (*groupName == '\0')
-                       sprintf(groupName, "%ld", info.egid);
 
-               len = printf("%5d %-8s %-8s %c ", info.pid, uidName, groupName, info.state);
+               len = printf("%5d %-8s %c    ", info.pid, uidName, info.state);
 
                if (strlen(info.command_line) > 1) {
                        for( j=0; j<(sizeof(info.command_line)-1) && j < (terminal_width-len); j++) {