Fix a regression in the PDF link code (Issue #536)

Author: michaelrsweet

CHANGES.md

@@ -5,6 +5,7 @@ v1.9.21 (YYYY-MM-DD)
 --------------------
 
 - Updated markdown parser.
+- Fixed a bug in the new PDF link code (Issue #536)
 
 
 v1.9.20 (2024-12-09)

Makedefs.in

@@ -1,7 +1,7 @@
 #
 # Makefile definitions for HTMLDOC, an HTML document processing program.
 #
-# Copyright © 2011-2023 by Michael R Sweet.
+# Copyright © 2011-2025 by Michael R Sweet.
 # Copyright © 1997-2010 by Easy Software Products.
 #
 # This program is free software.  Distribution and use rights are outlined in
@@ -16,7 +16,6 @@ AR		=	@AR@
 AWK		=	@AWK@
 CC		=	@CC@
 CXX		=	@CXX@
-CHMOD		=	@CHMOD@
 CP		=	@CP@
 INSTALL		=	@INSTALL@
 LN		=	/bin/ln -sf

htmldoc/ps-pdf.cxx

@@ -4129,7 +4129,8 @@ parse_doc(tree_t *t,		/* I - Tree to parse */
     {
       // Add file links, stripping any trailing HTTP GET parameters...
       uchar	newname[256],	// New filename
-		*sep;		// "?" separator in links
+		*sep,		// "?" separator in links
+		*base;		// Base path/URL
       int	linkpage;	// Link page
 
       // Figure out what page the file will actually start on...
@@ -4146,18 +4147,24 @@ parse_doc(tree_t *t,		/* I - Tree to parse */
       }
 
       // Base filename link...
-      strlcpy((char *)newname, (char *)htmlGetVariable(t, (uchar *)"_HD_FILENAME"), sizeof(newname));
-      if ((sep = (uchar *)strchr((char *)newname, '?')) != NULL)
-        *sep = '\0';
+      if ((base = htmlGetVariable(t, (uchar *)"_HD_FILENAME")) != NULL)
+      {
+        strlcpy((char *)newname, (char *)base, sizeof(newname));
+        if ((sep = (uchar *)strchr((char *)newname, '?')) != NULL)
+          *sep = '\0';
 
-      add_link(NULL, newname, linkpage, (int)*top);
+        add_link(NULL, newname, linkpage, (int)*top);
+      }
 
       // Relative filename link...
-      strlcpy((char *)newname, (char *)htmlGetVariable(t, (uchar *)"_HD_URL"), sizeof(newname));
-      if ((sep = (uchar *)strchr((char *)newname, '?')) != NULL)
-        *sep = '\0';
+      if ((base = htmlGetVariable(t, (uchar *)"_HD_URL")) != NULL)
+      {
+        strlcpy((char *)newname, (char *)base, sizeof(newname));
+        if ((sep = (uchar *)strchr((char *)newname, '?')) != NULL)
+          *sep = '\0';
 
-      add_link(NULL, newname, linkpage, (int)*top);
+        add_link(NULL, newname, linkpage, (int)*top);
+      }
     }
 
     if (chapter == 0 && !title_page)