int compare_dest = 0;
int link_dest = 0;
int basis_dir_cnt = 0;
+char *dest_option = NULL;
int verbose = 0;
int quiet = 0;
static int modify_window_set;
static int refused_delete, refused_archive_part;
static int refused_partial, refused_progress, refused_delete_before;
-static char *dest_option = NULL;
static char *max_size_arg;
static char partialdir_for_delayupdate[] = ".~tmp~";
rprintf(F," -x, --one-file-system don't cross filesystem boundaries\n");
rprintf(F," -B, --block-size=SIZE force a fixed checksum block-size\n");
rprintf(F," -e, --rsh=COMMAND specify the remote shell to use\n");
- rprintf(F," --rsync-path=PATH specify path to rsync on the remote machine\n");
+ rprintf(F," --rsync-path=PROGRAM specify the rsync to run on the remote machine\n");
rprintf(F," --existing only update files that already exist on receiver\n");
rprintf(F," --ignore-existing ignore files that already exist on receiving side\n");
rprintf(F," --remove-sent-files sent files/symlinks are removed from sending side\n");
if (*s == '[' && (p = strchr(s, ']')) != NULL) {
s++;
hostlen = p - s;
- if (*p == ':')
- *port_ptr = atoi(p+1);
- else if (!*port_ptr)
- *port_ptr = RSYNC_PORT;
+ if (p[1] == ':')
+ *port_ptr = atoi(p+2);
} else {
if ((p = strchr(s, ':')) != NULL) {
hostlen = p - s;
*port_ptr = atoi(p+1);
- } else if (!*port_ptr)
- *port_ptr = RSYNC_PORT;
+ }
}
+ if (!*port_ptr)
+ *port_ptr = RSYNC_PORT;
*host_ptr = new_array(char, hostlen + 1);
strlcpy(*host_ptr, s, hostlen + 1);
return path;
*p = ']';
if (not_host)
return NULL;
+ p++;
} else {
if (!(p = strchr(s, ':')))
return NULL;