Ok, this is a pretty major update to sh.c. I renamed all the variables and

[oweals/busybox.git] / ps.c

diff --git a/ps.c b/ps.c
index a326bc546dc83d678931bdc2734aff1d074b8624..2b41a495f8b8fac8e14261ff170281b9e72a0435 100644 (file)
--- a/ps.c
+++ b/ps.c
@@ -28,7 +28,7 @@
  *
  */
 
-#include "internal.h"
+#include "busybox.h"
 #include <stdio.h>
 #include <unistd.h>
 #include <dirent.h>
@@ -97,20 +97,20 @@ static void parse_proc_status(char *S, proc_t * P)
        if (tmp)
                sscanf(tmp, "Pid:\t%d\n" "PPid:\t%d\n", &P->pid, &P->ppid);
        else
-               errorMsg("Internal error!\n");
+               error_msg("Internal error!\n");
 
        /* For busybox, ignoring effective, saved, etc */
        tmp = strstr(S, "Uid:");
        if (tmp)
                sscanf(tmp, "Uid:\t%d", &P->ruid);
        else
-               errorMsg("Internal error!\n");
+               error_msg("Internal error!\n");
 
        tmp = strstr(S, "Gid:");
        if (tmp)
                sscanf(tmp, "Gid:\t%d", &P->rgid);
        else
-               errorMsg("Internal error!\n");
+               error_msg("Internal error!\n");
 
 }
 
@@ -121,8 +121,8 @@ extern int ps_main(int argc, char **argv)
        FILE *file;
        struct dirent *entry;
        char path[32], sbuf[512];
-       char uidName[10] = "";
-       char groupName[10] = "";
+       char uidName[9];
+       char groupName[9];
        int len, i, c;
 #ifdef BB_FEATURE_AUTOWIDTH
        struct winsize win = { 0, 0, 0, 0 };
@@ -135,7 +135,7 @@ extern int ps_main(int argc, char **argv)
 
        dir = opendir("/proc");
        if (!dir)
-               fatalError("Can't open /proc\n");
+               error_msg_and_die("Can't open /proc\n");
 
 #ifdef BB_FEATURE_AUTOWIDTH
                ioctl(fileno(stdout), TIOCGWINSZ, &win);
@@ -146,9 +146,6 @@ extern int ps_main(int argc, char **argv)
        fprintf(stdout, "%5s  %-8s %-3s %5s %s\n", "PID", "Uid", "Gid",
                        "State", "Command");
        while ((entry = readdir(dir)) != NULL) {
-               uidName[0] = '\0';
-               groupName[0] = '\0';
-
                if (!isdigit(*entry->d_name))
                        continue;
                sprintf(path, "/proc/%s/status", entry->d_name);
@@ -183,7 +180,7 @@ extern int ps_main(int argc, char **argv)
                fprintf(stdout, "\n");
        }
        closedir(dir);
-       return(TRUE);
+       return EXIT_SUCCESS;
 }
 
 
@@ -204,8 +201,8 @@ extern int ps_main(int argc, char **argv)
        pid_t num_pids;
        pid_t* pid_array = NULL;
        struct pid_info info;
-       char uidName[10] = "";
-       char groupName[10] = "";
+       char uidName[9];
+       char groupName[9];
 #ifdef BB_FEATURE_AUTOWIDTH
        struct winsize win = { 0, 0, 0, 0 };
        int terminal_width = TERMINAL_WIDTH;
@@ -219,11 +216,11 @@ extern int ps_main(int argc, char **argv)
        /* open device */ 
        fd = open(device, O_RDONLY);
        if (fd < 0) 
-               fatalError( "open failed for `%s': %s\n", device, strerror (errno));
+               perror_msg_and_die( "open failed for `%s'", device);
 
        /* Find out how many processes there are */
        if (ioctl (fd, DEVPS_GET_NUM_PIDS, &num_pids)<0) 
-               fatalError( "\nDEVPS_GET_PID_LIST: %s\n", strerror (errno));
+               perror_msg_and_die( "\nDEVPS_GET_PID_LIST");
        
        /* Allocate some memory -- grab a few extras just in case 
         * some new processes start up while we wait. The kernel will
@@ -234,7 +231,7 @@ extern int ps_main(int argc, char **argv)
 
        /* Now grab the pid list */
        if (ioctl (fd, DEVPS_GET_PID_LIST, pid_array)<0) 
-               fatalError("\nDEVPS_GET_PID_LIST: %s\n", strerror (errno));
+               perror_msg_and_die("\nDEVPS_GET_PID_LIST");
 
 #ifdef BB_FEATURE_AUTOWIDTH
                ioctl(fileno(stdout), TIOCGWINSZ, &win);
@@ -247,12 +244,10 @@ extern int ps_main(int argc, char **argv)
                        "State", "Command");
 
        for (i=1; i<pid_array[0] ; i++) {
-               uidName[0] = '\0';
-               groupName[0] = '\0';
            info.pid = pid_array[i];
 
            if (ioctl (fd, DEVPS_GET_PID_INFO, &info)<0)
-                       fatalError("\nDEVPS_GET_PID_INFO: %s\n", strerror (errno));
+                       perror_msg_and_die("\nDEVPS_GET_PID_INFO");
            
                /* Make some adjustments as needed */
                my_getpwuid(uidName, info.euid);
@@ -282,7 +277,7 @@ extern int ps_main(int argc, char **argv)
 
        /* close device */
        if (close (fd) != 0) 
-               fatalError("close failed for `%s': %s\n", device, strerror (errno));
+               perror_msg_and_die("close failed for `%s'", device);
  
        exit (0);
 }