]> granicus.if.org Git - procps-ng/commitdiff
pidof: Get the arg1 base name with get_basename().
authorQualys Security Advisory <qsa@qualys.com>
Thu, 1 Jan 1970 00:00:00 +0000 (00:00 +0000)
committerCraig Small <csmall@enc.com.au>
Fri, 18 May 2018 21:32:21 +0000 (07:32 +1000)
Same as program_base, cmd_arg0base, and exe_link_base.

pidof.c

diff --git a/pidof.c b/pidof.c
index e73c23e703bfeba5a3587478c257ace7e0d47744..c2b2eb4cbddf6b0fa5842a4746105e5c49c79fcd 100644 (file)
--- a/pidof.c
+++ b/pidof.c
@@ -136,7 +136,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;
@@ -193,12 +192,10 @@ static void select_procs (void)
 
                        } else if (opt_scripts_too && *(task.cmdline+1)) {
 
-                               pos = cmd_arg1base = cmd_arg1 = *(task.cmdline+1);
+                               cmd_arg1 = *(task.cmdline+1);
 
                                /* get the arg1 base name */
-                               while (*pos != '\0') {
-                                       if (*(pos++) == '/') cmd_arg1base = pos;
-                               }
+                               cmd_arg1base = get_basename(cmd_arg1);
 
                                /* if script, then task.cmd = argv1, otherwise task.cmd = argv0 */
                                if (task.cmd &&