|
@@ -22,41 +22,60 @@ s - suid type:
|
|
|
BB_SUID_REQUIRE or BB_SUID_MAYBE applet.
|
|
|
*/
|
|
|
|
|
|
+#define NOUSAGE_STR "\b"
|
|
|
+
|
|
|
+#define dummy_trivial_usage NOUSAGE_STR \
|
|
|
+
|
|
|
+#define dummy_full_usage "" \
|
|
|
+
|
|
|
#if defined(PROTOTYPES)
|
|
|
# define APPLET(name,l,s) int name##_main(int argc, char **argv) MAIN_EXTERNALLY_VISIBLE;
|
|
|
# define APPLET_ODDNAME(name,main,l,s,help) int main##_main(int argc, char **argv) MAIN_EXTERNALLY_VISIBLE;
|
|
|
# define APPLET_NOEXEC(name,main,l,s,help) int main##_main(int argc, char **argv) MAIN_EXTERNALLY_VISIBLE;
|
|
|
# define APPLET_NOFORK(name,main,l,s,help) int main##_main(int argc, char **argv) MAIN_EXTERNALLY_VISIBLE;
|
|
|
+# define APPLET_SCRIPTED(name,main,l,s,help)
|
|
|
|
|
|
#elif defined(NAME_MAIN)
|
|
|
# define APPLET(name,l,s) name name##_main
|
|
|
# define APPLET_ODDNAME(name,main,l,s,help) name main##_main
|
|
|
# define APPLET_NOEXEC(name,main,l,s,help) name main##_main
|
|
|
# define APPLET_NOFORK(name,main,l,s,help) name main##_main
|
|
|
+# define APPLET_SCRIPTED(name,main,l,s,help) name scripted_main
|
|
|
|
|
|
#elif defined(MAKE_USAGE) && ENABLE_FEATURE_VERBOSE_USAGE
|
|
|
# define APPLET(name,l,s) MAKE_USAGE(#name, name##_trivial_usage name##_full_usage)
|
|
|
# define APPLET_ODDNAME(name,main,l,s,help) MAKE_USAGE(#name, help##_trivial_usage help##_full_usage)
|
|
|
# define APPLET_NOEXEC(name,main,l,s,help) MAKE_USAGE(#name, help##_trivial_usage help##_full_usage)
|
|
|
# define APPLET_NOFORK(name,main,l,s,help) MAKE_USAGE(#name, help##_trivial_usage help##_full_usage)
|
|
|
+# define APPLET_SCRIPTED(name,main,l,s,help) MAKE_USAGE(#name, help##_trivial_usage help##_full_usage)
|
|
|
|
|
|
#elif defined(MAKE_USAGE) && !ENABLE_FEATURE_VERBOSE_USAGE
|
|
|
# define APPLET(name,l,s) MAKE_USAGE(#name, name##_trivial_usage)
|
|
|
# define APPLET_ODDNAME(name,main,l,s,help) MAKE_USAGE(#name, help##_trivial_usage)
|
|
|
# define APPLET_NOEXEC(name,main,l,s,help) MAKE_USAGE(#name, help##_trivial_usage)
|
|
|
# define APPLET_NOFORK(name,main,l,s,help) MAKE_USAGE(#name, help##_trivial_usage)
|
|
|
+# define APPLET_SCRIPTED(name,main,l,s,help) MAKE_USAGE(#name, help##_trivial_usage)
|
|
|
|
|
|
#elif defined(MAKE_LINKS)
|
|
|
# define APPLET(name,l,c) LINK l name
|
|
|
# define APPLET_ODDNAME(name,main,l,s,help) LINK l name
|
|
|
# define APPLET_NOEXEC(name,main,l,s,help) LINK l name
|
|
|
# define APPLET_NOFORK(name,main,l,s,help) LINK l name
|
|
|
+# define APPLET_SCRIPTED(name,main,l,s,help) LINK l name
|
|
|
|
|
|
#elif defined(MAKE_SUID)
|
|
|
# define APPLET(name,l,s) SUID s l name
|
|
|
# define APPLET_ODDNAME(name,main,l,s,help) SUID s l name
|
|
|
# define APPLET_NOEXEC(name,main,l,s,help) SUID s l name
|
|
|
# define APPLET_NOFORK(name,main,l,s,help) SUID s l name
|
|
|
+# define APPLET_SCRIPTED(name,main,l,s,help) SUID s l name
|
|
|
+
|
|
|
+#elif defined(MAKE_SCRIPTS)
|
|
|
+# define APPLET(name,l,s)
|
|
|
+# define APPLET_ODDNAME(name,main,l,s,help)
|
|
|
+# define APPLET_NOEXEC(name,main,l,s,help)
|
|
|
+# define APPLET_NOFORK(name,main,l,s,help)
|
|
|
+# define APPLET_SCRIPTED(name,main,l,s,help) SCRIPT name
|
|
|
|
|
|
#else
|
|
|
static struct bb_applet applets[] = { /* name, main, location, need_suid */
|
|
@@ -64,6 +83,7 @@ s - suid type:
|
|
|
# define APPLET_ODDNAME(name,main,l,s,help) { #name, #main, l, s },
|
|
|
# define APPLET_NOEXEC(name,main,l,s,help) { #name, #main, l, s, 1 },
|
|
|
# define APPLET_NOFORK(name,main,l,s,help) { #name, #main, l, s, 1, 1 },
|
|
|
+# define APPLET_SCRIPTED(name,main,l,s,help) { #name, #main, l, s },
|
|
|
#endif
|
|
|
|
|
|
#if ENABLE_INSTALL_NO_USR
|
|
@@ -84,3 +104,4 @@ INSERT
|
|
|
#undef APPLET_ODDNAME
|
|
|
#undef APPLET_NOEXEC
|
|
|
#undef APPLET_NOFORK
|
|
|
+#undef APPLET_SCRIPTED
|