diff options
| author | Denis Vlasenko <vda.linux@googlemail.com> | 2008-07-29 11:10:01 +0000 |
|---|---|---|
| committer | Denis Vlasenko <vda.linux@googlemail.com> | 2008-07-29 11:10:01 +0000 |
| commit | d91afa33fd6874aeed458a84ceeb2b51af84505d (patch) | |
| tree | da1303e1d709413b4811fbdeac2ea1cbf7f8f449 /shell | |
| parent | dadfb4975b23b284fa02d15a5cfd21593b2993fc (diff) | |
| download | busybox-w32-d91afa33fd6874aeed458a84ceeb2b51af84505d.tar.gz busybox-w32-d91afa33fd6874aeed458a84ceeb2b51af84505d.tar.bz2 busybox-w32-d91afa33fd6874aeed458a84ceeb2b51af84505d.zip | |
randomconfig fixes
Diffstat (limited to 'shell')
| -rw-r--r-- | shell/hush.c | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/shell/hush.c b/shell/hush.c index 5af939d06..8ffc6121a 100644 --- a/shell/hush.c +++ b/shell/hush.c | |||
| @@ -217,7 +217,7 @@ void xxfree(void *ptr) | |||
| 217 | /* Keep unconditionally on for now */ | 217 | /* Keep unconditionally on for now */ |
| 218 | #define HUSH_DEBUG 1 | 218 | #define HUSH_DEBUG 1 |
| 219 | /* Do we support ANY keywords? */ | 219 | /* Do we support ANY keywords? */ |
| 220 | #if ENABLE_HUSH_IF || ENABLE_HUSH_LOOPS | 220 | #if ENABLE_HUSH_IF || ENABLE_HUSH_LOOPS || ENABLE_HUSH_CASE |
| 221 | #define HAS_KEYWORDS 1 | 221 | #define HAS_KEYWORDS 1 |
| 222 | #define IF_HAS_KEYWORDS(...) __VA_ARGS__ | 222 | #define IF_HAS_KEYWORDS(...) __VA_ARGS__ |
| 223 | #define IF_HAS_NO_KEYWORDS(...) | 223 | #define IF_HAS_NO_KEYWORDS(...) |
| @@ -276,6 +276,8 @@ typedef enum reserved_style { | |||
| 276 | RES_UNTIL , | 276 | RES_UNTIL , |
| 277 | RES_DO , | 277 | RES_DO , |
| 278 | RES_DONE , | 278 | RES_DONE , |
| 279 | #endif | ||
| 280 | #if ENABLE_HUSH_LOOPS || ENABLE_HUSH_CASE | ||
| 279 | RES_IN , | 281 | RES_IN , |
| 280 | #endif | 282 | #endif |
| 281 | #if ENABLE_HUSH_CASE | 283 | #if ENABLE_HUSH_CASE |
| @@ -1998,6 +2000,8 @@ static void debug_print_tree(struct pipe *pi, int lvl) | |||
| 1998 | [RES_UNTIL] = "UNTIL", | 2000 | [RES_UNTIL] = "UNTIL", |
| 1999 | [RES_DO ] = "DO" , | 2001 | [RES_DO ] = "DO" , |
| 2000 | [RES_DONE ] = "DONE" , | 2002 | [RES_DONE ] = "DONE" , |
| 2003 | #endif | ||
| 2004 | #if ENABLE_HUSH_LOOPS || ENABLE_HUSH_CASE | ||
| 2001 | [RES_IN ] = "IN" , | 2005 | [RES_IN ] = "IN" , |
| 2002 | #endif | 2006 | #endif |
| 2003 | #if ENABLE_HUSH_CASE | 2007 | #if ENABLE_HUSH_CASE |
| @@ -2058,7 +2062,7 @@ static int run_list(struct pipe *pi) | |||
| 2058 | #endif | 2062 | #endif |
| 2059 | smallint flag_skip = 1; | 2063 | smallint flag_skip = 1; |
| 2060 | smalluint rcode = 0; /* probably just for compiler */ | 2064 | smalluint rcode = 0; /* probably just for compiler */ |
| 2061 | #if ENABLE_HUSH_IF | 2065 | #if ENABLE_HUSH_IF || ENABLE_HUSH_CASE |
| 2062 | smalluint cond_code = 0; | 2066 | smalluint cond_code = 0; |
| 2063 | #else | 2067 | #else |
| 2064 | enum { cond_code = 0, }; | 2068 | enum { cond_code = 0, }; |
