aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRob Landley <rob@landley.net>2015-09-29 05:31:02 -0500
committerRob Landley <rob@landley.net>2015-09-29 05:31:02 -0500
commit3d9dce3b523f5e4a01189d4735c02a9b33d8c7ab (patch)
treede429520966f34674fbd43f448cb52816ced4075
parent7d6af77804adc069a83e8566250f868a6cb9786e (diff)
downloadtoybox-3d9dce3b523f5e4a01189d4735c02a9b33d8c7ab.tar.gz
xvfork went away.
-rw-r--r--toys/pending/sh.c5
1 files changed, 4 insertions, 1 deletions
diff --git a/toys/pending/sh.c b/toys/pending/sh.c
index 87f2f9ff..e221960a 100644
--- a/toys/pending/sh.c
+++ b/toys/pending/sh.c
@@ -26,6 +26,9 @@ USE_SH(NEWTOY(exit, NULL, TOYFLAG_NOFORK))
USE_SH(NEWTOY(sh, "c:i", TOYFLAG_BIN))
USE_SH(OLDTOY(toysh, sh, TOYFLAG_BIN))
+// Login lies in argv[0], so add some aliases to catch that
+USE_SH(OLDTOY(-sh, sh, 0))
+USE_SH(OLDTOY(-toysh, sh, 0))
config SH
bool "sh (toysh)"
@@ -305,7 +308,7 @@ static void run_pipeline(struct pipeline *line)
} else {
int status;
- cmd->pid = xvfork();
+ cmd->pid = vfork();
if (!cmd->pid) xexec(cmd->argv);
else waitpid(cmd->pid, &status, 0);