rugged 0.27.10 → 0.27.10.1

data/vendor/libgit2/src/config_file.h

@@ -0,0 +1,73 @@
+/*
+ * 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_config_file_h__
+#define INCLUDE_config_file_h__
+
+#include "common.h"
+
+#include "git2/sys/config.h"
+#include "git2/config.h"
+
+GIT_INLINE(int) git_config_file_open(git_config_backend *cfg, unsigned int level, const git_repository *repo)
+{
+	return cfg->open(cfg, level, repo);
+}
+
+GIT_INLINE(void) git_config_file_free(git_config_backend *cfg)
+{
+	if (cfg)
+		cfg->free(cfg);
+}
+
+GIT_INLINE(int) git_config_file_get_string(
+	git_config_entry **out, git_config_backend *cfg, const char *name)
+{
+	return cfg->get(cfg, name, out);
+}
+
+GIT_INLINE(int) git_config_file_set_string(
+	git_config_backend *cfg, const char *name, const char *value)
+{
+	return cfg->set(cfg, name, value);
+}
+
+GIT_INLINE(int) git_config_file_delete(
+	git_config_backend *cfg, const char *name)
+{
+	return cfg->del(cfg, name);
+}
+
+GIT_INLINE(int) git_config_file_foreach(
+	git_config_backend *cfg,
+	int (*fn)(const git_config_entry *entry, void *data),
+	void *data)
+{
+	return git_config_backend_foreach_match(cfg, NULL, fn, data);
+}
+
+GIT_INLINE(int) git_config_file_foreach_match(
+	git_config_backend *cfg,
+	const char *regexp,
+	int (*fn)(const git_config_entry *entry, void *data),
+	void *data)
+{
+	return git_config_backend_foreach_match(cfg, regexp, fn, data);
+}
+
+GIT_INLINE(int) git_config_file_lock(git_config_backend *cfg)
+{
+	return cfg->lock(cfg);
+}
+
+GIT_INLINE(int) git_config_file_unlock(git_config_backend *cfg, int success)
+{
+	return cfg->unlock(cfg, success);
+}
+
+extern int git_config_file_normalize_section(char *start, char *end);
+
+#endif

data/vendor/libgit2/src/config_parse.c

@@ -11,19 +11,10 @@
 
 #include <ctype.h>
 
-const char *git_config_escapes = "ntb\"\\";
-const char *git_config_escaped = "\n\t\b\"\\";
-
 static void set_parse_error(git_config_parser *reader, int col, const char *error_str)
 {
-	if (col)
-		git_error_set(GIT_ERROR_CONFIG,
-		              "failed to parse config file: %s (in %s:%"PRIuZ", column %d)",
-		              error_str, reader->path, reader->ctx.line_num, col);
-	else
-		git_error_set(GIT_ERROR_CONFIG,
-		              "failed to parse config file: %s (in %s:%"PRIuZ")",
-		              error_str, reader->path, reader->ctx.line_num);
+	giterr_set(GITERR_CONFIG, "failed to parse config file: %s (in %s:%"PRIuZ", column %d)",
+		error_str, reader->file->path, reader->ctx.line_num, col);
 }
 
 
@@ -64,40 +55,35 @@ static int strip_comments(char *line, int in_quotes)
 }
 
 
-static int parse_subsection_header(git_config_parser *reader, const char *line, size_t pos, const char *base_name, char **section_name)
+static int parse_section_header_ext(git_config_parser *reader, const char *line, const char *base_name, char **section_name)
 {
 	int c, rpos;
-	const char *first_quote, *last_quote;
-	const char *line_start = line;
+	char *first_quote, *last_quote;
 	git_buf buf = GIT_BUF_INIT;
 	size_t quoted_len, alloc_len, base_name_len = strlen(base_name);
 
-	/* Skip any additional whitespace before our section name */
-	while (git__isspace(line[pos]))
-		pos++;
+	/*
+	 * base_name is what came before the space. We should be at the
+	 * first quotation mark, except for now, line isn't being kept in
+	 * sync so we only really use it to calculate the length.
+	 */
 
