Update documentation generator so that it sucks less

Signed-off-by: Denys Vlasenko <vda.linux@googlemail.com>

1 files changed, 12 insertions, 9 deletions

diff --git a/applets/applet_tables.c b/applets/applet_tables.c
index 17135ddc1..e67f017e7 100644
--- a/applets/applet_tables.c
+++ b/applets/applet_tables.c
@@ -70,29 +70,32 @@ int main(int argc, char **argv)
 
         /* Keep in sync with include/busybox.h! */
 
-        puts("/* This is a generated file, don't edit */\n");
+        printf("/* This is a generated file, don't edit */\n\n");
 
         printf("#define NUM_APPLETS %u\n", NUM_APPLETS);
         if (NUM_APPLETS == 1) {
                 printf("#define SINGLE_APPLET_STR \"%s\"\n", applets[0].name);
                 printf("#define SINGLE_APPLET_MAIN %s_main\n", applets[0].name);
         }
+        printf("\n");
 
-        puts("\nconst char applet_names[] ALIGN1 = \"\"");
+        printf("const char applet_names[] ALIGN1 = \"\"\n");
         for (i = 0; i < NUM_APPLETS; i++) {
                 printf("\"%s\" \"\\0\"\n", applets[i].name);
                 if (MAX_APPLET_NAME_LEN < strlen(applets[i].name))
                         MAX_APPLET_NAME_LEN = strlen(applets[i].name);
         }
-        puts(";");
+        printf(";\n\n");
 
-        puts("\nint (*const applet_main[])(int argc, char **argv) = {");
+        printf("#ifndef SKIP_applet_main\n");
+        printf("int (*const applet_main[])(int argc, char **argv) = {\n");
         for (i = 0; i < NUM_APPLETS; i++) {
                 printf("%s_main,\n", applets[i].main);
         }
-        puts("};");
+        printf("};\n");
+        printf("#endif\n\n");
 
-        puts("const uint16_t applet_nameofs[] ALIGN2 = {");
+        printf("const uint16_t applet_nameofs[] ALIGN2 = {\n");
         for (i = 0; i < NUM_APPLETS; i++) {
                 printf("0x%04x,\n",
                         offset[i]
@@ -105,10 +108,10 @@ int main(int argc, char **argv)
 #endif
                 );
         }
-        puts("};");
+        printf("};\n\n");
 
 #if ENABLE_FEATURE_INSTALLER
-        puts("const uint8_t applet_install_loc[] ALIGN1 = {");
+        printf("const uint8_t applet_install_loc[] ALIGN1 = {\n");
         i = 0;
         while (i < NUM_APPLETS) {
                 int v = applets[i].install_loc; /* 3 bits */
@@ -117,7 +120,7 @@ int main(int argc, char **argv)
                 printf("0x%02x,\n", v);
                 i++;
         }
-        puts("};\n");
+        printf("};\n\n");
 #endif
 
         printf("#define MAX_APPLET_NAME_LEN %u\n", MAX_APPLET_NAME_LEN);