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

hush: pass $n to functions

Browse Source 
function                                             old     new   delta
run_pipe                                            1183    1325    +142
run_list                                            1219    1220      +1
------------------------------------------------------------------------------
(add/remove: 0/0 grow/shrink: 2/0 up/down: 143/0)             Total: 143 bytes
This commit is contained in:
Denis Vlasenko 2009-04-10 21:57:50 +00:00
parent c0ea329297
commit 6ba6f546ac
1 changed files with 50 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

56
shell/hush.c
View File

@ -2644,6 +2644,7 @@ static const struct function *find_function(const char *name)
debug_printf_exec("found function '%s'\n", name); debug_printf_exec("found function '%s'\n", name);
return funcp; return funcp;
} }
static void exec_function(const struct function *funcp, char **argv) NORETURN; static void exec_function(const struct function *funcp, char **argv) NORETURN;
static void exec_function(const struct function *funcp, char **argv) static void exec_function(const struct function *funcp, char **argv)
{ {
@ -2660,7 +2661,49 @@ static void exec_function(const struct function *funcp, char **argv)
_exit(n); _exit(n);
# else # else
re_execute_shell(funcp->body_as_string, G.global_argv[0], argv + 1); re_execute_shell(funcp->body_as_string, G.global_argv[0], argv + 1);
#endif # endif
}
static int run_function(const struct function *funcp, char **argv)
{
int n;
char **pp;
char *sv_argv0;
smallint sv_g_malloced;
int sv_g_argc;
char **sv_g_argv;
sv_argv0 = argv[0];
sv_g_malloced = G.global_args_malloced;
sv_g_argc = G.global_argc;
sv_g_argv = G.global_argv;
pp = argv;
n = 1;
while (*++pp)
n++;
argv[0] = G.global_argv[0]; /* retain $0 */
G.global_args_malloced = 0;
G.global_argc = n;
G.global_argv = argv;
n = run_list(funcp->body);
if (G.global_args_malloced) {
/* function ran "set -- arg1 arg2 ..." */
pp = G.global_argv;
while (*++pp)
free(*pp);
free(G.global_argv);
}
argv[0] = sv_argv0;
G.global_args_malloced = sv_g_malloced;
G.global_argc = sv_g_argc;
G.global_argv = sv_g_argv;
return n;
} }
#endif #endif
@ -3238,7 +3281,7 @@ static int run_pipe(struct pipe *pi)
else { else {
debug_printf_exec(": function '%s' '%s'...\n", debug_printf_exec(": function '%s' '%s'...\n",
funcp->name, argv_expanded[1]); funcp->name, argv_expanded[1]);
rcode = run_list(funcp->body) & 0xff; rcode = run_function(funcp, argv_expanded) & 0xff;
} }
#endif #endif
} }
@ -6436,19 +6479,14 @@ static int builtin_set(char **argv)
++argv; ++argv;
goto set_argv; goto set_argv;
} }
if (arg[0] != '+' && arg[0] != '-')
if (arg[0] == '+' || arg[0] == '-') { break;
for (n = 1; arg[n]; ++n) for (n = 1; arg[n]; ++n)
if (set_mode(arg[0], arg[n])) if (set_mode(arg[0], arg[n]))
goto error; goto error;
continue;
}
break;
} while ((arg = *++argv) != NULL); } while ((arg = *++argv) != NULL);
/* Now argv[0] is 1st argument */ /* Now argv[0] is 1st argument */
/* Only reset global_argv if we didn't process anything */
if (arg == NULL) if (arg == NULL)
return EXIT_SUCCESS; return EXIT_SUCCESS;
set_argv: set_argv: