summaryrefslogtreecommitdiff
path: root/posix/tst-vfork3.c
diff options
context:
space:
mode:
Diffstat (limited to 'posix/tst-vfork3.c')
-rw-r--r--posix/tst-vfork3.c190
1 files changed, 71 insertions, 119 deletions
diff --git a/posix/tst-vfork3.c b/posix/tst-vfork3.c
index 05edc5a217..0449b2486a 100644
--- a/posix/tst-vfork3.c
+++ b/posix/tst-vfork3.c
@@ -1,5 +1,5 @@
/* Test for vfork functions.
- Copyright (C) 2007-2016 Free Software Foundation, Inc.
+ Copyright (C) 2007-2018 Free Software Foundation, Inc.
This file is part of the GNU C Library.
Contributed by Jakub Jelinek <jakub@redhat.com>, 2007.
@@ -23,6 +23,7 @@
#include <stdlib.h>
#include <string.h>
#include <unistd.h>
+#include <sys/stat.h>
#include <sys/wait.h>
static int do_test (void);
@@ -33,84 +34,67 @@ char *tmpdirname;
#define PREPARE(argc, argv) do_prepare ()
#include "../test-skeleton.c"
-static int
-do_test (void)
+static void
+run_script (const char *script, char *const argv[])
{
- mtrace ();
-
- const char *path = getenv ("PATH");
- if (path == NULL)
- path = "/bin";
- char pathbuf[strlen (tmpdirname) + 1 + strlen (path) + 1];
- strcpy (stpcpy (stpcpy (pathbuf, tmpdirname), ":"), path);
- if (setenv ("PATH", pathbuf, 1) < 0)
- {
- puts ("setenv failed");
- return 1;
- }
-
- size_t i;
- char *argv[3] = { (char *) "script1.sh", (char *) "1", NULL };
- for (i = 0; i < 5; i++)
+ for (size_t i = 0; i < 5; i++)
{
pid_t pid = vfork ();
if (pid < 0)
- {
- printf ("vfork failed: %m\n");
- return 1;
- }
+ FAIL_EXIT1 ("vfork failed: %m");
else if (pid == 0)
{
- execvp ("script1.sh", argv);
+ execvp (script, argv);
_exit (errno);
}
+
int status;
if (TEMP_FAILURE_RETRY (waitpid (pid, &status, 0)) != pid)
- {
- puts ("waitpid failed");
- return 1;
- }
+ FAIL_EXIT1 ("waitpid failed");
else if (status != 0)
{
if (WIFEXITED (status))
- printf ("script1.sh failed with status %d\n",
- WEXITSTATUS (status));
+ FAIL_EXIT1 ("%s failed with status %d\n", script,
+ WEXITSTATUS (status));
else
- printf ("script1.sh kill by signal %d\n",
- WTERMSIG (status));
- return 1;
+ FAIL_EXIT1 ("%s killed by signal %d\n", script,
+ WTERMSIG (status));
}
}
+}
- argv[0] = (char *) "script2.sh";
- argv[1] = (char *) "2";
- for (i = 0; i < 5; i++)
+static int
+do_test (void)
+{
+ mtrace ();
+
+ const char *path = getenv ("PATH");
+ if (path == NULL)
+ path = "/bin";
+ char pathbuf[strlen (tmpdirname) + 1 + strlen (path) + 1];
+ strcpy (stpcpy (stpcpy (pathbuf, tmpdirname), ":"), path);
+ if (setenv ("PATH", pathbuf, 1) < 0)
{
- pid_t pid = vfork ();
- if (pid < 0)
- {
- printf ("vfork failed: %m\n");
- return 1;
- }
- else if (pid == 0)
- {
- execvp ("script2.sh", argv);
- _exit (errno);
- }
- int status;
- if (TEMP_FAILURE_RETRY (waitpid (pid, &status, 0)) != pid)
- {
- puts ("waitpid failed");
- return 1;
- }
- else if (status != 0)
- {
- printf ("script2.sh failed with status %d\n", status);
- return 1;
- }
+ puts ("setenv failed");
+ return 1;
}
- for (i = 0; i < 5; i++)
+ /* Although manual states first argument should be the script name itself,
+ current execv{p,e} implementation allows it. */
+ char *argv00[] = { NULL };
+ run_script ("script0.sh", argv00);
+
+ char *argv01[] = { (char*) "script0.sh", NULL };
+ run_script ("script0.sh", argv01);
+
+ char *argv1[] = { (char *) "script1.sh", (char *) "1", NULL };
+ run_script ("script1.sh", argv1);
+
+ char *argv2[] = { (char *) "script2.sh", (char *) "2", NULL };
+ run_script ("script2.sh", argv2);
+
+ /* Same as before but with execlp. */
+ for (size_t i = 0; i < 5; i++)
{
pid_t pid = vfork ();
if (pid < 0)
@@ -137,87 +121,55 @@ do_test (void)
}
unsetenv ("PATH");
- argv[0] = (char *) "echo";
- argv[1] = (char *) "script 4";
- for (i = 0; i < 5; i++)
- {
- pid_t pid = vfork ();
- if (pid < 0)
- {
- printf ("vfork failed: %m\n");
- return 1;
- }
- else if (pid == 0)
- {
- execvp ("echo", argv);
- _exit (errno);
- }
- int status;
- if (TEMP_FAILURE_RETRY (waitpid (pid, &status, 0)) != pid)
- {
- puts ("waitpid failed");
- return 1;
- }
- else if (status != 0)
- {
- printf ("echo failed with status %d\n", status);
- return 1;
- }
- }
+ char *argv4[] = { (char *) "echo", (char *) "script 4", NULL };
+ run_script ("echo", argv4);
return 0;
}
static void
+create_script (const char *script, const char *contents, size_t size)
+{
+ int fd = open (script, O_WRONLY | O_CREAT, 0700);
+ if (fd < 0
+ || TEMP_FAILURE_RETRY (write (fd, contents, size)) != size
+ || fchmod (fd, S_IRUSR | S_IXUSR) < 0)
+ FAIL_EXIT1 ("could not write %s\n", script);
+ close (fd);
+}
+
+static void
do_prepare (void)
{
size_t len = strlen (test_dir) + sizeof ("/tst-vfork3.XXXXXX");
tmpdirname = malloc (len);
- char *script1 = malloc (len + sizeof "/script1.sh");
- char *script2 = malloc (len + sizeof "/script2.sh");
- if (tmpdirname == NULL || script1 == NULL || script2 == NULL)
- {
- puts ("out of memory");
- exit (1);
- }
+ if (tmpdirname == NULL)
+ FAIL_EXIT1 ("out of memory");
strcpy (stpcpy (tmpdirname, test_dir), "/tst-vfork3.XXXXXX");
tmpdirname = mkdtemp (tmpdirname);
if (tmpdirname == NULL)
- {
- puts ("could not create temporary directory");
- exit (1);
- }
+ FAIL_EXIT1 ("could not create temporary directory");
+ char script0[len + sizeof "/script0.sh"];
+ char script1[len + sizeof "/script1.sh"];
+ char script2[len + sizeof "/script2.sh"];
+
+ strcpy (stpcpy (script0, tmpdirname), "/script0.sh");
strcpy (stpcpy (script1, tmpdirname), "/script1.sh");
strcpy (stpcpy (script2, tmpdirname), "/script2.sh");
- /* Need to make sure tmpdirname is at the end of the linked list. */
- add_temp_file (script1);
add_temp_file (tmpdirname);
+ add_temp_file (script0);
+ add_temp_file (script1);
add_temp_file (script2);
+ const char content0[] = "#!/bin/sh\necho empty\n";
+ create_script (script0, content0, sizeof content0);
+
const char content1[] = "#!/bin/sh\necho script $1\n";
- int fd = open (script1, O_WRONLY | O_CREAT, 0700);
- if (fd < 0
- || TEMP_FAILURE_RETRY (write (fd, content1, sizeof content1))
- != sizeof content1
- || fchmod (fd, S_IRUSR | S_IXUSR) < 0)
- {
- printf ("Could not write %s\n", script1);
- exit (1);
- }
- close (fd);
+ create_script (script1, content1, sizeof content1);
const char content2[] = "echo script $1\n";
- fd = open (script2, O_WRONLY | O_CREAT, 0700);
- if (fd < 0
- || TEMP_FAILURE_RETRY (write (fd, content2, sizeof content2))
- != sizeof content2
- || fchmod (fd, S_IRUSR | S_IXUSR) < 0)
- {
- printf ("Could not write %s\n", script2);
- exit (1);
- }
- close (fd);
+ create_script (script2, content2, sizeof content2);
}
generated by cgit v1.2.3 (git 2.39.1) at 2024-05-17 23:45:25 +0000