Merge lp:~dannf/ubuntu/saucy/procps/pwdx-fixes into lp:ubuntu/saucy/procps

[dann frazier]

=== modified file '.pc/applied-patches'
--- .pc/applied-patches	2012-06-20 13:12:40 +0000
+++ .pc/applied-patches	2013-08-16 16:17:41 +0000
@@ -2,3 +2,5 @@
 bts676239-pkill-u-option
 watch_8bit
 uptime_test
+lp1213156-pwdx-pid-0
+lp1213160-pwdx-locale-fail

=== added directory '.pc/lp1213156-pwdx-pid-0'
=== added file '.pc/lp1213156-pwdx-pid-0/.timestamp'
=== added file '.pc/lp1213156-pwdx-pid-0/pwdx.c'
--- .pc/lp1213156-pwdx-pid-0/pwdx.c	1970-01-01 00:00:00 +0000
+++ .pc/lp1213156-pwdx-pid-0/pwdx.c	2013-08-16 16:17:41 +0000
@@ -0,0 +1,147 @@
+/*
+ * pwdx.c - print process working directory
+ * Copyright 2004 Nicholas Miell
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
+ */
+
+#include <errno.h>
+#include <getopt.h>
+#include <limits.h>
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+#include <sys/types.h>
+#include <unistd.h>
+
+#include "proc/version.h"
+#include "c.h"
+#include "nls.h"
+#include "xalloc.h"
+#include "fileutils.h"
+
+static void __attribute__ ((__noreturn__)) usage(FILE * out)
+{
+	fputs(USAGE_HEADER, out);
+	fprintf(out, _(" %s [options] pid...\n"), program_invocation_short_name);
+	fputs(USAGE_OPTIONS, out);
+	fputs(USAGE_HELP, out);
+	fputs(USAGE_VERSION, out);
+	fprintf(out, USAGE_MAN_TAIL("pwdx(1)"));
+
+	exit(out == stderr ? EXIT_FAILURE : EXIT_SUCCESS);
+}
+
+int check_pid_argument(char *input)
+{
+	int skip = 0;
+	long pid;
+	char *end = NULL;
+
+	if (!strncmp("/proc/", input, 6))
+		skip = 6;
+	pid = strtol(input + skip, &end, 10);
+
+	if (errno || input + skip == end || (end && *end))
+		return 1;
+	if (pid < 1)
+		return 1;
+	return 0;
+}
+
+int main(int argc, char *argv[])
+{
+	char ch;
+	int retval = 0, i;
+	int alloclen = 128;
+	char *pathbuf;
+
+	static const struct option longopts[] = {
+		{"version", no_argument, 0, 'V'},
+		{"help", no_argument, 0, 'h'},
+		{NULL, 0, 0, 0}
+	};
+
+    program_invocation_name = program_invocation_short_name;
+	setlocale (LC_ALL, "");
+	bindtextdomain(PACKAGE, LOCALEDIR);
+	textdomain(PACKAGE);
+	atexit(close_stdout);
+
+	while ((ch = getopt_long(argc, argv, "Vh", longopts, NULL)) != -1)
+		switch (ch) {
+		case 'V':
+			printf(PROCPS_NG_VERSION);
+			return EXIT_SUCCESS;
+		case 'h':
+			usage(stdout);
+		default:
+			usage(stderr);
+		}
+
+	argc -= optind;
+	argv += optind;
+
+	if (argc == 0)
+		usage(stderr);
+
+	pathbuf = malloc(alloclen);
+
+	for (i = 0; i < argc; i++) {
+		char *s;
+		ssize_t len, buflen;
+		/* Constant 10 is the length of strings "/proc/" + "/cwd" + 1 */
+		char *buf;
+		buflen = 10 + strlen(argv[i]) + 1;
+		buf = xmalloc(buflen);
+
+		if (check_pid_argument(argv[i]))
+			xerrx(EXIT_FAILURE, _("invalid process id: %s"),
+			     argv[i]);
+		/*
+		 * At this point, all arguments are in the form
+		 * /proc/NNNN or NNNN, so a simple check based on
+		 * the first char is possible
+		 */
+		if (argv[i][0] != '/')
+			snprintf(buf, buflen, "/proc/%s/cwd", argv[i]);
+		else
+			snprintf(buf, buflen, "%s/cwd", argv[i]);
+
+		/*
+		 * buf contains /proc/NNNN/cwd symlink name
+		 * on entry, the target of that symlink on return
+		 */
+		while ((len = readlink(buf, pathbuf, alloclen)) == alloclen) {
+			alloclen *= 2;
+			pathbuf = realloc(pathbuf, alloclen);
+		}
+		free(buf);
+
+		if (len < 0) {
+			s = strerror(errno == ENOENT ? ESRCH : errno);
+			retval = EXIT_FAILURE;
+			fprintf(stderr, "%s: %s\n", argv[i], s);
+			continue;
+		} else {
+			pathbuf[len] = 0;
+			s = pathbuf;
+		}
+
+		printf("%s: %s\n", argv[i], s);
+	}
+	free(pathbuf);
+	return retval;
+}

