[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Emacs-diffs] Changes to emacs/src/fileio.c,v [EMACS_22_BASE]
From: |
Eli Zaretskii |
Subject: |
[Emacs-diffs] Changes to emacs/src/fileio.c,v [EMACS_22_BASE] |
Date: |
Fri, 29 Aug 2008 10:07:16 +0000 |
CVSROOT: /cvsroot/emacs
Module name: emacs
Branch: EMACS_22_BASE
Changes by: Eli Zaretskii <eliz> 08/08/29 10:07:15
Index: fileio.c
===================================================================
RCS file: /cvsroot/emacs/emacs/src/fileio.c,v
retrieving revision 1.580.2.16
retrieving revision 1.580.2.17
diff -u -b -r1.580.2.16 -r1.580.2.17
--- fileio.c 5 Aug 2008 21:44:01 -0000 1.580.2.16
+++ fileio.c 29 Aug 2008 10:07:15 -0000 1.580.2.17
@@ -1149,11 +1149,10 @@
nm = SDATA (name);
multibyte = STRING_MULTIBYTE (name);
-#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);
+#ifdef DOS_NT
/* Note if special escape prefix is present, but remove for now. */
if (nm[0] == '/' && nm[1] == ':')
{
@@ -1340,7 +1339,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 */