mirror/rsync
1
0
Fork 0
mirror of https://github.com/RsyncProject/rsync.git synced 2026-05-17 19:35:29 -04:00
Code Issues Packages Projects Releases Wiki Activity

A few more improvements to the hostspec-parsing code.

Browse Source
This commit is contained in:
Wayne Davison
2009-01-28 23:17:46 -08:00
parent 794f38099a
commit 650bca3770
1 changed files with 8 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
options.c
View File

@@ -2083,17 +2083,18 @@ void server_options(char **args, int *argc_p)
* (required for parsing) [ and ] chars elided from the returned string. */
static char *parse_hostspec(char *str, char **path_start_ptr, int *port_ptr)
{
char *s = str;
char *host_start = str;
char *s, *host_start = str;
int hostlen = 0, userlen = 0;
char *ret;
for ( ; ; s++) {
for (s = str; ; s++) {
if (!*s) {
/* It is only OK if we run out of string with rsync:// */
if (port_ptr)
break;
return NULL;
if (!port_ptr)
return NULL;
if (!hostlen)
hostlen = s - host_start;
break;
}
if (*s == ':' || *s == '/') {
if (!hostlen)
@@ -2104,7 +2105,7 @@ static char *parse_hostspec(char *str, char **path_start_ptr, int *port_ptr)
} else if (port_ptr) {
*port_ptr = atoi(s);
while (isDigit(s)) s++;
if (*s++ != '/')
if (*s && *s++ != '/')
return NULL;
}
break;