aboutsummaryrefslogtreecommitdiff
path: root/scripts
diff options
context:
space:
mode:
author"Vladimir N. Oleynik" <dzo@simtreas.ru>2006-02-16 14:28:17 +0000
committer"Vladimir N. Oleynik" <dzo@simtreas.ru>2006-02-16 14:28:17 +0000
commitcb9b114d352edbc792f02b3e355e6588221e0488 (patch)
tree9c887624d6f94e3c3b1bc74870efc68c355b41e1 /scripts
parent5c1cd5fdd340c63963726394dd4ff0739e7c5e63 (diff)
downloadbusybox-w32-cb9b114d352edbc792f02b3e355e6588221e0488.tar.gz
busybox-w32-cb9b114d352edbc792f02b3e355e6588221e0488.tar.bz2
busybox-w32-cb9b114d352edbc792f02b3e355e6588221e0488.zip
isolate and show busybox`s changes
Diffstat (limited to 'scripts')
-rw-r--r--scripts/config/confdata.c61
1 files changed, 30 insertions, 31 deletions
diff --git a/scripts/config/confdata.c b/scripts/config/confdata.c
index fa262930f..a866deb45 100644
--- a/scripts/config/confdata.c
+++ b/scripts/config/confdata.c
@@ -279,7 +279,10 @@ int conf_write(const char *name)
279 char dirname[128], tmpname[128], newname[128]; 279 char dirname[128], tmpname[128], newname[128];
280 int type, l; 280 int type, l;
281 const char *str; 281 const char *str;
282
283 /* busybox`s code */
282 const char *opt_name; 284 const char *opt_name;
285 int use_flg;
283 286
284 dirname[0] = 0; 287 dirname[0] = 0;
285 if (name && name[0]) { 288 if (name && name[0]) {
@@ -316,6 +319,8 @@ int conf_write(const char *name)
316 fprintf(out, "#\n" 319 fprintf(out, "#\n"
317 "# Automatically generated make config: don't edit\n" 320 "# Automatically generated make config: don't edit\n"
318 "#\n"); 321 "#\n");
322
323 /* busybox`s code */
319 if (out_h) { 324 if (out_h) {
320 fprintf(out_h, "#ifndef BB_CONFIG_H\n#define BB_CONFIG_H\n"); 325 fprintf(out_h, "#ifndef BB_CONFIG_H\n#define BB_CONFIG_H\n");
321 fprintf(out_h, "/*\n" 326 fprintf(out_h, "/*\n"
@@ -331,6 +336,7 @@ int conf_write(const char *name)
331 getenv("EXTRA_VERSION")); 336 getenv("EXTRA_VERSION"));
332 fprintf(out_h, "\n"); 337 fprintf(out_h, "\n");
333 } 338 }
339 /* end busybox`s code */
334 340
335 if (!sym_change_count) 341 if (!sym_change_count)
336 sym_clear_all_valid(); 342 sym_clear_all_valid();
@@ -369,39 +375,37 @@ int conf_write(const char *name)
369 if (modules_sym->curr.tri == no) 375 if (modules_sym->curr.tri == no)
370 type = S_BOOLEAN; 376 type = S_BOOLEAN;
371 } 377 }
378
379 /* busybox`s code */
372 opt_name = strchr(sym->name, '_'); 380 opt_name = strchr(sym->name, '_');
373 if(opt_name == NULL) 381 if(opt_name == NULL)
374 opt_name = sym->name; 382 opt_name = sym->name;
375 else 383 else
376 opt_name++; 384 opt_name++;
385 use_flg = 1;
386 /* end busybox`s code */
387
377 switch (type) { 388 switch (type) {
378 case S_BOOLEAN: 389 case S_BOOLEAN:
379 case S_TRISTATE: 390 case S_TRISTATE:
380 switch (sym_get_tristate_value(sym)) { 391 switch (sym_get_tristate_value(sym)) {
381 case no: 392 case no:
382 fprintf(out, "# %s is not set\n", sym->name); 393 fprintf(out, "# %s is not set\n", sym->name);
383 if (out_h) { 394 if (out_h)
384 fprintf(out_h, "#undef %s\n", sym->name); 395 fprintf(out_h, "#undef %s\n", sym->name);
385 fprintf(out_h, "#define ENABLE_%s 0\n", opt_name); 396 use_flg = 0; /* busybox`s code */
386 fprintf(out_h, "#define USE_%s(...)\n", opt_name);
387 fprintf(out_h, "#define UNUSE_%s(...) __VA_ARGS__\n", opt_name);
388 }
389 break; 397 break;
390 case mod: 398 case mod:
391#if 0 399#if 0 /* busybox`s code */
392 fprintf(out, "%s=m\n", sym->name); 400 fprintf(out, "%s=m\n", sym->name);
393 if (out_h) 401 if (out_h)
394 fprintf(out_h, "#define %s_MODULE 1\n", sym->name); 402 fprintf(out_h, "#define %s_MODULE 1\n", sym->name);
395#endif 403#endif /* busybox`s code */
396 break; 404 break;
397 case yes: 405 case yes:
398 fprintf(out, "%s=y\n", sym->name); 406 fprintf(out, "%s=y\n", sym->name);
399 if (out_h) { 407 if (out_h)
400 fprintf(out_h, "#define %s 1\n", sym->name); 408 fprintf(out_h, "#define %s 1\n", sym->name);
401 fprintf(out_h, "#define ENABLE_%s 1\n", opt_name);
402 fprintf(out_h, "#define USE_%s(...) __VA_ARGS__\n", opt_name);
403 fprintf(out_h, "#define UNUSE_%s(...)\n", opt_name);
404 }
405 break; 409 break;
406 } 410 }
407 break; 411 break;
@@ -427,47 +431,42 @@ int conf_write(const char *name)
427 } 431 }
428 } while (*str); 432 } while (*str);
429 fputs("\"\n", out); 433 fputs("\"\n", out);
430 if (out_h) { 434 if (out_h)
431 fputs("\"\n", out_h); 435 fputs("\"\n", out_h);
432 fprintf(out_h, "#define ENABLE_%s 1\n", opt_name);
433 fprintf(out_h, "#define USE_%s(...) __VA_ARGS__\n", opt_name);
434 fprintf(out_h, "#define UNUSE_%s(...)\n", opt_name);
435 }
436 break; 436 break;
437 case S_HEX: 437 case S_HEX:
438 str = sym_get_string_value(sym); 438 str = sym_get_string_value(sym);
439 if (str[0] != '0' || (str[1] != 'x' && str[1] != 'X')) { 439 if (str[0] != '0' || (str[1] != 'x' && str[1] != 'X')) {
440 fprintf(out, "%s=%s\n", sym->name, *str ? str : "0"); 440 fprintf(out, "%s=%s\n", sym->name, *str ? str : "0");
441 if (out_h) { 441 if (out_h)
442 fprintf(out_h, "#define %s 0x%s\n", sym->name, str); 442 fprintf(out_h, "#define %s 0x%s\n", sym->name, str);
443 fprintf(out_h, "#define ENABLE_%s 1\n", opt_name);
444 fprintf(out_h, "#define USE_%s(...) __VA_ARGS__\n", opt_name);
445 fprintf(out_h, "#define UNUSE_%s(...)\n", opt_name);
446 }
447 break; 443 break;
448 } 444 }
449 case S_INT: 445 case S_INT:
450 str = sym_get_string_value(sym); 446 str = sym_get_string_value(sym);
451 fprintf(out, "%s=%s\n", sym->name, *str ? str : "0"); 447 fprintf(out, "%s=%s\n", sym->name, *str ? str : "0");
452 if (out_h) { 448 if (out_h)
453 fprintf(out_h, "#define %s %s\n", sym->name, str); 449 fprintf(out_h, "#define %s %s\n", sym->name, str);
454 fprintf(out_h, "#define ENABLE_%s 1\n", opt_name);
455 fprintf(out_h, "#define USE_%s(...) __VA_ARGS__\n", opt_name);
456 fprintf(out_h, "#define UNUSE_%s(...)\n", opt_name);
457 }
458 break; 450 break;
459 } 451 }
460 if (out_h) 452 /* busybox`s code */
461 fprintf(out_h, "\n"); 453 if (out_h) {
454 fprintf(out_h, "#define ENABLE_%s %d\n", opt_name, use_flg);
455 fprintf(out_h, "#define USE_%s(...)%s\n", opt_name,
456 (use_flg ? " __VA_ARGS__" : ""));
457 fprintf(out_h, "#define UNUSE_%s(...)%s\n\n", opt_name,
458 (use_flg ? "" : " __VA_ARGS__"));
459 }
460 /* end busybox`s code */
462 } 461 }
463next: 462next:
464 menu = next_menu(menu); 463 menu = next_menu(menu);
465 } 464 }
466 fclose(out); 465 fclose(out);
467 if (out_h) { 466 if (out_h) {
468 fprintf(out_h, "#endif /* BB_CONFIG_H */\n"); 467 fprintf(out_h, "#endif /* BB_CONFIG_H */\n"); /* busybox`s code */
469 fclose(out_h); 468 fclose(out_h);
470 rename(".tmpconfig.h", "include/bb_config.h"); 469 rename(".tmpconfig.h", "include/bb_config.h"); /* busybox`s config name */
471 file_write_dep(NULL); 470 file_write_dep(NULL);
472 } 471 }
473 if (!name || basename != conf_def_filename) { 472 if (!name || basename != conf_def_filename) {
generated by cgit v1.2.3-55-g6feb (git 2.39.1) at 2026-01-25 15:49:43 +0000