Switch over to Matt's idea of using FLAG_OWNED_BY_US.

[rsync.git] / rsync.c

diff --git a/rsync.c b/rsync.c
index 8fad34836324ea2555e5180fc09f993fbda8aef5..d9bd863fb1358e91770b9c39adb6ff3aa92ba846 100644 (file)
--- a/rsync.c
+++ b/rsync.c
@@ -37,12 +37,11 @@ extern int preserve_times;
 extern int am_root;
 extern int am_server;
 extern int am_sender;
+extern int am_receiver;
 extern int am_generator;
 extern int am_starting_up;
 extern int allow_8bit_chars;
 extern int protocol_version;
-extern int uid_ndx;
-extern int gid_ndx;
 extern int inc_recurse;
 extern int inplace;
 extern int flist_eof;
@@ -80,7 +79,6 @@ void setup_iconv(void)
 # endif
 
        if (!am_server && !allow_8bit_chars) {
-
                /* It's OK if this fails... */
                ic_chck = iconv_open(defset, defset);
 
@@ -304,9 +302,8 @@ int read_ndx_and_attrs(int f_in, int *iflag_ptr, uchar *type_ptr,
        iflags = protocol_version >= 29 ? read_shortint(f_in)
                   : ITEM_TRANSFER | ITEM_MISSING_DATA;
 
-       /* Honor the old-style keep-alive indicator. */
-       if (protocol_version < 30
-        && ndx == cur_flist->used && iflags == ITEM_IS_NEW) {
+       /* Support the protocol-29 keep-alive style. */
+       if (protocol_version < 30 && ndx == cur_flist->used && iflags == ITEM_IS_NEW) {
                if (am_sender)
                        maybe_send_keepalive();
                goto read_loop;
@@ -653,5 +650,8 @@ const char *who_am_i(void)
 {
        if (am_starting_up)
                return am_server ? "server" : "client";
-       return am_sender ? "sender" : am_generator ? "generator" : "receiver";
+       return am_sender ? "sender"
+            : am_generator ? "generator"
+            : am_receiver ? "receiver"
+            : "Receiver"; /* pre-forked receiver */
 }