Re: Discrepancy in mansearch and fs_lookup behavior

[Ingo Schwarze <schwarze@usta.de>]

Hi Soeren,

Soeren Tempel wrote on Sat, Sep 04, 2021 at 07:51:58PM +0200:
> Ingo Schwarze <schwarze@usta.de> wrote:

>> I believe the patch below fixes the issue that main() does not
>> properly prioritize gzipped files according to their file name
>> extensions.
>> 
>> Does it make sense to you, and does it work for you?

> Yes, the patch does make sense and it does work well for me:
> 
> 	man 3 open   -> Perl open(3pm) man page
> 	man 3p open  -> POSIX open(3p) man page
> 	man 3pm open -> Perl open(3pm) man page
> 
> Thanks a lot for fixing this so quickly!

Thank you for reporting and testing!

The patch is now committed, see the commit below.

> BTW: Is there any chance that you could make a new release soonish? Has
> been a while since the last release and CVS has accumulated quite a few
> useful fixes since 1.14.5.

Yes, the next release is long overdue.  I have been paying attention
to not do major reorganizations that might destabilize the code base
for quite some time now.  I'm trying to get those bugs fixed that
are easy to fix with a low risk, then draft the release notes,
then send out a beta to downstream maintainers for testing without
too much additional delay.

My list of pending patches is already free from mandoc entries.
My list of urgent bug reports still contains one or two entries
related to tbl(7).  After that, a final pass over the TODO file
makes sense, to see whether anything trivial remains in there -
but the bulk of the TODO entries will certainly not be addressed
before the upcoming release.

Yours,
  Ingo


Log Message:
-----------
during prioritization for man(1), correctly extract the section name
from the file name extension of gzipped manual page files; bug found 
on Alpine Linux by Soeren Tempel <soeren at soeren hyphen tempel dot net>,
who also tested this patch

Modified Files:
--------------
    mandoc:
        main.c

Revision Data
-------------
Index: main.c
===================================================================
RCS file: /home/cvs/mandoc/mandoc/main.c,v
retrieving revision 1.357
retrieving revision 1.358
diff -Lmain.c -Lmain.c -u -p -r1.357 -r1.358
--- main.c
+++ main.c
@@ -132,7 +132,7 @@ main(int argc, char *argv[])
 	struct mparse	*mp;		/* Opaque parser object. */
 	const char	*conf_file;	/* -C: alternate config file. */
 	const char	*os_s;		/* -I: Operating system for display. */
-	const char	*progname, *sec;
+	const char	*progname, *sec, *ep;
 	char		*defpaths;	/* -M: override manpaths. */
 	char		*auxpaths;	/* -m: additional manpaths. */
 	char		*oarg;		/* -O: output option string. */
@@ -536,11 +536,16 @@ main(int argc, char *argv[])
 					sec++; /* Prefer without suffix. */
 				if (*sec != '/')
 					prio += 10; /* Wrong dir name. */
-				if (search.sec != NULL &&
-				    (strlen(sec) <= ssz  + 3 ||
-				     strcmp(sec + strlen(sec) - ssz,
-				      search.sec) != 0))
-					prio += 20; /* Wrong file ext. */
+				if (search.sec != NULL) {
+					ep = strchr(sec, '\0');
+					if (ep - sec > 3 &&
+					    strncmp(ep - 3, ".gz", 3) == 0)
+						ep -= 3;
+					if ((size_t)(ep - sec) < ssz + 3 ||
+					    strncmp(ep - ssz, search.sec,
+					     ssz) != 0)      /* Wrong file */
+						prio += 20;  /* extension. */
+				}
 				if (prio >= best_prio)
 					continue;
 				best_prio = prio;
--
 To unsubscribe send an email to tech+unsubscribe@mandoc.bsd.lv