Added RERR_VANISHED.

[rsync/rsync.git] / syscall.c

diff --git a/syscall.c b/syscall.c
index b4b581b..dbde033 100644 (file)
--- a/syscall.c
+++ b/syscall.c
@@ -29,6 +29,7 @@
 extern int dry_run;
 extern int read_only;
 extern int list_only;
+extern int preserve_perms;
 
 #define CHECK_RO if (read_only || list_only) {errno = EROFS; return -1;}
 
@@ -84,22 +85,22 @@ int do_open(char *pathname, int flags, mode_t mode)
            if (dry_run) return -1;
            CHECK_RO
        }
-#ifdef O_BINARY
-       /* for Windows */
-       flags |= O_BINARY;
-#endif
        /* some systems can't handle a double / */
        if (pathname[0] == '/' && pathname[1] == '/') pathname++;
 
-       return open(pathname, flags, mode);
+       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
 
@@ -113,15 +114,19 @@ int do_rename(char *fname1, char *fname2)
 
 void trim_trailing_slashes(char *name)
 {
-       char *p;
+       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> */
-       if (!*name)
-               return;         /* empty string */
-       p = strchr(name, '\0') - 1;
-       while (p == '/') {
-               p-- = '\0';
+       
+       /* 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';
        }
 }
 
@@ -146,7 +151,7 @@ int do_mkstemp(char *template, mode_t perms)
        {
                int fd = mkstemp(template);
                if (fd == -1) return -1;
-               if (fchmod(fd, perms) != 0) {
+               if ((fchmod(fd, perms) != 0) && preserve_perms) {
                        close(fd);
                        unlink(template);
                        return -1;