Apple-2gs-SW/hush
1
0
Fork 0
mirror of https://github.com/sheumann/hush.git synced 2025-01-25 07:33:47 +00:00
Code Issues Projects Releases Wiki Activity

ORCA/C compat fixes. Variables must be at beginning of block.

Browse Source
This commit is contained in:
Stephen Heumann 2014-11-01 16:07:30 -05:00
parent 3577d48e74
commit d7a6168aa1
1 changed files with 16 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
shell/hush.c
View File

@ -5643,8 +5643,9 @@ static void re_execute_shell(char ***to_free, const char *s,
char **builtin_argv) char **builtin_argv)
{ {
# define NOMMU_HACK_FMT ("-$%x:%x:%x:%x:%x:%" PRIxMAX IF_HUSH_LOOPS(":%x")) # define NOMMU_HACK_FMT ("-$%x:%x:%x:%x:%x:%" PRIxMAX IF_HUSH_LOOPS(":%x"))
# define NOMMU_HACK_FMT_LEN 25
/* delims + 2 * (number of bytes in printed hex numbers) */ /* delims + 2 * (number of bytes in printed hex numbers) */
char param_buf[sizeof(NOMMU_HACK_FMT) + 2 * (sizeof(int)*6 + sizeof(uintmax_t)*1)]; char param_buf[NOMMU_HACK_FMT_LEN + 2 * (sizeof(int)*6 + sizeof(uintmax_t)*1)];
char *heredoc_argv[4]; char *heredoc_argv[4];
struct variable *cur; struct variable *cur;
# if ENABLE_HUSH_FUNCTIONS # if ENABLE_HUSH_FUNCTIONS
@ -5859,13 +5860,14 @@ static FILE *generate_stream_from_string(const char *s, pid_t *pid_p)
char **to_free = NULL; char **to_free = NULL;
# endif # endif
xpipe(channel);
struct child_args2 args_struct = { struct child_args2 args_struct = {
channel, channel,
s, s,
&to_free, &to_free,
}; };
xpipe(channel);
pid = BB_MMU ? xfork() : xvfork_and_run(xforked_child, &args_struct); pid = BB_MMU ? xfork() : xvfork_and_run(xforked_child, &args_struct);
#if BB_MMU #if BB_MMU
if (pid == 0) { /* child */ if (pid == 0) { /* child */
@ -7221,6 +7223,17 @@ static NOINLINE int run_pipe(struct pipe *pi)
struct fd_pair pipefds; struct fd_pair pipefds;
#if !BB_MMU #if !BB_MMU
volatile nommu_save_t nommu_save; volatile nommu_save_t nommu_save;
#endif
struct child_args args_struct = {
&pi,
&next_infd,
&pipefds,
&command,
&nommu_save,
&argv_expanded,
};
#if !BB_MMU
nommu_save.new_env = NULL; nommu_save.new_env = NULL;
nommu_save.old_vars = NULL; nommu_save.old_vars = NULL;
nommu_save.argv = NULL; nommu_save.argv = NULL;
@ -7241,15 +7254,6 @@ static NOINLINE int run_pipe(struct pipe *pi)
if (cmd_no < pi->num_cmds) if (cmd_no < pi->num_cmds)
xpiped_pair(pipefds); xpiped_pair(pipefds);
struct child_args args_struct = {
&pi,
&next_infd,
&pipefds,
&command,
&nommu_save,
&argv_expanded,
};
command->pid = BB_MMU ? fork() : vfork_and_run(forked_child, &args_struct); command->pid = BB_MMU ? fork() : vfork_and_run(forked_child, &args_struct);
#if BB_MMU #if BB_MMU
if (!command->pid) { /* child */ if (!command->pid) { /* child */