Moved some misplaced code.

diff --git a/source-filter_dest-filter.diff b/source-filter_dest-filter.diff
index c34614c..319aa18 100644 (file)
--- a/source-filter_dest-filter.diff
+++ b/source-filter_dest-filter.diff
@@ -51,7 +51,7 @@ To use this patch, run these commands for a successful build:
        /* if always checksum is set then we use the checksum instead
 --- old/main.c
 +++ new/main.c
-@@ -132,7 +132,7 @@ pid_t wait_process(pid_t pid, int *statu
+@@ -133,7 +133,7 @@ pid_t wait_process(pid_t pid, int *statu
  }
  
  /* Wait for a process to exit, calling io_flush while waiting. */
@@ -62,7 +62,7 @@ To use this patch, run these commands for a successful build:
        int status;
 --- old/options.c
 +++ new/options.c
-@@ -102,6 +102,7 @@ int keep_partial = 0;
+@@ -103,6 +103,7 @@ int keep_partial = 0;
  int safe_symlinks = 0;
  int copy_unsafe_links = 0;
  int size_only = 0;
@@ -70,7 +70,7 @@ To use this patch, run these commands for a successful build:
  int daemon_bwlimit = 0;
  int bwlimit = 0;
  int fuzzy_basis = 0;
-@@ -159,6 +160,8 @@ char *logfile_name = NULL;
+@@ -160,6 +161,8 @@ char *logfile_name = NULL;
  char *logfile_format = NULL;
  char *stdout_format = NULL;
  char *password_file = NULL;
@@ -79,7 +79,7 @@ To use this patch, run these commands for a successful build:
  char *rsync_path = RSYNC_PATH;
  char *backup_dir = NULL;
  char backup_dir_buf[MAXPATHLEN];
-@@ -379,6 +382,7 @@ void usage(enum logcode F)
+@@ -380,6 +383,7 @@ void usage(enum logcode F)
    rprintf(F,"     --timeout=TIME          set I/O timeout in seconds\n");
    rprintf(F," -I, --ignore-times          don't skip files that match in size and mod-time\n");
    rprintf(F,"     --size-only             skip files that match in size\n");
@@ -87,7 +87,7 @@ To use this patch, run these commands for a successful build:
    rprintf(F,"     --modify-window=NUM     compare mod-times with reduced accuracy\n");
    rprintf(F," -T, --temp-dir=DIR          create temporary files in directory DIR\n");
    rprintf(F," -y, --fuzzy                 find similar file for basis if no dest file\n");
-@@ -418,6 +422,8 @@ void usage(enum logcode F)
+@@ -419,6 +423,8 @@ void usage(enum logcode F)
    rprintf(F,"     --write-batch=FILE      write a batched update to FILE\n");
    rprintf(F,"     --only-write-batch=FILE like --write-batch but w/o updating destination\n");
    rprintf(F,"     --read-batch=FILE       read a batched update from FILE\n");
@@ -113,7 +113,7 @@ To use this patch, run these commands for a successful build:
    {"protocol",         0,  POPT_ARG_INT,    &protocol_version, 0, 0, 0 },
    {"checksum-seed",    0,  POPT_ARG_INT,    &checksum_seed, 0, 0, 0 },
    {"server",           0,  POPT_ARG_NONE,   0, OPT_SERVER, 0, 0 },
-@@ -1575,6 +1584,16 @@ int parse_arguments(int *argc_p, const c
+@@ -1577,6 +1586,16 @@ int parse_arguments(int *argc_p, const c
                }
        }
  
@@ -130,7 +130,7 @@ To use this patch, run these commands for a successful build:
        if (files_from) {
                char *h, *p;
                int q;
-@@ -1895,6 +1914,25 @@ void server_options(char **args, int *ar
+@@ -1897,6 +1916,25 @@ void server_options(char **args, int *ar
                }
        }
  
@@ -326,7 +326,7 @@ To use this patch, run these commands for a successful build:
       --modify-window=NUM     compare mod-times with reduced accuracy
   -T, --temp-dir=DIR          create temporary files in directory DIR
   -y, --fuzzy                 find similar file for basis if no dest file
-@@ -424,6 +425,8 @@ to the detailed description below for a 
+@@ -425,6 +426,8 @@ to the detailed description below for a 
       --write-batch=FILE      write a batched update to FILE
       --only-write-batch=FILE like --write-batch but w/o updating dest
       --read-batch=FILE       read a batched update from FILE
@@ -335,7 +335,7 @@ To use this patch, run these commands for a successful build:
       --protocol=NUM          force an older protocol version to be used
       --iconv=CONVERT_SPEC    request charset conversion of filesnames
       --checksum-seed=NUM     set block/file checksum seed (advanced)
-@@ -1936,6 +1939,33 @@ file previously generated by bf(--write-
+@@ -1959,6 +1962,33 @@ file previously generated by bf(--write-
  If em(FILE) is bf(-), the batch data will be read from standard input.
  See the "BATCH MODE" section for details.
  
@@ -414,8 +414,8 @@ To use this patch, run these commands for a successful build:
                fd = do_open(fname, O_RDONLY, 0);
                if (fd == -1) {
                        if (errno == ENOENT) {
-@@ -314,6 +336,33 @@ void send_files(int f_in, int f_out)
-                       exit_cleanup(RERR_PROTOCOL);
+@@ -305,6 +327,33 @@ void send_files(int f_in, int f_out)
+                       continue;
                }
  
 +              if (source_filter) {
@@ -445,9 +445,9 @@ To use this patch, run these commands for a successful build:
 +                      }
 +              }
 +
-               if (st.st_size) {
-                       int32 read_size = MAX(s->blength * 3, MAX_MAP_SIZE);
-                       mbuf = map_file(fd, st.st_size, read_size, s->blength);
+               /* map the local file */
+               if (do_fstat(fd, &st) != 0) {
+                       io_error |= IOERR_GENERAL;
 @@ -355,6 +404,8 @@ void send_files(int f_in, int f_out)
                        }
                }