hint that a proxy can handle plain and ssl stream at the same time

[rsync.git] / rsync.c

diff --git a/rsync.c b/rsync.c
index 40e6ad52b5549eeba4145a06bfc49d839a6e4526..cd288f57d430b3f1b8620310b271a0e2244ac687 100644 (file)
--- a/rsync.c
+++ b/rsync.c
@@ -3,7 +3,7 @@
  *
  * Copyright (C) 1996 Andrew Tridgell
  * Copyright (C) 1996 Paul Mackerras
- * 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
@@ -32,7 +32,9 @@ extern int preserve_acls;
 extern int preserve_xattrs;
 extern int preserve_perms;
 extern int preserve_executability;
-extern int preserve_times;
+extern int preserve_mtimes;
+extern int omit_dir_times;
+extern int omit_link_times;
 extern int am_root;
 extern int am_server;
 extern int am_daemon;
@@ -57,20 +59,19 @@ extern struct chmod_mode_struct *daemon_chmod_modes;
 extern char *iconv_opt;
 #endif
 
-#ifdef ICONV_CONST
-iconv_t ic_chck = (iconv_t)-1;
-# ifdef ICONV_OPTION
-iconv_t ic_send = (iconv_t)-1, ic_recv = (iconv_t)-1;
-# endif
-
 #define UPDATED_OWNER (1<<0)
 #define UPDATED_GROUP (1<<1)
 #define UPDATED_MTIME (1<<2)
 #define UPDATED_ATIME (1<<3)
 #define UPDATED_ACLS  (1<<4)
 #define UPDATED_MODE  (1<<5)
+#define UPDATED_CRTIME (1<<6)
 
-#define UPDATED_TIMES (UPDATED_MTIME|UPDATED_ATIME)
+#ifdef ICONV_CONST
+iconv_t ic_chck = (iconv_t)-1;
+# ifdef ICONV_OPTION
+iconv_t ic_send = (iconv_t)-1, ic_recv = (iconv_t)-1;
+# endif
 
 static const char *default_charset(void)
 {
@@ -318,8 +319,7 @@ void send_protected_args(int fd, char *args[])
 #endif
 }
 
-int read_ndx_and_attrs(int f_in, int f_out, int *iflag_ptr, uchar *type_ptr,
-                      char *buf, int *len_ptr)
+int read_ndx_and_attrs(int f_in, int f_out, int *iflag_ptr, uchar *type_ptr, char *buf, int *len_ptr)
 {
        int len, iflags = 0;
        struct file_list *flist;
@@ -548,8 +548,8 @@ int set_file_attrs(const char *fname, struct file_struct *file, stat_x *sxp,
                                /* We shouldn't have attempted to change uid
                                 * or gid unless have the privilege. */
                                rsyserr(FERROR_XFER, errno, "%s %s failed",
-                                   change_uid ? "chown" : "chgrp",
-                                   full_fname(fname));
+                                       change_uid ? "chown" : "chgrp",
+                                       full_fname(fname));
                                goto cleanup;
                        }
                        if (uid == (uid_t)-1 && sxp->st.st_uid != (uid_t)-1)
@@ -565,9 +565,9 @@ int set_file_attrs(const char *fname, struct file_struct *file, stat_x *sxp,
                        }
                }
                if (change_uid)
-                   updated |= UPDATED_OWNER;
+                       updated |= UPDATED_OWNER;
                if (change_gid)
-                   updated |= UPDATED_GROUP;
+                       updated |= UPDATED_GROUP;
        }
 
 #ifdef SUPPORT_XATTRS
