extern int size_only;
extern OFF_T max_size;
extern OFF_T min_size;
-@@ -619,7 +620,7 @@ void itemize(const char *fnamecmp, struc
+@@ -624,7 +625,7 @@ void itemize(const char *fnamecmp, struc
/* Perform our quick-check heuristic for determining if a file is unchanged. */
int unchanged_file(char *fn, struct file_struct *file, STRUCT_STAT *st)
{
/* 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
+@@ -134,7 +134,7 @@ pid_t wait_process(pid_t pid, int *statu
}
/* Wait for a process to exit, calling io_flush while waiting. */
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;
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;
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");
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");
{"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
+@@ -1576,6 +1585,16 @@ int parse_arguments(int *argc_p, const c
}
}
if (files_from) {
char *h, *p;
int q;
-@@ -1895,6 +1914,25 @@ void server_options(char **args, int *ar
+@@ -1893,6 +1912,25 @@ void server_options(char **args, int *ar
}
}
goto oom;
--- old/pipe.c
+++ new/pipe.c
-@@ -164,3 +164,77 @@ pid_t local_child(int argc, char **argv,
+@@ -167,3 +167,77 @@ pid_t local_child(int argc, char **argv,
return pid;
}
extern char *partial_dir;
extern char *basis_dir[];
extern struct file_list *cur_flist, *first_flist, *dir_flist;
-@@ -357,6 +358,8 @@ int recv_files(int f_in, char *local_nam
+@@ -394,6 +395,8 @@ int recv_files(int f_in, char *local_nam
const char *parent_dirname = "";
#endif
int ndx, recv_ok;
if (verbose > 2)
rprintf(FINFO, "recv_files(%d) starting\n", cur_flist->used);
-@@ -366,6 +369,23 @@ int recv_files(int f_in, char *local_nam
-
- updating_basis = inplace;
+@@ -401,6 +404,23 @@ int recv_files(int f_in, char *local_nam
+ if (delay_updates)
+ delayed_bits = bitbag_create(cur_flist->used + 1);
+ if (dest_filter) {
+ char *p;
while (1) {
cleanup_disable();
-@@ -663,6 +683,9 @@ int recv_files(int f_in, char *local_nam
+@@ -665,6 +685,9 @@ int recv_files(int f_in, char *local_nam
else if (!am_server && verbose && do_progress)
rprintf(FINFO, "%s\n", fname);
/* recv file data */
recv_ok = receive_data(f_in, fnamecmp, fd1, st.st_size,
fname, fd2, F_LENGTH(file));
-@@ -677,6 +700,16 @@ int recv_files(int f_in, char *local_nam
+@@ -679,6 +702,16 @@ int recv_files(int f_in, char *local_nam
exit_cleanup(RERR_FILEIO);
}
if (partialptr == fname)
--- old/rsync.h
+++ new/rsync.h
-@@ -128,6 +128,7 @@
+@@ -129,6 +129,7 @@
#define IOERR_DEL_LIMIT (1<<2)
#define MAX_ARGS 1000
--- old/rsync.yo
+++ new/rsync.yo
-@@ -386,6 +386,7 @@ to the detailed description below for a
+@@ -381,6 +381,7 @@ to the detailed description below for a
--timeout=TIME set I/O timeout in seconds
-I, --ignore-times don't skip files that match size and time
--size-only skip files that match in size
--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
+@@ -420,6 +421,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
--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-
+@@ -1986,6 +1989,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.
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) {
+ }
+ }
+
- 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)
}
}