X-Git-Url: https://git.librecmc.org/?a=blobdiff_plain;f=ps.c;h=9e96a540288cf294b476d4dda0244b5f22eeddeb;hb=74bcd1642597109661543d25304c551a2e39acbc;hp=79910fe34f097ebbe4596465363b192cb591e1f6;hpb=f57c944e09417edcbcd69f2b01b937cadef39db2;p=oweals%2Fbusybox.git diff --git a/ps.c b/ps.c index 79910fe34..9e96a5402 100644 --- a/ps.c +++ b/ps.c @@ -2,8 +2,8 @@ /* * Mini ps implementation(s) for busybox * - * Copyright (C) 1999,2000 by Lineo, inc. Written by Erik Andersen - * , + * Copyright (C) 1999,2000,2001 by Lineo, inc. + * Written by Erik Andersen , * * * This contains _two_ implementations of ps for Linux. One uses the @@ -28,19 +28,19 @@ * */ -#include "busybox.h" #include +#include #include #include #include #include #include +#include +#include #include -#define BB_DECLARE_EXTERN -#define bb_need_help -#include "messages.c" +#include "busybox.h" -#define TERMINAL_WIDTH 79 /* not 80 in case terminal has linefold bug */ +static const int TERMINAL_WIDTH = 79; /* not 80 in case terminal has linefold bug */ @@ -50,15 +50,11 @@ * 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 @@ -97,20 +93,15 @@ 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 - error_msg("Internal error!\n"); + 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!\n"); + error_msg("Internal error!"); - tmp = strstr(S, "Gid:"); - if (tmp) - sscanf(tmp, "Gid:\t%d", &P->rgid); - else - error_msg("Internal error!\n"); } @@ -121,8 +112,7 @@ 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]; int len, i, c; #ifdef BB_FEATURE_AUTOWIDTH struct winsize win = { 0, 0, 0, 0 }; @@ -135,7 +125,7 @@ extern int ps_main(int argc, char **argv) dir = opendir("/proc"); if (!dir) - error_msg_and_die("Can't open /proc\n"); + error_msg_and_die("Can't open /proc"); #ifdef BB_FEATURE_AUTOWIDTH ioctl(fileno(stdout), TIOCGWINSZ, &win); @@ -143,12 +133,8 @@ extern int ps_main(int argc, char **argv) terminal_width = win.ws_col - 1; #endif - fprintf(stdout, "%5s %-8s %-3s %5s %s\n", "PID", "Uid", "Gid", - "State", "Command"); + printf(" PID Uid Stat Command\n"); 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); @@ -160,17 +146,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 = fprintf(stdout, "%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') @@ -179,8 +161,8 @@ extern int ps_main(int argc, char **argv) } fclose(file); if (i == 0) - fprintf(stdout, "[%s]", p.cmd); - fprintf(stdout, "\n"); + printf("[%s]", p.cmd); + putchar('\n'); } closedir(dir); return EXIT_SUCCESS; @@ -204,8 +186,7 @@ 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]; #ifdef BB_FEATURE_AUTOWIDTH struct winsize win = { 0, 0, 0, 0 }; int terminal_width = TERMINAL_WIDTH; @@ -214,16 +195,16 @@ 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); if (fd < 0) - error_msg_and_die( "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) - error_msg_and_die( "\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 +215,7 @@ extern int ps_main(int argc, char **argv) /* Now grab the pid list */ if (ioctl (fd, DEVPS_GET_PID_LIST, pid_array)<0) - error_msg_and_die("\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); @@ -243,26 +224,20 @@ extern int ps_main(int argc, char **argv) #endif /* Print up a ps listing */ - fprintf(stdout, "%5s %-8s %-3s %5s %s\n", "PID", "Uid", "Gid", - "State", "Command"); + printf(" PID Uid Stat Command\n"); for (i=1; i 1) { for( j=0; j<(sizeof(info.command_line)-1) && j < (terminal_width-len); j++) { @@ -271,9 +246,9 @@ extern int ps_main(int argc, char **argv) } } *(info.command_line+j) = '\0'; - fprintf(stdout, "%s\n", info.command_line); + puts(info.command_line); } else { - fprintf(stdout, "[%s]\n", info.name); + printf("[%s]\n", info.name); } } @@ -282,7 +257,7 @@ extern int ps_main(int argc, char **argv) /* close device */ if (close (fd) != 0) - error_msg_and_die("close failed for `%s': %s\n", device, strerror (errno)); + perror_msg_and_die("close failed for `%s'", device); exit (0); }