@@ -577,14 +577,20 @@ int set_file_attrs(const char *fname, struct file_struct *file, stat_x *sxp,
                set_xattr(fname, file, fnamecmp, sxp);
 #endif
 
-       if (!preserve_times
-        || (!(preserve_times & PRESERVE_DIR_TIMES) && S_ISDIR(sxp->st.st_mode))
-        || (!(preserve_times & PRESERVE_LINK_TIMES) && S_ISLNK(sxp->st.st_mode)))
-               flags |= ATTRS_SKIP_MTIME | ATTRS_SKIP_ATIME;
-       else if (sxp != &sx2)
-               memcpy(&sx2.st, &sxp->st, sizeof (sx2.st));
-       if (!atimes_ndx || S_ISDIR(sxp->st.st_mode))
-               flags |= ATTRS_SKIP_ATIME;
+       if ((omit_dir_times && S_ISDIR(sxp->st.st_mode))
+        || (omit_link_times && S_ISLNK(sxp->st.st_mode)))
+               flags |= ATTRS_SKIP_MTIME | ATTRS_SKIP_ATIME | ATTRS_SKIP_CRTIME;
+       else {
+               if (!preserve_mtimes)
+                       flags |= ATTRS_SKIP_MTIME;
+               if (!atimes_ndx || S_ISDIR(sxp->st.st_mode))
+                       flags |= ATTRS_SKIP_ATIME;
+               /* Don't set the creation date on the root folder of an HFS+ volume. */
+               if (sxp->st.st_ino == 2 && S_ISDIR(sxp->st.st_mode))
+                       flags |= ATTRS_SKIP_CRTIME;
+       }
+       if (sxp != &sx2)
+               memcpy(&sx2.st, &sxp->st, sizeof sx2.st);
        if (!(flags & ATTRS_SKIP_MTIME) && !same_mtime(file, &sxp->st, flags & ATTRS_ACCURATE_TIME)) {
                sx2.st.st_mtime = file->modtime;
 #ifdef ST_MTIME_NSEC
@@ -602,15 +608,33 @@ int set_file_attrs(const char *fname, struct file_struct *file, stat_x *sxp,
                        updated |= UPDATED_ATIME;
                }
        }
-       if (updated & UPDATED_TIMES) {
+#ifdef SUPPORT_CRTIMES
+       if (crtimes_ndx && !(flags & ATTRS_SKIP_CRTIME)) {
+               time_t file_crtime = F_CRTIME(file);
+               if (sxp->crtime == 0)
+                       sxp->crtime = get_create_time(fname, &sxp->st);
+               if (!same_time(sxp->crtime, 0L, file_crtime, 0L)) {
+                       if (
+#ifdef HAVE_GETATTRLIST
+                            do_setattrlist_crtime(fname, file_crtime) == 0
+#elif defined __CYGWIN__
+                            do_SetFileTime(fname, file_crtime) == 0
+#else
+#error Unknown crtimes implementation
+#endif
+                       )
+                               updated |= UPDATED_CRTIME;
+               }
+       }
+#endif
+       if (updated & (UPDATED_MTIME|UPDATED_ATIME)) {
                int ret = set_times(fname, &sx2.st);
                if (ret < 0) {
-                       rsyserr(FERROR_XFER, errno, "failed to set times on %s",
-                               full_fname(fname));
+                       rsyserr(FERROR_XFER, errno, "failed to set times on %s", full_fname(fname));
                        goto cleanup;
                }
                if (ret > 0) { /* ret == 1 if symlink could not be set */
-                       updated &= ~UPDATED_TIMES;
+                       updated &= ~(UPDATED_MTIME|UPDATED_ATIME);
                        file->flags |= FLAG_TIME_FAILED;
                }
        }
@@ -618,7 +642,7 @@ int set_file_attrs(const char *fname, struct file_struct *file, stat_x *sxp,
 #ifdef SUPPORT_ACLS
        /* It's OK to call set_acl() now, even for a dir, as the generator
         * will enable owner-writability using chmod, if necessary.
-        * 
+        *
         * If set_acl() changes permission bits in the process of setting
         * an access ACL, it changes sxp->st.st_mode so we know whether we
         * need to chmod(). */
@@ -719,7 +743,7 @@ int finish_transfer(const char *fname, const char *fnametmp,
 
        /* Change permissions before putting the file into place. */
        set_file_attrs(fnametmp, file, NULL, fnamecmp,
-                      ok_to_set_time ? ATTRS_ACCURATE_TIME : ATTRS_SKIP_MTIME | ATTRS_SKIP_ATIME);
+                      ok_to_set_time ? ATTRS_ACCURATE_TIME : ATTRS_SKIP_MTIME | ATTRS_SKIP_ATIME | ATTRS_SKIP_CRTIME);
 
        /* move tmp file over real file */
        if (DEBUG_GTE(RECV, 1))
@@ -744,7 +768,7 @@ int finish_transfer(const char *fname, const char *fnametmp,
 
   do_set_file_attrs:
        set_file_attrs(fnametmp, file, NULL, fnamecmp,
-                      ok_to_set_time ? ATTRS_ACCURATE_TIME : ATTRS_SKIP_MTIME | ATTRS_SKIP_ATIME);
+                      ok_to_set_time ? ATTRS_ACCURATE_TIME : ATTRS_SKIP_MTIME | ATTRS_SKIP_ATIME | ATTRS_SKIP_CRTIME);
 
        if (temp_copy_name) {
                if (do_rename(fnametmp, fname) < 0) {