X-Git-Url: https://mattmccutchen.net/rsync/rsync.git/blobdiff_plain/06d76beb288856ad6d53bf3f481a3a8d664fd73d..f98c60bfa8c755b59b0299d7e656bbb298b083c5:/options.c
diff --git a/options.c b/options.c
index 884165e8..cf705dcd 100644
--- a/options.c
+++ b/options.c
@@ -46,17 +46,17 @@ int preserve_gid = 0;
int preserve_times = 0;
int update_only = 0;
int cvs_exclude = 0;
-int dry_run=0;
-int local_server=0;
-int ignore_times=0;
-int delete_mode=0;
-int delete_excluded=0;
-int one_file_system=0;
+int dry_run = 0;
+int local_server = 0;
+int ignore_times = 0;
+int delete_mode = 0;
+int delete_excluded = 0;
+int one_file_system = 0;
int protocol_version = PROTOCOL_VERSION;
-int sparse_files=0;
-int do_compression=0;
-int am_root=0;
-int orig_umask=0;
+int sparse_files = 0;
+int do_compression = 0;
+int am_root = 0;
+int orig_umask = 0;
int relative_paths = -1;
int implied_dirs = 1;
int numeric_ids = 0;
@@ -74,20 +74,20 @@ int eol_nulls = 0;
int recurse = 0;
int am_daemon = 0;
int daemon_over_rsh = 0;
-int do_stats=0;
-int do_progress=0;
-int keep_partial=0;
-int safe_symlinks=0;
-int copy_unsafe_links=0;
-int size_only=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;
-int modify_window=0;
-int blocking_io=-1;
+int do_stats = 0;
+int do_progress = 0;
+int keep_partial = 0;
+int safe_symlinks = 0;
+int copy_unsafe_links = 0;
+int size_only = 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;
+int modify_window = 0;
+int blocking_io = -1;
unsigned int block_size = 0;
@@ -168,7 +168,7 @@ static void print_rsync_version(enum logcode f)
rprintf(f, "\n");
rprintf(f, "Capabilities: %d-bit files, %ssocketpairs, "
"%shard links, %ssymlinks, batchfiles, \n",
- (int) (sizeof(OFF_T) * 8),
+ (int) (sizeof (OFF_T) * 8),
got_socketpair, hardlinks, links);
/* Note that this field may not have type ino_t. It depends
@@ -176,8 +176,8 @@ static void print_rsync_version(enum logcode f)
* 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));
+ (int) (sizeof dumstat->st_ino * 8),
+ (int) (sizeof (INO64_T) * 8));
#ifdef MAINTAINER_MODE
rprintf(f, " panic action: \"%s\"\n",
get_panic_action());
@@ -418,11 +418,13 @@ static int check_refuse_options(char *ref, int opt)
char *p;
const char *name;
- for (i=0; long_options[i].longName; i++) {
- if (long_options[i].val == opt) break;
+ for (i = 0; long_options[i].longName; i++) {
+ if (long_options[i].val == opt)
+ break;
}
- if (!long_options[i].longName) return 0;
+ if (!long_options[i].longName)
+ return 0;
name = long_options[i].longName;
len = strlen(name);
@@ -430,7 +432,7 @@ static int check_refuse_options(char *ref, int opt)
while ((p = strstr(ref,name))) {
if ((p==ref || p[-1]==' ') &&
(p[len] == ' ' || p[len] == 0)) {
- snprintf(err_buf,sizeof(err_buf),
+ snprintf(err_buf, sizeof err_buf,
"The '%s' option is not supported by this server\n", name);
return 1;
}
@@ -472,9 +474,8 @@ int parse_arguments(int *argc, const char ***argv, int frommain)
pc = poptGetContext(RSYNC_NAME, *argc, *argv, long_options, 0);
while ((opt = poptGetNextOpt(pc)) != -1) {
- if (ref) {
- if (check_refuse_options(ref, opt)) return 0;
- }
+ if (ref && check_refuse_options(ref, opt))
+ return 0;
/* most options are handled automatically by popt;
* only special cases are returned and listed here. */
@@ -530,7 +531,8 @@ int parse_arguments(int *argc, const char ***argv, int frommain)
break;
case 'q':
- if (frommain) quiet++;
+ if (frommain)
+ quiet++;
break;
case OPT_SENDER:
@@ -571,7 +573,7 @@ int parse_arguments(int *argc, const char ***argv, int frommain)
default:
- snprintf(err_buf, sizeof(err_buf),
+ snprintf(err_buf, sizeof err_buf,
"%s%s: %s\n",
am_server ? "on remote machine: " : "",
poptBadOption(pc, POPT_BADOPTION_NOALIAS),
@@ -581,7 +583,7 @@ int parse_arguments(int *argc, const char ***argv, int frommain)
}
#if !SUPPORT_LINKS
- if (preserve_links) {
+ if (preserve_links && !am_sender) {
snprintf(err_buf, sizeof err_buf,
"symlinks are not supported on this %s\n",
am_server ? "server" : "client");
@@ -720,13 +722,7 @@ void server_options(char **args,int *argc)
{
int ac = *argc;
static char argstr[50];
- static char bsize[30];
- static char iotime[30];
- static char mdelete[30];
- static char mwindow[30];
- static char bw[50];
- /* Leave room for ``--(write|read)-batch='' */
- static char fext[MAX_BATCH_PREFIX_LEN + 15];
+ char *arg;
int i, x;
@@ -747,7 +743,7 @@ void server_options(char **args,int *argc)
x = 1;
argstr[0] = '-';
- for (i=0;i