Merge branch 'busybox' into merge

1 files changed, 56 insertions, 38 deletions

diff --git a/libbb/lineedit.c b/libbb/lineedit.c
index 7c46fa5db..8abc87976 100644
--- a/libbb/lineedit.c
+++ b/libbb/lineedit.c
@@ -135,10 +135,6 @@ enum {
                       : 0x7ff0
 };
 
-#if ENABLE_USERNAME_OR_HOMEDIR
-static const char null_str[] ALIGN1 = "";
-#endif
-
 /* We try to minimize both static and stack usage. */
 struct lineedit_statics {
         line_input_t *state;
@@ -161,12 +157,13 @@ struct lineedit_statics {
 
 #if ENABLE_USERNAME_OR_HOMEDIR
         char *user_buf;
-        char *home_pwd_buf; /* = (char*)null_str; */
+        char *home_pwd_buf;
+        smallint got_user_strings;
 #endif
 
 #if ENABLE_FEATURE_TAB_COMPLETION
-        char **matches;
         unsigned num_matches;
+        char **matches;
 #endif
 
 #if ENABLE_FEATURE_EDITING_WINCH
@@ -192,7 +189,7 @@ struct lineedit_statics {
 };
 
 /* See lineedit_ptr_hack.c */
-extern struct lineedit_statics *const lineedit_ptr_to_statics;
+extern struct lineedit_statics *BB_GLOBAL_CONST lineedit_ptr_to_statics;
 
 #define S (*lineedit_ptr_to_statics)
 #define state            (S.state           )
@@ -207,15 +204,15 @@ extern struct lineedit_statics *const lineedit_ptr_to_statics;
 #define prompt_last_line (S.prompt_last_line)
 #define user_buf         (S.user_buf        )
 #define home_pwd_buf     (S.home_pwd_buf    )
-#define matches          (S.matches         )
+#define got_user_strings (S.got_user_strings)
 #define num_matches      (S.num_matches     )
+#define matches          (S.matches         )
 #define delptr           (S.delptr          )
 #define newdelflag       (S.newdelflag      )
 #define delbuf           (S.delbuf          )
 
 #define INIT_S() do { \
-        (*(struct lineedit_statics**)not_const_pp(&lineedit_ptr_to_statics)) = xzalloc(sizeof(S)); \
-        barrier(); \
+        XZALLOC_CONST_PTR(&lineedit_ptr_to_statics, sizeof(S)); \
 } while (0)
 
 static void deinit_S(void)
@@ -227,14 +224,47 @@ static void deinit_S(void)
 #endif
 #if ENABLE_USERNAME_OR_HOMEDIR
         free(user_buf);
-        if (home_pwd_buf != null_str)
-                free(home_pwd_buf);
+        free(home_pwd_buf);
 #endif
         free(lineedit_ptr_to_statics);
 }
 #define DEINIT_S() deinit_S()
 
 
+#if ENABLE_USERNAME_OR_HOMEDIR
+/* Call getpwuid() only if necessary.
+ * E.g. if PS1=':', no user database reading is needed to generate prompt.
+ * (Unfortunately, default PS1='\w \$' needs it, \w abbreviates homedir
+ * as ~/... - for that it needs to *know* the homedir...)
+ */
+static void get_user_strings(void)
+{
+        struct passwd *entry;
+
+        got_user_strings = 1;
+        entry = getpwuid(geteuid());
+        if (entry) {
+                user_buf = xstrdup(entry->pw_name);
+                home_pwd_buf = xstrdup(entry->pw_dir);
+        }
+}
+
+static const char *get_username_str(void)
+{
+        if (!got_user_strings)
+                get_user_strings();
+        return user_buf ? user_buf : "";
+        /* btw, bash uses "I have no name!" string if uid has no entry */
+}
+
+static NOINLINE const char *get_homedir_or_NULL(void)
+{
+        if (!got_user_strings)
+                get_user_strings();
+        return home_pwd_buf;
+}
+#endif
+
 #if ENABLE_UNICODE_SUPPORT
 static size_t load_string(const char *src)
 {
@@ -748,11 +778,11 @@ static char *username_path_completion(char *ud)
         struct passwd *entry;
 #endif
         char *tilde_name = ud;
-        char *home = NULL;
+        const char *home = NULL;
 
         ud++; /* skip ~ */
         if (*ud == '/') {       /* "~/..." */
-                home = home_pwd_buf;
+                home = get_homedir_or_NULL();
 #  if !ENABLE_PLATFORM_MINGW32
         } else {
                 /* "~user/..." */
@@ -1881,7 +1911,7 @@ vi_back_motion(void)
                         input_backward(1);
         }
 }
-#endif
+#endif /* ENABLE_FEATURE_EDITING_VI */
 
 /* Modelled after bash 4.0 behavior of Ctrl-<arrow> */
 static void ctrl_left(void)