-	/* We should be at the first quotation mark. */
-	if (line[pos] != '"') {
-		set_parse_error(reader, 0, "missing quotation marks in section header");
+	first_quote = strchr(line, '"');
+	if (first_quote == NULL) {
+		set_parse_error(reader, 0, "Missing quotation marks in section header");
 		goto end_error;
 	}
 
-	first_quote = &line[pos];
 	last_quote = strrchr(line, '"');
 	quoted_len = last_quote - first_quote;
 
-	if ((last_quote - line) > INT_MAX) {
-		set_parse_error(reader, 0, "invalid section header, line too long");
-		goto end_error;
-	}
-
 	if (quoted_len == 0) {
-		set_parse_error(reader, 0, "missing closing quotation mark in section header");
+		set_parse_error(reader, 0, "Missing closing quotation mark in section header");
 		goto end_error;
 	}
 
-	GIT_ERROR_CHECK_ALLOC_ADD(&alloc_len, base_name_len, quoted_len);
-	GIT_ERROR_CHECK_ALLOC_ADD(&alloc_len, alloc_len, 2);
+	GITERR_CHECK_ALLOC_ADD(&alloc_len, base_name_len, quoted_len);
+	GITERR_CHECK_ALLOC_ADD(&alloc_len, alloc_len, 2);
 
 	if (git_buf_grow(&buf, alloc_len) < 0 ||
 	    git_buf_printf(&buf, "%s.", base_name) < 0)
@@ -116,7 +102,7 @@ static int parse_subsection_header(git_config_parser *reader, const char *line,
 
 		switch (c) {
 		case 0:
-			set_parse_error(reader, 0, "unexpected end-of-line in section header");
+			set_parse_error(reader, 0, "Unexpected end-of-line in section header");
 			goto end_error;
 
 		case '"':
@@ -126,7 +112,7 @@ static int parse_subsection_header(git_config_parser *reader, const char *line,
 			c = line[++rpos];
 
 			if (c == 0) {
-				set_parse_error(reader, rpos, "unexpected end-of-line in section header");
+				set_parse_error(reader, rpos, "Unexpected end-of-line in section header");
 				goto end_error;
 			}
 
@@ -143,16 +129,16 @@ end_parse:
 		goto end_error;
 
 	if (line[rpos] != '"' || line[rpos + 1] != ']') {
-		set_parse_error(reader, rpos, "unexpected text after closing quotes");
-		git_buf_dispose(&buf);
+		set_parse_error(reader, rpos, "Unexpected text after closing quotes");
+		git_buf_free(&buf);
 		return -1;
 	}
 
 	*section_name = git_buf_detach(&buf);
-	return (int)(&line[rpos + 2] - line_start); /* rpos is at the closing quote */
+	return 0;
 
 end_error:
-	git_buf_dispose(&buf);
+	git_buf_free(&buf);
 
 	return -1;
 }
@@ -174,13 +160,13 @@ static int parse_section_header(git_config_parser *reader, char **section_out)
 	name_end = strrchr(line, ']');
 	if (name_end == NULL) {
 		git__free(line);
-		set_parse_error(reader, 0, "missing ']' in section header");
+		set_parse_error(reader, 0, "Missing ']' in section header");
 		return -1;
 	}
 
-	GIT_ERROR_CHECK_ALLOC_ADD(&line_len, (size_t)(name_end - line), 1);
+	GITERR_CHECK_ALLOC_ADD(&line_len, (size_t)(name_end - line), 1);
 	name = git__malloc(line_len);
-	GIT_ERROR_CHECK_ALLOC(name);
+	GITERR_CHECK_ALLOC(name);
 
 	name_length = 0;
 	pos = 0;
@@ -194,14 +180,14 @@ static int parse_section_header(git_config_parser *reader, char **section_out)
 	do {
 		if (git__isspace(c)){
 			name[name_length] = '\0';
-			result = parse_subsection_header(reader, line, pos, name, section_out);
+			result = parse_section_header_ext(reader, line, name, section_out);
 			git__free(line);
 			git__free(name);
 			return result;
 		}
 
 		if (!config_keychar(c) && c != '.') {
-			set_parse_error(reader, pos, "unexpected character in header");
+			set_parse_error(reader, pos, "Unexpected character in header");
 			goto fail_parse;
 		}
 
@@ -210,7 +196,7 @@ static int parse_section_header(git_config_parser *reader, char **section_out)
 	} while ((c = line[pos++]) != ']');
 
 	if (line[pos - 1] != ']') {
-		set_parse_error(reader, pos, "unexpected end of file");
+		set_parse_error(reader, pos, "Unexpected end of file");
 		goto fail_parse;
 	}
 
@@ -219,7 +205,7 @@ static int parse_section_header(git_config_parser *reader, char **section_out)
 	name[name_length] = 0;
 	*section_out = name;
 
-	return pos;
+	return 0;
 
 fail_parse:
 	git__free(line);
@@ -313,7 +299,7 @@ static int unescape_line(
 				*fixed++ = git_config_escaped[esc - git_config_escapes];
 			} else {
 				git__free(str);
-				git_error_set(GIT_ERROR_CONFIG, "invalid escape at %s", ptr);
+				giterr_set(GITERR_CONFIG, "invalid escape at %s", ptr);
 				return -1;
 			}
 		}
@@ -339,7 +325,7 @@ static int parse_multiline_variable(git_config_parser *reader, git_buf *value, i
 		/* Check that the next line exists */
 		git_parse_advance_line(&reader->ctx);
 		line = git__strndup(reader->ctx.line, reader->ctx.line_len);
-		GIT_ERROR_CHECK_ALLOC(line);
+		GITERR_CHECK_ALLOC(line);
 
 		/*
 		 * We've reached the end of the file, there is no continuation.
@@ -395,7 +381,7 @@ static int parse_name(
 		name_end++;
 
 	if (line == name_end) {
-		set_parse_error(reader, 0, "invalid configuration key");
+		set_parse_error(reader, 0, "Invalid configuration key");
 		return -1;
 	}
 
@@ -407,7 +393,7 @@ static int parse_name(
 	if (*value_start == '=') {
 		*value = value_start + 1;
 	} else if (*value_start) {
-		set_parse_error(reader, 0, "invalid configuration key");
+		set_parse_error(reader, 0, "Invalid configuration key");
 		return -1;
 	}
 
@@ -420,21 +406,22 @@ static int parse_name(
 static int parse_variable(git_config_parser *reader, char **var_name, char **var_value)
 {
 	const char *value_start = NULL;
-	char *line = NULL, *name = NULL, *value = NULL;
-	int quote_count, error;
+	char *line;
+	int quote_count;
 	bool multiline;
 
-	*var_name = NULL;
-	*var_value = NULL;
-
 	git_parse_advance_ws(&reader->ctx);
 	line = git__strndup(reader->ctx.line, reader->ctx.line_len);
-	GIT_ERROR_CHECK_ALLOC(line);
+	if (line == NULL)
+		return -1;
 
 	quote_count = strip_comments(line, 0);
 
-	if ((error = parse_name(&name, &value_start, reader, line)) < 0)
-		goto out;
+	/* If there is no value, boolean true is assumed */
+	*var_value = NULL;
+
+	if (parse_name(var_name, &value_start, reader, line) < 0)
+		goto on_error;
 
 	/*
 	 * Now, let's try to parse the value
@@ -443,46 +430,30 @@ static int parse_variable(git_config_parser *reader, char **var_name, char **var
 		while (git__isspace(value_start[0]))
 			value_start++;
 
-		if ((error = unescape_line(&value, &multiline, value_start, 0)) < 0)
-			goto out;
+		if (unescape_line(var_value, &multiline, value_start, 0) < 0)
+			goto on_error;
 
 		if (multiline) {
 			git_buf multi_value = GIT_BUF_INIT;
-			git_buf_attach(&multi_value, value, 0);
-			value = NULL;
+			git_buf_attach(&multi_value, *var_value, 0);
 
 			if (parse_multiline_variable(reader, &multi_value, quote_count) < 0 ||
-			    git_buf_oom(&multi_value)) {
-				error = -1;
-				git_buf_dispose(&multi_value);
-				goto out;
+				git_buf_oom(&multi_value)) {
+				git_buf_free(&multi_value);
+				goto on_error;
 			}
 
-			value = git_buf_detach(&multi_value);
+			*var_value = git_buf_detach(&multi_value);
 		}
 	}
 
-	*var_name = name;
-	*var_value = value;
-	name = NULL;
-	value = NULL;
-
-out:
-	git__free(name);
-	git__free(value);
 	git__free(line);
-	return error;
-}
-
-int git_config_parser_init(git_config_parser *out, const char *path, const char *data, size_t datalen)
-{
-	out->path = path;
-	return git_parse_ctx_init(&out->ctx, data, datalen);
-}
+	return 0;
 
-void git_config_parser_dispose(git_config_parser *parser)
-{
-	git_parse_ctx_clear(&parser->ctx);
+on_error:
+	git__free(*var_name);
+	git__free(line);
+	return -1;
 }
 
 int git_config_parse(
@@ -491,10 +462,10 @@ int git_config_parse(
 	git_config_parser_variable_cb on_variable,
 	git_config_parser_comment_cb on_comment,
 	git_config_parser_eof_cb on_eof,
-	void *payload)
+	void *data)
 {
 	git_parse_ctx *ctx;
-	char *current_section = NULL, *var_name = NULL, *var_value = NULL;
+	char *current_section = NULL, *var_name, *var_value;
 	int result = 0;
 
 	ctx = &parser->ctx;
@@ -502,14 +473,10 @@ int git_config_parse(
 	skip_bom(ctx);
 
 	for (; ctx->remain_len > 0; git_parse_advance_line(ctx)) {
-		const char *line_start;
-		size_t line_len;
+		const char *line_start = parser->ctx.line;
+		size_t line_len = parser->ctx.line_len;
 		char c;
 
-	restart:
-		line_start = ctx->line;
-		line_len = ctx->line_len;
-
 		/*
 		 * Get either first non-whitespace character or, if that does
 		 * not exist, the first whitespace character. This is required
@@ -524,24 +491,9 @@ int git_config_parse(
 			git__free(current_section);
 			current_section = NULL;
 
-			result = parse_section_header(parser, &current_section);
-			if (result < 0)
-				break;
-
-			git_parse_advance_chars(ctx, result);
-
-			if (on_section)
-				result = on_section(parser, current_section, line_start, line_len, payload);
-			/*
-			 * After we've parsed the section header we may not be
-			 * done with the line. If there's still data in there,
-			 * run the next loop with the rest of the current line
-			 * instead of moving forward.
-			 */
-
-			if (!git_parse_peek(&c, ctx, GIT_PARSE_PEEK_SKIP_WHITESPACE))
-				goto restart;
-
+			if ((result = parse_section_header(parser, &current_section)) == 0 && on_section) {
+				result = on_section(parser, current_section, line_start, line_len, data);
+			}
 			break;
 
 		case '\n': /* comment or whitespace-only */
@@ -551,17 +503,14 @@ int git_config_parse(
 		case ';':
 		case '#':
 			if (on_comment) {
-				result = on_comment(parser, line_start, line_len, payload);
+				result = on_comment(parser, line_start, line_len, data);
 			}
 			break;
 
 		default: /* assume variable declaration */
 			if ((result = parse_variable(parser, &var_name, &var_value)) == 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);
+				result = on_variable(parser, current_section, var_name, var_value, line_start, line_len, data);
 			}
-
 			break;
 		}
 
@@ -570,7 +519,7 @@ int git_config_parse(
 	}
 
 	if (on_eof)
-		result = on_eof(parser, current_section, payload);
+		result = on_eof(parser, current_section, data);
 
 out:
 	git__free(current_section);

data/vendor/libgit2/src/config_parse.h

@@ -8,51 +8,50 @@
 #define INCLUDE_config_parse_h__
 
 #include "common.h"
-
 #include "array.h"
-#include "futils.h"
 #include "oid.h"
 #include "parse.h"
 
-extern const char *git_config_escapes;
-extern const char *git_config_escaped;
+static const char *git_config_escapes = "ntb\"\\";
+static const char *git_config_escaped = "\n\t\b\"\\";
+
+typedef struct config_file {
+	git_oid checksum;
+	char *path;
+	git_array_t(struct config_file) includes;
+} git_config_file;
 
 typedef struct {
-	const char *path;
+	struct config_file *file;
 	git_parse_ctx ctx;
 } git_config_parser;
 
-#define GIT_CONFIG_PARSER_INIT { NULL, GIT_PARSE_CTX_INIT }
-
 typedef int (*git_config_parser_section_cb)(
 	git_config_parser *parser,
 	const char *current_section,
 	const char *line,
 	size_t line_len,
-	void *payload);
+	void *data);
 
 typedef int (*git_config_parser_variable_cb)(
 	git_config_parser *parser,
 	const char *current_section,
-	const char *var_name,
-	const char *var_value,
+	char *var_name,
+	char *var_value,
 	const char *line,
 	size_t line_len,
-	void *payload);
+	void *data);
 
 typedef int (*git_config_parser_comment_cb)(
 	git_config_parser *parser,
 	const char *line,
 	size_t line_len,
-	void *payload);
+	void *data);
 
 typedef int (*git_config_parser_eof_cb)(
 	git_config_parser *parser,
 	const char *current_section,
-	void *payload);
-
-int git_config_parser_init(git_config_parser *out, const char *path, const char *data, size_t datalen);
-void git_config_parser_dispose(git_config_parser *parser);
+	void *data);
 
 int git_config_parse(
 	git_config_parser *parser,
@@ -60,6 +59,6 @@ int git_config_parse(
 	git_config_parser_variable_cb on_variable,
 	git_config_parser_comment_cb on_comment,
 	git_config_parser_eof_cb on_eof,
-	void *payload);
+	void *data);
 
 #endif