These messages can be .rodata, so make them even more const.

[oweals/busybox.git] / ps.c

diff --git a/ps.c b/ps.c
index aac064c2af3b2f19a0f7dadce603dc4f9fe136f0..24f806c4b35d3e5dc45bd23c18e6b1883efa4d88 100644 (file)
--- 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,9 +37,7 @@
 #include <ctype.h>
 #include <string.h>
 #include <sys/ioctl.h>
-#define BB_DECLARE_EXTERN
-#define bb_need_help
-#include "messages.c"
+#include "busybox.h"
 
 static const int TERMINAL_WIDTH = 79;      /* not 80 in case terminal has linefold bug */
 
@@ -52,10 +49,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 +92,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 +130,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 +204,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);