killall and sestatus also need ARGVN scanning
authorDenis Vlasenko <vda.linux@googlemail.com>
Sat, 14 Feb 2009 01:36:11 +0000 (01:36 -0000)
committerDenis Vlasenko <vda.linux@googlemail.com>
Sat, 14 Feb 2009 01:36:11 +0000 (01:36 -0000)
include/libbb.h
libbb/find_pid_by_name.c

index 0403281c6e3719f126c662c8e9e2dc16d2d245e7..eefc13261409040040060eb8b8e0c65386851db2 100644 (file)
@@ -1281,7 +1281,13 @@ enum {
        PSSCAN_UTIME    = 1 << 13,
        PSSCAN_TTY      = 1 << 14,
        PSSCAN_SMAPS    = (1 << 15) * ENABLE_FEATURE_TOPMEM,
-       PSSCAN_ARGVN    = (1 << 16) * (ENABLE_PGREP || ENABLE_PKILL || ENABLE_PIDOF),
+       /* NB: used by find_pid_by_name(). Any applet using it
+        * needs to be mentioned here. */
+       PSSCAN_ARGVN    = (1 << 16) * (ENABLE_KILLALL
+                               || ENABLE_PGREP || ENABLE_PKILL
+                               || ENABLE_PIDOF
+                               || ENABLE_SESTATUS 
+                               ),
        USE_SELINUX(PSSCAN_CONTEXT = 1 << 17,)
        PSSCAN_START_TIME = 1 << 18,
        PSSCAN_CPU      = 1 << 19,
index 92d6d02541d93e389b237c8e40d71e9e6055d431..600d4e1a8920c932e45528e7196824afd3c78209 100644 (file)
@@ -67,15 +67,14 @@ static int comm_match(procps_status_t *p, const char *procName)
        return 1;
 }
 
-/* find_pid_by_name()
+/* This finds the pid of the specified process.
+ * Currently, it's implemented by rummaging through
+ * the proc filesystem.
  *
- *  Modified by Vladimir Oleynik for use with libbb/procps.c
- *  This finds the pid of the specified process.
- *  Currently, it's implemented by rummaging through
- *  the proc filesystem.
+ * Returns a list of all matching PIDs
+ * It is the caller's duty to free the returned pidlist.
  *
- *  Returns a list of all matching PIDs
- *  It is the caller's duty to free the returned pidlist.
+ * Modified by Vladimir Oleynik for use with libbb/procps.c
  */
 pid_t* FAST_FUNC find_pid_by_name(const char *procName)
 {