rugged 1.6.5 → 1.7.2

data/vendor/libgit2/src/util/win32/utf-conv.h

@@ -15,15 +15,46 @@
 # define WC_ERR_INVALID_CHARS	0x80
 #endif
 
+/**
+ * Converts a NUL-terminated UTF-8 string to wide characters. This is a
+ * convenience function for `git_utf8_to_16_with_len`.
+ *
+ * @param dest The buffer to receive the wide string.
+ * @param dest_size The size of the buffer, in characters.
+ * @param src The UTF-8 string to convert.
+ * @return The length of the wide string, in characters
+ *         (not counting the NULL terminator), or < 0 for failure
+ */
+int git_utf8_to_16(wchar_t *dest, size_t dest_size, const char *src);
+
 /**
  * Converts a UTF-8 string to wide characters.
  *
  * @param dest The buffer to receive the wide string.
  * @param dest_size The size of the buffer, in characters.
  * @param src The UTF-8 string to convert.
- * @return The length of the wide string, in characters (not counting the NULL terminator), or < 0 for failure
+ * @param src_len The length of the string to convert.
+ * @return The length of the wide string, in characters
+ *         (not counting the NULL terminator), or < 0 for failure
+ */
+int git_utf8_to_16_with_len(
+	wchar_t *dest,
+	size_t dest_size,
+	const char *src,
+	int src_len);
+
+/**
+ * Converts a NUL-terminated wide string to UTF-8. This is a convenience
+ * function for `git_utf8_from_16_with_len`.
+ *
+ * @param dest The buffer to receive the UTF-8 string.
+ * @param dest_size The size of the buffer, in bytes.
+ * @param src The wide string to convert.
+ * @param src_len The length of the string to convert.
+ * @return The length of the UTF-8 string, in bytes
+ *         (not counting the NULL terminator), or < 0 for failure
  */
-int git__utf8_to_16(wchar_t *dest, size_t dest_size, const char *src);
+int git_utf8_from_16(char *dest, size_t dest_size, const wchar_t *src);
 
 /**
  * Converts a wide string to UTF-8.
@@ -31,30 +62,66 @@ int git__utf8_to_16(wchar_t *dest, size_t dest_size, const char *src);
  * @param dest The buffer to receive the UTF-8 string.
  * @param dest_size The size of the buffer, in bytes.
  * @param src The wide string to convert.
- * @return The length of the UTF-8 string, in bytes (not counting the NULL terminator), or < 0 for failure
+ * @param src_len The length of the string to convert.
+ * @return The length of the UTF-8 string, in bytes
+ *         (not counting the NULL terminator), or < 0 for failure
  */
-int git__utf16_to_8(char *dest, size_t dest_size, const wchar_t *src);
+int git_utf8_from_16_with_len(char *dest, size_t dest_size, const wchar_t *src, int src_len);
 
 /**
- * Converts a UTF-8 string to wide characters.
- * Memory is allocated to hold the converted string.
- * The caller is responsible for freeing the string with git__free.
+ * Converts a UTF-8 string to wide characters. Memory is allocated to hold
+ * the converted string. The caller is responsible for freeing the string
+ * with git__free.
  *
  * @param dest Receives a pointer to the wide string.
  * @param src The UTF-8 string to convert.
- * @return The length of the wide string, in characters (not counting the NULL terminator), or < 0 for failure
+ * @return The length of the wide string, in characters
+ *         (not counting the NULL terminator), or < 0 for failure
  */
