emacs-diffs
[Top][All Lists]
Advanced

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

[Emacs-diffs] Changes to emacs/src/fileio.c,v


From: Miles Bader
Subject: [Emacs-diffs] Changes to emacs/src/fileio.c,v
Date: Tue, 02 Sep 2008 05:36:17 +0000

CVSROOT:        /cvsroot/emacs
Module name:    emacs
Changes by:     Miles Bader <miles>     08/09/02 05:36:13

Index: src/fileio.c
===================================================================
RCS file: /cvsroot/emacs/emacs/src/fileio.c,v
retrieving revision 1.633
retrieving revision 1.634
diff -u -b -r1.633 -r1.634
--- src/fileio.c        31 Aug 2008 00:57:00 -0000      1.633
+++ src/fileio.c        2 Sep 2008 05:35:55 -0000       1.634
@@ -932,12 +932,11 @@
   nm = SDATA (name);
   nm_in_name = 1;
 
-#ifdef DOS_NT
-  /* We will force directory separators to be either all \ or /, so make
-     a local copy to modify, even if there ends up being no change. */
+  /* Make a local copy of nm[] to protect it from GC in DECODE_FILE below. */
   nm = strcpy (alloca (strlen (nm) + 1), nm);
   nm_in_name = 0;
 
+#ifdef DOS_NT
   /* Note if special escape prefix is present, but remove for now.  */
   if (nm[0] == '/' && nm[1] == ':')
     {
@@ -1038,7 +1037,7 @@
            }
          return name;
 #else /* not DOS_NT */
-         if (nm == SDATA (name))
+         if (strcmp (nm, SDATA (name)) == 0)
            return name;
          return make_specified_string (nm, -1, strlen (nm), multibyte);
 #endif /* not DOS_NT */




reply via email to

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