Merge branch 'busybox' into merge

3 files changed, 35 insertions, 24 deletions

diff --git a/miscutils/devfsd.c b/miscutils/devfsd.c
index 642cd3637..d57691414 100644
--- a/miscutils/devfsd.c
+++ b/miscutils/devfsd.c
@@ -962,7 +962,6 @@ static void action_compat(const struct devfsd_notify_struct *info, unsigned int
                         dest_name = dest_buf;
                         compat_name = compat_buf;
 
-
                         /* 1 == scsi/generic  2 == scsi/disc 3 == scsi/cd 6 == ide/host/disc 7 == ide/host/cd */
                         if (i == 1 || i == 2 || i == 3 || i == 6 || i ==7)
                                 sprintf(compat_buf, fmt[i], host, bus, target, lun);
diff --git a/miscutils/less.c b/miscutils/less.c
index 5a8fc5a74..91403a252 100644
--- a/miscutils/less.c
+++ b/miscutils/less.c
@@ -857,13 +857,13 @@ static void print_found(const char *line)
         goto start;
 
         while (match_status == 0) {
-                char *new = xasprintf("%s%.*s"HIGHLIGHT"%.*s"NORMAL,
-                                growline ? growline : "",
-                                (int)match_structs.rm_so, str,
-                                (int)(match_structs.rm_eo - match_structs.rm_so),
-                                                str + match_structs.rm_so);
-                free(growline);
-                growline = new;
+                xasprintf_inplace(growline,
+                        "%s%.*s"HIGHLIGHT"%.*s"NORMAL,
+                        growline ? growline : "",
+                        (int)match_structs.rm_so,
+                                str,
+                        (int)(match_structs.rm_eo - match_structs.rm_so),
+                                str + match_structs.rm_so);
                 str += match_structs.rm_eo;
                 line += match_structs.rm_eo;
                 eflags = REG_NOTBOL;
diff --git a/miscutils/man.c b/miscutils/man.c
index 38c1b9aa3..cf67f1538 100644
--- a/miscutils/man.c
+++ b/miscutils/man.c
@@ -73,7 +73,7 @@ struct globals {
 
 static int show_manpage(char *man_filename, int man, int level);
 
-static int run_pipe(char *man_filename, int man, int level)
+static int run_man_pipe(char *man_filename, int man, int level)
 {
         char *cmd;
 
@@ -115,24 +115,36 @@ static int run_pipe(char *man_filename, int man, int level)
                  * ".so man7/path_resolution.7\n<junk>"
                  */
                 *strchrnul(line, '\n') = '\0';
-                linkname = skip_whitespace(&line[4]);
-
-                /* If link has no slashes, we just replace man page name.
-                 * If link has slashes (however many), we go back *once*.
-                 * ".so zzz/ggg/page.3" does NOT go back two levels. */
+                linkname = skip_whitespace(line + 4);
+//testcase:
+// cd /usr/share/man/man2
+// man ./path_resolution.2.gz
+                while (man_filename[0] == '.' && man_filename[1] == '/')
+                        man_filename += 2;
                 p = strrchr(man_filename, '/');
                 if (!p)
-                        goto ordinary_manpage;
-                *p = '\0';
+                        man_filename = (char*)".." + 1; /* "NAME.N" -> "." */
+                else
+                        *p = '\0'; /* "PFX/manN/NAME.N" -> "PFX/manN" */
+
+                /* If link has slashes (however many), we go back *once*.
+                 * ".so zzz/ggg/page.3" does NOT go back two levels.
+                 */
                 if (strchr(linkname, '/')) {
+                        if (!p) { /* man_filename had no path */
+                                man_filename--; /* ".." */
+                                goto append_link;
+                        }
                         p = strrchr(man_filename, '/');
                         if (!p)
-                                goto ordinary_manpage;
-                        *p = '\0';
-                }
+                                man_filename = (char*)".." + 1; /* "manN" -> "." */
+                        else
+                                *p = '\0'; /* "PFX/manN" -> "PFX" */
+                } /* else (link has no slashes): will do "PFX/manN" -> "PFX/manN/link" */
 
                 /* Links do not have .gz extensions, even if manpage
                  * is compressed */
+ append_link:
                 man_filename = xasprintf("%s/%s", man_filename, linkname);
                 free(line);
                 /* Note: we leak "new" man_filename string as well... */
@@ -172,26 +184,26 @@ static int show_manpage(char *man_filename, int man, int level)
 #endif
 
 #if ENABLE_FEATURE_SEAMLESS_LZMA
-        if (run_pipe(filename_with_zext, man, level))
+        if (run_man_pipe(filename_with_zext, man, level))
                 return 1;
 #endif
 #if ENABLE_FEATURE_SEAMLESS_XZ
         strcpy(ext, "xz");
-        if (run_pipe(filename_with_zext, man, level))
+        if (run_man_pipe(filename_with_zext, man, level))
                 return 1;
 #endif
 #if ENABLE_FEATURE_SEAMLESS_BZ2
         strcpy(ext, "bz2");
-        if (run_pipe(filename_with_zext, man, level))
+        if (run_man_pipe(filename_with_zext, man, level))
                 return 1;
 #endif
 #if ENABLE_FEATURE_SEAMLESS_GZ
         strcpy(ext, "gz");
-        if (run_pipe(filename_with_zext, man, level))
+        if (run_man_pipe(filename_with_zext, man, level))
                 return 1;
 #endif
 
-        return run_pipe(man_filename, man, level);
+        return run_man_pipe(man_filename, man, level);
 }
 
 static char **add_MANPATH(char **man_path_list, int *count_mp, char *path)