rugged 1.7.2 → 1.9.6

data/vendor/libgit2/src/libgit2/trailer.c

@@ -24,7 +24,7 @@ static const char *const git_generated_prefixes[] = {
 static int is_blank_line(const char *str)
 {
 	const char *s = str;
-	while (*s && *s != '\n' && isspace(*s))
+	while (*s && *s != '\n' && git__isspace(*s))
 		s++;
 	return !*s || *s == '\n';
 }
@@ -93,7 +93,7 @@ static bool find_separator(size_t *out, const char *line, const char *separators
 			return true;
 		}
 
-		if (!whitespace_found && (isalnum(*c) || *c == '-'))
+		if (!whitespace_found && (git__isalnum(*c) || *c == '-'))
 			continue;
 		if (c != line && (*c == ' ' || *c == '\t')) {
 			whitespace_found = 1;
@@ -158,7 +158,7 @@ static size_t find_patch_start(const char *str)
 	const char *s;
 
 	for (s = str; *s; s = next_line(s)) {
-		if (git__prefixcmp(s, "---") == 0)
+		if (git__prefixcmp(s, "---") == 0 && git__isspace(s[3]))
 			return s - str;
 	}
 
@@ -233,12 +233,12 @@ static size_t find_trailer_start(const char *buf, size_t len)
 		}
 
 		find_separator(&separator_pos, bol, TRAILER_SEPARATORS);
-		if (separator_pos >= 1 && !isspace(bol[0])) {
+		if (separator_pos >= 1 && !git__isspace(bol[0])) {
 			trailer_lines++;
 			possible_continuation_lines = 0;
 			if (recognized_prefix)
 				continue;
-		} else if (isspace(bol[0]))
+		} else if (git__isspace(bol[0]))
 			possible_continuation_lines++;
 		else {
 			non_trailer_lines++;
@@ -323,7 +323,7 @@ int git_message_trailers(git_message_trailer_array *trailer_arr, const char *mes
 					goto ret;
 				}
 
-				if (isalnum(*ptr) || *ptr == '-') {
+				if (git__isalnum(*ptr) || *ptr == '-') {
 					/* legal key character */
 					NEXT(S_KEY);
 				}

data/vendor/libgit2/src/libgit2/transaction.c

@@ -8,7 +8,6 @@
 #include "transaction.h"
 
 #include "repository.h"
-#include "strmap.h"
 #include "refdb.h"
 #include "pool.h"
 #include "reflog.h"
@@ -44,17 +43,23 @@ typedef struct {
 		remove :1;
 } transaction_node;
 
+GIT_HASHMAP_STR_SETUP(git_transaction_nodemap, transaction_node *);
+
 struct git_transaction {
 	transaction_t type;
 	git_repository *repo;
 	git_refdb *db;
 	git_config *cfg;
+	void *cfg_data;
 
-	git_strmap *locks;
+	git_transaction_nodemap locks;
 	git_pool pool;
 };
 
-int git_transaction_config_new(git_transaction **out, git_config *cfg)
+int git_transaction_config_new(
+	git_transaction **out,
+	git_config *cfg,
+	void *data)
 {
 	git_transaction *tx;
 
@@ -66,6 +71,8 @@ int git_transaction_config_new(git_transaction **out, git_config *cfg)
 
 	tx->type = TRANSACTION_CONFIG;
 	tx->cfg = cfg;
+	tx->cfg_data = data;
+
 	*out = tx;
 	return 0;
 }
@@ -88,11 +95,6 @@ int git_transaction_new(git_transaction **out, git_repository *repo)
 		goto on_error;
 	}
 
-	if ((error = git_strmap_new(&tx->locks)) < 0) {
-		error = -1;
-		goto on_error;
-	}
-
 	if ((error = git_repository_refdb(&tx->db, repo)) < 0)
 		goto on_error;
 
@@ -124,7 +126,7 @@ int git_transaction_lock_ref(git_transaction *tx, const char *refname)
 	if ((error = git_refdb_lock(&node->payload, tx->db, refname)) < 0)
 		return error;
 
-	if ((error = git_strmap_set(tx->locks, node->name, node)) < 0)
+	if ((error = git_transaction_nodemap_put(&tx->locks, node->name, node)) < 0)
 		goto cleanup;
 
 	return 0;
@@ -138,8 +140,11 @@ cleanup:
 static int find_locked(transaction_node **out, git_transaction *tx, const char *refname)
 {
 	transaction_node *node;
+	int error;
+
+	error = git_transaction_nodemap_get(&node, &tx->locks, refname);
 
-	if ((node = git_strmap_get(tx->locks, refname)) == NULL) {
+	if (error != 0) {
 		git_error_set(GIT_ERROR_REFERENCE, "the specified reference is not locked");
 		return GIT_ENOTFOUND;
 	}
@@ -328,18 +333,20 @@ static int update_target(git_refdb *db, transaction_node *node)
 int git_transaction_commit(git_transaction *tx)
 {
 	transaction_node *node;
+	git_hashmap_iter_t iter = GIT_HASHMAP_ITER_INIT;
 	int error = 0;
 
 	GIT_ASSERT_ARG(tx);
 
 	if (tx->type == TRANSACTION_CONFIG) {
-		error = git_config_unlock(tx->cfg, true);
+		error = git_config_unlock(tx->cfg, tx->cfg_data, true);
 		tx->cfg = NULL;
+		tx->cfg_data = NULL;
 
 		return error;
 	}
 
-	git_strmap_foreach_value(tx->locks, node, {
+	while (git_transaction_nodemap_iterate(&iter, NULL, &node, &tx->locks) == 0) {
 		if (node->reflog) {
 			if ((error = tx->db->backend->reflog_write(tx->db->backend, node->reflog)) < 0)
 				return error;
@@ -355,7 +362,7 @@ int git_transaction_commit(git_transaction *tx)
 			if ((error = update_target(tx->db, node)) < 0)
 				return error;
 		}
-	});
+	}
 
 	return 0;
 }
@@ -364,30 +371,29 @@ void git_transaction_free(git_transaction *tx)
 {
 	transaction_node *node;
 	git_pool pool;
+	git_hashmap_iter_t iter = GIT_HASHMAP_ITER_INIT;
 
 	if (!tx)
 		return;
 
 	if (tx->type == TRANSACTION_CONFIG) {
-		if (tx->cfg) {
-			git_config_unlock(tx->cfg, false);
-			git_config_free(tx->cfg);
-		}
+		if (tx->cfg)
+			git_config_unlock(tx->cfg, tx->cfg_data, false);
 
 		git__free(tx);
 		return;
 	}
 
 	/* start by unlocking the ones we've left hanging, if any */
-	git_strmap_foreach_value(tx->locks, node, {
+	while (git_transaction_nodemap_iterate(&iter, NULL, &node, &tx->locks) == 0) {
 		if (node->committed)
 			continue;
 
 		git_refdb_unlock(tx->db, node->payload, false, false, NULL, NULL, NULL);
-	});
+	}
 
 	git_refdb_free(tx->db);
-	git_strmap_free(tx->locks);
+	git_transaction_nodemap_dispose(&tx->locks);
 
 	/* tx is inside the pool, so we need to extract the data */
 	memcpy(&pool, &tx->pool, sizeof(git_pool));

data/vendor/libgit2/src/libgit2/transaction.h

@@ -9,6 +9,9 @@
 
 #include "common.h"
 
-int git_transaction_config_new(git_transaction **out, git_config *cfg);
+int git_transaction_config_new(
+	git_transaction **out,
+	git_config *cfg,
+	void *data);
 
 #endif

data/vendor/libgit2/src/libgit2/transport.c

@@ -22,6 +22,7 @@ typedef struct transport_definition {
 
 static git_smart_subtransport_definition http_subtransport_definition = { git_smart_subtransport_http, 1, NULL };
 static git_smart_subtransport_definition git_subtransport_definition = { git_smart_subtransport_git, 0, NULL };
+
 #ifdef GIT_SSH
 static git_smart_subtransport_definition ssh_subtransport_definition = { git_smart_subtransport_ssh, 0, NULL };
 #endif
@@ -33,11 +34,13 @@ static transport_definition transports[] = {
 	{ "http://",  git_transport_smart, &http_subtransport_definition },
 	{ "https://", git_transport_smart, &http_subtransport_definition },
 	{ "file://",  git_transport_local, NULL },
+
 #ifdef GIT_SSH
 	{ "ssh://",   git_transport_smart, &ssh_subtransport_definition },
 	{ "ssh+git://",   git_transport_smart, &ssh_subtransport_definition },
 	{ "git+ssh://",   git_transport_smart, &ssh_subtransport_definition },
 #endif
+
 	{ NULL, 0, 0 }
 };
 
@@ -200,7 +203,7 @@ int git_transport_unregister(const char *scheme)
 			git__free(d);
 
 			if (!custom_transports.length)
-				git_vector_free(&custom_transports);
+				git_vector_dispose(&custom_transports);
 
 			error = 0;
 			goto done;

data/vendor/libgit2/src/libgit2/transports/auth_sspi.c

@@ -324,12 +324,14 @@ static int sspi_init_context(
 	return 0;
 }
 
+#if defined(GIT_GSSAPI) || defined(GIT_GSSFRAMEWORK) || defined(GIT_WIN32)
 int git_http_auth_negotiate(
 	git_http_auth_context **out,
 	const git_net_url *url)
 {
 	return sspi_init_context(out, GIT_HTTP_AUTH_NEGOTIATE, url);
 }
+#endif
 
 int git_http_auth_ntlm(
 	git_http_auth_context **out,

data/vendor/libgit2/src/libgit2/transports/credential.c

@@ -161,7 +161,7 @@ static void ssh_custom_free(struct git_credential *cred)
 
 	if (c->publickey) {
 		/* Zero the memory which previously held the publickey */
-		size_t key_len = strlen(c->publickey);
+		size_t key_len = c->publickey_len;
 		git__memzero(c->publickey, key_len);
 		git__free(c->publickey);
 	}
@@ -204,7 +204,7 @@ int git_credential_ssh_key_memory_new(
 	const char *privatekey,
 	const char *passphrase)
 {
-#ifdef GIT_SSH_MEMORY_CREDENTIALS
+#ifdef GIT_SSH_LIBSSH2_MEMORY_CREDENTIALS
 	return git_credential_ssh_key_type_new(
 		cred,
 		username,

data/vendor/libgit2/src/libgit2/transports/git.c

@@ -39,7 +39,7 @@ typedef struct {
  */
 static int gen_proto(git_str *request, const char *cmd, const char *url)
 {
-	char *delim, *repo;
+	const char *delim, *repo;
 	char host[] = "host=";
 	size_t len;
 

data/vendor/libgit2/src/libgit2/transports/http.c

@@ -9,7 +9,6 @@
 
 #ifndef GIT_WINHTTP
 
-#include "http_parser.h"
 #include "net.h"
 #include "remote.h"
 #include "smart.h"
@@ -131,12 +130,12 @@ GIT_INLINE(void) free_cred(git_credential **cred)
 static int handle_auth(
 	http_server *server,
 	const char *server_type,
-	const char *url,
 	unsigned int allowed_schemetypes,
 	unsigned int allowed_credtypes,
 	git_credential_acquire_cb callback,
 	void *callback_payload)
 {
+	git_str server_url = GIT_STR_INIT;
 	int error = 1;
 
 	if (server->cred)
@@ -155,7 +154,8 @@ static int handle_auth(
 	}
 
 	if (error > 0 && callback) {
-		error = callback(&server->cred, url, server->url.username, allowed_credtypes, callback_payload);
+		if ((error = git_net_url_fmt(&server_url, &server->url)) == 0)
+			error = callback(&server->cred, server_url.ptr, server->url.username, allowed_credtypes, callback_payload);
 
 		/* treat GIT_PASSTHROUGH as if callback isn't set */
 		if (error == GIT_PASSTHROUGH)
@@ -170,6 +170,7 @@ static int handle_auth(
 	if (!error)
 		server->auth_schemetypes = allowed_schemetypes;
 
+	git_str_dispose(&server_url);
 	return error;
 }
 
@@ -189,7 +190,6 @@ GIT_INLINE(int) handle_remote_auth(
 	return handle_auth(
 		&transport->server,
 		SERVER_TYPE_REMOTE,
-		transport->owner->url,
 		response->server_auth_schemetypes,
 		response->server_auth_credtypes,
 		connect_opts->callbacks.credentials,
@@ -212,7 +212,6 @@ GIT_INLINE(int) handle_proxy_auth(
 	return handle_auth(
 		&transport->proxy,
 		SERVER_TYPE_PROXY,
-		connect_opts->proxy_opts.url,
 		response->server_auth_schemetypes,
 		response->proxy_auth_credtypes,
 		connect_opts->proxy_opts.credentials,
@@ -334,7 +333,7 @@ static int lookup_proxy(
 		return 0;
 	}
 
-	if (!proxy ||
+	if (!proxy || !*proxy ||
 	    (error = git_net_url_parse_http(&transport->proxy.url, proxy)) < 0)
 		goto done;
 

data/vendor/libgit2/src/libgit2/transports/http.h

@@ -15,14 +15,4 @@
 
 extern bool git_http__expect_continue;
 
-GIT_INLINE(int) git_http__user_agent(git_str *buf)
-{
-	const char *ua = git_libgit2__user_agent();
-
-	if (!ua)
-		ua = "libgit2 " LIBGIT2_VERSION;
-
-	return git_str_printf(buf, "git/2.0 (%s)", ua);
-}
-
 #endif