4 files changed, 26 insertions, 5 deletions

diff --git a/applets/.gitignore b/applets/.gitignore
index 459938d67..970bb90a9 100644
--- a/applets/.gitignore
+++ b/applets/.gitignore
@@ -1,3 +1,6 @@
 /applet_tables
 /usage
 /usage_pod
+/applet_tables.exe
+/usage.exe
+/usage_pod.exe
diff --git a/applets/applet_tables.c b/applets/applet_tables.c
index 66ef7e4ac..fe26a5109 100644
--- a/applets/applet_tables.c
+++ b/applets/applet_tables.c
@@ -103,6 +103,9 @@ int main(int argc, char **argv)
         if (i < 0)
                 return 1;
         dup2(i, 1);
+#ifdef __MINGW32__
+        close(i);
+#endif
 
         /* Keep in sync with include/busybox.h! */
 
@@ -236,8 +239,14 @@ int main(int argc, char **argv)
 
         if (fclose(stdout))
                 return 1;
+#ifdef __MINGW32__
+        unlink(argv[1]);
+#endif
         if (rename(tmp1, argv[1]))
                 return 1;
+#ifdef __MINGW32__
+        unlink(argv[2]);
+#endif
         if (rename(tmp2, argv[2]))
                 return 1;
         return 0;
diff --git a/applets/usage_compressed b/applets/usage_compressed
index 36fc2a007..94d70f33b 100755
--- a/applets/usage_compressed
+++ b/applets/usage_compressed
@@ -16,6 +16,7 @@ if test $? != 0; then
         exit 1
 fi
 
+(
 exec >"$target.$$"
 
 echo '#define UNPACKED_USAGE "" \'
@@ -58,5 +59,6 @@ echo '#define PACKED_USAGE \'
         -e 's/\(...\)/0\1,/g' \
         -e 's/$/ \\/'
 echo ''
+)
 
 mv -- "$target.$$" "$target"
diff --git a/applets/usage_pod.c b/applets/usage_pod.c
index 9e6d3f0ee..2c177be90 100644
--- a/applets/usage_pod.c
+++ b/applets/usage_pod.c
@@ -67,30 +67,37 @@ int main(void)
                 }
                 if (col == 0) {
                         col = 6;
-                        printf("\t");
                 } else {
                         printf(", ");
                 }
-                printf("%s", usage_array[i].aname);
+                if (usage_array[i].usage[0] != NOUSAGE_STR[0]) {
+                        /*
+                         * If the applet usage string will be included in the final document
+                         * optimistically link to its header (which is just the applet name).
+                         */
+                        printf("L<C<%1$s>|/\"%1$s\">", usage_array[i].aname);
+                } else {
+                        /* Without a usage string, just output the applet name with no link. */
+                        printf("C<%s>", usage_array[i].aname);
+                }
                 col += len2;
         }
         printf("\n\n");
 
         printf("=head1 COMMAND DESCRIPTIONS\n\n");
-        printf("=over 4\n\n");
 
         for (i = 0; i < num_messages; i++) {
                 if (usage_array[i].aname[0] >= 'a' && usage_array[i].aname[0] <= 'z'
                  && usage_array[i].usage[0] != NOUSAGE_STR[0]
                 ) {
-                        printf("=item B<%s>\n\n", usage_array[i].aname);
+                        /* This is the heading that will be linked from the command list. */
+                        printf("=head2 %s\n\n", usage_array[i].aname);
                         if (usage_array[i].usage[0])
                                 printf("%s %s\n\n", usage_array[i].aname, usage_array[i].usage);
                         else
                                 printf("%s\n\n", usage_array[i].aname);
                 }
         }
-        printf("=back\n\n");
 
         return 0;
 }