From 992b8b64f43688e1ee9c32a2ce316635d8a6694c Mon Sep 17 00:00:00 2001 From: Craig Small Date: Mon, 5 Apr 2021 14:40:00 +1000 Subject: [PATCH] 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 --- NEWS | 1 + pgrep.c | 6 ++++-- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/NEWS b/NEWS index 7e71021a..83918e3c 100644 --- a/NEWS +++ b/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 diff --git a/pgrep.c b/pgrep.c index 0fd85b7c..90e42211 100644 --- a/pgrep.c +++ b/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); -- 2.40.0