rugged 1.3.2.3 → 1.4.2

data/vendor/libgit2/src/config_parse.c

@@ -36,7 +36,7 @@ static int strip_comments(char *line, int in_quotes)
 	char *ptr;
 
 	for (ptr = line; *ptr; ++ptr) {
-		if (ptr[0] == '"' && ptr > line && ptr[-1] != '\\')
+		if (ptr[0] == '"' && ((ptr > line && ptr[-1] != '\\') || ptr == line))
 			quote_count++;
 
 		if ((ptr[0] == ';' || ptr[0] == '#') &&
@@ -67,7 +67,7 @@ static int parse_subsection_header(git_config_parser *reader, const char *line,
 	int c, rpos;
 	const char *first_quote, *last_quote;
 	const char *line_start = line;
-	git_buf buf = GIT_BUF_INIT;
+	git_str buf = GIT_STR_INIT;
 	size_t quoted_len, alloc_len, base_name_len = strlen(base_name);
 
 	/* Skip any additional whitespace before our section name */
@@ -97,8 +97,8 @@ static int parse_subsection_header(git_config_parser *reader, const char *line,
 	GIT_ERROR_CHECK_ALLOC_ADD(&alloc_len, base_name_len, quoted_len);
 	GIT_ERROR_CHECK_ALLOC_ADD(&alloc_len, alloc_len, 2);
 
-	if (git_buf_grow(&buf, alloc_len) < 0 ||
-	    git_buf_printf(&buf, "%s.", base_name) < 0)
+	if (git_str_grow(&buf, alloc_len) < 0 ||
+	    git_str_printf(&buf, "%s.", base_name) < 0)
 		goto end_error;
 
 	rpos = 0;
@@ -132,25 +132,25 @@ static int parse_subsection_header(git_config_parser *reader, const char *line,
 			break;
 		}
 
-		git_buf_putc(&buf, (char)c);
+		git_str_putc(&buf, (char)c);
 		c = line[++rpos];
 	} while (line + rpos < last_quote);
 
 end_parse:
-	if (git_buf_oom(&buf))
+	if (git_str_oom(&buf))
 		goto end_error;
 
 	if (line[rpos] != '"' || line[rpos + 1] != ']') {
 		set_parse_error(reader, rpos, "unexpected text after closing quotes");
-		git_buf_dispose(&buf);
+		git_str_dispose(&buf);
 		return -1;
 	}
 
-	*section_name = git_buf_detach(&buf);
+	*section_name = git_str_detach(&buf);
 	return (int)(&line[rpos + 2] - line_start); /* rpos is at the closing quote */
 
 end_error:
-	git_buf_dispose(&buf);
+	git_str_dispose(&buf);
 
 	return -1;
 }
@@ -227,11 +227,11 @@ fail_parse:
 
 static int skip_bom(git_parse_ctx *parser)
 {
-	git_buf buf = GIT_BUF_INIT_CONST(parser->content, parser->content_len);
-	git_buf_bom_t bom;
-	int bom_offset = git_buf_detect_bom(&bom, &buf);
+	git_str buf = GIT_STR_INIT_CONST(parser->content, parser->content_len);
+	git_str_bom_t bom;
+	int bom_offset = git_str_detect_bom(&bom, &buf);
 
-	if (bom == GIT_BUF_BOM_UTF8)
+	if (bom == GIT_STR_BOM_UTF8)
 		git_parse_advance_chars(parser, bom_offset);
 
 	/* TODO: reference implementation is pretty stupid with BoM */
@@ -325,7 +325,7 @@ done:
 	return 0;
 }
 
-static int parse_multiline_variable(git_config_parser *reader, git_buf *value, int in_quotes)
+static int parse_multiline_variable(git_config_parser *reader, git_str *value, int in_quotes, size_t *line_len)
 {
 	int quote_count;
 	bool multiline = true;
@@ -338,6 +338,10 @@ static int parse_multiline_variable(git_config_parser *reader, git_buf *value, i
 		git_parse_advance_line(&reader->ctx);
 		line = git__strndup(reader->ctx.line, reader->ctx.line_len);
 		GIT_ERROR_CHECK_ALLOC(line);
+		if (GIT_ADD_SIZET_OVERFLOW(line_len, *line_len, reader->ctx.line_len)) {
+			error = -1;
+			goto out;
+		}
 
 		/*
 		 * We've reached the end of the file, there is no continuation.
@@ -358,7 +362,7 @@ static int parse_multiline_variable(git_config_parser *reader, git_buf *value, i
 			goto out;
 
 		/* Add this line to the multiline var */
-		if ((error = git_buf_puts(value, proc_line)) < 0)
+		if ((error = git_str_puts(value, proc_line)) < 0)
 			goto out;
 
 next:
@@ -415,7 +419,7 @@ static int parse_name(
 	return 0;
 }
 
-static int parse_variable(git_config_parser *reader, char **var_name, char **var_value)
+static int parse_variable(git_config_parser *reader, char **var_name, char **var_value, size_t *line_len)
 {
 	const char *value_start = NULL;
 	char *line = NULL, *name = NULL, *value = NULL;
@@ -445,18 +449,18 @@ static int parse_variable(git_config_parser *reader, char **var_name, char **var
 			goto out;
 
 		if (multiline) {
-			git_buf multi_value = GIT_BUF_INIT;
-			git_buf_attach(&multi_value, value, 0);
+			git_str multi_value = GIT_STR_INIT;
+			git_str_attach(&multi_value, value, 0);
 			value = NULL;
 
-			if (parse_multiline_variable(reader, &multi_value, quote_count % 2) < 0 ||
-			    git_buf_oom(&multi_value)) {
+			if (parse_multiline_variable(reader, &multi_value, quote_count % 2, line_len) < 0 ||
+			    git_str_oom(&multi_value)) {
 				error = -1;
-				git_buf_dispose(&multi_value);
+				git_str_dispose(&multi_value);
 				goto out;
 			}
 
-			value = git_buf_detach(&multi_value);
+			value = git_str_detach(&multi_value);
 		}
 	}
 
@@ -554,7 +558,7 @@ int git_config_parse(
 			break;
 
 		default: /* assume variable declaration */
-			if ((result = parse_variable(parser, &var_name, &var_value)) == 0 && on_variable) {
+			if ((result = parse_variable(parser, &var_name, &var_value, &line_len)) == 0 && on_variable) {
 				result = on_variable(parser, current_section, var_name, var_value, line_start, line_len, payload);
 				git__free(var_name);
 				git__free(var_value);

data/vendor/libgit2/src/crlf.c

@@ -12,6 +12,7 @@
 #include "git2/index.h"
 #include "git2/sys/filter.h"
 
+#include "buf.h"
 #include "futils.h"
 #include "hash.h"
 #include "filter.h"
@@ -25,7 +26,7 @@ typedef enum {
 	GIT_CRLF_TEXT_CRLF,
 	GIT_CRLF_AUTO,
 	GIT_CRLF_AUTO_INPUT,
-	GIT_CRLF_AUTO_CRLF,
+	GIT_CRLF_AUTO_CRLF
 } git_crlf_t;
 
 struct crlf_attrs {
@@ -152,7 +153,7 @@ static git_configmap_value output_eol(struct crlf_attrs *ca)
 GIT_INLINE(int) check_safecrlf(
 	struct crlf_attrs *ca,
 	const git_filter_source *src,
-	git_buf_text_stats *stats)
+	git_str_text_stats *stats)
 {
 	const char *filename = git_filter_source_path(src);
 
@@ -206,19 +207,19 @@ GIT_INLINE(int) check_safecrlf(
 
 static int crlf_apply_to_odb(
 	struct crlf_attrs *ca,
-	git_buf *to,
-	const git_buf *from,
+	git_str *to,
+	const git_str *from,
 	const git_filter_source *src)
 {
-	git_buf_text_stats stats;
+	git_str_text_stats stats;
 	bool is_binary;
 	int error;
 
 	/* Binary attribute? Empty file? Nothing to do */
-	if (ca->crlf_action == GIT_CRLF_BINARY || !git_buf_len(from))
+	if (ca->crlf_action == GIT_CRLF_BINARY || from->size == 0)
 		return GIT_PASSTHROUGH;
 
-	is_binary = git_buf_gather_text_stats(&stats, from, false);
+	is_binary = git_str_gather_text_stats(&stats, from, false);
 
 	/* Heuristics to see if we can skip the conversion.
 	 * Straight from Core Git.
@@ -246,22 +247,22 @@ static int crlf_apply_to_odb(
 		return GIT_PASSTHROUGH;
 
 	/* Actually drop the carriage returns */
-	return git_buf_crlf_to_lf(to, from);
+	return git_str_crlf_to_lf(to, from);
 }
 
 static int crlf_apply_to_workdir(
 	struct crlf_attrs *ca,
-	git_buf *to,
-	const git_buf *from)
+	git_str *to,
+	const git_str *from)
 {
-	git_buf_text_stats stats;
+	git_str_text_stats stats;
 	bool is_binary;
 
 	/* Empty file? Nothing to do. */
-	if (git_buf_len(from) == 0 || output_eol(ca) != GIT_EOL_CRLF)
+	if (git_str_len(from) == 0 || output_eol(ca) != GIT_EOL_CRLF)
 		return GIT_PASSTHROUGH;
 
-	is_binary = git_buf_gather_text_stats(&stats, from, false);
+	is_binary = git_str_gather_text_stats(&stats, from, false);
 
 	/* If there are no LFs, or all LFs are part of a CRLF, nothing to do */
 	if (stats.lf == 0 || stats.lf == stats.crlf)
@@ -280,7 +281,7 @@ static int crlf_apply_to_workdir(
 			return GIT_PASSTHROUGH;
 	}
 
-	return git_buf_lf_to_crlf(to, from);
+	return git_str_lf_to_crlf(to, from);
 }
 
 static int convert_attrs(
@@ -368,22 +369,24 @@ static int crlf_check(
 static int crlf_apply(
 	git_filter *self,
 	void **payload, /* may be read and/or set */
-	git_buf *to,
-	const git_buf *from,
+	git_str *to,
+	const git_str *from,
 	const git_filter_source *src)
 {
+	int error = 0;
+
 	/* initialize payload in case `check` was bypassed */
 	if (!*payload) {
-		int error = crlf_check(self, payload, src, NULL);
-
-		if (error < 0)
+		if ((error = crlf_check(self, payload, src, NULL)) < 0)
 			return error;
 	}
 
 	if (git_filter_source_mode(src) == GIT_FILTER_SMUDGE)
-		return crlf_apply_to_workdir(*payload, to, from);
+		error = crlf_apply_to_workdir(*payload, to, from);
 	else
-		return crlf_apply_to_odb(*payload, to, from, src);
+		error = crlf_apply_to_odb(*payload, to, from, src);
+
+	return error;
 }
 
 static int crlf_stream(

data/vendor/libgit2/src/date.c

@@ -11,8 +11,8 @@
 #endif
 
 #include "util.h"
-#include "cache.h"
 #include "posix.h"
+#include "date.h"
 
 #include <ctype.h>
 #include <time.h>
@@ -853,11 +853,11 @@ static git_time_t approxidate_str(const char *date,
 	}
 	pending_number(&tm, &number);
 	if (!touched)
-		*error_ret = 1;
+		*error_ret = -1;
 	return update_tm(&tm, &now, 0);
 }
 
-int git__date_parse(git_time_t *out, const char *date)
+int git_date_parse(git_time_t *out, const char *date)
 {
 	time_t time_sec;
 	git_time_t timestamp;
@@ -872,34 +872,27 @@ int git__date_parse(git_time_t *out, const char *date)
 		return -1;
 
 	*out = approxidate_str(date, time_sec, &error_ret);
-   return error_ret;
+	return error_ret;
 }
 
-int git__date_rfc2822_fmt(char *out, size_t len, const git_time *date)
+int git_date_rfc2822_fmt(git_str *out, git_time_t time, int offset)
 {
-	int written;
-	struct tm gmt;
 	time_t t;
+	struct tm gmt;
 
 	GIT_ASSERT_ARG(out);
-	GIT_ASSERT_ARG(date);
 
-	t = (time_t) (date->time + date->offset * 60);
+	t = (time_t) (time + offset * 60);
 
-	if (p_gmtime_r (&t, &gmt) == NULL)
+	if (p_gmtime_r(&t, &gmt) == NULL)
 		return -1;
 
-	written = p_snprintf(out, len, "%.3s, %u %.3s %.4u %02u:%02u:%02u %+03d%02d",
+	return git_str_printf(out, "%.3s, %u %.3s %.4u %02u:%02u:%02u %+03d%02d",
 		weekday_names[gmt.tm_wday],
 		gmt.tm_mday,
 		month_names[gmt.tm_mon],
 		gmt.tm_year + 1900,
 		gmt.tm_hour, gmt.tm_min, gmt.tm_sec,
-		date->offset / 60, date->offset % 60);
-
-	if (written < 0 || (written > (int) len - 1))
-		return -1;
-
-	return 0;
+		offset / 60, offset % 60);
 }
 

data/vendor/libgit2/src/date.h

@@ -0,0 +1,33 @@
+/*
+ * 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_date_h__
+#define INCLUDE_date_h__
+
+#include "util.h"
+#include "str.h"
+
+/*
+ * Parse a string into a value as a git_time_t.
+ *
+ * Sample valid input:
+ * - "yesterday"
+ * - "July 17, 2003"
+ * - "2003-7-17 08:23"
+ */
+extern int git_date_parse(git_time_t *out, const char *date);
+
+/*
+ * Format a git_time as a RFC2822 string
+ *
+ * @param out buffer to store formatted date
+ * @param time the time to be formatted
+ * @param offset the timezone offset
+ * @return 0 if successful; -1 on error
+ */
+extern int git_date_rfc2822_fmt(git_str *out, git_time_t time, int offset);
+
+#endif

data/vendor/libgit2/src/describe.c

@@ -12,6 +12,7 @@
 #include "git2/diff.h"
 #include "git2/status.h"
 
+#include "buf.h"
 #include "commit.h"
 #include "commit_list.h"
 #include "oidmap.h"
@@ -322,7 +323,7 @@ static unsigned long finish_depth_computation(
 	return seen_commits;
 }
 
-static int display_name(git_buf *buf, git_repository *repo, struct commit_name *n)
+static int display_name(git_str *buf, git_repository *repo, struct commit_name *n)
 {
 	if (n->prio == 2 && !n->tag) {
 		if (git_tag_lookup(&n->tag, repo, &n->sha1) < 0) {
@@ -346,9 +347,9 @@ static int display_name(git_buf *buf, git_repository *repo, struct commit_name *
 	}
 
 	if (n->tag)
-		git_buf_printf(buf, "%s", git_tag_name(n->tag));
+		git_str_printf(buf, "%s", git_tag_name(n->tag));
 	else
-		git_buf_printf(buf, "%s", n->path);
+		git_str_printf(buf, "%s", n->path);
 
 	return 0;
 }
@@ -388,7 +389,7 @@ static int find_unique_abbrev_size(
 }
 
 static int show_suffix(
-	git_buf *buf,
+	git_str *buf,
 	int depth,
 	git_repository *repo,
 	const git_oid *id,
@@ -403,11 +404,11 @@ static int show_suffix(
 
 	git_oid_fmt(hex_oid, id);
 
-	git_buf_printf(buf, "-%d-g", depth);
+	git_str_printf(buf, "-%d-g", depth);
 
-	git_buf_put(buf, hex_oid, size);
+	git_str_put(buf, hex_oid, size);
 
-	return git_buf_oom(buf) ? -1 : 0;
+	return git_str_oom(buf) ? -1 : 0;
 }
 
 #define MAX_CANDIDATES_TAGS FLAG_BITS - 1
@@ -769,7 +770,10 @@ static int normalize_format_options(
 	return 0;
 }
 
-int git_describe_format(git_buf *out, const git_describe_result *result, const git_describe_format_options *given)
+static int git_describe__format(
+	git_str *out,
+	const git_describe_result *result,
+	const git_describe_format_options *given)
 {
 	int error;
 	git_repository *repo;
@@ -782,10 +786,6 @@ int git_describe_format(git_buf *out, const git_describe_result *result, const g
 	GIT_ERROR_CHECK_VERSION(given, GIT_DESCRIBE_FORMAT_OPTIONS_VERSION, "git_describe_format_options");
 	normalize_format_options(&opts, given);
 
-	if ((error = git_buf_sanitize(out)) < 0)
-		return error;
-
-
 	if (opts.always_use_long_format && opts.abbreviated_size == 0) {
 		git_error_set(GIT_ERROR_DESCRIBE, "cannot describe - "
 			"'always_use_long_format' is incompatible with a zero"
@@ -809,9 +809,9 @@ int git_describe_format(git_buf *out, const git_describe_result *result, const g
 		}
 
 		if (result->dirty && opts.dirty_suffix)
-			git_buf_puts(out, opts.dirty_suffix);
+			git_str_puts(out, opts.dirty_suffix);
 
-		return git_buf_oom(out) ? -1 : 0;
+		return git_str_oom(out) ? -1 : 0;
 	}
 
 	/* If we didn't find *any* tags, we fall back to the commit's id */
@@ -824,12 +824,12 @@ int git_describe_format(git_buf *out, const git_describe_result *result, const g
 			return -1;
 
 		git_oid_fmt(hex_oid, &result->commit_id);
-		git_buf_put(out, hex_oid, size);
+		git_str_put(out, hex_oid, size);
 
 		if (result->dirty && opts.dirty_suffix)
-			git_buf_puts(out, opts.dirty_suffix);
+			git_str_puts(out, opts.dirty_suffix);
 
-		return git_buf_oom(out) ? -1 : 0;
+		return git_str_oom(out) ? -1 : 0;
 	}
 
 	/* Lastly, if we found a matching tag, we show that */
@@ -845,10 +845,18 @@ int git_describe_format(git_buf *out, const git_describe_result *result, const g
 	}
 
 	if (result->dirty && opts.dirty_suffix) {
-		git_buf_puts(out, opts.dirty_suffix);
+		git_str_puts(out, opts.dirty_suffix);
 	}
 
-	return git_buf_oom(out) ? -1 : 0;
+	return git_str_oom(out) ? -1 : 0;
+}
+
+int git_describe_format(
+	git_buf *out,
+	const git_describe_result *result,
+	const git_describe_format_options *given)
+{
+	GIT_BUF_WRAP_PRIVATE(out, git_describe__format, result, given);
 }
 
 void git_describe_result_free(git_describe_result *result)

data/vendor/libgit2/src/diff.c

@@ -8,6 +8,7 @@
 #include "diff.h"
 
 #include "common.h"
+#include "buf.h"
 #include "patch.h"
 #include "email.h"
 #include "commit.h"
@@ -162,6 +163,7 @@ int git_diff_format_email(
 	const git_diff_format_email_options *opts)
 {
 	git_email_create_options email_create_opts = GIT_EMAIL_CREATE_OPTIONS_INIT;
+	git_str email = GIT_STR_INIT;
 	int error;
 
 	GIT_ASSERT_ARG(out);
@@ -172,14 +174,29 @@ int git_diff_format_email(
 		GIT_DIFF_FORMAT_EMAIL_OPTIONS_VERSION,
 		"git_format_email_options");
 
+	/* This is a `git_buf` special case; subsequent calls append. */
+	email.ptr = out->ptr;
+	email.asize = out->reserved;
+	email.size = out->size;
+
+	out->ptr = git_str__initstr;
+	out->reserved = 0;
+	out->size = 0;
+
 	if ((opts->flags & GIT_DIFF_FORMAT_EMAIL_EXCLUDE_SUBJECT_PATCH_MARKER) != 0)
 		email_create_opts.subject_prefix = "";
 
-
-	error = git_email__append_from_diff(out, diff, opts->patch_no,
+	error = git_email__append_from_diff(&email, diff, opts->patch_no,
 		opts->total_patches, opts->id, opts->summary, opts->body,
 		opts->author, &email_create_opts);
 
+	if (error < 0)
+		goto done;
+
+	error = git_buf_fromstr(out, &email);
+
+done:
+	git_str_dispose(&email);
 	return error;
 }
 
@@ -269,7 +286,7 @@ static int flush_hunk(git_oid *result, git_hash_ctx *ctx)
 	unsigned short carry = 0;
 	int error, i;
 
-	if ((error = git_hash_final(&hash, ctx)) < 0 ||
+	if ((error = git_hash_final(hash.id, ctx)) < 0 ||
 	    (error = git_hash_init(ctx)) < 0)
 		return error;
 
@@ -282,7 +299,7 @@ static int flush_hunk(git_oid *result, git_hash_ctx *ctx)
 	return 0;
 }
 
-static void strip_spaces(git_buf *buf)
+static void strip_spaces(git_str *buf)
 {
 	char *src = buf->ptr, *dst = buf->ptr;
 	char c;
@@ -295,7 +312,7 @@ static void strip_spaces(git_buf *buf)
 		}
 	}
 
-	git_buf_truncate(buf, len);
+	git_str_truncate(buf, len);
 }
 
 static int diff_patchid_print_callback_to_buf(
@@ -305,7 +322,7 @@ static int diff_patchid_print_callback_to_buf(
 	void *payload)
 {
 	struct patch_id_args *args = (struct patch_id_args *) payload;
-	git_buf buf = GIT_BUF_INIT;
+	git_str buf = GIT_STR_INIT;
 	int error = 0;
 
 	if (line->origin == GIT_DIFF_LINE_CONTEXT_EOFNL ||
@@ -331,7 +348,7 @@ static int diff_patchid_print_callback_to_buf(
 		args->first_file = 0;
 
 out:
-	git_buf_dispose(&buf);
+	git_str_dispose(&buf);
 	return error;
 }
 
@@ -352,7 +369,7 @@ int git_diff_patchid(git_oid *out, git_diff *diff, git_diff_patchid_options *opt
 
 	memset(&args, 0, sizeof(args));
 	args.first_file = 1;
-	if ((error = git_hash_ctx_init(&args.ctx)) < 0)
+	if ((error = git_hash_ctx_init(&args.ctx, GIT_HASH_ALGORITHM_SHA1)) < 0)
 		goto out;
 
 	if ((error = git_diff_print(diff,

data/vendor/libgit2/src/diff.h

@@ -14,9 +14,7 @@
 #include "git2/sys/diff.h"
 #include "git2/oid.h"
 
-#include <stdio.h>
 #include "vector.h"
-#include "buffer.h"
 #include "iterator.h"
 #include "repository.h"
 #include "pool.h"
@@ -28,7 +26,7 @@
 typedef enum {
 	GIT_DIFF_TYPE_UNKNOWN = 0,
 	GIT_DIFF_TYPE_GENERATED = 1,
-	GIT_DIFF_TYPE_PARSED = 2,
+	GIT_DIFF_TYPE_PARSED = 2
 } git_diff_origin_t;
 
 struct git_diff {
@@ -53,7 +51,7 @@ struct git_diff {
 };
 
 extern int git_diff_delta__format_file_header(
-	git_buf *out,
+	git_str *out,
 	const git_diff_delta *delta,
 	const char *oldpfx,
 	const char *newpfx,