Skip to content

L
liblongpath-rsync
Commit 8f4ae68c authored by Wayne Davison's avatar Wayne Davison
Browse files
Options

The [ & ] are now removed from a literal IPv6 hostname passed to the 

remote shell.
parent ff1b9344
Show whitespace changes
Inline Side-by-side
Showing with 6 additions and 3 deletions
options.c
View file @ 8f4ae68c
...@@ -1780,10 +1780,10 @@ char *check_for_hostspec(char *s, char **host_ptr, int *port_ptr) ...@@ -1780,10 +1780,10 @@ char *check_for_hostspec(char *s, char **host_ptr, int *port_ptr)
{ {
char *p; char *p;
int not_host; int not_host;
int hostlen;
if (port_ptr && strncasecmp(URL_PREFIX, s, strlen(URL_PREFIX)) == 0) { if (port_ptr && strncasecmp(URL_PREFIX, s, strlen(URL_PREFIX)) == 0) {
char *path; char *path;
int hostlen;
s += strlen(URL_PREFIX); s += strlen(URL_PREFIX);
if ((p = strchr(s, '/')) != NULL) { if ((p = strchr(s, '/')) != NULL) {
hostlen = p - s; hostlen = p - s;
...@@ -1811,6 +1811,8 @@ char *check_for_hostspec(char *s, char **host_ptr, int *port_ptr) ...@@ -1811,6 +1811,8 @@ char *check_for_hostspec(char *s, char **host_ptr, int *port_ptr)
} }
if (*s == '[' && (p = strchr(s, ']')) != NULL && p[1] == ':') { if (*s == '[' && (p = strchr(s, ']')) != NULL && p[1] == ':') {
s++;
hostlen = p - s;
*p = '\0'; *p = '\0';
not_host = strchr(s, '/') || !strchr(s, ':'); not_host = strchr(s, '/') || !strchr(s, ':');
*p = ']'; *p = ']';
...@@ -1820,6 +1822,7 @@ char *check_for_hostspec(char *s, char **host_ptr, int *port_ptr) ...@@ -1820,6 +1822,7 @@ char *check_for_hostspec(char *s, char **host_ptr, int *port_ptr)
} else { } else {
if (!(p = strchr(s, ':'))) if (!(p = strchr(s, ':')))
return NULL; return NULL;
hostlen = p - s;
*p = '\0'; *p = '\0';
not_host = strchr(s, '/') != NULL; not_host = strchr(s, '/') != NULL;
*p = ':'; *p = ':';
...@@ -1827,8 +1830,8 @@ char *check_for_hostspec(char *s, char **host_ptr, int *port_ptr) ...@@ -1827,8 +1830,8 @@ char *check_for_hostspec(char *s, char **host_ptr, int *port_ptr)
return NULL; return NULL;
} }
*host_ptr = new_array(char, p - s + 1); *host_ptr = new_array(char, hostlen + 1);
strlcpy(*host_ptr, s, p - s + 1); strlcpy(*host_ptr, s, hostlen + 1);
if (p[1] == ':') { if (p[1] == ':') {
if (port_ptr && !*port_ptr) if (port_ptr && !*port_ptr)
......
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