|
|
| version 1.1, 2012/02/17 15:09:30 | version 1.1.1.1.2.1, 2013/07/22 00:20:20 |
|---|---|
| Line 81 int am_sender = 0; | Line 81 int am_sender = 0; |
| int am_starting_up = 1; | int am_starting_up = 1; |
| int relative_paths = -1; | int relative_paths = -1; |
| int implied_dirs = 1; | int implied_dirs = 1; |
| int detect_renamed = 0; | |
| int numeric_ids = 0; | int numeric_ids = 0; |
| int allow_8bit_chars = 0; | int allow_8bit_chars = 0; |
| int force_delete = 0; | int force_delete = 0; |
| Line 390 void usage(enum logcode F) | Line 391 void usage(enum logcode F) |
| rprintf(F," --modify-window=NUM compare mod-times with reduced accuracy\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," -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," -y, --fuzzy find similar file for basis if no dest file\n"); |
| rprintf(F," --detect-renamed try to find renamed files to speed up the transfer\n"); | |
| rprintf(F," --compare-dest=DIR also compare destination files relative to DIR\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," --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," --link-dest=DIR hardlink to files in DIR when unchanged\n"); |
| Line 577 static struct poptOption long_options[] = { | Line 579 static struct poptOption long_options[] = { |
| {"compare-dest", 0, POPT_ARG_STRING, 0, OPT_COMPARE_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 }, | {"copy-dest", 0, POPT_ARG_STRING, 0, OPT_COPY_DEST, 0, 0 }, |
| {"link-dest", 0, POPT_ARG_STRING, 0, OPT_LINK_DEST, 0, 0 }, | {"link-dest", 0, POPT_ARG_STRING, 0, OPT_LINK_DEST, 0, 0 }, |
| {"detect-renamed", 0, POPT_ARG_NONE, &detect_renamed, 0, 0, 0 }, | |
| {"fuzzy", 'y', POPT_ARG_VAL, &fuzzy_basis, 1, 0, 0 }, | {"fuzzy", 'y', POPT_ARG_VAL, &fuzzy_basis, 1, 0, 0 }, |
| {"no-fuzzy", 0, POPT_ARG_VAL, &fuzzy_basis, 0, 0, 0 }, | {"no-fuzzy", 0, POPT_ARG_VAL, &fuzzy_basis, 0, 0, 0 }, |
| {"no-y", 0, POPT_ARG_VAL, &fuzzy_basis, 0, 0, 0 }, | {"no-y", 0, POPT_ARG_VAL, &fuzzy_basis, 0, 0, 0 }, |
| Line 1601 int parse_arguments(int *argc_p, const char ***argv_p) | Line 1604 int parse_arguments(int *argc_p, const char ***argv_p) |
| inplace = 1; | inplace = 1; |
| } | } |
| if (delay_updates && !partial_dir) | if ((delay_updates || detect_renamed) && !partial_dir) |
| partial_dir = tmp_partialdir; | partial_dir = tmp_partialdir; |
| if (inplace) { | if (inplace) { |
| Line 1610 int parse_arguments(int *argc_p, const char ***argv_p) | Line 1613 int parse_arguments(int *argc_p, const char ***argv_p) |
| snprintf(err_buf, sizeof err_buf, | snprintf(err_buf, sizeof err_buf, |
| "--%s cannot be used with --%s\n", | "--%s cannot be used with --%s\n", |
| append_mode ? "append" : "inplace", | append_mode ? "append" : "inplace", |
| detect_renamed ? "detect-renamed" : | |
| delay_updates ? "delay-updates" : "partial-dir"); | delay_updates ? "delay-updates" : "partial-dir"); |
| return 0; | return 0; |
| } | } |
| Line 1972 void server_options(char **args, int *argc_p) | Line 1976 void server_options(char **args, int *argc_p) |
| args[ac++] = "--super"; | args[ac++] = "--super"; |
| if (size_only) | if (size_only) |
| args[ac++] = "--size-only"; | args[ac++] = "--size-only"; |
| if (detect_renamed) | |
| args[ac++] = "--detect-renamed"; | |
| } else { | } else { |
| if (skip_compress) { | if (skip_compress) { |
| if (asprintf(&arg, "--skip-compress=%s", skip_compress) < 0) | if (asprintf(&arg, "--skip-compress=%s", skip_compress) < 0) |