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

[Andreas Schwab]

CVSROOT:        /sources/emacs
Module name:    emacs
Changes by:     Andreas Schwab <schwab> 08/09/02 08:13:23

Index: fileio.c
===================================================================
RCS file: /sources/emacs/emacs/src/fileio.c,v
retrieving revision 1.634
retrieving revision 1.635
diff -u -b -r1.634 -r1.635
--- fileio.c    2 Sep 2008 05:35:55 -0000       1.634
+++ fileio.c    2 Sep 2008 08:13:22 -0000       1.635
@@ -824,7 +824,6 @@
   /* These point to SDATA and need to be careful with string-relocation
      during GC (via DECODE_FILE).  */
   unsigned char *nm, *newdir;
-  int nm_in_name;
   /* This should only point to alloca'd data.  */
   unsigned char *target;
 
@@ -930,11 +929,9 @@
     }
 
   nm = SDATA (name);
-  nm_in_name = 1;
 
   /* 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.  */
@@ -1077,13 +1074,8 @@
          tem = build_string (newdir);
          if (!STRING_MULTIBYTE (tem))
            {
-             /* FIXME: DECODE_FILE may GC, which may move SDATA(name),
-                after which `nm' won't point to the right place any more.  */
-             int offset = nm - SDATA (name);
              hdir = DECODE_FILE (tem);
              newdir = SDATA (hdir);
-             if (nm_in_name)
-             nm = SDATA (name) + offset;
            }
 #ifdef DOS_NT
          collapse_newdir = 0;