Make the !flist_eof assumption explicit before the check_for_io_err

[rsync/rsync.git] / compat.c

diff --git a/compat.c b/compat.c
index ef220e2..212f927 100644 (file)
--- a/compat.c
+++ b/compat.c
@@ -25,7 +25,6 @@ int remote_protocol = 0;
 int file_extra_cnt = 0; /* count of file-list extras that everyone gets */
 int inc_recurse = 0;
 
-extern int verbose;
 extern int am_server;
 extern int am_sender;
 extern int local_server;
@@ -57,12 +56,14 @@ extern struct filter_list_struct filter_list;
 extern int need_unsorted_flist;
 #ifdef ICONV_OPTION
 extern iconv_t ic_send, ic_recv;
+extern char *iconv_opt;
 #endif
 
 /* These index values are for the file-list's extra-attribute array. */
 int uid_ndx, gid_ndx, acls_ndx, xattrs_ndx, unsort_ndx;
 
 int receiver_symlink_times = 0; /* receiver can set the time on a symlink */
+int sender_symlink_iconv = 0;  /* sender should convert symlink content */
 
 #ifdef ICONV_OPTION
 int filesfrom_convert = 0;
@@ -70,6 +71,7 @@ int filesfrom_convert = 0;
 
 #define CF_INC_RECURSE  (1<<0)
 #define CF_SYMLINK_TIMES (1<<1)
+#define CF_SYMLINK_ICONV (1<<2)
 
 static const char *client_info;
 
@@ -157,7 +159,7 @@ void setup_protocol(int f_out,int f_in)
                exit_cleanup(RERR_PROTOCOL);
        }
 
-       if (verbose > 3) {
+       if (DEBUG_GTE(PROTO, 1)) {
                rprintf(FINFO, "(%s) Protocol versions: remote=%d, negotiated=%d\n",
                        am_server? "Server" : "Client", remote_protocol, protocol_version);
        }
@@ -248,6 +250,9 @@ void setup_protocol(int f_out,int f_in)
                        compat_flags = allow_inc_recurse ? CF_INC_RECURSE : 0;
 #if defined HAVE_LUTIMES && defined HAVE_UTIMES
                        compat_flags |= CF_SYMLINK_TIMES;
+#endif
+#ifdef ICONV_OPTION
+                       compat_flags |= CF_SYMLINK_ICONV;
 #endif
                        write_byte(f_out, compat_flags);
                } else
@@ -262,6 +267,11 @@ void setup_protocol(int f_out,int f_in)
 #if defined HAVE_LUTIMES && defined HAVE_UTIMES
                else
                        receiver_symlink_times = 1;
+#endif
+#ifdef ICONV_OPTION
+               sender_symlink_iconv = iconv_opt && (am_server
+                   ? strchr(client_info, 's') != NULL
+                   : !!(compat_flags & CF_SYMLINK_ICONV));
 #endif
                if (inc_recurse && !allow_inc_recurse) {
                        /* This should only be able to happen in a batch. */