X-Git-Url: https://git.librecmc.org/?a=blobdiff_plain;f=ps.c;h=79910fe34f097ebbe4596465363b192cb591e1f6;hb=46f44d24fcc25a5d6e13e0453485881bdf147e91;hp=b0933ab514347d4c66dbb0b1bff2858e102abde6;hpb=246cc6dddd3df2164e8a925ebd8e9a7bba379253;p=oweals%2Fbusybox.git diff --git a/ps.c b/ps.c index b0933ab51..79910fe34 100644 --- a/ps.c +++ b/ps.c @@ -2,7 +2,7 @@ /* * Mini ps implementation(s) for busybox * - * Copyright (C) 1999 by Lineo, inc. Written by Erik Andersen + * Copyright (C) 1999,2000 by Lineo, inc. Written by Erik Andersen * , * * @@ -28,15 +28,23 @@ * */ -#include "internal.h" +#include "busybox.h" #include #include #include #include #include #include +#include +#define BB_DECLARE_EXTERN +#define bb_need_help +#include "messages.c" + +#define TERMINAL_WIDTH 79 /* not 80 in case terminal has linefold bug */ + -#if ! defined BB_FEATURE_USE_DEVPS_N_DEVMTAB + +#if ! defined BB_FEATURE_USE_DEVPS_PATCH /* The following is the first ps implementation -- * the one using the /proc virtual filesystem. @@ -89,24 +97,23 @@ 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 - fprintf(stderr, "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 - fprintf(stderr, "Internal error!\n"); + error_msg("Internal error!\n"); tmp = strstr(S, "Gid:"); if (tmp) sscanf(tmp, "Gid:\t%d", &P->rgid); else - fprintf(stderr, "Internal error!\n"); + error_msg("Internal error!\n"); } - extern int ps_main(int argc, char **argv) { proc_t p; @@ -116,14 +123,25 @@ extern int ps_main(int argc, char **argv) char path[32], sbuf[512]; char uidName[10] = ""; char groupName[10] = ""; - int i, c; + int len, i, c; +#ifdef BB_FEATURE_AUTOWIDTH + struct winsize win = { 0, 0, 0, 0 }; + int terminal_width = TERMINAL_WIDTH; +#else +#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"); + error_msg_and_die("Can't open /proc\n"); + +#ifdef BB_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"); @@ -146,71 +164,83 @@ extern int ps_main(int argc, char **argv) if (*groupName == '\0') sprintf(groupName, "%d", p.rgid); - 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)); + continue; i = 0; - while (((c = getc(file)) != EOF) && (i < 53)) { + len = fprintf(stdout, "%5d %-8s %-8s %c ", p.pid, uidName, groupName, + p.state); + while (((c = getc(file)) != EOF) && (i < (terminal_width-len))) { i++; if (c == '\0') c = ' '; putc(c, stdout); } + fclose(file); if (i == 0) - fprintf(stdout, "%s", p.cmd); + fprintf(stdout, "[%s]", p.cmd); fprintf(stdout, "\n"); } closedir(dir); - exit(TRUE); + return EXIT_SUCCESS; } -#else /* BB_FEATURE_USE_DEVPS_N_DEVMTAB */ +#else /* BB_FEATURE_USE_DEVPS_PATCH */ /* The following is the second ps implementation -- * this one uses the nifty new devps kernel device. */ -#include -#include +#include /* For Erik's nifty devps device driver */ extern int ps_main(int argc, char **argv) { char device[] = "/dev/ps"; - int i, fd; + int i, j, len, fd; 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, 0, 0 }; + int terminal_width = TERMINAL_WIDTH; +#else +#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"); + usage(ps_usage); /* open device */ fd = open(device, O_RDONLY); if (fd < 0) - fatalError( "open failed for `%s': %s\n", device, strerror (errno)); + error_msg_and_die( "open failed for `%s': %s\n", device, strerror (errno)); /* 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)); + error_msg_and_die( "\nDEVPS_GET_PID_LIST: %s\n", strerror (errno)); /* 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)); + error_msg_and_die("\nDEVPS_GET_PID_LIST: %s\n", strerror (errno)); + +#ifdef BB_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", @@ -222,7 +252,7 @@ extern int ps_main(int argc, char **argv) info.pid = pid_array[i]; if (ioctl (fd, DEVPS_GET_PID_INFO, &info)<0) - fatalError("\nDEVPS_GET_PID_INFO: %s\n", strerror (errno)); + error_msg_and_die("\nDEVPS_GET_PID_INFO: %s\n", strerror (errno)); /* Make some adjustments as needed */ my_getpwuid(uidName, info.euid); @@ -232,13 +262,19 @@ extern int ps_main(int argc, char **argv) if (*groupName == '\0') sprintf(groupName, "%ld", info.egid); - fprintf(stdout, "%5d %-8s %-8s %c ", info.pid, uidName, groupName, info.state); + len = fprintf(stdout, "%5d %-8s %-8s %c ", info.pid, uidName, groupName, info.state); - if (strlen(info.command_line) > 1) + if (strlen(info.command_line) > 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') { + *(info.command_line+j) = ' '; + } + } + *(info.command_line+j) = '\0'; fprintf(stdout, "%s\n", info.command_line); - else + } else { fprintf(stdout, "[%s]\n", info.name); - + } } /* Free memory */ @@ -246,10 +282,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)); + error_msg_and_die("close failed for `%s': %s\n", device, strerror (errno)); exit (0); } -#endif /* BB_FEATURE_USE_DEVPS_N_DEVMTAB */ +#endif /* BB_FEATURE_USE_DEVPS_PATCH */