emo/busybox
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

use user's shell instead of hardwired "/bin/sh" (android needs this)

Browse Source 
Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
This commit is contained in:
Denys Vlasenko
2011-03-08 21:00:36 +01:00
parent 86cf0364bd
commit 681efe20d3
12 changed files with 38 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
runit/svlogd.c
View File

@@ -187,6 +187,7 @@ struct globals {
unsigned nearest_rotate;
void* (*memRchr)(const void *, int, size_t);
char *shell;
smallint exitasap;
smallint rotateasap;
@@ -382,6 +383,9 @@ static void processorstart(struct logdir *ld)
/* vfork'ed child trashes this byte, save... */
sv_ch = ld->fnsave[26];
if (!G.shell)
G.shell = xstrdup(get_shell_name());
while ((pid = vfork()) == -1)
pause2cannot("vfork for processor", ld->name);
if (!pid) {
@@ -416,8 +420,7 @@ static void processorstart(struct logdir *ld)
fd = xopen("newstate", O_WRONLY|O_NDELAY|O_TRUNC|O_CREAT);
xmove_fd(fd, 5);
// getenv("SHELL")?
execl(DEFAULT_SHELL, DEFAULT_SHELL_SHORT_NAME, "-c", ld->processor, (char*) NULL);
execl(G.shell, G.shell, "-c", ld->processor, (char*) NULL);
bb_perror_msg_and_die(FATAL"can't %s processor %s", "run", ld->name);
}
ld->fnsave[26] = sv_ch; /* ...restore */