Got rid of patch fuzz.

[rsync-patches.git] / early-checksum.diff

diff --git a/early-checksum.diff b/early-checksum.diff
index 4b7230240a5d94482383da4cbe0cf9df9d20a5df..6f6c931ee1330e605734557fbc0945e810247911 100644 (file)
--- a/early-checksum.diff
+++ b/early-checksum.diff
@@ -16,7 +16,7 @@ To use this patch, run these commands for a successful build:
 
 --- old/flist.c
 +++ new/flist.c
-@@ -33,6 +33,7 @@ extern int am_generator;
+@@ -34,6 +34,7 @@ extern int am_generator;
  extern int inc_recurse;
  extern int do_progress;
  extern int always_checksum;
@@ -24,7 +24,7 @@ To use this patch, run these commands for a successful build:
  extern int module_id;
  extern int ignore_errors;
  extern int numeric_ids;
-@@ -955,6 +956,15 @@ static struct file_struct *recv_file_ent
+@@ -949,6 +950,15 @@ static struct file_struct *recv_file_ent
                        memcpy(bp, F_SUM(first), checksum_len);
                } else
                        read_buf(f, bp, checksum_len);
@@ -50,7 +50,7 @@ To use this patch, run these commands for a successful build:
  extern int checksum_len;
  extern char *partial_dir;
  extern char *basis_dir[];
-@@ -618,7 +619,8 @@ void itemize(const char *fnamecmp, struc
+@@ -617,7 +618,8 @@ void itemize(const char *fnamecmp, struc
  
  
  /* Perform our quick-check heuristic for determining if a file is unchanged. */
@@ -60,7 +60,7 @@ To use this patch, run these commands for a successful build:
  {
        if (st->st_size != F_LENGTH(file))
                return 0;
-@@ -627,6 +629,8 @@ int unchanged_file(char *fn, struct file
+@@ -626,6 +628,8 @@ int unchanged_file(char *fn, struct file
           of the file time to determine whether to sync */
        if (always_checksum > 0 && S_ISREG(st->st_mode)) {
                char sum[MAX_DIGEST_LEN];
@@ -69,7 +69,7 @@ To use this patch, run these commands for a successful build:
                file_checksum(fn, sum, st->st_size);
                return memcmp(sum, F_SUM(file), checksum_len) == 0;
        }
-@@ -847,7 +851,7 @@ static int try_dests_reg(struct file_str
+@@ -846,7 +850,7 @@ static int try_dests_reg(struct file_str
                        match_level = 1;
                        /* FALL THROUGH */
                case 1:
@@ -78,7 +78,7 @@ To use this patch, run these commands for a successful build:
                                continue;
                        best_match = j;
                        match_level = 2;
-@@ -1575,7 +1579,7 @@ static void recv_generator(char *fname, 
+@@ -1638,7 +1642,7 @@ static void recv_generator(char *fname, 
                ;
        else if (fnamecmp_type == FNAMECMP_FUZZY)
                ;
@@ -89,7 +89,7 @@ To use this patch, run these commands for a successful build:
                        handle_partial_dir(partialptr, PDIR_DELETE);
 --- old/hlink.c
 +++ new/hlink.c
-@@ -392,7 +392,7 @@ int hard_link_check(struct file_struct *
+@@ -353,7 +353,7 @@ int hard_link_check(struct file_struct *
                                }
                                break;
                        }
@@ -100,7 +100,7 @@ To use this patch, run these commands for a successful build:
                        if (unchanged_attrs(cmpbuf, file, &alt_sx))
 --- old/main.c
 +++ new/main.c
-@@ -45,6 +45,7 @@ extern int module_id;
+@@ -46,6 +46,7 @@ extern int module_id;
  extern int copy_links;
  extern int copy_dirlinks;
  extern int keep_dirlinks;
@@ -108,17 +108,17 @@ To use this patch, run these commands for a successful build:
  extern int preserve_hard_links;
  extern int protocol_version;
  extern int file_total;
-@@ -72,6 +73,9 @@ extern char *password_file;
- extern char curr_dir[MAXPATHLEN];
- extern struct filter_list_struct server_filter_list;
+@@ -78,6 +79,9 @@ extern struct filter_list_struct server_
+ extern iconv_t ic_send;
+ #endif
  
 +extern char curr_dir[MAXPATHLEN];
 +
 +int pre_checksum = 0;
  int local_server = 0;
- int new_root_dir = 0;
+ int daemon_over_rsh = 0;
  mode_t orig_umask = 0;
-@@ -792,6 +796,7 @@ static void do_server_recv(int f_in, int
+@@ -850,6 +854,7 @@ static void do_server_recv(int f_in, int
        struct file_list *flist;
        char *local_name = NULL;
        char *dir = NULL;
@@ -126,7 +126,7 @@ To use this patch, run these commands for a successful build:
        int save_verbose = verbose;
  
        if (filesfrom_fd >= 0) {
-@@ -838,6 +843,10 @@ static void do_server_recv(int f_in, int
+@@ -896,6 +901,10 @@ static void do_server_recv(int f_in, int
                filesfrom_fd = -1;
        }
  
@@ -137,7 +137,7 @@ To use this patch, run these commands for a successful build:
        flist = recv_file_list(f_in);
        if (!flist) {
                rprintf(FERROR,"server_recv: recv_file_list error\n");
-@@ -847,6 +856,9 @@ static void do_server_recv(int f_in, int
+@@ -905,6 +914,9 @@ static void do_server_recv(int f_in, int
                recv_additional_file_list(f_in);
        verbose = save_verbose;
  
@@ -147,7 +147,7 @@ To use this patch, run these commands for a successful build:
        if (argc > 0)
                local_name = get_local_name(flist,argv[0]);
  
-@@ -926,6 +938,7 @@ int client_run(int f_in, int f_out, pid_
+@@ -981,6 +993,7 @@ int client_run(int f_in, int f_out, pid_
  {
        struct file_list *flist = NULL;
        int exit_code = 0, exit_code2 = 0;
@@ -155,7 +155,7 @@ To use this patch, run these commands for a successful build:
        char *local_name = NULL;
  
        cleanup_child_pid = pid;
-@@ -1006,12 +1019,19 @@ int client_run(int f_in, int f_out, pid_
+@@ -1058,12 +1071,19 @@ int client_run(int f_in, int f_out, pid_
                filesfrom_fd = -1;
        }
  
@@ -177,7 +177,7 @@ To use this patch, run these commands for a successful build:
  
 --- old/rsync.h
 +++ new/rsync.h
-@@ -71,6 +71,7 @@
+@@ -73,6 +73,7 @@
  #define FLAG_HLINK_DONE (1<<8)        /* receiver/generator */
  #define FLAG_LENGTH64 (1<<9)  /* sender/receiver/generator */
  #define FLAG_SKIP_GROUP (1<<10)       /* receiver/generator */