Apple-2gs-SW/hush
1
0
Fork 0
mirror of https://github.com/sheumann/hush.git synced 2025-01-10 16:29:44 +00:00
Code Issues Projects Releases Wiki Activity

ash: trivial fixes for compile failures

Browse Source 
Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>
This commit is contained in:
Denys Vlasenko 2012-09-25 12:49:29 +02:00
parent ffe03f04cb
commit 0b4980c252
1 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
shell/ash.c
View File

@ -6338,7 +6338,8 @@ subevalvar(char *p, char *varname, int strloc, int subtype,
IF_ASH_BASH_COMPAT(const char *repl = NULL;) IF_ASH_BASH_COMPAT(const char *repl = NULL;)
IF_ASH_BASH_COMPAT(int pos, len, orig_len;) IF_ASH_BASH_COMPAT(int pos, len, orig_len;)
int saveherefd = herefd; int saveherefd = herefd;
int amount, workloc, resetloc; int amount, resetloc;
IF_ASH_BASH_COMPAT(int workloc;)
int zero; int zero;
char *(*scan)(char*, char*, char*, char*, int, int); char *(*scan)(char*, char*, char*, char*, int, int);
@ -6451,9 +6452,9 @@ subevalvar(char *p, char *varname, int strloc, int subtype,
rmescend--; rmescend--;
str = (char *)stackblock() + strloc; str = (char *)stackblock() + strloc;
preglob(str, varflags & VSQUOTE, 0); preglob(str, varflags & VSQUOTE, 0);
workloc = expdest - (char *)stackblock();
#if ENABLE_ASH_BASH_COMPAT #if ENABLE_ASH_BASH_COMPAT
workloc = expdest - (char *)stackblock();
if (subtype == VSREPLACE || subtype == VSREPLACEALL) { if (subtype == VSREPLACE || subtype == VSREPLACEALL) {
char *idx, *end; char *idx, *end;
@ -9310,11 +9311,11 @@ evalcommand(union node *cmd, int flags)
/* Now locate the command. */ /* Now locate the command. */
if (argc) { if (argc) {
const char *oldpath;
int cmd_flag = DO_ERR; int cmd_flag = DO_ERR;
#if ENABLE_ASH_CMDCMD
const char *oldpath = path + 5;
#endif
path += 5; path += 5;
oldpath = path;
for (;;) { for (;;) {
find_command(argv[0], &cmdentry, cmd_flag, path); find_command(argv[0], &cmdentry, cmd_flag, path);
if (cmdentry.cmdtype == CMDUNKNOWN) { if (cmdentry.cmdtype == CMDUNKNOWN) {