X-Git-Url: https://git.librecmc.org/?a=blobdiff_plain;f=ps.c;h=4ce43c47f9f0242d55d57fcb79f41c2776f2f7bb;hb=7cf9fed83f6e7bf86eb4cac324b98734739fa861;hp=68213594460fc2e94563406fb4a7f767b7359193;hpb=d537a95fdbc0b4a5f38edea8593b4c085fdd7fcb;p=oweals%2Fbusybox.git diff --git a/ps.c b/ps.c index 682135944..4ce43c47f 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,21 @@ * */ -#include "internal.h" #include +#include #include #include #include #include #include +#include #include +#include "busybox.h" #define BB_DECLARE_EXTERN #define bb_need_help #include "messages.c" -#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,10 +52,6 @@ * 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) */ @@ -97,24 +95,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 - errorMsg("Internal error!\n"); + error_msg("Internal error!"); /* 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!"); tmp = strstr(S, "Gid:"); if (tmp) sscanf(tmp, "Gid:\t%d", &P->rgid); else - errorMsg("Internal error!\n"); + error_msg("Internal error!"); } - extern int ps_main(int argc, char **argv) { proc_t p; @@ -122,11 +119,11 @@ 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 }; + struct winsize win = { 0, 0, 0, 0 }; int terminal_width = TERMINAL_WIDTH; #else #define terminal_width TERMINAL_WIDTH @@ -134,18 +131,9 @@ extern int ps_main(int argc, char **argv) - if (argc > 1 && strcmp(argv[1], dash_dash_help) == 0) { - usage ("ps\n" -#ifndef BB_FEATURE_TRIVIAL_HELP - "\nReport process status\n" - "\nThis version of ps accepts no options.\n" -#endif - ); - } - dir = opendir("/proc"); if (!dir) - fatalError("Can't open /proc\n"); + error_msg_and_die("Can't open /proc"); #ifdef BB_FEATURE_AUTOWIDTH ioctl(fileno(stdout), TIOCGWINSZ, &win); @@ -153,12 +141,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("%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); @@ -179,20 +163,20 @@ extern int ps_main(int argc, char **argv) if (file == NULL) continue; i = 0; - len = fprintf(stdout, "%5d %-8s %-8s %c ", p.pid, uidName, groupName, - p.state); + len = printf("%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"); + printf("[%s]", p.cmd); + putchar('\n'); } closedir(dir); - return(TRUE); + return EXIT_SUCCESS; } @@ -213,37 +197,37 @@ 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 }; + 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"); + 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 ioctl(fileno(stdout), TIOCGWINSZ, &win); @@ -252,16 +236,13 @@ 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("%5s %-8s %-3s %5s %s\n", "PID", "Uid", "Gid", "State", "Command"); for (i=1; i 1) { for( j=0; j<(sizeof(info.command_line)-1) && j < (terminal_width-len); j++) { @@ -280,9 +261,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); } } @@ -291,7 +272,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); }