[gentoo-commits] gentoo-x86 commit in sys-apps/man/files: man-1.6f-so-search.patch

[Mike Frysinger (vapier)]

vapier      08/04/21 01:17:37

  Added:                man-1.6f-so-search.patch
  Log:
  Make uncompressed .so searching better.
  (Portage version: 2.2_pre5)

Revision  Changes    Path
1.1                  sys-apps/man/files/man-1.6f-so-search.patch

file : http://sources.gentoo.org/viewcvs.py/gentoo-x86/sys-apps/man/files/man-1.6f-so-search.patch?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewcvs.py/gentoo-x86/sys-apps/man/files/man-1.6f-so-search.patch?rev=1.1&content-type=text/plain

Index: man-1.6f-so-search.patch
===================================================================
improve the uncompressed .so search

--- a/src/man.c
+++ b/src/man.c
@@ -381,13 +381,23 @@ again:
 	  }
 	  /*
 	   * Some people have compressed man pages, but uncompressed
-	   * .so files - we could glob for all possible extensions,
-	   * for now: only try .gz
+	   * .so files - we should discover this list dynamically, but
+	   * for now just hardcode it.
 	   */
-	  else if (fp == NULL && get_expander(".gz") &&
-		   strlen(name)+strlen(".gz") < BUFSIZE) {
-	       strcat(name, ".gz");
-	       fp = fopen (name, "r");
+	  else if (fp == NULL) {
+#define ARRAY_SIZE(a) (sizeof(a) / sizeof(*(a)))
+	       size_t i, name_len = strlen(name);
+	       const char *extensions[] = { ".gz", ".bz2", ".lzma", ".z", ".Z" };
+	       for (i = 0; i < ARRAY_SIZE(extensions); ++i) {
+		    const char *comp = extensions[i];
+		    name[name_len] = '\0';
+		    if (get_expander(comp) && name_len+strlen(comp) < BUFSIZE) {
+			 strcat(name, comp);
+			 fp = fopen(name, "r");
+			 if (fp)
+			      break;
+		    }
+	       }
 	  }
 
 	  if (fp == NULL) {



-- 
gentoo-commits@l.g.o mailing list