Changeset 3621 in MondoRescue for branches/3.3/mindi-busybox/scripts/kconfig/confdata.c
- Timestamp:
- Dec 20, 2016, 4:07:32 PM (7 years ago)
- Location:
- branches/3.3
- Files:
-
- 1 edited
- 1 copied
Legend:
- Unmodified
- Added
- Removed
-
branches/3.3/mindi-busybox/scripts/kconfig/confdata.c
r2725 r3621 125 125 case S_HEX: 126 126 case S_STRING: 127 if (sym->user.val) 128 free(sym->user.val); 127 free(sym->user.val); 129 128 default: 130 129 sym->user.val = NULL; … … 475 474 /* bbox */ 476 475 fprintf(out_h, "#define ENABLE_%s 1\n", sym->name); 477 fprintf(out_h, "#define IF_%s(...) __VA_ARGS__\n", sym->name); 476 fprintf(out_h, "#ifdef MAKE_SUID\n"); 477 fprintf(out_h, "# define IF_%s(...) __VA_ARGS__ \"CONFIG_%s\"\n", sym->name, sym->name); 478 fprintf(out_h, "#else\n"); 479 fprintf(out_h, "# define IF_%s(...) __VA_ARGS__\n", sym->name); 480 fprintf(out_h, "#endif\n"); 478 481 fprintf(out_h, "#define IF_NOT_%s(...)\n", sym->name); 479 482 } … … 507 510 /* bbox */ 508 511 fprintf(out_h, "#define ENABLE_%s 1\n", sym->name); 509 fprintf(out_h, "#define IF_%s(...) __VA_ARGS__\n", sym->name); 512 fprintf(out_h, "#ifdef MAKE_SUID\n"); 513 fprintf(out_h, "# define IF_%s(...) __VA_ARGS__ \"CONFIG_%s\"\n", sym->name, sym->name); 514 fprintf(out_h, "#else\n"); 515 fprintf(out_h, "# define IF_%s(...) __VA_ARGS__\n", sym->name); 516 fprintf(out_h, "#endif\n"); 510 517 fprintf(out_h, "#define IF_NOT_%s(...)\n", sym->name); 511 518 } … … 519 526 /* bbox */ 520 527 fprintf(out_h, "#define ENABLE_%s 1\n", sym->name); 521 fprintf(out_h, "#define IF_%s(...) __VA_ARGS__\n", sym->name); 528 fprintf(out_h, "#ifdef MAKE_SUID\n"); 529 fprintf(out_h, "# define IF_%s(...) __VA_ARGS__ \"CONFIG_%s\"\n", sym->name, sym->name); 530 fprintf(out_h, "#else\n"); 531 fprintf(out_h, "# define IF_%s(...) __VA_ARGS__\n", sym->name); 532 fprintf(out_h, "#endif\n"); 522 533 fprintf(out_h, "#define IF_NOT_%s(...)\n", sym->name); 523 534 } … … 533 544 /* bbox */ 534 545 fprintf(out_h, "#define ENABLE_%s 1\n", sym->name); 535 fprintf(out_h, "#define IF_%s(...) __VA_ARGS__\n", sym->name); 546 fprintf(out_h, "#ifdef MAKE_SUID\n"); 547 fprintf(out_h, "# define IF_%s(...) __VA_ARGS__ \"CONFIG_%s\"\n", sym->name, sym->name); 548 fprintf(out_h, "#else\n"); 549 fprintf(out_h, "# define IF_%s(...) __VA_ARGS__\n", sym->name); 550 fprintf(out_h, "#endif\n"); 536 551 fprintf(out_h, "#define IF_NOT_%s(...)\n", sym->name); 537 552 }
Note:
See TracChangeset
for help on using the changeset viewer.