mirror/rsync
1
0
Fork 0
mirror of https://github.com/RsyncProject/rsync.git synced 2026-05-05 21:45:22 -04:00
Code Issues Packages Projects Releases Wiki Activity

Fix a bug introduced in 1.119, whereby strings like

Browse Source 
"mirror.aarnet.edu.au::" were not properly digested.

It wasn't even my bug! :-)
This commit is contained in:
Martin Pool
2001-08-15 07:50:07 +00:00
parent 2db52650fc
commit 7169bb4aa9
1 changed files with 26 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

31
main.c
View File

@@ -583,6 +583,22 @@ static char *find_colon(char *s)
}
static int copy_argv (char *argv[])
{
int i;
for (i = 0; argv[i]; i++) {
if (!(argv[i] = strdup(argv[i]))) {
rprintf (FERROR, "out of memory at %s(%d)\n",
__FILE__, __LINE__);
return RERR_MALLOC;
}
}
return 0;
}
/*
* Start a client for either type of remote connection. Work out
* whether the arguments request a remote shell or rsyncd connection,
@@ -602,13 +618,18 @@ static int start_client(int argc, char *argv[])
extern char *shell_cmd;
extern int rsync_port;
extern int whole_file;
char *argv0 = strdup(argv[0]);
extern int read_batch;
int rc;
if (strncasecmp(URL_PREFIX, argv0, strlen(URL_PREFIX)) == 0) {
/* Don't clobber argv[] so that ps(1) can still show the right
command line. */
if ((rc = copy_argv (argv)))
return rc;
if (strncasecmp(URL_PREFIX, argv[0], strlen(URL_PREFIX)) == 0) {
char *host, *path;
host = argv0 + strlen(URL_PREFIX);
host = argv[0] + strlen(URL_PREFIX);
p = strchr(host,'/');
if (p) {
*p = 0;
@@ -630,7 +651,7 @@ static int start_client(int argc, char *argv[])
if (p) {
if (p[1] == ':') {
*p = 0;
return start_socket_client(argv0, p+2, argc-1, argv+1);
return start_socket_client(argv[0], p+2, argc-1, argv+1);
}
if (argc < 1) {
@@ -640,7 +661,7 @@ static int start_client(int argc, char *argv[])
am_sender = 0;
*p = 0;
shell_machine = argv0;
shell_machine = argv[0];
shell_path = p+1;
argc--;
argv++;