diff src/fileio.c @ 100:4be1180a9e89 r20-1b2

Import from CVS: tag r20-1b2
author cvs
date Mon, 13 Aug 2007 09:15:11 +0200
parents 364816949b59
children fe104dbd9147
line wrap: on
line diff
--- a/src/fileio.c	Mon Aug 13 09:13:58 2007 +0200
+++ b/src/fileio.c	Mon Aug 13 09:15:11 2007 +0200
@@ -2145,7 +2145,7 @@
 				  INTP (ok_if_already_exists), 0);
 
 #ifdef WINDOWSNT
-  if (!MoveFile (XSTRING (filename)->data, XSTRING (newname)->data))
+  if (!MoveFile (XSTRING (filename)->_data, XSTRING (newname)->_data))
 #else  /* not WINDOWSNT */
     /* FSFmacs only calls rename() here under BSD 4.1, and calls
        link() and unlink() otherwise, but that's bogus.  Sometimes
@@ -2726,7 +2726,7 @@
   if (stat ((char *) XSTRING_DATA (abspath), &st) < 0)
     return Qnil;
 #ifdef DOS_NT
-  if (check_executable (XSTRING (abspath)->data))
+  if (check_executable (XSTRING (abspath)->_data))
     st.st_mode |= S_IEXEC;
 #endif /* DOS_NT */
 
@@ -2801,7 +2801,9 @@
 */
        ())
 {
+#ifndef WINDOWSNT
   sync ();
+#endif
   return Qnil;
 }
 #endif /* !VMS */
@@ -3194,6 +3196,8 @@
     NUNGCPRO;
   }
 
+#if 0
+/* XXXX Why the #### ? Bogus anyway. If they are there, display em! */
 #ifdef DOS_NT
   /* Determine file type from name and remove LFs from CR-LFs if the file
      is deemed to be a text file.  */
@@ -3209,6 +3213,7 @@
       }
   }
 #endif
+#endif
 
   /* Close the file/stream */
   unbind_to (speccount, Qnil);