sys-apps/man/files/man-1.6f-so-search-2.patch

   1 improve the uncompressed .so search
   2
   3 --- a/src/man.c
   4 +++ b/src/man.c
   5 @@ -381,13 +381,23 @@ again:
   6           }
   7           /*
   8            * Some people have compressed man pages, but uncompressed
   9 -          * .so files - we could glob for all possible extensions,
  10 -          * for now: only try .gz
  11 +          * .so files - we should discover this list dynamically, but
  12 +          * for now just hardcode it.
  13            */
  14 -         else if (fp == NULL && get_expander(".gz") &&
  15 -                  strlen(name)+strlen(".gz") < BUFSIZE) {
  16 -              strcat(name, ".gz");
  17 -              fp = fopen (name, "r");
  18 +         else if (fp == NULL) {
  19 +#define ARRAY_SIZE(a) (sizeof(a) / sizeof(*(a)))
  20 +              size_t i, name_len = strlen(name);
  21 +              const char *extensions[] = { ".gz", ".bz2", ".lzma", ".xz", ".z", ".Z" };
  22 +              for (i = 0; i < ARRAY_SIZE(extensions); ++i) {
  23 +                   const char *comp = extensions[i];
  24 +                   name[name_len] = '\0';
  25 +                   if (get_expander(comp) && name_len+strlen(comp) < BUFSIZE) {
  26 +                        strcat(name, comp);
  27 +                        fp = fopen(name, "r");
  28 +                        if (fp)
  29 +                             break;
  30 +                   }
  31 +              }
  32           }
  33
  34           if (fp == NULL) {