texinfo-commits
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

[6436] Fix unportable file-name comparisons.


From: Eli Zaretskii
Subject: [6436] Fix unportable file-name comparisons.
Date: Sat, 18 Jul 2015 08:59:53 +0000

Revision: 6436
          http://svn.sv.gnu.org/viewvc/?view=rev&root=texinfo&revision=6436
Author:   eliz
Date:     2015-07-18 08:59:52 +0000 (Sat, 18 Jul 2015)
Log Message:
-----------
Fix unportable file-name comparisons.

Modified Paths:
--------------
    trunk/ChangeLog
    trunk/info/nodes.c

Modified: trunk/ChangeLog
===================================================================
--- trunk/ChangeLog     2015-07-16 17:53:33 UTC (rev 6435)
+++ trunk/ChangeLog     2015-07-18 08:59:52 UTC (rev 6436)
@@ -1,3 +1,8 @@
+2015-07-18  Eli Zaretskii  <address@hidden>
+
+       * info/nodes.c (find_node_from_tag, info_node_of_tag): Use
+       FILENAME_CMP to compare file names.
+
 2015-07-16  Gavin Smith  <address@hidden>
 
        * info/nodes.c (info_find_file): If filename has slash, look for

Modified: trunk/info/nodes.c
===================================================================
--- trunk/info/nodes.c  2015-07-16 17:53:33 UTC (rev 6435)
+++ trunk/info/nodes.c  2015-07-18 08:59:52 UTC (rev 6436)
@@ -1201,7 +1201,7 @@
     {
       /* For split files, only restore the part of the tag table for
          the subfile. */
-      if (!strcmp ((*t)->filename, fb->fullpath))
+      if (!FILENAME_CMP ((*t)->filename, fb->fullpath))
         {
           NODE *n = &(*t)->cache;
           (*t)->nodestart_adjusted = -1;
@@ -1237,8 +1237,8 @@
         {
           NODE *n = (*h)->node;;
           if (!(n->flags & N_IsInternal)
-              && (n->subfile ? (!strcmp (n->subfile, fb->fullpath))
-                             : (!strcmp (n->fullpath, fb->fullpath))))
+              && (n->subfile ? (!FILENAME_CMP (n->subfile, fb->fullpath))
+                             : (!FILENAME_CMP (n->fullpath, fb->fullpath))))
             {
               /* The call to info_get_node is indirectly recursive, but it 
                  should not recurse twice because of the N_EOLs_Converted 
@@ -1293,7 +1293,7 @@
   FILE_BUFFER *parent; /* File containing tag table. */
   FILE_BUFFER *subfile; /* File containing node. */
  
-  if (!strcmp (fb->fullpath, tag->filename))
+  if (!FILENAME_CMP (fb->fullpath, tag->filename))
     parent = subfile = fb;
   else
     {




reply via email to

[Prev in Thread] Current Thread [Next in Thread]