aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--shell/ash.c10
1 files changed, 4 insertions, 6 deletions
diff --git a/shell/ash.c b/shell/ash.c
index 366f704be..3d7043c8f 100644
--- a/shell/ash.c
+++ b/shell/ash.c
@@ -9967,8 +9967,8 @@ static int
9967readtoken() { 9967readtoken() {
9968 int t; 9968 int t;
9969 9969
9970#ifdef CONFIG_ASH_ALIAS
9971 int savecheckalias = checkalias; 9970 int savecheckalias = checkalias;
9971#ifdef CONFIG_ASH_ALIAS
9972 int savecheckkwd = checkkwd; 9972 int savecheckkwd = checkkwd;
9973 struct alias *ap; 9973 struct alias *ap;
9974#endif 9974#endif
@@ -9983,9 +9983,7 @@ top:
9983 9983
9984 t = xxreadtoken(); 9984 t = xxreadtoken();
9985 9985
9986#ifdef CONFIG_ASH_ALIAS
9987 checkalias = savecheckalias; 9986 checkalias = savecheckalias;
9988#endif
9989 9987
9990 if (checkkwd) { 9988 if (checkkwd) {
9991 /* 9989 /*
@@ -10021,8 +10019,8 @@ top:
10021 } 10019 }
10022 } else if (checkalias == 2 && isassignment(wordtext)) { 10020 } else if (checkalias == 2 && isassignment(wordtext)) {
10023 lasttoken = t = TASSIGN; 10021 lasttoken = t = TASSIGN;
10024#ifdef CONFIG_ASH_ALIAS
10025 } else if (checkalias) { 10022 } else if (checkalias) {
10023#ifdef CONFIG_ASH_ALIAS
10026 if (!quoteflag && (ap = *__lookupalias(wordtext)) != NULL && !(ap->flag & ALIASINUSE)) { 10024 if (!quoteflag && (ap = *__lookupalias(wordtext)) != NULL && !(ap->flag & ALIASINUSE)) {
10027 if (*ap->val) { 10025 if (*ap->val) {
10028 pushstring(ap->val, strlen(ap->val), ap); 10026 pushstring(ap->val, strlen(ap->val), ap);
@@ -10030,8 +10028,8 @@ top:
10030 checkkwd = savecheckkwd; 10028 checkkwd = savecheckkwd;
10031 goto top; 10029 goto top;
10032 } 10030 }
10033 checkalias = 0;
10034#endif 10031#endif
10032 checkalias = 0;
10035 } 10033 }
10036out: 10034out:
10037#ifdef DEBUG 10035#ifdef DEBUG
@@ -12442,7 +12440,7 @@ findvar(struct var **vpp, const char *name)
12442/* 12440/*
12443 * Copyright (c) 1999 Herbert Xu <herbert@debian.org> 12441 * Copyright (c) 1999 Herbert Xu <herbert@debian.org>
12444 * This file contains code for the times builtin. 12442 * This file contains code for the times builtin.
12445 * $Id: ash.c,v 1.53 2002/07/03 23:19:22 andersen Exp $ 12443 * $Id: ash.c,v 1.54 2002/07/04 00:19:46 andersen Exp $
12446 */ 12444 */
12447static int timescmd (int argc, char **argv) 12445static int timescmd (int argc, char **argv)
12448{ 12446{