projects
/
oweals
/
busybox.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Support for tar -z option for uncompressing only
[oweals/busybox.git]
/
ps.c
diff --git
a/ps.c
b/ps.c
index a326bc546dc83d678931bdc2734aff1d074b8624..79910fe34f097ebbe4596465363b192cb591e1f6 100644
(file)
--- a/
ps.c
+++ b/
ps.c
@@
-28,7
+28,7
@@
*
*/
*
*/
-#include "
internal
.h"
+#include "
busybox
.h"
#include <stdio.h>
#include <unistd.h>
#include <dirent.h>
#include <stdio.h>
#include <unistd.h>
#include <dirent.h>
@@
-97,20
+97,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
M
sg("Internal error!\n");
+ error
_m
sg("Internal error!\n");
/* 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
M
sg("Internal error!\n");
+ error
_m
sg("Internal error!\n");
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
M
sg("Internal error!\n");
+ error
_m
sg("Internal error!\n");
}
}
@@
-135,7
+135,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\n");
#ifdef BB_FEATURE_AUTOWIDTH
ioctl(fileno(stdout), TIOCGWINSZ, &win);
#ifdef BB_FEATURE_AUTOWIDTH
ioctl(fileno(stdout), TIOCGWINSZ, &win);
@@
-183,7
+183,7
@@
extern int ps_main(int argc, char **argv)
fprintf(stdout, "\n");
}
closedir(dir);
fprintf(stdout, "\n");
}
closedir(dir);
- return
(TRUE)
;
+ return
EXIT_SUCCESS
;
}
}
@@
-219,11
+219,11
@@
extern int ps_main(int argc, char **argv)
/* 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));
+
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)
/* 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
/* Allocate some memory -- grab a few extras just in case
* some new processes start up while we wait. The kernel will
@@
-234,7
+234,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));
+
error_msg_and_die
("\nDEVPS_GET_PID_LIST: %s\n", strerror (errno));
#ifdef BB_FEATURE_AUTOWIDTH
ioctl(fileno(stdout), TIOCGWINSZ, &win);
#ifdef BB_FEATURE_AUTOWIDTH
ioctl(fileno(stdout), TIOCGWINSZ, &win);
@@
-252,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)
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);
/* Make some adjustments as needed */
my_getpwuid(uidName, info.euid);
@@
-282,7
+282,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));
+
error_msg_and_die
("close failed for `%s': %s\n", device, strerror (errno));
exit (0);
}
exit (0);
}