-int git__utf8_to_16_alloc(wchar_t **dest, const char *src);
+int git_utf8_to_16_alloc(wchar_t **dest, const char *src);
 
 /**
- * Converts a wide string to UTF-8.
- * Memory is allocated to hold the converted string.
- * The caller is responsible for freeing the string with git__free.
+ * Converts a UTF-8 string to wide characters. Memory is allocated to hold
+ * the converted string. The caller is responsible for freeing the string
+ * with git__free.
+ *
+ * @param dest Receives a pointer to the wide string.
+ * @param src The UTF-8 string to convert.
+ * @param src_len The length of the string.
+ * @return The length of the wide string, in characters
+ *         (not counting the NULL terminator), or < 0 for failure
+ */
+int git_utf8_to_16_alloc_with_len(
+	wchar_t **dest,
+	const char *src,
+	int src_len);
+
+/**
+ * Converts a wide string to UTF-8. Memory is allocated to hold the
+ * converted string. The caller is responsible for freeing the string
+ * with git__free.
+ *
+ * @param dest Receives a pointer to the UTF-8 string.
+ * @param src The wide string to convert.
+ * @return The length of the UTF-8 string, in bytes
+ *         (not counting the NULL terminator), or < 0 for failure
+ */
+int git_utf8_from_16_alloc(char **dest, const wchar_t *src);
+
+/**
+ * Converts a wide string to UTF-8. Memory is allocated to hold the
+ * converted string. The caller is responsible for freeing the string
+ * with git__free.
  *
  * @param dest Receives a pointer to the UTF-8 string.
  * @param src The wide string to convert.
- * @return The length of the UTF-8 string, in bytes (not counting the NULL terminator), or < 0 for failure
+ * @param src_len The length of the wide string.
+ * @return The length of the UTF-8 string, in bytes
+ *         (not counting the NULL terminator), or < 0 for failure
  */
-int git__utf16_to_8_alloc(char **dest, const wchar_t *src);
+int git_utf8_from_16_alloc_with_len(
+	char **dest,
+	const wchar_t *src,
+	int src_len);
 
 #endif

data/vendor/libgit2/src/util/win32/w32_util.c

