summaryrefslogtreecommitdiff
path: root/include
diff options
context:
space:
mode:
authorBernhard Reutner-Fischer2008-09-05 12:05:47 +0000
committerBernhard Reutner-Fischer2008-09-05 12:05:47 +0000
commita959a858a36fd88c1adc4ef5a05d621d555df63e (patch)
tree2373169d946b8f7ec3335128422e6d309a8b9ddf /include
parent2957fc699207d8e855c7024f8f91c451cf018952 (diff)
downloadbusybox-a959a858a36fd88c1adc4ef5a05d621d555df63e.zip
busybox-a959a858a36fd88c1adc4ef5a05d621d555df63e.tar.gz
- pull r22872 from trunk:
pidof/killall: allow find_pid_by_name to find running processes started as scripts_with_name_longer_than_15_bytes.sh closes bug 4054 (and is generally neat)
Diffstat (limited to 'include')
-rw-r--r--include/libbb.h3
1 files changed, 2 insertions, 1 deletions
diff --git a/include/libbb.h b/include/libbb.h
index e92dbc4..27fb50a 100644
--- a/include/libbb.h
+++ b/include/libbb.h
@@ -1140,6 +1140,7 @@ typedef struct procps_status_t {
uint8_t shift_pages_to_bytes;
uint8_t shift_pages_to_kb;
/* Fields are set to 0/NULL if failed to determine (or not requested) */
+ uint16_t argv_len;
char *argv0;
USE_SELINUX(char *context;)
/* Everything below must contain no ptrs to malloc'ed data:
@@ -1187,7 +1188,7 @@ enum {
PSSCAN_UTIME = 1 << 13,
PSSCAN_TTY = 1 << 14,
PSSCAN_SMAPS = (1 << 15) * ENABLE_FEATURE_TOPMEM,
- PSSCAN_ARGVN = (1 << 16) * (ENABLE_PGREP | ENABLE_PKILL),
+ PSSCAN_ARGVN = (1 << 16) * (ENABLE_PGREP || ENABLE_PKILL || ENABLE_PIDOF),
USE_SELINUX(PSSCAN_CONTEXT = 1 << 17,)
PSSCAN_START_TIME = 1 << 18,
/* These are all retrieved from proc/NN/stat in one go: */