git.samba.org
/
rsync.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
4afcb70
)
Reject attempts to combine --sparse with --inplace.
author
Wayne Davison
<wayned@samba.org>
Tue, 30 Aug 2005 02:57:19 +0000
(
02:57
+0000)
committer
Wayne Davison
<wayned@samba.org>
Tue, 30 Aug 2005 02:57:19 +0000
(
02:57
+0000)
options.c
patch
|
blob
|
history
diff --git
a/options.c
b/options.c
index cb721d6a1280f35eebcd7656a8cf63b4087f7d41..aa231f7ff6b81c52813942234cc58d045bdfa08e 100644
(file)
--- a/
options.c
+++ b/
options.c
@@
-1159,6
+1159,14
@@
int parse_arguments(int *argc, const char ***argv, int frommain)
bwlimit_writemax = 512;
}
+ if (sparse_files && inplace) {
+ /* Note: we don't check for this below, because --update is
+ * OK with --sparse (as long as redos are handled right). */
+ snprintf(err_buf, sizeof err_buf,
+ "--sparse cannot be used with --inplace\n");
+ return 0;
+ }
+
if (append_mode) {
if (whole_file > 0) {
snprintf(err_buf, sizeof err_buf,