copy-file fstat

copy-file fstat

[Kevin Ryde]

[-- Attachment #1: Type: text/plain, Size: 366 bytes --]

        * filesys.c (scm_copy_file): Use fstat on the input fd rather than
        stat on the filename, to be certain a file rename can't mean we get
        info on one filesystem object but open another.  This fstat usage is
        similar to Emacs copy-file.

This would be for 1.6 too.  You'd have to be very unlucky to hit the
problem, but it's real enough.


[-- Attachment #2: filesys.c.fstat.diff --]
[-- Type: text/plain, Size: 942 bytes --]

--- filesys.c.~1.129.~	2004-07-31 11:18:38.000000000 +1000
+++ filesys.c	2004-08-02 10:44:56.000000000 +1000
@@ -1408,23 +1408,31 @@
 #define FUNC_NAME s_scm_copy_file
 {
   int oldfd, newfd;
-  int n;
+  int n, rv;
   char buf[BUFSIZ];
   struct stat oldstat;
 
   SCM_VALIDATE_STRING (1, oldfile);
   SCM_VALIDATE_STRING (2, newfile);
-  if (stat (SCM_STRING_CHARS (oldfile), &oldstat) == -1)
-    SCM_SYSERROR;
+
   oldfd = open (SCM_STRING_CHARS (oldfile), O_RDONLY);
   if (oldfd == -1)
     SCM_SYSERROR;
 
+#ifdef __MINGW32__
+  SCM_SYSCALL (rv = fstat_Win32 (oldfd, &oldstat));
+#else
+  SCM_SYSCALL (rv = fstat (oldfd, &oldstat));
+#endif
+  if (rv == -1)
+    goto err_close_oldfd;
+
   /* use POSIX flags instead of 07777?.  */
   newfd = open (SCM_STRING_CHARS (newfile), O_WRONLY | O_CREAT | O_TRUNC,
 		oldstat.st_mode & 07777);
   if (newfd == -1)
     {
+    err_close_oldfd:
       close (oldfd);
       SCM_SYSERROR;
     }

[-- Attachment #3: Type: text/plain, Size: 143 bytes --]

_______________________________________________
Guile-devel mailing list
Guile-devel@gnu.org
http://lists.gnu.org/mailman/listinfo/guile-devel