X-Git-Url: https://git.librecmc.org/?a=blobdiff_plain;f=procps%2Fps.c;h=cf2f2b0c44c253fc03d3c86db569da65efe0d291;hb=44608e9693b03661fbab5e27650bb040c6871d11;hp=b9ff5bd0bc1ce5db29091e306256241ca159429b;hpb=2ac2fae728cca8a535b29bdd2fa6899e6f4992f2;p=oweals%2Fbusybox.git diff --git a/procps/ps.c b/procps/ps.c index b9ff5bd0b..cf2f2b0c4 100644 --- a/procps/ps.c +++ b/procps/ps.c @@ -2,15 +2,8 @@ /* * Mini ps implementation(s) for busybox * - * Copyright (C) 1999 by Lineo, inc. Written by Erik Andersen - * , - * - * - * This contains _two_ implementations of ps for Linux. One uses the - * traditional /proc virtual filesystem, and the other use the devps kernel - * driver (written by Erik Andersen to avoid using /proc thereby saving 100k+). - * - * + * Copyright (C) 1999,2000 by Lineo, inc. and Erik Andersen + * Copyright (C) 1999,2000,2001 by Erik Andersen * * This program is free software; you can redistribute it and/or modify it * under the terms of the GNU General Public License as published by the Free @@ -25,173 +18,88 @@ * You should have received a copy of the GNU General Public License along with * this program; if not, write to the Free Software Foundation, Inc., 59 Temple * Place, Suite 330, Boston, MA 02111-1307 USA - * */ -#include "internal.h" +/* + * This contains _two_ implementations of ps for Linux. One uses the + * traditional /proc virtual filesystem, and the other use the devps kernel + * driver (written by Erik Andersen to avoid using /proc thereby saving 100k+). + */ + #include +#include #include #include #include #include #include +#include +#include #include +#include "busybox.h" +static const int TERMINAL_WIDTH = 79; /* not 80 in case terminal has linefold bug */ -#if ! defined BB_FEATURE_USE_DEVPS_N_DEVMTAB - -/* The following is the first ps implementation -- - * 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) */ - pid, /* process id */ - ppid; /* pid of parent process */ - char - state; /* single-char code for process state (S=sleeping) */ -} proc_t; - - - -static int file2str(char *filename, char *ret, int cap) -{ - int fd, num_read; - - if ((fd = open(filename, O_RDONLY, 0)) == -1) - return -1; - if ((num_read = read(fd, ret, cap - 1)) <= 0) - return -1; - ret[num_read] = 0; - close(fd); - return num_read; -} - - -static void parse_proc_status(char *S, proc_t * P) -{ - char *tmp; - - memset(P->cmd, 0, sizeof P->cmd); - sscanf(S, "Name:\t%15c", P->cmd); - tmp = strchr(P->cmd, '\n'); - if (tmp) - *tmp = '\0'; - tmp = strstr(S, "State"); - sscanf(tmp, "State:\t%c", &P->state); - - tmp = strstr(S, "Pid:"); - if (tmp) - sscanf(tmp, "Pid:\t%d\n" "PPid:\t%d\n", &P->pid, &P->ppid); - else - fprintf(stderr, "Internal error!\n"); - - /* For busybox, ignoring effective, saved, etc */ - tmp = strstr(S, "Uid:"); - if (tmp) - sscanf(tmp, "Uid:\t%d", &P->ruid); - else - fprintf(stderr, "Internal error!\n"); - - tmp = strstr(S, "Gid:"); - if (tmp) - sscanf(tmp, "Gid:\t%d", &P->rgid); - else - fprintf(stderr, "Internal error!\n"); -} +#if ! defined CONFIG_FEATURE_USE_DEVPS_PATCH extern int ps_main(int argc, char **argv) { - proc_t p; - DIR *dir; - FILE *file; - struct dirent *entry; - char path[32], sbuf[512]; - char uidName[10] = ""; - char groupName[10] = ""; - int len, i, c; -#ifdef BB_FEATURE_AUTOWIDTH - struct winsize win = { 0, 0 }; - int terminal_width = 0; + procps_status_t * p; + int i, len; +#ifdef CONFIG_FEATURE_AUTOWIDTH + struct winsize win = { 0, 0, 0, 0 }; + int terminal_width = TERMINAL_WIDTH; #else -#define terminal_width 79 +#define terminal_width TERMINAL_WIDTH #endif - - if (argc > 1 && **(argv + 1) == '-') - usage ("ps\n\nReport process status\n\nThis version of ps accepts no options.\n"); - - dir = opendir("/proc"); - if (!dir) - fatalError("Can't open /proc"); - -#ifdef BB_FEATURE_AUTOWIDTH +#ifdef CONFIG_FEATURE_AUTOWIDTH ioctl(fileno(stdout), TIOCGWINSZ, &win); if (win.ws_col > 0) terminal_width = win.ws_col - 1; #endif - 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); - if ((file2str(path, sbuf, sizeof sbuf)) != -1) { - parse_proc_status(sbuf, &p); - } + printf(" PID Uid VmSize Stat Command\n"); + while ((p = procps_scan(1)) != 0) { + char *namecmd = p->cmd; - /* Make some adjustments as needed */ - 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); - - len = fprintf(stdout, "%5d %-8s %-8s %c ", p.pid, uidName, groupName, - p.state); - sprintf(path, "/proc/%s/cmdline", entry->d_name); - file = fopen(path, "r"); - if (file == NULL) - fatalError("Can't open %s: %s\n", path, strerror(errno)); + if(p->rss == 0) + len = printf("%5d %-8s %s ", p->pid, p->user, p->state); + else + len = printf("%5d %-8s %6ld %s ", p->pid, p->user, p->rss, p->state); + i = terminal_width-len; + + if(namecmd != 0 && namecmd[0] != 0) { + if(i < 0) i = 0; - while (((c = getc(file)) != EOF) && (i < (terminal_width-len))) { - i++; - if (c == '\0') - c = ' '; - putc(c, stdout); + if(strlen(namecmd) > i) + namecmd[i] = 0; + printf("%s\n", namecmd); + } else { + namecmd = p->short_cmd; + if(i < 2) + i = 2; + if(strlen(namecmd) > (i-2)) + namecmd[i-2] = 0; + printf("[%s]\n", namecmd); } - if (i == 0) - fprintf(stdout, "[%s]", p.cmd); - fprintf(stdout, "\n"); + free(p->cmd); } - closedir(dir); - exit(TRUE); + return EXIT_SUCCESS; } -#else /* BB_FEATURE_USE_DEVPS_N_DEVMTAB */ +#else /* CONFIG_FEATURE_USE_DEVPS_PATCH */ /* The following is the second ps implementation -- * this one uses the nifty new devps kernel device. */ -#include +#include /* For Erik's nifty devps device driver */ extern int ps_main(int argc, char **argv) @@ -201,66 +109,59 @@ 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] = ""; -#ifdef BB_FEATURE_AUTOWIDTH - struct winsize win = { 0, 0 }; - int terminal_width = 0; + char uidName[9]; +#ifdef CONFIG_FEATURE_AUTOWIDTH + struct winsize win = { 0, 0, 0, 0 }; + int terminal_width = TERMINAL_WIDTH; #else -#define terminal_width 79 +#define terminal_width TERMINAL_WIDTH #endif if (argc > 1 && **(argv + 1) == '-') - usage("ps-devps\n\nReport process status\n\nThis version of ps accepts no options.\n\n"); + show_usage(); /* 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 * just ignore any extras if we give it too many, and will trunc. * the list if we give it too few. */ - pid_array = (pid_t*) calloc( num_pids+10, sizeof(pid_t)); + pid_array = (pid_t*) xcalloc( num_pids+10, sizeof(pid_t)); pid_array[0] = num_pids+10; /* 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 +#ifdef CONFIG_FEATURE_AUTOWIDTH ioctl(fileno(stdout), TIOCGWINSZ, &win); if (win.ws_col > 0) terminal_width = win.ws_col - 1; #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++) { if (*(info.command_line+j) == '\0' && *(info.command_line+j+1) != '\0') { @@ -268,9 +169,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); } } @@ -279,10 +180,10 @@ 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); } -#endif /* BB_FEATURE_USE_DEVPS_N_DEVMTAB */ +#endif /* CONFIG_FEATURE_USE_DEVPS_PATCH */