X-Git-Url: https://git.librecmc.org/?a=blobdiff_plain;f=procps%2Fps.c;h=9dc45d35d45940caa68b1545d08794241923d77c;hb=b511f9cea92b6a8965812829218e8e327487de71;hp=cf2f2b0c44c253fc03d3c86db569da65efe0d291;hpb=44608e9693b03661fbab5e27650bb040c6871d11;p=oweals%2Fbusybox.git

diff --git a/procps/ps.c b/procps/ps.c
index cf2f2b0c4..9dc45d35d 100644
--- a/procps/ps.c
+++ b/procps/ps.c
@@ -2,8 +2,7 @@
 /*
  * Mini ps implementation(s) for busybox
  *
- * Copyright (C) 1999,2000 by Lineo, inc. and Erik Andersen  
- * Copyright (C) 1999,2000,2001 by Erik Andersen <andersee@debian.org>
+ * Copyright (C) 1999-2003 by Erik Andersen <andersen@codepoet.org>
  *
  * This program is free software; you can redistribute it and/or modify it
  * under the terms of the GNU General Public License as published by the Free
@@ -20,12 +19,6 @@
  * Place, Suite 330, Boston, MA 02111-1307 USA
  */
 
-/*
- * This contains _two_ implementations of ps for Linux.  One uses the
- * traditional /proc virtual filesystem, and the other use the devps kernel
- * driver (written by Erik Andersen to avoid using /proc thereby saving 100k+).
- */
-
 #include <stdio.h>
 #include <stdlib.h>
 #include <unistd.h>
@@ -37,13 +30,16 @@
 #include <termios.h>
 #include <sys/ioctl.h>
 #include "busybox.h"
+#ifdef CONFIG_SELINUX
+#include <fs_secure.h>
+#include <ss.h>
+#include <flask_util.h>          /* for is_flask_enabled() */
+#endif
 
 static const int TERMINAL_WIDTH = 79;      /* not 80 in case terminal has linefold bug */
 
 
 
-#if ! defined CONFIG_FEATURE_USE_DEVPS_PATCH
-
 extern int ps_main(int argc, char **argv)
 {
 	procps_status_t * p;
@@ -55,6 +51,13 @@ extern int ps_main(int argc, char **argv)
 #define terminal_width  TERMINAL_WIDTH
 #endif
 
+#ifdef CONFIG_SELINUX
+	int use_selinux = 0;
+	security_id_t sid;
+	if(is_flask_enabled() && argv[1] && !strcmp(argv[1], "-c") )
+		use_selinux = 1;
+#endif
+
 
 #ifdef CONFIG_FEATURE_AUTOWIDTH
 		ioctl(fileno(stdout), TIOCGWINSZ, &win);
@@ -62,10 +65,31 @@ extern int ps_main(int argc, char **argv)
 			terminal_width = win.ws_col - 1;
 #endif
 
+#ifdef CONFIG_SELINUX
+	if(use_selinux)
+		printf("  PID Context                          Stat Command\n");
+	else
+#endif
 	printf("  PID  Uid     VmSize Stat Command\n");
+#ifdef CONFIG_SELINUX
+	while ((p = procps_scan(1, use_selinux, &sid)) != 0) {
+#else
 	while ((p = procps_scan(1)) != 0) {
+#endif
 		char *namecmd = p->cmd;
 
+#ifdef CONFIG_SELINUX
+		if(use_selinux)
+		{
+			char sbuf[128];
+			len = sizeof(sbuf);
+			if(security_sid_to_context(sid, (security_context_t)&sbuf, &len))
+				strcpy(sbuf, "unknown");
+
+			len = printf("%5d %-32s %s ", p->pid, sbuf, p->state);
+		}
+		else
+#endif
 		if(p->rss == 0)
 			len = printf("%5d %-8s        %s ", p->pid, p->user, p->state);
 		else
@@ -91,99 +115,3 @@ extern int ps_main(int argc, char **argv)
 	return EXIT_SUCCESS;
 }
 
-
-#else /* CONFIG_FEATURE_USE_DEVPS_PATCH */
-
-
-/* The following is the second ps implementation --
- * this one uses the nifty new devps kernel device.
- */
-
-#include <linux/devps.h> /* For Erik's nifty devps device driver */
-
-
-extern int ps_main(int argc, char **argv)
-{
-	char device[] = "/dev/ps";
-	int i, j, len, fd;
-	pid_t num_pids;
-	pid_t* pid_array = NULL;
-	struct pid_info info;
-	char uidName[9];
-#ifdef CONFIG_FEATURE_AUTOWIDTH
-	struct winsize win = { 0, 0, 0, 0 };
-	int terminal_width = TERMINAL_WIDTH;
-#else
-#define terminal_width  TERMINAL_WIDTH
-#endif
-
-	if (argc > 1 && **(argv + 1) == '-') 
-		show_usage();
-
-	/* open device */ 
-	fd = open(device, O_RDONLY);
-	if (fd < 0) 
-		perror_msg_and_die( "open failed for `%s'", device);
-
-	/* Find out how many processes there are */
-	if (ioctl (fd, DEVPS_GET_NUM_PIDS, &num_pids)<0) 
-		perror_msg_and_die( "\nDEVPS_GET_PID_LIST");
-	
-	/* 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*) 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) 
-		perror_msg_and_die("\nDEVPS_GET_PID_LIST");
-
-#ifdef CONFIG_FEATURE_AUTOWIDTH
-		ioctl(fileno(stdout), TIOCGWINSZ, &win);
-		if (win.ws_col > 0)
-			terminal_width = win.ws_col - 1;
-#endif
-
-	/* Print up a ps listing */
-	printf("  PID  Uid     Stat Command\n");
-
-	for (i=1; i<pid_array[0] ; i++) {
-	    info.pid = pid_array[i];
-
-	    if (ioctl (fd, DEVPS_GET_PID_INFO, &info)<0)
-			perror_msg_and_die("\nDEVPS_GET_PID_INFO");
-	    
-		/* Make some adjustments as needed */
-		my_getpwuid(uidName, info.euid);
-
-		if(p.vmsize == 0)
-			len = printf("%5d %-8s        %c    ", p.pid, uidName, p.state);
-		else
-			len = printf("%5d %-8s %6d %c    ", p.pid, uidName, p.vmsize, p.state);
-		if (strlen(info.command_line) > 1) {
-			for( j=0; j<(sizeof(info.command_line)-1) && j < (terminal_width-len); j++) {
-				if (*(info.command_line+j) == '\0' && *(info.command_line+j+1) != '\0') {
-					*(info.command_line+j) = ' ';
-				}
-			}
-			*(info.command_line+j) = '\0';
-			puts(info.command_line);
-		} else {
-			printf("[%s]\n", info.name);
-		}
-	}
-
-	/* Free memory */
-	free( pid_array);
-
-	/* close device */
-	if (close (fd) != 0) 
-		perror_msg_and_die("close failed for `%s'", device);
- 
-	exit (0);
-}
-
-#endif /* CONFIG_FEATURE_USE_DEVPS_PATCH */
-