Cast some F_OWNER()/F_GROUP() values to make sure that we don't get

[rsync/rsync.git] / rsync.c

diff --git a/rsync.c b/rsync.c
index 676e658..9772b74 100644 (file)
--- a/rsync.c
+++ b/rsync.c
@@ -20,9 +20,6 @@
  */
 
 #include "rsync.h"
-#if defined HAVE_ICONV_OPEN && defined HAVE_ICONV_H
-#include <iconv.h>
-#endif
 #if defined HAVE_LIBCHARSET_H && defined HAVE_LOCALE_CHARSET
 #include <libcharset.h>
 #elif defined HAVE_LANGINFO_H && defined HAVE_NL_LANGINFO
@@ -53,9 +50,16 @@ extern int keep_dirlinks;
 extern int make_backups;
 extern struct file_list *cur_flist, *first_flist, *dir_flist;
 extern struct chmod_mode_struct *daemon_chmod_modes;
+#ifdef ICONV_OPTION
+extern char *iconv_opt;
+#endif
 
-#if defined HAVE_ICONV_OPEN && defined HAVE_ICONV_H
+#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;
+int ic_ndx;
+#endif
 
 static const char *default_charset(void)
 {
@@ -70,8 +74,13 @@ static const char *default_charset(void)
 
 void setup_iconv()
 {
+       const char *defset = default_charset();
+# ifdef ICONV_OPTION
+       const char *charset;
+       char *cp;
+#endif
+
        if (!am_server && !allow_8bit_chars) {
-               const char *defset = default_charset();
 
                /* It's OK if this fails... */
                ic_chck = iconv_open(defset, defset);
@@ -89,6 +98,44 @@ void setup_iconv()
                        }
                }
        }
+
+# ifdef ICONV_OPTION
+       if (!iconv_opt)
+               return;
+
+       if ((cp = strchr(iconv_opt, ',')) != NULL) {
+               if (am_server) /* A local transfer needs this. */
+                       iconv_opt = cp + 1;
+               else
+                       *cp = '\0';
+       }
+
+       if (!*iconv_opt || (*iconv_opt == '.' && iconv_opt[1] == '\0'))
+               charset = defset;
+       else
+               charset = iconv_opt;
+
+       if ((ic_send = iconv_open(UTF8_CHARSET, charset)) == (iconv_t)-1) {
+               rprintf(FERROR, "iconv_open(\"%s\", \"%s\") failed\n",
+                       UTF8_CHARSET, charset);
+               exit_cleanup(RERR_UNSUPPORTED);
+       }
+
+       if ((ic_recv = iconv_open(charset, UTF8_CHARSET)) == (iconv_t)-1) {
+               rprintf(FERROR, "iconv_open(\"%s\", \"%s\") failed\n",
+                       charset, UTF8_CHARSET);
+               exit_cleanup(RERR_UNSUPPORTED);
+       }
+
+       if (!am_sender || inc_recurse)
+               ic_ndx = ++file_extra_cnt;
+
+       if (verbose > 1) {
+               rprintf(FINFO, "%s charset: %s\n",
+                       am_server ? "server" : "client",
+                       *charset ? charset : "[LOCALE]");
+       }
+# endif
 }
 #endif
 
@@ -112,7 +159,7 @@ int read_ndx_and_attrs(int f_in, int *iflag_ptr, uchar *type_ptr,
                        goto invalid_ndx;
                if (ndx == NDX_FLIST_EOF) {
                        flist_eof = 1;
-                       send_msg(MSG_FLIST_EOF, "", 0);
+                       send_msg(MSG_FLIST_EOF, "", 0, 0);
                        continue;
                }
                ndx = NDX_FLIST_OFFSET - ndx;
@@ -257,6 +304,8 @@ int set_file_attrs(const char *fname, struct file_struct *file, statx *sxp,
 #ifdef SUPPORT_XATTRS
        if (preserve_xattrs && fnamecmp)
                set_xattr(fname, file, fnamecmp, sxp);
+       if (am_root < 0)
+               set_stat_xattr(fname, file);
 #endif
 
        if (!preserve_times || (S_ISDIR(sxp->st.st_mode) && omit_dir_times))
@@ -273,9 +322,9 @@ int set_file_attrs(const char *fname, struct file_struct *file, statx *sxp,
                        updated = 1;
        }
 
-       change_uid = am_root && preserve_uid && sxp->st.st_uid != F_UID(file);
-       change_gid = preserve_gid && F_GID(file) != GID_NONE
-               && sxp->st.st_gid != F_GID(file);
+       change_uid = am_root && preserve_uid && sxp->st.st_uid != (uid_t)F_OWNER(file);
+       change_gid = preserve_gid && !(file->flags & FLAG_SKIP_GROUP)
+                 && sxp->st.st_gid != (gid_t)F_GROUP(file);
 #if !defined HAVE_LCHOWN && !defined CHOWN_MODIFIES_SYMLINK
        if (S_ISLNK(sxp->st.st_mode))
                ;
@@ -285,27 +334,27 @@ int set_file_attrs(const char *fname, struct file_struct *file, statx *sxp,
                if (verbose > 2) {
                        if (change_uid) {
                                rprintf(FINFO,
-                                       "set uid of %s from %ld to %ld\n",
-                                       fname,
-                                       (long)sxp->st.st_uid, (long)F_UID(file));
+                                       "set uid of %s from %u to %u\n",
+                                       fname, (unsigned)sxp->st.st_uid, F_OWNER(file));
                        }
                        if (change_gid) {
                                rprintf(FINFO,
-                                       "set gid of %s from %ld to %ld\n",
-                                       fname,
-                                       (long)sxp->st.st_gid, (long)F_GID(file));
+                                       "set gid of %s from %u to %u\n",
+                                       fname, (unsigned)sxp->st.st_gid, F_GROUP(file));
                        }
                }
-               if (do_lchown(fname,
-                   change_uid ? F_UID(file) : sxp->st.st_uid,
-                   change_gid ? F_GID(file) : sxp->st.st_gid) != 0) {
+               if (am_root < 0) {
+                       ;
+               } else if (do_lchown(fname,
+                   change_uid ? (uid_t)F_OWNER(file) : sxp->st.st_uid,
+                   change_gid ? (gid_t)F_GROUP(file) : sxp->st.st_gid) != 0) {
                        /* shouldn't have attempted to change uid or gid
                         * unless have the privilege */
                        rsyserr(FERROR, errno, "%s %s failed",
                            change_uid ? "chown" : "chgrp",
                            full_fname(fname));
                        goto cleanup;
-               }
+               } else
                /* a lchown had been done - we have to re-stat if the
                 * destination had the setuid or setgid bits set due
                 * to the side effect of the chown call */
@@ -332,7 +381,7 @@ int set_file_attrs(const char *fname, struct file_struct *file, statx *sxp,
 
 #ifdef HAVE_CHMOD
        if (!BITS_EQUAL(sxp->st.st_mode, new_mode, CHMOD_BITS)) {
-               int ret = do_chmod(fname, new_mode);
+               int ret = am_root < 0 ? 0 : do_chmod(fname, new_mode);
                if (ret < 0) {
                        rsyserr(FERROR, errno,
                                "failed to set permissions on %s",