3 files changed, 65 insertions, 3 deletions

diff --git a/procps/Config.src b/procps/Config.src
index cf664eeb2..3e7df0b81 100644
--- a/procps/Config.src
+++ b/procps/Config.src
@@ -10,7 +10,7 @@ INSERT
 config FREE
         bool "free"
         default y
-        depends on PLATFORM_LINUX #sysinfo()
+        select PLATFORM_LINUX #sysinfo()
         help
           free displays the total amount of free and used physical and swap
           memory in the system, as well as the buffers used by the kernel.
@@ -99,7 +99,8 @@ config FEATURE_PS_WIDE
 config FEATURE_PS_TIME
         bool "Enable time and elapsed time output"
         default y
-        depends on PS && DESKTOP && PLATFORM_LINUX #sysinfo()
+        depends on PS && DESKTOP
+        select PLATFORM_LINUX
         help
           Support -o time and -o etime output specifiers.
 
@@ -196,7 +197,7 @@ config FEATURE_SHOW_THREADS
 config UPTIME
         bool "uptime"
         default y
-        depends on PLATFORM_LINUX #sysinfo()
+        select PLATFORM_LINUX #sysinfo()
         help
           uptime gives a one line display of the current time, how long
           the system has been running, how many users are currently logged
diff --git a/procps/kill.c b/procps/kill.c
index e6f27af50..599152250 100644
--- a/procps/kill.c
+++ b/procps/kill.c
@@ -221,6 +221,7 @@ int kill_main(int argc, char **argv)
                         pid = bb_strtoi(arg, &end, 10);
                         if (errno && (errno != EINVAL || *end != ' ')) {
                                 bb_error_msg("invalid number '%s'", arg);
+                                *end = '\0';
                                 errors++;
                         } else if (kill(pid, signo) != 0) {
                                 bb_perror_msg("can't kill pid %d", (int)pid);
diff --git a/procps/pwdx.c b/procps/pwdx.c
new file mode 100644
index 000000000..781810488
--- /dev/null
+++ b/procps/pwdx.c
@@ -0,0 +1,60 @@
+/* vi: set sw=4 ts=4: */
+/*
+ * pwdx implementation for busybox
+ *
+ * Copyright (c) 2004 Nicholas Miell
+ * ported from procps by Pere Orga <gotrunks@gmail.com> 2011
+ *
+ * Licensed under GPLv2, see file LICENSE in this source tree.
+ */
+
+//config:config PWDX
+//config:       bool "pwdx"
+//config:       default y
+//config:       help
+//config:         Report current working directory of a process
+
+//applet:IF_PWDX(APPLET(pwdx, BB_DIR_USR_BIN, BB_SUID_DROP))
+
+//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"
+
+#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, "");
+        argv += optind;
+
+        do {
+                char buf[sizeof("/proc/%u/cwd") + sizeof(int)*3];
+                unsigned pid;
+                char *s;
+                char *arg = *argv;
+
+                // Allowed on the command line:
+                // /proc/NUM
+                // NUM
+                if (strncmp(arg, "/proc/", 6) == 0)
+                        arg += 6;
+
+                pid = bb_strtou(arg, NULL, 10);
+                if (errno)
+                        bb_error_msg_and_die("invalid process id: '%s'", arg);
+
+                sprintf(buf, "/proc/%u/cwd", pid);
+
+                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));
+                free(s);
+        } while (*++argv);
+
+        return EXIT_SUCCESS;
+}