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:
6eba67e
)
Updated to work once more (using the new file_struct idioms).
author
Wayne Davison
<wayned@samba.org>
Sun, 17 Dec 2006 02:29:19 +0000
(
02:29
+0000)
committer
Wayne Davison
<wayned@samba.org>
Sun, 17 Dec 2006 02:29:19 +0000
(
02:29
+0000)
detect-renamed.diff
patch
|
blob
|
blame
|
history
diff --git
a/detect-renamed.diff
b/detect-renamed.diff
index
247be0c
..
d700d57
100644
(file)
--- a/
detect-renamed.diff
+++ b/
detect-renamed.diff
@@
-34,7
+34,7
@@
TODO:
--- old/flist.c
+++ new/flist.c
--- old/flist.c
+++ new/flist.c
-@@ -5
4,6 +54
,7 @@ extern int non_perishable_cnt;
+@@ -5
5,6 +55
,7 @@ extern int non_perishable_cnt;
extern int prune_empty_dirs;
extern int copy_links;
extern int copy_unsafe_links;
extern int prune_empty_dirs;
extern int copy_links;
extern int copy_unsafe_links;
@@
-42,16
+42,16
@@
TODO:
extern int protocol_version;
extern int sanitize_paths;
extern struct stats stats;
extern int protocol_version;
extern int sanitize_paths;
extern struct stats stats;
-@@ -80,6 +81,8 @@ static
struct idev tmp_idev
;
+@@ -80,6 +81,8 @@ static
int64 tmp_dev, tmp_ino
;
#endif
static char tmp_sum[MD4_SUM_LENGTH];
+struct file_list the_fattr_list;
+
static char empty_sum[MD4_SUM_LENGTH];
#endif
static char tmp_sum[MD4_SUM_LENGTH];
+struct file_list the_fattr_list;
+
static char empty_sum[MD4_SUM_LENGTH];
- static int flist_count_offset;
+ static int flist_count_offset;
/* for --delete --progress */
-@@ -262,6 +265,4
4
@@ static mode_t from_wire_mode(int mode)
+@@ -262,6 +265,4
5
@@ static mode_t from_wire_mode(int mode)
return mode;
}
return mode;
}
@@
-59,19
+59,20
@@
TODO:
+{
+ struct file_struct *f1 = *file1;
+ struct file_struct *f2 = *file2;
+{
+ struct file_struct *f1 = *file1;
+ struct file_struct *f2 = *file2;
++ int64 len1 = F_LENGTH(f1), len2 = F_LENGTH(f2);
+ int diff;
+
+ int diff;
+
-+ if (!f1->basename || !S_ISREG(f1->mode) || !
f1->length
) {
-+ if (!f2->basename || !S_ISREG(f2->mode) || !
f2->length
)
++ if (!f1->basename || !S_ISREG(f1->mode) || !
len1
) {
++ if (!f2->basename || !S_ISREG(f2->mode) || !
len2
)
+ return 0;
+ return 1;
+ }
+ return 0;
+ return 1;
+ }
-+ if (!f2->basename || !S_ISREG(f2->mode) || !
f2->length
)
++ if (!f2->basename || !S_ISREG(f2->mode) || !
len2
)
+ return -1;
+
+ /* Don't use diff for values that are longer than an int. */
+ return -1;
+
+ /* Don't use diff for values that are longer than an int. */
-+ if (
f1->length != f2->length
)
-+ return
f1->length < f2->length
? -1 : 1;
++ if (
len1 != len2
)
++ return
len1 < len2
? -1 : 1;
+
+ if (always_checksum) {
+ diff = u_memcmp(F_SUM(f1), F_SUM(f2), checksum_len);
+
+ if (always_checksum) {
+ diff = u_memcmp(F_SUM(f1), F_SUM(f2), checksum_len);
@@
-96,7
+97,7
@@
TODO:
static void send_directory(int f, struct file_list *flist,
char *fbuf, int len);
static void send_directory(int f, struct file_list *flist,
char *fbuf, int len);
-@@ -1
414,6 +1455
,25 @@ struct file_list *recv_file_list(int f)
+@@ -1
501,6 +1543
,25 @@ struct file_list *recv_file_list(int f)
clean_flist(flist, relative_paths, 1);
clean_flist(flist, relative_paths, 1);
@@
-113,7
+114,7
@@
TODO:
+ the_fattr_list.low = 0;
+ while (j-- > 0) {
+ struct file_struct *fp = the_fattr_list.files[j];
+ the_fattr_list.low = 0;
+ while (j-- > 0) {
+ struct file_struct *fp = the_fattr_list.files[j];
-+ if (fp->basename && S_ISREG(fp->mode) &&
fp->length
)
++ if (fp->basename && S_ISREG(fp->mode) &&
F_LENGTH(fp)
)
+ break;
+ }
+ the_fattr_list.high = j;
+ break;
+ }
+ the_fattr_list.high = j;
@@
-156,7
+157,7
@@
TODO:
#define DEL_RECURSE (1<<1) /* recurse */
#define DEL_DIR_IS_EMPTY (1<<2) /* internal delete_FUNCTIONS use only */
#define DEL_RECURSE (1<<1) /* recurse */
#define DEL_DIR_IS_EMPTY (1<<2) /* internal delete_FUNCTIONS use only */
-@@ -125,11 +129,12
1
@@ static int is_backup_file(char *fn)
+@@ -125,11 +129,12
0
@@ static int is_backup_file(char *fn)
return k > 0 && strcmp(fn+k, backup_suffix) == 0;
}
return k > 0 && strcmp(fn+k, backup_suffix) == 0;
}
@@
-164,7
+165,7
@@
TODO:
+ * time (plus the basename, if possible) or (2) the size & checksum. If
+ * we find an exact match down to the dirname, return -1 because we found
+ * an up-to-date file in the transfer, not a renamed file. */
+ * time (plus the basename, if possible) or (2) the size & checksum. If
+ * we find an exact match down to the dirname, return -1 because we found
+ * an up-to-date file in the transfer, not a renamed file. */
-+static int fattr_find(struct file_struct *f, char *fname
, alloc_pool_t pool
)
++static int fattr_find(struct file_struct *f, char *fname)
+{
+ int low = the_fattr_list.low, high = the_fattr_list.high;
+ int mid, ok_match = -1, good_match = -1;
+{
+ int low = the_fattr_list.low, high = the_fattr_list.high;
+ int mid, ok_match = -1, good_match = -1;
@@
-174,22
+175,22
@@
TODO:
+ while (low <= high) {
+ mid = (low + high) / 2;
+ fmid = the_fattr_list.files[mid];
+ while (low <= high) {
+ mid = (low + high) / 2;
+ fmid = the_fattr_list.files[mid];
-+ if (
fmid->length != f->length
) {
-+ if (
fmid->length < f->length
)
++ if (
F_LENGTH(fmid) != F_LENGTH(f)
) {
++ if (
F_LENGTH(fmid) < F_LENGTH(f)
)
+ low = mid + 1;
+ else
+ high = mid - 1;
+ continue;
+ }
+ if (always_checksum) {
+ low = mid + 1;
+ else
+ high = mid - 1;
+ continue;
+ }
+ if (always_checksum) {
-+ if (!F_SUM(f)) {
++ /* We use the FLAG_SENT flag to indicate when we
++ * have computed the checksum for an entry. */
++ if (!(f->flags & FLAG_SENT)) {
+ if (fmid->modtime == f->modtime
+ && f_name_cmp(fmid, f) == 0)
+ return -1; /* assume we can't help */
+ if (fmid->modtime == f->modtime
+ && f_name_cmp(fmid, f) == 0)
+ return -1; /* assume we can't help */
-+ /* XXX update this to new checksum var idiom! */
-+ F_SUM(f) = pool_alloc(pool, MD4_SUM_LENGTH,
-+ "fattr_find");
-+ file_checksum(fname, F_SUM(f), f->length);
++ file_checksum(fname, (char*)F_SUM(f), F_LENGTH(f));
++ f->flags |= FLAG_SENT;
+ }
+ diff = u_memcmp(F_SUM(fmid), F_SUM(f), checksum_len);
+ if (diff) {
+ }
+ diff = u_memcmp(F_SUM(fmid), F_SUM(f), checksum_len);
+ if (diff) {
@@
-235,15
+236,14
@@
TODO:
+ return good_match >= 0 ? good_match : ok_match;
+}
+
+ return good_match >= 0 ? good_match : ok_match;
+}
+
-+static void look_for_rename(struct file_struct *file, char *fname,
-+ alloc_pool_t pool)
++static void look_for_rename(struct file_struct *file, char *fname)
+{
+ struct file_struct *fp;
+ char *partialptr, *fn;
+ STRUCT_STAT st;
+ int ndx;
+
+{
+ struct file_struct *fp;
+ char *partialptr, *fn;
+ STRUCT_STAT st;
+ int ndx;
+
-+ if ((ndx = fattr_find(file, fname
, pool
)) < 0)
++ if ((ndx = fattr_find(file, fname)) < 0)
+ return;
+
+ fp = the_fattr_list.files[ndx];
+ return;
+
+ fp = the_fattr_list.files[ndx];
@@
-278,7
+278,7
@@
TODO:
*/
static enum delret delete_item(char *fbuf, int mode, char *replace, int flags)
{
*/
static enum delret delete_item(char *fbuf, int mode, char *replace, int flags)
{
-@@ -151,6 +26
5
,8 @@ static enum delret delete_item(char *fbu
+@@ -151,6 +26
4
,8 @@ static enum delret delete_item(char *fbu
goto check_ret;
/* OK: try to delete the directory. */
}
goto check_ret;
/* OK: try to delete the directory. */
}
@@
-287,7
+287,7
@@
TODO:
if (!replace && max_delete >= 0 && ++deletion_count > max_delete)
return DR_AT_LIMIT;
if (!replace && max_delete >= 0 && ++deletion_count > max_delete)
return DR_AT_LIMIT;
-@@ -197,6 +31
3
,8 @@ static enum delret delete_item(char *fbu
+@@ -197,6 +31
2
,8 @@ static enum delret delete_item(char *fbu
* its contents, otherwise just checks for content. Returns DR_SUCCESS or
* DR_NOT_EMPTY. Note that fname must point to a MAXPATHLEN buffer! (The
* buffer is used for recursion, but returned unchanged.)
* its contents, otherwise just checks for content. Returns DR_SUCCESS or
* DR_NOT_EMPTY. Note that fname must point to a MAXPATHLEN buffer! (The
* buffer is used for recursion, but returned unchanged.)
@@
-296,16
+296,26
@@
TODO:
*/
static enum delret delete_dir_contents(char *fname, int flags)
{
*/
static enum delret delete_dir_contents(char *fname, int flags)
{
-@@ -253,6 +371,8 @@ static enum delret delete_dir_contents(c
+@@ -216,7 +333,9 @@ static enum delret delete_dir_contents(c
+ save_filters = push_local_filters(fname, dlen);
+
+ non_perishable_cnt = 0;
++ flist_extra_cnt += SUM_EXTRA_CNT;
+ dirlist = get_dirlist(fname, dlen, 0);
++ flist_extra_cnt -= SUM_EXTRA_CNT;
+ ret = non_perishable_cnt ? DR_NOT_EMPTY : DR_SUCCESS;
+
+ if (!dirlist->count)
+@@ -253,6 +372,8 @@ static enum delret delete_dir_contents(c
if (S_ISDIR(fp->mode)
&& delete_dir_contents(fname, flags | DEL_RECURSE) != DR_SUCCESS)
ret = DR_NOT_EMPTY;
+ if (detect_renamed && S_ISREG(fp->mode))
if (S_ISDIR(fp->mode)
&& delete_dir_contents(fname, flags | DEL_RECURSE) != DR_SUCCESS)
ret = DR_NOT_EMPTY;
+ if (detect_renamed && S_ISREG(fp->mode))
-+ look_for_rename(fp, fname
, dirlist->file_pool
);
++ look_for_rename(fp, fname);
if (delete_item(fname, fp->mode, NULL, flags) != DR_SUCCESS)
ret = DR_NOT_EMPTY;
}
if (delete_item(fname, fp->mode, NULL, flags) != DR_SUCCESS)
ret = DR_NOT_EMPTY;
}
-@@ -405,15 +52
5
,19 @@ static void do_delayed_deletions(char *d
+@@ -405,15 +52
6
,19 @@ static void do_delayed_deletions(char *d
* all the --delete-WHEN options. Note that the fbuf pointer must point to a
* MAXPATHLEN buffer with the name of the directory in it (the functions we
* call will append names onto the end, but the old dir value will be restored
* all the --delete-WHEN options. Note that the fbuf pointer must point to a
* MAXPATHLEN buffer with the name of the directory in it (the functions we
* call will append names onto the end, but the old dir value will be restored
@@
-328,7
+338,7
@@
TODO:
int dlen, i;
if (!flist) {
int dlen, i;
if (!flist) {
-@@ -427,6 +55
1
,8 @@ static void delete_in_dir(struct file_li
+@@ -427,6 +55
2
,8 @@ static void delete_in_dir(struct file_li
if (verbose > 2)
rprintf(FINFO, "delete_in_dir(%s)\n", fbuf);
if (verbose > 2)
rprintf(FINFO, "delete_in_dir(%s)\n", fbuf);
@@
-337,7
+347,7
@@
TODO:
if (allowed_lull)
maybe_send_keepalive();
if (allowed_lull)
maybe_send_keepalive();
-@@ -434,12 +56
0
,14 @@ static void delete_in_dir(struct file_li
+@@ -434,12 +56
1
,14 @@ static void delete_in_dir(struct file_li
return; /* Impossible... */
if (io_error && !(lp_ignore_errors(module_id) || ignore_errors)) {
return; /* Impossible... */
if (io_error && !(lp_ignore_errors(module_id) || ignore_errors)) {
@@
-356,8
+366,8
@@
TODO:
+ flags |= DEL_NO_DELETIONS;
}
+ flags |= DEL_NO_DELETIONS;
}
- while (cur_depth >=
file->dir.depth
&& cur_depth >= min_depth)
-@@ -450,6 +57
8
,9 @@ static void delete_in_dir(struct file_li
+ while (cur_depth >=
F_DEPTH(file)
&& cur_depth >= min_depth)
+@@ -450,6 +57
9
,9 @@ static void delete_in_dir(struct file_li
dlen = strlen(fbuf);
filt_array[cur_depth] = push_local_filters(fbuf, dlen);
dlen = strlen(fbuf);
filt_array[cur_depth] = push_local_filters(fbuf, dlen);
@@
-367,7
+377,7
@@
TODO:
if (one_file_system) {
if (file->flags & FLAG_TOP_DIR)
filesystem_dev = stp->st_dev;
if (one_file_system) {
if (file->flags & FLAG_TOP_DIR)
filesystem_dev = stp->st_dev;
-@@ -459,6 +59
0
,11 @@ static void delete_in_dir(struct file_li
+@@ -459,6 +59
1
,11 @@ static void delete_in_dir(struct file_li
dirlist = get_dirlist(fbuf, dlen, 0);
dirlist = get_dirlist(fbuf, dlen, 0);
@@
-379,18
+389,18
@@
TODO:
/* If an item in dirlist is not found in flist, delete it
* from the filesystem. */
for (i = dirlist->count; i--; ) {
/* If an item in dirlist is not found in flist, delete it
* from the filesystem. */
for (i = dirlist->count; i--; ) {
-@@ -471,16 +60
7
,23 @@ static void delete_in_dir(struct file_li
+@@ -471,16 +60
8
,23 @@ static void delete_in_dir(struct file_li
f_name(fp, NULL));
continue;
}
+ if (detect_renamed && S_ISREG(fp->mode)) {
+ strlcpy(p, fp->basename, remainder);
f_name(fp, NULL));
continue;
}
+ if (detect_renamed && S_ISREG(fp->mode)) {
+ strlcpy(p, fp->basename, remainder);
-+ look_for_rename(fp, fbuf
, dirlist->file_pool
);
++ look_for_rename(fp, fbuf);
+ }
if (flist_find(flist, fp) < 0) {
f_name(fp, delbuf);
- if (delete_during == 2) {
+ }
if (flist_find(flist, fp) < 0) {
f_name(fp, delbuf);
- if (delete_during == 2) {
-+
+
if (delete_during == 2 && !(flags & DEL_NO_DELETIONS)) {
++
if (delete_during == 2 && !(flags & DEL_NO_DELETIONS)) {
if (!remember_delete(fp, delbuf))
break;
} else
if (!remember_delete(fp, delbuf))
break;
} else
@@
-406,7
+416,7
@@
TODO:
flist_free(dirlist);
}
flist_free(dirlist);
}
-@@ -510,9 +65
3
,9 @@ static void do_delete_pass(struct file_l
+@@ -510,9 +65
4
,9 @@ static void do_delete_pass(struct file_l
|| !S_ISDIR(st.st_mode))
continue;
|| !S_ISDIR(st.st_mode))
continue;
@@
-418,7
+428,7
@@
TODO:
if (do_progress && !am_server)
rprintf(FINFO, " \r");
if (do_progress && !am_server)
rprintf(FINFO, " \r");
-@@ -104
8
,6 +1191,7 @@ static int try_dests_non(struct file_str
+@@ -104
7
,6 +1191,7 @@ static int try_dests_non(struct file_str
return j;
}
return j;
}
@@
-426,7
+436,7
@@
TODO:
static int phase = 0;
/* Acts on the_file_list->file's ndx'th item, whose name is fname. If a dir,
static int phase = 0;
/* Acts on the_file_list->file's ndx'th item, whose name is fname. If a dir,
-@@ -123
3
,8 +1377,12 @@ static void recv_generator(char *fname,
+@@ -123
2
,8 +1377,12 @@ static void recv_generator(char *fname,
if (real_ret != 0 && one_file_system)
real_st.st_dev = filesystem_dev;
if (delete_during && f_out != -1 && !phase && dry_run < 2
if (real_ret != 0 && one_file_system)
real_st.st_dev = filesystem_dev;
if (delete_during && f_out != -1 && !phase && dry_run < 2
@@
-441,14
+451,14
@@
TODO:
return;
}
return;
}
-@@ -149
8
,8 +1646,14 @@ static void recv_generator(char *fname,
- if (preserve_hard_links && F_
NOT_HLINK
_LAST(file))
+@@ -149
7
,8 +1646,14 @@ static void recv_generator(char *fname,
+ if (preserve_hard_links && F_
HLINK_NOT
_LAST(file))
return;
#endif
- if (stat_errno == ENOENT)
+ if (stat_errno == ENOENT) {
+ if (detect_renamed && unexplored_dirs > 0
return;
#endif
- if (stat_errno == ENOENT)
+ if (stat_errno == ENOENT) {
+ if (detect_renamed && unexplored_dirs > 0
-+ &&
file->length
) {
++ &&
F_LENGTH(file)
) {
+ bitbag_set_bit(delayed_bits, ndx);
+ return;
+ }
+ bitbag_set_bit(delayed_bits, ndx);
+ return;
+ }
@@
-457,7
+467,7
@@
TODO:
rsyserr(FERROR, stat_errno, "recv_generator: failed to stat %s",
full_fname(fname));
return;
rsyserr(FERROR, stat_errno, "recv_generator: failed to stat %s",
full_fname(fname));
return;
-@@ -16
91,6 +1845
,12 @@ void generate_files(int f_out, struct fi
+@@ -16
88,6 +1843
,12 @@ void generate_files(int f_out, struct fi
(long)getpid(), flist->count);
}
(long)getpid(), flist->count);
}
@@
-470,7
+480,7
@@
TODO:
if (delete_before && !local_name && flist->count > 0)
do_delete_pass(flist);
if (delete_during == 2) {
if (delete_before && !local_name && flist->count > 0)
do_delete_pass(flist);
if (delete_during == 2) {
-@@ -1
701,7 +1861
,7 @@ void generate_files(int f_out, struct fi
+@@ -1
698,7 +1859
,7 @@ void generate_files(int f_out, struct fi
}
do_progress = 0;
}
do_progress = 0;
@@
-479,7
+489,7
@@
TODO:
whole_file = 0;
if (verbose >= 2) {
rprintf(FINFO, "delta-transmission %s\n",
whole_file = 0;
if (verbose >= 2) {
rprintf(FINFO, "delta-transmission %s\n",
-@@ -175
7,7 +1917,23
@@ void generate_files(int f_out, struct fi
+@@ -175
4,7 +1915,22
@@ void generate_files(int f_out, struct fi
}
recv_generator(NULL, NULL, 0, 0, code, -1);
if (delete_during)
}
recv_generator(NULL, NULL, 0, 0, code, -1);
if (delete_during)
@@
-497,8
+507,7
@@
TODO:
+ strlcpy(fbuf, local_name, sizeof fbuf);
+ else
+ f_name(file, fbuf);
+ strlcpy(fbuf, local_name, sizeof fbuf);
+ else
+ f_name(file, fbuf);
-+ recv_generator(fbuf, file, i, itemizing,
-+ maybe_ATTRS_REPORT, code, f_out);
++ recv_generator(fbuf, file, i, itemizing, code, f_out);
+ }
+ }
+ }
+ }
@@
-514,7
+523,7
@@
TODO:
int numeric_ids = 0;
int allow_8bit_chars = 0;
int force_delete = 0;
int numeric_ids = 0;
int allow_8bit_chars = 0;
int force_delete = 0;
-@@ -34
3,6 +344
,7 @@ void usage(enum logcode F)
+@@ -34
2,6 +343
,7 @@ void usage(enum logcode F)
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");
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");
@@
-522,7
+531,7
@@
TODO:
rprintf(F," --compare-dest=DIR also compare destination files relative to DIR\n");
rprintf(F," --copy-dest=DIR ... and include copies of unchanged files\n");
rprintf(F," --link-dest=DIR hardlink to files in DIR when unchanged\n");
rprintf(F," --compare-dest=DIR also compare destination files relative to DIR\n");
rprintf(F," --copy-dest=DIR ... and include copies of unchanged files\n");
rprintf(F," --link-dest=DIR hardlink to files in DIR when unchanged\n");
-@@ -49
7,6 +499
,7 @@ static struct poptOption long_options[]
+@@ -49
6,6 +498
,7 @@ static struct poptOption long_options[]
{"compare-dest", 0, POPT_ARG_STRING, 0, OPT_COMPARE_DEST, 0, 0 },
{"copy-dest", 0, POPT_ARG_STRING, 0, OPT_COPY_DEST, 0, 0 },
{"link-dest", 0, POPT_ARG_STRING, 0, OPT_LINK_DEST, 0, 0 },
{"compare-dest", 0, POPT_ARG_STRING, 0, OPT_COMPARE_DEST, 0, 0 },
{"copy-dest", 0, POPT_ARG_STRING, 0, OPT_COPY_DEST, 0, 0 },
{"link-dest", 0, POPT_ARG_STRING, 0, OPT_LINK_DEST, 0, 0 },
@@
-530,7
+539,7
@@
TODO:
{"fuzzy", 'y', POPT_ARG_NONE, &fuzzy_basis, 0, 0, 0 },
{"compress", 'z', POPT_ARG_NONE, 0, 'z', 0, 0 },
{"compress-level", 0, POPT_ARG_INT, &def_compress_level, 'z', 0, 0 },
{"fuzzy", 'y', POPT_ARG_NONE, &fuzzy_basis, 0, 0, 0 },
{"compress", 'z', POPT_ARG_NONE, 0, 'z', 0, 0 },
{"compress-level", 0, POPT_ARG_INT, &def_compress_level, 'z', 0, 0 },
-@@ -13
61,7 +1364
,7 @@ int parse_arguments(int *argc, const cha
+@@ -13
55,7 +1358
,7 @@ int parse_arguments(int *argc, const cha
inplace = 1;
}
inplace = 1;
}
@@
-539,7
+548,7
@@
TODO:
partial_dir = tmp_partialdir;
if (inplace) {
partial_dir = tmp_partialdir;
if (inplace) {
-@@ -13
70,6 +1373
,7 @@ int parse_arguments(int *argc, const cha
+@@ -13
64,6 +1367
,7 @@ int parse_arguments(int *argc, const cha
snprintf(err_buf, sizeof err_buf,
"--%s cannot be used with --%s\n",
append_mode ? "append" : "inplace",
snprintf(err_buf, sizeof err_buf,
"--%s cannot be used with --%s\n",
append_mode ? "append" : "inplace",
@@
-547,7
+556,7
@@
TODO:
delay_updates ? "delay-updates" : "partial-dir");
return 0;
}
delay_updates ? "delay-updates" : "partial-dir");
return 0;
}
-@@ -16
80,6 +1684
,8 @@ void server_options(char **args,int *arg
+@@ -16
74,6 +1678
,8 @@ void server_options(char **args,int *arg
args[ac++] = "--super";
if (size_only)
args[ac++] = "--size-only";
args[ac++] = "--super";
if (size_only)
args[ac++] = "--size-only";