Merge branch 'busybox' into merge

1 files changed, 3 insertions, 3 deletions

diff --git a/procps/pwdx.c b/procps/pwdx.c
index dac238950..c72cf804a 100644
--- a/procps/pwdx.c
+++ b/procps/pwdx.c
@@ -14,7 +14,7 @@
 //config:       help
 //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
 
@@ -28,8 +28,7 @@
 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 {
@@ -50,6 +49,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));