2 files changed, 76 insertions, 0 deletions
diff --git a/gnulib b/gnulib
deleted file mode 160000
-Subproject 443bc5ffcf7429e557f4a371b0661abe98ddbc1
diff --git a/gnulib/tests/test-popen-safer.c b/gnulib/tests/test-popen-safer.c
new file mode 100644
index 0000000..b8071dc
--- /dev/null
+++ b/gnulib/tests/test-popen-safer.c
@@ -0,0 +1,76 @@
+/* Test of opening a subcommand stream.
+   Copyright (C) 2009-2011 Free Software Foundation, Inc.
+
+   This program is free software: you can redistribute it and/or modify
+   it under the terms of the GNU General Public License as published by
+   the Free Software Foundation; either version 3 of the License, or
+   (at your option) any later version.
+
+   This program 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 General Public License for more details.
+
+   You should have received a copy of the GNU General Public License
+   along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
+
+/* Written by Eric Blake <ebb9@byu.net>, 2009.  */
+
+#include <config.h>
+
+/* Specification.  */
+#include "stdio--.h"
+
+/* Helpers.  */
+#include <sys/wait.h>
+#include <unistd.h>
+
+/* This test intentionally closes stderr.  So, we arrange to have fd 10
+   (outside the range of interesting fd's during the test) set up to
+   duplicate the original stderr.  */
+
+#define BACKUP_STDERR_FILENO 10
+#define ASSERT_STREAM myerr
+#include "macros.h"
+
+static FILE *myerr;
+
+int
+main (int argc, char **argv)
+{
+  FILE *fp;
+  int status;
+
+  /* We close fd 2 later, so save it in fd 10.  */
+  if (dup2 (STDERR_FILENO, BACKUP_STDERR_FILENO) != BACKUP_STDERR_FILENO
+      || (myerr = fdopen (BACKUP_STDERR_FILENO, "w")) == NULL)
+    return 2;
+
+  ASSERT (fp = popen ("exit 0", "r"));
+  ASSERT (STDERR_FILENO < fileno (fp));
+  status = pclose (fp);
+  ASSERT (WIFEXITED (status));
+  ASSERT (!WEXITSTATUS (status));
+
+  ASSERT (fclose (stdin) == 0);
+  ASSERT (fp = popen ("exit 0", "r"));
+  ASSERT (STDERR_FILENO < fileno (fp));
+  status = pclose (fp);
+  ASSERT (WIFEXITED (status));
+  ASSERT (!WEXITSTATUS (status));
+
+  ASSERT (fclose (stdout) == 0);
+  ASSERT (fp = popen ("exit 0", "r"));
+  ASSERT (STDERR_FILENO < fileno (fp));
+  status = pclose (fp);
+  ASSERT (WIFEXITED (status));
+  ASSERT (!WEXITSTATUS (status));
+
+  ASSERT (fclose (stderr) == 0);
+  ASSERT (fp = popen ("exit 0", "r"));
+  ASSERT (STDERR_FILENO < fileno (fp));
+  status = pclose (fp);
+  ASSERT (WIFEXITED (status));
+  ASSERT (!WEXITSTATUS (status));
+  return 0;
+}