@@ -1982,7 +2012,7 @@ static void ask_terminal(void)
         }
 }
 #else
-#define ask_terminal() ((void)0)
+# define ask_terminal() ((void)0)
 #endif
 
 /* Note about multi-line PS1 (e.g. "\n\w \u@\h\n> ") and prompt redrawing:
@@ -2091,7 +2121,7 @@ static void parse_and_put_prompt(const char *prmt_ptr)
 
                                 switch (c) {
                                 case 'u':
-                                        pbuf = user_buf ? user_buf : (char*)"";
+                                        pbuf = (char*)get_username_str();
                                         break;
                                 case 'H':
                                 case 'h':
@@ -2113,14 +2143,15 @@ static void parse_and_put_prompt(const char *prmt_ptr)
                                 case 'w': /* current dir */
                                 case 'W': /* basename of cur dir */
                                         if (!cwd_buf) {
+                                                const char *home;
                                                 cwd_buf = xrealloc_getcwd_or_warn(NULL);
                                                 if (!cwd_buf)
                                                         cwd_buf = (char *)bb_msg_unknown;
-                                                else if (home_pwd_buf[0]) {
+                                                else if ((home = get_homedir_or_NULL()) != NULL && home[0]) {
                                                         char *after_home_user;
 
                                                         /* /home/user[/something] -> ~[/something] */
-                                                        after_home_user = is_prefixed_with(cwd_buf, home_pwd_buf);
+                                                        after_home_user = is_prefixed_with(cwd_buf, home);
                                                         if (after_home_user
                                                          && (*after_home_user == '/' || *after_home_user == '\0')
                                                         ) {
@@ -2176,7 +2207,7 @@ static void parse_and_put_prompt(const char *prmt_ptr)
                         if (c == '\n')
                                 cmdedit_prmt_len = 0;
                         else if (flg_not_length != ']') {
-#if ENABLE_UNICODE_SUPPORT
+# if ENABLE_UNICODE_SUPPORT
                                 if (n == 1) {
                                         /* Only count single-byte characters and the first of multi-byte characters */
                                         if ((unsigned char)*pbuf < 0x80  /* single byte character */
@@ -2187,9 +2218,9 @@ static void parse_and_put_prompt(const char *prmt_ptr)
                                 } else {
                                         cmdedit_prmt_len += unicode_strwidth(pbuf);
                                 }
-#else
+# else
                                 cmdedit_prmt_len += n;
-#endif
+# endif
                         }
                 }
                 prmt_mem_ptr = strcat(xrealloc(prmt_mem_ptr, prmt_size+1), pbuf);
@@ -2416,7 +2447,7 @@ static int32_t reverse_i_search(int timeout)
                         }
 
                         /* Append this char */
-#if ENABLE_UNICODE_SUPPORT
+# if ENABLE_UNICODE_SUPPORT
                         if (unicode_status == UNICODE_ON) {
                                 mbstate_t mbstate = { 0 };
                                 char buf[MB_CUR_MAX + 1];
@@ -2427,7 +2458,7 @@ static int32_t reverse_i_search(int timeout)
                                                 strcpy(match_buf + match_buf_len, buf);
                                 }
                         } else
-#endif
+# endif
                         if (match_buf_len < sizeof(match_buf) - 1) {
                                 match_buf[match_buf_len] = ic;
                                 match_buf[match_buf_len + 1] = '\0';
@@ -2479,7 +2510,7 @@ static int32_t reverse_i_search(int timeout)
 
         return ic;
 }
-#endif
+#endif /* ENABLE_FEATURE_REVERSE_SEARCH */
 
 #if ENABLE_FEATURE_EDITING_WINCH
 static void sigaction2(int sig, struct sigaction *act)
@@ -2521,7 +2552,6 @@ int FAST_FUNC read_line_input(line_input_t *st, const char *prompt, char *comman
         //command_len = 0; - done by INIT_S()
         //cmdedit_y = 0;  /* quasireal y, not true if line > xt*yt */
         cmdedit_termw = 80;
-        IF_USERNAME_OR_HOMEDIR(home_pwd_buf = (char*)null_str;)
         IF_FEATURE_EDITING_VI(delptr = delbuf;)
 
 #if !ENABLE_PLATFORM_MINGW32
@@ -2589,18 +2619,6 @@ int FAST_FUNC read_line_input(line_input_t *st, const char *prompt, char *comman
         tcsetattr_stdin_TCSANOW(&new_settings);
 #endif
 
-#if ENABLE_USERNAME_OR_HOMEDIR
-        {
-                struct passwd *entry;
-
-                entry = getpwuid(geteuid());
-                if (entry) {
-                        user_buf = xstrdup(entry->pw_name);
-                        home_pwd_buf = xstrdup(entry->pw_dir);
-                }
-        }
-#endif
-
 #if 0
         for (i = 0; i <= state->max_history; i++)
                 bb_error_msg("history[%d]:'%s'", i, state->history[i]);