@@ -115,7 +115,7 @@ int git_win32__file_attribute_to_stat(
 
 			/* st_size gets the UTF-8 length of the target name, in bytes,
 			 * not counting the NULL terminator */
-			if ((st->st_size = git__utf16_to_8(NULL, 0, target)) < 0) {
+			if ((st->st_size = git_utf8_from_16(NULL, 0, target)) < 0) {
 				git_error_set(GIT_ERROR_OS, "could not convert reparse point name for '%ls'", path);
 				return -1;
 			}

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rugged
 version: !ruby/object:Gem::Version
-  version: 1.6.5
+  version: 1.7.2
 platform: ruby
 authors:
 - Scott Chacon
@@ -125,6 +125,7 @@ files:
 - vendor/libgit2/COPYING
 - vendor/libgit2/cmake/AddCFlagIfSupported.cmake
 - vendor/libgit2/cmake/AddClarTest.cmake
+- vendor/libgit2/cmake/CheckPrototypeDefinitionSafe.cmake
 - vendor/libgit2/cmake/DefaultCFlags.cmake
 - vendor/libgit2/cmake/EnableWarnings.cmake
 - vendor/libgit2/cmake/ExperimentalFeatures.cmake
@@ -150,7 +151,7 @@ files:
 - vendor/libgit2/cmake/SelectHashes.cmake
 - vendor/libgit2/cmake/SelectRegex.cmake
 - vendor/libgit2/cmake/SelectSSH.cmake
-- vendor/libgit2/cmake/SelectWinHTTP.cmake
+- vendor/libgit2/cmake/SelectXdiff.cmake
 - vendor/libgit2/cmake/SelectZlib.cmake
 - vendor/libgit2/deps/chromium-zlib/CMakeLists.txt
 - vendor/libgit2/deps/http-parser/CMakeLists.txt
@@ -219,6 +220,23 @@ files:
 - vendor/libgit2/deps/winhttp/winhttp.def
 - vendor/libgit2/deps/winhttp/winhttp.h
 - vendor/libgit2/deps/winhttp/winhttp64.def
+- vendor/libgit2/deps/xdiff/CMakeLists.txt
+- vendor/libgit2/deps/xdiff/git-xdiff.h
+- vendor/libgit2/deps/xdiff/xdiff.h
+- vendor/libgit2/deps/xdiff/xdiffi.c
+- vendor/libgit2/deps/xdiff/xdiffi.h
+- vendor/libgit2/deps/xdiff/xemit.c
+- vendor/libgit2/deps/xdiff/xemit.h
+- vendor/libgit2/deps/xdiff/xhistogram.c
+- vendor/libgit2/deps/xdiff/xinclude.h
+- vendor/libgit2/deps/xdiff/xmacros.h
+- vendor/libgit2/deps/xdiff/xmerge.c
+- vendor/libgit2/deps/xdiff/xpatience.c
+- vendor/libgit2/deps/xdiff/xprepare.c
+- vendor/libgit2/deps/xdiff/xprepare.h
+- vendor/libgit2/deps/xdiff/xtypes.h
+- vendor/libgit2/deps/xdiff/xutils.c
+- vendor/libgit2/deps/xdiff/xutils.h
 - vendor/libgit2/deps/zlib/CMakeLists.txt
 - vendor/libgit2/deps/zlib/COPYING
 - vendor/libgit2/deps/zlib/adler32.c
@@ -437,6 +455,8 @@ files:
 - vendor/libgit2/src/libgit2/filter.c
 - vendor/libgit2/src/libgit2/filter.h
 - vendor/libgit2/src/libgit2/git2.rc
+- vendor/libgit2/src/libgit2/grafts.c
+- vendor/libgit2/src/libgit2/grafts.h
 - vendor/libgit2/src/libgit2/graph.c
 - vendor/libgit2/src/libgit2/hashsig.c
 - vendor/libgit2/src/libgit2/ident.c
@@ -464,8 +484,6 @@ files:
 - vendor/libgit2/src/libgit2/midx.h
 - vendor/libgit2/src/libgit2/mwindow.c
 - vendor/libgit2/src/libgit2/mwindow.h
-- vendor/libgit2/src/libgit2/netops.c
-- vendor/libgit2/src/libgit2/netops.h
 - vendor/libgit2/src/libgit2/notes.c
 - vendor/libgit2/src/libgit2/notes.h
 - vendor/libgit2/src/libgit2/object.c
@@ -545,6 +563,8 @@ files:
 - vendor/libgit2/src/libgit2/streams/openssl_legacy.h
 - vendor/libgit2/src/libgit2/streams/registry.c
 - vendor/libgit2/src/libgit2/streams/registry.h
+- vendor/libgit2/src/libgit2/streams/schannel.c
+- vendor/libgit2/src/libgit2/streams/schannel.h
 - vendor/libgit2/src/libgit2/streams/socket.c
 - vendor/libgit2/src/libgit2/streams/socket.h
 - vendor/libgit2/src/libgit2/streams/stransport.c
@@ -567,10 +587,11 @@ files:
 - vendor/libgit2/src/libgit2/transport.c
 - vendor/libgit2/src/libgit2/transports/auth.c
 - vendor/libgit2/src/libgit2/transports/auth.h
-- vendor/libgit2/src/libgit2/transports/auth_negotiate.c
+- vendor/libgit2/src/libgit2/transports/auth_gssapi.c
 - vendor/libgit2/src/libgit2/transports/auth_negotiate.h
-- vendor/libgit2/src/libgit2/transports/auth_ntlm.c
 - vendor/libgit2/src/libgit2/transports/auth_ntlm.h
+- vendor/libgit2/src/libgit2/transports/auth_ntlmclient.c
+- vendor/libgit2/src/libgit2/transports/auth_sspi.c
 - vendor/libgit2/src/libgit2/transports/credential.c
 - vendor/libgit2/src/libgit2/transports/credential_helpers.c
 - vendor/libgit2/src/libgit2/transports/git.c
@@ -593,22 +614,6 @@ files:
 - vendor/libgit2/src/libgit2/userdiff.h
 - vendor/libgit2/src/libgit2/worktree.c
 - vendor/libgit2/src/libgit2/worktree.h
-- vendor/libgit2/src/libgit2/xdiff/git-xdiff.h
-- vendor/libgit2/src/libgit2/xdiff/xdiff.h
-- vendor/libgit2/src/libgit2/xdiff/xdiffi.c
-- vendor/libgit2/src/libgit2/xdiff/xdiffi.h
-- vendor/libgit2/src/libgit2/xdiff/xemit.c
-- vendor/libgit2/src/libgit2/xdiff/xemit.h
-- vendor/libgit2/src/libgit2/xdiff/xhistogram.c
-- vendor/libgit2/src/libgit2/xdiff/xinclude.h
-- vendor/libgit2/src/libgit2/xdiff/xmacros.h
-- vendor/libgit2/src/libgit2/xdiff/xmerge.c
-- vendor/libgit2/src/libgit2/xdiff/xpatience.c
-- vendor/libgit2/src/libgit2/xdiff/xprepare.c
-- vendor/libgit2/src/libgit2/xdiff/xprepare.h
-- vendor/libgit2/src/libgit2/xdiff/xtypes.h
-- vendor/libgit2/src/libgit2/xdiff/xutils.c
-- vendor/libgit2/src/libgit2/xdiff/xutils.h
 - vendor/libgit2/src/util/CMakeLists.txt
 - vendor/libgit2/src/util/alloc.c
 - vendor/libgit2/src/util/alloc.h
@@ -672,6 +677,7 @@ files:
 - vendor/libgit2/src/util/runtime.h
 - vendor/libgit2/src/util/sortedcache.c
 - vendor/libgit2/src/util/sortedcache.h
+- vendor/libgit2/src/util/staticstr.h
 - vendor/libgit2/src/util/str.c
 - vendor/libgit2/src/util/str.h
 - vendor/libgit2/src/util/strmap.c

data/vendor/libgit2/cmake/SelectWinHTTP.cmake

@@ -1,17 +0,0 @@
-if(WIN32 AND USE_WINHTTP)
-	set(GIT_WINHTTP 1)
-
-	# Since MinGW does not come with headers or an import library for winhttp,
-	# we have to include a private header and generate our own import library
-	if(MINGW)
-		add_subdirectory("${PROJECT_SOURCE_DIR}/deps/winhttp" "${PROJECT_BINARY_DIR}/deps/winhttp")
-		list(APPEND LIBGIT2_SYSTEM_LIBS winhttp)
-		list(APPEND LIBGIT2_DEPENDENCY_INCLUDES "${PROJECT_SOURCE_DIR}/deps/winhttp")
-	else()
-		list(APPEND LIBGIT2_SYSTEM_LIBS "winhttp")
-		list(APPEND LIBGIT2_PC_LIBS "-lwinhttp")
-	endif()
-
-	list(APPEND LIBGIT2_SYSTEM_LIBS "rpcrt4" "crypt32" "ole32")
-	list(APPEND LIBGIT2_PC_LIBS "-lrpcrt4" "-lcrypt32" "-lole32")
-endif()

data/vendor/libgit2/src/libgit2/netops.c

@@ -1,124 +0,0 @@
-/*
- * Copyright (C) the libgit2 contributors. All rights reserved.
- *
- * This file is part of libgit2, distributed under the GNU GPL v2 with
- * a Linking Exception. For full terms see the included COPYING file.
- */
-
-#include "netops.h"
-
-#include <ctype.h>
-#include "git2/errors.h"
-
-#include "posix.h"
-#include "str.h"
-#include "runtime.h"
-
-int gitno_recv(gitno_buffer *buf)
-{
-	return buf->recv(buf);
-}
-
-void gitno_buffer_setup_callback(
-	gitno_buffer *buf,
-	char *data,
-	size_t len,
-	int (*recv)(gitno_buffer *buf), void *cb_data)
-{
-	memset(data, 0x0, len);
-	buf->data = data;
-	buf->len = len;
-	buf->offset = 0;
-	buf->recv = recv;
-	buf->cb_data = cb_data;
-}
-
-static int recv_stream(gitno_buffer *buf)
-{
-	git_stream *io = (git_stream *) buf->cb_data;
-	size_t readlen = buf->len - buf->offset;
-	ssize_t ret;
-
-	readlen = min(readlen, INT_MAX);
-
-	ret = git_stream_read(io, buf->data + buf->offset, (int)readlen);
-	if (ret < 0)
-		return -1;
-
-	buf->offset += ret;
-	return (int)ret;
-}
-
-void gitno_buffer_setup_fromstream(git_stream *st, gitno_buffer *buf, char *data, size_t len)
-{
-	memset(data, 0x0, len);
-	buf->data = data;
-	buf->len = len;
-	buf->offset = 0;
-	buf->recv = recv_stream;
-	buf->cb_data = st;
-}
-
-/* Consume up to ptr and move the rest of the buffer to the beginning */
-int gitno_consume(gitno_buffer *buf, const char *ptr)
-{
-	size_t consumed;
-
-	GIT_ASSERT(ptr - buf->data >= 0);
-	GIT_ASSERT(ptr - buf->data <= (int) buf->len);
-
-	consumed = ptr - buf->data;
-
-	memmove(buf->data, ptr, buf->offset - consumed);
-	memset(buf->data + buf->offset, 0x0, buf->len - buf->offset);
-	buf->offset -= consumed;
-
-	return 0;
-}
-
-/* Consume const bytes and move the rest of the buffer to the beginning */
-void gitno_consume_n(gitno_buffer *buf, size_t cons)
-{
-	memmove(buf->data, buf->data + cons, buf->len - buf->offset);
-	memset(buf->data + cons, 0x0, buf->len - buf->offset);
-	buf->offset -= cons;
-}
-
-/* Match host names according to RFC 2818 rules */
-int gitno__match_host(const char *pattern, const char *host)
-{
-	for (;;) {
-		char c = git__tolower(*pattern++);
-
-		if (c == '\0')
-			return *host ? -1 : 0;
-
-		if (c == '*') {
-			c = *pattern;
-			/* '*' at the end matches everything left */
-			if (c == '\0')
-				return 0;
-
-	/*
-	 * We've found a pattern, so move towards the next matching
-	 * char. The '.' is handled specially because wildcards aren't
-	 * allowed to cross subdomains.
-	 */
-
-			while(*host) {
-				char h = git__tolower(*host);
-				if (c == h)
-					return gitno__match_host(pattern, host++);
-				if (h == '.')
-					return gitno__match_host(pattern, host);
-				host++;
-			}
-			return -1;
-		}
-
-		if (c != git__tolower(*host++))
-			return -1;
-	}
-
-	return -1;
-}

data/vendor/libgit2/src/libgit2/netops.h

@@ -1,68 +0,0 @@
-/*
- * Copyright (C) the libgit2 contributors. All rights reserved.
- *
- * This file is part of libgit2, distributed under the GNU GPL v2 with
- * a Linking Exception. For full terms see the included COPYING file.
- */
-#ifndef INCLUDE_netops_h__
-#define INCLUDE_netops_h__
-
-#include "common.h"
-
-#include "posix.h"
-#include "stream.h"
-#include "net.h"
-
-#ifdef GIT_OPENSSL
-# include "streams/openssl.h"
-#endif
-
-typedef struct gitno_ssl {
-#ifdef GIT_OPENSSL
-	SSL *ssl;
-#else
-	size_t dummy;
-#endif
-} gitno_ssl;
-
-/* Represents a socket that may or may not be using SSL */
-typedef struct gitno_socket {
-	GIT_SOCKET socket;
-	gitno_ssl ssl;
-} gitno_socket;
-
-typedef struct gitno_buffer {
-	char *data;
-	size_t len;
-	size_t offset;
-	int (*recv)(struct gitno_buffer *buffer);
-	void *cb_data;
-} gitno_buffer;
-
-/* Flags to gitno_connect */
-enum {
-	/* Attempt to create an SSL connection. */
-	GITNO_CONNECT_SSL = 1
-};
-
-/**
- * Check if the name in a cert matches the wanted hostname
- *
- * Check if a pattern from a certificate matches the hostname we
- * wanted to connect to according to RFC2818 rules (which specifies
- * HTTP over TLS). Mainly, an asterisk matches anything, but is
- * limited to a single url component.
- *
- * Note that this does not set an error message. It expects the user
- * to provide the message for the user.
- */
-int gitno__match_host(const char *pattern, const char *host);
-
-void gitno_buffer_setup_fromstream(git_stream *st, gitno_buffer *buf, char *data, size_t len);
-void gitno_buffer_setup_callback(gitno_buffer *buf, char *data, size_t len, int (*recv)(gitno_buffer *buf), void *cb_data);
-int gitno_recv(gitno_buffer *buf);
-
-int gitno_consume(gitno_buffer *buf, const char *ptr);
-void gitno_consume_n(gitno_buffer *buf, size_t cons);
-
-#endif