X-Git-Url: https://git.librecmc.org/?a=blobdiff_plain;f=ps.c;h=79910fe34f097ebbe4596465363b192cb591e1f6;hb=46f44d24fcc25a5d6e13e0453485881bdf147e91;hp=8d59700fd8b5c8df525d367e035ff2ed35c89625;hpb=a3e57ca7008cbaf612675b9de3dd18109f8150de;p=oweals%2Fbusybox.git diff --git a/ps.c b/ps.c index 8d59700fd..79910fe34 100644 --- a/ps.c +++ b/ps.c @@ -28,7 +28,7 @@ * */ -#include "internal.h" +#include "busybox.h" #include #include #include @@ -36,6 +36,12 @@ #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_PATCH @@ -91,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; @@ -120,21 +125,17 @@ extern int ps_main(int argc, char **argv) char groupName[10] = ""; int len, i, c; #ifdef BB_FEATURE_AUTOWIDTH - struct winsize win = { 0, 0 }; - int terminal_width = 0; + 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 && strcmp(argv[1], "--help") == 0) { - 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); @@ -163,25 +164,26 @@ extern int ps_main(int argc, char **argv) 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)); + continue; i = 0; + 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, "\n"); } closedir(dir); - exit(TRUE); + return EXIT_SUCCESS; } @@ -192,7 +194,7 @@ extern int ps_main(int argc, char **argv) * 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) @@ -205,34 +207,34 @@ extern int ps_main(int argc, char **argv) char uidName[10] = ""; char groupName[10] = ""; #ifdef BB_FEATURE_AUTOWIDTH - struct winsize win = { 0, 0 }; - int terminal_width = 0; + 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"); + 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); @@ -250,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); @@ -280,7 +282,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)); + error_msg_and_die("close failed for `%s': %s\n", device, strerror (errno)); exit (0); }