Merge branch 'busybox' into merge

3 files changed, 56 insertions, 5 deletions

diff --git a/shell/Config.src b/shell/Config.src
index 959d3cb42..bc7218fe5 100644
--- a/shell/Config.src
+++ b/shell/Config.src
@@ -161,6 +161,20 @@ config FEATURE_SH_HISTFILESIZE
         to set shell history size. Note that its max value is capped
         by "History size" setting in library tuning section.
 
+config FEATURE_SH_EMBEDDED_SCRIPTS
+        bool "Embed scripts in the binary"
+        default y
+        depends on ASH || HUSH || SH_IS_ASH || BASH_IS_ASH || SH_IS_HUSH || BASH_IS_HUSH
+        help
+        Allow scripts to be compressed and embedded in the busybox
+        binary. The scripts should be placed in the 'embed' directory
+        at build time. Like applets, scripts can be run as
+        'busybox SCRIPT ...' or by linking their name to the binary.
+
+        This also allows applets to be implemented as scripts: place
+        the script in 'applets_sh' and a stub C file containing
+        configuration in the appropriate subsystem directory.
+
 endif # Options common to all shells
 
 endmenu
diff --git a/shell/ash.c b/shell/ash.c
index 7131609e4..1b40e3407 100644
--- a/shell/ash.c
+++ b/shell/ash.c
@@ -208,6 +208,11 @@
 #include <sys/times.h>
 #include <sys/utsname.h> /* for setting $HOSTNAME */
 #include "busybox.h" /* for applet_names */
+#if ENABLE_FEATURE_SH_EMBEDDED_SCRIPTS
+# include "embedded_scripts.h"
+#else
+# define NUM_SCRIPTS 0
+#endif
 
 /* So far, all bash compat is controlled by one config option */
 /* Separate defines document which part of code implements what */
@@ -2503,13 +2508,12 @@ setvar(const char *name, const char *val, int flags)
         }
 
         INT_OFF;
-        nameeq = ckmalloc(namelen + vallen + 2);
+        nameeq = ckzalloc(namelen + vallen + 2);
         p = mempcpy(nameeq, name, namelen);
         if (val) {
                 *p++ = '=';
-                p = mempcpy(p, val, vallen);
+                memcpy(p, val, vallen);
         }
-        *p = '\0';
         vp = setvareq(nameeq, flags | VNOSAVE);
         INT_ON;
 
@@ -8420,6 +8424,7 @@ tryexec(IF_FEATURE_SH_STANDALONE(int applet_no,) const char *cmd, char **argv, c
 #else
         execve(cmd, argv, envp);
 #endif
+
         if (cmd != bb_busybox_exec_path && errno == ENOEXEC) {
                 /* Run "cmd" as a shell script:
                  * http://pubs.opengroup.org/onlinepubs/9699919799/utilities/V3_chap02.html
@@ -13459,6 +13464,7 @@ parseheredoc(void)
         heredoclist = NULL;
 
         while (here) {
+                tokpushback = 0;
                 setprompt_if(needprompt, 2);
                 readtoken1(pgetc(), here->here->type == NHERE ? SQSYNTAX : DQSYNTAX,
                                 here->eofmark, here->striptabs);
@@ -14662,12 +14668,16 @@ procargs(char **argv)
 
         xargv = argv;
         login_sh = xargv[0] && xargv[0][0] == '-';
+#if NUM_SCRIPTS > 0
+        if (minusc)
+                goto setarg0;
+#endif
         arg0 = xargv[0];
         /* if (xargv[0]) - mmm, this is always true! */
                 xargv++;
+        argptr = xargv;
         for (i = 0; i < NOPTS; i++)
                 optlist[i] = 2;
-        argptr = xargv;
         if (options(/*cmdline:*/ 1, &login_sh)) {
                 /* it already printed err message */
                 raise_exception(EXERROR);
@@ -14772,7 +14782,12 @@ extern int etext();
  * is used to figure out how far we had gotten.
  */
 int ash_main(int argc, char **argv) MAIN_EXTERNALLY_VISIBLE;
+#if NUM_SCRIPTS > 0
+int ash_main(int argc, char **argv)
+#else
 int ash_main(int argc UNUSED_PARAM, char **argv)
+#endif
+/* note: 'argc' is used only if embedded scripts are enabled */
 {
         volatile smallint state;
         struct jmploc jmploc;
@@ -14839,6 +14854,12 @@ int ash_main(int argc UNUSED_PARAM, char **argv)
                 bb_error_msg_and_die("forkshell failed");
         }
 #endif
+
+#if NUM_SCRIPTS > 0
+        if (argc < 0)
+                /* Non-NULL minusc tells procargs that an embedded script is being run */
+                minusc = get_script_content(-argc - 1);
+#endif
         login_sh = procargs(argv);
 #if DEBUG
         TRACE(("Shell args: "));
diff --git a/shell/hush.c b/shell/hush.c
index 881331c5b..90191408d 100644
--- a/shell/hush.c
+++ b/shell/hush.c
@@ -157,7 +157,7 @@
 //config:       but no separate process group is formed.
 //config:
 //config:config HUSH_TICK
-//config:       bool "Support process substitution"
+//config:       bool "Support command substitution"
 //config:       default y
 //config:       depends on HUSH || SH_IS_HUSH || BASH_IS_HUSH
 //config:       help
@@ -367,6 +367,11 @@
 # define PIPE_BUF 4096  /* amount of buffering in a pipe */
 #endif
 
+#if ENABLE_FEATURE_SH_EMBEDDED_SCRIPTS && !(ENABLE_ASH || ENABLE_SH_IS_ASH || ENABLE_BASH_IS_ASH)
+# include "embedded_scripts.h"
+#else
+# define NUM_SCRIPTS 0
+#endif
 
 /* So far, all bash compat is controlled by one config option */
 /* Separate defines document which part of code implements what */
@@ -9951,6 +9956,14 @@ int hush_main(int argc, char **argv)
         /* http://www.opengroup.org/onlinepubs/9699919799/utilities/sh.html */
         flags = (argv[0] && argv[0][0] == '-') ? OPT_login : 0;
         builtin_argc = 0;
+#if NUM_SCRIPTS > 0
+        if (argc < 0) {
+                optarg = get_script_content(-argc - 1);
+                optind = 0;
+                argc = string_array_len(argv);
+                goto run_script;
+        }
+#endif
         while (1) {
                 int opt = getopt(argc, argv, "+c:exinsl"
 #if !BB_MMU
@@ -9974,6 +9987,9 @@ int hush_main(int argc, char **argv)
                          * Note: the form without ARG0 never happens:
                          * sh ... -c 'builtin' BARGV... ""
                          */
+#if NUM_SCRIPTS > 0
+ run_script:
+#endif
                         if (!G.root_pid) {
                                 G.root_pid = getpid();
                                 G.root_ppid = getppid();