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 4ff7a8a58cab7b47137a4f8900f2c0dc76f877d1..4ce43c47f9f0242d55d57fcb79f41c2776f2f7bb 100644
(file)
--- a/
ps.c
+++ b/
ps.c
@@
-28,7
+28,6
@@
*
*/
*
*/
-#include "busybox.h"
#include <stdio.h>
#include <stdlib.h>
#include <unistd.h>
#include <stdio.h>
#include <stdlib.h>
#include <unistd.h>
@@
-38,6
+37,7
@@
#include <ctype.h>
#include <string.h>
#include <sys/ioctl.h>
#include <ctype.h>
#include <string.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"
@@
-52,10
+52,6
@@
static const int TERMINAL_WIDTH = 79; /* not 80 in case terminal has linefo
* 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) */
@@
-211,7
+207,7
@@
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);
/* open device */
fd = open(device, O_RDONLY);