int delete_mode=0;
int delete_excluded=0;
int one_file_system=0;
-int remote_version=0;
+int protocol_version = PROTOCOL_VERSION;
int sparse_files=0;
int do_compression=0;
int am_root=0;
int numeric_ids = 0;
int force_delete = 0;
int io_timeout = 0;
-int io_error = 0;
int read_only = 0;
int module_id = -1;
int am_server = 0;
int keep_partial=0;
int safe_symlinks=0;
int copy_unsafe_links=0;
-int block_size=0;
int size_only=0;
int bwlimit=0;
int delete_after=0;
int ignore_errors=0;
int modify_window=0;
int blocking_io=-1;
+unsigned int block_size = 0;
/** Network address family. **/
rprintf(f, "%s version %s protocol version %d\n",
RSYNC_NAME, RSYNC_VERSION, PROTOCOL_VERSION);
rprintf(f,
- "Copyright (C) 1996-2002 by Andrew Tridgell and others\n");
+ "Copyright (C) 1996-2004 by Andrew Tridgell and others\n");
rprintf(f, "<http://rsync.samba.org/>\n");
rprintf(f, "Capabilities: %d-bit files, %ssocketpairs, "
"%shard links, %ssymlinks, batchfiles, \n",
rprintf(F," -R, --relative use relative path names\n");
rprintf(F," --no-relative turn off --relative\n");
rprintf(F," --no-implied-dirs don't send implied dirs with -R\n");
- rprintf(F," -b, --backup make backups (default %s suffix)\n",BACKUP_SUFFIX);
+ rprintf(F," -b, --backup make backups (see --suffix & --backup-dir)\n");
rprintf(F," --backup-dir make backups into this directory\n");
- rprintf(F," --suffix=SUFFIX override backup suffix\n");
+ rprintf(F," --suffix=SUFFIX backup suffix (default %s w/o --backup-dir)\n",BACKUP_SUFFIX);
rprintf(F," -u, --update update only (don't overwrite newer files)\n");
rprintf(F," -l, --links copy symlinks as symlinks\n");
rprintf(F," -L, --copy-links copy the referent of symlinks\n");
rprintf(F," -e, --rsh=COMMAND specify the remote shell\n");
rprintf(F," --rsync-path=PATH specify path to rsync on the remote machine\n");
rprintf(F," --existing only update files that already exist\n");
- rprintf(F," --ignore-existing ignore files that already exist on the receiving side\n");
+ rprintf(F," --ignore-existing ignore files that already exist on receiving side\n");
rprintf(F," --delete delete files that don't exist on the sending side\n");
rprintf(F," --delete-excluded also delete excluded files on the receiving side\n");
rprintf(F," --delete-after delete after transferring, not before\n");
rprintf(F," --force force deletion of directories even if not empty\n");
rprintf(F," --numeric-ids don't map uid/gid values by user/group name\n");
rprintf(F," --timeout=TIME set IO timeout in seconds\n");
- rprintf(F," -I, --ignore-times don't exclude files that match length and time\n");
- rprintf(F," --size-only only use file size when determining if a file should be transferred\n");
- rprintf(F," --modify-window=NUM Timestamp window (seconds) for file match (default=%d)\n",modify_window);
+ rprintf(F," -I, --ignore-times turn off mod time & file size quick check\n");
+ rprintf(F," --size-only ignore mod time for quick check (use size)\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," --compare-dest=DIR also compare destination files relative to DIR\n");
rprintf(F," --link-dest=DIR create hardlinks to DIR for unchanged files\n");
rprintf(F," --include=PATTERN don't exclude files matching PATTERN\n");
rprintf(F," --include-from=FILE don't exclude patterns listed in FILE\n");
rprintf(F," --files-from=FILE read FILE for list of source-file names\n");
- rprintf(F," -0 --from0 file names we read are separated by nulls, not newlines\n");
+ rprintf(F," -0 --from0 all *-from file lists are delimited by nulls\n");
rprintf(F," --version print version number\n");
rprintf(F," --daemon run as a rsync daemon\n");
rprintf(F," --no-detach do not detach from the parent\n");
{"files-from", 0, POPT_ARG_STRING, &files_from, 0, 0, 0 },
{"from0", '0', POPT_ARG_NONE, &eol_nulls, 0, 0, 0},
{"no-implied-dirs", 0, POPT_ARG_VAL, &implied_dirs, 0, 0, 0 },
+ {"protocol", 0, POPT_ARG_INT, &protocol_version, 0, 0, 0 },
#ifdef INET6
{0, '4', POPT_ARG_VAL, &default_af_hint, AF_INET, 0, 0 },
{0, '6', POPT_ARG_VAL, &default_af_hint, AF_INET6, 0, 0 },
{
if (err_buf[0]) {
rprintf(FLOG, "%s", err_buf);
- rprintf(FERROR, "%s: %s", RSYNC_NAME, err_buf);
+ rprintf(FERROR, RSYNC_NAME ": %s", err_buf);
} else {
rprintf (FERROR, "Error parsing options: "
"option may be supported on client but not on server?\n");
exit_cleanup(RERR_SYNTAX);
}
+ if (do_progress && !verbose)
+ verbose = 1;
+
*argv = poptGetArgs(pc);
if (*argv)
*argc = count_args(*argv);
usage(FERROR);
exit_cleanup(RERR_SYNTAX);
}
- if (strcmp(files_from, "-") == 0)
+ if (strcmp(files_from, "-") == 0) {
filesfrom_fd = 0;
+ if (am_server)
+ remote_filesfrom_file = "-";
+ }
else if ((colon = find_colon(files_from)) != 0) {
if (am_server) {
usage(FERROR);
if (x != 1) args[ac++] = argstr;
if (block_size) {
- snprintf(bsize,sizeof(bsize),"-B%d",block_size);
+ snprintf(bsize, sizeof bsize, "-B%u", block_size);
args[ac++] = bsize;
}
/* Only send --suffix if it specifies a non-default value. */
if (strcmp(backup_suffix, backup_dir? "" : BACKUP_SUFFIX) != 0) {
- char *s = malloc(9+backup_suffix_len+1);
+ char *s = new_array(char, 9+backup_suffix_len+1);
if (!s)
out_of_memory("server_options");
/* We use the following syntax to avoid weirdness with '~'. */