Fixed failing hunks.

[rsync/rsync-patches.git] / threaded-receiver.diff

diff --git a/threaded-receiver.diff b/threaded-receiver.diff
index b107ed0..8129c4d 100644 (file)
--- a/threaded-receiver.diff
+++ b/threaded-receiver.diff
@@ -137,7 +137,7 @@ To use this patch, run these commands for a successful build:
                                continue;
                }
  
-@@ -1347,7 +1351,7 @@ static void recv_generator(char *fname, 
+@@ -1348,7 +1352,7 @@ static void recv_generator(char *fname, 
                return;
        }
  
@@ -146,7 +146,7 @@ To use this patch, run these commands for a successful build:
                return;
  
        if (fnamecmp_type <= FNAMECMP_BASIS_DIR_HIGH)
-@@ -1410,7 +1414,7 @@ static void recv_generator(char *fname, 
+@@ -1411,7 +1415,7 @@ static void recv_generator(char *fname, 
                goto notify_others;
        }
  
@@ -155,7 +155,7 @@ To use this patch, run these commands for a successful build:
                if (!(backupptr = get_backup_name(fname))) {
                        close(fd);
                        return;
-@@ -1501,9 +1505,12 @@ void generate_files(int f_out, struct fi
+@@ -1502,9 +1506,12 @@ void generate_files(int f_out, struct fi
        int save_ignore_existing = ignore_existing;
        int save_ignore_non_existing = ignore_non_existing;
        int save_do_progress = do_progress;
@@ -169,7 +169,7 @@ To use this patch, run these commands for a successful build:
        if (protocol_version >= 29) {
                itemizing = 1;
                maybe_ATTRS_REPORT = stdout_format_has_i ? 0 : ATTRS_REPORT;
-@@ -1531,7 +1538,7 @@ void generate_files(int f_out, struct fi
+@@ -1532,7 +1539,7 @@ void generate_files(int f_out, struct fi
                do_delete_pass(flist);
        do_progress = 0;
  
@@ -178,7 +178,7 @@ To use this patch, run these commands for a successful build:
                whole_file = 0;
        if (verbose >= 2) {
                rprintf(FINFO, "delta-transmission %s\n",
-@@ -1540,12 +1547,6 @@ void generate_files(int f_out, struct fi
+@@ -1541,12 +1548,6 @@ void generate_files(int f_out, struct fi
                        : "enabled");
        }
  
@@ -191,7 +191,7 @@ To use this patch, run these commands for a successful build:
        for (i = 0; i < flist->count; i++) {
                struct file_struct *file = flist->files[i];
  
-@@ -1589,23 +1590,34 @@ void generate_files(int f_out, struct fi
+@@ -1590,23 +1591,34 @@ void generate_files(int f_out, struct fi
                delete_in_dir(NULL, NULL, NULL, NULL);
  
        phase++;
@@ -232,7 +232,7 @@ To use this patch, run these commands for a successful build:
                if (local_name)
                        strlcpy(fbuf, local_name, sizeof fbuf);
                else
-@@ -1617,27 +1629,43 @@ void generate_files(int f_out, struct fi
+@@ -1618,27 +1630,43 @@ void generate_files(int f_out, struct fi
        phase++;
        ignore_non_existing = save_ignore_non_existing;
        ignore_existing = save_ignore_existing;
@@ -420,8 +420,8 @@ To use this patch, run these commands for a successful build:
 -}
 -
  /* Add a message to the pending MSG_* list. */
--static void msg_list_add(struct msg_list *lst, int code, char *buf, int len)
-+static void msg_list_add(int code, char *buf, int len)
+-static void msg_list_add(struct msg_list *lst, int code, const char *buf, int len)
++static void msg_list_add(int code, const char *buf, int len)
  {
        struct msg_list_item *m;
 -      int sz = len + 4 + sizeof m[0] - 1;
@@ -584,7 +584,7 @@ To use this patch, run these commands for a successful build:
 +      no_flush--;
  }
  
- int send_msg(enum msgcode code, char *buf, int len)
+ int send_msg(enum msgcode code, const char *buf, int len)
  {
 -      if (msg_fd_out < 0) {
 +      if (!am_receiver()) {
@@ -668,7 +668,7 @@ To use this patch, run these commands for a successful build:
                if ((size_t)write(batch_fd, buffer, total) != total)
                        exit_cleanup(RERR_FILEIO);
        }
-@@ -1115,7 +1067,6 @@ static void writefd_unbuffered(int fd,ch
+@@ -1115,7 +1067,6 @@ static void writefd_unbuffered(int fd, c
                         * to grab any messages they sent before they died. */
                        while (fd == sock_f_out && io_multiplexing_in) {
                                set_io_timeout(30);
@@ -676,7 +676,7 @@ To use this patch, run these commands for a successful build:
                                readfd_unbuffered(sock_f_in, io_filesfrom_buf,
                                                  sizeof io_filesfrom_buf);
                        }
-@@ -1126,7 +1077,7 @@ static void writefd_unbuffered(int fd,ch
+@@ -1126,7 +1077,7 @@ static void writefd_unbuffered(int fd, c
                defer_forwarding_messages = 1;
  
                if (fd == sock_f_out) {
@@ -685,7 +685,7 @@ To use this patch, run these commands for a successful build:
                                last_io_out = time(NULL);
                        sleep_for_bwlimit(cnt);
                }
-@@ -1136,23 +1087,6 @@ static void writefd_unbuffered(int fd,ch
+@@ -1136,23 +1087,6 @@ static void writefd_unbuffered(int fd, c
        no_flush--;
  }
  
@@ -731,7 +731,7 @@ To use this patch, run these commands for a successful build:
                return;
 @@ -1199,11 +1134,6 @@ void io_flush(int flush_it_all)
  
- static void writefd(int fd,char *buf,size_t len)
+ static void writefd(int fd, const char *buf, size_t len)
  {
 -      if (fd == msg_fd_out) {
 -              rprintf(FERROR, "Internal error: wrong write used in receiver.\n");
@@ -769,7 +769,7 @@ To use this patch, run these commands for a successful build:
        { RERR_SIGNAL     , "received SIGINT, SIGTERM, or SIGHUP" },
        { RERR_WAITCHILD  , "waitpid() failed" },
        { RERR_MALLOC     , "error allocating core memory buffers" },
-@@ -241,8 +239,8 @@ void rwrite(enum logcode code, char *buf
+@@ -241,8 +239,8 @@ void rwrite(enum logcode code, const cha
        if (len < 0)
                exit_cleanup(RERR_MESSAGEIO);
  
@@ -820,7 +820,7 @@ To use this patch, run these commands for a successful build:
                return;
  
        if (am_daemon) {
-@@ -683,12 +693,30 @@ static void do_server_sender(int f_in, i
+@@ -684,12 +694,30 @@ static void do_server_sender(int f_in, i
        exit_cleanup(0);
  }
  
@@ -854,7 +854,7 @@ To use this patch, run these commands for a successful build:
  
        /* The receiving side mustn't obey this, or an existing symlink that
         * points to an identical file won't be replaced by the referent. */
-@@ -697,70 +725,16 @@ static int do_recv(int f_in,int f_out,st
+@@ -698,70 +726,16 @@ static int do_recv(int f_in,int f_out,st
        if (preserve_hard_links)
                init_hard_links();
  
@@ -930,7 +930,7 @@ To use this patch, run these commands for a successful build:
        generate_files(f_out, flist, local_name);
  
        handle_stats(-1);
-@@ -771,10 +745,13 @@ static int do_recv(int f_in,int f_out,st
+@@ -772,10 +746,13 @@ static int do_recv(int f_in,int f_out,st
        }
        io_flush(FULL_FLUSH);
  
@@ -948,7 +948,7 @@ To use this patch, run these commands for a successful build:
  }
  
  
-@@ -1176,22 +1153,6 @@ static int start_client(int argc, char *
+@@ -1177,22 +1154,6 @@ static int start_client(int argc, char *
        return ret;
  }
  
@@ -971,7 +971,7 @@ To use this patch, run these commands for a successful build:
  RETSIGTYPE remember_children(UNUSED(int val))
  {
  #ifdef WNOHANG
-@@ -1283,8 +1244,6 @@ int main(int argc,char *argv[])
+@@ -1284,8 +1245,6 @@ int main(int argc,char *argv[])
  # endif
        sigact.sa_flags = SA_NOCLDSTOP;
  #endif
@@ -1012,7 +1012,7 @@ To use this patch, run these commands for a successful build:
 @@ -325,7 +325,7 @@ void match_sums(int f, struct sum_struct
                }
                if (last_match < s->flength) {
-                       int32 len = s->flength - last_match;
+                       int32 len = (int32)(s->flength - last_match);
 -                      if (buf && do_progress)
 +                      if (buf && recv_progress)
                                show_progress(last_match, buf->file_size);
@@ -1036,7 +1036,7 @@ To use this patch, run these commands for a successful build:
  int keep_partial = 0;
  int safe_symlinks = 0;
  int copy_unsafe_links = 0;
-@@ -1306,6 +1306,7 @@ int parse_arguments(int *argc, const cha
+@@ -1302,6 +1302,7 @@ int parse_arguments(int *argc, const cha
  
        if (do_progress && !verbose && !log_before_transfer && !am_server)
                verbose = 1;
@@ -1046,7 +1046,7 @@ To use this patch, run these commands for a successful build:
                do_xfers = 0;
 --- old/pipe.c
 +++ new/pipe.c
-@@ -59,7 +59,7 @@ pid_t piped_child(char **command, int *f
+@@ -58,7 +58,7 @@ pid_t piped_child(char **command, int *f
                exit_cleanup(RERR_IPC);
        }
  
@@ -1055,7 +1055,7 @@ To use this patch, run these commands for a successful build:
        if (pid == -1) {
                rsyserr(FERROR, errno, "fork");
                exit_cleanup(RERR_IPC);
-@@ -123,7 +123,7 @@ pid_t local_child(int argc, char **argv,
+@@ -122,7 +122,7 @@ pid_t local_child(int argc, char **argv,
                exit_cleanup(RERR_IPC);
        }
  
@@ -1087,7 +1087,7 @@ To use this patch, run these commands for a successful build:
 @@ -165,7 +165,7 @@ static int receive_data(int f_in, char *
                }
                if (offset < sum.flength) {
-                       int32 len = sum.flength - offset;
+                       int32 len = (int32)(sum.flength - offset);
 -                      if (do_progress)
 +                      if (recv_progress)
                                show_progress(offset, total_size);
@@ -1171,7 +1171,7 @@ To use this patch, run these commands for a successful build:
 +                      if (preserve_hard_links && file->link_u.links)
 +                              push_hlink_num(i);
                } else if (!recv_ok) {
-                       int msgtype = phase || read_batch ? FERROR : FINFO;
+                       enum logcode msgtype = phase || read_batch ? FERROR : FINFO;
                        if (msgtype == FERROR || verbose) {
 @@ -681,8 +678,8 @@ int recv_files(int f_in, struct file_lis
                                        errstr, fname, keptstr, redostr);
@@ -1224,7 +1224,7 @@ To use this patch, run these commands for a successful build:
  
 --- old/util.c
 +++ new/util.c
-@@ -415,49 +415,6 @@ int robust_rename(char *from, char *to, 
+@@ -417,49 +417,6 @@ int robust_rename(const char *from, cons
        return -1;
  }
  
@@ -1272,5 +1272,5 @@ To use this patch, run these commands for a successful build:
 -}
 -
  /** Turn a user name into a uid */
- int name_to_uid(char *name, uid_t *uid)
+ int name_to_uid(const char *name, uid_t *uid)
  {