proxmox-mirrors/libgit2
1
0
Fork 0
mirror of https://git.proxmox.com/git/libgit2 synced 2025-05-09 22:39:38 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Allow to override default ssh transport_cb

Browse Source 
W/o this patch it is not possible to have a third party ssh transport_cb if GIT_SSH is disabled or a third party transport_cb which has a higher priority than the default one.

Signed-off-by: Sven Strickroth <email@cs-ware.de>
This commit is contained in:
Sven Strickroth 2014-07-30 01:41:43 +02:00
parent fa44a1699c
commit 34e510cedf
1 changed files with 33 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

58
src/transport.c
View File

@ -46,33 +46,36 @@ static git_vector custom_transports = GIT_VECTOR_INIT;
#define GIT_TRANSPORT_COUNT (sizeof(transports)/sizeof(transports[0])) - 1 #define GIT_TRANSPORT_COUNT (sizeof(transports)/sizeof(transports[0])) - 1
static transport_definition * transport_find_by_url(const char *url)
{
size_t i = 0;
transport_definition *d;
/* Find a user transport who wants to deal with this URI */
git_vector_foreach(&custom_transports, i, d) {
if (strncasecmp(url, d->prefix, strlen(d->prefix)) == 0) {
return d;
}
}
/* Find a system transport for this URI */
for (i = 0; i < GIT_TRANSPORT_COUNT; ++i) {
d = &transports[i];
if (strncasecmp(url, d->prefix, strlen(d->prefix)) == 0) {
return d;
}
}
return NULL;
}
static int transport_find_fn( static int transport_find_fn(
git_transport_cb *out, git_transport_cb *out,
const char *url, const char *url,
void **param) void **param)
{ {
size_t i = 0; transport_definition *definition = transport_find_by_url(url);
transport_definition *d, *definition = NULL;
/* Find a user transport who wants to deal with this URI */
git_vector_foreach(&custom_transports, i, d) {
if (strncasecmp(url, d->prefix, strlen(d->prefix)) == 0) {
definition = d;
break;
}
}
/* Find a system transport for this URI */
if (!definition) {
for (i = 0; i < GIT_TRANSPORT_COUNT; ++i) {
d = &transports[i];
if (strncasecmp(url, d->prefix, strlen(d->prefix)) == 0) {
definition = d;
break;
}
}
}
#ifdef GIT_WIN32 #ifdef GIT_WIN32
/* On Windows, it might not be possible to discern between absolute local /* On Windows, it might not be possible to discern between absolute local
@ -89,12 +92,15 @@ static int transport_find_fn(
/* It could be a SSH remote path. Check to see if there's a : /* It could be a SSH remote path. Check to see if there's a :
* SSH is an unsupported transport mechanism in this version of libgit2 */ * SSH is an unsupported transport mechanism in this version of libgit2 */
if (!definition && strrchr(url, ':')) if (!definition && strrchr(url, ':')) {
#ifdef GIT_SSH // re-search transports again with ssh:// as url so that we can find a third party ssh transport
definition = &ssh_transport_definition; definition = transport_find_by_url("ssh://");
#else #ifndef GIT_SSH
if (!definition) {
definition = &dummy_transport_definition; definition = &dummy_transport_definition;
}
#endif #endif
}
#ifndef GIT_WIN32 #ifndef GIT_WIN32
/* Check to see if the path points to a file on the local file system */ /* Check to see if the path points to a file on the local file system */