emo/busybox
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

randomconfig fixes

Browse Source
This commit is contained in:
Denis Vlasenko 2008-07-29 11:10:01 +00:00
parent dadfb4975b
commit d91afa33fd
2 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
shell/hush.c
View File

@ -217,7 +217,7 @@ void xxfree(void *ptr)
/* Keep unconditionally on for now */ /* Keep unconditionally on for now */
#define HUSH_DEBUG 1 #define HUSH_DEBUG 1
/* Do we support ANY keywords? */ /* Do we support ANY keywords? */
#if ENABLE_HUSH_IF || ENABLE_HUSH_LOOPS #if ENABLE_HUSH_IF || ENABLE_HUSH_LOOPS || ENABLE_HUSH_CASE
#define HAS_KEYWORDS 1 #define HAS_KEYWORDS 1
#define IF_HAS_KEYWORDS(...) __VA_ARGS__ #define IF_HAS_KEYWORDS(...) __VA_ARGS__
#define IF_HAS_NO_KEYWORDS(...) #define IF_HAS_NO_KEYWORDS(...)
@ -276,6 +276,8 @@ typedef enum reserved_style {
RES_UNTIL , RES_UNTIL ,
RES_DO , RES_DO ,
RES_DONE , RES_DONE ,
#endif
#if ENABLE_HUSH_LOOPS || ENABLE_HUSH_CASE
RES_IN , RES_IN ,
#endif #endif
#if ENABLE_HUSH_CASE #if ENABLE_HUSH_CASE
@ -1998,6 +2000,8 @@ static void debug_print_tree(struct pipe *pi, int lvl)
[RES_UNTIL] = "UNTIL", [RES_UNTIL] = "UNTIL",
[RES_DO ] = "DO" , [RES_DO ] = "DO" ,
[RES_DONE ] = "DONE" , [RES_DONE ] = "DONE" ,
#endif
#if ENABLE_HUSH_LOOPS || ENABLE_HUSH_CASE
[RES_IN ] = "IN" , [RES_IN ] = "IN" ,
#endif #endif
#if ENABLE_HUSH_CASE #if ENABLE_HUSH_CASE
@ -2058,7 +2062,7 @@ static int run_list(struct pipe *pi)
#endif #endif
smallint flag_skip = 1; smallint flag_skip = 1;
smalluint rcode = 0; /* probably just for compiler */ smalluint rcode = 0; /* probably just for compiler */
#if ENABLE_HUSH_IF #if ENABLE_HUSH_IF || ENABLE_HUSH_CASE
smalluint cond_code = 0; smalluint cond_code = 0;
#else #else
enum { cond_code = 0, }; enum { cond_code = 0, };

2
util-linux/fbset.c
View File

@ -170,6 +170,7 @@ enum {
}; };
#endif #endif
#if ENABLE_FEATURE_FBSET_READMODE
static void ss(uint32_t *x, uint32_t flag, char *buf, const char *what) static void ss(uint32_t *x, uint32_t flag, char *buf, const char *what)
{ {
if (strstr(buf, what)) if (strstr(buf, what))
@ -178,7 +179,6 @@ static void ss(uint32_t *x, uint32_t flag, char *buf, const char *what)
*x |= flag; *x |= flag;
} }
#if ENABLE_FEATURE_FBSET_READMODE
static int readmode(struct fb_var_screeninfo *base, const char *fn, static int readmode(struct fb_var_screeninfo *base, const char *fn,
const char *mode) const char *mode)
{ {