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

hush: fix thinko in re_execute_shell; pass even less junk to heredoc helper

Browse Source 
function                                             old     new   delta
re_execute_shell                                     284     314     +30
setup_heredoc                                        290     303     +13
execv                                                 23       -     -23
This commit is contained in:
Denis Vlasenko 2009-04-09 01:39:02 +00:00
parent 5c090a96f9
commit a2218dd862
1 changed files with 19 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
shell/hush.c
View File

@ -2180,10 +2180,21 @@ static void re_execute_shell(const char *s, int is_heredoc) NORETURN;
static void re_execute_shell(const char *s, int is_heredoc) static void re_execute_shell(const char *s, int is_heredoc)
{ {
char param_buf[sizeof("-$%x:%x:%x:%x") + sizeof(unsigned) * 4]; char param_buf[sizeof("-$%x:%x:%x:%x") + sizeof(unsigned) * 4];
char *heredoc_argv[4];
struct variable *cur; struct variable *cur;
char **argv, **pp, **pp2; char **argv, **pp, **pp2;
unsigned cnt; unsigned cnt;
if (is_heredoc) {
argv = heredoc_argv;
argv[0] = (char *) G.argv0_for_re_execing;
argv[1] = (char *) "-<";
argv[2] = (char *) s;
argv[3] = NULL;
pp = &argv[3]; /* used as pointer to empty environmaent */
goto do_exec;
}
sprintf(param_buf, "-$%x:%x:%x" USE_HUSH_LOOPS(":%x") sprintf(param_buf, "-$%x:%x:%x" USE_HUSH_LOOPS(":%x")
, (unsigned) G.root_pid , (unsigned) G.root_pid
, (unsigned) G.last_bg_pid , (unsigned) G.last_bg_pid
@ -2198,7 +2209,7 @@ static void re_execute_shell(const char *s, int is_heredoc)
if (!cur->flg_export || cur->flg_read_only) if (!cur->flg_export || cur->flg_read_only)
cnt += 2; cnt += 2;
} }
G.argv_from_re_execing = pp = xzalloc(sizeof(argv[0]) * cnt); G.argv_from_re_execing = argv = pp = xzalloc(sizeof(argv[0]) * cnt);
*pp++ = (char *) G.argv0_for_re_execing; *pp++ = (char *) G.argv0_for_re_execing;
*pp++ = param_buf; *pp++ = param_buf;
for (cur = G.top_var; cur; cur = cur->next) { for (cur = G.top_var; cur; cur = cur->next) {
@ -2232,22 +2243,21 @@ static void re_execute_shell(const char *s, int is_heredoc)
* I conclude it means we don't need to pass active traps here. * I conclude it means we don't need to pass active traps here.
* exec syscall below resets them to SIG_DFL for us. * exec syscall below resets them to SIG_DFL for us.
*/ */
*pp++ = (char *) (is_heredoc ? "-<" : "-c"); *pp++ = (char *) "-c";
*pp++ = (char *) s; *pp++ = (char *) s;
pp2 = G.global_argv; pp2 = G.global_argv;
while (*pp2) while (*pp2)
*pp++ = *pp2++; *pp++ = *pp2++;
/* *pp = NULL; - is already there */ /* *pp = NULL; - is already there */
pp = environ;
do_exec:
debug_printf_exec("re_execute_shell pid:%d cmd:'%s'\n", getpid(), s); debug_printf_exec("re_execute_shell pid:%d cmd:'%s'\n", getpid(), s);
sigprocmask(SIG_SETMASK, &G.inherited_set, NULL); sigprocmask(SIG_SETMASK, &G.inherited_set, NULL);
execve(bb_busybox_exec_path, execve(bb_busybox_exec_path, argv, pp);
G.argv_from_re_execing,
(is_heredoc ? pp /* points to NULL ptr */ : environ)
);
/* Fallback. Useful for init=/bin/hush usage etc */ /* Fallback. Useful for init=/bin/hush usage etc */
if (G.argv0_for_re_execing[0] == '/') if (argv[0][0] == '/')
execv(G.argv0_for_re_execing, G.argv_from_re_execing); execve(argv[0], argv, pp);
xfunc_error_retval = 127; xfunc_error_retval = 127;
bb_error_msg_and_die("can't re-execute the shell"); bb_error_msg_and_die("can't re-execute the shell");
} }
@ -2281,6 +2291,7 @@ static void setup_heredoc(struct redir_struct *redir)
} }
len = strlen(heredoc); len = strlen(heredoc);
close(redir->rd_fd); /* often saves dup2+close in xmove_fd */
xpiped_pair(pair); xpiped_pair(pair);
xmove_fd(pair.rd, redir->rd_fd); xmove_fd(pair.rd, redir->rd_fd);