int copy_unsafe_links=0;
int block_size=BLOCK_SIZE;
int size_only=0;
+int bwlimit=0;
int delete_after=0;
int only_existing=0;
int max_delete=0;
+int ignore_errors=0;
+int blocking_io=0;
char *backup_suffix = BACKUP_SUFFIX;
char *tmpdir = NULL;
char *log_format = NULL;
char *password_file = NULL;
char *rsync_path = RSYNC_NAME;
+char *backup_dir = NULL;
int rsync_port = RSYNC_PORT;
int verbose = 0;
struct in_addr socket_address = {INADDR_ANY};
-void usage(int F)
+void usage(enum logcode F)
{
rprintf(F,"rsync version %s Copyright Andrew Tridgell and Paul Mackerras\n\n",
VERSION);
rprintf(F," -r, --recursive recurse into directories\n");
rprintf(F," -R, --relative use relative path names\n");
rprintf(F," -b, --backup make backups (default %s suffix)\n",BACKUP_SUFFIX);
+ rprintf(F," --backup-dir make backups into this directory\n");
rprintf(F," --suffix=SUFFIX override backup suffix\n");
rprintf(F," -u, --update update only (don't overwrite newer files)\n");
rprintf(F," -l, --links preserve soft links\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," --ignore-errors delete even if there are IO errors\n");
rprintf(F," --max-delete=NUM don't delete more than NUM files\n");
rprintf(F," --partial keep partially transferred files\n");
rprintf(F," --force force deletion of directories even if not empty\n");
rprintf(F," --address bind to the specified address\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," --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," -h, --help show this help screen\n");
rprintf(F,"\n");
OPT_INCLUDE, OPT_INCLUDE_FROM, OPT_STATS, OPT_PARTIAL, OPT_PROGRESS,
OPT_COPY_UNSAFE_LINKS, OPT_SAFE_LINKS, OPT_COMPARE_DEST,
OPT_LOG_FORMAT, OPT_PASSWORD_FILE, OPT_SIZE_ONLY, OPT_ADDRESS,
- OPT_DELETE_AFTER, OPT_EXISTING, OPT_MAX_DELETE};
+ OPT_DELETE_AFTER, OPT_EXISTING, OPT_MAX_DELETE, OPT_BACKUP_DIR,
+ OPT_IGNORE_ERRORS, OPT_BWLIMIT, OPT_BLOCKING_IO};
static char *short_options = "oblLWHpguDCtcahvqrRIxnSe:B:T:zP";
{"progress", 0, 0, OPT_PROGRESS},
{"partial", 0, 0, OPT_PARTIAL},
{"delete-after",0, 0, OPT_DELETE_AFTER},
+ {"ignore-errors",0, 0, OPT_IGNORE_ERRORS},
+ {"blocking-io" ,0, 0, OPT_BLOCKING_IO},
{"config", 1, 0, OPT_CONFIG},
{"port", 1, 0, OPT_PORT},
{"log-format", 1, 0, OPT_LOG_FORMAT},
+ {"bwlimit", 1, 0, OPT_BWLIMIT},
{"address", 1, 0, OPT_ADDRESS},
{"max-delete", 1, 0, OPT_MAX_DELETE},
+ {"backup-dir", 1, 0, OPT_BACKUP_DIR},
{0,0,0,0}};
preserve_perms=1;
preserve_times=1;
preserve_gid=1;
- if (am_root) {
- preserve_devices=1;
- preserve_uid=1;
- }
+ preserve_uid=1;
+ preserve_devices=1;
break;
case OPT_SERVER:
keep_partial = 1;
break;
+ case OPT_IGNORE_ERRORS:
+ ignore_errors = 1;
+ break;
+
+ case OPT_BLOCKING_IO:
+ blocking_io = 1;
+ break;
+
case 'P':
do_progress = 1;
keep_partial = 1;
case OPT_LOG_FORMAT:
log_format = optarg;
break;
+
+ case OPT_BWLIMIT:
+ bwlimit = atoi(optarg);
+ break;
case OPT_ADDRESS:
{
}
break;
+ case OPT_BACKUP_DIR:
+ backup_dir = optarg;
+ break;
+
default:
slprintf(err_buf,sizeof(err_buf),"unrecognised option\n");
return 0;
}
+/* need to pass all the valid options from the client to the server */
+
void server_options(char **args,int *argc)
{
int ac = *argc;
static char bsize[30];
static char iotime[30];
static char mdelete[30];
+ static char bw[50];
+
int i, x;
args[ac++] = "--server";
argstr[0] = '-';
for (i=0;i<verbose;i++)
argstr[x++] = 'v';
+
/* the -q option is intentionally left out */
if (make_backups)
argstr[x++] = 'b';
argstr[x++] = 'S';
if (do_compression)
argstr[x++] = 'z';
+
+ /* this is a complete hack - blame Rusty
+
+ this is a hack to make the list_only (remote file list)
+ more useful */
+ if (list_only && !recurse)
+ argstr[x++] = 'r';
+
argstr[x] = 0;
if (x != 1) args[ac++] = argstr;
args[ac++] = iotime;
}
+ if (bwlimit) {
+ slprintf(bw,sizeof(bw),"--bwlimit=%d",bwlimit);
+ args[ac++] = bw;
+ }
+
if (strcmp(backup_suffix, BACKUP_SUFFIX)) {
args[ac++] = "--suffix";
args[ac++] = backup_suffix;
if (delete_after)
args[ac++] = "--delete-after";
+ if (ignore_errors)
+ args[ac++] = "--ignore-errors";
+
if (copy_unsafe_links)
args[ac++] = "--copy-unsafe-links";
args[ac++] = tmpdir;
}
+ if (backup_dir && am_sender) {
+ /* only the receiver needs this option, if we are the sender
+ * then we need to send it to the receiver.
+ */
+ args[ac++] = "--backup-dir";
+ args[ac++] = backup_dir;
+ }
+
if (compare_dest && am_sender) {
/* the server only needs this option if it is not the sender,
* and it may be an older version that doesn't know this
Matt McCutchen's Web Site / rsync / rsync.git / blobdiff