=== added directory '.pc/lp1213160-pwdx-locale-fail'
=== added file '.pc/lp1213160-pwdx-locale-fail/.timestamp'
=== added file '.pc/lp1213160-pwdx-locale-fail/pwdx.c'
--- .pc/lp1213160-pwdx-locale-fail/pwdx.c	1970-01-01 00:00:00 +0000
+++ .pc/lp1213160-pwdx-locale-fail/pwdx.c	2013-08-16 16:17:41 +0000
@@ -0,0 +1,147 @@
+/*
+ * pwdx.c - print process working directory
+ * Copyright 2004 Nicholas Miell
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+ *
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
+ */
+
+#include <errno.h>
+#include <getopt.h>
+#include <limits.h>
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+#include <sys/types.h>
+#include <unistd.h>
+
+#include "proc/version.h"
+#include "c.h"
+#include "nls.h"
+#include "xalloc.h"
+#include "fileutils.h"
+
+static void __attribute__ ((__noreturn__)) usage(FILE * out)
+{
+	fputs(USAGE_HEADER, out);
+	fprintf(out, _(" %s [options] pid...\n"), program_invocation_short_name);
+	fputs(USAGE_OPTIONS, out);
+	fputs(USAGE_HELP, out);
+	fputs(USAGE_VERSION, out);
+	fprintf(out, USAGE_MAN_TAIL("pwdx(1)"));
+
+	exit(out == stderr ? EXIT_FAILURE : EXIT_SUCCESS);
+}
+
+int check_pid_argument(char *input)
+{
+	int skip = 0;
+	long pid;
+	char *end = NULL;
+
+	if (!strncmp("/proc/", input, 6))
+		skip = 6;
+	pid = strtol(input + skip, &end, 10);
+
+	if (errno || input + skip == end || (end && *end))
+		return 1;
+	if (pid < 1)
+		return 1;
+	return 0;
+}
+
+int main(int argc, char *argv[])
+{
+	int ch;
+	int retval = 0, i;
+	int alloclen = 128;
+	char *pathbuf;
+
+	static const struct option longopts[] = {
+		{"version", no_argument, 0, 'V'},
+		{"help", no_argument, 0, 'h'},
+		{NULL, 0, 0, 0}
+	};
+
+    program_invocation_name = program_invocation_short_name;
+	setlocale (LC_ALL, "");
+	bindtextdomain(PACKAGE, LOCALEDIR);
+	textdomain(PACKAGE);
+	atexit(close_stdout);
+
+	while ((ch = getopt_long(argc, argv, "Vh", longopts, NULL)) != -1)
+		switch (ch) {
+		case 'V':
+			printf(PROCPS_NG_VERSION);
+			return EXIT_SUCCESS;
+		case 'h':
+			usage(stdout);
+		default:
+			usage(stderr);
+		}
+
+	argc -= optind;
+	argv += optind;
+
+	if (argc == 0)
+		usage(stderr);
+
+	pathbuf = malloc(alloclen);
+
+	for (i = 0; i < argc; i++) {
+		char *s;
+		ssize_t len, buflen;
+		/* Constant 10 is the length of strings "/proc/" + "/cwd" + 1 */
+		char *buf;
+		buflen = 10 + strlen(argv[i]) + 1;
+		buf = xmalloc(buflen);
+
+		if (check_pid_argument(argv[i]))
+			xerrx(EXIT_FAILURE, _("invalid process id: %s"),
+			     argv[i]);
+		/*
+		 * At this point, all arguments are in the form
+		 * /proc/NNNN or NNNN, so a simple check based on
+		 * the first char is possible
+		 */
+		if (argv[i][0] != '/')
+			snprintf(buf, buflen, "/proc/%s/cwd", argv[i]);
+		else
+			snprintf(buf, buflen, "%s/cwd", argv[i]);
+
+		/*
+		 * buf contains /proc/NNNN/cwd symlink name
+		 * on entry, the target of that symlink on return
+		 */
+		while ((len = readlink(buf, pathbuf, alloclen)) == alloclen) {
+			alloclen *= 2;
+			pathbuf = realloc(pathbuf, alloclen);
+		}
+		free(buf);
+
+		if (len < 0) {
+			s = strerror(errno == ENOENT ? ESRCH : errno);
+			retval = EXIT_FAILURE;
+			fprintf(stderr, "%s: %s\n", argv[i], s);
+			continue;
+		} else {
+			pathbuf[len] = 0;
+			s = pathbuf;
+		}
+
+		printf("%s: %s\n", argv[i], s);
+	}
+	free(pathbuf);
+	return retval;
+}

