Patch from Vladimir to move struct applet from busybox.c to applets.c,

which looks like the right place for such things to live.

diff --git a/applets.c b/applets.c
index 1e31e89259917ec8f7f90e756d0838505b56ef26..51511037203e8e4ea81b80b835f56e80b6089087 100644 (file)
--- a/applets.c
+++ b/applets.c
@@ -29,12 +29,20 @@
 #include <stdlib.h>
 #include "busybox.h"
 
+#undef APPLET
+#undef APPLET_NOUSAGE
+#undef PROTOTYPES
+#include "applets.h"
+
 #define bb_need_full_version
 #define BB_DECLARE_EXTERN
 #include "messages.c"
 
 struct BB_applet *applet_using;
 
+/* The -1 arises because of the {0,NULL,0,-1} entry above. */
+const size_t NUM_APPLETS = (sizeof (applets) / sizeof (struct BB_applet) - 1);
+
 extern void show_usage(void)
 {
        const char *format_string;

diff --git a/applets.h b/applets.h
index f7f68cd8d91c27c6941c7c2468698de8affc67f2..8c59507cec8b510160618f033692ee867203ebf4 100644 (file)
--- a/applets.h
+++ b/applets.h
@@ -436,7 +436,4 @@
        { 0,NULL,0 }
 };
 
-/* The -1 arises because of the {0,NULL,0,-1} entry above. */
-size_t NUM_APPLETS = (sizeof (applets) / sizeof (struct BB_applet) - 1);
-
 #endif

diff --git a/applets/applets.c b/applets/applets.c
index 1e31e89259917ec8f7f90e756d0838505b56ef26..51511037203e8e4ea81b80b835f56e80b6089087 100644 (file)
--- a/applets/applets.c
+++ b/applets/applets.c
@@ -29,12 +29,20 @@
 #include <stdlib.h>
 #include "busybox.h"
 
+#undef APPLET
+#undef APPLET_NOUSAGE
+#undef PROTOTYPES
+#include "applets.h"
+
 #define bb_need_full_version
 #define BB_DECLARE_EXTERN
 #include "messages.c"
 
 struct BB_applet *applet_using;
 
+/* The -1 arises because of the {0,NULL,0,-1} entry above. */
+const size_t NUM_APPLETS = (sizeof (applets) / sizeof (struct BB_applet) - 1);
+
 extern void show_usage(void)
 {
        const char *format_string;

diff --git a/applets/busybox.c b/applets/busybox.c
index 0250e4c108ccee77d65c0b28c4e467e617d5724b..2872f1e38c0c6c0feaa9cc6ce12f0423d17830d3 100644 (file)
--- a/applets/busybox.c
+++ b/applets/busybox.c
@@ -6,11 +6,6 @@
 #include <stdlib.h>
 #include "busybox.h"
 
-#undef APPLET
-#undef APPLET_NOUSAGE
-#undef PROTOTYPES
-#include "applets.h"
-
 #define bb_need_full_version
 #define BB_DECLARE_EXTERN
 #include "messages.c"

diff --git a/busybox.c b/busybox.c
index 0250e4c108ccee77d65c0b28c4e467e617d5724b..2872f1e38c0c6c0feaa9cc6ce12f0423d17830d3 100644 (file)
--- a/busybox.c
+++ b/busybox.c
@@ -6,11 +6,6 @@
 #include <stdlib.h>
 #include "busybox.h"
 
-#undef APPLET
-#undef APPLET_NOUSAGE
-#undef PROTOTYPES
-#include "applets.h"
-
 #define bb_need_full_version
 #define BB_DECLARE_EXTERN
 #include "messages.c"

diff --git a/include/applets.h b/include/applets.h
index f7f68cd8d91c27c6941c7c2468698de8affc67f2..8c59507cec8b510160618f033692ee867203ebf4 100644 (file)
--- a/include/applets.h
+++ b/include/applets.h
@@ -436,7 +436,4 @@
        { 0,NULL,0 }
 };
 
-/* The -1 arises because of the {0,NULL,0,-1} entry above. */
-size_t NUM_APPLETS = (sizeof (applets) / sizeof (struct BB_applet) - 1);
-
 #endif