Per a suggestion from Tom Oehser, fix up the leading-hyphen hack to

make it general.  Now all leading single hyphens are ignored for
purposed of applet name matching, while argv[0] is still passed
unaltered to applets, so leading-hyphen sensitive applets (such as sh)
can react accordingly.
 -Erik


git-svn-id: svn://busybox.net/trunk/busybox@2867 69ca8d6d-28ef-0310-b511-8ec308f3f277

2 files changed, 4 insertions, 10 deletions

diff --git a/applets/busybox.c b/applets/busybox.c
index f3d0c4c2f..7a220f7b0 100644
--- a/applets/busybox.c
+++ b/applets/busybox.c
@@ -74,13 +74,10 @@ int main(int argc, char **argv)
                         applet_name = s;
         }
 
-#ifdef BB_SH
-        /* Add in a special case hack -- whenever **argv == '-'
-         * (i.e., '-su' or '-sh') always invoke the shell */
+        /* Add in a special case hack for a leading hyphen */
         if (**argv == '-' && *(*argv+1)!= '-') {
-                applet_name = "sh";
+                applet_name = (*argv+1);
         }
-#endif
 
 #ifdef BB_LOCALE_SUPPORT 
 #ifdef BB_INIT
diff --git a/busybox.c b/busybox.c
index f3d0c4c2f..7a220f7b0 100644
--- a/busybox.c
+++ b/busybox.c
@@ -74,13 +74,10 @@ int main(int argc, char **argv)
                         applet_name = s;
         }
 
-#ifdef BB_SH
-        /* Add in a special case hack -- whenever **argv == '-'
-         * (i.e., '-su' or '-sh') always invoke the shell */
+        /* Add in a special case hack for a leading hyphen */
         if (**argv == '-' && *(*argv+1)!= '-') {
-                applet_name = "sh";
+                applet_name = (*argv+1);
         }
-#endif
 
 #ifdef BB_LOCALE_SUPPORT 
 #ifdef BB_INIT