=== modified file 'debian/changelog'
--- debian/changelog	2013-01-04 17:13:35 +0000
+++ debian/changelog	2013-08-16 16:17:41 +0000
@@ -1,3 +1,10 @@
+procps (1:3.3.3-2ubuntu6) UNRELEASED; urgency=low
+
+  * pwdx.c: Fix pwdx argument parsing, fixing FTBFS on arm64 (LP: #1213156)
+  * pwdx.c: Fix failure when executed in a nonexistent locale (LP: #1213160)
+
+ -- dann frazier <[e-mail]>  Fri, 16 Aug 2013 10:07:49 -0600
+
 procps (1:3.3.3-2ubuntu5) raring; urgency=low
 
   * Fix cross build.

=== added file 'debian/patches/lp1213156-pwdx-pid-0'
--- debian/patches/lp1213156-pwdx-pid-0	1970-01-01 00:00:00 +0000
+++ debian/patches/lp1213156-pwdx-pid-0	2013-08-16 16:17:41 +0000
@@ -0,0 +1,13 @@
+Index: procps/pwdx.c
+===================================================================
+--- procps.orig/pwdx.c	2013-08-16 09:26:26.606789000 -0600
++++ procps/pwdx.c	2013-08-16 10:06:49.070216686 -0600
+@@ -63,7 +63,7 @@
+ 
+ int main(int argc, char *argv[])
+ {
+-	char ch;
++	int ch;
+ 	int retval = 0, i;
+ 	int alloclen = 128;
+ 	char *pathbuf;

=== added file 'debian/patches/lp1213160-pwdx-locale-fail'
--- debian/patches/lp1213160-pwdx-locale-fail	1970-01-01 00:00:00 +0000
+++ debian/patches/lp1213160-pwdx-locale-fail	2013-08-16 16:17:41 +0000
@@ -0,0 +1,12 @@
+Index: procps/pwdx.c
+===================================================================
+--- procps.orig/pwdx.c	2013-08-16 10:13:41.723121575 -0600
++++ procps/pwdx.c	2013-08-16 10:13:47.619192217 -0600
+@@ -52,6 +52,7 @@
+ 
+ 	if (!strncmp("/proc/", input, 6))
+ 		skip = 6;
++	errno = 0;
+ 	pid = strtol(input + skip, &end, 10);
+ 
+ 	if (errno || input + skip == end || (end && *end))

=== modified file 'debian/patches/series'
--- debian/patches/series	2012-06-20 13:12:40 +0000
+++ debian/patches/series	2013-08-16 16:17:41 +0000
@@ -2,3 +2,5 @@
 bts676239-pkill-u-option
 watch_8bit
 uptime_test
+lp1213156-pwdx-pid-0
+lp1213160-pwdx-locale-fail

=== modified file 'pwdx.c'
--- pwdx.c	2012-05-20 16:48:44 +0000
+++ pwdx.c	2013-08-16 16:17:41 +0000
@@ -52,6 +52,7 @@
 
 	if (!strncmp("/proc/", input, 6))
 		skip = 6;
+	errno = 0;
 	pid = strtol(input + skip, &end, 10);
 
 	if (errno || input + skip == end || (end && *end))
@@ -63,7 +64,7 @@
 
 int main(int argc, char *argv[])
 {
-	char ch;
+	int ch;
 	int retval = 0, i;
 	int alloclen = 128;
 	char *pathbuf;