This is the mail archive of the
binutils@sourceware.org
mailing list for the binutils project.
[PATCH][Libiberty] Support empty arguments in pex-win32
- From: Andrew Stubbs <ams at codesourcery dot com>
- To: Binutils <binutils at sourceware dot org>
- Date: Fri, 16 Sep 2016 16:44:34 +0100
- Subject: [PATCH][Libiberty] Support empty arguments in pex-win32
- Authentication-results: sourceware.org; auth=none
Hi,
This patch fixes a libiberty bug in which zero-length arguments to
"pex_run" subprocesses were silently dropped on MinGW.
Basically, the code does not quote parameters unless it has to, but this
corner-case was forgotten.
OK?
Andrew
>From bb184c435ebde5c8cf0e5ecafcefa5f24aadc32d Mon Sep 17 00:00:00 2001
From: Andrew Stubbs <ams@codesourcery.com>
Date: Fri, 16 Sep 2016 16:17:40 +0100
Subject: [PATCH] Support empty arguments in pex-win32
2016-09-16 Andrew Stubbs <ams@codesourcery.com>
libiberty/
* pex-win32.c (argv_to_cmdline): Quote zero-length parameters.
libiberty/testsuite/
* test-pexecute.c (main): Insert check for zero-length parameters.
---
libiberty/pex-win32.c | 4 ++++
libiberty/testsuite/test-pexecute.c | 14 ++++++++++++++
2 files changed, 18 insertions(+)
diff --git a/libiberty/pex-win32.c b/libiberty/pex-win32.c
index 66d2f11..4c15b0d 100644
--- a/libiberty/pex-win32.c
+++ b/libiberty/pex-win32.c
@@ -370,6 +370,8 @@ argv_to_cmdline (char *const *argv)
cmdline_len++;
}
}
+ if (j == 0)
+ needs_quotes = 1;
/* Trailing backslashes also need to be escaped because they will be
followed by the terminating quote. */
if (needs_quotes)
@@ -394,6 +396,8 @@ argv_to_cmdline (char *const *argv)
break;
}
}
+ if (j == 0)
+ needs_quotes = 1;
if (needs_quotes)
{
diff --git a/libiberty/testsuite/test-pexecute.c b/libiberty/testsuite/test-pexecute.c
index 8e01fda..f62239d 100644
--- a/libiberty/testsuite/test-pexecute.c
+++ b/libiberty/testsuite/test-pexecute.c
@@ -285,6 +285,20 @@ main (int argc, char **argv)
ERROR ("echo exit status failed");
pex_free (pex1);
+ /* Check empty parameters don't get lost. */
+ pex1 = TEST_PEX_INIT (PEX_USE_PIPES, "temp");
+ subargv[1] = "echo";
+ subargv[2] = "foo";
+ subargv[3] = "";
+ subargv[4] = "bar";
+ subargv[5] = NULL;
+ TEST_PEX_RUN (pex1, 0, "./test-pexecute", subargv, NULL, NULL);
+ e = TEST_PEX_READ_OUTPUT (pex1);
+ CHECK_LINE (e, "foo bar"); /* Two spaces! */
+ if (TEST_PEX_GET_STATUS_1 (pex1) != 0)
+ ERROR ("echo exit status failed");
+ pex_free (pex1);
+
pex1 = TEST_PEX_INIT (PEX_USE_PIPES, "temp");
subargv[1] = "echo";
subargv[2] = "bar";
--
1.8.1.1