emo/busybox
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix ps so it doesn't waste space showing group, as it is pretty much

Browse Source 
meaningless anyways.
 -Erik
This commit is contained in:
Eric Andersen 2001-06-26 22:55:45 +00:00
parent 91a6318d55
commit d98337a7b4
2 changed files with 10 additions and 36 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
procps/ps.c
View File

@ -53,7 +53,7 @@ typedef struct proc_s {
char char
cmd[16]; /* basename of executable file in call to exec(2) */ cmd[16]; /* basename of executable file in call to exec(2) */
int int
ruid, rgid, /* real only (sorry) */ ruid, /* real only (sorry) */
pid, /* process id */ pid, /* process id */
ppid; /* pid of parent process */ ppid; /* pid of parent process */
char char
@ -101,11 +101,6 @@ static void parse_proc_status(char *S, proc_t * P)
else else
error_msg("Internal error!"); error_msg("Internal error!");
tmp = strstr(S, "Gid:");
if (tmp)
sscanf(tmp, "Gid:\t%d", &P->rgid);
else
error_msg("Internal error!");
} }
@ -117,7 +112,6 @@ extern int ps_main(int argc, char **argv)
struct dirent *entry; struct dirent *entry;
char path[32], sbuf[512]; char path[32], sbuf[512];
char uidName[9]; char uidName[9];
char groupName[9];
int len, i, c; int len, i, c;
#ifdef BB_FEATURE_AUTOWIDTH #ifdef BB_FEATURE_AUTOWIDTH
struct winsize win = { 0, 0, 0, 0 }; struct winsize win = { 0, 0, 0, 0 };
@ -138,7 +132,7 @@ extern int ps_main(int argc, char **argv)
terminal_width = win.ws_col - 1; terminal_width = win.ws_col - 1;
#endif #endif
printf("%5s %-8s %-3s %5s %s\n", "PID", "Uid", "Gid", "State", "Command"); printf("%5s %-8s %5s %s\n", "PID", "Uid", "State", "Command");
while ((entry = readdir(dir)) != NULL) { while ((entry = readdir(dir)) != NULL) {
if (!isdigit(*entry->d_name)) if (!isdigit(*entry->d_name))
continue; continue;
@ -151,16 +145,13 @@ extern int ps_main(int argc, char **argv)
my_getpwuid(uidName, p.ruid); my_getpwuid(uidName, p.ruid);
if (*uidName == '\0') if (*uidName == '\0')
sprintf(uidName, "%d", p.ruid); 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); sprintf(path, "/proc/%s/cmdline", entry->d_name);
file = fopen(path, "r"); file = fopen(path, "r");
if (file == NULL) if (file == NULL)
continue; continue;
i = 0; i = 0;
len = printf("%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))) { while (((c = getc(file)) != EOF) && (i < (terminal_width-len))) {
i++; i++;
if (c == '\0') if (c == '\0')
@ -195,7 +186,6 @@ extern int ps_main(int argc, char **argv)
pid_t* pid_array = NULL; pid_t* pid_array = NULL;
struct pid_info info; struct pid_info info;
char uidName[9]; char uidName[9];
char groupName[9];
#ifdef BB_FEATURE_AUTOWIDTH #ifdef BB_FEATURE_AUTOWIDTH
struct winsize win = { 0, 0, 0, 0 }; struct winsize win = { 0, 0, 0, 0 };
int terminal_width = TERMINAL_WIDTH; int terminal_width = TERMINAL_WIDTH;
@ -233,7 +223,7 @@ extern int ps_main(int argc, char **argv)
#endif #endif
/* Print up a ps listing */ /* Print up a ps listing */
printf("%5s %-8s %-3s %5s %s\n", "PID", "Uid", "Gid", "State", "Command"); printf("%5s %-8s %5s %s\n", "PID", "Uid", "State", "Command");
for (i=1; i<pid_array[0] ; i++) { for (i=1; i<pid_array[0] ; i++) {
info.pid = pid_array[i]; info.pid = pid_array[i];
@ -245,11 +235,8 @@ extern int ps_main(int argc, char **argv)
my_getpwuid(uidName, info.euid); my_getpwuid(uidName, info.euid);
if (*uidName == '\0') if (*uidName == '\0')
sprintf(uidName, "%ld", info.euid); sprintf(uidName, "%ld", info.euid);
my_getgrgid(groupName, info.egid);
if (*groupName == '\0')
sprintf(groupName, "%ld", info.egid);
len = printf("%5d %-8s %-8s %c ", info.pid, uidName, groupName, info.state); len = printf("%5d %-8s %c ", info.pid, uidName, 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++) { for( j=0; j<(sizeof(info.command_line)-1) && j < (terminal_width-len); j++) {

23
ps.c
View File

@ -53,7 +53,7 @@ typedef struct proc_s {
char char
cmd[16]; /* basename of executable file in call to exec(2) */ cmd[16]; /* basename of executable file in call to exec(2) */
int int
ruid, rgid, /* real only (sorry) */ ruid, /* real only (sorry) */
pid, /* process id */ pid, /* process id */
ppid; /* pid of parent process */ ppid; /* pid of parent process */
char char
@ -101,11 +101,6 @@ static void parse_proc_status(char *S, proc_t * P)
else else
error_msg("Internal error!"); error_msg("Internal error!");
tmp = strstr(S, "Gid:");
if (tmp)
sscanf(tmp, "Gid:\t%d", &P->rgid);
else
error_msg("Internal error!");
} }
@ -117,7 +112,6 @@ extern int ps_main(int argc, char **argv)
struct dirent *entry; struct dirent *entry;
char path[32], sbuf[512]; char path[32], sbuf[512];
char uidName[9]; char uidName[9];
char groupName[9];
int len, i, c; int len, i, c;
#ifdef BB_FEATURE_AUTOWIDTH #ifdef BB_FEATURE_AUTOWIDTH
struct winsize win = { 0, 0, 0, 0 }; struct winsize win = { 0, 0, 0, 0 };
@ -138,7 +132,7 @@ extern int ps_main(int argc, char **argv)
terminal_width = win.ws_col - 1; terminal_width = win.ws_col - 1;
#endif #endif
printf("%5s %-8s %-3s %5s %s\n", "PID", "Uid", "Gid", "State", "Command"); printf("%5s %-8s %5s %s\n", "PID", "Uid", "State", "Command");
while ((entry = readdir(dir)) != NULL) { while ((entry = readdir(dir)) != NULL) {
if (!isdigit(*entry->d_name)) if (!isdigit(*entry->d_name))
continue; continue;
@ -151,16 +145,13 @@ extern int ps_main(int argc, char **argv)
my_getpwuid(uidName, p.ruid); my_getpwuid(uidName, p.ruid);
if (*uidName == '\0') if (*uidName == '\0')
sprintf(uidName, "%d", p.ruid); 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); sprintf(path, "/proc/%s/cmdline", entry->d_name);
file = fopen(path, "r"); file = fopen(path, "r");
if (file == NULL) if (file == NULL)
continue; continue;
i = 0; i = 0;
len = printf("%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))) { while (((c = getc(file)) != EOF) && (i < (terminal_width-len))) {
i++; i++;
if (c == '\0') if (c == '\0')
@ -195,7 +186,6 @@ extern int ps_main(int argc, char **argv)
pid_t* pid_array = NULL; pid_t* pid_array = NULL;
struct pid_info info; struct pid_info info;
char uidName[9]; char uidName[9];
char groupName[9];
#ifdef BB_FEATURE_AUTOWIDTH #ifdef BB_FEATURE_AUTOWIDTH
struct winsize win = { 0, 0, 0, 0 }; struct winsize win = { 0, 0, 0, 0 };
int terminal_width = TERMINAL_WIDTH; int terminal_width = TERMINAL_WIDTH;
@ -233,7 +223,7 @@ extern int ps_main(int argc, char **argv)
#endif #endif
/* Print up a ps listing */ /* Print up a ps listing */
printf("%5s %-8s %-3s %5s %s\n", "PID", "Uid", "Gid", "State", "Command"); printf("%5s %-8s %5s %s\n", "PID", "Uid", "State", "Command");
for (i=1; i<pid_array[0] ; i++) { for (i=1; i<pid_array[0] ; i++) {
info.pid = pid_array[i]; info.pid = pid_array[i];
@ -245,11 +235,8 @@ extern int ps_main(int argc, char **argv)
my_getpwuid(uidName, info.euid); my_getpwuid(uidName, info.euid);
if (*uidName == '\0') if (*uidName == '\0')
sprintf(uidName, "%ld", info.euid); sprintf(uidName, "%ld", info.euid);
my_getgrgid(groupName, info.egid);
if (*groupName == '\0')
sprintf(groupName, "%ld", info.egid);
len = printf("%5d %-8s %-8s %c ", info.pid, uidName, groupName, info.state); len = printf("%5d %-8s %c ", info.pid, uidName, 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++) { for( j=0; j<(sizeof(info.command_line)-1) && j < (terminal_width-len); j++) {