Changeset 3232 in MondoRescue for branches/3.2/mindi-busybox/miscutils/man.c

Timestamp:

Jan 1, 2014, 12:47:38 AM (10 years ago)

Author:

Bruno Cornec

Message:

• Update mindi-busybox to 1.21.1

File:

• branches/3.2/mindi-busybox/miscutils/man.c (modified) (5 diffs)

branches/3.2/mindi-busybox/miscutils/man.c

@@ -3 +3 @@
  * Licensed under GPLv2, see file LICENSE in this source tree.
  */
+
+//usage:#define man_trivial_usage
+//usage:       "[-aw] [MANPAGE]..."
+//usage:#define man_full_usage "\n\n"
+//usage:       "Format and display manual page\n"
+//usage:     "\n    -a  Display all pages"
+//usage:     "\n    -w  Show page locations"
 
 #include "libbb.h"
@@ -23 +30 @@
 
 */
-
-#if ENABLE_FEATURE_SEAMLESS_LZMA
-#define Z_SUFFIX ".lzma"
-#elif ENABLE_FEATURE_SEAMLESS_BZ2
-#define Z_SUFFIX ".bz2"
-#elif ENABLE_FEATURE_SEAMLESS_GZ
-#define Z_SUFFIX ".gz"
-#else
-#define Z_SUFFIX ""
-#endif
 
 static int show_manpage(const char *pager, char *man_filename, int man, int level);
@@ -96 +93 @@
         /* Links do not have .gz extensions, even if manpage
          * is compressed */
-        man_filename = xasprintf("%s/%s" Z_SUFFIX, man_filename, linkname);
+        man_filename = xasprintf("%s/%s", man_filename, linkname);
         free(line);
         /* Note: we leak "new" man_filename string as well... */
@@ -118 +115 @@
 }
 
-/* man_filename is of the form "/dir/dir/dir/name.s" Z_SUFFIX */
+/* man_filename is of the form "/dir/dir/dir/name.s" */
 static int show_manpage(const char *pager, char *man_filename, int man, int level)
 {
+#if SEAMLESS_COMPRESSION
+    /* We leak this allocation... */
+    char *filename_with_zext = xasprintf("%s.lzma", man_filename);
+    char *ext = strrchr(filename_with_zext, '.') + 1;
+#endif
+
 #if ENABLE_FEATURE_SEAMLESS_LZMA
-    if (run_pipe(pager, man_filename, man, level))
-        return 1;
-#endif
-
+    if (run_pipe(pager, filename_with_zext, man, level))
+        return 1;
+#endif
+#if ENABLE_FEATURE_SEAMLESS_XZ
+    strcpy(ext, "xz");
+    if (run_pipe(pager, filename_with_zext, man, level))
+        return 1;
+#endif
 #if ENABLE_FEATURE_SEAMLESS_BZ2
-#if ENABLE_FEATURE_SEAMLESS_LZMA
-    strcpy(strrchr(man_filename, '.') + 1, "bz2");
-#endif
-    if (run_pipe(pager, man_filename, man, level))
-        return 1;
-#endif
-
+    strcpy(ext, "bz2");
+    if (run_pipe(pager, filename_with_zext, man, level))
+        return 1;
+#endif
 #if ENABLE_FEATURE_SEAMLESS_GZ
-#if ENABLE_FEATURE_SEAMLESS_LZMA || ENABLE_FEATURE_SEAMLESS_BZ2
-    strcpy(strrchr(man_filename, '.') + 1, "gz");
-#endif
-    if (run_pipe(pager, man_filename, man, level))
-        return 1;
-#endif
-
-#if ENABLE_FEATURE_SEAMLESS_LZMA || ENABLE_FEATURE_SEAMLESS_BZ2 || ENABLE_FEATURE_SEAMLESS_GZ
-    *strrchr(man_filename, '.') = '\0';
-#endif
-    if (run_pipe(pager, man_filename, man, level))
-        return 1;
-
-    return 0;
+    strcpy(ext, "gz");
+    if (run_pipe(pager, filename_with_zext, man, level))
+        return 1;
+#endif
+
+    return run_pipe(pager, man_filename, man, level);
 }
 
@@ -256 +252 @@
                 while (cat0man1 < 2) {
                     int found_here;
-                    man_filename = xasprintf("%s/%s%.*s/%s.%.*s" Z_SUFFIX,
+                    man_filename = xasprintf("%s/%s%.*s/%s.%.*s",
                             cur_path,
                             "cat\0man" + (cat0man1 * 4),