*
* Copyright (C) 1998-2001 Andrew Tridgell <tridge@samba.org>
* Copyright (C) 2000, 2001, 2002 Martin Pool <mbp@samba.org>
- * Copyright (C) 2002-2019 Wayne Davison
+ * Copyright (C) 2002-2020 Wayne Davison
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
#include "rsync.h"
#include "itypes.h"
+#include "latest-year.h"
#include <popt.h>
-#include <zlib.h>
extern int module_id;
extern int local_server;
extern int sanitize_paths;
extern int daemon_over_rsh;
extern unsigned int module_dirlen;
+extern struct name_num_obj valid_checksums;
+extern struct name_num_obj valid_compressions;
extern filter_rule_list filter_list;
extern filter_rule_list daemon_filter_list;
-#define NOT_SPECIFIED (-42)
-
int make_backups = 0;
/**
int keep_dirlinks = 0;
int copy_dirlinks = 0;
int copy_links = 0;
+int write_devices = 0;
int preserve_links = 0;
int preserve_hard_links = 0;
int preserve_acls = 0;
int preserve_uid = 0;
int preserve_gid = 0;
int preserve_times = 0;
+int preserve_atimes = 0;
int update_only = 0;
+int open_noatime = 0;
int cvs_exclude = 0;
int dry_run = 0;
int do_xfers = 1;
int sparse_files = 0;
int preallocate_files = 0;
int do_compression = 0;
-int def_compress_level = NOT_SPECIFIED;
+int do_compression_level = CLVL_NOT_SPECIFIED;
int am_root = 0; /* 0 = normal, 1 = root, 2 = --super, -1 = --fake-super */
int am_server = 0;
int am_sender = 0;
int remote_option_cnt = 0;
const char **remote_options = NULL;
const char *checksum_choice = NULL;
+const char *compress_choice = NULL;
int quiet = 0;
int output_motd = 1;
DEBUG_WORD(HLINK, W_SND|W_REC, "Debug hard-link actions (levels 1-3)"),
DEBUG_WORD(ICONV, W_CLI|W_SRV, "Debug iconv character conversions (levels 1-2)"),
DEBUG_WORD(IO, W_CLI|W_SRV, "Debug I/O routines (levels 1-4)"),
+ DEBUG_WORD(NSTR, W_CLI|W_SRV, "Debug negotiation strings"),
DEBUG_WORD(OWN, W_REC, "Debug ownership changes in users & groups (levels 1-2)"),
DEBUG_WORD(PROTO, W_CLI|W_SRV, "Debug protocol information"),
DEBUG_WORD(RECV, W_REC, "Debug receiver functions"),
break;
}
}
- if (len && !words[j].name) {
+ if (len && !words[j].name && !am_server) {
rprintf(FERROR, "Unknown %s item: \"%.*s\"\n",
words[j].help, len, str);
exit_cleanup(RERR_SYNTAX);
debug_levels[j] *= -1;
}
-static void print_rsync_version(enum logcode f)
+static char *istring(const char *fmt, int val)
+{
+ char *str;
+ if (asprintf(&str, fmt, val) < 0)
+ out_of_memory("istring");
+ return str;
+}
+
+static void print_capabilities(enum logcode f)
{
- char *subprotocol = "";
- char const *got_socketpair = "no ";
- char const *have_inplace = "no ";
- char const *hardlinks = "no ";
- char const *prealloc = "no ";
- char const *symtimes = "no ";
- char const *acls = "no ";
- char const *xattrs = "no ";
- char const *links = "no ";
- char const *iconv = "no ";
- char const *ipv6 = "no ";
+ char *capabilities[256]; /* Just overallocate this so it's impossible to overflow... */
+ char line_buf[75];
STRUCT_STAT *dumstat;
+ int line_len, cnt = 0;
-#if SUBPROTOCOL_VERSION != 0
- if (asprintf(&subprotocol, ".PR%d", SUBPROTOCOL_VERSION) < 0)
- out_of_memory("print_rsync_version");
+#define add(str,val) capabilities[cnt++] = istring(str, val)
+
+ add("%d-bit files", (int)(sizeof (OFF_T) * 8));
+ add("%d-bit inums", (int)(sizeof dumstat->st_ino * 8)); /* Don't check ino_t! */
+ add("%d-bit timestamps", (int)(sizeof (time_t) * 8));
+ add("%d-bit long ints", (int)(sizeof (int64) * 8));
+
+#undef add
+#define add(str) capabilities[cnt++] = str
+
+ add(
+#ifndef HAVE_SOCKETPAIR
+ "no "
#endif
-#ifdef HAVE_SOCKETPAIR
- got_socketpair = "";
+ "socketpairs");
+
+ add(
+#ifndef SUPPORT_HARD_LINKS
+ "no "
#endif
-#ifdef HAVE_FTRUNCATE
- have_inplace = "";
+ "hardlinks");
+
+ add(
+#ifndef SUPPORT_LINKS
+ "no "
#endif
-#ifdef SUPPORT_HARD_LINKS
- hardlinks = "";
+ "symlinks");
+
+ add(
+#ifndef INET6
+ "no "
#endif
-#ifdef SUPPORT_PREALLOCATION
- prealloc = "";
+ "IPv6");
+
+ add("batchfiles");
+
+ add(
+#ifndef HAVE_FTRUNCATE
+ "no "
#endif
-#ifdef SUPPORT_ACLS
- acls = "";
+ "inplace");
+
+ add(
+#ifndef HAVE_FTRUNCATE
+ "no "
#endif
-#ifdef SUPPORT_XATTRS
- xattrs = "";
+ "append");
+
+ add(
+#ifndef SUPPORT_ACLS
+ " no"
#endif
-#ifdef SUPPORT_LINKS
- links = "";
+ "ACLs");
+
+ add(
+#ifndef SUPPORT_XATTRS
+ " no"
#endif
-#ifdef INET6
- ipv6 = "";
+ "xattrs");
+
+ add(
+#ifndef ICONV_OPTION
+ " no"
#endif
-#ifdef ICONV_OPTION
- iconv = "";
+ "iconv");
+
+ add(
+#ifndef CAN_SET_SYMLINK_TIMES
+ " no"
#endif
-#ifdef CAN_SET_SYMLINK_TIMES
- symtimes = "";
+ "symtimes");
+
+ add(
+#ifndef SUPPORT_PREALLOCATION
+ "no "
#endif
+ "prealloc");
+
+ add(
+#ifndef HAVE_SIMD
+ "no "
+#endif
+ "SIMD");
+
+ add(NULL);
+
+#undef add
+ for (line_len = 0, cnt = 0; ; cnt++) {
+ char *cap = capabilities[cnt];
+ int cap_len = cap ? strlen(cap) : 1000;
+ int need_comma = cap && capabilities[cnt+1] != NULL ? 1 : 0;
+ if (line_len + 1 + cap_len + need_comma >= (int)sizeof line_buf) {
+ rprintf(f, " %s\n", line_buf);
+ line_len = 0;
+ }
+ if (!cap)
+ break;
+ line_len += snprintf(line_buf+line_len, sizeof line_buf - line_len, " %s%s", cap, need_comma ? "," : "");
+ }
+}
+
+static void print_rsync_version(enum logcode f)
+{
+ char tmpbuf[256], *subprotocol = "";
+
+#if SUBPROTOCOL_VERSION != 0
+ subprotocol = istring(".PR%d", SUBPROTOCOL_VERSION);
+#endif
rprintf(f, "%s version %s protocol version %d%s\n",
RSYNC_NAME, RSYNC_VERSION, PROTOCOL_VERSION, subprotocol);
- rprintf(f, "Copyright (C) 1996-2019 by Andrew Tridgell, Wayne Davison, and others.\n");
+
+ rprintf(f, "Copyright (C) 1996-" LATEST_YEAR " by Andrew Tridgell, Wayne Davison, and others.\n");
rprintf(f, "Web site: http://rsync.samba.org/\n");
+
rprintf(f, "Capabilities:\n");
- rprintf(f, " %d-bit files, %d-bit inums, %d-bit timestamps, %d-bit long ints,\n",
- (int)(sizeof (OFF_T) * 8),
- (int)(sizeof dumstat->st_ino * 8), /* Don't check ino_t! */
- (int)(sizeof (time_t) * 8),
- (int)(sizeof (int64) * 8));
- rprintf(f, " %ssocketpairs, %shardlinks, %ssymlinks, %sIPv6, batchfiles, %sinplace,\n",
- got_socketpair, hardlinks, links, ipv6, have_inplace);
- rprintf(f, " %sappend, %sACLs, %sxattrs, %siconv, %ssymtimes, %sprealloc\n",
- have_inplace, acls, xattrs, iconv, symtimes, prealloc);
+ print_capabilities(f);
+
+ rprintf(f, "Checksum list:\n");
+ get_default_nno_list(&valid_checksums, tmpbuf, sizeof tmpbuf, '(');
+ rprintf(f, " %s\n", tmpbuf);
+
+ rprintf(f, "Compress list:\n");
+ get_default_nno_list(&valid_compressions, tmpbuf, sizeof tmpbuf, '(');
+ rprintf(f, " %s\n", tmpbuf);
#ifdef MAINTAINER_MODE
rprintf(f, "Panic Action: \"%s\"\n", get_panic_action());
rprintf(F," --specials preserve special files\n");
rprintf(F," -D same as --devices --specials\n");
rprintf(F," -t, --times preserve modification times\n");
+ rprintf(F," -U, --atimes preserve access (last-used) times\n");
+ rprintf(F," --open-noatime avoid changing the atime on opened files\n");
rprintf(F," -O, --omit-dir-times omit directories from --times\n");
rprintf(F," -J, --omit-link-times omit symlinks from --times\n");
rprintf(F," --super receiver attempts super-user activities\n");
#else
rprintf(F," --preallocate pre-allocate dest files on remote receiver\n");
#endif
+ rprintf(F," --write-devices write to devices as files (implies --inplace)\n");
rprintf(F," -n, --dry-run perform a trial run with no changes made\n");
rprintf(F," -W, --whole-file copy files whole (without delta-xfer algorithm)\n");
rprintf(F," --checksum-choice=STR choose the checksum algorithms\n");
OPT_READ_BATCH, OPT_WRITE_BATCH, OPT_ONLY_WRITE_BATCH, OPT_MAX_SIZE,
OPT_NO_D, OPT_APPEND, OPT_NO_ICONV, OPT_INFO, OPT_DEBUG,
OPT_USERMAP, OPT_GROUPMAP, OPT_CHOWN, OPT_BWLIMIT,
+ OPT_OLD_COMPRESS, OPT_NEW_COMPRESS, OPT_NO_COMPRESS,
OPT_SERVER, OPT_REFUSED_BASE = 9000};
static struct poptOption long_options[] = {
{"times", 't', POPT_ARG_VAL, &preserve_times, 1, 0, 0 },
{"no-times", 0, POPT_ARG_VAL, &preserve_times, 0, 0, 0 },
{"no-t", 0, POPT_ARG_VAL, &preserve_times, 0, 0, 0 },
+ {"atimes", 'U', POPT_ARG_NONE, 0, 'U', 0, 0 },
+ {"no-atimes", 0, POPT_ARG_VAL, &preserve_atimes, 0, 0, 0 },
+ {"no-U", 0, POPT_ARG_VAL, &preserve_atimes, 0, 0, 0 },
+ {"open-noatime", 0, POPT_ARG_VAL, &open_noatime, 1, 0, 0 },
+ {"no-open-noatime", 0, POPT_ARG_VAL, &open_noatime, 0, 0, 0 },
{"omit-dir-times", 'O', POPT_ARG_VAL, &omit_dir_times, 1, 0, 0 },
{"no-omit-dir-times",0, POPT_ARG_VAL, &omit_dir_times, 0, 0, 0 },
{"no-O", 0, POPT_ARG_VAL, &omit_dir_times, 0, 0, 0 },
{"no-D", 0, POPT_ARG_NONE, 0, OPT_NO_D, 0, 0 },
{"devices", 0, POPT_ARG_VAL, &preserve_devices, 1, 0, 0 },
{"no-devices", 0, POPT_ARG_VAL, &preserve_devices, 0, 0, 0 },
+ {"write-devices", 0, POPT_ARG_VAL, &write_devices, 1, 0, 0 },
+ {"no-write-devices", 0, POPT_ARG_VAL, &write_devices, 0, 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 },
{"cvs-exclude", 'C', POPT_ARG_NONE, &cvs_exclude, 0, 0, 0 },
{"whole-file", 'W', POPT_ARG_VAL, &whole_file, 1, 0, 0 },
{"no-whole-file", 0, POPT_ARG_VAL, &whole_file, 0, 0, 0 },
- {"checksum-choice", 0, POPT_ARG_STRING, &checksum_choice, 0, 0, 0 },
{"no-W", 0, POPT_ARG_VAL, &whole_file, 0, 0, 0 },
{"checksum", 'c', POPT_ARG_VAL, &always_checksum, 1, 0, 0 },
{"no-checksum", 0, POPT_ARG_VAL, &always_checksum, 0, 0, 0 },
{"no-c", 0, POPT_ARG_VAL, &always_checksum, 0, 0, 0 },
+ {"checksum-choice", 0, POPT_ARG_STRING, &checksum_choice, 0, 0, 0 },
+ {"cc", 0, POPT_ARG_STRING, &checksum_choice, 0, 0, 0 },
{"block-size", 'B', POPT_ARG_LONG, &block_size, 0, 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 },
{"no-fuzzy", 0, POPT_ARG_VAL, &fuzzy_basis, 0, 0, 0 },
{"no-y", 0, POPT_ARG_VAL, &fuzzy_basis, 0, 0, 0 },
{"compress", 'z', POPT_ARG_NONE, 0, 'z', 0, 0 },
- {"old-compress", 0, POPT_ARG_VAL, &do_compression, 1, 0, 0 },
- {"new-compress", 0, POPT_ARG_VAL, &do_compression, 2, 0, 0 },
- {"no-compress", 0, POPT_ARG_VAL, &do_compression, 0, 0, 0 },
- {"no-z", 0, POPT_ARG_VAL, &do_compression, 0, 0, 0 },
+ {"old-compress", 0, POPT_ARG_NONE, 0, OPT_OLD_COMPRESS, 0, 0 },
+ {"new-compress", 0, POPT_ARG_NONE, 0, OPT_NEW_COMPRESS, 0, 0 },
+ {"no-compress", 0, POPT_ARG_NONE, 0, OPT_NO_COMPRESS, 0, 0 },
+ {"no-z", 0, POPT_ARG_NONE, 0, OPT_NO_COMPRESS, 0, 0 },
+ {"compress-choice", 0, POPT_ARG_STRING, &compress_choice, 0, 0, 0 },
+ {"zc", 0, POPT_ARG_STRING, &compress_choice, 0, 0, 0 },
{"skip-compress", 0, POPT_ARG_STRING, &skip_compress, 0, 0, 0 },
- {"compress-level", 0, POPT_ARG_INT, &def_compress_level, 0, 0, 0 },
+ {"compress-level", 0, POPT_ARG_INT, &do_compression_level, 0, 0, 0 },
{0, 'P', POPT_ARG_NONE, 0, 'P', 0, 0 },
{"progress", 0, POPT_ARG_VAL, &do_progress, 1, 0, 0 },
{"no-progress", 0, POPT_ARG_VAL, &do_progress, 0, 0, 0 },
}
rprintf(FERROR, RSYNC_NAME ": %s", err_buf);
+ io_flush(FULL_FLUSH);
msleep(20);
}
+static void parse_one_refuse_match(int negated, const char *ref, const struct poptOption *list_end)
+{
+ struct poptOption *op;
+ char shortName[2];
+ int is_wild = strpbrk(ref, "*?[") != NULL;
+ int found_match = 0;
+
+ shortName[1] = '\0';
+
+ if (strcmp("a", ref) == 0 || strcmp("archive", ref) == 0) {
+ ref = "[ardlptgoD]";
+ is_wild = 1;
+ }
+
+ for (op = long_options; op != list_end; op++) {
+ *shortName = op->shortName;
+ if ((op->longName && wildmatch(ref, op->longName))
+ || (*shortName && wildmatch(ref, shortName))) {
+ if (op->descrip[1] == '*')
+ op->descrip = negated ? "a*" : "r*";
+ else if (!is_wild)
+ op->descrip = negated ? "a=" : "r=";
+ found_match = 1;
+ if (!is_wild)
+ break;
+ }
+ }
+
+ if (!found_match)
+ rprintf(FLOG, "No match for refuse-options string \"%s\"\n", ref);
+}
+
+
/**
* Tweak the option table to disable all options that the rsyncd.conf
* file has told us to refuse.
**/
-static void set_refuse_options(char *bp)
+static void set_refuse_options(void)
{
- struct poptOption *op;
- char *cp, shortname[2];
- int is_wild, found_match;
+ struct poptOption *op, *list_end = NULL;
+ char *cp, *ref = lp_refuse_options(module_id);
+ int negated;
- shortname[1] = '\0';
+ if (!ref)
+ ref = "";
- while (1) {
- while (*bp == ' ') bp++;
- if (!*bp)
+ if (!*ref && !am_daemon) /* A simple optimization */
+ return;
+
+ /* We abuse the descrip field in poptOption to make it easy to flag which options
+ * are refused (since we don't use it otherwise). Start by marking all options
+ * as "a"ccepted with a few options also marked as non-wild. */
+ for (op = long_options; ; op++) {
+ const char *longName = op->longName ? op->longName : "";
+ if (!op->longName && !op->shortName) {
+ list_end = op;
break;
- if ((cp = strchr(bp, ' ')) != NULL)
- *cp= '\0';
- is_wild = strpbrk(bp, "*?[") != NULL;
- found_match = 0;
- for (op = long_options; ; op++) {
- *shortname = op->shortName;
- if (!op->longName && !*shortname)
- break;
- if ((op->longName && wildmatch(bp, op->longName))
- || (*shortname && wildmatch(bp, shortname))) {
- if (op->argInfo == POPT_ARG_VAL)
- op->argInfo = POPT_ARG_NONE;
- op->val = (op - long_options) + OPT_REFUSED_BASE;
- found_match = 1;
- /* These flags are set to let us easily check
- * an implied option later in the code. */
- switch (*shortname) {
- case 'r': case 'd': case 'l': case 'p':
- case 't': case 'g': case 'o': case 'D':
- refused_archive_part = op->val;
- break;
- case 'z':
- refused_compress = op->val;
- break;
- case '\0':
- if (wildmatch("delete", op->longName))
- refused_delete = op->val;
- else if (wildmatch("delete-before", op->longName))
- refused_delete_before = op->val;
- else if (wildmatch("delete-during", op->longName))
- refused_delete_during = op->val;
- else if (wildmatch("partial", op->longName))
- refused_partial = op->val;
- else if (wildmatch("progress", op->longName))
- refused_progress = op->val;
- else if (wildmatch("inplace", op->longName))
- refused_inplace = op->val;
- else if (wildmatch("no-iconv", op->longName))
- refused_no_iconv = op->val;
- break;
- }
- if (!is_wild)
- break;
- }
- }
- if (!found_match) {
- rprintf(FLOG, "No match for refuse-options string \"%s\"\n",
- bp);
}
+ if (op->shortName == 'e' /* Required for compatibility flags */
+ || op->shortName == '0' /* --from0 just modifies --files-from, so refuse that instead (or not) */
+ || op->shortName == 's' /* --protect-args is always OK */
+ || op->shortName == 'n' /* --dry-run is always OK */
+ || strcmp("iconv", longName) == 0
+ || strcmp("no-iconv", longName) == 0
+ || strcmp("checksum-seed", longName) == 0
+ || strcmp("write-devices", longName) == 0 /* disable wild-match (it gets refused below) */
+ || strcmp("log-format", longName) == 0 /* aka out-format (NOT log-file-format) */
+ || strcmp("sender", longName) == 0
+ || strcmp("server", longName) == 0)
+ op->descrip = "a="; /* exact-match only */
+ else
+ op->descrip = "a*"; /* wild-card-able */
+ }
+ assert(list_end != NULL);
+
+ if (am_daemon) /* Refused by default, but can be accepted via "!write-devices" */
+ parse_one_refuse_match(0, "write-devices", list_end);
+
+ while (1) {
+ while (*ref == ' ') ref++;
+ if (!*ref)
+ break;
+ if ((cp = strchr(ref, ' ')) != NULL)
+ *cp = '\0';
+ negated = *ref == '!';
+ if (negated && ref[1])
+ ref++;
+ parse_one_refuse_match(negated, ref, list_end);
if (!cp)
break;
*cp = ' ';
- bp = cp + 1;
+ ref = cp + 1;
+ }
+
+ if (am_daemon) {
+#ifdef ICONV_OPTION
+ if (!*lp_charset(module_id))
+ parse_one_refuse_match(0, "iconv", list_end);
+#endif
+ parse_one_refuse_match(0, "log-file*", list_end);
+ }
+
+ /* Now we use the descrip values to actually mark the options for refusal. */
+ for (op = long_options; op != list_end; op++) {
+ int refused = op->descrip[0] == 'r';
+ op->descrip = NULL;
+ if (!refused)
+ continue;
+ if (op->argInfo == POPT_ARG_VAL)
+ op->argInfo = POPT_ARG_NONE;
+ op->val = (op - long_options) + OPT_REFUSED_BASE;
+ /* The following flags are set to let us easily check an implied option later in the code. */
+ switch (op->shortName) {
+ case 'r': case 'd': case 'l': case 'p':
+ case 't': case 'g': case 'o': case 'D':
+ refused_archive_part = op->val;
+ break;
+ case 'z':
+ refused_compress = op->val;
+ break;
+ case '\0':
+ if (strcmp("delete", op->longName) == 0)
+ refused_delete = op->val;
+ else if (strcmp("delete-before", op->longName) == 0)
+ refused_delete_before = op->val;
+ else if (strcmp("delete-during", op->longName) == 0)
+ refused_delete_during = op->val;
+ else if (strcmp("partial", op->longName) == 0)
+ refused_partial = op->val;
+ else if (strcmp("progress", op->longName) == 0)
+ refused_progress = op->val;
+ else if (strcmp("inplace", op->longName) == 0)
+ refused_inplace = op->val;
+ else if (strcmp("no-iconv", op->longName) == 0)
+ refused_no_iconv = op->val;
+ break;
+ }
}
}
int parse_arguments(int *argc_p, const char ***argv_p)
{
static poptContext pc;
- char *ref = lp_refuse_options(module_id);
const char *arg, **argv = *argv_p;
int argc = *argc_p;
int opt;
strlcpy(err_buf, "argc is zero!\n", sizeof err_buf);
return 0;
}
- if (ref && *ref)
- set_refuse_options(ref);
- if (am_daemon) {
- set_refuse_options("log-file*");
-#ifdef ICONV_OPTION
- if (!*lp_charset(module_id))
- set_refuse_options("iconv");
-#endif
- }
+
+ set_refuse_options();
#ifdef ICONV_OPTION
if (!am_daemon && protect_args <= 0 && (arg = getenv("RSYNC_ICONV")) != NULL && *arg)
itemize_changes++;
break;
+ case 'U':
+ if (++preserve_atimes > 1)
+ open_noatime = 1;
+ break;
+
case 'v':
verbose++;
break;
do_compression++;
break;
+ case OPT_OLD_COMPRESS:
+ compress_choice = "zlib";
+ break;
+
+ case OPT_NEW_COMPRESS:
+ compress_choice = "zlibx";
+ break;
+
+ case OPT_NO_COMPRESS:
+ do_compression = 0;
+ compress_choice = NULL;
+ break;
+
case 'M':
arg = poptGetOptArg(pc);
if (*arg != '-') {
* of any more restrictive ACLs, but this is safe
* for now */
snprintf(err_buf,sizeof(err_buf),
- "ACLs are not supported on this %s\n",
+ "ACLs are not supported on this %s\n",
am_server ? "server" : "client");
return 0;
#endif
}
}
- if (checksum_choice && strcmp(checksum_choice, "auto") != 0 && strcmp(checksum_choice, "auto,auto") != 0) {
+ if (checksum_choice && strcasecmp(checksum_choice, "auto") != 0 && strcasecmp(checksum_choice, "auto,auto") != 0) {
/* Call this early to verify the args and figure out if we need to force
* --whole-file. Note that the parse function will get called again later,
* just in case an "auto" choice needs to know the protocol_version. */
- if (parse_checksum_choice())
- whole_file = 1;
+ parse_checksum_choice(0);
} else
checksum_choice = NULL;
exit_cleanup(0);
}
- if (do_compression || def_compress_level != NOT_SPECIFIED) {
- if (def_compress_level == NOT_SPECIFIED)
- def_compress_level = Z_DEFAULT_COMPRESSION;
- else if (def_compress_level < Z_DEFAULT_COMPRESSION || def_compress_level > Z_BEST_COMPRESSION) {
- snprintf(err_buf, sizeof err_buf, "--compress-level value is invalid: %d\n",
- def_compress_level);
- return 0;
- } else if (def_compress_level == Z_NO_COMPRESSION)
- do_compression = 0;
- else if (!do_compression)
- do_compression = 1;
+ if (!compress_choice && do_compression > 1)
+ compress_choice = "zlibx";
+ if (compress_choice && strcasecmp(compress_choice, "auto") != 0)
+ parse_compress_choice(0); /* Twiddles do_compression and can possibly NULL-out compress_choice. */
+ else
+ compress_choice = NULL;
+
+ if (do_compression || do_compression_level != CLVL_NOT_SPECIFIED) {
+ if (!do_compression)
+ do_compression = CPRES_AUTO;
if (do_compression && refused_compress) {
create_refuse_error(refused_compress);
return 0;
}
-#ifdef EXTERNAL_ZLIB
- if (do_compression == 1) {
- snprintf(err_buf, sizeof err_buf,
- "This rsync lacks old-style --compress due to its external zlib. Try -zz.\n");
- if (am_server)
- return 0;
- fprintf(stderr, "%s" "Continuing without compression.\n\n", err_buf);
- do_compression = 0;
- }
-#endif
}
#ifdef HAVE_SETVBUF
inplace = 1;
}
+ if (write_devices) {
+ if (refused_inplace) {
+ create_refuse_error(refused_inplace);
+ return 0;
+ }
+ inplace = 1;
+ }
+
if (delay_updates && !partial_dir)
partial_dir = tmp_partialdir;
argstr[x++] = 'D';
if (preserve_times)
argstr[x++] = 't';
+ if (preserve_atimes) {
+ argstr[x++] = 'U';
+ if (preserve_atimes > 1)
+ argstr[x++] = 'U';
+ }
if (preserve_perms)
argstr[x++] = 'p';
else if (preserve_executability && am_sender)
}
if (sparse_files)
argstr[x++] = 'S';
- if (do_compression == 1)
+ if (do_compression == CPRES_ZLIB)
argstr[x++] = 'z';
set_allow_inc_recurse();
eFlags[x++] = 'f'; /* flist I/O-error safety support */
eFlags[x++] = 'x'; /* xattr hardlink optimization not desired */
eFlags[x++] = 'C'; /* support checksum seed order fix */
+ eFlags[x++] = 'I'; /* support inplace_partial behavior */
+ eFlags[x++] = 'v'; /* use varint for flist & compat flags; negotiate checksum */
+ /* NOTE: Avoid using 'V' -- it was the high bit of a write_byte() that became write_varint(). */
#undef eFlags
}
if (xfer_dirs && !recurse && delete_mode && am_sender)
args[ac++] = "--no-r";
- if (do_compression && def_compress_level != Z_DEFAULT_COMPRESSION) {
- if (asprintf(&arg, "--compress-level=%d", def_compress_level) < 0)
+ if (do_compression && do_compression_level != CLVL_NOT_SPECIFIED) {
+ if (asprintf(&arg, "--compress-level=%d", do_compression_level) < 0)
goto oom;
args[ac++] = arg;
}
args[ac++] = arg;
}
+ if (do_compression == CPRES_ZLIBX)
+ args[ac++] = "--new-compress";
+ else if (compress_choice && do_compression == CPRES_ZLIB)
+ args[ac++] = "--old-compress";
+ else if (compress_choice) {
+ if (asprintf(&arg, "--compress-choice=%s", compress_choice) < 0)
+ goto oom;
+ args[ac++] = arg;
+ }
+
if (am_sender) {
if (max_delete > 0) {
if (asprintf(&arg, "--max-delete=%d", max_delete) < 0)
if (arg)
args[ac++] = arg;
- arg = make_output_option(debug_words, debug_levels, where);
- if (arg)
- args[ac++] = arg;
-
if (append_mode) {
if (append_mode > 1)
args[ac++] = "--append";
if (relative_paths && !implied_dirs && (!am_sender || protocol_version >= 30))
args[ac++] = "--no-implied-dirs";
+ if (write_devices && am_sender)
+ args[ac++] = "--write-devices";
+
if (remove_source_files == 1)
args[ac++] = "--remove-source-files";
else if (remove_source_files)
if (preallocate_files && am_sender)
args[ac++] = "--preallocate";
+ if (open_noatime && preserve_atimes <= 1)
+ args[ac++] = "--open-noatime";
+
if (ac > MAX_SERVER_ARGS) { /* Not possible... */
rprintf(FERROR, "argc overflow in server_options().\n");
exit_cleanup(RERR_MALLOC);
}
- if (do_compression > 1)
- args[ac++] = "--new-compress";
-
if (remote_option_cnt) {
int j;
if (ac + remote_option_cnt > MAX_SERVER_ARGS) {
return ret;
}
-/* Look for a HOST specfication of the form "HOST:PATH", "HOST::PATH", or
+/* Look for a HOST specification of the form "HOST:PATH", "HOST::PATH", or
* "rsync://HOST:PORT/PATH". If found, *host_ptr will be set to some allocated
* memory with the HOST. If a daemon-accessing spec was specified, the value
* of *port_ptr will contain a non-0 port number, otherwise it will be set to
*host_ptr = parse_hostspec(s + strlen(URL_PREFIX), &path, port_ptr);
if (*host_ptr) {
if (!*port_ptr)
- *port_ptr = RSYNC_PORT;
+ *port_ptr = -1; /* -1 indicates they want the default */
return path;
}
}
if (*path == ':') {
if (port_ptr && !*port_ptr)
- *port_ptr = RSYNC_PORT;
+ *port_ptr = -1;
return path + 1;
}
if (port_ptr)