pkill: Add lt- variants
The pgrep code checks to see if the program is run as pkill or pidwait and changes its behaviour accordingly. Some older versions of libtool run the programs as lt-pkill and lt-pidwait which means the tests fail. We add these two program names to the checks. Signed-off-by: Craig Small <csmall@dropbear.xyz>
This commit is contained in:
parent
dc143c8dc0
commit
992b8b64f4
1
NEWS
1
NEWS
@ -2,6 +2,7 @@ procps-ng-NEXT
|
||||
---------------
|
||||
* Rename pwait to pidwait
|
||||
* library: renamed to libproc-2 and reset to 0:0:0
|
||||
* pkill: Check for lt- variants of program name issue #192
|
||||
* ps: Add OOM and OOMADJ fields issue #198
|
||||
* slabtop: Don't combine d and o options issue #160
|
||||
|
||||
|
6
pgrep.c
6
pgrep.c
@ -750,12 +750,14 @@ static void parse_opts (int argc, char **argv)
|
||||
};
|
||||
|
||||
#ifdef ENABLE_PIDWAIT
|
||||
if (strcmp (program_invocation_short_name, "pidwait") == 0) {
|
||||
if (strcmp (program_invocation_short_name, "pidwait") == 0 ||
|
||||
strcmp (program_invocation_short_name, "lt-pidwait") == 0) {
|
||||
prog_mode = PIDWAIT;
|
||||
strcat (opts, "e");
|
||||
} else
|
||||
#endif
|
||||
if (strcmp (program_invocation_short_name, "pkill") == 0) {
|
||||
if (strcmp (program_invocation_short_name, "pkill") == 0 ||
|
||||
strcmp (program_invocation_short_name, "lt-pkill") == 0) {
|
||||
int sig;
|
||||
prog_mode = PKILL;
|
||||
sig = signal_option(&argc, argv);
|
||||
|
Loading…
Reference in New Issue
Block a user