Matt McCutchen's Web Site
/
rsync
/
rsync-patches.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (from parent 1:
ab5ffac
)
The patches for 3.0.4pre1.
author
Wayne Davison
<wayne@opencoder.net>
Fri, 25 Jul 2008 13:56:40 +0000
(06:56 -0700)
committer
Wayne Davison
<wayne@opencoder.net>
Fri, 25 Jul 2008 13:56:40 +0000
(06:56 -0700)
26 files changed:
adaptec_acl_mods.diff
patch
|
blob
|
blame
|
history
atimes.diff
patch
|
blob
|
blame
|
history
backup-dir-dels.diff
patch
|
blob
|
blame
|
history
catch_crash_signals.diff
patch
|
blob
|
blame
|
history
checksum-updating.diff
patch
|
blob
|
blame
|
history
checksum-xattr.diff
patch
|
blob
|
blame
|
history
copy-devices.diff
patch
|
blob
|
blame
|
history
date-only.diff
patch
|
blob
|
blame
|
history
db.diff
patch
|
blob
|
blame
|
history
detect-renamed-lax.diff
patch
|
blob
|
blame
|
history
detect-renamed.diff
patch
|
blob
|
blame
|
history
downdate.diff
patch
|
blob
|
blame
|
history
drop-cache.diff
patch
|
blob
|
blame
|
history
fileflags.diff
patch
|
blob
|
blame
|
history
fsync.diff
patch
|
blob
|
blame
|
history
ignore-case.diff
patch
|
blob
|
blame
|
history
link-by-hash.diff
patch
|
blob
|
blame
|
history
openssl-support.diff
patch
|
blob
|
blame
|
history
osx-xattr-nodev.diff
patch
|
blob
|
blame
|
history
preallocate.diff
patch
|
blob
|
blame
|
history
remote-option.diff
patch
|
blob
|
blame
|
history
source-backup.diff
patch
|
blob
|
blame
|
history
source-filter_dest-filter.diff
patch
|
blob
|
blame
|
history
sparse-block.diff
patch
|
blob
|
blame
|
history
time-limit.diff
patch
|
blob
|
blame
|
history
transliterate.diff
patch
|
blob
|
blame
|
history
diff --git
a/adaptec_acl_mods.diff
b/adaptec_acl_mods.diff
index
d668246
..
c7e33c3
100644
(file)
--- a/
adaptec_acl_mods.diff
+++ b/
adaptec_acl_mods.diff
@@
-10,7
+10,7
@@
Philip Lowman wrote:
> chmod, and chown bits which Adaptec has added to XFS on their SnapOS NAS
> units. This is nice for backing up files between different NAS units
> and preserving all of the Samba ACLs.
> chmod, and chown bits which Adaptec has added to XFS on their SnapOS NAS
> units. This is nice for backing up files between different NAS units
> and preserving all of the Samba ACLs.
->
+>
> I'm not sure how useful this patch will be because I'm not sure if any
> other NAS vendors have standardized on their extensions to POSIX ACLs to
> support Samba in the same manner that Adaptec has. FWIW, though, this
> I'm not sure how useful this patch will be because I'm not sure if any
> other NAS vendors have standardized on their extensions to POSIX ACLs to
> support Samba in the same manner that Adaptec has. FWIW, though, this
diff --git
a/atimes.diff
b/atimes.diff
index
a1885a7
..
d84b51a
100644
(file)
--- a/
atimes.diff
+++ b/
atimes.diff
@@
-184,8
+184,8
@@
diff --git a/generator.c b/generator.c
- set_modtime(fname, file->modtime, file->mode);
+ set_times(fname, file->modtime, file->modtime, file->mode);
}
- set_modtime(fname, file->modtime, file->mode);
+ set_times(fname, file->modtime, file->modtime, file->mode);
}
- if (
allowed_lull && !(counter % lull_mod))
- maybe_send_keepalive();
+ if (
counter >= loopchk_limit) {
+ if (allowed_lull)
diff --git a/ifuncs.h b/ifuncs.h
--- a/ifuncs.h
+++ b/ifuncs.h
diff --git a/ifuncs.h b/ifuncs.h
--- a/ifuncs.h
+++ b/ifuncs.h
@@
-470,7
+470,7
@@
diff --git a/tls.c b/tls.c
#endif
+static int display_atimes = 0;
#endif
+static int display_atimes = 0;
-+
++
static void failed(char const *what, char const *where)
{
fprintf(stderr, PROGRAM ": %s %s: %s\n",
static void failed(char const *what, char const *where)
{
fprintf(stderr, PROGRAM ": %s %s: %s\n",
diff --git
a/backup-dir-dels.diff
b/backup-dir-dels.diff
index
0b8d322
..
dc0d9f1
100644
(file)
--- a/
backup-dir-dels.diff
+++ b/
backup-dir-dels.diff
@@
-157,7
+157,7
@@
diff --git a/options.c b/options.c
int write_batch = 0;
int read_batch = 0;
int backup_dir_len = 0;
int write_batch = 0;
int read_batch = 0;
int backup_dir_len = 0;
-+int backup_dir_dels_len = 0;
++int backup_dir_dels_len = 0;
int backup_suffix_len;
+int backup_suffix_dels_len;
unsigned int backup_dir_remainder;
int backup_suffix_len;
+int backup_suffix_dels_len;
unsigned int backup_dir_remainder;
@@
-236,7
+236,7
@@
diff --git a/options.c b/options.c
+ if (strchr(backup_suffix_dels, '/') != NULL) {
+ snprintf(err_buf, sizeof err_buf,
+ "--suffix-dels cannot contain slashes: %s\n",
+ if (strchr(backup_suffix_dels, '/') != NULL) {
+ snprintf(err_buf, sizeof err_buf,
+ "--suffix-dels cannot contain slashes: %s\n",
-+ backup_suffix_dels);
++ backup_suffix_dels);
+ return 0;
+ }
if (backup_dir) {
+ return 0;
+ }
if (backup_dir) {
@@
-277,7
+277,7
@@
diff --git a/options.c b/options.c
if (make_backups && !backup_dir) {
omit_dir_times = 0; /* Implied, so avoid -O to sender. */
if (make_backups && !backup_dir) {
omit_dir_times = 0; /* Implied, so avoid -O to sender. */
-@@ -190
1,6 +1963
,10 @@ void server_options(char **args, int *argc_p)
+@@ -190
7,6 +1969
,10 @@ void server_options(char **args, int *argc_p)
args[ac++] = "--backup-dir";
args[ac++] = backup_dir;
}
args[ac++] = "--backup-dir";
args[ac++] = backup_dir;
}
@@
-288,7
+288,7
@@
diff --git a/options.c b/options.c
/* Only send --suffix if it specifies a non-default value. */
if (strcmp(backup_suffix, backup_dir ? "" : BACKUP_SUFFIX) != 0) {
/* Only send --suffix if it specifies a non-default value. */
if (strcmp(backup_suffix, backup_dir ? "" : BACKUP_SUFFIX) != 0) {
-@@ -19
09,7 +1975
,14 @@ void server_options(char **args, int *argc_p)
+@@ -19
15,7 +1981
,14 @@ void server_options(char **args, int *argc_p)
goto oom;
args[ac++] = arg;
}
goto oom;
args[ac++] = arg;
}
diff --git
a/catch_crash_signals.diff
b/catch_crash_signals.diff
index
751eeaa
..
b67c8cd
100644
(file)
--- a/
catch_crash_signals.diff
+++ b/
catch_crash_signals.diff
@@
-1,18
+1,18
@@
Igor Yu. Zhbanov wrote:
Igor Yu. Zhbanov wrote:
-> I am using rsync compiled with Cygwin on windows.
+> I am using rsync compiled with Cygwin on windows.
> I must call rsync from the *.bat script (I don't want to use a bash on Windows)
> and I have noticed that in the case when program compiled by Cygwin crashes
> via segmentation fault and default SIGSEGV handler is called, then it
> terminates process with exit status 0 as I see it from my *.bat script.
> (But if I invoke a program from bash (compiled with Cygwin too) I will see
> error code 139 as expected.)
> I must call rsync from the *.bat script (I don't want to use a bash on Windows)
> and I have noticed that in the case when program compiled by Cygwin crashes
> via segmentation fault and default SIGSEGV handler is called, then it
> terminates process with exit status 0 as I see it from my *.bat script.
> (But if I invoke a program from bash (compiled with Cygwin too) I will see
> error code 139 as expected.)
->
+>
> It is a Cygwin's problem, not an rsync's, but to use it on windows and
> to distinguish situations when rsync crashes and when it exits normally,
> I have written signal handler which terminates process with code 50.
> You may use conventional 139. Also signal handler writes corresponding
> message to log file.
> It is a Cygwin's problem, not an rsync's, but to use it on windows and
> to distinguish situations when rsync crashes and when it exits normally,
> I have written signal handler which terminates process with code 50.
> You may use conventional 139. Also signal handler writes corresponding
> message to log file.
->
+>
> By the way. When I terminate rsync in daemon mode by pressing Control-C,
> it writes an error to log. May be this is not an error but info or notice?
> By the way. When I terminate rsync in daemon mode by pressing Control-C,
> it writes an error to log. May be this is not an error but info or notice?
diff --git
a/checksum-updating.diff
b/checksum-updating.diff
index
e85c8a7
..
bea59fa
100644
(file)
--- a/
checksum-updating.diff
+++ b/
checksum-updating.diff
@@
-433,16
+433,16
@@
diff --git a/flist.c b/flist.c
if (f >= 0 && recurse && !divert_dirs) {
int i, end = flist->used - 1;
/* send_if_directory() bumps flist->used, so use "end". */
if (f >= 0 && recurse && !divert_dirs) {
int i, end = flist->used - 1;
/* send_if_directory() bumps flist->used, so use "end". */
-@@ -2435,6 +2651,9 @@ struct file_list *send_file_list(int f, int argc, char *argv[])
- }
+@@ -2436,6 +2652,9 @@ struct file_list *send_file_list(int f, int argc, char *argv[])
} else
flist_eof = 1;
} else
flist_eof = 1;
-+
+
+ if (checksum_files & CSF_UPDATE && flist_eof)
+ reset_checksum_cache(0); /* writes any last updates */
+ if (checksum_files & CSF_UPDATE && flist_eof)
+ reset_checksum_cache(0); /* writes any last updates */
-
++
return flist;
}
return flist;
}
+
diff --git a/generator.c b/generator.c
--- a/generator.c
+++ b/generator.c
diff --git a/generator.c b/generator.c
--- a/generator.c
+++ b/generator.c
@@
-490,7
+490,7
@@
diff --git a/generator.c b/generator.c
if (itemizing)
itemize(fnamecmp, file, ndx, statret, &sx, 0, 0, NULL);
#ifdef SUPPORT_HARD_LINKS
if (itemizing)
itemize(fnamecmp, file, ndx, statret, &sx, 0, 0, NULL);
#ifdef SUPPORT_HARD_LINKS
-@@ -22
47,6 +2252
,7 @@ void generate_files(int f_out, const char *local_name)
+@@ -22
50,6 +2255
,7 @@ void generate_files(int f_out, const char *local_name)
} else
change_local_filter_dir(fbuf, strlen(fbuf), F_DEPTH(fp));
}
} else
change_local_filter_dir(fbuf, strlen(fbuf), F_DEPTH(fp));
}
@@
-498,7
+498,7
@@
diff --git a/generator.c b/generator.c
}
for (i = cur_flist->low; i <= cur_flist->high; i++) {
struct file_struct *file = cur_flist->sorted[i];
}
for (i = cur_flist->low; i <= cur_flist->high; i++) {
struct file_struct *file = cur_flist->sorted[i];
-@@ -23
27,6 +2333
,9 @@ void generate_files(int f_out, const char *local_name)
+@@ -23
33,6 +2339
,9 @@ void generate_files(int f_out, const char *local_name)
wait_for_receiver();
}
wait_for_receiver();
}
diff --git
a/checksum-xattr.diff
b/checksum-xattr.diff
index
53d1319
..
62e1fbf
100644
(file)
--- a/
checksum-xattr.diff
+++ b/
checksum-xattr.diff
@@
-191,7
+191,7
@@
diff --git a/xattrs.c b/xattrs.c
continue;
}
continue;
}
-@@ -89
1,6 +899
,39 @@ int del_def_xattr_acl(const char *fname)
+@@ -89
4,6 +902
,39 @@ int del_def_xattr_acl(const char *fname)
}
#endif
}
#endif
@@
-202,7
+202,7
@@
diff --git a/xattrs.c b/xattrs.c
+ char buf[256];
+ uint32 file_length, mtime;
+ int len;
+ char buf[256];
+ uint32 file_length, mtime;
+ int len;
-+
++
+ len = sys_lgetxattr(fname, mdattr, buf, sizeof buf);
+ if (len < 0) {
+ if (errno == ENOTSUP || errno == ENOATTR)
+ len = sys_lgetxattr(fname, mdattr, buf, sizeof buf);
+ if (len < 0) {
+ if (errno == ENOTSUP || errno == ENOATTR)
diff --git
a/copy-devices.diff
b/copy-devices.diff
index
f0a0e64
..
3daa57f
100644
(file)
--- a/
copy-devices.diff
+++ b/
copy-devices.diff
@@
-55,7
+55,7
@@
diff --git a/options.c b/options.c
{"specials", 0, POPT_ARG_VAL, &preserve_specials, 1, 0, 0 },
{"no-specials", 0, POPT_ARG_VAL, &preserve_specials, 0, 0, 0 },
{"links", 'l', POPT_ARG_VAL, &preserve_links, 1, 0, 0 },
{"specials", 0, POPT_ARG_VAL, &preserve_specials, 1, 0, 0 },
{"no-specials", 0, POPT_ARG_VAL, &preserve_specials, 0, 0, 0 },
{"links", 'l', POPT_ARG_VAL, &preserve_links, 1, 0, 0 },
-@@ -20
48,6 +2051
,9 @@ void server_options(char **args, int *argc_p)
+@@ -20
53,6 +2056
,9 @@ void server_options(char **args, int *argc_p)
else if (remove_source_files)
args[ac++] = "--remove-sent-files";
else if (remove_source_files)
args[ac++] = "--remove-sent-files";
diff --git
a/date-only.diff
b/date-only.diff
index
d6a7d3b
..
e2e5913
100644
(file)
--- a/
date-only.diff
+++ b/
date-only.diff
@@
-62,7
+62,7
@@
diff --git a/options.c b/options.c
{"one-file-system", 'x', POPT_ARG_NONE, 0, 'x', 0, 0 },
{"no-one-file-system",'x',POPT_ARG_VAL, &one_file_system, 0, 0, 0 },
{"no-x", 'x', POPT_ARG_VAL, &one_file_system, 0, 0, 0 },
{"one-file-system", 'x', POPT_ARG_NONE, 0, 'x', 0, 0 },
{"no-one-file-system",'x',POPT_ARG_VAL, &one_file_system, 0, 0, 0 },
{"no-x", 'x', POPT_ARG_VAL, &one_file_system, 0, 0, 0 },
-@@ -195
3,6 +1956
,9 @@ void server_options(char **args, int *argc_p)
+@@ -195
9,6 +1962
,9 @@ void server_options(char **args, int *argc_p)
}
}
}
}
diff --git
a/db.diff
b/db.diff
index
1eed1eb
..
7606028
100644
(file)
--- a/
db.diff
+++ b/
db.diff
@@
-819,7
+819,7
@@
diff --git a/generator.c b/generator.c
return memcmp(sum, F_SUM(file), checksum_len) == 0;
}
return memcmp(sum, F_SUM(file), checksum_len) == 0;
}
-@@ -220
1,6 +2203
,9 @@ void generate_files(int f_out, const char *local_name)
+@@ -220
4,6 +2206
,9 @@ void generate_files(int f_out, const char *local_name)
: "enabled");
}
: "enabled");
}
diff --git
a/detect-renamed-lax.diff
b/detect-renamed-lax.diff
index
118013c
..
9314476
100644
(file)
--- a/
detect-renamed-lax.diff
+++ b/
detect-renamed-lax.diff
@@
-79,7
+79,7
@@
diff --git a/options.c b/options.c
{"fuzzy", 'y', POPT_ARG_VAL, &fuzzy_basis, 1, 0, 0 },
{"no-fuzzy", 0, POPT_ARG_VAL, &fuzzy_basis, 0, 0, 0 },
{"no-y", 0, POPT_ARG_VAL, &fuzzy_basis, 0, 0, 0 },
{"fuzzy", 'y', POPT_ARG_VAL, &fuzzy_basis, 1, 0, 0 },
{"no-fuzzy", 0, POPT_ARG_VAL, &fuzzy_basis, 0, 0, 0 },
{"no-y", 0, POPT_ARG_VAL, &fuzzy_basis, 0, 0, 0 },
-@@ -19
49,8 +1953
,14 @@ void server_options(char **args, int *argc_p)
+@@ -19
55,8 +1959
,14 @@ void server_options(char **args, int *argc_p)
args[ac++] = "--super";
if (size_only)
args[ac++] = "--size-only";
args[ac++] = "--super";
if (size_only)
args[ac++] = "--size-only";
diff --git
a/detect-renamed.diff
b/detect-renamed.diff
index
05d7f8e
..
161bafb
100644
(file)
--- a/
detect-renamed.diff
+++ b/
detect-renamed.diff
@@
-498,7
+498,7
@@
diff --git a/generator.c b/generator.c
rsyserr(FERROR_XFER, stat_errno, "recv_generator: failed to stat %s",
full_fname(fname));
goto cleanup;
rsyserr(FERROR_XFER, stat_errno, "recv_generator: failed to stat %s",
full_fname(fname));
goto cleanup;
-@@ -218
2,6 +2340
,12 @@ void generate_files(int f_out, const char *local_name)
+@@ -218
5,6 +2343
,12 @@ void generate_files(int f_out, const char *local_name)
if (verbose > 2)
rprintf(FINFO, "generator starting pid=%ld\n", (long)getpid());
if (verbose > 2)
rprintf(FINFO, "generator starting pid=%ld\n", (long)getpid());
@@
-511,7
+511,7
@@
diff --git a/generator.c b/generator.c
if (delete_before && !solo_file && cur_flist->used > 0)
do_delete_pass();
if (delete_during == 2) {
if (delete_before && !solo_file && cur_flist->used > 0)
do_delete_pass();
if (delete_during == 2) {
-@@ -219
2,7 +2356
,7 @@ void generate_files(int f_out, const char *local_name)
+@@ -219
5,7 +2359
,7 @@ void generate_files(int f_out, const char *local_name)
}
do_progress = 0;
}
do_progress = 0;
@@
-520,7
+520,7
@@
diff --git a/generator.c b/generator.c
whole_file = 0;
if (verbose >= 2) {
rprintf(FINFO, "delta-transmission %s\n",
whole_file = 0;
if (verbose >= 2) {
rprintf(FINFO, "delta-transmission %s\n",
-@@ -223
4,7 +2398
,7 @@ void generate_files(int f_out, const char *local_name)
+@@ -223
7,7 +2401
,7 @@ void generate_files(int f_out, const char *local_name)
dirdev = MAKEDEV(DEV_MAJOR(devp), DEV_MINOR(devp));
} else
dirdev = MAKEDEV(0, 0);
dirdev = MAKEDEV(DEV_MAJOR(devp), DEV_MINOR(devp));
} else
dirdev = MAKEDEV(0, 0);
@@
-529,7
+529,7
@@
diff --git a/generator.c b/generator.c
} else
change_local_filter_dir(fbuf, strlen(fbuf), F_DEPTH(fp));
}
} else
change_local_filter_dir(fbuf, strlen(fbuf), F_DEPTH(fp));
}
-@@ -22
78,7 +2442
,21 @@ void generate_files(int f_out, const char *local_name)
+@@ -22
84,7 +2448
,21 @@ void generate_files(int f_out, const char *local_name)
} while ((cur_flist = cur_flist->next) != NULL);
if (delete_during)
} while ((cur_flist = cur_flist->next) != NULL);
if (delete_during)
@@
-596,7
+596,7
@@
diff --git a/options.c b/options.c
delay_updates ? "delay-updates" : "partial-dir");
return 0;
}
delay_updates ? "delay-updates" : "partial-dir");
return 0;
}
-@@ -19
45,6 +1949
,8 @@ void server_options(char **args, int *argc_p)
+@@ -19
51,6 +1955
,8 @@ void server_options(char **args, int *argc_p)
args[ac++] = "--super";
if (size_only)
args[ac++] = "--size-only";
args[ac++] = "--super";
if (size_only)
args[ac++] = "--size-only";
diff --git
a/downdate.diff
b/downdate.diff
index
ef1e2a6
..
5e790f4
100644
(file)
--- a/
downdate.diff
+++ b/
downdate.diff
@@
-32,7
+32,7
@@
diff --git a/generator.c b/generator.c
fnamecmp = fname;
fnamecmp_type = FNAMECMP_FNAME;
fnamecmp = fname;
fnamecmp_type = FNAMECMP_FNAME;
-@@ -209
2,6 +2100
,7 @@ void check_for_finished_files(int itemizing, enum logcode code, int check_redo)
+@@ -209
5,6 +2103
,7 @@ void check_for_finished_files(int itemizing, enum logcode code, int check_redo)
ignore_existing = -ignore_existing;
ignore_non_existing = -ignore_non_existing;
update_only = -update_only;
ignore_existing = -ignore_existing;
ignore_non_existing = -ignore_non_existing;
update_only = -update_only;
@@
-40,7
+40,7
@@
diff --git a/generator.c b/generator.c
always_checksum = -always_checksum;
size_only = -size_only;
append_mode = -append_mode;
always_checksum = -always_checksum;
size_only = -size_only;
append_mode = -append_mode;
-@@ -21
17,6 +2126
,7 @@ void check_for_finished_files(int itemizing, enum logcode code, int check_redo)
+@@ -21
20,6 +2129
,7 @@ void check_for_finished_files(int itemizing, enum logcode code, int check_redo)
ignore_existing = -ignore_existing;
ignore_non_existing = -ignore_non_existing;
update_only = -update_only;
ignore_existing = -ignore_existing;
ignore_non_existing = -ignore_non_existing;
update_only = -update_only;
diff --git
a/drop-cache.diff
b/drop-cache.diff
index
14fd1b0
..
8cdebe8
100644
(file)
--- a/
drop-cache.diff
+++ b/
drop-cache.diff
@@
-56,7
+56,7
@@
You can get the latest edition of the patch from
cheers
tobi
cheers
tobi
-Changes:
+Changes:
2007-04-23
2007-04-23
@@
-365,12
+365,12
@@
diff --git a/util.c b/util.c
+ fadv_fd_init_func();
+ fadv_close_buffer_size += pos - fadv_fd_pos[fd];
+ fadv_close_ring[fadv_close_ring_head] = newfd;
+ fadv_fd_init_func();
+ fadv_close_buffer_size += pos - fadv_fd_pos[fd];
+ fadv_close_ring[fadv_close_ring_head] = newfd;
-+ fadv_close_ring_head = (fadv_close_ring_head + 1) % fadv_max_fd;
++ fadv_close_ring_head = (fadv_close_ring_head + 1) % fadv_max_fd;
+ fadv_close_ring_size ++;
+ if (fadv_close_ring_size == fadv_max_fd || fadv_close_buffer_size > 1024*1024 ){
+ /* it seems fastest to drop things 'in groups' */
+ fadv_close_all();
+ fadv_close_ring_size ++;
+ if (fadv_close_ring_size == fadv_max_fd || fadv_close_buffer_size > 1024*1024 ){
+ /* it seems fastest to drop things 'in groups' */
+ fadv_close_all();
-+ }
++ }
+ }
+ return close(fd);
+}
+ }
+ return close(fd);
+}
diff --git
a/fileflags.diff
b/fileflags.diff
index
6cff063
..
93f7047
100644
(file)
--- a/
fileflags.diff
+++ b/
fileflags.diff
@@
-303,9
+303,9
@@
diff --git a/generator.c b/generator.c
+ if (force_change && F_FFLAGS(file) & force_change)
+ undo_make_mutable(fname, F_FFLAGS(file));
+#endif
+ if (force_change && F_FFLAGS(file) & force_change)
+ undo_make_mutable(fname, F_FFLAGS(file));
+#endif
- if (
allowed_lull && !(counter % lull_mod))
- maybe_send_keepalive();
- else if (!(counter & 0xFF))
+ if (
counter >= loopchk_limit) {
+ if (allowed_lull)
+ maybe_send_keepalive();
diff --git a/log.c b/log.c
--- a/log.c
+++ b/log.c
diff --git a/log.c b/log.c
--- a/log.c
+++ b/log.c
@@
-416,7
+416,7
@@
diff --git a/options.c b/options.c
{"ignore-errors", 0, POPT_ARG_VAL, &ignore_errors, 1, 0, 0 },
{"no-ignore-errors", 0, POPT_ARG_VAL, &ignore_errors, 0, 0, 0 },
{"max-delete", 0, POPT_ARG_INT, &max_delete, 0, 0, 0 },
{"ignore-errors", 0, POPT_ARG_VAL, &ignore_errors, 1, 0, 0 },
{"no-ignore-errors", 0, POPT_ARG_VAL, &ignore_errors, 0, 0, 0 },
{"max-delete", 0, POPT_ARG_INT, &max_delete, 0, 0, 0 },
-@@ -185
2,6 +1878
,9 @@ void server_options(char **args, int *argc_p)
+@@ -185
8,6 +1884
,9 @@ void server_options(char **args, int *argc_p)
if (xfer_dirs && !recurse && delete_mode && am_sender)
args[ac++] = "--no-r";
if (xfer_dirs && !recurse && delete_mode && am_sender)
args[ac++] = "--no-r";
@@
-426,7
+426,7
@@
diff --git a/options.c b/options.c
if (do_compression && def_compress_level != Z_DEFAULT_COMPRESSION) {
if (asprintf(&arg, "--compress-level=%d", def_compress_level) < 0)
goto oom;
if (do_compression && def_compress_level != Z_DEFAULT_COMPRESSION) {
if (asprintf(&arg, "--compress-level=%d", def_compress_level) < 0)
goto oom;
-@@ -19
39,6 +1968
,16 @@ void server_options(char **args, int *argc_p)
+@@ -19
45,6 +1974
,16 @@ void server_options(char **args, int *argc_p)
args[ac++] = "--delete-excluded";
if (force_delete)
args[ac++] = "--force";
args[ac++] = "--delete-excluded";
if (force_delete)
args[ac++] = "--force";
@@
-1060,7
+1060,7
@@
diff --git a/xattrs.c b/xattrs.c
if (rsync_xal_get(fname, sxp->xattr) < 0) {
free_xattr(sxp);
return -1;
if (rsync_xal_get(fname, sxp->xattr) < 0) {
free_xattr(sxp);
return -1;
-@@ -86
1,6 +865
,11 @@ int set_xattr(const char *fname, const struct file_struct *file,
+@@ -86
4,6 +868
,11 @@ int set_xattr(const char *fname, const struct file_struct *file,
return -1;
}
return -1;
}
@@
-1072,7
+1072,7
@@
diff --git a/xattrs.c b/xattrs.c
ndx = F_XATTR(file);
return rsync_xal_set(fname, lst + ndx, fnamecmp, sxp);
}
ndx = F_XATTR(file);
return rsync_xal_set(fname, lst + ndx, fnamecmp, sxp);
}
-@@ -9
77,7 +986
,7 @@ int set_stat_xattr(const char *fname, struct file_struct *file, mode_t new_mode)
+@@ -9
80,7 +989
,7 @@ int set_stat_xattr(const char *fname, struct file_struct *file, mode_t new_mode)
mode = (fst.st_mode & _S_IFMT) | (fmode & ACCESSPERMS)
| (S_ISDIR(fst.st_mode) ? 0700 : 0600);
if (fst.st_mode != mode)
mode = (fst.st_mode & _S_IFMT) | (fmode & ACCESSPERMS)
| (S_ISDIR(fst.st_mode) ? 0700 : 0600);
if (fst.st_mode != mode)
diff --git
a/fsync.diff
b/fsync.diff
index
7ac11f5
..
c030199
100644
(file)
--- a/
fsync.diff
+++ b/
fsync.diff
@@
-34,7
+34,7
@@
diff --git a/options.c b/options.c
{"rsh", 'e', POPT_ARG_STRING, &shell_cmd, 0, 0, 0 },
{"rsync-path", 0, POPT_ARG_STRING, &rsync_path, 0, 0, 0 },
{"temp-dir", 'T', POPT_ARG_STRING, &tmpdir, 0, 0, 0 },
{"rsh", 'e', POPT_ARG_STRING, &shell_cmd, 0, 0, 0 },
{"rsync-path", 0, POPT_ARG_STRING, &rsync_path, 0, 0, 0 },
{"temp-dir", 'T', POPT_ARG_STRING, &tmpdir, 0, 0, 0 },
-@@ -200
3,6 +2006
,9 @@ void server_options(char **args, int *argc_p)
+@@ -200
9,6 +2012
,9 @@ void server_options(char **args, int *argc_p)
args[ac++] = tmpdir;
}
args[ac++] = tmpdir;
}
diff --git
a/ignore-case.diff
b/ignore-case.diff
index
903ddc4
..
b9f3825
100644
(file)
--- a/
ignore-case.diff
+++ b/
ignore-case.diff
@@
-236,7
+236,7
@@
diff --git a/options.c b/options.c
{"files-from", 0, POPT_ARG_STRING, &files_from, 0, 0, 0 },
{"from0", '0', POPT_ARG_VAL, &eol_nulls, 1, 0, 0},
{"no-from0", 0, POPT_ARG_VAL, &eol_nulls, 0, 0, 0},
{"files-from", 0, POPT_ARG_STRING, &files_from, 0, 0, 0 },
{"from0", '0', POPT_ARG_VAL, &eol_nulls, 1, 0, 0},
{"no-from0", 0, POPT_ARG_VAL, &eol_nulls, 0, 0, 0},
-@@ -19
65,6 +1969
,9 @@ void server_options(char **args, int *argc_p)
+@@ -19
71,6 +1975
,9 @@ void server_options(char **args, int *argc_p)
args[ac++] = arg;
}
args[ac++] = arg;
}
diff --git
a/link-by-hash.diff
b/link-by-hash.diff
index
65416a1
..
14db3e9
100644
(file)
--- a/
link-by-hash.diff
+++ b/
link-by-hash.diff
@@
-443,7
+443,7
@@
diff --git a/options.c b/options.c
default:
/* A large opt value means that set_refuse_options()
* turned this option off. */
default:
/* A large opt value means that set_refuse_options()
* turned this option off. */
-@@ -202
3,6 +2041
,11 @@ void server_options(char **args, int *argc_p)
+@@ -202
8,6 +2046
,11 @@ void server_options(char **args, int *argc_p)
} else if (inplace)
args[ac++] = "--inplace";
} else if (inplace)
args[ac++] = "--inplace";
diff --git
a/openssl-support.diff
b/openssl-support.diff
index
f08f48f
..
2b51359
100644
(file)
--- a/
openssl-support.diff
+++ b/
openssl-support.diff
@@
-393,7
+393,7
@@
diff --git a/options.c b/options.c
if (inplace) {
#ifdef HAVE_FTRUNCATE
if (partial_dir) {
if (inplace) {
#ifdef HAVE_FTRUNCATE
if (partial_dir) {
-@@ -20
67,10 +2141
,27 @@ char *check_for_hostspec(char *s, char **host_ptr, int *port_ptr)
+@@ -20
72,10 +2146
,27 @@ char *check_for_hostspec(char *s, char **host_ptr, int *port_ptr)
char *p;
int not_host;
int hostlen;
char *p;
int not_host;
int hostlen;
@@
-453,7
+453,7
@@
new file mode 100644
+++ b/ssl.c
@@ -0,0 +1,370 @@
+/* -*- c-file-style: "linux" -*-
+++ b/ssl.c
@@ -0,0 +1,370 @@
+/* -*- c-file-style: "linux" -*-
-+ * ssl.c: operations for negotiating SSL rsync connections.
++ * ssl.c: operations for negotiating SSL rsync connections.
+ *
+ * Copyright (C) 2003 Casey Marshall <rsdio@metastatic.org>
+ *
+ *
+ * Copyright (C) 2003 Casey Marshall <rsdio@metastatic.org>
+ *
@@
-461,12
+461,12
@@
new file mode 100644
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
-+ *
++ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
-+ *
++ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
diff --git
a/osx-xattr-nodev.diff
b/osx-xattr-nodev.diff
index
3b87663
..
9a82005
100644
(file)
--- a/
osx-xattr-nodev.diff
+++ b/
osx-xattr-nodev.diff
@@
-33,7
+33,7
@@
diff --git a/xattrs.c b/xattrs.c
if (rsync_xal_get(fname, sxp->xattr) < 0) {
free_xattr(sxp);
return -1;
if (rsync_xal_get(fname, sxp->xattr) < 0) {
free_xattr(sxp);
return -1;
-@@ -86
1,6 +865
,11 @@ int set_xattr(const char *fname, const struct file_struct *file,
+@@ -86
4,6 +868
,11 @@ int set_xattr(const char *fname, const struct file_struct *file,
return -1;
}
return -1;
}
diff --git
a/preallocate.diff
b/preallocate.diff
index
7a91b78
..
41f4429
100644
(file)
--- a/
preallocate.diff
+++ b/
preallocate.diff
@@
-139,7
+139,7
@@
diff --git a/options.c b/options.c
{"inplace", 0, POPT_ARG_VAL, &inplace, 1, 0, 0 },
{"no-inplace", 0, POPT_ARG_VAL, &inplace, 0, 0, 0 },
{"append", 0, POPT_ARG_NONE, 0, OPT_APPEND, 0, 0 },
{"inplace", 0, POPT_ARG_VAL, &inplace, 1, 0, 0 },
{"no-inplace", 0, POPT_ARG_VAL, &inplace, 0, 0, 0 },
{"append", 0, POPT_ARG_NONE, 0, OPT_APPEND, 0, 0 },
-@@ -20
48,6 +2057
,9 @@ void server_options(char **args, int *argc_p)
+@@ -20
53,6 +2062
,9 @@ void server_options(char **args, int *argc_p)
else if (remove_source_files)
args[ac++] = "--remove-sent-files";
else if (remove_source_files)
args[ac++] = "--remove-sent-files";
diff --git
a/remote-option.diff
b/remote-option.diff
index
481361a
..
cc1ccc1
100644
(file)
--- a/
remote-option.diff
+++ b/
remote-option.diff
@@
-52,7
+52,7
@@
diff --git a/options.c b/options.c
+ "Remote option must start with a dash: %s\n", arg);
+ return 0;
+ }
+ "Remote option must start with a dash: %s\n", arg);
+ return 0;
+ }
-+ if (remote_option_cnt+
3 >
remote_option_alloc) {
++ if (remote_option_cnt+
2 >=
remote_option_alloc) {
+ remote_option_alloc += 16;
+ remote_options = realloc_array(remote_options,
+ const char *, remote_option_alloc);
+ remote_option_alloc += 16;
+ remote_options = realloc_array(remote_options,
+ const char *, remote_option_alloc);
@@
-68,8
+68,8
@@
diff --git a/options.c b/options.c
case OPT_WRITE_BATCH:
/* batch_name is already set */
write_batch = 1;
case OPT_WRITE_BATCH:
/* batch_name is already set */
write_batch = 1;
-@@ -18
26,6 +1852
,11 @@ void server_options(char **args, int *argc_p)
- #endif
+@@ -18
32,6 +1858
,11 @@ void server_options(char **args, int *argc_p)
+
argstr[x] = '\0';
+ if (x > (int)sizeof argstr) { /* Not possible... */
argstr[x] = '\0';
+ if (x > (int)sizeof argstr) { /* Not possible... */
@@
-80,7
+80,7
@@
diff --git a/options.c b/options.c
args[ac++] = argstr;
#ifdef ICONV_OPTION
args[ac++] = argstr;
#ifdef ICONV_OPTION
-@@ -20
48,6 +2079
,21 @@ void server_options(char **args, int *argc_p)
+@@ -20
53,6 +2084
,21 @@ void server_options(char **args, int *argc_p)
else if (remove_source_files)
args[ac++] = "--remove-sent-files";
else if (remove_source_files)
args[ac++] = "--remove-sent-files";
diff --git
a/source-backup.diff
b/source-backup.diff
index
ea5fbde
..
ecd813d
100644
(file)
--- a/
source-backup.diff
+++ b/
source-backup.diff
@@
-36,7
+36,7
@@
diff --git a/options.c b/options.c
{"no-backup", 0, POPT_ARG_VAL, &make_backups, 0, 0, 0 },
{"backup-dir", 0, POPT_ARG_STRING, &backup_dir, 0, 0, 0 },
{"suffix", 0, POPT_ARG_STRING, &backup_suffix, 0, 0, 0 },
{"no-backup", 0, POPT_ARG_VAL, &make_backups, 0, 0, 0 },
{"backup-dir", 0, POPT_ARG_STRING, &backup_dir, 0, 0, 0 },
{"suffix", 0, POPT_ARG_STRING, &backup_suffix, 0, 0, 0 },
-@@ -195
1,6 +1954
,8 @@ void server_options(char **args, int *argc_p)
+@@ -195
7,6 +1960
,8 @@ void server_options(char **args, int *argc_p)
goto oom;
args[ac++] = arg;
}
goto oom;
args[ac++] = arg;
}
diff --git
a/source-filter_dest-filter.diff
b/source-filter_dest-filter.diff
index
d64909b
..
de0410b
100644
(file)
--- a/
source-filter_dest-filter.diff
+++ b/
source-filter_dest-filter.diff
@@
-133,7
+133,7
@@
diff --git a/options.c b/options.c
if (files_from) {
char *h, *p;
int q;
if (files_from) {
char *h, *p;
int q;
-@@ -195
3,6 +1972
,25 @@ void server_options(char **args, int *argc_p)
+@@ -195
9,6 +1978
,25 @@ void server_options(char **args, int *argc_p)
}
}
}
}
@@
-171,7
+171,7
@@
diff --git a/pipe.c b/pipe.c
+{
+ pid_t pid;
+ int pipefds[2];
+{
+ pid_t pid;
+ int pipefds[2];
-+
++
+ if (verbose >= 2)
+ print_child_argv("opening connection using:", command);
+
+ if (verbose >= 2)
+ print_child_argv("opening connection using:", command);
+
@@
-215,7
+215,7
@@
diff --git a/pipe.c b/pipe.c
+pid_t run_filter_on_file(char *command[], int out, int in)
+{
+ pid_t pid;
+pid_t run_filter_on_file(char *command[], int out, int in)
+{
+ pid_t pid;
-+
++
+ if (verbose >= 2)
+ print_child_argv("opening connection using:", command);
+
+ if (verbose >= 2)
+ print_child_argv("opening connection using:", command);
+
diff --git
a/sparse-block.diff
b/sparse-block.diff
index
12b5569
..
27fa9b1
100644
(file)
--- a/
sparse-block.diff
+++ b/
sparse-block.diff
@@
-65,7
+65,7
@@
diff --git a/options.c b/options.c
{"inplace", 0, POPT_ARG_VAL, &inplace, 1, 0, 0 },
{"no-inplace", 0, POPT_ARG_VAL, &inplace, 0, 0, 0 },
{"append", 0, POPT_ARG_NONE, 0, OPT_APPEND, 0, 0 },
{"inplace", 0, POPT_ARG_VAL, &inplace, 1, 0, 0 },
{"no-inplace", 0, POPT_ARG_VAL, &inplace, 0, 0, 0 },
{"append", 0, POPT_ARG_NONE, 0, OPT_APPEND, 0, 0 },
-@@ -18
85,6 +1888
,12 @@ void server_options(char **args, int *argc_p)
+@@ -18
91,6 +1894
,12 @@ void server_options(char **args, int *argc_p)
args[ac++] = arg;
}
args[ac++] = arg;
}
diff --git
a/time-limit.diff
b/time-limit.diff
index
23a5769
..
5226710
100644
(file)
--- a/
time-limit.diff
+++ b/
time-limit.diff
@@
-123,7
+123,7
@@
diff --git a/options.c b/options.c
default:
/* A large opt value means that set_refuse_options()
* turned this option off. */
default:
/* A large opt value means that set_refuse_options()
* turned this option off. */
-@@ -1
897,6 +1932
,15 @@ void server_options(char **args, int *argc_p)
+@@ -1
903,6 +1938
,15 @@ void server_options(char **args, int *argc_p)
args[ac++] = arg;
}
args[ac++] = arg;
}
diff --git
a/transliterate.diff
b/transliterate.diff
index
f12cf5f
..
845317a
100644
(file)
--- a/
transliterate.diff
+++ b/
transliterate.diff
@@
-121,7
+121,7
@@
diff --git a/options.c b/options.c
am_starting_up = 0;
return 1;
am_starting_up = 0;
return 1;
-@@ -20
48,6 +2077
,12 @@ void server_options(char **args, int *argc_p)
+@@ -20
53,6 +2082
,12 @@ void server_options(char **args, int *argc_p)
else if (remove_source_files)
args[ac++] = "--remove-sent-files";
else if (remove_source_files)
args[ac++] = "--remove-sent-files";