ash: in tryexec(), ensure we don't try to run embedded scripts as applets

[oweals/busybox.git] / procps / pwdx.c

diff --git a/procps/pwdx.c b/procps/pwdx.c
index 781810488558cee07a81b0c53f3a97ff3bc86051..6009e2aa3783057f35425dc0317868e27dc312c7 100644 (file)
--- a/procps/pwdx.c
+++ b/procps/pwdx.c
@@ -7,29 +7,27 @@
  *
  * Licensed under GPLv2, see file LICENSE in this source tree.
  */
-
 //config:config PWDX
-//config:      bool "pwdx"
+//config:      bool "pwdx (3.5 kb)"
 //config:      default y
 //config:      help
-//config:        Report current working directory of a process
+//config:      Report current working directory of a process
 
-//applet:IF_PWDX(APPLET(pwdx, BB_DIR_USR_BIN, BB_SUID_DROP))
+//applet:IF_PWDX(APPLET_NOFORK(pwdx, pwdx, BB_DIR_USR_BIN, BB_SUID_DROP, pwdx))
 
 //kbuild:lib-$(CONFIG_PWDX) += pwdx.o
 
 //usage:#define pwdx_trivial_usage
 //usage:       "PID..."
 //usage:#define pwdx_full_usage "\n\n"
-//usage:       "Show current directory for PIDs\n"
+//usage:       "Show current directory for PIDs"
 
 #include "libbb.h"
 
 int pwdx_main(int argc, char **argv) MAIN_EXTERNALLY_VISIBLE;
 int pwdx_main(int argc UNUSED_PARAM, char **argv)
 {
-       opt_complementary = "-1";
-       getopt32(argv, "");
+       getopt32(argv, "^" "" "\0" "-1");
        argv += optind;
 
        do {
@@ -41,7 +39,7 @@ int pwdx_main(int argc UNUSED_PARAM, char **argv)
                // Allowed on the command line:
                // /proc/NUM
                // NUM
-               if (strncmp(arg, "/proc/", 6) == 0)
+               if (is_prefixed_with(arg, "/proc/"))
                        arg += 6;
 
                pid = bb_strtou(arg, NULL, 10);
@@ -50,6 +48,7 @@ int pwdx_main(int argc UNUSED_PARAM, char **argv)
 
                sprintf(buf, "/proc/%u/cwd", pid);
 
+               /* NOFORK: only one alloc is allowed; must free */
                s = xmalloc_readlink(buf);
                // "pwdx /proc/1" says "/proc/1: DIR", not "1: DIR"
                printf("%s: %s\n", *argv, s ? s : strerror(errno == ENOENT ? ESRCH : errno));