From 3528bee569f518dcb66e1343dd808b437499db84 Mon Sep 17 00:00:00 2001 From: Ron Yorston Date: Wed, 19 Oct 2016 17:19:04 +0100 Subject: Post-merge fixes Update default configurations; rename ststrdup -> sstrdup; fix status returns in evalcommand. --- shell/ash.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'shell') diff --git a/shell/ash.c b/shell/ash.c index 02e76c0ae..1485a35c9 100644 --- a/shell/ash.c +++ b/shell/ash.c @@ -2650,7 +2650,7 @@ updatepwd(const char *dir) int absdrive = *dir && dir[1] == ':'; int abspath = absdrive ? is_path_sep(dir[2]) : is_path_sep(*dir); - cdcomppath = ststrdup(dir); + cdcomppath = sstrdup(dir); STARTSTACKSTR(new); if (!absdrive && curdir == nullstr) return 0; @@ -10014,7 +10014,7 @@ evalcommand(union node *cmd, int flags) if (applet_no >= 0 && APPLET_IS_NOFORK(applet_no)) { listsetvar(varlist.list, VEXPORT|VSTACK); /* run _main() */ - exitstatus = run_nofork_applet(applet_no, argv); + status = run_nofork_applet(applet_no, argv); break; } #endif @@ -10036,7 +10036,7 @@ evalcommand(union node *cmd, int flags) jp = makejob(/*cmd,*/ 1); if (spawn_forkshell(jp, &fs, FORK_FG) < 0) ash_msg_and_raise_error("unable to spawn shell"); - exitstatus = waitforjob(jp); + status = waitforjob(jp); INT_ON; TRACE(("forked child exited with %d\n", exitstatus)); break; -- cgit v1.2.3-55-g6feb