X-Git-Url: https://git.librecmc.org/?a=blobdiff_plain;f=ps.c;h=4ce43c47f9f0242d55d57fcb79f41c2776f2f7bb;hb=7cf9fed83f6e7bf86eb4cac324b98734739fa861;hp=aac064c2af3b2f19a0f7dadce603dc4f9fe136f0;hpb=ed3ef50c233ffb1b50ea0e7382a8e60b86491009;p=oweals%2Fbusybox.git

diff --git a/ps.c b/ps.c
index aac064c2a..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
- * <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
@@ -28,7 +28,6 @@
  *
  */
 
-#include "busybox.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 "busybox.h"
 #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.
  */
 
-#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) */
@@ -99,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
-		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
-		error_msg("Internal error!\n");
+		error_msg("Internal error!");
 
 	tmp = strstr(S, "Gid:");
 	if (tmp)
 		sscanf(tmp, "Gid:\t%d", &P->rgid);
 	else
-		error_msg("Internal error!\n");
+		error_msg("Internal error!");
 
 }
 
@@ -137,7 +133,7 @@ extern int ps_main(int argc, char **argv)
 
 	dir = opendir("/proc");
 	if (!dir)
-		error_msg_and_die("Can't open /proc\n");
+		error_msg_and_die("Can't open /proc");
 
 #ifdef BB_FEATURE_AUTOWIDTH
 		ioctl(fileno(stdout), TIOCGWINSZ, &win);
@@ -211,7 +207,7 @@ extern int ps_main(int argc, char **argv)
 #endif
 
 	if (argc > 1 && **(argv + 1) == '-') 
-		usage(ps_usage);
+		show_usage();
 
 	/* open device */ 
 	fd = open(device, O_RDONLY);