/* -*- c-file-style: "linux" -*-
Copyright (C) 1998-2001 by Andrew Tridgell <tridge@samba.org>
- Copyright (C) 2000-2001 by Martin Pool <mbp@samba.org>
+ Copyright (C) 2000, 2001, 2002 by Martin Pool <mbp@samba.org>
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 "popt.h"
int make_backups = 0;
+
+/**
+ * Should we send the whole file as literal data rather than trying to
+ * create an incremental diff? This is on by default when both source
+ * and destination are local and we're not doing a batch delta,
+ * because there it's no cheaper to read the whole basis file than to
+ * just rewrite it.
+ *
+ * If both are 0, then look at whether we're local or remote and go by
+ * that.
+ **/
int whole_file = 0;
+int no_whole_file = 0;
+
int copy_links = 0;
int preserve_links = 0;
int preserve_hard_links = 0;
int bwlimit=0;
int delete_after=0;
int only_existing=0;
+int opt_ignore_existing=0;
int max_delete=0;
int ignore_errors=0;
#ifdef _WIN32
#else
int modify_window=0;
#endif
-int blocking_io=0;
+int blocking_io=-1;
+
/** Network address family. **/
#ifdef INET6
* or under Unix process-monitors. **/
int no_detach = 0;
-
-int read_batch=0;
-int write_batch=0;
+int write_batch = 0;
+int read_batch = 0;
char *backup_suffix = BACKUP_SUFFIX;
char *tmpdir = NULL;
int always_checksum = 0;
int list_only = 0;
-char *batch_ext = NULL;
+char *batch_prefix = NULL;
static int modify_window_set;
char const *hardlinks = "no ";
char const *links = "no ";
char const *ipv6 = "no ";
+ STRUCT_STAT *dumstat;
#ifdef HAVE_SOCKETPAIR
got_socketpair = "";
rprintf(f, "%s version %s protocol version %d\n",
RSYNC_NAME, RSYNC_VERSION, PROTOCOL_VERSION);
rprintf(f,
- "Copyright (C) 1996-2001 by Andrew Tridgell and others\n");
+ "Copyright (C) 1996-2002 by Andrew Tridgell and others\n");
rprintf(f, "<http://rsync.samba.org/>\n");
rprintf(f, "Capabilities: %d-bit files, %ssocketpairs, "
- "%shard links, %ssymlinks, batchfiles, %sIPv6\n\n",
+ "%shard links, %ssymlinks, batchfiles, \n",
(int) (sizeof(OFF_T) * 8),
- got_socketpair, hardlinks, links, ipv6);
+ got_socketpair, hardlinks, links);
+
+ /* Note that this field may not have type ino_t. It depends
+ * on the complicated interaction between largefile feature
+ * macros. */
+ rprintf(f, " %sIPv6, %d-bit system inums, %d-bit internal inums\n",
+ ipv6,
+ (int) (sizeof(dumstat->st_ino) * 8),
+ (int) (sizeof(INO64_T) * 8));
+#ifdef MAINTAINER_MODE
+ rprintf(f, " panic action: \"%s\"\n",
+ get_panic_action());
+#endif
#ifdef NO_INT64
rprintf(f, "WARNING: no 64-bit integers on this platform!\n");
#endif
+
+ rprintf(f,
+"\n"
+"rsync comes with ABSOLUTELY NO WARRANTY. This is free software, and you\n"
+"are welcome to redistribute it under certain conditions. See the GNU\n"
+"General Public Licence for details.\n"
+ );
}
{
print_rsync_version(F);
- rprintf(F,"rsync is a file transfer program capable of efficient remote update\nvia a fast differencing algorithm.\n\n");
+ rprintf(F,"\nrsync is a file transfer program capable of efficient remote update\nvia a fast differencing algorithm.\n\n");
rprintf(F,"Usage: rsync [OPTION]... SRC [SRC]... [USER@]HOST:DEST\n");
rprintf(F," or rsync [OPTION]... [USER@]HOST:SRC DEST\n");
rprintf(F," -S, --sparse handle sparse files efficiently\n");
rprintf(F," -n, --dry-run show what would have been transferred\n");
rprintf(F," -W, --whole-file copy whole files, no incremental checks\n");
+ rprintf(F," --no-whole-file turn off --whole-file\n");
rprintf(F," -x, --one-file-system don't cross filesystem boundaries\n");
rprintf(F," -B, --block-size=SIZE checksum blocking size (default %d)\n",BLOCK_SIZE);
rprintf(F," -e, --rsh=COMMAND specify rsh replacement\n");
rprintf(F," --rsync-path=PATH specify path to rsync on the remote machine\n");
rprintf(F," -C, --cvs-exclude auto ignore files in the same way CVS does\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," --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," --config=FILE specify alternate rsyncd.conf file\n");
rprintf(F," --port=PORT specify alternate rsyncd port number\n");
rprintf(F," --blocking-io use blocking IO for the remote shell\n");
+ rprintf(F," --no-blocking-io turn off --blocking-io\n");
rprintf(F," --stats give some file transfer stats\n");
rprintf(F," --progress show progress during transfer\n");
rprintf(F," --log-format=FORMAT log file transfers using specified format\n");
rprintf(F," --password-file=FILE get password from FILE\n");
rprintf(F," --bwlimit=KBPS limit I/O bandwidth, KBytes per second\n");
- rprintf(F," -f --read-batch=EXT read batch file\n");
- rprintf(F," -F --write-batch write batch file\n");
+ rprintf(F," --write-batch=PREFIX write batch fileset starting with PREFIX\n");
+ rprintf(F," --read-batch=PREFIX read batch fileset starting with PREFIX\n");
rprintf(F," -h, --help show this help screen\n");
#ifdef INET6
rprintf(F," -4 prefer IPv4\n");
OPT_LOG_FORMAT, OPT_PASSWORD_FILE, OPT_SIZE_ONLY, OPT_ADDRESS,
OPT_DELETE_AFTER, OPT_EXISTING, OPT_MAX_DELETE, OPT_BACKUP_DIR,
OPT_IGNORE_ERRORS, OPT_BWLIMIT, OPT_BLOCKING_IO,
- OPT_MODIFY_WINDOW};
+ OPT_NO_BLOCKING_IO, OPT_WHOLE_FILE, OPT_NO_WHOLE_FILE,
+ OPT_MODIFY_WINDOW, OPT_READ_BATCH, OPT_WRITE_BATCH, OPT_IGNORE_EXISTING};
static struct poptOption long_options[] = {
/* longName, shortName, argInfo, argPtr, value, descrip, argDesc */
- {"version", 0, POPT_ARG_NONE, 0, OPT_VERSION},
- {"suffix", 0, POPT_ARG_STRING, &backup_suffix},
- {"rsync-path", 0, POPT_ARG_STRING, &rsync_path},
- {"password-file", 0, POPT_ARG_STRING, &password_file},
- {"ignore-times", 'I', POPT_ARG_NONE, &ignore_times},
- {"size-only", 0, POPT_ARG_NONE, &size_only},
- {"modify-window", 0, POPT_ARG_INT, &modify_window, OPT_MODIFY_WINDOW},
- {"one-file-system", 'x', POPT_ARG_NONE, &one_file_system},
- {"delete", 0, POPT_ARG_NONE, &delete_mode},
- {"existing", 0, POPT_ARG_NONE, &only_existing},
- {"delete-after", 0, POPT_ARG_NONE, &delete_after},
- {"delete-excluded", 0, POPT_ARG_NONE, 0, OPT_DELETE_EXCLUDED},
- {"force", 0, POPT_ARG_NONE, &force_delete},
- {"numeric-ids", 0, POPT_ARG_NONE, &numeric_ids},
- {"exclude", 0, POPT_ARG_STRING, 0, OPT_EXCLUDE},
- {"include", 0, POPT_ARG_STRING, 0, OPT_INCLUDE},
- {"exclude-from", 0, POPT_ARG_STRING, 0, OPT_EXCLUDE_FROM},
- {"include-from", 0, POPT_ARG_STRING, 0, OPT_INCLUDE_FROM},
- {"safe-links", 0, POPT_ARG_NONE, &safe_symlinks},
- {"help", 'h', POPT_ARG_NONE, 0, 'h'},
- {"backup", 'b', POPT_ARG_NONE, &make_backups},
- {"dry-run", 'n', POPT_ARG_NONE, &dry_run},
- {"sparse", 'S', POPT_ARG_NONE, &sparse_files},
- {"cvs-exclude", 'C', POPT_ARG_NONE, &cvs_exclude},
- {"update", 'u', POPT_ARG_NONE, &update_only},
- {"links", 'l', POPT_ARG_NONE, &preserve_links},
- {"copy-links", 'L', POPT_ARG_NONE, ©_links},
- {"whole", 'W', POPT_ARG_NONE, &whole_file},
- {"copy-unsafe-links", 0, POPT_ARG_NONE, ©_unsafe_links},
- {"perms", 'p', POPT_ARG_NONE, &preserve_perms},
- {"owner", 'o', POPT_ARG_NONE, &preserve_uid},
- {"group", 'g', POPT_ARG_NONE, &preserve_gid},
- {"devices", 'D', POPT_ARG_NONE, &preserve_devices},
- {"times", 't', POPT_ARG_NONE, &preserve_times},
- {"checksum", 'c', POPT_ARG_NONE, &always_checksum},
- {"verbose", 'v', POPT_ARG_NONE, 0, 'v'},
- {"quiet", 'q', POPT_ARG_NONE, 0, 'q'},
- {"archive", 'a', POPT_ARG_NONE, 0, 'a'},
- {"server", 0, POPT_ARG_NONE, &am_server},
- {"sender", 0, POPT_ARG_NONE, 0, OPT_SENDER},
- {"recursive", 'r', POPT_ARG_NONE, &recurse},
- {"relative", 'R', POPT_ARG_NONE, &relative_paths},
- {"rsh", 'e', POPT_ARG_STRING, &shell_cmd},
- {"block-size", 'B', POPT_ARG_INT, &block_size},
- {"max-delete", 0, POPT_ARG_INT, &max_delete},
- {"timeout", 0, POPT_ARG_INT, &io_timeout},
- {"temp-dir", 'T', POPT_ARG_STRING, &tmpdir},
- {"compare-dest", 0, POPT_ARG_STRING, &compare_dest},
+ {"version", 0, POPT_ARG_NONE, 0, OPT_VERSION, 0, 0},
+ {"suffix", 0, POPT_ARG_STRING, &backup_suffix, 0, 0, 0 },
+ {"rsync-path", 0, POPT_ARG_STRING, &rsync_path, 0, 0, 0 },
+ {"password-file", 0, POPT_ARG_STRING, &password_file, 0, 0, 0 },
+ {"ignore-times", 'I', POPT_ARG_NONE, &ignore_times , 0, 0, 0 },
+ {"size-only", 0, POPT_ARG_NONE, &size_only , 0, 0, 0 },
+ {"modify-window", 0, POPT_ARG_INT, &modify_window, OPT_MODIFY_WINDOW, 0, 0 },
+ {"one-file-system", 'x', POPT_ARG_NONE, &one_file_system , 0, 0, 0 },
+ {"delete", 0, POPT_ARG_NONE, &delete_mode , 0, 0, 0 },
+ {"existing", 0, POPT_ARG_NONE, &only_existing , 0, 0, 0 },
+ {"ignore-existing", 0, POPT_ARG_NONE, &opt_ignore_existing , 0, 0, 0 },
+ {"delete-after", 0, POPT_ARG_NONE, &delete_after , 0, 0, 0 },
+ {"delete-excluded", 0, POPT_ARG_NONE, 0, OPT_DELETE_EXCLUDED, 0, 0 },
+ {"force", 0, POPT_ARG_NONE, &force_delete , 0, 0, 0 },
+ {"numeric-ids", 0, POPT_ARG_NONE, &numeric_ids , 0, 0, 0 },
+ {"exclude", 0, POPT_ARG_STRING, 0, OPT_EXCLUDE, 0, 0 },
+ {"include", 0, POPT_ARG_STRING, 0, OPT_INCLUDE, 0, 0 },
+ {"exclude-from", 0, POPT_ARG_STRING, 0, OPT_EXCLUDE_FROM, 0, 0 },
+ {"include-from", 0, POPT_ARG_STRING, 0, OPT_INCLUDE_FROM, 0, 0 },
+ {"safe-links", 0, POPT_ARG_NONE, &safe_symlinks , 0, 0, 0 },
+ {"help", 'h', POPT_ARG_NONE, 0, 'h', 0, 0 },
+ {"backup", 'b', POPT_ARG_NONE, &make_backups , 0, 0, 0 },
+ {"dry-run", 'n', POPT_ARG_NONE, &dry_run , 0, 0, 0 },
+ {"sparse", 'S', POPT_ARG_NONE, &sparse_files , 0, 0, 0 },
+ {"cvs-exclude", 'C', POPT_ARG_NONE, &cvs_exclude , 0, 0, 0 },
+ {"update", 'u', POPT_ARG_NONE, &update_only , 0, 0, 0 },
+ {"links", 'l', POPT_ARG_NONE, &preserve_links , 0, 0, 0 },
+ {"copy-links", 'L', POPT_ARG_NONE, ©_links , 0, 0, 0 },
+ {"whole-file", 'W', POPT_ARG_NONE, 0, OPT_WHOLE_FILE, 0, 0 },
+ {"no-whole-file", 0, POPT_ARG_NONE, 0, OPT_NO_WHOLE_FILE, 0, 0 },
+ {"copy-unsafe-links", 0, POPT_ARG_NONE, ©_unsafe_links , 0, 0, 0 },
+ {"perms", 'p', POPT_ARG_NONE, &preserve_perms , 0, 0, 0 },
+ {"owner", 'o', POPT_ARG_NONE, &preserve_uid , 0, 0, 0 },
+ {"group", 'g', POPT_ARG_NONE, &preserve_gid , 0, 0, 0 },
+ {"devices", 'D', POPT_ARG_NONE, &preserve_devices , 0, 0, 0 },
+ {"times", 't', POPT_ARG_NONE, &preserve_times , 0, 0, 0 },
+ {"checksum", 'c', POPT_ARG_NONE, &always_checksum , 0, 0, 0 },
+ {"verbose", 'v', POPT_ARG_NONE, 0, 'v', 0, 0 },
+ {"quiet", 'q', POPT_ARG_NONE, 0, 'q', 0, 0 },
+ {"archive", 'a', POPT_ARG_NONE, 0, 'a', 0, 0 },
+ {"server", 0, POPT_ARG_NONE, &am_server , 0, 0, 0 },
+ {"sender", 0, POPT_ARG_NONE, 0, OPT_SENDER, 0, 0 },
+ {"recursive", 'r', POPT_ARG_NONE, &recurse , 0, 0, 0 },
+ {"relative", 'R', POPT_ARG_NONE, &relative_paths , 0, 0, 0 },
+ {"rsh", 'e', POPT_ARG_STRING, &shell_cmd , 0, 0, 0 },
+ {"block-size", 'B', POPT_ARG_INT, &block_size , 0, 0, 0 },
+ {"max-delete", 0, POPT_ARG_INT, &max_delete , 0, 0, 0 },
+ {"timeout", 0, POPT_ARG_INT, &io_timeout , 0, 0, 0 },
+ {"temp-dir", 'T', POPT_ARG_STRING, &tmpdir , 0, 0, 0 },
+ {"compare-dest", 0, POPT_ARG_STRING, &compare_dest , 0, 0, 0 },
/* TODO: Should this take an optional int giving the compression level? */
- {"compress", 'z', POPT_ARG_NONE, &do_compression},
- {"daemon", 0, POPT_ARG_NONE, &am_daemon},
- {"no-detach", 0, POPT_ARG_NONE, &no_detach},
- {"stats", 0, POPT_ARG_NONE, &do_stats},
- {"progress", 0, POPT_ARG_NONE, &do_progress},
- {"partial", 0, POPT_ARG_NONE, &keep_partial},
- {"ignore-errors", 0, POPT_ARG_NONE, &ignore_errors},
- {"blocking-io", 0, POPT_ARG_NONE, &blocking_io},
- {0, 'P', POPT_ARG_NONE, 0, 'P'},
- {"config", 0, POPT_ARG_STRING, &config_file},
- {"port", 0, POPT_ARG_INT, &rsync_port},
- {"log-format", 0, POPT_ARG_STRING, &log_format},
- {"bwlimit", 0, POPT_ARG_INT, &bwlimit},
- {"address", 0, POPT_ARG_STRING, &bind_address, 0},
- {"backup-dir", 0, POPT_ARG_STRING, &backup_dir},
- {"hard-links", 'H', POPT_ARG_NONE, &preserve_hard_links},
- {"read-batch", 'f', POPT_ARG_STRING, &batch_ext, 'f'},
- {"write-batch", 'F', POPT_ARG_NONE, &write_batch, 0},
+ {"compress", 'z', POPT_ARG_NONE, &do_compression , 0, 0, 0 },
+ {"daemon", 0, POPT_ARG_NONE, &am_daemon , 0, 0, 0 },
+ {"no-detach", 0, POPT_ARG_NONE, &no_detach , 0, 0, 0 },
+ {"stats", 0, POPT_ARG_NONE, &do_stats , 0, 0, 0 },
+ {"progress", 0, POPT_ARG_NONE, &do_progress , 0, 0, 0 },
+ {"partial", 0, POPT_ARG_NONE, &keep_partial , 0, 0, 0 },
+ {"ignore-errors", 0, POPT_ARG_NONE, &ignore_errors , 0, 0, 0 },
+ {"blocking-io", 0, POPT_ARG_NONE, &blocking_io , 0, 0, 0 },
+ {"no-blocking-io", 0, POPT_ARG_NONE, 0, OPT_NO_BLOCKING_IO, 0, 0 },
+ {0, 'P', POPT_ARG_NONE, 0, 'P', 0, 0 },
+ {"config", 0, POPT_ARG_STRING, &config_file , 0, 0, 0 },
+ {"port", 0, POPT_ARG_INT, &rsync_port , 0, 0, 0 },
+ {"log-format", 0, POPT_ARG_STRING, &log_format , 0, 0, 0 },
+ {"bwlimit", 0, POPT_ARG_INT, &bwlimit , 0, 0, 0 },
+ {"address", 0, POPT_ARG_STRING, &bind_address, 0, 0, 0 },
+ {"backup-dir", 0, POPT_ARG_STRING, &backup_dir , 0, 0, 0 },
+ {"hard-links", 'H', POPT_ARG_NONE, &preserve_hard_links , 0, 0, 0 },
+ {"read-batch", 0, POPT_ARG_STRING, &batch_prefix, OPT_READ_BATCH, 0, 0 },
+ {"write-batch", 0, POPT_ARG_STRING, &batch_prefix, OPT_WRITE_BATCH, 0, 0 },
#ifdef INET6
- {0, '4', POPT_ARG_VAL, &default_af_hint, AF_INET },
- {0, '6', POPT_ARG_VAL, &default_af_hint, AF_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 },
#endif
- {0,0,0,0}
+ {0,0,0,0, 0, 0, 0}
};
add_exclude_file(poptGetOptArg(pc), 1, 1);
break;
+ case OPT_WHOLE_FILE:
+ whole_file = 1;
+ no_whole_file = 0;
+ break;
+
+ case OPT_NO_WHOLE_FILE:
+ no_whole_file = 1;
+ whole_file = 0;
+ break;
+
+ case OPT_NO_BLOCKING_IO:
+ blocking_io = 0;
+ break;
+
case 'h':
usage(FINFO);
exit_cleanup(0);
keep_partial = 1;
break;
+ case OPT_WRITE_BATCH:
+ /* popt stores the filename in batch_prefix for us */
+ write_batch = 1;
+ break;
- case 'f':
- /* The filename is stored for us by popt */
+ case OPT_READ_BATCH:
+ /* popt stores the filename in batch_prefix for us */
read_batch = 1;
break;
}
}
+ if (write_batch && read_batch) {
+ snprintf(err_buf,sizeof(err_buf),
+ "write-batch and read-batch can not be used together\n");
+ rprintf(FERROR,"ERROR: write-batch and read-batch"
+ " can not be used together\n");
+ return 0;
+ }
+
+ if (do_compression && (write_batch || read_batch)) {
+ snprintf(err_buf,sizeof(err_buf),
+ "compress can not be used with write-batch or read-batch\n");
+ rprintf(FERROR,"ERROR: compress can not be used with"
+ " write-batch or read-batch\n");
+ return 0;
+ }
+
*argv = poptGetArgs(pc);
if (*argv)
*argc = count_args(*argv);
static char mdelete[30];
static char mwindow[30];
static char bw[50];
- static char fext[20]; /* dw */
+ /* Leave room for ``--(write|read)-batch='' */
+ static char fext[MAXPATHLEN + 15];
int i, x;
+ if (blocking_io == -1)
+ blocking_io = 0;
+
args[ac++] = "--server";
if (!am_sender)
argstr[x++] = 'l';
if (copy_links)
argstr[x++] = 'L';
+
+ assert(whole_file == 0 || whole_file == 1);
if (whole_file)
argstr[x++] = 'W';
+ /* We don't need to send --no-whole-file, because it's the
+ * default for remote transfers, and in any case old versions
+ * of rsync will not understand it. */
+
if (preserve_hard_links)
argstr[x++] = 'H';
if (preserve_uid)
argstr[x++] = 'S';
if (do_compression)
argstr[x++] = 'z';
- if (write_batch)
- argstr[x++] = 'F'; /* dw */
/* this is a complete hack - blame Rusty
args[ac++] = mdelete;
}
- if (batch_ext != NULL) {
- sprintf(fext,"-f%s",batch_ext);
+ if (batch_prefix != NULL) {
+ char *fmt = "";
+ if (write_batch)
+ fmt = "--write-batch=%s";
+ else
+ if (read_batch)
+ fmt = "--read-batch=%s";
+ snprintf(fext,sizeof(fext),fmt,batch_prefix);
args[ac++] = fext;
}
if (only_existing && am_sender)
args[ac++] = "--existing";
+ if (opt_ignore_existing && am_sender)
+ args[ac++] = "--ignore-existing";
+
if (tmpdir) {
args[ac++] = "--temp-dir";
args[ac++] = tmpdir;
args[ac++] = compare_dest;
}
-
*argc = ac;
}