[BusyBox-cvs] busybox/libbb find_pid_by_name.c,1.8,1.9 mtab_file.c,1.4,1.5 procps.c,1.4,1.5

Erik Andersen andersen at codepoet.org
Thu Dec 5 07:24:11 UTC 2002


Update of /var/cvs/busybox/libbb
In directory winder:/tmp/cvs-serv6515/libbb

Modified Files:
	find_pid_by_name.c mtab_file.c procps.c 
Log Message:
Kill CONFIG_FEATURE_USE_DEVPS_PATCH and the devps patch.  I'm not
maintaining it anymore, and it is now terribly out of date.
 -Erik


Index: find_pid_by_name.c
===================================================================
RCS file: /var/cvs/busybox/libbb/find_pid_by_name.c,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -d -r1.8 -r1.9
--- find_pid_by_name.c	22 Oct 2002 12:21:14 -0000	1.8
+++ find_pid_by_name.c	5 Dec 2002 07:24:07 -0000	1.9
@@ -27,88 +27,6 @@
 
 #define READ_BUF_SIZE	50
 
-
-/* For Erik's nifty devps device driver */
-#ifdef CONFIG_FEATURE_USE_DEVPS_PATCH
-#include <linux/devps.h> 
-
-/* find_pid_by_name()
- *  
- *  This finds the pid of the specified process,
[...65 lines suppressed...]
-	/* close device */
-	if (close (fd) != 0) 
-		perror_msg_and_die("close failed for `%s'", device);
-
-	return pidList;
-}
-
-#else		/* CONFIG_FEATURE_USE_DEVPS_PATCH */
-
 /* find_pid_by_name()
  *  
  *  Modified by Vladimir Oleynik for use with libbb/procps.c
@@ -135,7 +53,6 @@
 	pidList[i] = i==0 ? -1 : 0;
 	return pidList;
 }
-#endif							/* CONFIG_FEATURE_USE_DEVPS_PATCH */
 
 /* END CODE */
 /*

Index: mtab_file.c
===================================================================
RCS file: /var/cvs/busybox/libbb/mtab_file.c,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- mtab_file.c	24 Oct 2001 04:59:38 -0000	1.4
+++ mtab_file.c	5 Dec 2002 07:24:07 -0000	1.5
@@ -23,16 +23,12 @@
 #include "libbb.h"
 
 
-/* Busybox mount uses either /proc/mounts or /dev/mtab to 
+/* Busybox mount uses either /proc/mounts or /etc/mtab to 
  * get the list of currently mounted filesystems */ 
 #if defined CONFIG_FEATURE_MTAB_SUPPORT
 const char mtab_file[] = "/etc/mtab";
 #else
-#  if defined CONFIG_FEATURE_USE_DEVPS_PATCH
-      const char mtab_file[] = "/dev/mtab";
-#  else
-      const char mtab_file[] = "/proc/mounts";
-#  endif
+const char mtab_file[] = "/proc/mounts";
 #endif
 
 

Index: procps.c
===================================================================
RCS file: /var/cvs/busybox/libbb/procps.c,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- procps.c	2 Dec 2002 21:18:10 -0000	1.4
+++ procps.c	5 Dec 2002 07:24:07 -0000	1.5
@@ -8,7 +8,6 @@
  *
  */
 
-#if ! defined CONFIG_FEATURE_USE_DEVPS_PATCH
 #include <dirent.h>
 #include <string.h>
 #include <stdlib.h>
@@ -130,8 +129,6 @@
 		return memcpy(&ret_status, &curstatus, sizeof(procps_status_t));
 	}
 }
-
-#endif /* CONFIG_FEATURE_USE_DEVPS_PATCH. Else this file is empty */
 
 /* END CODE */
 /*




More information about the busybox-cvs mailing list