Make some RERR_* choices better, and another noop_io_until_death() tweak.

[rsync/rsync.git] / syscall.c

diff --git a/syscall.c b/syscall.c
index 20ad131..945a11d 100644 (file)
--- a/syscall.c
+++ b/syscall.c
@@ -4,11 +4,12 @@
  *
  * Copyright (C) 1998 Andrew Tridgell
  * Copyright (C) 2002 Martin Pool
- * Copyright (C) 2003-2007 Wayne Davison
+ * Copyright (C) 2003-2009 Wayne Davison
  *
  * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License version 2 as
- * published by the Free Software Foundation.
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
  *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -16,8 +17,7 @@
  * GNU General Public License for more details.
  *
  * You should have received a copy of the GNU General Public License along
- * with this program; if not, write to the Free Software Foundation, Inc.,
- * 51 Franklin Street - Fifth Floor, Boston, MA 02110-1301, USA.
+ * with this program; if not, visit the http://fsf.org website.
  */
 
 #include "rsync.h"
@@ -25,11 +25,17 @@
 #if !defined MKNOD_CREATES_SOCKETS && defined HAVE_SYS_UN_H
 #include <sys/un.h>
 #endif
+#ifdef HAVE_SYS_ATTR_H
+#include <sys/attr.h>
+#endif
 
 extern int dry_run;
+extern int am_root;
+extern int am_sender;
 extern int read_only;
 extern int list_only;
 extern int preserve_perms;
+extern int preserve_executability;
 
 #define RETURN_ERROR_IF(x,e) \
        do { \
@@ -48,12 +54,54 @@ int do_unlink(const char *fname)
        return unlink(fname);
 }
 
-int do_symlink(const char *fname1, const char *fname2)
+#ifdef SUPPORT_LINKS
+int do_symlink(const char *lnk, const char *fname)
 {
        if (dry_run) return 0;
        RETURN_ERROR_IF_RO_OR_LO;
-       return symlink(fname1, fname2);
+
+#ifdef NO_SYMLINK_XATTRS
+       /* For --fake-super, we create a normal file with mode 0600
+        * and write the lnk into it. */
+       if (am_root < 0) {
+               int ok, len = strlen(lnk);
+               int fd = open(fname, O_WRONLY|O_CREAT|O_TRUNC, S_IWUSR|S_IRUSR);
+               if (fd < 0)
+                       return -1;
+               ok = write(fd, lnk, len) == len;
+               if (close(fd) < 0)
+                       ok = 0;
+               return ok ? 0 : -1;
+       }
+#endif
+
+       return symlink(lnk, fname);
+}
+
+#ifdef NO_SYMLINK_XATTRS
+ssize_t do_readlink(const char *path, char *buf, size_t bufsiz)
+{
+       /* For --fake-super, we read the link from the file. */
+       if (am_root < 0) {
+               int fd = open(path, O_RDONLY|O_NOFOLLOW);
+               if (fd >= 0) {
+                       int len = read(fd, buf, bufsiz);
+                       close(fd);
+                       return len;
+               }
+               if (errno != ELOOP)
+                       return -1;
+               /* A real symlink needs to be turned into a fake one on the receiving
+                * side, so tell the generator that the link has no length. */
+               if (!am_sender)
+                       return 0;
+               /* Otherwise fall through and let the sender report the real length. */
+       }
+
+       return readlink(path, buf, bufsiz);
 }
+#endif
+#endif
 
 #ifdef HAVE_LINK
 int do_link(const char *fname1, const char *fname2)
@@ -78,6 +126,15 @@ int do_mknod(const char *pathname, mode_t mode, dev_t dev)
 {
        if (dry_run) return 0;
        RETURN_ERROR_IF_RO_OR_LO;
+
+       /* For --fake-super, we create a normal file with mode 0600. */
+       if (am_root < 0) {
+               int fd = open(pathname, O_WRONLY|O_CREAT|O_TRUNC, S_IWUSR|S_IRUSR);
+               if (fd < 0 || close(fd) < 0)
+                       return -1;
+               return 0;
+       }
+
 #if !defined MKNOD_CREATES_FIFOS && defined HAVE_MKFIFO
        if (S_ISFIFO(mode))
                return mkfifo(pathname, mode);
@@ -141,13 +198,21 @@ int do_chmod(const char *path, mode_t mode)
        if (S_ISLNK(mode)) {
 #ifdef HAVE_LCHMOD
                code = lchmod(path, mode & CHMOD_BITS);
+#elif defined HAVE_SETATTRLIST
+               struct attrlist attrList;
+               uint32_t m = mode & CHMOD_BITS; /* manpage is wrong: not mode_t! */
+
+               memset(&attrList, 0, sizeof attrList);
+               attrList.bitmapcount = ATTR_BIT_MAP_COUNT;
+               attrList.commonattr = ATTR_CMN_ACCESSMASK;
+               code = setattrlist(path, &attrList, &m, sizeof m, FSOPT_NOFOLLOW);
 #else
                code = 1;
 #endif
        } else
-               code = chmod(path, mode & CHMOD_BITS);
-       if (code != 0 && preserve_perms)
-           return code;
+               code = chmod(path, mode & CHMOD_BITS); /* DISCOURAGED FUNCTION */
+       if (code != 0 && (preserve_perms || preserve_executability))
+               return code;
        return 0;
 }
 #endif
@@ -190,6 +255,7 @@ int do_mkstemp(char *template, mode_t perms)
 {
        RETURN_ERROR_IF(dry_run, 0);
        RETURN_ERROR_IF(read_only, EROFS);
+       perms |= S_IWUSR;
 
 #if defined HAVE_SECURE_MKSTEMP && defined HAVE_FCHMOD && (!defined HAVE_OPEN64 || defined HAVE_MKSTEMP64)
        {
@@ -259,12 +325,3 @@ OFF_T do_lseek(int fd, OFF_T offset, int whence)
        return lseek(fd, offset, whence);
 #endif
 }
-
-char *d_name(struct dirent *di)
-{
-#ifdef HAVE_BROKEN_READDIR
-       return (di->d_name - 2);
-#else
-       return di->d_name;
-#endif
-}