summaryrefslogtreecommitdiff
path: root/pidof.c
diff options
context:
space:
mode:
authorQualys Security Advisory <qsa@qualys.com>1970-01-01 00:00:00 +0000
committerCraig Small <csmall@enc.com.au>2018-06-23 21:59:14 +1000
commit9d59bd6fc975c90785d667875d81c0879a37dd67 (patch)
tree25626e4a718dd6ed6201cfc64b976494b8373c47 /pidof.c
parentcd8499f5f00ddf12358be8d91de4575caaf4a855 (diff)
downloadprocps-ng-9d59bd6fc975c90785d667875d81c0879a37dd67.tar.gz
0017-pidof: Get the arg1 base name with get_basename().
Same as program_base, cmd_arg0base, and exe_link_base.
Diffstat (limited to 'pidof.c')
-rw-r--r--pidof.c7
1 files changed, 2 insertions, 5 deletions
diff --git a/pidof.c b/pidof.c
index ad79c29..4fa619a 100644
--- a/pidof.c
+++ b/pidof.c
@@ -139,7 +139,6 @@ static void select_procs (void)
static int size = 0;
char *cmd_arg0, *cmd_arg0base;
char *cmd_arg1, *cmd_arg1base;
- char *pos;
char *program_base;
char *root_link;
char *exe_link;
@@ -198,12 +197,10 @@ static void select_procs (void)
} else if (opt_scripts_too && *(p_cmdline+1)) {
- pos = cmd_arg1base = cmd_arg1 = *(p_cmdline+1);
+ cmd_arg1 = *(p_cmdline+1);
/* get the arg1 base name */
- while (*pos != '\0') {
- if (*(pos++) == '/') cmd_arg1base = pos;
- }
+ cmd_arg1base = get_basename(cmd_arg1);
/* if script, then cmd = argv1, otherwise cmd = argv0 */
if (p_cmd &&