OSDN Git Service
(root)
/
android-x86
/
external-toybox.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
7d6af77
)
xvfork went away.
author
Rob Landley
<rob@landley.net>
Tue, 29 Sep 2015 10:31:02 +0000
(
05:31
-0500)
committer
Rob Landley
<rob@landley.net>
Tue, 29 Sep 2015 10:31:02 +0000
(
05:31
-0500)
toys/pending/sh.c
patch
|
blob
|
history
diff --git
a/toys/pending/sh.c
b/toys/pending/sh.c
index
87f2f9f
..
e221960
100644
(file)
--- 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 =
x
vfork();
+ cmd->pid = vfork();
if (!cmd->pid) xexec(cmd->argv);
else waitpid(cmd->pid, &status, 0);