Commit 50b31539 authored by Wayne Davison's avatar Wayne Davison

- Added the ability to parse a literal IPv6 address in an "rsync:" URL

  (e.g. rsync://[2001:638:500:101::21]:873/module/dir).
- Improved a couple --files-from error messages.
parent 56194bcd
...@@ -775,15 +775,20 @@ static int start_client(int argc, char *argv[]) ...@@ -775,15 +775,20 @@ static int start_client(int argc, char *argv[])
host = argv[0] + strlen(URL_PREFIX); host = argv[0] + strlen(URL_PREFIX);
p = strchr(host,'/'); p = strchr(host,'/');
if (p) { if (p) {
*p = 0; *p = '\0';
path = p+1; path = p+1;
} else { } else
path = ""; path = "";
} if (*host == '[' && (p = strchr(host, ']')) != NULL) {
p = strchr(host,':'); host++;
*p++ = '\0';
if (*p != ':')
p = NULL;
} else
p = strchr(host, ':');
if (p) { if (p) {
rsync_port = atoi(p+1); rsync_port = atoi(p+1);
*p = 0; *p = '\0';
} }
return start_socket_client(host, path, argc-1, argv+1); return start_socket_client(host, path, argc-1, argv+1);
} }
...@@ -795,7 +800,7 @@ static int start_client(int argc, char *argv[]) ...@@ -795,7 +800,7 @@ static int start_client(int argc, char *argv[])
&& remote_filesfrom_file != files_from + 1 && remote_filesfrom_file != files_from + 1
&& strncmp(files_from, argv[0], p-argv[0]+1) != 0) { && strncmp(files_from, argv[0], p-argv[0]+1) != 0) {
rprintf(FERROR, rprintf(FERROR,
"--files-from hostname is not transfer hostname\n"); "--files-from hostname is not the same as the transfer hostname\n");
exit_cleanup(RERR_SYNTAX); exit_cleanup(RERR_SYNTAX);
} }
if (p[1] == ':') { /* double colon */ if (p[1] == ':') { /* double colon */
...@@ -828,15 +833,20 @@ static int start_client(int argc, char *argv[]) ...@@ -828,15 +833,20 @@ static int start_client(int argc, char *argv[])
host = argv[argc-1] + strlen(URL_PREFIX); host = argv[argc-1] + strlen(URL_PREFIX);
p = strchr(host,'/'); p = strchr(host,'/');
if (p) { if (p) {
*p = 0; *p = '\0';
path = p+1; path = p+1;
} else { } else
path = ""; path = "";
} if (*host == '[' && (p = strchr(host, ']')) != NULL) {
p = strchr(host,':'); host++;
*p++ = '\0';
if (*p != ':')
p = NULL;
} else
p = strchr(host, ':');
if (p) { if (p) {
rsync_port = atoi(p+1); rsync_port = atoi(p+1);
*p = 0; *p = '\0';
} }
return start_socket_client(host, path, argc-1, argv); return start_socket_client(host, path, argc-1, argv);
} }
...@@ -846,14 +856,14 @@ static int start_client(int argc, char *argv[]) ...@@ -846,14 +856,14 @@ static int start_client(int argc, char *argv[])
&& remote_filesfrom_file != files_from + 1 && remote_filesfrom_file != files_from + 1
&& strncmp(files_from, argv[argc-1], p-argv[argc-1]+1) != 0) { && strncmp(files_from, argv[argc-1], p-argv[argc-1]+1) != 0) {
rprintf(FERROR, rprintf(FERROR,
"--files-from hostname is not transfer hostname\n"); "--files-from hostname is not the same as the transfer hostname\n");
exit_cleanup(RERR_SYNTAX); exit_cleanup(RERR_SYNTAX);
} }
if (!p) { /* no colon found, so src & dest are local */ if (!p) { /* no colon found, so src & dest are local */
local_server = 1; local_server = 1;
if (remote_filesfrom_file) { if (remote_filesfrom_file) {
rprintf(FERROR, rprintf(FERROR,
"--files-from is remote but transfer is local\n"); "--files-from cannot be remote when the transfer is local\n");
exit_cleanup(RERR_SYNTAX); exit_cleanup(RERR_SYNTAX);
} }
} else if (p[1] == ':') { /* double colon */ } else if (p[1] == ':') { /* double colon */
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment