Mention updated config files.

[rsync.git] / syscall.c

diff --git a/syscall.c b/syscall.c
index abb0057546935fb21df7ae8c3205ae1fb22dbb66..d92074aaadc20f595c6d381a24d6eefb0f90d416 100644 (file)
--- a/syscall.c
+++ b/syscall.c
@@ -4,7 +4,7 @@
  *
  * Copyright (C) 1998 Andrew Tridgell
  * Copyright (C) 2002 Martin Pool
- * Copyright (C) 2003-2020 Wayne Davison
+ * Copyright (C) 2003-2022 Wayne Davison
  *
  * 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
@@ -77,15 +77,15 @@ struct create_time {
 
 #define RETURN_ERROR_IF_RO_OR_LO RETURN_ERROR_IF(read_only || list_only, EROFS)
 
-int do_unlink(const char *fname)
+int do_unlink(const char *path)
 {
        if (dry_run) return 0;
        RETURN_ERROR_IF_RO_OR_LO;
-       return unlink(fname);
+       return unlink(path);
 }
 
 #ifdef SUPPORT_LINKS
-int do_symlink(const char *lnk, const char *fname)
+int do_symlink(const char *lnk, const char *path)
 {
        if (dry_run) return 0;
        RETURN_ERROR_IF_RO_OR_LO;
@@ -95,7 +95,7 @@ int do_symlink(const char *lnk, const char *fname)
         * 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);
+               int fd = open(path, O_WRONLY|O_CREAT|O_TRUNC, S_IWUSR|S_IRUSR);
                if (fd < 0)
                        return -1;
                ok = write(fd, lnk, len) == len;
@@ -105,7 +105,7 @@ int do_symlink(const char *lnk, const char *fname)
        }
 #endif
 
-       return symlink(lnk, fname);
+       return symlink(lnk, path);
 }
 
 #if defined NO_SYMLINK_XATTRS || defined NO_SYMLINK_USER_XATTRS
@@ -231,13 +231,24 @@ int do_open(const char *pathname, int flags, mode_t mode)
 #ifdef HAVE_CHMOD
 int do_chmod(const char *path, mode_t mode)
 {
+       static int switch_step = 0;
        int code;
+
        if (dry_run) return 0;
        RETURN_ERROR_IF_RO_OR_LO;
+
+       switch (switch_step) {
 #ifdef HAVE_LCHMOD
-       if ((code = lchmod(path, mode & CHMOD_BITS)) < 0 && errno == ENOTSUP)
+       case 0:
+               if ((code = lchmod(path, mode & CHMOD_BITS)) == 0)
+                       break;
+               if (errno == ENOSYS)
+                       switch_step++;
+               else if (errno != ENOTSUP)
+                       break;
 #endif
-       {
+               /* FALLTHROUGH */
+       default:
                if (S_ISLNK(mode)) {
 # if defined HAVE_SETATTRLIST
                        struct attrlist attrList;
@@ -246,12 +257,16 @@ int do_chmod(const char *path, mode_t mode)
                        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);
+                       if ((code = setattrlist(path, &attrList, &m, sizeof m, FSOPT_NOFOLLOW)) == 0)
+                               break;
+                       if (errno == ENOTSUP)
+                               code = 1;
 # else
                        code = 1;
 # endif
                } else
                        code = chmod(path, mode & CHMOD_BITS); /* DISCOURAGED FUNCTION */
+               break;
        }
        if (code != 0 && (preserve_perms || preserve_executability))
                return code;
@@ -300,12 +315,12 @@ void trim_trailing_slashes(char *name)
        }
 }
 
-int do_mkdir(char *fname, mode_t mode)
+int do_mkdir(char *path, mode_t mode)
 {
        if (dry_run) return 0;
        RETURN_ERROR_IF_RO_OR_LO;
-       trim_trailing_slashes(fname);
-       return mkdir(fname, mode);
+       trim_trailing_slashes(path);
+       return mkdir(path, mode);
 }
 
 /* like mkstemp but forces permissions */
@@ -339,25 +354,25 @@ int do_mkstemp(char *template, mode_t perms)
 #endif
 }
 
-int do_stat(const char *fname, STRUCT_STAT *st)
+int do_stat(const char *path, STRUCT_STAT *st)
 {
 #ifdef USE_STAT64_FUNCS
-       return stat64(fname, st);
+       return stat64(path, st);
 #else
-       return stat(fname, st);
+       return stat(path, st);
 #endif
 }
 
-int do_lstat(const char *fname, STRUCT_STAT *st)
+int do_lstat(const char *path, STRUCT_STAT *st)
 {
 #ifdef SUPPORT_LINKS
 # ifdef USE_STAT64_FUNCS
-       return lstat64(fname, st);
+       return lstat64(path, st);
 # else
-       return lstat(fname, st);
+       return lstat(path, st);
 # endif
 #else
-       return do_stat(fname, st);
+       return do_stat(path, st);
 #endif
 }
 
@@ -385,7 +400,7 @@ OFF_T do_lseek(int fd, OFF_T offset, int whence)
 }
 
 #ifdef HAVE_SETATTRLIST
