Merge branch 'busybox' into merge

6 files changed, 45 insertions, 54 deletions

diff --git a/shell/ash.c b/shell/ash.c
index 75c01ec14..962fc2609 100644
--- a/shell/ash.c
+++ b/shell/ash.c
@@ -441,6 +441,9 @@ static void trace_vprintf(const char *fmt, va_list va);
 /* ============ Utility functions */
 #define xbarrier() do { __asm__ __volatile__ ("": : :"memory"); } while (0)
 
+#define is_name(c)      ((c) == '_' || isalpha((unsigned char)(c)))
+#define is_in_name(c)   ((c) == '_' || isalnum((unsigned char)(c)))
+
 static int isdigit_str9(const char *str)
 {
         int maxlen = 9 + 1; /* max 9 digits: 999999999 */
@@ -2064,27 +2067,6 @@ getoptsreset(const char *value)
 }
 #endif
 
-/* math.h has these, otherwise define our private copies */
-#if !ENABLE_SH_MATH_SUPPORT
-#define is_name(c)      ((c) == '_' || isalpha((unsigned char)(c)))
-#define is_in_name(c)   ((c) == '_' || isalnum((unsigned char)(c)))
-/*
- * Return the pointer to the first char which is not part of a legal variable name
- * (a letter or underscore followed by letters, underscores, and digits).
- */
-static const char*
-endofname(const char *name)
-{
-        if (!is_name(*name))
-                return name;
-        while (*++name) {
-                if (!is_in_name(*name))
-                        break;
-        }
-        return name;
-}
-#endif
-
 /*
  * Compares two strings up to the first = or '\0'.  The first
  * string must be terminated by '='; the second may be terminated by
@@ -12774,6 +12756,9 @@ dotcmd(int argc, char **argv)
         /* "false; . empty_file; echo $?" should print 0, not 1: */
         exitstatus = 0;
 
+        /* This aborts if file isn't found, which is POSIXly correct.
+         * bash returns exitcode 1 instead.
+         */
         fullname = find_dot_file(argv[1]);
 
         argv += 2;
@@ -12785,6 +12770,9 @@ dotcmd(int argc, char **argv)
                 shellparam.p = argv;
         };
 
+        /* This aborts if file can't be opened, which is POSIXly correct.
+         * bash returns exitcode 1 instead.
+         */
         setinputfile(fullname, INPUT_PUSH_FILE);
         commandname = fullname;
         cmdloop(0);
@@ -13832,27 +13820,21 @@ int ash_main(int argc UNUSED_PARAM, char **argv)
 #endif
         procargs(argv);
 
-#if ENABLE_FEATURE_EDITING_SAVEHISTORY
-        if (iflag) {
-                const char *hp = lookupvar("HISTFILE");
-                if (!hp) {
-                        hp = lookupvar("HOME");
-                        if (hp) {
-                                char *defhp = concat_path_file(hp, ".ash_history");
-                                setvar("HISTFILE", defhp, 0);
-                                free(defhp);
-                        }
-                }
-        }
-#endif
         if (argv[0] && argv[0][0] == '-')
                 isloginsh = 1;
         if (isloginsh) {
+                const char *hp;
+
                 state = 1;
                 read_profile("/etc/profile");
  state1:
                 state = 2;
-                read_profile(".profile");
+                hp = lookupvar("HOME");
+                if (hp) {
+                        hp = concat_path_file(hp, ".profile");
+                        read_profile(hp);
+                        free((char*)hp);
+                }
         }
  state2:
         state = 3;
