preparing for release of 2.5.7

[rsync.git] / syscall.c

diff --git a/syscall.c b/syscall.c
index a004d9d37b764b8814683e168b083df40b329e10..dbde033b3879726c56e5b7e28fcb4e2cb8427d35 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,23 +17,33 @@
    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 || list_only) {errno = EROFS; return -1;}
 
 int do_unlink(char *fname)
 {
        if (dry_run) return 0;
+       CHECK_RO
        return unlink(fname);
 }
 
 int do_symlink(char *fname1, char *fname2)
 {
        if (dry_run) return 0;
+       CHECK_RO
        return symlink(fname1, fname2);
 }
 
@@ -40,6 +51,7 @@ int do_symlink(char *fname1, char *fname2)
 int do_link(char *fname1, char *fname2)
 {
        if (dry_run) return 0;
+       CHECK_RO
        return link(fname1, fname2);
 }
 #endif
@@ -47,6 +59,7 @@ int do_link(char *fname1, char *fname2)
 int do_lchown(const char *path, uid_t owner, gid_t group)
 {
        if (dry_run) return 0;
+       CHECK_RO
        return lchown(path, owner, group);
 }
 
@@ -54,6 +67,7 @@ int do_lchown(const char *path, uid_t owner, gid_t group)
 int do_mknod(char *pathname, mode_t mode, dev_t dev)
 {
        if (dry_run) return 0;
+       CHECK_RO
        return mknod(pathname, mode, dev);
 }
 #endif
@@ -61,39 +75,93 @@ int do_mknod(char *pathname, mode_t mode, dev_t dev)
 int do_rmdir(char *pathname)
 {
        if (dry_run) return 0;
+       CHECK_RO
        return rmdir(pathname);
 }
 
 int do_open(char *pathname, int flags, mode_t mode)
 {
-       if (dry_run) return -1;
-       return open(pathname, flags, mode);
+       if (flags != O_RDONLY) {
+           if (dry_run) return -1;
+           CHECK_RO
+       }
+       /* some systems can't handle a double / */
+       if (pathname[0] == '/' && pathname[1] == '/') pathname++;
+
+       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;
-       return chmod(path, mode);
+       CHECK_RO
+       code = chmod(path, mode);
+       if ((code != 0) && preserve_perms)
+           return code;
+       return 0;
 }
 #endif
 
 int do_rename(char *fname1, char *fname2)
 {
        if (dry_run) return 0;
+       CHECK_RO
        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;
+       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;
-       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)
@@ -128,8 +196,29 @@ int do_fstat(int fd, STRUCT_STAT *st)
 OFF_T do_lseek(int fd, OFF_T offset, int whence)
 {
 #if HAVE_OFF64_T
+       off64_t lseek64();
        return lseek64(fd, offset, whence);
 #else
        return lseek(fd, offset, whence);
 #endif
 }
+
+#ifdef USE_MMAP
+void *do_mmap(void *start, int len, int prot, int flags, int fd, OFF_T offset)
+{
+#if HAVE_OFF64_T
+       return mmap64(start, len, prot, flags, fd, offset);
+#else
+       return mmap(start, len, prot, flags, fd, offset);
+#endif
+}
+#endif
+
+char *d_name(struct dirent *di)
+{
+#if HAVE_BROKEN_READDIR
+       return (di->d_name - 2);
+#else
+       return di->d_name;
+#endif
+}