texlive[48107] Build/source/texk/web2c/lib: do not prepend top-level

[commits+karl at tug.org]

Revision: 48107
          http://tug.org/svn/texlive?view=revision&revision=48107
Author:   karl
Date:     2018-06-28 19:42:07 +0200 (Thu, 28 Jun 2018)
Log Message:
-----------
do not prepend top-level dir if searched-for filename is absolute

Modified Paths:
--------------
    trunk/Build/source/texk/web2c/lib/ChangeLog
    trunk/Build/source/texk/web2c/lib/openclose.c

Modified: trunk/Build/source/texk/web2c/lib/ChangeLog
===================================================================
--- trunk/Build/source/texk/web2c/lib/ChangeLog	2018-06-28 00:24:33 UTC (rev 48106)
+++ trunk/Build/source/texk/web2c/lib/ChangeLog	2018-06-28 17:42:07 UTC (rev 48107)
@@ -1,3 +1,10 @@
+2018-06-28  Karl Berry  <karl at freefriends.org>
+
+	* openclose.c (open_input_with_dirname): do not prepend the
+	top-level directory name if the subsidiary aux file being searched
+	for is alrady absolute. Private report from John Collins
+	(22 Jun 2018 14:01:31).
+
 2018-06-14  Akira Kakuto  <kakuto at fuk.kindai.ac.jp>
 
 	* texmfmp.c: remove sjisterminal (w32 only).

Modified: trunk/Build/source/texk/web2c/lib/openclose.c
===================================================================
--- trunk/Build/source/texk/web2c/lib/openclose.c	2018-06-28 00:24:33 UTC (rev 48106)
+++ trunk/Build/source/texk/web2c/lib/openclose.c	2018-06-28 17:42:07 UTC (rev 48107)
@@ -300,11 +300,12 @@
 
 

 /* Open input file *F_PTR (of type FILEFMT), prepending the directory
-   part of the string FNAME. This is called from BibTeX, to open
-   subsidiary .aux files, with FNAME set to the top-level aux file. The
-   idea is that if invoked as bibtex somedir/foo.aux, and foo.aux has an
-   \@input{bar} statement, we should look for somedir/bar.aux too.
-   (See bibtex-auxinclude.test.)  */
+   part of the string FNAME to `nameoffile'+1, unless that is already
+   kpse_absolute_p. This is called from BibTeX, to open subsidiary .aux
+   files, with FNAME set to the top-level aux file. The idea is that if
+   we're invoked as bibtex somedir/foo.aux, and foo.aux has an
+   \@input{bar} statement, we should look for somedir/bar.aux too. (See
+   bibtex-auxinclude.test.) */
 
 boolean
 open_input_with_dirname (FILE **f_ptr, int filefmt, const char *fname)
@@ -312,7 +313,8 @@
   boolean ret = false;
   char *top_dir = xdirname (fname);
 
-  if (top_dir && *top_dir && !STREQ (top_dir, ".")) {
+  if (top_dir && *top_dir && !STREQ (top_dir, ".")
+      && !kpse_absolute_p (nameoffile+1, true)) {
     char *newname = concat3 (top_dir, DIR_SEP_STRING, nameoffile+1);
     free (nameoffile);
     nameoffile = xmalloc (strlen (newname) + 2);