Merge branch 'busybox' into merge

Conflicts:
	coreutils/od_bloaty.c
	libbb/lineedit.c

1 files changed, 19 insertions, 16 deletions

diff --git a/libbb/lineedit.c b/libbb/lineedit.c
index 3d96a8e9f..7982f2997 100644
--- a/libbb/lineedit.c
+++ b/libbb/lineedit.c
@@ -714,23 +714,20 @@ static char *username_path_completion(char *ud)
  */
 static NOINLINE unsigned complete_username(const char *ud)
 {
-        /* Using _r function to avoid pulling in static buffers */
-        char line_buff[256];
-        struct passwd pwd;
-        struct passwd *result;
+        struct passwd *pw;
         unsigned userlen;
 
         ud++; /* skip ~ */
         userlen = strlen(ud);
 
         setpwent();
-        while (!getpwent_r(&pwd, line_buff, sizeof(line_buff), &result)) {
+        while ((pw = getpwent()) != NULL) {
                 /* Null usernames should result in all users as possible completions. */
-                if (/*!userlen || */ strncmp(ud, pwd.pw_name, userlen) == 0) {
-                        add_match(xasprintf("~%s/", pwd.pw_name));
+                if (/* !ud[0] || */ is_prefixed_with(pw->pw_name, ud)) {
+                        add_match(xasprintf("~%s/", pw->pw_name));
                 }
         }
-        endpwent();
+        endpwent(); /* don't keep password file open */
 
         return 1 + userlen;
 }
@@ -845,7 +842,7 @@ static NOINLINE unsigned complete_cmd_dir_file(const char *command, int type)
                         if (!pfind[0] && DOT_OR_DOTDOT(name_found))
                                 continue;
                         /* match? */
-                        if (strncmp(name_found, pfind, pf_len) != 0)
+                        if (!is_prefixed_with(name_found, pfind))
                                 continue; /* no */
 
                         found = concat_path_file(paths[i], name_found);
@@ -1932,19 +1929,25 @@ static void parse_and_put_prompt(const char *prmt_ptr)
                                                 cwd_buf = xrealloc_getcwd_or_warn(NULL);
                                                 if (!cwd_buf)
                                                         cwd_buf = (char *)bb_msg_unknown;
-                                                else {
+                                                else if (home_pwd_buf[0]) {
+                                                        char *after_home_user;
+
                                                         /* /home/user[/something] -> ~[/something] */
-                                                        l = strlen(home_pwd_buf);
-                                                        if (l != 0
 #if !ENABLE_PLATFORM_MINGW32
-                                                         && strncmp(home_pwd_buf, cwd_buf, l) == 0
+                                                        after_home_user = is_prefixed_with(cwd_buf, home_pwd_buf);
 #else
-                                                         && strncasecmp(home_pwd_buf, cwd_buf, l) == 0
+                                                        after_home_user = NULL;
+                                                        l = strlen(home_pwd_buf);
+                                                        if (l != 0
+                                                         && strncasecmp(home_pwd_buf, cwd_buf, l) == 0) {
+                                                                after_home_user = cwd_buf + l;
+                                                        }
 #endif
-                                                         && (cwd_buf[l] == '/' || cwd_buf[l] == '\0')
+                                                        if (after_home_user
+                                                         && (*after_home_user == '/' || *after_home_user == '\0')
                                                         ) {
                                                                 cwd_buf[0] = '~';
-                                                                overlapping_strcpy(cwd_buf + 1, cwd_buf + l);
+                                                                overlapping_strcpy(cwd_buf + 1, after_home_user);
                                                         }
                                                 }
                                         }