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 (parent:
36ae7f0
)
The client shouldn't send the --backup-dir-dels option to the server
author
Wayne Davison
<wayned@samba.org>
Mon, 5 Dec 2005 16:19:51 +0000
(16:19 +0000)
committer
Wayne Davison
<wayned@samba.org>
Mon, 5 Dec 2005 16:19:51 +0000
(16:19 +0000)
if the user didn't actually specify it.
backup-dir-dels.diff
patch
|
blob
|
blame
|
history
diff --git
a/backup-dir-dels.diff
b/backup-dir-dels.diff
index
6248f47
..
5592699
100644
(file)
--- a/
backup-dir-dels.diff
+++ b/
backup-dir-dels.diff
@@
-157,7
+157,7
@@
Marc St-Onge
else
ok = do_rmdir(fname) == 0;
if (ok) {
else
ok = do_rmdir(fname) == 0;
if (ok) {
---- orig/options.c 2005-11-15
07:01:03
+--- orig/options.c 2005-11-15
18:21:22
+++ options.c 2005-11-07 04:35:54
@@ -132,10 +132,14 @@ int no_detach
int write_batch = 0;
+++ options.c 2005-11-07 04:35:54
@@ -132,10 +132,14 @@ int no_detach
int write_batch = 0;
@@
-203,7
+203,7
@@
Marc St-Onge
{"list-only", 0, POPT_ARG_VAL, &list_only, 2, 0, 0 },
{"read-batch", 0, POPT_ARG_STRING, &batch_name, OPT_READ_BATCH, 0, 0 },
{"write-batch", 0, POPT_ARG_STRING, &batch_name, OPT_WRITE_BATCH, 0, 0 },
{"list-only", 0, POPT_ARG_VAL, &list_only, 2, 0, 0 },
{"read-batch", 0, POPT_ARG_STRING, &batch_name, OPT_READ_BATCH, 0, 0 },
{"write-batch", 0, POPT_ARG_STRING, &batch_name, OPT_WRITE_BATCH, 0, 0 },
-@@ -11
39,6 +1149
,8 @@ int parse_arguments(int *argc, const cha
+@@ -11
42,6 +1152
,8 @@ int parse_arguments(int *argc, const cha
partial_dir = sanitize_path(NULL, partial_dir, NULL, 0);
if (backup_dir)
backup_dir = sanitize_path(NULL, backup_dir, NULL, 0);
partial_dir = sanitize_path(NULL, partial_dir, NULL, 0);
if (backup_dir)
backup_dir = sanitize_path(NULL, backup_dir, NULL, 0);
@@
-212,7
+212,7
@@
Marc St-Onge
}
if (server_filter_list.head && !am_sender) {
struct filter_list_struct *elp = &server_filter_list;
}
if (server_filter_list.head && !am_sender) {
struct filter_list_struct *elp = &server_filter_list;
-@@ -117
3,6 +1185
,14 @@ int parse_arguments(int *argc, const cha
+@@ -117
6,6 +1188
,14 @@ int parse_arguments(int *argc, const cha
return 0;
}
}
return 0;
}
}
@@
-227,7
+227,7
@@
Marc St-Onge
}
if (!backup_suffix)
}
if (!backup_suffix)
-@@ -118
4,6 +1204
,16 @@ int parse_arguments(int *argc, const cha
+@@ -118
7,6 +1207
,16 @@ int parse_arguments(int *argc, const cha
backup_suffix);
return 0;
}
backup_suffix);
return 0;
}
@@
-244,7
+244,7
@@
Marc St-Onge
if (backup_dir) {
backup_dir_len = strlcpy(backup_dir_buf, backup_dir, sizeof backup_dir_buf);
backup_dir_remainder = sizeof backup_dir_buf - backup_dir_len;
if (backup_dir) {
backup_dir_len = strlcpy(backup_dir_buf, backup_dir, sizeof backup_dir_buf);
backup_dir_remainder = sizeof backup_dir_buf - backup_dir_len;
-@@ -120
5,6 +1235
,31 @@ int parse_arguments(int *argc, const cha
+@@ -120
8,6 +1238
,31 @@ int parse_arguments(int *argc, const cha
"--suffix cannot be a null string without --backup-dir\n");
return 0;
}
"--suffix cannot be a null string without --backup-dir\n");
return 0;
}
@@
-276,18
+276,18
@@
Marc St-Onge
if (make_backups && !backup_dir)
omit_dir_times = 1;
if (make_backups && !backup_dir)
omit_dir_times = 1;
-@@ -15
27,6 +1582
,10 @@ void server_options(char **args,int *arg
+@@ -15
30,6 +1585
,10 @@ void server_options(char **args,int *arg
args[ac++] = "--backup-dir";
args[ac++] = backup_dir;
}
args[ac++] = "--backup-dir";
args[ac++] = backup_dir;
}
-+ if (backup_dir_dels) {
++ if (backup_dir_dels
&& backup_dir_dels != backup_dir
) {
+ args[ac++] = "--backup-dir-dels";
+ args[ac++] = backup_dir_dels;
+ }
/* Only send --suffix if it specifies a non-default value. */
if (strcmp(backup_suffix, backup_dir ? "" : BACKUP_SUFFIX) != 0) {
+ args[ac++] = "--backup-dir-dels";
+ args[ac++] = backup_dir_dels;
+ }
/* Only send --suffix if it specifies a non-default value. */
if (strcmp(backup_suffix, backup_dir ? "" : BACKUP_SUFFIX) != 0) {
-@@ -153
5,7 +1594
,13 @@ void server_options(char **args,int *arg
+@@ -153
8,7 +1597
,13 @@ void server_options(char **args,int *arg
goto oom;
args[ac++] = arg;
}
goto oom;
args[ac++] = arg;
}