Re: Discrepancy in mansearch and fs_lookup behavior

[Ingo Schwarze <schwarze@usta.de>]

Hi Soeren,

Ingo Schwarze wrote on Sat, Sep 04, 2021 at 03:18:32PM +0200:

> Hang on a moment for the remaining issue with the .gz extension
> probably breaking the prio code, i'll try to figure that out and
> send a patch for that, too.

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?

The main() program is growing to become a bit unwieldy, but i'm not
going to do any major refactoring right now.

Yours,
  Ingo


Index: main.c
===================================================================
RCS file: /cvs/src/usr.bin/mandoc/main.c,v
retrieving revision 1.259
diff -u -r1.259 main.c
--- main.c	4 Sep 2021 12:47:04 -0000	1.259
+++ main.c	4 Sep 2021 16:04:44 -0000
@@ -131,7 +131,7 @@
 	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. */
@@ -514,11 +514,16 @@
 					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