(e.g. rsync://[2001:638:500:101::21]:873/module/dir).
- Improved a couple --files-from error messages.
host = argv[0] + strlen(URL_PREFIX);
p = strchr(host,'/');
if (p) {
host = argv[0] + strlen(URL_PREFIX);
p = strchr(host,'/');
if (p) {
- }
- p = strchr(host,':');
+ if (*host == '[' && (p = strchr(host, ']')) != NULL) {
+ host++;
+ *p++ = '\0';
+ if (*p != ':')
+ p = NULL;
+ } else
+ p = strchr(host, ':');
if (p) {
rsync_port = atoi(p+1);
if (p) {
rsync_port = atoi(p+1);
}
return start_socket_client(host, path, argc-1, argv+1);
}
}
return start_socket_client(host, path, argc-1, argv+1);
}
&& remote_filesfrom_file != files_from + 1
&& strncmp(files_from, argv[0], p-argv[0]+1) != 0) {
rprintf(FERROR,
&& remote_filesfrom_file != files_from + 1
&& strncmp(files_from, argv[0], p-argv[0]+1) != 0) {
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);
}
if (p[1] == ':') { /* double colon */
exit_cleanup(RERR_SYNTAX);
}
if (p[1] == ':') { /* double colon */
host = argv[argc-1] + strlen(URL_PREFIX);
p = strchr(host,'/');
if (p) {
host = argv[argc-1] + strlen(URL_PREFIX);
p = strchr(host,'/');
if (p) {
- }
- p = strchr(host,':');
+ if (*host == '[' && (p = strchr(host, ']')) != NULL) {
+ host++;
+ *p++ = '\0';
+ if (*p != ':')
+ p = NULL;
+ } else
+ p = strchr(host, ':');
if (p) {
rsync_port = atoi(p+1);
if (p) {
rsync_port = atoi(p+1);
}
return start_socket_client(host, path, argc-1, argv);
}
}
return start_socket_client(host, path, argc-1, argv);
}
&& remote_filesfrom_file != files_from + 1
&& strncmp(files_from, argv[argc-1], p-argv[argc-1]+1) != 0) {
rprintf(FERROR,
&& remote_filesfrom_file != files_from + 1
&& strncmp(files_from, argv[argc-1], p-argv[argc-1]+1) != 0) {
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);
}
if (!p) { /* no colon found, so src & dest are local */
local_server = 1;
if (remote_filesfrom_file) {
rprintf(FERROR,
exit_cleanup(RERR_SYNTAX);
}
if (!p) { /* no colon found, so src & dest are local */
local_server = 1;
if (remote_filesfrom_file) {
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);
}
} else if (p[1] == ':') { /* double colon */
exit_cleanup(RERR_SYNTAX);
}
} else if (p[1] == ':') { /* double colon */