We no longer munge a double-leading slash in do_open() because we

[rsync.git] / syscall.c

diff --git a/syscall.c b/syscall.c
index a8470e14974cb7a3e15c77e4b2ab1a92be0497f8..391846b7a3551b943e6f601873cf781ba4fe484a 100644 (file)
--- a/syscall.c
+++ b/syscall.c
@@ -1,5 +1,6 @@
 /* 
    Copyright (C) Andrew Tridgell 1998
+   Copyright (C) 2002 by Martin Pool
    
    This program is free software; you can redistribute it and/or modify
    it under the terms of the GNU General Public License as published by
@@ -16,16 +17,21 @@
    Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 */
 
-/*
-  syscall wrappers to ensure that nothing gets done in dry_run mode
-  */
+/**
+ * @file syscall.c
+ *
+ * Syscall wrappers to ensure that nothing gets done in dry_run mode
+ * and to handle system peculiarities.
+ **/
 
 #include "rsync.h"
 
 extern int dry_run;
 extern int read_only;
+extern int list_only;
+extern int preserve_perms;
 
-#define CHECK_RO if (read_only) {errno = EROFS; return -1;}
+#define CHECK_RO if (read_only || list_only) {errno = EROFS; return -1;}
 
 int do_unlink(char *fname)
 {
@@ -75,17 +81,24 @@ int do_rmdir(char *pathname)
 
 int do_open(char *pathname, int flags, mode_t mode)
 {
-       if (dry_run) return -1;
-       CHECK_RO
-       return open(pathname, flags, mode);
+       if (flags != O_RDONLY) {
+           if (dry_run) return -1;
+           CHECK_RO
+       }
+
+       return open(pathname, flags | O_BINARY, mode);
 }
 
 #if HAVE_CHMOD
 int do_chmod(const char *path, mode_t mode)
 {
+       int code;
        if (dry_run) return 0;
        CHECK_RO
-       return chmod(path, mode);
+       code = chmod(path, mode);
+       if ((code != 0) && preserve_perms)
+           return code;
+       return 0;
 }
 #endif
 
@@ -96,18 +109,57 @@ int do_rename(char *fname1, char *fname2)
        return rename(fname1, fname2);
 }
 
+
+void trim_trailing_slashes(char *name)
+{
+       int l;
+       /* Some BSD systems cannot make a directory if the name
+        * contains a trailing slash.
+        * <http://www.opensource.apple.com/bugs/X/BSD%20Kernel/2734739.html> */
+       
+       /* Don't change empty string; and also we can't improve on
+        * "/" */
+       
+       l = strlen(name);
+       while (l > 1) {
+               if (name[--l] != '/')
+                       break;
+               name[l] = '\0';
+       }
+}
+
+
 int do_mkdir(char *fname, mode_t mode)
 {
-       if (dry_run) return 0;
-       CHECK_RO
+       if (dry_run)
+               return 0;
+       CHECK_RO;
+       trim_trailing_slashes(fname);   
        return mkdir(fname, mode);
 }
 
-char *do_mktemp(char *template)
+
+/* like mkstemp but forces permissions */
+int do_mkstemp(char *template, mode_t perms)
 {
-       if (dry_run) return NULL;
-       if (read_only) {errno = EROFS; return NULL;}
-       return mktemp(template);
+       if (dry_run) return -1;
+       if (read_only) {errno = EROFS; return -1;}
+
+#if defined(HAVE_SECURE_MKSTEMP) && defined(HAVE_FCHMOD)
+       {
+               int fd = mkstemp(template);
+               if (fd == -1) return -1;
+               if ((fchmod(fd, perms) != 0) && preserve_perms) {
+                       close(fd);
+                       unlink(template);
+                       return -1;
+               }
+               return fd;
+       }
+#else
+       if (!mktemp(template)) return -1;
+       return do_open(template, O_RDWR|O_EXCL|O_CREAT, perms);
+#endif
 }
 
 int do_stat(const char *fname, STRUCT_STAT *st)
@@ -149,7 +201,7 @@ OFF_T do_lseek(int fd, OFF_T offset, int whence)
 #endif
 }
 
-#if HAVE_MMAP
+#ifdef USE_MMAP
 void *do_mmap(void *start, int len, int prot, int flags, int fd, OFF_T offset)
 {
 #if HAVE_OFF64_T