emo/procps
1
0
Fork 0
Code Issues Pull Requests Packages Releases Activity

pkill: Add lt- variants

Browse Source 
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:
Craig Small 2021-04-05 14:40:00 +10:00
parent dc143c8dc0
commit 992b8b64f4
2 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
NEWS
View File

@ -2,6 +2,7 @@ procps-ng-NEXT
--------------- ---------------
* Rename pwait to pidwait * Rename pwait to pidwait
* library: renamed to libproc-2 and reset to 0:0:0 * 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 * ps: Add OOM and OOMADJ fields issue #198
* slabtop: Don't combine d and o options issue #160 * slabtop: Don't combine d and o options issue #160

6
pgrep.c
View File

@ -750,12 +750,14 @@ static void parse_opts (int argc, char **argv)
}; };
#ifdef ENABLE_PIDWAIT #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; prog_mode = PIDWAIT;
strcat (opts, "e"); strcat (opts, "e");
} else } else
#endif #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; int sig;
prog_mode = PKILL; prog_mode = PKILL;
sig = signal_option(&argc, argv); sig = signal_option(&argc, argv);