Apple-2gs-SW/hush
1
0
Fork 0
mirror of https://github.com/sheumann/hush.git synced 2024-12-21 23:29:34 +00:00
Code Issues Projects Releases Wiki Activity

more compile fixes from randomconfig run

Browse Source
This commit is contained in:
Denis Vlasenko 2007-05-17 13:02:41 +00:00
parent d46e6d1a55
commit 96f67dc69d
2 changed files with 10 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
libbb/vfork_daemon_rexec.c
View File

@ -100,6 +100,7 @@ int wait_pid(int *wstat, int pid)
return r; return r;
} }
#if ENABLE_FEATURE_PREFER_APPLETS
void save_nofork_data(struct nofork_save_area *save) void save_nofork_data(struct nofork_save_area *save)
{ {
save->current_applet = current_applet; save->current_applet = current_applet;
@ -162,6 +163,7 @@ int run_nofork_applet(const struct bb_applet *a, char **argv)
save_nofork_data(&old); save_nofork_data(&old);
return run_nofork_applet_prime(&old, a, argv); return run_nofork_applet_prime(&old, a, argv);
} }
#endif /* FEATURE_PREFER_APPLETS */
int spawn_and_wait(char **argv) int spawn_and_wait(char **argv)
{ {

16
shell/hush.c
View File

@ -486,6 +486,10 @@ static const struct built_in_command bltins[] = {
{ NULL, NULL, NULL } { NULL, NULL, NULL }
}; };
#if ENABLE_FEATURE_SH_STANDALONE
struct nofork_save_area nofork_save;
#endif
#if ENABLE_HUSH_JOB #if ENABLE_HUSH_JOB
/* move to libbb? */ /* move to libbb? */
@ -537,10 +541,6 @@ static void set_every_sighandler(void (*handler)(int))
static struct pipe *toplevel_list; static struct pipe *toplevel_list;
static sigjmp_buf toplevel_jb; static sigjmp_buf toplevel_jb;
smallint ctrl_z_flag; smallint ctrl_z_flag;
#if ENABLE_FEATURE_SH_STANDALONE
struct nofork_save_area nofork_save;
#endif
static void handler_ctrl_c(int sig) static void handler_ctrl_c(int sig)
{ {
debug_printf_jobs("got sig %d\n", sig); debug_printf_jobs("got sig %d\n", sig);
@ -1105,7 +1105,9 @@ static int file_get(struct in_str *i)
/* If there is data waiting, eat it up */ /* If there is data waiting, eat it up */
if (i->p && *i->p) { if (i->p && *i->p) {
#if ENABLE_HUSH_INTERACTIVE
take_cached: take_cached:
#endif
ch = *i->p++; ch = *i->p++;
if (i->eof_flag && !*i->p) if (i->eof_flag && !*i->p)
ch = EOF; ch = EOF;
@ -1120,11 +1122,9 @@ static int file_get(struct in_str *i)
i->promptmode = 2; i->promptmode = 2;
i->__promptme = 0; i->__promptme = 0;
goto take_cached; goto take_cached;
} else
#endif
{
ch = fgetc(i->file);
} }
#endif
ch = fgetc(i->file);
} }
debug_printf("file_get: got a '%c' %d\n", ch, ch); debug_printf("file_get: got a '%c' %d\n", ch, ch);
#if ENABLE_HUSH_INTERACTIVE #if ENABLE_HUSH_INTERACTIVE