proxmox-mirrors/libgit2
1
0
Fork 0
mirror of https://git.proxmox.com/git/libgit2 synced 2025-05-07 20:17:59 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Move extract_host_and_port to netops and add default port argument

Browse Source 
Signed-off-by: Carlos Martín Nieto <carlos@cmartin.tk>
This commit is contained in:
Carlos Martín Nieto 2011-09-04 15:32:11 +02:00
parent 3d975abcb8
commit db84b7988b
3 changed files with 34 additions and 32 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
src/netops.c
View File

@ -161,3 +161,33 @@ int gitno_select_in(gitno_buffer *buf, long int sec, long int usec)
/* The select(2) interface is silly */ /* The select(2) interface is silly */
return select(buf->fd + 1, &fds, NULL, NULL, &tv); return select(buf->fd + 1, &fds, NULL, NULL, &tv);
} }
int gitno_extract_host_and_port(char **host, char **port, const char *url, const char *default_port)
{
char *colon, *slash, *delim;
int error = GIT_SUCCESS;
colon = strchr(url, ':');
slash = strchr(url, '/');
if (slash == NULL)
return git__throw(GIT_EOBJCORRUPTED, "Malformed URL: missing /");
if (colon == NULL) {
*port = git__strdup(default_port);
} else {
*port = git__strndup(colon + 1, slash - colon - 1);
}
if (*port == NULL)
return GIT_ENOMEM;;
delim = colon == NULL ? slash : colon;
*host = git__strndup(url, delim - url);
if (*host == NULL) {
free(*port);
error = GIT_ENOMEM;
}
return error;
}

2
src/netops.h
View File

@ -26,4 +26,6 @@ int gitno_connect(const char *host, const char *port);
int gitno_send(int s, const char *msg, size_t len, int flags); int gitno_send(int s, const char *msg, size_t len, int flags);
int gitno_select_in(gitno_buffer *buf, long int sec, long int usec); int gitno_select_in(gitno_buffer *buf, long int sec, long int usec);
int gitno_extract_host_and_port(char **host, char **port, const char *url, const char *default_port);
#endif #endif

34
src/transport_git.c
View File

@ -102,37 +102,6 @@ cleanup:
return error; return error;
} }
/* The URL should already have been stripped of the protocol */
static int extract_host_and_port(char **host, char **port, const char *url)
{
char *colon, *slash, *delim;
int error = GIT_SUCCESS;
colon = strchr(url, ':');
slash = strchr(url, '/');
if (slash == NULL)
return git__throw(GIT_EOBJCORRUPTED, "Malformed URL: missing /");
if (colon == NULL) {
*port = git__strdup(GIT_DEFAULT_PORT);
} else {
*port = git__strndup(colon + 1, slash - colon - 1);
}
if (*port == NULL)
return GIT_ENOMEM;;
delim = colon == NULL ? slash : colon;
*host = git__strndup(url, delim - url);
if (*host == NULL) {
free(*port);
error = GIT_ENOMEM;
}
return error;
}
/* /*
* Parse the URL and connect to a server, storing the socket in * Parse the URL and connect to a server, storing the socket in
* out. For convenience this also takes care of asking for the remote * out. For convenience this also takes care of asking for the remote
@ -148,9 +117,10 @@ static int do_connect(transport_git *t, const char *url)
if (!git__prefixcmp(url, prefix)) if (!git__prefixcmp(url, prefix))
url += strlen(prefix); url += strlen(prefix);
error = extract_host_and_port(&host, &port, url); error = gitno_extract_host_and_port(&host, &port, url, GIT_DEFAULT_PORT);
if (error < GIT_SUCCESS) if (error < GIT_SUCCESS)
return error; return error;
s = gitno_connect(host, port); s = gitno_connect(host, port);
connected = 1; connected = 1;
error = send_request(s, NULL, url); error = send_request(s, NULL, url);