projects
/
oweals
/
busybox.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
copy_file_chunk uses streams now.
[oweals/busybox.git]
/
ps.c
diff --git
a/ps.c
b/ps.c
index df321612a57924f5f6f95620c4e02c8a2acca820..4ce43c47f9f0242d55d57fcb79f41c2776f2f7bb 100644
(file)
--- a/
ps.c
+++ b/
ps.c
@@
-2,8
+2,8
@@
/*
* Mini ps implementation(s) for busybox
*
/*
* Mini ps implementation(s) for busybox
*
- * Copyright (C) 1999,2000
by Lineo, inc. Written by Erik Andersen
- * <andersen@lineo.com>, <andersee@debian.org>
+ * Copyright (C) 1999,2000
,2001 by Lineo, inc.
+ *
Written by Erik Andersen
<andersen@lineo.com>, <andersee@debian.org>
*
*
* This contains _two_ implementations of ps for Linux. One uses the
*
*
* This contains _two_ implementations of ps for Linux. One uses the
@@
-28,19
+28,21
@@
*
*/
*
*/
-#include "busybox.h"
#include <stdio.h>
#include <stdio.h>
+#include <stdlib.h>
#include <unistd.h>
#include <dirent.h>
#include <errno.h>
#include <fcntl.h>
#include <ctype.h>
#include <unistd.h>
#include <dirent.h>
#include <errno.h>
#include <fcntl.h>
#include <ctype.h>
+#include <string.h>
#include <sys/ioctl.h>
#include <sys/ioctl.h>
+#include "busybox.h"
#define BB_DECLARE_EXTERN
#define bb_need_help
#include "messages.c"
#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.
*/
* 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) */
typedef struct proc_s {
char
cmd[16]; /* basename of executable file in call to exec(2) */
@@
-97,20
+95,20
@@
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
if (tmp)
sscanf(tmp, "Pid:\t%d\n" "PPid:\t%d\n", &P->pid, &P->ppid);
else
- error
Msg("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
/* For busybox, ignoring effective, saved, etc */
tmp = strstr(S, "Uid:");
if (tmp)
sscanf(tmp, "Uid:\t%d", &P->ruid);
else
- error
Msg("Internal error!\n
");
+ error
_msg("Internal error!
");
tmp = strstr(S, "Gid:");
if (tmp)
sscanf(tmp, "Gid:\t%d", &P->rgid);
else
tmp = strstr(S, "Gid:");
if (tmp)
sscanf(tmp, "Gid:\t%d", &P->rgid);
else
- error
Msg("Internal error!\n
");
+ error
_msg("Internal error!
");
}
}
@@
-121,8
+119,8
@@
extern int ps_main(int argc, char **argv)
FILE *file;
struct dirent *entry;
char path[32], sbuf[512];
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, 0, 0 };
int len, i, c;
#ifdef BB_FEATURE_AUTOWIDTH
struct winsize win = { 0, 0, 0, 0 };
@@
-135,7
+133,7
@@
extern int ps_main(int argc, char **argv)
dir = opendir("/proc");
if (!dir)
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);
#ifdef BB_FEATURE_AUTOWIDTH
ioctl(fileno(stdout), TIOCGWINSZ, &win);
@@
-143,12
+141,8
@@
extern int ps_main(int argc, char **argv)
terminal_width = win.ws_col - 1;
#endif
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) {
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 (!isdigit(*entry->d_name))
continue;
sprintf(path, "/proc/%s/status", entry->d_name);
@@
-169,8
+163,7
@@
extern int ps_main(int argc, char **argv)
if (file == NULL)
continue;
i = 0;
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')
while (((c = getc(file)) != EOF) && (i < (terminal_width-len))) {
i++;
if (c == '\0')
@@
-179,11
+172,11
@@
extern int ps_main(int argc, char **argv)
}
fclose(file);
if (i == 0)
}
fclose(file);
if (i == 0)
-
fprintf(stdout,
"[%s]", p.cmd);
-
fprintf(stdout, "\n"
);
+
printf(
"[%s]", p.cmd);
+
putchar('\n'
);
}
closedir(dir);
}
closedir(dir);
- return
(TRUE)
;
+ return
EXIT_SUCCESS
;
}
}
@@
-204,8
+197,8
@@
extern int ps_main(int argc, char **argv)
pid_t num_pids;
pid_t* pid_array = NULL;
struct pid_info info;
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, 0, 0 };
int terminal_width = TERMINAL_WIDTH;
#ifdef BB_FEATURE_AUTOWIDTH
struct winsize win = { 0, 0, 0, 0 };
int terminal_width = TERMINAL_WIDTH;
@@
-214,16
+207,16
@@
extern int ps_main(int argc, char **argv)
#endif
if (argc > 1 && **(argv + 1) == '-')
#endif
if (argc > 1 && **(argv + 1) == '-')
-
usage(ps_usage
);
+
show_usage(
);
/* open device */
fd = open(device, O_RDONLY);
if (fd < 0)
/* 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)
/* 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
/* Allocate some memory -- grab a few extras just in case
* some new processes start up while we wait. The kernel will
@@
-234,7
+227,7
@@
extern int ps_main(int argc, char **argv)
/* Now grab the pid list */
if (ioctl (fd, DEVPS_GET_PID_LIST, pid_array)<0)
/* 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);
#ifdef BB_FEATURE_AUTOWIDTH
ioctl(fileno(stdout), TIOCGWINSZ, &win);
@@
-243,16
+236,13
@@
extern int ps_main(int argc, char **argv)
#endif
/* Print up a ps listing */
#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<pid_array[0] ; i++) {
for (i=1; i<pid_array[0] ; i++) {
- uidName[0] = '\0';
- groupName[0] = '\0';
info.pid = pid_array[i];
if (ioctl (fd, DEVPS_GET_PID_INFO, &info)<0)
info.pid = pid_array[i];
if (ioctl (fd, DEVPS_GET_PID_INFO, &info)<0)
-
fatalError("\nDEVPS_GET_PID_INFO: %s\n", strerror (errno)
);
+
perror_msg_and_die("\nDEVPS_GET_PID_INFO"
);
/* Make some adjustments as needed */
my_getpwuid(uidName, info.euid);
/* Make some adjustments as needed */
my_getpwuid(uidName, info.euid);
@@
-262,7
+252,7
@@
extern int ps_main(int argc, char **argv)
if (*groupName == '\0')
sprintf(groupName, "%ld", info.egid);
if (*groupName == '\0')
sprintf(groupName, "%ld", info.egid);
- len =
fprintf(stdout,
"%5d %-8s %-8s %c ", info.pid, uidName, groupName, info.state);
+ len =
printf(
"%5d %-8s %-8s %c ", info.pid, uidName, groupName, info.state);
if (strlen(info.command_line) > 1) {
for( j=0; j<(sizeof(info.command_line)-1) && j < (terminal_width-len); j++) {
if (strlen(info.command_line) > 1) {
for( j=0; j<(sizeof(info.command_line)-1) && j < (terminal_width-len); j++) {
@@
-271,9
+261,9
@@
extern int ps_main(int argc, char **argv)
}
}
*(info.command_line+j) = '\0';
}
}
*(info.command_line+j) = '\0';
-
fprintf(stdout, "%s\n",
info.command_line);
+
puts(
info.command_line);
} else {
} else {
-
fprintf(stdout,
"[%s]\n", info.name);
+
printf(
"[%s]\n", info.name);
}
}
}
}
@@
-282,7
+272,7
@@
extern int ps_main(int argc, char **argv)
/* close device */
if (close (fd) != 0)
/* 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);
}
exit (0);
}