diff options
author | Bernhard Reutner-Fischer <rep.dot.nop@gmail.com> | 2008-09-05 12:05:47 +0000 |
---|---|---|
committer | Bernhard Reutner-Fischer <rep.dot.nop@gmail.com> | 2008-09-05 12:05:47 +0000 |
commit | a959a858a36fd88c1adc4ef5a05d621d555df63e (patch) | |
tree | 2373169d946b8f7ec3335128422e6d309a8b9ddf /include | |
parent | 2957fc699207d8e855c7024f8f91c451cf018952 (diff) | |
download | busybox-w32-a959a858a36fd88c1adc4ef5a05d621d555df63e.tar.gz busybox-w32-a959a858a36fd88c1adc4ef5a05d621d555df63e.tar.bz2 busybox-w32-a959a858a36fd88c1adc4ef5a05d621d555df63e.zip |
- 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.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/include/libbb.h b/include/libbb.h index e92dbc4c0..27fb50ae4 100644 --- a/include/libbb.h +++ b/include/libbb.h | |||
@@ -1140,6 +1140,7 @@ typedef struct procps_status_t { | |||
1140 | uint8_t shift_pages_to_bytes; | 1140 | uint8_t shift_pages_to_bytes; |
1141 | uint8_t shift_pages_to_kb; | 1141 | uint8_t shift_pages_to_kb; |
1142 | /* Fields are set to 0/NULL if failed to determine (or not requested) */ | 1142 | /* Fields are set to 0/NULL if failed to determine (or not requested) */ |
1143 | uint16_t argv_len; | ||
1143 | char *argv0; | 1144 | char *argv0; |
1144 | USE_SELINUX(char *context;) | 1145 | USE_SELINUX(char *context;) |
1145 | /* Everything below must contain no ptrs to malloc'ed data: | 1146 | /* Everything below must contain no ptrs to malloc'ed data: |
@@ -1187,7 +1188,7 @@ enum { | |||
1187 | PSSCAN_UTIME = 1 << 13, | 1188 | PSSCAN_UTIME = 1 << 13, |
1188 | PSSCAN_TTY = 1 << 14, | 1189 | PSSCAN_TTY = 1 << 14, |
1189 | PSSCAN_SMAPS = (1 << 15) * ENABLE_FEATURE_TOPMEM, | 1190 | PSSCAN_SMAPS = (1 << 15) * ENABLE_FEATURE_TOPMEM, |
1190 | PSSCAN_ARGVN = (1 << 16) * (ENABLE_PGREP | ENABLE_PKILL), | 1191 | PSSCAN_ARGVN = (1 << 16) * (ENABLE_PGREP || ENABLE_PKILL || ENABLE_PIDOF), |
1191 | USE_SELINUX(PSSCAN_CONTEXT = 1 << 17,) | 1192 | USE_SELINUX(PSSCAN_CONTEXT = 1 << 17,) |
1192 | PSSCAN_START_TIME = 1 << 18, | 1193 | PSSCAN_START_TIME = 1 << 18, |
1193 | /* These are all retrieved from proc/NN/stat in one go: */ | 1194 | /* These are all retrieved from proc/NN/stat in one go: */ |