@@ -13884,6 +13866,15 @@ int ash_main(int argc UNUSED_PARAM, char **argv)
 #if MAX_HISTORY > 0 && ENABLE_FEATURE_EDITING_SAVEHISTORY
                 if (iflag) {
                         const char *hp = lookupvar("HISTFILE");
+                        if (!hp) {
+                                hp = lookupvar("HOME");
+                                if (hp) {
+                                        hp = concat_path_file(hp, ".ash_history");
+                                        setvar("HISTFILE", hp, 0);
+                                        free((char*)hp);
+                                        hp = lookupvar("HISTFILE");
+                                }
+                        }
                         if (hp)
                                 line_input_state->hist_file = hp;
 # if ENABLE_FEATURE_SH_HISTFILESIZE
diff --git a/shell/hush.c b/shell/hush.c
index e2dc1e2d0..b23325725 100644
--- a/shell/hush.c
+++ b/shell/hush.c
@@ -8880,6 +8880,9 @@ static int FAST_FUNC builtin_source(char **argv)
         free(arg_path);
         if (!input) {
                 /* bb_perror_msg("%s", *argv); - done by fopen_or_warn */
+                /* POSIX: non-interactive shell should abort here,
+                 * not merely fail. So far no one complained :)
+                 */
                 return EXIT_FAILURE;
         }
         close_on_exec_on(fileno(input));
@@ -8889,12 +8892,14 @@ static int FAST_FUNC builtin_source(char **argv)
         /* "we are inside sourced file, ok to use return" */
         G.flag_return_in_progress = -1;
 #endif
-        save_and_replace_G_args(&sv, argv);
+        if (argv[1])
+                save_and_replace_G_args(&sv, argv);
 
         parse_and_run_file(input);
         fclose(input);
 
-        restore_G_args(&sv, argv);
+        if (argv[1])
+                restore_G_args(&sv, argv);
 #if ENABLE_HUSH_FUNCTIONS
         G.flag_return_in_progress = sv_flg;
 #endif
diff --git a/shell/hush_test/hush-misc/source2.right b/shell/hush_test/hush-misc/source2.right
new file mode 100644
index 000000000..0587bad67
--- /dev/null
+++ b/shell/hush_test/hush-misc/source2.right
@@ -0,0 +1,4 @@
+0:arg0 1:arg1 2:arg2
+Ok1:0
+0:arg0 1:q 2:w
+Ok2:0
diff --git a/shell/hush_test/hush-misc/source2.tests b/shell/hush_test/hush-misc/source2.tests
new file mode 100755
index 000000000..40b6b83cd
--- /dev/null
+++ b/shell/hush_test/hush-misc/source2.tests
@@ -0,0 +1,8 @@
+echo 'echo "0:$0 1:$1 2:$2"' >sourced1
+set -- 1 2 3
+"$THIS_SH" -c '. ./sourced1' arg0 arg1 arg2
+echo Ok1:$?
+"$THIS_SH" -c '. ./sourced1 q w e' arg0 arg1 arg2
+echo Ok2:$?
+
+rm sourced1
diff --git a/shell/math.c b/shell/math.c
index 15c003965..3da151137 100644
--- a/shell/math.c
+++ b/shell/math.c
@@ -494,18 +494,6 @@ static const char op_tokens[] ALIGN1 = {
 };
 #define ptr_to_rparen (&op_tokens[sizeof(op_tokens)-7])
 
-const char* FAST_FUNC
-endofname(const char *name)
-{
-        if (!is_name(*name))
-                return name;
-        while (*++name) {
-                if (!is_in_name(*name))
-                        break;
-        }
-        return name;
-}
-
 static arith_t FAST_FUNC
 evaluate_string(arith_state_t *math_state, const char *expr)
 {
diff --git a/shell/math.h b/shell/math.h
index 2d305eb12..864bee691 100644
--- a/shell/math.h
+++ b/shell/math.h
@@ -73,11 +73,6 @@ typedef long arith_t;
 #define strto_arith_t strtoul
 #endif
 
-/* ash's and hush's endofname is the same, so... */
-# define is_name(c)      ((c) == '_' || isalpha((unsigned char)(c)))
-# define is_in_name(c)   ((c) == '_' || isalnum((unsigned char)(c)))
-const char* FAST_FUNC endofname(const char *name);
-
 typedef const char* FAST_FUNC (*arith_var_lookup_t)(const char *name);
 typedef void        FAST_FUNC (*arith_var_set_t)(const char *name, const char *val);
 //typedef const char* FAST_FUNC (*arith_var_endofname_t)(const char *name);