X-Git-Url: https://git.librecmc.org/?a=blobdiff_plain;f=ps.c;h=79910fe34f097ebbe4596465363b192cb591e1f6;hb=46f44d24fcc25a5d6e13e0453485881bdf147e91;hp=13b6ce541d4e9dd1ae2715916314dbc7e906cd04;hpb=b610615be9aedfac07d1e01f12575707fa3a227c;p=oweals%2Fbusybox.git

diff --git a/ps.c b/ps.c
index 13b6ce541..79910fe34 100644
--- 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>
@@ -97,24 +97,23 @@ 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
-		fprintf(stderr, "Internal error!\n");
+		error_msg("Internal error!\n");
 
 	/* For busybox, ignoring effective, saved, etc */
 	tmp = strstr(S, "Uid:");
 	if (tmp)
 		sscanf(tmp, "Uid:\t%d", &P->ruid);
 	else
-		fprintf(stderr, "Internal error!\n");
+		error_msg("Internal error!\n");
 
 	tmp = strstr(S, "Gid:");
 	if (tmp)
 		sscanf(tmp, "Gid:\t%d", &P->rgid);
 	else
-		fprintf(stderr, "Internal error!\n");
+		error_msg("Internal error!\n");
 
 }
 
-
 extern int ps_main(int argc, char **argv)
 {
 	proc_t p;
@@ -126,7 +125,7 @@ extern int ps_main(int argc, char **argv)
 	char groupName[10] = "";
 	int len, i, c;
 #ifdef BB_FEATURE_AUTOWIDTH
-	struct winsize win = { 0, 0 };
+	struct winsize win = { 0, 0, 0, 0 };
 	int terminal_width = TERMINAL_WIDTH;
 #else
 #define terminal_width  TERMINAL_WIDTH
@@ -134,18 +133,9 @@ extern int ps_main(int argc, char **argv)
 
 
 
-	if (argc > 1 && strcmp(argv[1], dash_dash_help) == 0) {
-		usage ("ps\n"
-#ifndef BB_FEATURE_TRIVIAL_HELP
-				"\nReport process status\n"
-				"\nThis version of ps accepts no options.\n"
-#endif
-				);
-	}
-
 	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);
@@ -187,12 +177,13 @@ extern int ps_main(int argc, char **argv)
 				c = ' ';
 			putc(c, stdout);
 		}
+		fclose(file);
 		if (i == 0)
 			fprintf(stdout, "[%s]", p.cmd);
 		fprintf(stdout, "\n");
 	}
 	closedir(dir);
-	return(TRUE);
+	return EXIT_SUCCESS;
 }
 
 
@@ -203,7 +194,7 @@ extern int ps_main(int argc, char **argv)
  * this one uses the nifty new devps kernel device.
  */
 
-#include <linux/devps.h>
+#include <linux/devps.h> /* For Erik's nifty devps device driver */
 
 
 extern int ps_main(int argc, char **argv)
@@ -216,34 +207,34 @@ extern int ps_main(int argc, char **argv)
 	char uidName[10] = "";
 	char groupName[10] = "";
 #ifdef BB_FEATURE_AUTOWIDTH
-	struct winsize win = { 0, 0 };
+	struct winsize win = { 0, 0, 0, 0 };
 	int terminal_width = TERMINAL_WIDTH;
 #else
 #define terminal_width  TERMINAL_WIDTH
 #endif
 
 	if (argc > 1 && **(argv + 1) == '-') 
-		usage("ps-devps\n\nReport process status\n\nThis version of ps accepts no options.\n\n");
+		usage(ps_usage);
 
 	/* 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) 
-		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
 	 * just ignore any extras if we give it too many, and will trunc.
 	 * the list if we give it too few.  */
-	pid_array = (pid_t*) calloc( num_pids+10, sizeof(pid_t));
+	pid_array = (pid_t*) xcalloc( num_pids+10, sizeof(pid_t));
 	pid_array[0] = num_pids+10;
 
 	/* 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);
@@ -261,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)
-			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);
@@ -291,7 +282,7 @@ extern int ps_main(int argc, char **argv)
 
 	/* 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);
 }