X-Git-Url: https://git.librecmc.org/?a=blobdiff_plain;f=ps.c;h=4ce43c47f9f0242d55d57fcb79f41c2776f2f7bb;hb=4949faf4b2090ca23c2aeb34535fdbe57754913a;hp=2b41a495f8b8fac8e14261ff170281b9e72a0435;hpb=1fa1adea2ae16d4f4c82d7466905dce4c6edd5f5;p=oweals%2Fbusybox.git

diff --git a/ps.c b/ps.c
index 2b41a495f..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,19 +28,21 @@
  *
  */
 
-#include "busybox.h"
 #include <stdio.h>
+#include <stdlib.h>
 #include <unistd.h>
 #include <dirent.h>
 #include <errno.h>
 #include <fcntl.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 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.
  */
 
-#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) */
@@ -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
-		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!");
 
 }
 
@@ -135,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);
@@ -143,8 +141,7 @@ extern int ps_main(int argc, char **argv)
 			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) {
 		if (!isdigit(*entry->d_name))
 			continue;
@@ -166,8 +163,7 @@ extern int ps_main(int argc, char **argv)
 		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')
@@ -176,8 +172,8 @@ extern int ps_main(int argc, char **argv)
 		}
 		fclose(file);
 		if (i == 0)
-			fprintf(stdout, "[%s]", p.cmd);
-		fprintf(stdout, "\n");
+			printf("[%s]", p.cmd);
+		putchar('\n');
 	}
 	closedir(dir);
 	return EXIT_SUCCESS;
@@ -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);
@@ -240,8 +236,7 @@ extern int ps_main(int argc, char **argv)
 #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++) {
 	    info.pid = pid_array[i];
@@ -257,7 +252,7 @@ extern int ps_main(int argc, char **argv)
 		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++) {
@@ -266,9 +261,9 @@ extern int ps_main(int argc, char **argv)
 				}
 			}
 			*(info.command_line+j) = '\0';
-			fprintf(stdout, "%s\n", info.command_line);
+			puts(info.command_line);
 		} else {
-			fprintf(stdout, "[%s]\n", info.name);
+			printf("[%s]\n", info.name);
 		}
 	}