rugged 0.27.10 → 0.27.10.1

data/vendor/libgit2/src/hash/{sha1/win32.h → hash_win32.h}

@@ -5,10 +5,12 @@
  * a Linking Exception. For full terms see the included COPYING file.
  */
 
-#ifndef INCLUDE_hash_sha1_win32_h__
-#define INCLUDE_hash_sha1_win32_h__
+#ifndef INCLUDE_hash_hash_win32_h__
+#define INCLUDE_hash_hash_win32_h__
 
-#include "hash/sha1.h"
+#include "common.h"
+
+#include "hash.h"
 
 #include <wincrypt.h>
 #include <strsafe.h>
@@ -34,6 +36,17 @@ struct hash_cryptoapi_prov {
  * would not exist when building in pre-Windows 2008 environments.
  */
 
+#define GIT_HASH_CNG_DLL_NAME           "bcrypt.dll"
+
+/* BCRYPT_SHA1_ALGORITHM */
+#define GIT_HASH_CNG_HASH_TYPE          L"SHA1"
+
+/* BCRYPT_OBJECT_LENGTH */
+#define GIT_HASH_CNG_HASH_OBJECT_LEN    L"ObjectLength"
+
+/* BCRYPT_HASH_REUSEABLE_FLAGS */
+#define GIT_HASH_CNG_HASH_REUSABLE      0x00000020
+
 /* Function declarations for CNG */
 typedef NTSTATUS (WINAPI *hash_win32_cng_open_algorithm_provider_fn)(
 	HANDLE /* BCRYPT_ALG_HANDLE */ *phAlgorithm,
@@ -93,14 +106,14 @@ struct hash_cng_prov {
 	DWORD hash_object_size;
 };
 
-typedef struct {
+struct git_hash_prov {
 	enum hash_win32_prov_type type;
 
 	union {
 		struct hash_cryptoapi_prov cryptoapi;
 		struct hash_cng_prov cng;
 	} prov;
-} git_hash_prov;
+};
 
 /* Hash contexts */
 
@@ -115,7 +128,7 @@ struct hash_cng_ctx {
 	PBYTE hash_object;
 };
 
-struct git_hash_sha1_ctx {
+struct git_hash_ctx {
 	enum hash_win32_prov_type type;
 	git_hash_prov *prov;
 

data/vendor/libgit2/src/hash/{sha1/sha1dc → sha1dc}/sha1.c

@@ -93,23 +93,13 @@
 #define SHA1DC_BIGENDIAN
 
 /* Not under GCC-alike or glibc or *BSD or newlib or <processor whitelist> */
-#elif (defined(_AIX) || defined(__hpux))
-
-/*
- * Defines Big Endian on a whitelist of OSs that are known to be Big
- * Endian-only. See
- * https://public-inbox.org/git/93056823-2740-d072-1ebd-46b440b33d7e@felt.demon.nl/
- */
-#define SHA1DC_BIGENDIAN
-
-/* Not under GCC-alike or glibc or *BSD or newlib or <processor whitelist> or <os whitelist> */
 #elif defined(SHA1DC_ON_INTEL_LIKE_PROCESSOR)
 /*
  * As a last resort before we do anything else we're not 100% sure
  * about below, we blacklist specific processors here. We could add
  * more, see e.g. https://wiki.debian.org/ArchitectureSpecificsMemo
  */
-#else /* Not under GCC-alike or glibc or *BSD or newlib or <processor whitelist> or <os whitelist> or <processor blacklist> */
+#else /* Not under GCC-alike or glibc or *BSD or newlib or <processor whitelist>  or <processor blacklist> */
 
 /* We do nothing more here for now */
 /*#error "Uncomment this to see if you fall through all the detection"*/
@@ -124,11 +114,10 @@
 #endif
 /*ENDIANNESS SELECTION*/
 
-#ifndef SHA1DC_FORCE_ALIGNED_ACCESS
 #if defined(SHA1DC_FORCE_UNALIGNED_ACCESS) || defined(SHA1DC_ON_INTEL_LIKE_PROCESSOR)
 #define SHA1DC_ALLOW_UNALIGNED_ACCESS
-#endif /*UNALIGNED ACCESS DETECTION*/
-#endif /*FORCE ALIGNED ACCESS*/
+#endif /*UNALIGNMENT DETECTION*/
+
 
 #define rotate_right(x,n) (((x)>>(n))|((x)<<(32-(n))))
 #define rotate_left(x,n)  (((x)<<(n))|((x)>>(32-(n))))

data/vendor/libgit2/src/hashsig.c

@@ -8,7 +8,7 @@
 #include "common.h"
 
 #include "git2/sys/hashsig.h"
-#include "futils.h"
+#include "fileops.h"
 #include "util.h"
 
 typedef uint32_t hashsig_t;
@@ -216,7 +216,7 @@ static int hashsig_finalize_hashes(git_hashsig *sig)
 {
 	if (sig->mins.size < HASHSIG_HEAP_MIN_SIZE &&
 		!(sig->opt & GIT_HASHSIG_ALLOW_SMALL_FILES)) {
-		git_error_set(GIT_ERROR_INVALID,
+		giterr_set(GITERR_INVALID,
 			"file too small for similarity signature calculation");
 		return GIT_EBUFS;
 	}
@@ -249,7 +249,7 @@ int git_hashsig_create(
 	int error;
 	hashsig_in_progress prog;
 	git_hashsig *sig = hashsig_alloc(opts);
-	GIT_ERROR_CHECK_ALLOC(sig);
+	GITERR_CHECK_ALLOC(sig);
 
 	hashsig_in_progress_init(&prog, sig);
 
@@ -276,7 +276,7 @@ int git_hashsig_create_fromfile(
 	int error = 0, fd;
 	hashsig_in_progress prog;
 	git_hashsig *sig = hashsig_alloc(opts);
-	GIT_ERROR_CHECK_ALLOC(sig);
+	GITERR_CHECK_ALLOC(sig);
 
 	if ((fd = git_futils_open_ro(path)) < 0) {
 		git__free(sig);
@@ -288,7 +288,7 @@ int git_hashsig_create_fromfile(
 	while (!error) {
 		if ((buflen = p_read(fd, buf, sizeof(buf))) <= 0) {
 			if ((error = (int)buflen) < 0)
-				git_error_set(GIT_ERROR_OS,
+				giterr_set(GITERR_OS,
 					"read error on '%s' calculating similarity hashes", path);
 			break;
 		}

data/vendor/libgit2/src/idxmap.c

@@ -7,173 +7,127 @@
 
 #include "idxmap.h"
 
-#define kmalloc git__malloc
-#define kcalloc git__calloc
-#define krealloc git__realloc
-#define kreallocarray git__reallocarray
-#define kfree git__free
-#include "khash.h"
-
-__KHASH_TYPE(idx, const git_index_entry *, git_index_entry *)
-__KHASH_TYPE(idxicase, const git_index_entry *, git_index_entry *)
-
 /* This is __ac_X31_hash_string but with tolower and it takes the entry's stage into account */
 static kh_inline khint_t idxentry_hash(const git_index_entry *e)
 {
 	const char *s = e->path;
 	khint_t h = (khint_t)git__tolower(*s);
 	if (h) for (++s ; *s; ++s) h = (h << 5) - h + (khint_t)git__tolower(*s);
-	return h + GIT_INDEX_ENTRY_STAGE(e);
+	return h + GIT_IDXENTRY_STAGE(e);
 }
 
-#define idxentry_equal(a, b) (GIT_INDEX_ENTRY_STAGE(a) == GIT_INDEX_ENTRY_STAGE(b) && strcmp(a->path, b->path) == 0)
-#define idxentry_icase_equal(a, b) (GIT_INDEX_ENTRY_STAGE(a) == GIT_INDEX_ENTRY_STAGE(b) && strcasecmp(a->path, b->path) == 0)
+#define idxentry_equal(a, b) (GIT_IDXENTRY_STAGE(a) == GIT_IDXENTRY_STAGE(b) && strcmp(a->path, b->path) == 0)
+#define idxentry_icase_equal(a, b) (GIT_IDXENTRY_STAGE(a) == GIT_IDXENTRY_STAGE(b) && strcasecmp(a->path, b->path) == 0)
 
 __KHASH_IMPL(idx, static kh_inline, const git_index_entry *, git_index_entry *, 1, idxentry_hash, idxentry_equal)
 __KHASH_IMPL(idxicase, static kh_inline, const git_index_entry *, git_index_entry *, 1, idxentry_hash, idxentry_icase_equal)
 
-int git_idxmap_new(git_idxmap **out)
+int git_idxmap_alloc(git_idxmap **map)
 {
-	*out = kh_init(idx);
-	GIT_ERROR_CHECK_ALLOC(*out);
+	if ((*map = kh_init(idx)) == NULL) {
+		giterr_set_oom();
+		return -1;
+	}
 
 	return 0;
 }
 
-int git_idxmap_icase_new(git_idxmap_icase **out)
+int git_idxmap_icase_alloc(git_idxmap_icase **map)
 {
-	*out = kh_init(idxicase);
-	GIT_ERROR_CHECK_ALLOC(*out);
+	if ((*map = kh_init(idxicase)) == NULL) {
+		giterr_set_oom();
+		return -1;
+	}
 
 	return 0;
 }
 
-void git_idxmap_free(git_idxmap *map)
+void git_idxmap_insert(git_idxmap *map, const git_index_entry *key, void *value, int *rval)
 {
-	kh_destroy(idx, map);
-}
+	khiter_t idx = kh_put(idx, map, key, rval);
 
-void git_idxmap_icase_free(git_idxmap_icase *map)
-{
-	kh_destroy(idxicase, map);
+	if ((*rval) >= 0) {
+		if ((*rval) == 0)
+			kh_key(map, idx) = key;
+		kh_val(map, idx) = value;
+	}
 }
 
-void git_idxmap_clear(git_idxmap *map)
+void git_idxmap_icase_insert(git_idxmap_icase *map, const git_index_entry *key, void *value, int *rval)
 {
-	kh_clear(idx, map);
-}
+	khiter_t idx = kh_put(idxicase, map, key, rval);
 
-void git_idxmap_icase_clear(git_idxmap_icase *map)
-{
-	kh_clear(idxicase, map);
+	if ((*rval) >= 0) {
+		if ((*rval) == 0)
+			kh_key(map, idx) = key;
+		kh_val(map, idx) = value;
+	}
 }
 
-int git_idxmap_resize(git_idxmap *map, size_t size)
+size_t git_idxmap_lookup_index(git_idxmap *map, const git_index_entry *key)
 {
-	if (!git__is_uint32(size) ||
-	    kh_resize(idx, map, (khiter_t)size) < 0) {
-		git_error_set_oom();
-		return -1;
-	}
-	return 0;
+	return kh_get(idx, map, key);
 }
 
-int git_idxmap_icase_resize(git_idxmap_icase *map, size_t size)
+size_t git_idxmap_icase_lookup_index(git_idxmap_icase *map, const git_index_entry *key)
 {
-	if (!git__is_uint32(size) ||
-	    kh_resize(idxicase, map, (khiter_t)size) < 0) {
-		git_error_set_oom();
-		return -1;
-	}
-	return 0;
+	return kh_get(idxicase, map, key);
 }
 
-void *git_idxmap_get(git_idxmap *map, const git_index_entry *key)
+void *git_idxmap_value_at(git_idxmap *map, size_t idx)
 {
-	size_t idx = kh_get(idx, map, key);
-	if (idx == kh_end(map) || !kh_exist(map, idx))
-		return NULL;
 	return kh_val(map, idx);
 }
 
-int git_idxmap_set(git_idxmap *map, const git_index_entry *key, void *value)
+int git_idxmap_valid_index(git_idxmap *map, size_t idx)
 {
-	size_t idx;
-	int rval;
-
-	idx = kh_put(idx, map, key, &rval);
-	if (rval < 0)
-		return -1;
-
-	if (rval == 0)
-		kh_key(map, idx) = key;
-
-	kh_val(map, idx) = value;
-
-	return 0;
+	return idx != kh_end(map);
 }
 
-int git_idxmap_icase_set(git_idxmap_icase *map, const git_index_entry *key, void *value)
+int git_idxmap_has_data(git_idxmap *map, size_t idx)
 {
-	size_t idx;
-	int rval;
-
-	idx = kh_put(idxicase, map, key, &rval);
-	if (rval < 0)
-		return -1;
-
-	if (rval == 0)
-		kh_key(map, idx) = key;
-
-	kh_val(map, idx) = value;
-
-	return 0;
+	return kh_exist(map, idx);
 }
 
-void *git_idxmap_icase_get(git_idxmap_icase *map, const git_index_entry *key)
+void git_idxmap_resize(git_idxmap *map, size_t size)
 {
-	size_t idx = kh_get(idxicase, map, key);
-	if (idx == kh_end(map) || !kh_exist(map, idx))
-		return NULL;
-	return kh_val(map, idx);
+	kh_resize(idx, map, size);
 }
 
-void git_idxmap_insert(git_idxmap *map, const git_index_entry *key, void *value, int *rval)
+void git_idxmap_icase_resize(git_idxmap_icase *map, size_t size)
 {
-	khiter_t idx = kh_put(idx, map, key, rval);
-
-	if ((*rval) >= 0) {
-		if ((*rval) == 0)
-			kh_key(map, idx) = key;
-		kh_val(map, idx) = value;
-	}
+	kh_resize(idxicase, map, size);
 }
 
-void git_idxmap_icase_insert(git_idxmap_icase *map, const git_index_entry *key, void *value, int *rval)
+void git_idxmap_free(git_idxmap *map)
 {
-	khiter_t idx = kh_put(idxicase, map, key, rval);
+	kh_destroy(idx, map);
+}
 
-	if ((*rval) >= 0) {
-		if ((*rval) == 0)
-			kh_key(map, idx) = key;
-		kh_val(map, idx) = value;
-	}
+void git_idxmap_clear(git_idxmap *map)
+{
+	kh_clear(idx, map);
 }
 
-int git_idxmap_delete(git_idxmap *map, const git_index_entry *key)
+void git_idxmap_delete_at(git_idxmap *map, size_t idx)
 {
-	khiter_t idx = kh_get(idx, map, key);
-	if (idx == kh_end(map))
-		return GIT_ENOTFOUND;
 	kh_del(idx, map, idx);
-	return 0;
 }
 
-int git_idxmap_icase_delete(git_idxmap_icase *map, const git_index_entry *key)
+void git_idxmap_icase_delete_at(git_idxmap_icase *map, size_t idx)
 {
-	khiter_t idx = kh_get(idxicase, map, key);
-	if (idx == kh_end(map))
-		return GIT_ENOTFOUND;
 	kh_del(idxicase, map, idx);
-	return 0;
+}
+
+void git_idxmap_delete(git_idxmap *map, const git_index_entry *key)
+{
+	khiter_t idx = git_idxmap_lookup_index(map, key);
+	if (git_idxmap_valid_index(map, idx))
+		git_idxmap_delete_at(map, idx);
+}
+void git_idxmap_icase_delete(git_idxmap_icase *map, const git_index_entry *key)
+{
+	khiter_t idx = git_idxmap_icase_lookup_index(map, key);
+	if (git_idxmap_valid_index((git_idxmap *)map, idx))
+		git_idxmap_icase_delete_at(map, idx);
 }

data/vendor/libgit2/src/idxmap.h

@@ -9,169 +9,47 @@
 
 #include "common.h"
 
+#include <ctype.h>
 #include "git2/index.h"
 
-/** A map with `git_index_entry`s as key. */
-typedef struct kh_idx_s git_idxmap;
-/** A map with case-insensitive `git_index_entry`s as key */
-typedef struct kh_idxicase_s git_idxmap_icase;
+#define kmalloc git__malloc
+#define kcalloc git__calloc
+#define krealloc git__realloc
+#define kreallocarray git__reallocarray
+#define kfree git__free
+#include "khash.h"
 
-/**
- * Allocate a new index entry map.
- *
- * @param out Pointer to the map that shall be allocated.
- * @return 0 on success, an error code if allocation has failed.
- */
-int git_idxmap_new(git_idxmap **out);
+__KHASH_TYPE(idx, const git_index_entry *, git_index_entry *)
+__KHASH_TYPE(idxicase, const git_index_entry *, git_index_entry *)
 
-/**
- * Allocate a new case-insensitive index entry map.
- *
- * @param out Pointer to the map that shall be allocated.
- * @return 0 on success, an error code if allocation has failed.
- */
-int git_idxmap_icase_new(git_idxmap_icase **out);
+typedef khash_t(idx) git_idxmap;
+typedef khash_t(idxicase) git_idxmap_icase;
 
-/**
- * Free memory associated with the map.
- *
- * Note that this function will _not_ free values added to this
- * map.
- *
- * @param map Pointer to the map that is to be free'd. May be
- *            `NULL`.
- */
-void git_idxmap_free(git_idxmap *map);
+typedef khiter_t git_idxmap_iter;
 
-/**
- * Free memory associated with the map.
- *
- * Note that this function will _not_ free values added to this
- * map.
- *
- * @param map Pointer to the map that is to be free'd. May be
- *            `NULL`.
- */
-void git_idxmap_icase_free(git_idxmap_icase *map);
+int git_idxmap_alloc(git_idxmap **map);
+int git_idxmap_icase_alloc(git_idxmap_icase **map);
+void git_idxmap_insert(git_idxmap *map, const git_index_entry *key, void *value, int *rval);
+void git_idxmap_icase_insert(git_idxmap_icase *map, const git_index_entry *key, void *value, int *rval);
 
-/**
- * Clear all entries from the map.
- *
- * This function will remove all entries from the associated map.
- * Memory associated with it will not be released, though.
- *
- * @param map Pointer to the map that shall be cleared. May be
- *            `NULL`.
- */
-void git_idxmap_clear(git_idxmap *map);
+size_t git_idxmap_lookup_index(git_idxmap *map, const git_index_entry *key);
+size_t git_idxmap_icase_lookup_index(git_idxmap_icase *map, const git_index_entry *key);
+void *git_idxmap_value_at(git_idxmap *map, size_t idx);
+int git_idxmap_valid_index(git_idxmap *map, size_t idx);
+int git_idxmap_has_data(git_idxmap *map, size_t idx);
 
-/**
- * Clear all entries from the map.
- *
- * This function will remove all entries from the associated map.
- * Memory associated with it will not be released, though.
- *
- * @param map Pointer to the map that shall be cleared. May be
- *            `NULL`.
- */
-void git_idxmap_icase_clear(git_idxmap_icase *map);
-
-/**
- * Resize the map by allocating more memory.
- *
- * @param map map that shall be resized
- * @param size count of entries that the map shall hold
- * @return `0` if the map was successfully resized, a negative
- *         error code otherwise
- */
-int git_idxmap_resize(git_idxmap *map, size_t size);
-
-/**
- * Resize the map by allocating more memory.
- *
- * @param map map that shall be resized
- * @param size count of entries that the map shall hold
- * @return `0` if the map was successfully resized, a negative
- *         error code otherwise
- */
-int git_idxmap_icase_resize(git_idxmap_icase *map, size_t size);
-
-/**
- * Return value associated with the given key.
- *
- * @param map map to search key in
- * @param key key to search for; the index entry will be searched
- *            for by its case-sensitive path
- * @return value associated with the given key or NULL if the key was not found
- */
-void *git_idxmap_get(git_idxmap *map, const git_index_entry *key);
-
-/**
- * Return value associated with the given key.
- *
- * @param map map to search key in
- * @param key key to search for; the index entry will be searched
- *            for by its case-insensitive path
- * @return value associated with the given key or NULL if the key was not found
- */
-void *git_idxmap_icase_get(git_idxmap_icase *map, const git_index_entry *key);
-
-/**
- * Set the entry for key to value.
- *
- * If the map has no corresponding entry for the given key, a new
- * entry will be created with the given value. If an entry exists
- * already, its value will be updated to match the given value.
- *
- * @param map map to create new entry in
- * @param key key to set
- * @param value value to associate the key with; may be NULL
- * @return zero if the key was successfully set, a negative error
- *         code otherwise
- */
-int git_idxmap_set(git_idxmap *map, const git_index_entry *key, void *value);
+void git_idxmap_resize(git_idxmap *map, size_t size);
+void git_idxmap_icase_resize(git_idxmap_icase *map, size_t size);
+void git_idxmap_free(git_idxmap *map);
+void git_idxmap_clear(git_idxmap *map);
 
-/**
- * Set the entry for key to value.
- *
- * If the map has no corresponding entry for the given key, a new
- * entry will be created with the given value. If an entry exists
- * already, its value will be updated to match the given value.
- *
- * @param map map to create new entry in
- * @param key key to set
- * @param value value to associate the key with; may be NULL
- * @return zero if the key was successfully set, a negative error
- *         code otherwise
- */
-int git_idxmap_icase_set(git_idxmap_icase *map, const git_index_entry *key, void *value);
+void git_idxmap_delete_at(git_idxmap *map, size_t idx);
+void git_idxmap_icase_delete_at(git_idxmap_icase *map, size_t idx);
 
-/**
- * Delete an entry from the map.
- *
- * Delete the given key and its value from the map. If no such
- * key exists, this will do nothing.
- *
- * @param map map to delete key in
- * @param key key to delete
- * @return `0` if the key has been deleted, GIT_ENOTFOUND if no
- *         such key was found, a negative code in case of an
- *         error
- */
-int git_idxmap_delete(git_idxmap *map, const git_index_entry *key);
+void git_idxmap_delete(git_idxmap *map, const git_index_entry *key);
+void git_idxmap_icase_delete(git_idxmap_icase *map, const git_index_entry *key);
 
-/**
- * Delete an entry from the map.
- *
- * Delete the given key and its value from the map. If no such
- * key exists, this will do nothing.
- *
- * @param map map to delete key in
- * @param key key to delete
- * @return `0` if the key has been deleted, GIT_ENOTFOUND if no
- *         such key was found, a negative code in case of an
- *         error
- */
-int git_idxmap_icase_delete(git_idxmap_icase *map, const git_index_entry *key);
+#define git_idxmap_begin		kh_begin
+#define git_idxmap_end		kh_end
 
 #endif