-int do_setattrlist_times(const char *fname, STRUCT_STAT *stp)
+int do_setattrlist_times(const char *path, STRUCT_STAT *stp)
 {
        struct attrlist attrList;
        struct timespec ts[2];
@@ -403,9 +418,28 @@ int do_setattrlist_times(const char *fname, STRUCT_STAT *stp)
        memset(&attrList, 0, sizeof attrList);
        attrList.bitmapcount = ATTR_BIT_MAP_COUNT;
        attrList.commonattr = ATTR_CMN_MODTIME | ATTR_CMN_ACCTIME;
-       return setattrlist(fname, &attrList, ts, sizeof ts, FSOPT_NOFOLLOW);
+       return setattrlist(path, &attrList, ts, sizeof ts, FSOPT_NOFOLLOW);
+}
+
+#ifdef SUPPORT_CRTIMES
+int do_setattrlist_crtime(const char *path, time_t crtime)
+{
+       struct attrlist attrList;
+       struct timespec ts;
+
+       if (dry_run) return 0;
+       RETURN_ERROR_IF_RO_OR_LO;
+
+       ts.tv_sec = crtime;
+       ts.tv_nsec = 0;
+
+       memset(&attrList, 0, sizeof attrList);
+       attrList.bitmapcount = ATTR_BIT_MAP_COUNT;
+       attrList.commonattr = ATTR_CMN_CRTIME;
+       return setattrlist(path, &attrList, &ts, sizeof ts, FSOPT_NOFOLLOW);
 }
 #endif
+#endif /* HAVE_SETATTRLIST */
 
 #ifdef SUPPORT_CRTIMES
 time_t get_create_time(const char *path, STRUCT_STAT *stp)
@@ -429,24 +463,12 @@ time_t get_create_time(const char *path, STRUCT_STAT *stp)
 #endif
 }
 
-int set_create_time(const char *path, time_t crtime)
+#if defined __CYGWIN__
+int do_SetFileTime(const char *path, time_t crtime)
 {
        if (dry_run) return 0;
        RETURN_ERROR_IF_RO_OR_LO;
 
-    {
-#ifdef HAVE_GETATTRLIST
-       struct attrlist attrList;
-       struct timespec ts;
-
-       ts.tv_sec = crtime;
-       ts.tv_nsec = 0;
-
-       memset(&attrList, 0, sizeof attrList);
-       attrList.bitmapcount = ATTR_BIT_MAP_COUNT;
-       attrList.commonattr = ATTR_CMN_CRTIME;
-       return setattrlist(path, &attrList, &ts, sizeof ts, FSOPT_NOFOLLOW);
-#elif defined __CYGWIN__
        int cnt = MultiByteToWideChar(CP_UTF8, 0, path, -1, NULL, 0);
        if (cnt == 0)
            return -1;
@@ -466,13 +488,12 @@ int set_create_time(const char *path, time_t crtime)
        int ok = SetFileTime(handle, &birth_time, NULL, NULL);
        CloseHandle(handle);
        return ok ? 0 : -1;
-#endif
-    }
 }
+#endif
 #endif /* SUPPORT_CRTIMES */
 
 #ifdef HAVE_UTIMENSAT
-int do_utimensat(const char *fname, STRUCT_STAT *stp)
+int do_utimensat(const char *path, STRUCT_STAT *stp)
 {
        struct timespec t[2];
 
@@ -491,12 +512,12 @@ int do_utimensat(const char *fname, STRUCT_STAT *stp)
 #else
        t[1].tv_nsec = 0;
 #endif
-       return utimensat(AT_FDCWD, fname, t, AT_SYMLINK_NOFOLLOW);
+       return utimensat(AT_FDCWD, path, t, AT_SYMLINK_NOFOLLOW);
 }
 #endif
 
 #ifdef HAVE_LUTIMES
-int do_lutimes(const char *fname, STRUCT_STAT *stp)
+int do_lutimes(const char *path, STRUCT_STAT *stp)
 {
        struct timeval t[2];
 
@@ -515,12 +536,12 @@ int do_lutimes(const char *fname, STRUCT_STAT *stp)
 #else
        t[1].tv_usec = 0;
 #endif
-       return lutimes(fname, t);
+       return lutimes(path, t);
 }
 #endif
 
 #ifdef HAVE_UTIMES
-int do_utimes(const char *fname, STRUCT_STAT *stp)
+int do_utimes(const char *path, STRUCT_STAT *stp)
 {
        struct timeval t[2];
 
@@ -539,11 +560,11 @@ int do_utimes(const char *fname, STRUCT_STAT *stp)
 #else
        t[1].tv_usec = 0;
 #endif
-       return utimes(fname, t);
+       return utimes(path, t);
 }
 
 #elif defined HAVE_UTIME
-int do_utime(const char *fname, STRUCT_STAT *stp)
+int do_utime(const char *path, STRUCT_STAT *stp)
 {
 #ifdef HAVE_STRUCT_UTIMBUF
        struct utimbuf tbuf;
@@ -557,11 +578,11 @@ int do_utime(const char *fname, STRUCT_STAT *stp)
 # ifdef HAVE_STRUCT_UTIMBUF
        tbuf.actime = stp->st_atime;
        tbuf.modtime = stp->st_mtime;
-       return utime(fname, &tbuf);
+       return utime(path, &tbuf);
 # else
        t[0] = stp->st_atime;
        t[1] = stp->st_mtime;
-       return utime(fname, t);
+       return utime(path, t);
 # endif
 }