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)

Author:

Bruno Cornec

Message:

New 3?3 banch for incorporation of latest busybox 1.25. Changing minor version to handle potential incompatibilities.

Location:

branches/3.3

Files:

• . (copied) (copied from branches/3.2 )
• mindi-busybox/scripts/kconfig/confdata.c (modified) (5 diffs)

branches/3.3/mindi-busybox/scripts/kconfig/confdata.c

@@ -125 +125 @@
         case S_HEX:
         case S_STRING:
-            if (sym->user.val)
-                free(sym->user.val);
+            free(sym->user.val);
         default:
             sym->user.val = NULL;
@@ -475 +474 @@
                         /* bbox */
                         fprintf(out_h, "#define ENABLE_%s 1\n", sym->name);
-                        fprintf(out_h, "#define IF_%s(...) __VA_ARGS__\n", sym->name);
+                        fprintf(out_h, "#ifdef MAKE_SUID\n");
+                        fprintf(out_h, "# define IF_%s(...) __VA_ARGS__ \"CONFIG_%s\"\n", sym->name, sym->name);
+                        fprintf(out_h, "#else\n");
+                        fprintf(out_h, "# define IF_%s(...) __VA_ARGS__\n", sym->name);
+                        fprintf(out_h, "#endif\n");
                         fprintf(out_h, "#define IF_NOT_%s(...)\n", sym->name);
                     }
@@ -507 +510 @@
                     /* bbox */
                     fprintf(out_h, "#define ENABLE_%s 1\n", sym->name);
-                    fprintf(out_h, "#define IF_%s(...) __VA_ARGS__\n", sym->name);
+                    fprintf(out_h, "#ifdef MAKE_SUID\n");
+                    fprintf(out_h, "# define IF_%s(...) __VA_ARGS__ \"CONFIG_%s\"\n", sym->name, sym->name);
+                    fprintf(out_h, "#else\n");
+                    fprintf(out_h, "# define IF_%s(...) __VA_ARGS__\n", sym->name);
+                    fprintf(out_h, "#endif\n");
                     fprintf(out_h, "#define IF_NOT_%s(...)\n", sym->name);
                 }
@@ -519 +526 @@
                         /* bbox */
                         fprintf(out_h, "#define ENABLE_%s 1\n", sym->name);
-                        fprintf(out_h, "#define IF_%s(...) __VA_ARGS__\n", sym->name);
+                        fprintf(out_h, "#ifdef MAKE_SUID\n");
+                        fprintf(out_h, "# define IF_%s(...) __VA_ARGS__ \"CONFIG_%s\"\n", sym->name, sym->name);
+                        fprintf(out_h, "#else\n");
+                        fprintf(out_h, "# define IF_%s(...) __VA_ARGS__\n", sym->name);
+                        fprintf(out_h, "#endif\n");
                         fprintf(out_h, "#define IF_NOT_%s(...)\n", sym->name);
                     }
@@ -533 +544 @@
                     /* bbox */
                     fprintf(out_h, "#define ENABLE_%s 1\n", sym->name);
-                    fprintf(out_h, "#define IF_%s(...) __VA_ARGS__\n", sym->name);
+                    fprintf(out_h, "#ifdef MAKE_SUID\n");
+                    fprintf(out_h, "# define IF_%s(...) __VA_ARGS__ \"CONFIG_%s\"\n", sym->name, sym->name);
+                    fprintf(out_h, "#else\n");
+                    fprintf(out_h, "# define IF_%s(...) __VA_ARGS__\n", sym->name);
+                    fprintf(out_h, "#endif\n");
                     fprintf(out_h, "#define IF_NOT_%s(...)\n", sym->name);
                 }