rugged 0.28.4 → 0.28.4.1

data/vendor/libgit2/src/parse.c

@@ -101,16 +101,6 @@ int git_parse_advance_digit(int64_t *out, git_parse_ctx *ctx, int base)
 	return 0;
 }
 
-int git_parse_advance_oid(git_oid *out, git_parse_ctx *ctx)
-{
-	if (ctx->line_len < GIT_OID_HEXSZ)
-		return -1;
-	if ((git_oid_fromstrn(out, ctx->line, GIT_OID_HEXSZ)) < 0)
-		return -1;
-	git_parse_advance_chars(ctx, GIT_OID_HEXSZ);
-	return 0;
-}
-
 int git_parse_peek(char *out, git_parse_ctx *ctx, int flags)
 {
 	size_t remain = ctx->line_len;

data/vendor/libgit2/src/parse.h

@@ -23,11 +23,12 @@ typedef struct {
 	size_t line_num;
 } git_parse_ctx;
 
-#define GIT_PARSE_CTX_INIT { 0 }
-
 int git_parse_ctx_init(git_parse_ctx *ctx, const char *content, size_t content_len);
 void git_parse_ctx_clear(git_parse_ctx *ctx);
 
+#define git_parse_err(...) \
+	( git_error_set(GIT_ERROR_PATCH, __VA_ARGS__), -1 )
+
 #define git_parse_ctx_contains_s(ctx, str) \
 	git_parse_ctx_contains(ctx, str, sizeof(str) - 1)
 
@@ -50,7 +51,6 @@ int git_parse_advance_expected(
 int git_parse_advance_ws(git_parse_ctx *ctx);
 int git_parse_advance_nl(git_parse_ctx *ctx);
 int git_parse_advance_digit(int64_t *out, git_parse_ctx *ctx, int base);
-int git_parse_advance_oid(git_oid *out, git_parse_ctx *ctx);
 
 enum GIT_PARSE_PEEK_FLAGS {
 	GIT_PARSE_PEEK_SKIP_WHITESPACE = (1 << 0)

data/vendor/libgit2/src/patch.c

@@ -79,7 +79,7 @@ size_t git_patch_size(
 		git_buf file_header = GIT_BUF_INIT;
 
 		if (git_diff_delta__format_file_header(
-			&file_header, patch->delta, NULL, NULL, 0, true) < 0)
+			&file_header, patch->delta, NULL, NULL, 0) < 0)
 			git_error_clear();
 		else
 			out += git_buf_len(&file_header);

data/vendor/libgit2/src/patch_generate.c

@@ -15,7 +15,7 @@
 #include "diff_xdiff.h"
 #include "delta.h"
 #include "zstream.h"
-#include "futils.h"
+#include "fileops.h"
 
 static void diff_output_init(
 	git_patch_generated_output *, const git_diff_options *, git_diff_file_cb,
@@ -836,7 +836,7 @@ static int patch_generated_line_cb(
 {
 	git_patch_generated  *patch = payload;
 	git_patch_hunk *hunk;
-	git_diff_line *line;
+	git_diff_line   *line;
 
 	GIT_UNUSED(delta);
 	GIT_UNUSED(hunk_);

data/vendor/libgit2/src/patch_parse.c

@@ -33,19 +33,7 @@ typedef struct {
 	char *old_prefix, *new_prefix;
 } git_patch_parsed;
 
-static int git_parse_err(const char *fmt, ...) GIT_FORMAT_PRINTF(1, 2);
-static int git_parse_err(const char *fmt, ...)
-{
-	va_list ap;
-
-	va_start(ap, fmt);
-	git_error_vset(GIT_ERROR_PATCH, fmt, ap);
-	va_end(ap);
-
-	return -1;
-}
-
-static size_t header_path_len(git_patch_parse_ctx *ctx)
+static int header_path_len(git_patch_parse_ctx *ctx)
 {
 	bool inquote = 0;
 	bool quoted = git_parse_ctx_contains_s(&ctx->parse_ctx, "\"");
@@ -70,36 +58,31 @@ static int parse_header_path_buf(git_buf *path, git_patch_parse_ctx *ctx, size_t
 	int error;
 
 	if ((error = git_buf_put(path, ctx->parse_ctx.line, path_len)) < 0)
-		return error;
+		goto done;
 
 	git_parse_advance_chars(&ctx->parse_ctx, path_len);
 
 	git_buf_rtrim(path);
 
-	if (path->size > 0 && path->ptr[0] == '"' &&
-	    (error = git_buf_unquote(path)) < 0)
-		return error;
+	if (path->size > 0 && path->ptr[0] == '"')
+		error = git_buf_unquote(path);
 
-	git_path_squash_slashes(path);
+	if (error < 0)
+		goto done;
 
-	if (!path->size)
-		return git_parse_err("patch contains empty path at line %"PRIuZ,
-				     ctx->parse_ctx.line_num);
+	git_path_squash_slashes(path);
 
-	return 0;
+done:
+	return error;
 }
 
 static int parse_header_path(char **out, git_patch_parse_ctx *ctx)
 {
 	git_buf path = GIT_BUF_INIT;
-	int error;
+	int error = parse_header_path_buf(&path, ctx, header_path_len(ctx));
 
-	if ((error = parse_header_path_buf(&path, ctx, header_path_len(ctx))) < 0)
-		goto out;
 	*out = git_buf_detach(&path);
 
-out:
-	git_buf_dispose(&path);
 	return error;
 }
 
@@ -109,12 +92,6 @@ static int parse_header_git_oldpath(
 	git_buf old_path = GIT_BUF_INIT;
 	int error;
 
-	if (patch->old_path) {
-		error = git_parse_err("patch contains duplicate old path at line %"PRIuZ,
-				      ctx->parse_ctx.line_num);
-		goto out;
-	}
-
 	if ((error = parse_header_path_buf(&old_path, ctx, ctx->parse_ctx.line_len - 1)) <  0)
 		goto out;
 
@@ -131,14 +108,9 @@ static int parse_header_git_newpath(
 	git_buf new_path = GIT_BUF_INIT;
 	int error;
 
-	if (patch->new_path) {
-		error = git_parse_err("patch contains duplicate new path at line %"PRIuZ,
-				      ctx->parse_ctx.line_num);
-		goto out;
-	}
-
 	if ((error = parse_header_path_buf(&new_path, ctx, ctx->parse_ctx.line_len - 1)) <  0)
 		goto out;
+
 	patch->new_path = git_buf_detach(&new_path);
 
 out:
@@ -231,9 +203,9 @@ static int parse_header_git_deletedfilemode(
 	git_patch_parsed *patch,
 	git_patch_parse_ctx *ctx)
 {
-	git__free((char *)patch->base.delta->new_file.path);
+	git__free((char *)patch->base.delta->old_file.path);
 
-	patch->base.delta->new_file.path = NULL;
+	patch->base.delta->old_file.path = NULL;
 	patch->base.delta->status = GIT_DELTA_DELETED;
 	patch->base.delta->nfiles = 1;
 
@@ -244,9 +216,9 @@ static int parse_header_git_newfilemode(
 	git_patch_parsed *patch,
 	git_patch_parse_ctx *ctx)
 {
-	git__free((char *)patch->base.delta->old_file.path);
+	git__free((char *)patch->base.delta->new_file.path);
 
-	patch->base.delta->old_file.path = NULL;
+	patch->base.delta->new_file.path = NULL;
 	patch->base.delta->status = GIT_DELTA_ADDED;
 	patch->base.delta->nfiles = 1;
 
@@ -405,7 +377,6 @@ static const parse_header_transition transitions[] = {
 	{ "index "              , STATE_DIFF,       STATE_INDEX,      parse_header_git_index },
 	{ "index "              , STATE_END,        STATE_INDEX,      parse_header_git_index },
 
-	{ "--- "                , STATE_DIFF,       STATE_PATH,       parse_header_git_oldpath },
 	{ "--- "                , STATE_INDEX,      STATE_PATH,       parse_header_git_oldpath },
 	{ "+++ "                , STATE_PATH,       STATE_END,        parse_header_git_newpath },
 	{ "GIT binary patch"    , STATE_INDEX,      STATE_END,        NULL },
@@ -423,7 +394,6 @@ static const parse_header_transition transitions[] = {
 	/* Next patch */
 	{ "diff --git "         , STATE_END,        0,                NULL },
 	{ "@@ -"                , STATE_END,        0,                NULL },
-	{ "-- "                 , STATE_INDEX,      0,                NULL },
 	{ "-- "                 , STATE_END,        0,                NULL },
 };
 
@@ -491,7 +461,7 @@ done:
 
 static int parse_int(int *out, git_patch_parse_ctx *ctx)
 {
-	int64_t num;
+	git_off_t num;
 
 	if (git_parse_advance_digit(&num, &ctx->parse_ctx, 10) < 0 || !git__is_int(num))
 		return -1;
@@ -554,14 +524,6 @@ fail:
 	return -1;
 }
 
-static int eof_for_origin(int origin) {
-	if (origin == GIT_DIFF_LINE_ADDITION)
-		return GIT_DIFF_LINE_ADD_EOFNL;
-	if (origin == GIT_DIFF_LINE_DELETION)
-		return GIT_DIFF_LINE_DEL_EOFNL;
-	return GIT_DIFF_LINE_CONTEXT_EOFNL;
-}
-
 static int parse_hunk_body(
 	git_patch_parsed *patch,
 	git_patch_hunk *hunk,
@@ -572,7 +534,6 @@ static int parse_hunk_body(
 
 	int oldlines = hunk->hunk.old_lines;
 	int newlines = hunk->hunk.new_lines;
-	int last_origin = 0;
 
 	for (;
 		ctx->parse_ctx.remain_len > 1 &&
@@ -580,17 +541,11 @@ static int parse_hunk_body(
 		!git_parse_ctx_contains_s(&ctx->parse_ctx, "@@ -");
 		git_parse_advance_line(&ctx->parse_ctx)) {
 
-		int old_lineno, new_lineno, origin, prefix = 1;
 		char c;
-
-		if (git__add_int_overflow(&old_lineno, hunk->hunk.old_start, hunk->hunk.old_lines) ||
-		    git__sub_int_overflow(&old_lineno, old_lineno, oldlines) ||
-		    git__add_int_overflow(&new_lineno, hunk->hunk.new_start, hunk->hunk.new_lines) ||
-		    git__sub_int_overflow(&new_lineno, new_lineno, newlines)) {
-			error = git_parse_err("unrepresentable line count at line %"PRIuZ,
-					      ctx->parse_ctx.line_num);
-			goto done;
-		}
+		int origin;
+		int prefix = 1;
+		int old_lineno = hunk->hunk.old_start + (hunk->hunk.old_lines - oldlines);
+		int new_lineno = hunk->hunk.new_start + (hunk->hunk.new_lines - newlines);
 
 		if (ctx->parse_ctx.line_len == 0 || ctx->parse_ctx.line[ctx->parse_ctx.line_len - 1] != '\n') {
 			error = git_parse_err("invalid patch instruction at line %"PRIuZ,
@@ -623,21 +578,6 @@ static int parse_hunk_body(
 			old_lineno = -1;
 			break;
 
-		case '\\':
-			/*
-			 * If there are no oldlines left, then this is probably
-			 * the "" marker. Do not
-			 * verify its format, as it may be localized.
-			 */
-			if (!oldlines) {
-				prefix = 0;
-				origin = eof_for_origin(last_origin);
-				old_lineno = -1;
-				new_lineno = -1;
-				break;
-			}
-			/* fall through */
-
 		default:
 			error = git_parse_err("invalid patch hunk at line %"PRIuZ, ctx->parse_ctx.line_num);
 			goto done;
@@ -648,9 +588,8 @@ static int parse_hunk_body(
 
 		memset(line, 0x0, sizeof(git_diff_line));
 
+		line->content = ctx->parse_ctx.line + prefix;
 		line->content_len = ctx->parse_ctx.line_len - prefix;
-		line->content = git__strndup(ctx->parse_ctx.line + prefix, line->content_len);
-		GIT_ERROR_CHECK_ALLOC(line->content);
 		line->content_offset = ctx->parse_ctx.content_len - ctx->parse_ctx.remain_len;
 		line->origin = origin;
 		line->num_lines = 1;
@@ -658,8 +597,6 @@ static int parse_hunk_body(
 		line->new_lineno = new_lineno;
 
 		hunk->line_count++;
-
-		last_origin = origin;
 	}
 
 	if (oldlines || newlines) {
@@ -669,8 +606,7 @@ static int parse_hunk_body(
 		goto done;
 	}
 
-	/*
-	 * Handle "". Only expect the leading
+	/* Handle "".  Only expect the leading
 	 * backslash, though, because the rest of the string could be
 	 * localized.  Because `diff` optimizes for the case where you
 	 * want to apply the patch by hand.
@@ -681,25 +617,11 @@ static int parse_hunk_body(
 		line = git_array_get(patch->base.lines, git_array_size(patch->base.lines) - 1);
 
 		if (line->content_len < 1) {
-			error = git_parse_err("last line has no trailing newline");
+			error = git_parse_err("cannot trim trailing newline of empty line");
 			goto done;
 		}
 
-		line = git_array_alloc(patch->base.lines);
-		GIT_ERROR_CHECK_ALLOC(line);
-
-		memset(line, 0x0, sizeof(git_diff_line));
-
-		line->content_len = ctx->parse_ctx.line_len;
-		line->content = git__strndup(ctx->parse_ctx.line, line->content_len);
-		GIT_ERROR_CHECK_ALLOC(line->content);
-		line->content_offset = ctx->parse_ctx.content_len - ctx->parse_ctx.remain_len;
-		line->origin = eof_for_origin(last_origin);
-		line->num_lines = 1;
-		line->old_lineno = -1;
-		line->new_lineno = -1;
-
-		hunk->line_count++;
+		line->content_len--;
 
 		git_parse_advance_line(&ctx->parse_ctx);
 	}
@@ -765,7 +687,7 @@ static int parse_patch_binary_side(
 {
 	git_diff_binary_t type = GIT_DIFF_BINARY_NONE;
 	git_buf base85 = GIT_BUF_INIT, decoded = GIT_BUF_INIT;
-	int64_t len;
+	git_off_t len;
 	int error = 0;
 
 	if (git_parse_ctx_contains_s(&ctx->parse_ctx, "literal ")) {
@@ -808,7 +730,7 @@ static int parse_patch_binary_side(
 
 		encoded_len = ((decoded_len / 4) + !!(decoded_len % 4)) * 5;
 
-		if (!encoded_len || !ctx->parse_ctx.line_len || encoded_len > ctx->parse_ctx.line_len - 1) {
+		if (encoded_len > ctx->parse_ctx.line_len - 1) {
 			error = git_parse_err("truncated binary data at line %"PRIuZ, ctx->parse_ctx.line_num);
 			goto done;
 		}
@@ -878,23 +800,12 @@ static int parse_patch_binary_nodata(
 	git_patch_parsed *patch,
 	git_patch_parse_ctx *ctx)
 {
-	const char *old = patch->old_path ? patch->old_path : patch->header_old_path;
-	const char *new = patch->new_path ? patch->new_path : patch->header_new_path;
-
-	if (!old || !new)
-		return git_parse_err("corrupt binary data without paths at line %"PRIuZ, ctx->parse_ctx.line_num);
-
-	if (patch->base.delta->status == GIT_DELTA_ADDED)
-		old = "/dev/null";
-	else if (patch->base.delta->status == GIT_DELTA_DELETED)
-		new = "/dev/null";
-
 	if (git_parse_advance_expected_str(&ctx->parse_ctx, "Binary files ") < 0 ||
-	    git_parse_advance_expected_str(&ctx->parse_ctx, old) < 0 ||
-	    git_parse_advance_expected_str(&ctx->parse_ctx, " and ") < 0 ||
-	    git_parse_advance_expected_str(&ctx->parse_ctx, new) < 0 ||
-	    git_parse_advance_expected_str(&ctx->parse_ctx, " differ") < 0 ||
-	    git_parse_advance_nl(&ctx->parse_ctx) < 0)
+		git_parse_advance_expected_str(&ctx->parse_ctx, patch->header_old_path) < 0 ||
+		git_parse_advance_expected_str(&ctx->parse_ctx, " and ") < 0 ||
+		git_parse_advance_expected_str(&ctx->parse_ctx, patch->header_new_path) < 0 ||
+		git_parse_advance_expected_str(&ctx->parse_ctx, " differ") < 0 ||
+		git_parse_advance_nl(&ctx->parse_ctx) < 0)
 		return git_parse_err("corrupt git binary header at line %"PRIuZ, ctx->parse_ctx.line_num);
 
 	patch->base.binary.contains_data = 0;
@@ -1127,8 +1038,6 @@ int git_patch_parsed_from_diff(git_patch **out, git_diff *d, size_t idx)
 static void patch_parsed__free(git_patch *p)
 {
 	git_patch_parsed *patch = (git_patch_parsed *)p;
-	git_diff_line *line;
-	size_t i;
 
 	if (!patch)
 		return;
@@ -1138,8 +1047,6 @@ static void patch_parsed__free(git_patch *p)
 	git__free((char *)patch->base.binary.old_file.data);
 	git__free((char *)patch->base.binary.new_file.data);
 	git_array_clear(patch->base.hunks);
-	git_array_foreach(patch->base.lines, i, line)
-		git__free((char *) line->content);
 	git_array_clear(patch->base.lines);
 	git__free(patch->base.delta);
 

data/vendor/libgit2/src/path.c

@@ -14,7 +14,7 @@
 #include "win32/w32_buffer.h"
 #include "win32/w32_util.h"
 #include "win32/version.h"
-#include <aclapi.h>
+#include <AclAPI.h>
 #else
 #include <dirent.h>
 #endif
@@ -183,13 +183,7 @@ int git_path_dirname_r(git_buf *buffer, const char *path)
 	while (endp > path && *endp == '/')
 		endp--;
 
-	if (endp - path + 1 > INT_MAX) {
-		git_error_set(GIT_ERROR_INVALID, "path too long");
-		len = -1;
-		goto Exit;
-	}
-
-	if ((len = win32_prefix_length(path, (int)(endp - path + 1))) > 0) {
+	if ((len = win32_prefix_length(path, endp - path + 1)) > 0) {
 		is_prefix = 1;
 		goto Exit;
 	}
@@ -209,13 +203,7 @@ int git_path_dirname_r(git_buf *buffer, const char *path)
 		endp--;
 	} while (endp > path && *endp == '/');
 
-	if (endp - path + 1 > INT_MAX) {
-		git_error_set(GIT_ERROR_INVALID, "path too long");
-		len = -1;
-		goto Exit;
-	}
-
-	if ((len = win32_prefix_length(path, (int)(endp - path + 1))) > 0) {
+	if ((len = win32_prefix_length(path, endp - path + 1)) > 0) {
 		is_prefix = 1;
 		goto Exit;
 	}
@@ -311,12 +299,9 @@ int git_path_root(const char *path)
 		while (path[offset] && path[offset] != '/' && path[offset] != '\\')
 			offset++;
 	}
-
-	if (path[offset] == '\\')
-		return offset;
 #endif
 
-	if (path[offset] == '/')
+	if (path[offset] == '/' || path[offset] == '\\')
 		return offset;
 
 	return -1;	/* Not a real error - signals that path is not rooted */
@@ -1864,12 +1849,12 @@ GIT_INLINE(unsigned int) dotgit_flags(
 #endif
 
 	if (repo && !protectHFS)
-		error = git_repository__configmap_lookup(&protectHFS, repo, GIT_CONFIGMAP_PROTECTHFS);
+		error = git_repository__cvar(&protectHFS, repo, GIT_CVAR_PROTECTHFS);
 	if (!error && protectHFS)
 		flags |= GIT_PATH_REJECT_DOT_GIT_HFS;
 
 	if (repo)
-		error = git_repository__configmap_lookup(&protectNTFS, repo, GIT_CONFIGMAP_PROTECTNTFS);
+		error = git_repository__cvar(&protectNTFS, repo, GIT_CVAR_PROTECTNTFS);
 	if (!error && protectNTFS)
 		flags |= GIT_PATH_REJECT_DOT_GIT_NTFS;
 
@@ -1957,28 +1942,6 @@ extern int git_path_is_gitfile(const char *path, size_t pathlen, git_path_gitfil
 	}
 }
 
-bool git_path_supports_symlinks(const char *dir)
-{
-	git_buf path = GIT_BUF_INIT;
-	bool supported = false;
-	struct stat st;
-	int fd;
-
-	if ((fd = git_futils_mktmp(&path, dir, 0666)) < 0 ||
-	    p_close(fd) < 0 ||
-	    p_unlink(path.ptr) < 0 ||
-	    p_symlink("testing", path.ptr) < 0 ||
-	    p_lstat(path.ptr, &st) < 0)
-		goto done;
-
-	supported = (S_ISLNK(st.st_mode) != 0);
-done:
-	if (path.size)
-		(void)p_unlink(path.ptr);
-	git_buf_dispose(&path);
-	return supported;
-}
-
 int git_path_validate_system_file_ownership(const char *path)
 {
 #ifndef GIT_WIN32