diff options
Diffstat (limited to 'scripts')
-rw-r--r-- | scripts/config/Kconfig-language.txt | 2 | ||||
-rw-r--r-- | scripts/config/Makefile | 4 | ||||
-rw-r--r-- | scripts/config/checklist.c | 10 | ||||
-rw-r--r-- | scripts/config/dialog.h | 4 | ||||
-rw-r--r-- | scripts/config/lex.zconf.c_shipped | 84 | ||||
-rw-r--r-- | scripts/config/mconf.c | 12 | ||||
-rw-r--r-- | scripts/config/menu.c | 2 | ||||
-rw-r--r-- | scripts/config/menubox.c | 6 | ||||
-rw-r--r-- | scripts/config/util.c | 6 | ||||
-rw-r--r-- | scripts/config/zconf.tab.c_shipped | 32 | ||||
-rw-r--r-- | scripts/mkdep.c | 2 | ||||
-rw-r--r-- | scripts/split-include.c | 2 |
12 files changed, 83 insertions, 83 deletions
diff --git a/scripts/config/Kconfig-language.txt b/scripts/config/Kconfig-language.txt index a3037ffcf..493749b32 100644 --- a/scripts/config/Kconfig-language.txt +++ b/scripts/config/Kconfig-language.txt | |||
@@ -112,7 +112,7 @@ module state. Dependency expressions have the following syntax: | |||
112 | <expr> '||' <expr> (6) | 112 | <expr> '||' <expr> (6) |
113 | <expr> '&&' <expr> (7) | 113 | <expr> '&&' <expr> (7) |
114 | 114 | ||
115 | Expressions are listed in decreasing order of precedence. | 115 | Expressions are listed in decreasing order of precedence. |
116 | 116 | ||
117 | (1) Convert the symbol into an expression. Boolean and tristate symbols | 117 | (1) Convert the symbol into an expression. Boolean and tristate symbols |
118 | are simply converted into the respective expression values. All | 118 | are simply converted into the respective expression values. All |
diff --git a/scripts/config/Makefile b/scripts/config/Makefile index ab3df4993..e15ec399c 100644 --- a/scripts/config/Makefile +++ b/scripts/config/Makefile | |||
@@ -38,7 +38,7 @@ CONF_OBJS =$(patsubst %.c,%.o, $(CONF_SRC)) | |||
38 | MCONF_OBJS=$(patsubst %.c,%.o, $(MCONF_SRC)) | 38 | MCONF_OBJS=$(patsubst %.c,%.o, $(MCONF_SRC)) |
39 | SHARED_OBJS=$(patsubst %.c,%.o, $(SHARED_SRC)) | 39 | SHARED_OBJS=$(patsubst %.c,%.o, $(SHARED_SRC)) |
40 | 40 | ||
41 | conf: $(CONF_OBJS) $(SHARED_OBJS) | 41 | conf: $(CONF_OBJS) $(SHARED_OBJS) |
42 | $(HOSTCC) $(NATIVE_LDFLAGS) $^ -o $@ | 42 | $(HOSTCC) $(NATIVE_LDFLAGS) $^ -o $@ |
43 | 43 | ||
44 | mconf: $(MCONF_OBJS) $(SHARED_OBJS) | 44 | mconf: $(MCONF_OBJS) $(SHARED_OBJS) |
@@ -55,7 +55,7 @@ lkc_defs.h: lkc_proto.h | |||
55 | 55 | ||
56 | ### | 56 | ### |
57 | # The following requires flex/bison | 57 | # The following requires flex/bison |
58 | # By default we use the _shipped versions, uncomment the | 58 | # By default we use the _shipped versions, uncomment the |
59 | # following line if you are modifying the flex/bison src. | 59 | # following line if you are modifying the flex/bison src. |
60 | #LKC_GENPARSER := 1 | 60 | #LKC_GENPARSER := 1 |
61 | 61 | ||
diff --git a/scripts/config/checklist.c b/scripts/config/checklist.c index c4a9289b9..9744d798d 100644 --- a/scripts/config/checklist.c +++ b/scripts/config/checklist.c | |||
@@ -120,7 +120,7 @@ int | |||
120 | dialog_checklist (const char *title, const char *prompt, int height, int width, | 120 | dialog_checklist (const char *title, const char *prompt, int height, int width, |
121 | int list_height, int item_no, struct dialog_list_item ** items, | 121 | int list_height, int item_no, struct dialog_list_item ** items, |
122 | int flag) | 122 | int flag) |
123 | 123 | ||
124 | { | 124 | { |
125 | int i, x, y, box_x, box_y; | 125 | int i, x, y, box_x, box_y; |
126 | int key = 0, button = 0, choice = 0, scroll = 0, max_choice, *status; | 126 | int key = 0, button = 0, choice = 0, scroll = 0, max_choice, *status; |
@@ -195,7 +195,7 @@ dialog_checklist (const char *title, const char *prompt, int height, int width, | |||
195 | 195 | ||
196 | /* Find length of longest item in order to center checklist */ | 196 | /* Find length of longest item in order to center checklist */ |
197 | check_x = 0; | 197 | check_x = 0; |
198 | for (i = 0; i < item_no; i++) | 198 | for (i = 0; i < item_no; i++) |
199 | check_x = MAX (check_x, + strlen (items[i]->name) + 4); | 199 | check_x = MAX (check_x, + strlen (items[i]->name) + 4); |
200 | 200 | ||
201 | check_x = (list_width - check_x) / 2; | 201 | check_x = (list_width - check_x) / 2; |
@@ -229,7 +229,7 @@ dialog_checklist (const char *title, const char *prompt, int height, int width, | |||
229 | break; | 229 | break; |
230 | 230 | ||
231 | 231 | ||
232 | if ( i < max_choice || key == KEY_UP || key == KEY_DOWN || | 232 | if ( i < max_choice || key == KEY_UP || key == KEY_DOWN || |
233 | key == '+' || key == '-' ) { | 233 | key == '+' || key == '-' ) { |
234 | if (key == KEY_UP || key == '-') { | 234 | if (key == KEY_UP || key == '-') { |
235 | if (!choice) { | 235 | if (!choice) { |
@@ -337,7 +337,7 @@ dialog_checklist (const char *title, const char *prompt, int height, int width, | |||
337 | } | 337 | } |
338 | wnoutrefresh (list); | 338 | wnoutrefresh (list); |
339 | wrefresh (dialog); | 339 | wrefresh (dialog); |
340 | 340 | ||
341 | for (i = 0; i < item_no; i++) { | 341 | for (i = 0; i < item_no; i++) { |
342 | items[i]->selected = status[i]; | 342 | items[i]->selected = status[i]; |
343 | } | 343 | } |
@@ -355,7 +355,7 @@ dialog_checklist (const char *title, const char *prompt, int height, int width, | |||
355 | /* Now, update everything... */ | 355 | /* Now, update everything... */ |
356 | doupdate (); | 356 | doupdate (); |
357 | } | 357 | } |
358 | 358 | ||
359 | 359 | ||
360 | delwin (dialog); | 360 | delwin (dialog); |
361 | free (status); | 361 | free (status); |
diff --git a/scripts/config/dialog.h b/scripts/config/dialog.h index 8116cee36..6486cc8f7 100644 --- a/scripts/config/dialog.h +++ b/scripts/config/dialog.h | |||
@@ -86,7 +86,7 @@ | |||
86 | #define ACS_DARROW 'v' | 86 | #define ACS_DARROW 'v' |
87 | #endif | 87 | #endif |
88 | 88 | ||
89 | /* | 89 | /* |
90 | * Attribute names | 90 | * Attribute names |
91 | */ | 91 | */ |
92 | #define screen_attr attributes[0] | 92 | #define screen_attr attributes[0] |
@@ -162,7 +162,7 @@ int dialog_msgbox (const char *title, const char *prompt, int height, | |||
162 | int width, int pause); | 162 | int width, int pause); |
163 | int dialog_textbox (const char *title, const char *file, int height, int width); | 163 | int dialog_textbox (const char *title, const char *file, int height, int width); |
164 | int dialog_menu (const char *title, const char *prompt, int height, int width, | 164 | int dialog_menu (const char *title, const char *prompt, int height, int width, |
165 | int menu_height, const char *choice, int item_no, | 165 | int menu_height, const char *choice, int item_no, |
166 | struct dialog_list_item ** items); | 166 | struct dialog_list_item ** items); |
167 | int dialog_checklist (const char *title, const char *prompt, int height, | 167 | int dialog_checklist (const char *title, const char *prompt, int height, |
168 | int width, int list_height, int item_no, | 168 | int width, int list_height, int item_no, |
diff --git a/scripts/config/lex.zconf.c_shipped b/scripts/config/lex.zconf.c_shipped index 22dda11f7..b877bb6b3 100644 --- a/scripts/config/lex.zconf.c_shipped +++ b/scripts/config/lex.zconf.c_shipped | |||
@@ -42,7 +42,7 @@ typedef uint32_t flex_uint32_t; | |||
42 | typedef signed char flex_int8_t; | 42 | typedef signed char flex_int8_t; |
43 | typedef short int flex_int16_t; | 43 | typedef short int flex_int16_t; |
44 | typedef int flex_int32_t; | 44 | typedef int flex_int32_t; |
45 | typedef unsigned char flex_uint8_t; | 45 | typedef unsigned char flex_uint8_t; |
46 | typedef unsigned short int flex_uint16_t; | 46 | typedef unsigned short int flex_uint16_t; |
47 | typedef unsigned int flex_uint32_t; | 47 | typedef unsigned int flex_uint32_t; |
48 | #endif /* ! C99 */ | 48 | #endif /* ! C99 */ |
@@ -148,7 +148,7 @@ extern FILE *zconfin, *zconfout; | |||
148 | #define EOB_ACT_LAST_MATCH 2 | 148 | #define EOB_ACT_LAST_MATCH 2 |
149 | 149 | ||
150 | #define YY_LESS_LINENO(n) | 150 | #define YY_LESS_LINENO(n) |
151 | 151 | ||
152 | /* Return all but the first "n" matched characters back to the input stream. */ | 152 | /* Return all but the first "n" matched characters back to the input stream. */ |
153 | #define yyless(n) \ | 153 | #define yyless(n) \ |
154 | do \ | 154 | do \ |
@@ -215,7 +215,7 @@ struct yy_buffer_state | |||
215 | 215 | ||
216 | int yy_bs_lineno; /**< The line count. */ | 216 | int yy_bs_lineno; /**< The line count. */ |
217 | int yy_bs_column; /**< The column count. */ | 217 | int yy_bs_column; /**< The column count. */ |
218 | 218 | ||
219 | /* Whether to try to fill the input buffer when we reach the | 219 | /* Whether to try to fill the input buffer when we reach the |
220 | * end of it. | 220 | * end of it. |
221 | */ | 221 | */ |
@@ -2089,7 +2089,7 @@ extern int zconfwrap (void ); | |||
2089 | #endif | 2089 | #endif |
2090 | 2090 | ||
2091 | static void yyunput (int c,char *buf_ptr ); | 2091 | static void yyunput (int c,char *buf_ptr ); |
2092 | 2092 | ||
2093 | #ifndef yytext_ptr | 2093 | #ifndef yytext_ptr |
2094 | static void yy_flex_strncpy (char *,yyconst char *,int ); | 2094 | static void yy_flex_strncpy (char *,yyconst char *,int ); |
2095 | #endif | 2095 | #endif |
@@ -2194,7 +2194,7 @@ YY_DECL | |||
2194 | register yy_state_type yy_current_state; | 2194 | register yy_state_type yy_current_state; |
2195 | register char *yy_cp, *yy_bp; | 2195 | register char *yy_cp, *yy_bp; |
2196 | register int yy_act; | 2196 | register int yy_act; |
2197 | 2197 | ||
2198 | int str = 0; | 2198 | int str = 0; |
2199 | int ts, i; | 2199 | int ts, i; |
2200 | 2200 | ||
@@ -2899,7 +2899,7 @@ static int yy_get_next_buffer (void) | |||
2899 | { | 2899 | { |
2900 | register yy_state_type yy_current_state; | 2900 | register yy_state_type yy_current_state; |
2901 | register char *yy_cp; | 2901 | register char *yy_cp; |
2902 | 2902 | ||
2903 | yy_current_state = (yy_start); | 2903 | yy_current_state = (yy_start); |
2904 | 2904 | ||
2905 | for ( yy_cp = (yytext_ptr) + YY_MORE_ADJ; yy_cp < (yy_c_buf_p); ++yy_cp ) | 2905 | for ( yy_cp = (yytext_ptr) + YY_MORE_ADJ; yy_cp < (yy_c_buf_p); ++yy_cp ) |
@@ -2918,7 +2918,7 @@ static int yy_get_next_buffer (void) | |||
2918 | static yy_state_type yy_try_NUL_trans (yy_state_type yy_current_state ) | 2918 | static yy_state_type yy_try_NUL_trans (yy_state_type yy_current_state ) |
2919 | { | 2919 | { |
2920 | register int yy_is_jam; | 2920 | register int yy_is_jam; |
2921 | 2921 | ||
2922 | yy_current_state = yy_nxt[yy_current_state][1]; | 2922 | yy_current_state = yy_nxt[yy_current_state][1]; |
2923 | yy_is_jam = (yy_current_state <= 0); | 2923 | yy_is_jam = (yy_current_state <= 0); |
2924 | 2924 | ||
@@ -2928,7 +2928,7 @@ static int yy_get_next_buffer (void) | |||
2928 | static void yyunput (int c, register char * yy_bp ) | 2928 | static void yyunput (int c, register char * yy_bp ) |
2929 | { | 2929 | { |
2930 | register char *yy_cp; | 2930 | register char *yy_cp; |
2931 | 2931 | ||
2932 | yy_cp = (yy_c_buf_p); | 2932 | yy_cp = (yy_c_buf_p); |
2933 | 2933 | ||
2934 | /* undo effects of setting up zconftext */ | 2934 | /* undo effects of setting up zconftext */ |
@@ -2971,7 +2971,7 @@ static int yy_get_next_buffer (void) | |||
2971 | 2971 | ||
2972 | { | 2972 | { |
2973 | int c; | 2973 | int c; |
2974 | 2974 | ||
2975 | *(yy_c_buf_p) = (yy_hold_char); | 2975 | *(yy_c_buf_p) = (yy_hold_char); |
2976 | 2976 | ||
2977 | if ( *(yy_c_buf_p) == YY_END_OF_BUFFER_CHAR ) | 2977 | if ( *(yy_c_buf_p) == YY_END_OF_BUFFER_CHAR ) |
@@ -3038,12 +3038,12 @@ static int yy_get_next_buffer (void) | |||
3038 | 3038 | ||
3039 | /** Immediately switch to a different input stream. | 3039 | /** Immediately switch to a different input stream. |
3040 | * @param input_file A readable stream. | 3040 | * @param input_file A readable stream. |
3041 | * | 3041 | * |
3042 | * @note This function does not reset the start condition to @c INITIAL . | 3042 | * @note This function does not reset the start condition to @c INITIAL . |
3043 | */ | 3043 | */ |
3044 | void zconfrestart (FILE * input_file ) | 3044 | void zconfrestart (FILE * input_file ) |
3045 | { | 3045 | { |
3046 | 3046 | ||
3047 | if ( ! YY_CURRENT_BUFFER ){ | 3047 | if ( ! YY_CURRENT_BUFFER ){ |
3048 | zconfensure_buffer_stack (); | 3048 | zconfensure_buffer_stack (); |
3049 | YY_CURRENT_BUFFER_LVALUE = | 3049 | YY_CURRENT_BUFFER_LVALUE = |
@@ -3056,11 +3056,11 @@ static int yy_get_next_buffer (void) | |||
3056 | 3056 | ||
3057 | /** Switch to a different input buffer. | 3057 | /** Switch to a different input buffer. |
3058 | * @param new_buffer The new input buffer. | 3058 | * @param new_buffer The new input buffer. |
3059 | * | 3059 | * |
3060 | */ | 3060 | */ |
3061 | void zconf_switch_to_buffer (YY_BUFFER_STATE new_buffer ) | 3061 | void zconf_switch_to_buffer (YY_BUFFER_STATE new_buffer ) |
3062 | { | 3062 | { |
3063 | 3063 | ||
3064 | /* TODO. We should be able to replace this entire function body | 3064 | /* TODO. We should be able to replace this entire function body |
3065 | * with | 3065 | * with |
3066 | * zconfpop_buffer_state(); | 3066 | * zconfpop_buffer_state(); |
@@ -3100,13 +3100,13 @@ static void zconf_load_buffer_state (void) | |||
3100 | /** Allocate and initialize an input buffer state. | 3100 | /** Allocate and initialize an input buffer state. |
3101 | * @param file A readable stream. | 3101 | * @param file A readable stream. |
3102 | * @param size The character buffer size in bytes. When in doubt, use @c YY_BUF_SIZE. | 3102 | * @param size The character buffer size in bytes. When in doubt, use @c YY_BUF_SIZE. |
3103 | * | 3103 | * |
3104 | * @return the allocated buffer state. | 3104 | * @return the allocated buffer state. |
3105 | */ | 3105 | */ |
3106 | YY_BUFFER_STATE zconf_create_buffer (FILE * file, int size ) | 3106 | YY_BUFFER_STATE zconf_create_buffer (FILE * file, int size ) |
3107 | { | 3107 | { |
3108 | YY_BUFFER_STATE b; | 3108 | YY_BUFFER_STATE b; |
3109 | 3109 | ||
3110 | b = (YY_BUFFER_STATE) zconfalloc(sizeof( struct yy_buffer_state ) ); | 3110 | b = (YY_BUFFER_STATE) zconfalloc(sizeof( struct yy_buffer_state ) ); |
3111 | if ( ! b ) | 3111 | if ( ! b ) |
3112 | YY_FATAL_ERROR( "out of dynamic memory in zconf_create_buffer()" ); | 3112 | YY_FATAL_ERROR( "out of dynamic memory in zconf_create_buffer()" ); |
@@ -3129,11 +3129,11 @@ static void zconf_load_buffer_state (void) | |||
3129 | 3129 | ||
3130 | /** Destroy the buffer. | 3130 | /** Destroy the buffer. |
3131 | * @param b a buffer created with zconf_create_buffer() | 3131 | * @param b a buffer created with zconf_create_buffer() |
3132 | * | 3132 | * |
3133 | */ | 3133 | */ |
3134 | void zconf_delete_buffer (YY_BUFFER_STATE b ) | 3134 | void zconf_delete_buffer (YY_BUFFER_STATE b ) |
3135 | { | 3135 | { |
3136 | 3136 | ||
3137 | if ( ! b ) | 3137 | if ( ! b ) |
3138 | return; | 3138 | return; |
3139 | 3139 | ||
@@ -3154,7 +3154,7 @@ static void zconf_load_buffer_state (void) | |||
3154 | 3154 | ||
3155 | { | 3155 | { |
3156 | int oerrno = errno; | 3156 | int oerrno = errno; |
3157 | 3157 | ||
3158 | zconf_flush_buffer(b ); | 3158 | zconf_flush_buffer(b ); |
3159 | 3159 | ||
3160 | b->yy_input_file = file; | 3160 | b->yy_input_file = file; |
@@ -3170,13 +3170,13 @@ static void zconf_load_buffer_state (void) | |||
3170 | } | 3170 | } |
3171 | 3171 | ||
3172 | b->yy_is_interactive = 0; | 3172 | b->yy_is_interactive = 0; |
3173 | 3173 | ||
3174 | errno = oerrno; | 3174 | errno = oerrno; |
3175 | } | 3175 | } |
3176 | 3176 | ||
3177 | /** Discard all buffered characters. On the next scan, YY_INPUT will be called. | 3177 | /** Discard all buffered characters. On the next scan, YY_INPUT will be called. |
3178 | * @param b the buffer state to be flushed, usually @c YY_CURRENT_BUFFER. | 3178 | * @param b the buffer state to be flushed, usually @c YY_CURRENT_BUFFER. |
3179 | * | 3179 | * |
3180 | */ | 3180 | */ |
3181 | void zconf_flush_buffer (YY_BUFFER_STATE b ) | 3181 | void zconf_flush_buffer (YY_BUFFER_STATE b ) |
3182 | { | 3182 | { |
@@ -3205,7 +3205,7 @@ static void zconf_load_buffer_state (void) | |||
3205 | * the current state. This function will allocate the stack | 3205 | * the current state. This function will allocate the stack |
3206 | * if necessary. | 3206 | * if necessary. |
3207 | * @param new_buffer The new state. | 3207 | * @param new_buffer The new state. |
3208 | * | 3208 | * |
3209 | */ | 3209 | */ |
3210 | void zconfpush_buffer_state (YY_BUFFER_STATE new_buffer ) | 3210 | void zconfpush_buffer_state (YY_BUFFER_STATE new_buffer ) |
3211 | { | 3211 | { |
@@ -3235,7 +3235,7 @@ void zconfpush_buffer_state (YY_BUFFER_STATE new_buffer ) | |||
3235 | 3235 | ||
3236 | /** Removes and deletes the top of the stack, if present. | 3236 | /** Removes and deletes the top of the stack, if present. |
3237 | * The next element becomes the new top. | 3237 | * The next element becomes the new top. |
3238 | * | 3238 | * |
3239 | */ | 3239 | */ |
3240 | void zconfpop_buffer_state (void) | 3240 | void zconfpop_buffer_state (void) |
3241 | { | 3241 | { |
@@ -3259,7 +3259,7 @@ void zconfpop_buffer_state (void) | |||
3259 | static void zconfensure_buffer_stack (void) | 3259 | static void zconfensure_buffer_stack (void) |
3260 | { | 3260 | { |
3261 | int num_to_alloc; | 3261 | int num_to_alloc; |
3262 | 3262 | ||
3263 | if (!(yy_buffer_stack)) { | 3263 | if (!(yy_buffer_stack)) { |
3264 | 3264 | ||
3265 | /* First allocation is just for 2 elements, since we don't know if this | 3265 | /* First allocation is just for 2 elements, since we don't know if this |
@@ -3270,9 +3270,9 @@ static void zconfensure_buffer_stack (void) | |||
3270 | (yy_buffer_stack) = (struct yy_buffer_state**)zconfalloc | 3270 | (yy_buffer_stack) = (struct yy_buffer_state**)zconfalloc |
3271 | (num_to_alloc * sizeof(struct yy_buffer_state*) | 3271 | (num_to_alloc * sizeof(struct yy_buffer_state*) |
3272 | ); | 3272 | ); |
3273 | 3273 | ||
3274 | memset((yy_buffer_stack), 0, num_to_alloc * sizeof(struct yy_buffer_state*)); | 3274 | memset((yy_buffer_stack), 0, num_to_alloc * sizeof(struct yy_buffer_state*)); |
3275 | 3275 | ||
3276 | (yy_buffer_stack_max) = num_to_alloc; | 3276 | (yy_buffer_stack_max) = num_to_alloc; |
3277 | (yy_buffer_stack_top) = 0; | 3277 | (yy_buffer_stack_top) = 0; |
3278 | return; | 3278 | return; |
@@ -3298,13 +3298,13 @@ static void zconfensure_buffer_stack (void) | |||
3298 | /** Setup the input buffer state to scan directly from a user-specified character buffer. | 3298 | /** Setup the input buffer state to scan directly from a user-specified character buffer. |
3299 | * @param base the character buffer | 3299 | * @param base the character buffer |
3300 | * @param size the size in bytes of the character buffer | 3300 | * @param size the size in bytes of the character buffer |
3301 | * | 3301 | * |
3302 | * @return the newly allocated buffer state object. | 3302 | * @return the newly allocated buffer state object. |
3303 | */ | 3303 | */ |
3304 | YY_BUFFER_STATE zconf_scan_buffer (char * base, yy_size_t size ) | 3304 | YY_BUFFER_STATE zconf_scan_buffer (char * base, yy_size_t size ) |
3305 | { | 3305 | { |
3306 | YY_BUFFER_STATE b; | 3306 | YY_BUFFER_STATE b; |
3307 | 3307 | ||
3308 | if ( size < 2 || | 3308 | if ( size < 2 || |
3309 | base[size-2] != YY_END_OF_BUFFER_CHAR || | 3309 | base[size-2] != YY_END_OF_BUFFER_CHAR || |
3310 | base[size-1] != YY_END_OF_BUFFER_CHAR ) | 3310 | base[size-1] != YY_END_OF_BUFFER_CHAR ) |
@@ -3333,14 +3333,14 @@ YY_BUFFER_STATE zconf_scan_buffer (char * base, yy_size_t size ) | |||
3333 | /** Setup the input buffer state to scan a string. The next call to zconflex() will | 3333 | /** Setup the input buffer state to scan a string. The next call to zconflex() will |
3334 | * scan from a @e copy of @a str. | 3334 | * scan from a @e copy of @a str. |
3335 | * @param str a NUL-terminated string to scan | 3335 | * @param str a NUL-terminated string to scan |
3336 | * | 3336 | * |
3337 | * @return the newly allocated buffer state object. | 3337 | * @return the newly allocated buffer state object. |
3338 | * @note If you want to scan bytes that may contain NUL values, then use | 3338 | * @note If you want to scan bytes that may contain NUL values, then use |
3339 | * zconf_scan_bytes() instead. | 3339 | * zconf_scan_bytes() instead. |
3340 | */ | 3340 | */ |
3341 | YY_BUFFER_STATE zconf_scan_string (yyconst char * str ) | 3341 | YY_BUFFER_STATE zconf_scan_string (yyconst char * str ) |
3342 | { | 3342 | { |
3343 | 3343 | ||
3344 | return zconf_scan_bytes(str,strlen(str) ); | 3344 | return zconf_scan_bytes(str,strlen(str) ); |
3345 | } | 3345 | } |
3346 | 3346 | ||
@@ -3348,7 +3348,7 @@ YY_BUFFER_STATE zconf_scan_string (yyconst char * str ) | |||
3348 | * scan from a @e copy of @a bytes. | 3348 | * scan from a @e copy of @a bytes. |
3349 | * @param bytes the byte buffer to scan | 3349 | * @param bytes the byte buffer to scan |
3350 | * @param len the number of bytes in the buffer pointed to by @a bytes. | 3350 | * @param len the number of bytes in the buffer pointed to by @a bytes. |
3351 | * | 3351 | * |
3352 | * @return the newly allocated buffer state object. | 3352 | * @return the newly allocated buffer state object. |
3353 | */ | 3353 | */ |
3354 | YY_BUFFER_STATE zconf_scan_bytes (yyconst char * bytes, int len ) | 3354 | YY_BUFFER_STATE zconf_scan_bytes (yyconst char * bytes, int len ) |
@@ -3357,7 +3357,7 @@ YY_BUFFER_STATE zconf_scan_bytes (yyconst char * bytes, int len ) | |||
3357 | char *buf; | 3357 | char *buf; |
3358 | yy_size_t n; | 3358 | yy_size_t n; |
3359 | int i; | 3359 | int i; |
3360 | 3360 | ||
3361 | /* Get memory for full buffer, including space for trailing EOB's. */ | 3361 | /* Get memory for full buffer, including space for trailing EOB's. */ |
3362 | n = len + 2; | 3362 | n = len + 2; |
3363 | buf = (char *) zconfalloc(n ); | 3363 | buf = (char *) zconfalloc(n ); |
@@ -3411,16 +3411,16 @@ static void yy_fatal_error (yyconst char* msg ) | |||
3411 | /* Accessor methods (get/set functions) to struct members. */ | 3411 | /* Accessor methods (get/set functions) to struct members. */ |
3412 | 3412 | ||
3413 | /** Get the current line number. | 3413 | /** Get the current line number. |
3414 | * | 3414 | * |
3415 | */ | 3415 | */ |
3416 | int zconfget_lineno (void) | 3416 | int zconfget_lineno (void) |
3417 | { | 3417 | { |
3418 | 3418 | ||
3419 | return zconflineno; | 3419 | return zconflineno; |
3420 | } | 3420 | } |
3421 | 3421 | ||
3422 | /** Get the input stream. | 3422 | /** Get the input stream. |
3423 | * | 3423 | * |
3424 | */ | 3424 | */ |
3425 | FILE *zconfget_in (void) | 3425 | FILE *zconfget_in (void) |
3426 | { | 3426 | { |
@@ -3428,7 +3428,7 @@ FILE *zconfget_in (void) | |||
3428 | } | 3428 | } |
3429 | 3429 | ||
3430 | /** Get the output stream. | 3430 | /** Get the output stream. |
3431 | * | 3431 | * |
3432 | */ | 3432 | */ |
3433 | FILE *zconfget_out (void) | 3433 | FILE *zconfget_out (void) |
3434 | { | 3434 | { |
@@ -3436,7 +3436,7 @@ FILE *zconfget_out (void) | |||
3436 | } | 3436 | } |
3437 | 3437 | ||
3438 | /** Get the length of the current token. | 3438 | /** Get the length of the current token. |
3439 | * | 3439 | * |
3440 | */ | 3440 | */ |
3441 | int zconfget_leng (void) | 3441 | int zconfget_leng (void) |
3442 | { | 3442 | { |
@@ -3444,7 +3444,7 @@ int zconfget_leng (void) | |||
3444 | } | 3444 | } |
3445 | 3445 | ||
3446 | /** Get the current token. | 3446 | /** Get the current token. |
3447 | * | 3447 | * |
3448 | */ | 3448 | */ |
3449 | 3449 | ||
3450 | char *zconfget_text (void) | 3450 | char *zconfget_text (void) |
@@ -3454,18 +3454,18 @@ char *zconfget_text (void) | |||
3454 | 3454 | ||
3455 | /** Set the current line number. | 3455 | /** Set the current line number. |
3456 | * @param line_number | 3456 | * @param line_number |
3457 | * | 3457 | * |
3458 | */ | 3458 | */ |
3459 | void zconfset_lineno (int line_number ) | 3459 | void zconfset_lineno (int line_number ) |
3460 | { | 3460 | { |
3461 | 3461 | ||
3462 | zconflineno = line_number; | 3462 | zconflineno = line_number; |
3463 | } | 3463 | } |
3464 | 3464 | ||
3465 | /** Set the input stream. This does not discard the current | 3465 | /** Set the input stream. This does not discard the current |
3466 | * input buffer. | 3466 | * input buffer. |
3467 | * @param in_str A readable stream. | 3467 | * @param in_str A readable stream. |
3468 | * | 3468 | * |
3469 | * @see zconf_switch_to_buffer | 3469 | * @see zconf_switch_to_buffer |
3470 | */ | 3470 | */ |
3471 | void zconfset_in (FILE * in_str ) | 3471 | void zconfset_in (FILE * in_str ) |
@@ -3491,7 +3491,7 @@ void zconfset_debug (int bdebug ) | |||
3491 | /* zconflex_destroy is for both reentrant and non-reentrant scanners. */ | 3491 | /* zconflex_destroy is for both reentrant and non-reentrant scanners. */ |
3492 | int zconflex_destroy (void) | 3492 | int zconflex_destroy (void) |
3493 | { | 3493 | { |
3494 | 3494 | ||
3495 | /* Pop the buffer stack, destroying each element. */ | 3495 | /* Pop the buffer stack, destroying each element. */ |
3496 | while(YY_CURRENT_BUFFER){ | 3496 | while(YY_CURRENT_BUFFER){ |
3497 | zconf_delete_buffer(YY_CURRENT_BUFFER ); | 3497 | zconf_delete_buffer(YY_CURRENT_BUFFER ); |
diff --git a/scripts/config/mconf.c b/scripts/config/mconf.c index 739b3b480..fe4562b17 100644 --- a/scripts/config/mconf.c +++ b/scripts/config/mconf.c | |||
@@ -169,7 +169,7 @@ static void cmake(void) | |||
169 | items[item_no]->namelen = 0; | 169 | items[item_no]->namelen = 0; |
170 | item_no++; | 170 | item_no++; |
171 | } | 171 | } |
172 | 172 | ||
173 | static int cprint_name(const char *fmt, ...) | 173 | static int cprint_name(const char *fmt, ...) |
174 | { | 174 | { |
175 | va_list ap; | 175 | va_list ap; |
@@ -186,7 +186,7 @@ static int cprint_name(const char *fmt, ...) | |||
186 | 186 | ||
187 | return res; | 187 | return res; |
188 | } | 188 | } |
189 | 189 | ||
190 | static int cprint_tag(const char *fmt, ...) | 190 | static int cprint_tag(const char *fmt, ...) |
191 | { | 191 | { |
192 | va_list ap; | 192 | va_list ap; |
@@ -200,7 +200,7 @@ static int cprint_tag(const char *fmt, ...) | |||
200 | 200 | ||
201 | return res; | 201 | return res; |
202 | } | 202 | } |
203 | 203 | ||
204 | static void cdone(void) | 204 | static void cdone(void) |
205 | { | 205 | { |
206 | int i; | 206 | int i; |
@@ -675,19 +675,19 @@ int main(int ac, char **av) | |||
675 | if (!strcasecmp(mode, "single_menu")) | 675 | if (!strcasecmp(mode, "single_menu")) |
676 | single_menu_mode = 1; | 676 | single_menu_mode = 1; |
677 | } | 677 | } |
678 | 678 | ||
679 | tcgetattr(1, &ios_org); | 679 | tcgetattr(1, &ios_org); |
680 | atexit(conf_cleanup); | 680 | atexit(conf_cleanup); |
681 | init_wsize(); | 681 | init_wsize(); |
682 | init_dialog(); | 682 | init_dialog(); |
683 | signal(SIGWINCH, winch_handler); | 683 | signal(SIGWINCH, winch_handler); |
684 | conf(&rootmenu); | 684 | conf(&rootmenu); |
685 | end_dialog(); | 685 | end_dialog(); |
686 | 686 | ||
687 | /* Restart dialog to act more like when lxdialog was still separate */ | 687 | /* Restart dialog to act more like when lxdialog was still separate */ |
688 | init_dialog(); | 688 | init_dialog(); |
689 | do { | 689 | do { |
690 | stat = dialog_yesno(NULL, | 690 | stat = dialog_yesno(NULL, |
691 | "Do you wish to save your new BusyBox configuration?", 5, 60); | 691 | "Do you wish to save your new BusyBox configuration?", 5, 60); |
692 | } while (stat < 0); | 692 | } while (stat < 0); |
693 | end_dialog(); | 693 | end_dialog(); |
diff --git a/scripts/config/menu.c b/scripts/config/menu.c index 6e075f80b..9b8d389e6 100644 --- a/scripts/config/menu.c +++ b/scripts/config/menu.c | |||
@@ -228,7 +228,7 @@ void menu_finalize(struct menu *parent) | |||
228 | if (prop->type == P_PROMPT && prop->menu != menu) { | 228 | if (prop->type == P_PROMPT && prop->menu != menu) { |
229 | fprintf(stderr, "%s:%d:warning: choice values currently only support a single prompt\n", | 229 | fprintf(stderr, "%s:%d:warning: choice values currently only support a single prompt\n", |
230 | prop->file->name, prop->lineno); | 230 | prop->file->name, prop->lineno); |
231 | 231 | ||
232 | } | 232 | } |
233 | if (prop->type == P_DEFAULT) | 233 | if (prop->type == P_DEFAULT) |
234 | fprintf(stderr, "%s:%d:warning: defaults for choice values not supported\n", | 234 | fprintf(stderr, "%s:%d:warning: defaults for choice values not supported\n", |
diff --git a/scripts/config/menubox.c b/scripts/config/menubox.c index 18e02168b..431f09fc9 100644 --- a/scripts/config/menubox.c +++ b/scripts/config/menubox.c | |||
@@ -26,7 +26,7 @@ | |||
26 | * | 26 | * |
27 | * *) A bugfix for the Page-Down problem | 27 | * *) A bugfix for the Page-Down problem |
28 | * | 28 | * |
29 | * *) Formerly when I used Page Down and Page Up, the cursor would be set | 29 | * *) Formerly when I used Page Down and Page Up, the cursor would be set |
30 | * to the first position in the menu box. Now lxdialog is a bit | 30 | * to the first position in the menu box. Now lxdialog is a bit |
31 | * smarter and works more like other menu systems (just have a look at | 31 | * smarter and works more like other menu systems (just have a look at |
32 | * it). | 32 | * it). |
@@ -225,7 +225,7 @@ dialog_menu (const char *title, const char *prompt, int height, int width, | |||
225 | 225 | ||
226 | /* | 226 | /* |
227 | * Find length of longest item in order to center menu. | 227 | * Find length of longest item in order to center menu. |
228 | * Set 'choice' to default item. | 228 | * Set 'choice' to default item. |
229 | */ | 229 | */ |
230 | item_x = 0; | 230 | item_x = 0; |
231 | for (i = 0; i < item_no; i++) { | 231 | for (i = 0; i < item_no; i++) { |
@@ -294,7 +294,7 @@ dialog_menu (const char *title, const char *prompt, int height, int width, | |||
294 | } | 294 | } |
295 | } | 295 | } |
296 | 296 | ||
297 | if (i < max_choice || | 297 | if (i < max_choice || |
298 | key == KEY_UP || key == KEY_DOWN || | 298 | key == KEY_UP || key == KEY_DOWN || |
299 | key == '-' || key == '+' || | 299 | key == '-' || key == '+' || |
300 | key == KEY_PPAGE || key == KEY_NPAGE) { | 300 | key == KEY_PPAGE || key == KEY_NPAGE) { |
diff --git a/scripts/config/util.c b/scripts/config/util.c index d20730b88..104ff0e4c 100644 --- a/scripts/config/util.c +++ b/scripts/config/util.c | |||
@@ -29,7 +29,7 @@ char *backtitle = NULL; | |||
29 | 29 | ||
30 | const char *dialog_result; | 30 | const char *dialog_result; |
31 | 31 | ||
32 | /* | 32 | /* |
33 | * Attribute values, default is for mono display | 33 | * Attribute values, default is for mono display |
34 | */ | 34 | */ |
35 | chtype attributes[] = | 35 | chtype attributes[] = |
@@ -204,7 +204,7 @@ print_autowrap (WINDOW * win, const char *prompt, int width, int y, int x) | |||
204 | strcpy (tempstr, prompt); | 204 | strcpy (tempstr, prompt); |
205 | 205 | ||
206 | prompt_len = strlen(tempstr); | 206 | prompt_len = strlen(tempstr); |
207 | 207 | ||
208 | /* | 208 | /* |
209 | * Remove newlines | 209 | * Remove newlines |
210 | */ | 210 | */ |
@@ -350,7 +350,7 @@ first_alpha(const char *string, const char *exempt) | |||
350 | if (strchr("<[(", c)) ++in_paren; | 350 | if (strchr("<[(", c)) ++in_paren; |
351 | if (strchr(">])", c)) --in_paren; | 351 | if (strchr(">])", c)) --in_paren; |
352 | 352 | ||
353 | if ((! in_paren) && isalpha(c) && | 353 | if ((! in_paren) && isalpha(c) && |
354 | strchr(exempt, c) == 0) | 354 | strchr(exempt, c) == 0) |
355 | return i; | 355 | return i; |
356 | } | 356 | } |
diff --git a/scripts/config/zconf.tab.c_shipped b/scripts/config/zconf.tab.c_shipped index 4f5bcfb45..a5f69a026 100644 --- a/scripts/config/zconf.tab.c_shipped +++ b/scripts/config/zconf.tab.c_shipped | |||
@@ -446,21 +446,21 @@ static const unsigned short yyrline[] = | |||
446 | First, the terminals, then, starting at YYNTOKENS, nonterminals. */ | 446 | First, the terminals, then, starting at YYNTOKENS, nonterminals. */ |
447 | static const char *const yytname[] = | 447 | static const char *const yytname[] = |
448 | { | 448 | { |
449 | "$end", "error", "$undefined", "T_MAINMENU", "T_MENU", "T_ENDMENU", | 449 | "$end", "error", "$undefined", "T_MAINMENU", "T_MENU", "T_ENDMENU", |
450 | "T_SOURCE", "T_CHOICE", "T_ENDCHOICE", "T_COMMENT", "T_CONFIG", | 450 | "T_SOURCE", "T_CHOICE", "T_ENDCHOICE", "T_COMMENT", "T_CONFIG", |
451 | "T_MENUCONFIG", "T_HELP", "T_HELPTEXT", "T_IF", "T_ENDIF", "T_DEPENDS", | 451 | "T_MENUCONFIG", "T_HELP", "T_HELPTEXT", "T_IF", "T_ENDIF", "T_DEPENDS", |
452 | "T_REQUIRES", "T_OPTIONAL", "T_PROMPT", "T_DEFAULT", "T_TRISTATE", | 452 | "T_REQUIRES", "T_OPTIONAL", "T_PROMPT", "T_DEFAULT", "T_TRISTATE", |
453 | "T_DEF_TRISTATE", "T_BOOLEAN", "T_DEF_BOOLEAN", "T_STRING", "T_INT", | 453 | "T_DEF_TRISTATE", "T_BOOLEAN", "T_DEF_BOOLEAN", "T_STRING", "T_INT", |
454 | "T_HEX", "T_WORD", "T_WORD_QUOTE", "T_UNEQUAL", "T_EOF", "T_EOL", | 454 | "T_HEX", "T_WORD", "T_WORD_QUOTE", "T_UNEQUAL", "T_EOF", "T_EOL", |
455 | "T_CLOSE_PAREN", "T_OPEN_PAREN", "T_ON", "T_SELECT", "T_RANGE", "T_OR", | 455 | "T_CLOSE_PAREN", "T_OPEN_PAREN", "T_ON", "T_SELECT", "T_RANGE", "T_OR", |
456 | "T_AND", "T_EQUAL", "T_NOT", "$accept", "input", "block", | 456 | "T_AND", "T_EQUAL", "T_NOT", "$accept", "input", "block", |
457 | "common_block", "config_entry_start", "config_stmt", | 457 | "common_block", "config_entry_start", "config_stmt", |
458 | "menuconfig_entry_start", "menuconfig_stmt", "config_option_list", | 458 | "menuconfig_entry_start", "menuconfig_stmt", "config_option_list", |
459 | "config_option", "choice", "choice_entry", "choice_end", "choice_stmt", | 459 | "config_option", "choice", "choice_entry", "choice_end", "choice_stmt", |
460 | "choice_option_list", "choice_option", "choice_block", "if", "if_end", | 460 | "choice_option_list", "choice_option", "choice_block", "if", "if_end", |
461 | "if_stmt", "if_block", "menu", "menu_entry", "menu_end", "menu_stmt", | 461 | "if_stmt", "if_block", "menu", "menu_entry", "menu_end", "menu_stmt", |
462 | "menu_block", "source", "source_stmt", "comment", "comment_stmt", | 462 | "menu_block", "source", "source_stmt", "comment", "comment_stmt", |
463 | "help_start", "help", "depends_list", "depends", "prompt_stmt_opt", | 463 | "help_start", "help", "depends_list", "depends", "prompt_stmt_opt", |
464 | "prompt", "end", "nl_or_eof", "if_expr", "expr", "symbol", 0 | 464 | "prompt", "end", "nl_or_eof", "if_expr", "expr", "symbol", 0 |
465 | }; | 465 | }; |
466 | #endif | 466 | #endif |
@@ -1027,7 +1027,7 @@ yyparse () | |||
1027 | #endif | 1027 | #endif |
1028 | #endif | 1028 | #endif |
1029 | { | 1029 | { |
1030 | 1030 | ||
1031 | register int yystate; | 1031 | register int yystate; |
1032 | register int yyn; | 1032 | register int yyn; |
1033 | int yyresult; | 1033 | int yyresult; |
diff --git a/scripts/mkdep.c b/scripts/mkdep.c index 9b92b08c4..ae3cc74e0 100644 --- a/scripts/mkdep.c +++ b/scripts/mkdep.c | |||
@@ -3,7 +3,7 @@ | |||
3 | * Smart CONFIG_* processing by Werner Almesberger, Michael Chastain. | 3 | * Smart CONFIG_* processing by Werner Almesberger, Michael Chastain. |
4 | * | 4 | * |
5 | * Usage: mkdep cflags -- file ... | 5 | * Usage: mkdep cflags -- file ... |
6 | * | 6 | * |
7 | * Read source files and output makefile dependency lines for them. | 7 | * Read source files and output makefile dependency lines for them. |
8 | * I make simple dependency lines for #include <*.h> and #include "*.h". | 8 | * I make simple dependency lines for #include <*.h> and #include "*.h". |
9 | * I also find instances of CONFIG_FOO and generate dependencies | 9 | * I also find instances of CONFIG_FOO and generate dependencies |
diff --git a/scripts/split-include.c b/scripts/split-include.c index 3ab9fed87..624a0d62b 100644 --- a/scripts/split-include.c +++ b/scripts/split-include.c | |||
@@ -96,7 +96,7 @@ int main(int argc, const char * argv []) | |||
96 | /* Change to output directory. */ | 96 | /* Change to output directory. */ |
97 | if (chdir(str_dir_config) != 0) | 97 | if (chdir(str_dir_config) != 0) |
98 | ERROR_EXIT(str_dir_config); | 98 | ERROR_EXIT(str_dir_config); |
99 | 99 | ||
100 | /* Put initial separator into target list. */ | 100 | /* Put initial separator into target list. */ |
101 | ptarget = list_target; | 101 | ptarget = list_target; |
102 | *ptarget++ = '\n'; | 102 | *ptarget++ = '\n'; |