Merge branch 'busybox' into merge

12 files changed, 95 insertions, 54 deletions

diff --git a/editors/vi.c b/editors/vi.c
index e28db3ab6..b813747d1 100644
--- a/editors/vi.c
+++ b/editors/vi.c
@@ -413,7 +413,9 @@ struct globals {
         char *last_search_pattern; // last pattern from a '/' or '?' search
 #endif
 #if ENABLE_FEATURE_VI_SETOPTS
-        int indentcol;          // column of recently autoindent, 0 or -1
+        int char_insert__indentcol;             // column of recent autoindent or 0
+        int newindent;          // autoindent value for 'O'/'cc' commands
+                                                // or -1 to use indent from previous line
 #endif
 #if ENABLE_FEATURE_VI_FILE_FORMAT
         smallint fileformat;
@@ -546,7 +548,8 @@ struct globals {
 #define ioq_start               (G.ioq_start          )
 #define dotcnt                  (G.dotcnt             )
 #define last_search_pattern     (G.last_search_pattern)
-#define indentcol               (G.indentcol          )
+#define char_insert__indentcol  (G.char_insert__indentcol)
+#define newindent               (G.newindent          )
 #define fileformat              (G.fileformat         )
 #define fileformats             (G.fileformats        )
 #define cmd_error               (G.cmd_error          )
@@ -581,10 +584,11 @@ struct globals {
 
 #define INIT_G() do { \
         SET_PTR_TO_GLOBALS(xzalloc(sizeof(G))); \
-        last_modified_count = -1; \
+        last_modified_count--; \
         /* "" but has space for 2 chars: */ \
         IF_FEATURE_VI_SEARCH(last_search_pattern = xzalloc(2);) \
         tabstop = 8; \
+        IF_FEATURE_VI_SETOPTS(newindent--;) \
 } while (0)
 
 #if ENABLE_FEATURE_VI_CRASHME
@@ -2204,6 +2208,7 @@ static size_t indent_len(char *p)
 static char *char_insert(char *p, char c, int undo) // insert the char c at 'p'
 {
 #if ENABLE_FEATURE_VI_SETOPTS
+# define indentcol char_insert__indentcol
         size_t len;
         int col, ntab, nspc;
 #endif
@@ -2232,7 +2237,8 @@ static char *char_insert(char *p, char c, int undo) // insert the char c at 'p'
 #if ENABLE_FEATURE_VI_SETOPTS
                 if (autoindent) {
                         len = indent_len(bol);
-                        if (len && get_column(bol + len) == indentcol && bol[len] == '\n') {
+                        col = get_column(bol + len);
+                        if (len && col == indentcol && bol[len] == '\n') {
                                 // remove autoindent from otherwise empty line
                                 text_hole_delete(bol, bol + len - 1, undo);
                                 p = bol;
@@ -2301,24 +2307,31 @@ static char *char_insert(char *p, char c, int undo) // insert the char c at 'p'
                         showmatching(p - 1);
                 }
                 if (autoindent && c == '\n') {  // auto indent the new line
-                        // use indent of current/previous line
-                        bol = indentcol < 0 ? p : prev_line(p);
-                        len = indent_len(bol);
-                        col = get_column(bol + len);
-
-                        if (len && col == indentcol) {
-                                // previous line was empty except for autoindent
-                                // move the indent to the current line
-                                memmove(bol + 1, bol, len);
-                                *bol = '\n';
-                                return p;
+                        if (newindent < 0) {
+                                // use indent of previous line
+                                bol = prev_line(p);
+                                len = indent_len(bol);
+                                col = get_column(bol + len);
+
+                                if (len && col == indentcol) {
+                                        // previous line was empty except for autoindent
+                                        // move the indent to the current line
+                                        memmove(bol + 1, bol, len);
+                                        *bol = '\n';
+                                        return p;
+                                }
+                        } else {
+                                // for 'O'/'cc' commands add indent before newly inserted NL
+                                if (p != end - 1)       // but not for 'cc' at EOF
+                                        p--;
+                                col = newindent;
                         }
 
-                        if (indentcol < 0)
-                                p--;    // open above, indent before newly inserted NL
-
-                        if (len) {
-                                indentcol = col;
+                        if (col) {
+                                // only record indent if in insert/replace mode or for
+                                // the 'o'/'O'/'cc' commands, which are switched to
+                                // insert mode early.
+                                indentcol = cmd_mode != 0 ? col : 0;
                                 if (expandtab) {
                                         ntab = 0;
                                         nspc = col;
@@ -2340,6 +2353,7 @@ static char *char_insert(char *p, char c, int undo) // insert the char c at 'p'
         }
 #if ENABLE_FEATURE_VI_SETOPTS
         indentcol = 0;
+# undef indentcol
 #endif
         return p;
 }
@@ -4373,6 +4387,9 @@ static void do_cmd(int c)
         case 'i':                       // i- insert before current char
         case KEYCODE_INSERT:    // Cursor Key Insert
  dc_i:
+#if ENABLE_FEATURE_VI_SETOPTS
+                newindent = -1;
+#endif
                 cmd_mode = 1;   // start inserting
                 undo_queue_commit();    // commit queue when cmd_mode changes
                 break;
@@ -4415,12 +4432,16 @@ static void do_cmd(int c)
         case 'O':                       // O- open an empty line above
                 dot_begin();
 #if ENABLE_FEATURE_VI_SETOPTS
-                indentcol = -1;
+                // special case: use indent of current line
+                newindent = get_column(dot + indent_len(dot));
 #endif
                 goto dc3;
         case 'o':                       // o- open an empty line below
                 dot_end();
  dc3:
+#if ENABLE_FEATURE_VI_SETOPTS
+                cmd_mode = 1;   // switch to insert mode early
+#endif
                 dot = char_insert(dot, '\n', ALLOW_UNDO);
                 if (c == 'O' && !autoindent) {
                         // done in char_insert() for 'O'+autoindent
@@ -4535,14 +4556,22 @@ static void do_cmd(int c)
                 if (buftype == WHOLE) {
                         save_dot = p;   // final cursor position is start of range
                         p = begin_line(p);
+#if ENABLE_FEATURE_VI_SETOPTS
+                        if (c == 'c')   // special case: use indent of current line
+                                newindent = get_column(p + indent_len(p));
+#endif
                         q = end_line(q);
                 }
                 dot = yank_delete(p, q, buftype, yf, ALLOW_UNDO);       // delete word
                 if (buftype == WHOLE) {
                         if (c == 'c') {
+#if ENABLE_FEATURE_VI_SETOPTS
+                                cmd_mode = 1;   // switch to insert mode early
+#endif
                                 dot = char_insert(dot, '\n', ALLOW_UNDO_CHAIN);
-                                // on the last line of file don't move to prev line
-                                if (dot != (end-1)) {
+                                // on the last line of file don't move to prev line,
+                                // handled in char_insert() if autoindent is enabled
+                                if (dot != (end-1) && !autoindent) {
                                         dot_prev();
                                 }
                         } else if (c == 'd') {
diff --git a/examples/var_service/dhcp_if/convert2ipconf b/examples/var_service/dhcp_if/convert2ipconf
index 31e3c7fde..98f6546bf 100755
--- a/examples/var_service/dhcp_if/convert2ipconf
+++ b/examples/var_service/dhcp_if/convert2ipconf
@@ -19,7 +19,7 @@
 #let cfg=cfg+1
 #if[$cfg]=...; ip[$cfg]=...; ipmask[$cfg]=.../...; gw[$cfg]=...; net[$cfg]=... dns[$cfg]=...
 
-exec >/dev/null
+#exec >/dev/null
 #exec >"$0.out"  # debug
 exec 2>&1
 
@@ -31,23 +31,31 @@ test "$ip" || exit 1
 if ! test "$mask"; then
         case "$ip" in
         10.*)
+                echo "mask assumed 8 for ip=$ip"
                 mask=8;;
-        192.168.*)
-                mask=16;;
         #172.16-31.x.x
         172.1[6789].*)
+                echo "mask assumed 12 for ip=$ip"
                 mask=12;;
         172.2[0123456789].*)
+                echo "mask assumed 12 for ip=$ip"
                 mask=12;;
         172.3[01].*)
+                echo "mask assumed 12 for ip=$ip"
                 mask=12;;
+        192.168.*)
+                echo "mask assumed 16 for ip=$ip"
+                mask=16;;
         esac
 fi
 
 # some servers do not return router option.
 # assume DHCP server is the router.
 if ! test "$router"; then
-        test "$serverid" && router="$serverid"
+        if test "$serverid"; then
+                router="$serverid"
+                echo "No 'router' from the server, assuming 'serverid' is the router: $serverid"
+        fi
 fi
 
 {
diff --git a/examples/var_service/dhcp_if/convert2ntpconf b/examples/var_service/dhcp_if/convert2ntpconf
index e9d829308..f51740ba0 100755
--- a/examples/var_service/dhcp_if/convert2ntpconf
+++ b/examples/var_service/dhcp_if/convert2ntpconf
@@ -19,7 +19,7 @@
 #let cfg=cfg+1
 #ntpip[$cfg]=...
 
-exec >/dev/null
+#exec >/dev/null
 #exec >"$0.out"  # debug
 exec 2>&1
 
diff --git a/examples/var_service/dhcp_if/dhcp_handler b/examples/var_service/dhcp_if/dhcp_handler
index 6a97e8543..3e652621d 100755
--- a/examples/var_service/dhcp_if/dhcp_handler
+++ b/examples/var_service/dhcp_if/dhcp_handler
@@ -38,12 +38,10 @@ file_ntpconf="$service.ntpconf"
 dir_ipconf="/var/run/service/fw"
 dir_ntpconf="/var/run/service/ntpd"
 
-exec >/dev/null
-#exec >>"$0.out"  #debug
+#exec >/dev/null
+#exec >"$0.out"  #debug
 exec 2>&1
 
-echo "`date`: Params: $*"
-
 if test x"$1" != x"bound" && test x"$1" != x"renew" ; then
         # Reconfigure network with this interface disabled
         echo "Deconfiguring"
diff --git a/examples/var_service/dhcp_if/finish b/examples/var_service/dhcp_if/finish
index 8ce188336..50bfe67b5 100755
--- a/examples/var_service/dhcp_if/finish
+++ b/examples/var_service/dhcp_if/finish
@@ -1,5 +1,5 @@
 #!/bin/sh
-# executed when service is taken down ("sv d .")
+# executed when service is taken down ("svc -d .")
 
 service=${PWD##*/}
 file_ipconf="$service.ipconf"
diff --git a/include/libbb.h b/include/libbb.h
index 6e4e7583f..c5691c76d 100644
--- a/include/libbb.h
+++ b/include/libbb.h
@@ -1992,6 +1992,7 @@ unsigned size_from_HISTFILESIZE(const char *hp) FAST_FUNC;
 #  define MAX_HISTORY 0
 # endif
 typedef const char *get_exe_name_t(int i) FAST_FUNC;
+typedef const char *sh_get_var_t(const char *name) FAST_FUNC;
 typedef struct line_input_t {
         int flags;
         int timeout;
@@ -2005,9 +2006,8 @@ typedef struct line_input_t {
 #  if ENABLE_SHELL_ASH || ENABLE_SHELL_HUSH
         /* function to fetch additional application-specific names to match */
         get_exe_name_t *get_exe_name;
-#   define EDITING_HAS_get_exe_name 1
-#  else
-#   define EDITING_HAS_get_exe_name 0
+        /* function to fetch value of shell variable */
+        sh_get_var_t *sh_get_var;
 #  endif
 # endif
 # if MAX_HISTORY
@@ -2061,11 +2061,6 @@ int read_line_input(const char* prompt, char* command, int maxsize) FAST_FUNC;
         read_line_input(prompt, command, maxsize)
 #endif
 
-#ifndef EDITING_HAS_get_exe_name
-# define EDITING_HAS_get_exe_name 0
-#endif
-
-
 #ifndef COMM_LEN
 # ifdef TASK_COMM_LEN
 enum { COMM_LEN = TASK_COMM_LEN };
diff --git a/libbb/lineedit.c b/libbb/lineedit.c
index c06b104ff..6994d1da7 100644
--- a/libbb/lineedit.c
+++ b/libbb/lineedit.c
@@ -259,6 +259,16 @@ static const char *get_username_str(void)
 
 static NOINLINE const char *get_homedir_or_NULL(void)
 {
+        const char *home;
+
+# if ENABLE_SHELL_ASH || ENABLE_SHELL_HUSH
+        home = state->sh_get_var ? state->sh_get_var("HOME") : getenv("HOME");
+# else
+        home = getenv("HOME");
+# endif
+        if (home != NULL && home[0] != '\0')
+                return home;
+
         if (!got_user_strings)
                 get_user_strings();
         return home_pwd_buf;
@@ -932,7 +942,7 @@ static NOINLINE unsigned complete_cmd_dir_file(const char *command, int type)
                                 continue;
                 }
 # endif
-# if EDITING_HAS_get_exe_name
+# if ENABLE_SHELL_ASH || ENABLE_SHELL_HUSH
                 if (state->get_exe_name) {
                         i = 0;
                         for (;;) {
diff --git a/libbb/perror_nomsg.c b/libbb/perror_nomsg.c
index d7d53de44..a2a11cc8e 100644
--- a/libbb/perror_nomsg.c
+++ b/libbb/perror_nomsg.c
@@ -12,11 +12,11 @@
  * instead of including libbb.h */
 //#include "libbb.h"
 #include "platform.h"
-extern void bb_simple_perror_msg(const char *s) FAST_FUNC;
+extern void bb_perror_msg(const char *s, ...) FAST_FUNC;
 
 /* suppress gcc "no previous prototype" warning */
 void FAST_FUNC bb_perror_nomsg(void);
 void FAST_FUNC bb_perror_nomsg(void)
 {
-        bb_simple_perror_msg(0);
+        bb_perror_msg(0);
 }
diff --git a/libbb/perror_nomsg_and_die.c b/libbb/perror_nomsg_and_die.c
index bea5f25a5..543ff5178 100644
--- a/libbb/perror_nomsg_and_die.c
+++ b/libbb/perror_nomsg_and_die.c
@@ -12,11 +12,11 @@
  * instead of including libbb.h */
 //#include "libbb.h"
 #include "platform.h"
-extern void bb_simple_perror_msg_and_die(const char *s) FAST_FUNC;
+extern void bb_perror_msg_and_die(const char *s, ...) FAST_FUNC;
 
 /* suppress gcc "no previous prototype" warning */
 void FAST_FUNC bb_perror_nomsg_and_die(void);
 void FAST_FUNC bb_perror_nomsg_and_die(void)
 {
-        bb_simple_perror_msg_and_die(0);
+        bb_perror_msg_and_die(0);
 }
diff --git a/procps/top.c b/procps/top.c
index 744f20e9b..ff775422c 100644
--- a/procps/top.c
+++ b/procps/top.c
@@ -879,8 +879,11 @@ static NOINLINE void display_topmem_process_list(int lines_rem, int scr_width)
                 lines_rem = ntop - G_scroll_ofs;
         while (--lines_rem >= 0) {
                 /* PID VSZ VSZRW RSS (SHR) DIRTY (SHR) COMMAND */
-                ulltoa6_and_space(s->pid     , &line_buf[0*6]);
+                int n = sprintf(line_buf, "%5u ", s->pid);
                 ulltoa6_and_space(s->vsz     , &line_buf[1*6]);
+                if (n > 7 || (n == 7 && line_buf[6] != ' '))
+                        /* PID and VSZ are clumped together, truncate PID */
+                        line_buf[5] = '.';
                 ulltoa6_and_space(s->vszrw   , &line_buf[2*6]);
                 ulltoa6_and_space(s->rss     , &line_buf[3*6]);
                 ulltoa6_and_space(s->rss_sh  , &line_buf[4*6]);
diff --git a/shell/ash.c b/shell/ash.c
index b34ed67a7..28c7fe2db 100644
--- a/shell/ash.c
+++ b/shell/ash.c
@@ -10611,7 +10611,7 @@ evalpipe(union node *n, int flags)
 }
 
 /* setinteractive needs this forward reference */
-#if EDITING_HAS_get_exe_name
+#if ENABLE_FEATURE_EDITING
 static const char *get_builtin_name(int i) FAST_FUNC;
 #endif
 
@@ -10648,9 +10648,8 @@ setinteractive(int on)
 #if ENABLE_FEATURE_EDITING
                 if (!line_input_state) {
                         line_input_state = new_line_input_t(FOR_SHELL | WITH_PATH_LOOKUP);
-# if EDITING_HAS_get_exe_name
                         line_input_state->get_exe_name = get_builtin_name;
-# endif
+                        line_input_state->sh_get_var = lookupvar;
                 }
 #endif
         }
@@ -11157,7 +11156,7 @@ find_builtin(const char *name)
         return bp;
 }
 
-#if EDITING_HAS_get_exe_name
+#if ENABLE_FEATURE_EDITING
 static const char * FAST_FUNC
 get_builtin_name(int i)
 {
diff --git a/shell/hush.c b/shell/hush.c
index ae81f0da5..051b123e7 100644
--- a/shell/hush.c
+++ b/shell/hush.c
@@ -8188,7 +8188,7 @@ static const struct built_in_command *find_builtin(const char *name)
         return find_builtin_helper(name, bltins2, &bltins2[ARRAY_SIZE(bltins2)]);
 }
 
-#if ENABLE_HUSH_JOB && EDITING_HAS_get_exe_name
+#if ENABLE_HUSH_JOB && ENABLE_FEATURE_EDITING
 static const char * FAST_FUNC get_builtin_name(int i)
 {
         if (/*i >= 0 && */ i < ARRAY_SIZE(bltins1)) {
@@ -10668,9 +10668,8 @@ int hush_main(int argc, char **argv)
 
 # if ENABLE_FEATURE_EDITING
                 G.line_input_state = new_line_input_t(FOR_SHELL);
-#  if EDITING_HAS_get_exe_name
                 G.line_input_state->get_exe_name = get_builtin_name;
-#  endif
+                G.line_input_state->sh_get_var = get_local_var_value;
 # endif
 # if ENABLE_HUSH_SAVEHISTORY && MAX_HISTORY > 0
                 {