Merge branch 'busybox' into merge

Conflicts:
	include/libbb.h
	shell/ash.c

1 files changed, 4 insertions, 10 deletions

diff --git a/miscutils/man.c b/miscutils/man.c
index 236fdcebd..b8b15b83b 100644
--- a/miscutils/man.c
+++ b/miscutils/man.c
@@ -129,27 +129,21 @@ static int show_manpage(const char *pager, char *man_filename, int man, int leve
 #endif
 #if ENABLE_FEATURE_SEAMLESS_XZ
         strcpy(ext, "xz");
-        if (run_pipe(pager, man_filename, man, level))
+        if (run_pipe(pager, filename_with_zext, man, level))
                 return 1;
 #endif
 #if ENABLE_FEATURE_SEAMLESS_BZ2
         strcpy(ext, "bz2");
-        if (run_pipe(pager, man_filename, man, level))
+        if (run_pipe(pager, filename_with_zext, man, level))
                 return 1;
 #endif
 #if ENABLE_FEATURE_SEAMLESS_GZ
         strcpy(ext, "gz");
-        if (run_pipe(pager, man_filename, man, level))
+        if (run_pipe(pager, filename_with_zext, man, level))
                 return 1;
 #endif
 
-#if SEAMLESS_COMPRESSION
-        ext[-1] = '\0';
-#endif
-        if (run_pipe(pager, man_filename, man, level))
-                return 1;
-
-        return 0;
+        return run_pipe(pager, man_filename, man, level);
 }
 
 int man_main(int argc, char **argv) MAIN_EXTERNALLY_VISIBLE;