From patchwork Wed Aug 23 21:53:48 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Josh Steadmon X-Patchwork-Id: 13363218 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 20A77C27C40 for ; Wed, 23 Aug 2023 21:54:58 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S237931AbjHWVy0 (ORCPT ); Wed, 23 Aug 2023 17:54:26 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:49602 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S238013AbjHWVx7 (ORCPT ); Wed, 23 Aug 2023 17:53:59 -0400 Received: from mail-yb1-xb49.google.com (mail-yb1-xb49.google.com [IPv6:2607:f8b0:4864:20::b49]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 47AF010D2 for ; Wed, 23 Aug 2023 14:53:56 -0700 (PDT) Received: by mail-yb1-xb49.google.com with SMTP id 3f1490d57ef6-d630af4038fso7473773276.0 for ; Wed, 23 Aug 2023 14:53:56 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20221208; t=1692827635; x=1693432435; h=cc:to:from:subject:message-id:references:mime-version:in-reply-to :date:from:to:cc:subject:date:message-id:reply-to; bh=vzIHnW3LwN1kbMJx76zgwCo1YtzUxZWHUl0Yzf0SPyI=; b=xpriQj7i0V7xxAzun9Ts5XJ3Dg1/HpC8vffVUy5BPvracHkPZdLq/QHmfyh4XHy2Ep e8dlsqS+jpKZHYThTmcesQIIlPRTZz5J51weuGeBnTVHFAh0O5KjgrfwtBJ8EQMaKvtf R3gbEwDv3oGxdAwFBbwkvqK2fSQ3rvUbrW2nsdAt5LGQQIoFIwhRBPXXwnkS2XIhy4n7 xIPuKh6/h4RRNazSI3FCQ+rCf+d7rSV1VX0Z+aitAzar8d1YVIaz+jZLZNbsb9z6pcNE 9Mr3KhltfyEwpY931kEu/cQlbF3YAIJ5Z8/WJ7CFR0dHkguGlNaMTyWfosCp0dpkccKh 1gUA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1692827635; x=1693432435; h=cc:to:from:subject:message-id:references:mime-version:in-reply-to :date:x-gm-message-state:from:to:cc:subject:date:message-id:reply-to; bh=vzIHnW3LwN1kbMJx76zgwCo1YtzUxZWHUl0Yzf0SPyI=; b=EjCJ5W4+d1BF2dTg5qQYE58qEyXpM8Of8X2TOzPtQ2S0bR0dR6mCpTzx+c+MgTyK5w YmYd9dzzaR523pW+tvQQs73DZOhK1Eisbiyu58E12E4HcC3/gO7Uk6YBKQZq/uiCYV5N EBzD/SaO3GE952eoYbnd21gt3It1gbzCwVjbMUKaoqPvuVXd7iFZ5/oy0vAxFnAw13QG 5QQ8oy1Y1C0Q1MZ3vEIqb9rmgzLC12Rn35tOWS6IpADk//MwXYnHMvnLTKbI2e9B/7Gm arfolpPaYNZ77yovRpmDRvp6E5cps7htvUEIVk9HIOeX7BmPlMEF86FBKNZ6jDDt6/5v daWQ== X-Gm-Message-State: AOJu0YzLvOgR/3pCpiSr4QXdZF93522Riw3HV/PQ2PHUdRVgRjNcN8XV zWNI3u5a9j0nGYsYzGYi5IOPlrsrz++Ff09jagNzO5gnoV/drPYdSJce14qxDG9O08bpjw8tiNh OZlWLEaT7cFoOEZwsLtqiRPo9PIAF+Ez3mfkFOWl9kd+jQS8JzWhCWT8SCrjT/eQ= X-Google-Smtp-Source: AGHT+IEQCmA1l44zSfI1FO3PKaW9oNv9624L4yGVlETaoKN4OqBDADUt4tF93dkCstHUQJWP+G6gOvCHHJUARQ== X-Received: from lunarfall.svl.corp.google.com ([2620:15c:2d3:204:83ba:288:9608:d4be]) (user=steadmon job=sendgmr) by 2002:a5b:a11:0:b0:d77:e848:2afe with SMTP id k17-20020a5b0a11000000b00d77e8482afemr39276ybq.13.1692827635487; Wed, 23 Aug 2023 14:53:55 -0700 (PDT) Date: Wed, 23 Aug 2023 14:53:48 -0700 In-Reply-To: Mime-Version: 1.0 References: X-Mailer: git-send-email 2.42.0.rc1.204.g551eb34607-goog Message-ID: <5c676fbac370a2ba9d499ae2ef003e75b1d70081.1692827403.git.steadmon@google.com> Subject: [PATCH v2 1/4] config: split out config_parse_options From: Josh Steadmon To: git@vger.kernel.org Cc: jonathantanmy@google.com, calvinwan@google.com, glencbz@gmail.com, gitster@pobox.com Precedence: bulk List-ID: X-Mailing-List: git@vger.kernel.org From: Glen Choo "struct config_options" is a disjoint set of options options used by the config parser (e.g. event listners) and options used by config_with_options() (e.g. to handle includes, choose which config files to parse). Split parser-only options into config_parse_options. Signed-off-by: Glen Choo Signed-off-by: Josh Steadmon --- bundle-uri.c | 2 +- config.c | 14 +++++++------- config.h | 37 ++++++++++++++++++++----------------- fsck.c | 2 +- 4 files changed, 29 insertions(+), 26 deletions(-) diff --git a/bundle-uri.c b/bundle-uri.c index 4b5c49b93d..f93ca6a486 100644 --- a/bundle-uri.c +++ b/bundle-uri.c @@ -237,7 +237,7 @@ int bundle_uri_parse_config_format(const char *uri, struct bundle_list *list) { int result; - struct config_options opts = { + struct config_parse_options opts = { .error_action = CONFIG_ERROR_ERROR, }; diff --git a/config.c b/config.c index 85c5f35132..1518f70fc2 100644 --- a/config.c +++ b/config.c @@ -982,7 +982,7 @@ static int get_base_var(struct config_source *cs, struct strbuf *name) struct parse_event_data { enum config_event_t previous_type; size_t previous_offset; - const struct config_options *opts; + const struct config_parse_options *opts; }; static int do_event(struct config_source *cs, enum config_event_t type, @@ -1030,7 +1030,7 @@ static void kvi_from_source(struct config_source *cs, static int git_parse_source(struct config_source *cs, config_fn_t fn, struct key_value_info *kvi, void *data, - const struct config_options *opts) + const struct config_parse_options *opts) { int comment = 0; size_t baselen = 0; @@ -1967,7 +1967,7 @@ int git_default_config(const char *var, const char *value, */ static int do_config_from(struct config_source *top, config_fn_t fn, void *data, enum config_scope scope, - const struct config_options *opts) + const struct config_parse_options *opts) { struct key_value_info kvi = KVI_INIT; int ret; @@ -1992,7 +1992,7 @@ static int do_config_from_file(config_fn_t fn, const enum config_origin_type origin_type, const char *name, const char *path, FILE *f, void *data, enum config_scope scope, - const struct config_options *opts) + const struct config_parse_options *opts) { struct config_source top = CONFIG_SOURCE_INIT; int ret; @@ -2021,7 +2021,7 @@ static int git_config_from_stdin(config_fn_t fn, void *data, int git_config_from_file_with_options(config_fn_t fn, const char *filename, void *data, enum config_scope scope, - const struct config_options *opts) + const struct config_parse_options *opts) { int ret = -1; FILE *f; @@ -2047,7 +2047,7 @@ int git_config_from_mem(config_fn_t fn, const enum config_origin_type origin_type, const char *name, const char *buf, size_t len, void *data, enum config_scope scope, - const struct config_options *opts) + const struct config_parse_options *opts) { struct config_source top = CONFIG_SOURCE_INIT; @@ -3380,7 +3380,7 @@ int git_config_set_multivar_in_file_gently(const char *config_filename, struct stat st; size_t copy_begin, copy_end; int i, new_line = 0; - struct config_options opts; + struct config_parse_options opts; if (!value_pattern) store.value_pattern = NULL; diff --git a/config.h b/config.h index 6332d74904..2537516446 100644 --- a/config.h +++ b/config.h @@ -85,6 +85,21 @@ typedef int (*config_parser_event_fn_t)(enum config_event_t type, struct config_source *cs, void *event_fn_data); +struct config_parse_options { + enum config_error_action { + CONFIG_ERROR_UNSET = 0, /* use source-specific default */ + CONFIG_ERROR_DIE, /* die() on error */ + CONFIG_ERROR_ERROR, /* error() on error, return -1 */ + CONFIG_ERROR_SILENT, /* return -1 */ + } error_action; + /* + * event_fn and event_fn_data are for internal use only. Handles events + * emitted by the config parser. + */ + config_parser_event_fn_t event_fn; + void *event_fn_data; +}; + struct config_options { unsigned int respect_includes : 1; unsigned int ignore_repo : 1; @@ -92,6 +107,9 @@ struct config_options { unsigned int ignore_cmdline : 1; unsigned int system_gently : 1; + const char *commondir; + const char *git_dir; + struct config_parse_options parse_options; /* * For internal use. Include all includeif.hasremoteurl paths without * checking if the repo has that remote URL, and when doing so, verify @@ -99,21 +117,6 @@ struct config_options { * themselves. */ unsigned int unconditional_remote_url : 1; - - const char *commondir; - const char *git_dir; - /* - * event_fn and event_fn_data are for internal use only. Handles events - * emitted by the config parser. - */ - config_parser_event_fn_t event_fn; - void *event_fn_data; - enum config_error_action { - CONFIG_ERROR_UNSET = 0, /* use source-specific default */ - CONFIG_ERROR_DIE, /* die() on error */ - CONFIG_ERROR_ERROR, /* error() on error, return -1 */ - CONFIG_ERROR_SILENT, /* return -1 */ - } error_action; }; /* Config source metadata for a given config key-value pair */ @@ -178,13 +181,13 @@ int git_config_from_file(config_fn_t fn, const char *, void *); int git_config_from_file_with_options(config_fn_t fn, const char *, void *, enum config_scope, - const struct config_options *); + const struct config_parse_options *); int git_config_from_mem(config_fn_t fn, const enum config_origin_type, const char *name, const char *buf, size_t len, void *data, enum config_scope scope, - const struct config_options *opts); + const struct config_parse_options *opts); int git_config_from_blob_oid(config_fn_t fn, const char *name, struct repository *repo, const struct object_id *oid, void *data, diff --git a/fsck.c b/fsck.c index 3be86616c5..522ee1c18a 100644 --- a/fsck.c +++ b/fsck.c @@ -1219,7 +1219,7 @@ static int fsck_blob(const struct object_id *oid, const char *buf, return 0; if (oidset_contains(&options->gitmodules_found, oid)) { - struct config_options config_opts = { 0 }; + struct config_parse_options config_opts = { 0 }; struct fsck_gitmodules_data data; oidset_insert(&options->gitmodules_done, oid); From patchwork Wed Aug 23 21:53:49 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Josh Steadmon X-Patchwork-Id: 13363220 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 82C51C71153 for ; Wed, 23 Aug 2023 21:54:58 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S238013AbjHWVy1 (ORCPT ); Wed, 23 Aug 2023 17:54:27 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:49430 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S238304AbjHWVyB (ORCPT ); Wed, 23 Aug 2023 17:54:01 -0400 Received: from mail-yw1-x1149.google.com (mail-yw1-x1149.google.com [IPv6:2607:f8b0:4864:20::1149]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 73310E5C for ; Wed, 23 Aug 2023 14:53:58 -0700 (PDT) Received: by mail-yw1-x1149.google.com with SMTP id 00721157ae682-58d428d4956so78317887b3.0 for ; Wed, 23 Aug 2023 14:53:58 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20221208; t=1692827637; x=1693432437; h=cc:to:from:subject:message-id:references:mime-version:in-reply-to :date:from:to:cc:subject:date:message-id:reply-to; bh=NLNaGvuAqYnHidi8Yx+o34fUeL1/oPEcXDU7dxSC65A=; b=C4bnE1jpPNDg+W2OtKjXyXCewUB16uVk3/cuNX2RphljaksQWPwcvlj6iZ3OrpS2h6 Dmol1nC7SfiYrhGtGz/Tn6d15kw3S6cRsDlAKHOitok77Kz5RQlsi5rpcNn20gG37Aw9 y/GO/QEgWLiHnw9Tnm3uEM1+wz469cqPwF269o7NibmgiVvsqEUtKL4YrVu2ufRd7UvB BLvQnWMdbhPUq7lGxCRq1ZqNDfRWsIOXrSilXfc3WLtCH0G3Fler6Rru/EcA55fywvU/ iS4/WlzAHAg4M4gWysUurKoRSjlGCAsVqtnJyZllqO/y1eIXf5BQirYbeqgHDE3mgMxv EfJA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1692827637; x=1693432437; h=cc:to:from:subject:message-id:references:mime-version:in-reply-to :date:x-gm-message-state:from:to:cc:subject:date:message-id:reply-to; bh=NLNaGvuAqYnHidi8Yx+o34fUeL1/oPEcXDU7dxSC65A=; b=QdTngY7zBNwnftbMH8vckoLb6zTn6OkS7P2RINaCZ9tYhVE5G3VPlys9H2JSHvNnE2 W9s1o+mVNMumRNWAelNmLmV6Yo651p1kfvwgl3zY+EATANj2ay9fLLXAZ+s9aIL/I7En d64MIUoqVJH0SdKVz6wBz82u/sytVcbOIRbWv07U+189im7R7fT2jArmeQqChO46t73m Y9gUuDdh4aPo9lPPvCMiRuSyFYM//1gn15VGVeGNrC4vDb1E+WJ67fPUt06bnYGc//b5 yHqzlZhoM/JOD3xo2x9UiIojp5PyQl5YGrbcRvNAnylhcG3gzh3RexHMBNh3af71rPfV BjNQ== X-Gm-Message-State: AOJu0YyyvHRzkmGzNCmvSxcOmVoN9h9JTroyXuOKglu1yormlPSlR8t0 QbDjIQPhJ9lDcwLk55q6e0pMSxhLZjrXBK5o3hCOuxfsOOh7Z7gpBbRp66HXS0pxHn3kTDVS5XD +YSkM6NOdPjAA6wxFkMuvQ/CIkAMwPh3LnbyFm0dc+Er80ji6jEZs5wsq3wlaYCs= X-Google-Smtp-Source: AGHT+IECJ7fiJwhAiETxUV6rp/FT3q3FcHQnT37r/c5xR/k3lrYaohQFXUBcnLQ6fV5K3kq0O3ZimBdPgiHvvw== X-Received: from lunarfall.svl.corp.google.com ([2620:15c:2d3:204:83ba:288:9608:d4be]) (user=steadmon job=sendgmr) by 2002:a25:6983:0:b0:d49:e117:3a17 with SMTP id e125-20020a256983000000b00d49e1173a17mr176512ybc.4.1692827637596; Wed, 23 Aug 2023 14:53:57 -0700 (PDT) Date: Wed, 23 Aug 2023 14:53:49 -0700 In-Reply-To: Mime-Version: 1.0 References: X-Mailer: git-send-email 2.42.0.rc1.204.g551eb34607-goog Message-ID: Subject: [PATCH v2 2/4] config: report config parse errors using cb From: Josh Steadmon To: git@vger.kernel.org Cc: jonathantanmy@google.com, calvinwan@google.com, glencbz@gmail.com, gitster@pobox.com Precedence: bulk List-ID: X-Mailing-List: git@vger.kernel.org From: Glen Choo In a subsequent commit, config parsing will become its own library, and it's likely that the caller will want flexibility in handling errors (instead of being limited to the error handling we have in-tree). Move the Git-specific error handling into a config_parser_event_fn_t that responds to config errors, and make git_parse_source() always return -1 (careful inspection shows that it was always returning -1 already). This makes CONFIG_ERROR_SILENT obsolete since that is equivalent to not specifying an error event listener. Also, remove CONFIG_ERROR_UNSET and the config_source 'default', since all callers are now expected to specify the error handling they want. Signed-off-by: Glen Choo Signed-off-by: Josh Steadmon --- builtin/config.c | 4 +- bundle-uri.c | 4 +- config.c | 175 ++++++++++++++++++++++++++------------------- config.h | 20 ++++-- fsck.c | 4 +- submodule-config.c | 9 ++- 6 files changed, 129 insertions(+), 87 deletions(-) diff --git a/builtin/config.c b/builtin/config.c index 1c75cbc43d..e2cf49de7a 100644 --- a/builtin/config.c +++ b/builtin/config.c @@ -42,7 +42,9 @@ static int actions, type; static char *default_value; static int end_nul; static int respect_includes_opt = -1; -static struct config_options config_options; +static struct config_options config_options = { + .parse_options = CP_OPTS_INIT(CONFIG_ERROR_DIE) +}; static int show_origin; static int show_scope; static int fixed_value; diff --git a/bundle-uri.c b/bundle-uri.c index f93ca6a486..856bffdcad 100644 --- a/bundle-uri.c +++ b/bundle-uri.c @@ -237,9 +237,7 @@ int bundle_uri_parse_config_format(const char *uri, struct bundle_list *list) { int result; - struct config_parse_options opts = { - .error_action = CONFIG_ERROR_ERROR, - }; + struct config_parse_options opts = CP_OPTS_INIT(CONFIG_ERROR_ERROR); if (!list->baseURI) { struct strbuf baseURI = STRBUF_INIT; diff --git a/config.c b/config.c index 1518f70fc2..6cf4dafc6c 100644 --- a/config.c +++ b/config.c @@ -55,7 +55,6 @@ struct config_source { enum config_origin_type origin_type; const char *name; const char *path; - enum config_error_action default_error_action; int linenr; int eof; size_t total_len; @@ -185,13 +184,15 @@ static int handle_path_include(const struct key_value_info *kvi, } if (!access_or_die(path, R_OK, 0)) { + struct config_parse_options config_opts = CP_OPTS_INIT(CONFIG_ERROR_DIE); + if (++inc->depth > MAX_INCLUDE_DEPTH) die(_(include_depth_advice), MAX_INCLUDE_DEPTH, path, !kvi ? "" : kvi->filename ? kvi->filename : "the command line"); ret = git_config_from_file_with_options(git_config_include, path, inc, - kvi->scope, NULL); + kvi->scope, &config_opts); inc->depth--; } cleanup: @@ -339,7 +340,9 @@ static int add_remote_url(const char *var, const char *value, static void populate_remote_urls(struct config_include_data *inc) { - struct config_options opts; + struct config_options opts = { + .parse_options = CP_OPTS_INIT(CONFIG_ERROR_DIE), + }; opts = *inc->opts; opts.unconditional_remote_url = 1; @@ -1028,6 +1031,56 @@ static void kvi_from_source(struct config_source *cs, out->path = cs->path; } +int git_config_err_fn(enum config_event_t type, size_t begin_offset UNUSED, + size_t end_offset UNUSED, struct config_source *cs, + void *data) +{ + char *error_msg = NULL; + int error_return = 0; + enum config_error_action *action = data; + + if (type != CONFIG_EVENT_ERROR) + return 0; + + switch (cs->origin_type) { + case CONFIG_ORIGIN_BLOB: + error_msg = xstrfmt(_("bad config line %d in blob %s"), + cs->linenr, cs->name); + break; + case CONFIG_ORIGIN_FILE: + error_msg = xstrfmt(_("bad config line %d in file %s"), + cs->linenr, cs->name); + break; + case CONFIG_ORIGIN_STDIN: + error_msg = xstrfmt(_("bad config line %d in standard input"), + cs->linenr); + break; + case CONFIG_ORIGIN_SUBMODULE_BLOB: + error_msg = xstrfmt(_("bad config line %d in submodule-blob %s"), + cs->linenr, cs->name); + break; + case CONFIG_ORIGIN_CMDLINE: + error_msg = xstrfmt(_("bad config line %d in command line %s"), + cs->linenr, cs->name); + break; + default: + error_msg = xstrfmt(_("bad config line %d in %s"), + cs->linenr, cs->name); + } + + switch (*action) { + case CONFIG_ERROR_DIE: + die("%s", error_msg); + break; + case CONFIG_ERROR_ERROR: + error_return = error("%s", error_msg); + break; + } + + free(error_msg); + return error_return; +} + static int git_parse_source(struct config_source *cs, config_fn_t fn, struct key_value_info *kvi, void *data, const struct config_parse_options *opts) @@ -1035,8 +1088,6 @@ static int git_parse_source(struct config_source *cs, config_fn_t fn, int comment = 0; size_t baselen = 0; struct strbuf *var = &cs->var; - int error_return = 0; - char *error_msg = NULL; /* U+FEFF Byte Order Mark in UTF8 */ const char *bomptr = utf8_bom; @@ -1118,53 +1169,14 @@ static int git_parse_source(struct config_source *cs, config_fn_t fn, break; } - if (do_event(cs, CONFIG_EVENT_ERROR, &event_data) < 0) - return -1; - - switch (cs->origin_type) { - case CONFIG_ORIGIN_BLOB: - error_msg = xstrfmt(_("bad config line %d in blob %s"), - cs->linenr, cs->name); - break; - case CONFIG_ORIGIN_FILE: - error_msg = xstrfmt(_("bad config line %d in file %s"), - cs->linenr, cs->name); - break; - case CONFIG_ORIGIN_STDIN: - error_msg = xstrfmt(_("bad config line %d in standard input"), - cs->linenr); - break; - case CONFIG_ORIGIN_SUBMODULE_BLOB: - error_msg = xstrfmt(_("bad config line %d in submodule-blob %s"), - cs->linenr, cs->name); - break; - case CONFIG_ORIGIN_CMDLINE: - error_msg = xstrfmt(_("bad config line %d in command line %s"), - cs->linenr, cs->name); - break; - default: - error_msg = xstrfmt(_("bad config line %d in %s"), - cs->linenr, cs->name); - } - - switch (opts && opts->error_action ? - opts->error_action : - cs->default_error_action) { - case CONFIG_ERROR_DIE: - die("%s", error_msg); - break; - case CONFIG_ERROR_ERROR: - error_return = error("%s", error_msg); - break; - case CONFIG_ERROR_SILENT: - error_return = -1; - break; - case CONFIG_ERROR_UNSET: - BUG("config error action unset"); - } - - free(error_msg); - return error_return; + /* + * FIXME for whatever reason, do_event passes the _previous_ event, so + * in order for our callback to receive the error event, we have to call + * do_event twice + */ + do_event(cs, CONFIG_EVENT_ERROR, &event_data); + do_event(cs, CONFIG_EVENT_ERROR, &event_data); + return -1; } static uintmax_t get_unit_factor(const char *end) @@ -2001,7 +2013,6 @@ static int do_config_from_file(config_fn_t fn, top.origin_type = origin_type; top.name = name; top.path = path; - top.default_error_action = CONFIG_ERROR_DIE; top.do_fgetc = config_file_fgetc; top.do_ungetc = config_file_ungetc; top.do_ftell = config_file_ftell; @@ -2015,8 +2026,10 @@ static int do_config_from_file(config_fn_t fn, static int git_config_from_stdin(config_fn_t fn, void *data, enum config_scope scope) { + struct config_parse_options config_opts = CP_OPTS_INIT(CONFIG_ERROR_DIE); + return do_config_from_file(fn, CONFIG_ORIGIN_STDIN, "", NULL, stdin, - data, scope, NULL); + data, scope, &config_opts); } int git_config_from_file_with_options(config_fn_t fn, const char *filename, @@ -2039,8 +2052,10 @@ int git_config_from_file_with_options(config_fn_t fn, const char *filename, int git_config_from_file(config_fn_t fn, const char *filename, void *data) { + struct config_parse_options config_opts = CP_OPTS_INIT(CONFIG_ERROR_DIE); + return git_config_from_file_with_options(fn, filename, data, - CONFIG_SCOPE_UNKNOWN, NULL); + CONFIG_SCOPE_UNKNOWN, &config_opts); } int git_config_from_mem(config_fn_t fn, @@ -2057,7 +2072,6 @@ int git_config_from_mem(config_fn_t fn, top.origin_type = origin_type; top.name = name; top.path = NULL; - top.default_error_action = CONFIG_ERROR_ERROR; top.do_fgetc = config_buf_fgetc; top.do_ungetc = config_buf_ungetc; top.do_ftell = config_buf_ftell; @@ -2076,6 +2090,7 @@ int git_config_from_blob_oid(config_fn_t fn, char *buf; unsigned long size; int ret; + struct config_parse_options config_opts = CP_OPTS_INIT(CONFIG_ERROR_ERROR); buf = repo_read_object_file(repo, oid, &type, &size); if (!buf) @@ -2086,7 +2101,7 @@ int git_config_from_blob_oid(config_fn_t fn, } ret = git_config_from_mem(fn, CONFIG_ORIGIN_BLOB, name, buf, size, - data, scope, NULL); + data, scope, &config_opts); free(buf); return ret; @@ -2187,29 +2202,32 @@ static int do_git_config_sequence(const struct config_options *opts, opts->system_gently ? ACCESS_EACCES_OK : 0)) ret += git_config_from_file_with_options(fn, system_config, data, CONFIG_SCOPE_SYSTEM, - NULL); + &opts->parse_options); git_global_config(&user_config, &xdg_config); if (xdg_config && !access_or_die(xdg_config, R_OK, ACCESS_EACCES_OK)) ret += git_config_from_file_with_options(fn, xdg_config, data, - CONFIG_SCOPE_GLOBAL, NULL); + CONFIG_SCOPE_GLOBAL, + &opts->parse_options); if (user_config && !access_or_die(user_config, R_OK, ACCESS_EACCES_OK)) ret += git_config_from_file_with_options(fn, user_config, data, - CONFIG_SCOPE_GLOBAL, NULL); + CONFIG_SCOPE_GLOBAL, + &opts->parse_options); if (!opts->ignore_repo && repo_config && !access_or_die(repo_config, R_OK, 0)) ret += git_config_from_file_with_options(fn, repo_config, data, - CONFIG_SCOPE_LOCAL, NULL); + CONFIG_SCOPE_LOCAL, + &opts->parse_options); if (!opts->ignore_worktree && worktree_config && repo && repo->repository_format_worktree_config && !access_or_die(worktree_config, R_OK, 0)) { ret += git_config_from_file_with_options(fn, worktree_config, data, CONFIG_SCOPE_WORKTREE, - NULL); + &opts->parse_options); } if (!opts->ignore_cmdline && git_config_from_parameters(fn, data) < 0) @@ -2250,7 +2268,7 @@ int config_with_options(config_fn_t fn, void *data, } else if (config_source && config_source->file) { ret = git_config_from_file_with_options(fn, config_source->file, data, config_source->scope, - NULL); + &opts->parse_options); } else if (config_source && config_source->blob) { ret = git_config_from_blob_ref(fn, repo, config_source->blob, data, config_source->scope); @@ -2288,9 +2306,11 @@ static void configset_iter(struct config_set *set, config_fn_t fn, void *data) void read_early_config(config_fn_t cb, void *data) { - struct config_options opts = {0}; struct strbuf commondir = STRBUF_INIT; struct strbuf gitdir = STRBUF_INIT; + struct config_options opts = { + .parse_options = CP_OPTS_INIT(CONFIG_ERROR_DIE), + }; opts.respect_includes = 1; @@ -2322,7 +2342,9 @@ void read_early_config(config_fn_t cb, void *data) */ void read_very_early_config(config_fn_t cb, void *data) { - struct config_options opts = { 0 }; + struct config_options opts = { + .parse_options = CP_OPTS_INIT(CONFIG_ERROR_DIE), + }; opts.respect_includes = 1; opts.ignore_repo = 1; @@ -2613,7 +2635,9 @@ int git_configset_get_pathname(struct config_set *set, const char *key, const ch /* Functions use to read configuration from a repository */ static void repo_read_config(struct repository *repo) { - struct config_options opts = { 0 }; + struct config_options opts = { + .parse_options = CP_OPTS_INIT(CONFIG_ERROR_DIE), + }; opts.respect_includes = 1; opts.commondir = repo->commondir; @@ -2760,12 +2784,14 @@ int repo_config_get_pathname(struct repository *repo, static void read_protected_config(void) { struct config_options opts = { - .respect_includes = 1, - .ignore_repo = 1, - .ignore_worktree = 1, - .system_gently = 1, + .parse_options = CP_OPTS_INIT(CONFIG_ERROR_DIE), }; + opts.respect_includes = 1; + opts.ignore_repo = 1; + opts.ignore_worktree = 1; + opts.system_gently = 1; + git_configset_init(&protected_config); config_with_options(config_set_callback, &protected_config, NULL, NULL, &opts); @@ -2976,6 +3002,7 @@ struct config_store_data { enum config_event_t type; int is_keys_section; } *parsed; + enum config_error_action error_action; unsigned int parsed_nr, parsed_alloc, *seen, seen_nr, seen_alloc; unsigned int key_seen:1, section_seen:1, is_keys_section:1; }; @@ -3043,6 +3070,10 @@ static int store_aux_event(enum config_event_t type, size_t begin, size_t end, store->seen[store->seen_nr] = store->parsed_nr; } } + if (type == CONFIG_EVENT_ERROR) { + return git_config_err_fn(type, begin, end, cs, + &store->error_action); + } store->parsed_nr++; @@ -3380,7 +3411,7 @@ int git_config_set_multivar_in_file_gently(const char *config_filename, struct stat st; size_t copy_begin, copy_end; int i, new_line = 0; - struct config_parse_options opts; + struct config_parse_options opts = CP_OPTS_INIT(CONFIG_ERROR_DIE); if (!value_pattern) store.value_pattern = NULL; @@ -3407,8 +3438,8 @@ int git_config_set_multivar_in_file_gently(const char *config_filename, ALLOC_GROW(store.parsed, 1, store.parsed_alloc); store.parsed[0].end = 0; + store.error_action = CONFIG_ERROR_DIE; - memset(&opts, 0, sizeof(opts)); opts.event_fn = store_aux_event; opts.event_fn_data = &store; diff --git a/config.h b/config.h index 2537516446..8ad399580f 100644 --- a/config.h +++ b/config.h @@ -86,12 +86,6 @@ typedef int (*config_parser_event_fn_t)(enum config_event_t type, void *event_fn_data); struct config_parse_options { - enum config_error_action { - CONFIG_ERROR_UNSET = 0, /* use source-specific default */ - CONFIG_ERROR_DIE, /* die() on error */ - CONFIG_ERROR_ERROR, /* error() on error, return -1 */ - CONFIG_ERROR_SILENT, /* return -1 */ - } error_action; /* * event_fn and event_fn_data are for internal use only. Handles events * emitted by the config parser. @@ -100,6 +94,11 @@ struct config_parse_options { void *event_fn_data; }; +#define CP_OPTS_INIT(error_action) { \ + .event_fn = git_config_err_fn, \ + .event_fn_data = (enum config_error_action []){(error_action)}, \ +} + struct config_options { unsigned int respect_includes : 1; unsigned int ignore_repo : 1; @@ -119,6 +118,15 @@ struct config_options { unsigned int unconditional_remote_url : 1; }; +enum config_error_action { + CONFIG_ERROR_DIE, /* die() on error */ + CONFIG_ERROR_ERROR, /* error() on error, return -1 */ +}; + +int git_config_err_fn(enum config_event_t type, size_t begin_offset, + size_t end_offset, struct config_source *cs, + void *event_fn_data); + /* Config source metadata for a given config key-value pair */ struct key_value_info { const char *filename; diff --git a/fsck.c b/fsck.c index 522ee1c18a..bc0ca11421 100644 --- a/fsck.c +++ b/fsck.c @@ -1219,7 +1219,6 @@ static int fsck_blob(const struct object_id *oid, const char *buf, return 0; if (oidset_contains(&options->gitmodules_found, oid)) { - struct config_parse_options config_opts = { 0 }; struct fsck_gitmodules_data data; oidset_insert(&options->gitmodules_done, oid); @@ -1238,10 +1237,9 @@ static int fsck_blob(const struct object_id *oid, const char *buf, data.oid = oid; data.options = options; data.ret = 0; - config_opts.error_action = CONFIG_ERROR_SILENT; if (git_config_from_mem(fsck_gitmodules_fn, CONFIG_ORIGIN_BLOB, ".gitmodules", buf, size, &data, - CONFIG_SCOPE_UNKNOWN, &config_opts)) + CONFIG_SCOPE_UNKNOWN, NULL)) data.ret |= report(options, oid, OBJ_BLOB, FSCK_MSG_GITMODULES_PARSE, "could not parse gitmodules blob"); diff --git a/submodule-config.c b/submodule-config.c index b6908e295f..d97135c917 100644 --- a/submodule-config.c +++ b/submodule-config.c @@ -565,6 +565,8 @@ static const struct submodule *config_from(struct submodule_cache *cache, enum object_type type; const struct submodule *submodule = NULL; struct parse_config_parameter parameter; + struct config_parse_options config_opts = CP_OPTS_INIT(CONFIG_ERROR_ERROR); + /* * If any parameter except the cache is a NULL pointer just @@ -608,7 +610,8 @@ static const struct submodule *config_from(struct submodule_cache *cache, parameter.gitmodules_oid = &oid; parameter.overwrite = 0; git_config_from_mem(parse_config, CONFIG_ORIGIN_SUBMODULE_BLOB, rev.buf, - config, config_size, ¶meter, CONFIG_SCOPE_UNKNOWN, NULL); + config, config_size, ¶meter, + CONFIG_SCOPE_UNKNOWN, &config_opts); strbuf_release(&rev); free(config); @@ -652,7 +655,9 @@ static void config_from_gitmodules(config_fn_t fn, struct repository *repo, void struct git_config_source config_source = { 0, .scope = CONFIG_SCOPE_SUBMODULE }; - const struct config_options opts = { 0 }; + struct config_options opts = { + .parse_options = CP_OPTS_INIT(CONFIG_ERROR_DIE), + }; struct object_id oid; char *file; char *oidstr = NULL; From patchwork Wed Aug 23 21:53:50 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Josh Steadmon X-Patchwork-Id: 13363219 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id 6BB99C3DA6F for ; Wed, 23 Aug 2023 21:54:58 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S238215AbjHWVy2 (ORCPT ); Wed, 23 Aug 2023 17:54:28 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:49440 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S238324AbjHWVyC (ORCPT ); Wed, 23 Aug 2023 17:54:02 -0400 Received: from mail-yw1-x1149.google.com (mail-yw1-x1149.google.com [IPv6:2607:f8b0:4864:20::1149]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 8C3A1E52 for ; Wed, 23 Aug 2023 14:54:00 -0700 (PDT) Received: by mail-yw1-x1149.google.com with SMTP id 00721157ae682-59224c40275so37267937b3.3 for ; Wed, 23 Aug 2023 14:54:00 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20221208; t=1692827640; x=1693432440; h=cc:to:from:subject:message-id:references:mime-version:in-reply-to :date:from:to:cc:subject:date:message-id:reply-to; bh=yn516+F8TP3bMPM3VH2wJkYdgK3cLGYRbNTqJIasxT0=; b=osnzKv9ddHHup4gqPx43FrUu5V5hwIRUdLEt5jj1lH6lE/a5OUdcscX3Kl2kqCJXBq 2hvoy2TStvUZz7NBnwr001PL62rjwVVWUiBxHzEcdMiCLjG6rkOj+Vb4OwtXB2O0NJ+0 K+TfvDr9YVkEuRe5P15oi24WT0Aa1xi95LZQK1E/sDF4uyW+xndfgdI8uvYq+X+do+Oy hds+OmwiXvY005jv0xNMSJDW7QuOeyBoP1BeV2xyzVo3KeWeVe0XIP9Ykkh/sOxNAePb hYKrxvCn4wPMHAYKA9dAhEN0WeH5vwP3AiJ0h3e0HOGQM67HnB+RDjIrZpy4Evj0SDT7 rc1w== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1692827640; x=1693432440; h=cc:to:from:subject:message-id:references:mime-version:in-reply-to :date:x-gm-message-state:from:to:cc:subject:date:message-id:reply-to; bh=yn516+F8TP3bMPM3VH2wJkYdgK3cLGYRbNTqJIasxT0=; b=Wk5o03wD21Vn0SlWWz37OciMjNMhJLxgiD6rJfdzo+Ih46rs/vuSlamYjizc3jYnlv VEv/FitN0tG7C4wKfRFXVOMaPPBLby2ufqxmMPR+GweK2fm1zLW7CUlJ5nLYq9yOK2gf zhl8HgvY0+1a+BrxjMyQ8Gmr3I+47OyKpGObR07qSvJxKfpSMcyV9aAuqIVMPaxhWyvV bUMoN0C/LKNlpuPkp28Cnhy0WooCWnUdfZnFEvJck1/nzOT2m7VNUo0a3a08cLDrwBWi DWxi/MYr5pTXZDKuIa3j3f26Uf/fUziHl263lq7Opc4HE1VknjtKbhTV/Wk5RE+se+Z+ Fy6A== X-Gm-Message-State: AOJu0YwRoQU/UBVyIwINT4tsriTZWnx2x0JjDO5hYHlGQv+CFcbslwuO 2GJABeDteRqJax7DLwNInAG9iitD0nyKpAWsnF2/Os0jqZvZ6IPmD+gjeAYRmFNpqH/7MAq2pMa mebBIhPusq1iPCy7QljHu5EHOn5NN8c/zxvlOfPs1XJB9Y8PRthVULj/Zu08cmLA= X-Google-Smtp-Source: AGHT+IGnoYQd/eVmBhC2CASpbTP8TGduWNo+3ttHxSt3/uswsQWVTOWJKpQ6emvfr359Rf6KVg9uzuA5CJiEGg== X-Received: from lunarfall.svl.corp.google.com ([2620:15c:2d3:204:83ba:288:9608:d4be]) (user=steadmon job=sendgmr) by 2002:a25:ce44:0:b0:d72:8661:ee25 with SMTP id x65-20020a25ce44000000b00d728661ee25mr183737ybe.2.1692827639756; Wed, 23 Aug 2023 14:53:59 -0700 (PDT) Date: Wed, 23 Aug 2023 14:53:50 -0700 In-Reply-To: Mime-Version: 1.0 References: X-Mailer: git-send-email 2.42.0.rc1.204.g551eb34607-goog Message-ID: Subject: [PATCH v2 3/4] config.c: accept config_parse_options in git_config_from_stdin From: Josh Steadmon To: git@vger.kernel.org Cc: jonathantanmy@google.com, calvinwan@google.com, glencbz@gmail.com, gitster@pobox.com Precedence: bulk List-ID: X-Mailing-List: git@vger.kernel.org From: Glen Choo A later commit will move git_config_from_stdin() to a library, so it will need to accept event listeners. Signed-off-by: Glen Choo Signed-off-by: Josh Steadmon --- config.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/config.c b/config.c index 6cf4dafc6c..40cc9dbc40 100644 --- a/config.c +++ b/config.c @@ -2024,12 +2024,11 @@ static int do_config_from_file(config_fn_t fn, } static int git_config_from_stdin(config_fn_t fn, void *data, - enum config_scope scope) + enum config_scope scope, + const struct config_parse_options *config_opts) { - struct config_parse_options config_opts = CP_OPTS_INIT(CONFIG_ERROR_DIE); - return do_config_from_file(fn, CONFIG_ORIGIN_STDIN, "", NULL, stdin, - data, scope, &config_opts); + data, scope, config_opts); } int git_config_from_file_with_options(config_fn_t fn, const char *filename, @@ -2264,7 +2263,8 @@ int config_with_options(config_fn_t fn, void *data, * regular lookup sequence. */ if (config_source && config_source->use_stdin) { - ret = git_config_from_stdin(fn, data, config_source->scope); + ret = git_config_from_stdin(fn, data, config_source->scope, + &opts->parse_options); } else if (config_source && config_source->file) { ret = git_config_from_file_with_options(fn, config_source->file, data, config_source->scope, From patchwork Wed Aug 23 21:53:51 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Josh Steadmon X-Patchwork-Id: 13363221 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by smtp.lore.kernel.org (Postfix) with ESMTP id CCED7C71145 for ; Wed, 23 Aug 2023 21:54:58 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S238324AbjHWVy2 (ORCPT ); Wed, 23 Aug 2023 17:54:28 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:49462 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S238450AbjHWVyH (ORCPT ); Wed, 23 Aug 2023 17:54:07 -0400 Received: from mail-yw1-x1149.google.com (mail-yw1-x1149.google.com [IPv6:2607:f8b0:4864:20::1149]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id B363FE52 for ; Wed, 23 Aug 2023 14:54:02 -0700 (PDT) Received: by mail-yw1-x1149.google.com with SMTP id 00721157ae682-58caf216c55so5345287b3.0 for ; Wed, 23 Aug 2023 14:54:02 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20221208; t=1692827642; x=1693432442; h=cc:to:from:subject:message-id:references:mime-version:in-reply-to :date:from:to:cc:subject:date:message-id:reply-to; bh=UdpUFXHMtz3T/14ZmNmJmJNkepsPmOz4YeC34yW6+sA=; b=FXtOshf9Elytu8fODhPbeHn1KOweLLiXcB2OOka38S45uW9Uq/hNmN8fd9ZAeXZ0WO m6WK6vlF2/W9F8rkEz0da0SSHZtVvdCILTh5C07IinmH7haLfuAEvw5BQ+PkGRQ1GTV2 htXU3nc2SvVFtBj/CoegLXp/v8euqn547yyKwRqyKmbnqSEAE9ls4zJ5Jk3pzPKKGFNW d7TcCD29PwwzIfj8SUGNNxI+4UYzo9CPRBEtRRllxAKvgA7BHJ1hsDfMUBDKRj4FbY0w F9wTehrpWhYgAgqcYtSLRdxpcFKbKIr6k5ZKeLfX9eliJXvb21rDNGR8v3wmrDW4QecN XhHg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1692827642; x=1693432442; h=cc:to:from:subject:message-id:references:mime-version:in-reply-to :date:x-gm-message-state:from:to:cc:subject:date:message-id:reply-to; bh=UdpUFXHMtz3T/14ZmNmJmJNkepsPmOz4YeC34yW6+sA=; b=fdJJT0891kzpShBMfr3+d1zCpXEJrxMSHI+n89zbcLV5rgGHtx5qE88El9NZOuWg1H deEjLp6elxsgHU3wtulXBlKao1TFpzaMTawLv4theTlbfWALjsTrQh7MPcB0j8nb9cJU wlz//A25Rup2Bd3b8EzS62tLjbSF7et6YJZdvnvCTjA839wq9P9AHyNV6tF10EzyAZzg CedVxPpC8pBNZDlZcAsIKTlII4hECY+udKZcfdxg/l5fk7vsbxLY7qw6PBCErruI/r49 P9ZIFYQDp/eA2SOV7zdlfrDmoVYaNt/Ba9eBNtPp62/AQwtxYcbG2TRCS0aZQKKXNxkE fC0Q== X-Gm-Message-State: AOJu0YyDqI7TcjLj9B6GPKsZg0L+jHJTZwZgPupTKhK/LuY00UU9UWuB cQBgfC/5Fbxwh2MTZHfJkoYTq1qKSRSIHqv8TBL4flNQFKrcDFyZnoPo4b1hKN71WA4voOR1JIz S4GcpTGe5Bn0VxjXmRQvvNlNUH4IwEIW5RexpGBKtgukgUEgUp3d1znu/7IUZrAo= X-Google-Smtp-Source: AGHT+IFtM5GuMZfiIo48krrl5BCwql+e8jeG2G525VcvmNhZHCwnTHBnx5KYITLh1qq6unCeZybCuOvQZ353ig== X-Received: from lunarfall.svl.corp.google.com ([2620:15c:2d3:204:83ba:288:9608:d4be]) (user=steadmon job=sendgmr) by 2002:a25:e78a:0:b0:d04:6d5e:4ded with SMTP id e132-20020a25e78a000000b00d046d5e4dedmr257532ybh.6.1692827641914; Wed, 23 Aug 2023 14:54:01 -0700 (PDT) Date: Wed, 23 Aug 2023 14:53:51 -0700 In-Reply-To: Mime-Version: 1.0 References: X-Mailer: git-send-email 2.42.0.rc1.204.g551eb34607-goog Message-ID: <74c5dcd5a27fd5749a0b0bedfa58e806dc78d5f0.1692827403.git.steadmon@google.com> Subject: [PATCH v2 4/4] config-parse: split library out of config.[c|h] From: Josh Steadmon To: git@vger.kernel.org Cc: jonathantanmy@google.com, calvinwan@google.com, glencbz@gmail.com, gitster@pobox.com Precedence: bulk List-ID: X-Mailing-List: git@vger.kernel.org From: Glen Choo The config parsing machinery (besides "include" directives) is usable by programs other than Git - it works with any file written in Git config syntax (IOW it doesn't rely on 'core' Git features like a repository), and as of the series ending at 6e8e7981eb (config: pass source to config_parser_event_fn_t, 2023-06-28), it no longer relies on global state. Thus, we can and should start turning it into a library other programs can use. Begin this process by splitting the config parsing code out of config.[c|h] and into config-parse.[c|h]. Do not change interfaces or function bodies, but tweak visibility and includes where appropriate, namely: - git_config_from_stdin() is now non-static so that it can be seen by config.c. - "struct config_source" is now defined in the .h file so that it can be seen by config.c. And as a result, config-lib.h needs to "#include strbuf.h". In theory, this makes it possible for in-tree files to decide whether they only need all of the config functionality or only config parsing, and bring in the smallest bit of functionality needed. But for now, there are no in-tree files that can swap "#include config.h" for "#include config-parse.h". E.g. Bundle URIs would only need config parsing to parse bundle lists, but bundle-uri.c uses other config.h functionality like key parsing and reading repo settings. The resulting library is usable, though it is unergonomic to do so, e.g. the caller needs to "#include git-compat-util.h" and other dependencies, and we don't have an easy way of linking in the required objects. This isn't the end state we want for our libraries, but at least we have _some_ library whose usability we can improve in future series. Signed-off-by: Glen Choo Signed-off-by: Josh Steadmon --- Makefile | 1 + config-parse.c | 561 +++++++++++++++++++++++++++++++++++++++++++++++ config-parse.h | 155 +++++++++++++ config.c | 582 ------------------------------------------------- config.h | 119 +--------- 5 files changed, 718 insertions(+), 700 deletions(-) create mode 100644 config-parse.c create mode 100644 config-parse.h diff --git a/Makefile b/Makefile index fb541dedc9..67e05bcee5 100644 --- a/Makefile +++ b/Makefile @@ -992,6 +992,7 @@ LIB_OBJS += compat/obstack.o LIB_OBJS += compat/terminal.o LIB_OBJS += compat/zlib-uncompress2.o LIB_OBJS += config.o +LIB_OBJS += config-parse.o LIB_OBJS += connect.o LIB_OBJS += connected.o LIB_OBJS += convert.o diff --git a/config-parse.c b/config-parse.c new file mode 100644 index 0000000000..97ebd6d72b --- /dev/null +++ b/config-parse.c @@ -0,0 +1,561 @@ +#include "git-compat-util.h" +#include "strbuf.h" +#include "gettext.h" +#include "hashmap.h" +#include "utf8.h" +#include "config-parse.h" + +static int config_file_fgetc(struct config_source *conf) +{ + return getc_unlocked(conf->u.file); +} + +static int config_file_ungetc(int c, struct config_source *conf) +{ + return ungetc(c, conf->u.file); +} + +static long config_file_ftell(struct config_source *conf) +{ + return ftell(conf->u.file); +} + + +static int config_buf_fgetc(struct config_source *conf) +{ + if (conf->u.buf.pos < conf->u.buf.len) + return conf->u.buf.buf[conf->u.buf.pos++]; + + return EOF; +} + +static int config_buf_ungetc(int c, struct config_source *conf) +{ + if (conf->u.buf.pos > 0) { + conf->u.buf.pos--; + if (conf->u.buf.buf[conf->u.buf.pos] != c) + BUG("config_buf can only ungetc the same character"); + return c; + } + + return EOF; +} + +static long config_buf_ftell(struct config_source *conf) +{ + return conf->u.buf.pos; +} + +static inline int iskeychar(int c) +{ + return isalnum(c) || c == '-'; +} + +/* + * Auxiliary function to sanity-check and split the key into the section + * identifier and variable name. + * + * Returns 0 on success, -CONFIG_INVALID_KEY when there is an invalid character + * in the key and -CONFIG_NO_SECTION_OR_NAME if there is no section name in the + * key. + * + * store_key - pointer to char* which will hold a copy of the key with + * lowercase section and variable name + * baselen - pointer to size_t which will hold the length of the + * section + subsection part, can be NULL + */ +int git_config_parse_key(const char *key, char **store_key, size_t *baselen_) +{ + size_t i, baselen; + int dot; + const char *last_dot = strrchr(key, '.'); + + /* + * Since "key" actually contains the section name and the real + * key name separated by a dot, we have to know where the dot is. + */ + + if (last_dot == NULL || last_dot == key) { + error(_("key does not contain a section: %s"), key); + return -CONFIG_NO_SECTION_OR_NAME; + } + + if (!last_dot[1]) { + error(_("key does not contain variable name: %s"), key); + return -CONFIG_NO_SECTION_OR_NAME; + } + + baselen = last_dot - key; + if (baselen_) + *baselen_ = baselen; + + /* + * Validate the key and while at it, lower case it for matching. + */ + *store_key = xmallocz(strlen(key)); + + dot = 0; + for (i = 0; key[i]; i++) { + unsigned char c = key[i]; + if (c == '.') + dot = 1; + /* Leave the extended basename untouched.. */ + if (!dot || i > baselen) { + if (!iskeychar(c) || + (i == baselen + 1 && !isalpha(c))) { + error(_("invalid key: %s"), key); + goto out_free_ret_1; + } + c = tolower(c); + } else if (c == '\n') { + error(_("invalid key (newline): %s"), key); + goto out_free_ret_1; + } + (*store_key)[i] = c; + } + + return 0; + +out_free_ret_1: + FREE_AND_NULL(*store_key); + return -CONFIG_INVALID_KEY; +} + +static int get_next_char(struct config_source *cs) +{ + int c = cs->do_fgetc(cs); + + if (c == '\r') { + /* DOS like systems */ + c = cs->do_fgetc(cs); + if (c != '\n') { + if (c != EOF) + cs->do_ungetc(c, cs); + c = '\r'; + } + } + + if (c != EOF && ++cs->total_len > INT_MAX) { + /* + * This is an absurdly long config file; refuse to parse + * further in order to protect downstream code from integer + * overflows. Note that we can't return an error specifically, + * but we can mark EOF and put trash in the return value, + * which will trigger a parse error. + */ + cs->eof = 1; + return 0; + } + + if (c == '\n') + cs->linenr++; + if (c == EOF) { + cs->eof = 1; + cs->linenr++; + c = '\n'; + } + return c; +} + +static char *parse_value(struct config_source *cs) +{ + int quote = 0, comment = 0, space = 0; + + strbuf_reset(&cs->value); + for (;;) { + int c = get_next_char(cs); + if (c == '\n') { + if (quote) { + cs->linenr--; + return NULL; + } + return cs->value.buf; + } + if (comment) + continue; + if (isspace(c) && !quote) { + if (cs->value.len) + space++; + continue; + } + if (!quote) { + if (c == ';' || c == '#') { + comment = 1; + continue; + } + } + for (; space; space--) + strbuf_addch(&cs->value, ' '); + if (c == '\\') { + c = get_next_char(cs); + switch (c) { + case '\n': + continue; + case 't': + c = '\t'; + break; + case 'b': + c = '\b'; + break; + case 'n': + c = '\n'; + break; + /* Some characters escape as themselves */ + case '\\': case '"': + break; + /* Reject unknown escape sequences */ + default: + return NULL; + } + strbuf_addch(&cs->value, c); + continue; + } + if (c == '"') { + quote = 1-quote; + continue; + } + strbuf_addch(&cs->value, c); + } +} + +static int get_value(struct config_source *cs, struct key_value_info *kvi, + config_fn_t fn, void *data, struct strbuf *name) +{ + int c; + char *value; + int ret; + struct config_context ctx = { + .kvi = kvi, + }; + + /* Get the full name */ + for (;;) { + c = get_next_char(cs); + if (cs->eof) + break; + if (!iskeychar(c)) + break; + strbuf_addch(name, tolower(c)); + } + + while (c == ' ' || c == '\t') + c = get_next_char(cs); + + value = NULL; + if (c != '\n') { + if (c != '=') + return -1; + value = parse_value(cs); + if (!value) + return -1; + } + /* + * We already consumed the \n, but we need linenr to point to + * the line we just parsed during the call to fn to get + * accurate line number in error messages. + */ + cs->linenr--; + kvi->linenr = cs->linenr; + ret = fn(name->buf, value, &ctx, data); + if (ret >= 0) + cs->linenr++; + return ret; +} + +static int get_extended_base_var(struct config_source *cs, struct strbuf *name, + int c) +{ + cs->subsection_case_sensitive = 0; + do { + if (c == '\n') + goto error_incomplete_line; + c = get_next_char(cs); + } while (isspace(c)); + + /* We require the format to be '[base "extension"]' */ + if (c != '"') + return -1; + strbuf_addch(name, '.'); + + for (;;) { + int c = get_next_char(cs); + if (c == '\n') + goto error_incomplete_line; + if (c == '"') + break; + if (c == '\\') { + c = get_next_char(cs); + if (c == '\n') + goto error_incomplete_line; + } + strbuf_addch(name, c); + } + + /* Final ']' */ + if (get_next_char(cs) != ']') + return -1; + return 0; +error_incomplete_line: + cs->linenr--; + return -1; +} + +static int get_base_var(struct config_source *cs, struct strbuf *name) +{ + cs->subsection_case_sensitive = 1; + for (;;) { + int c = get_next_char(cs); + if (cs->eof) + return -1; + if (c == ']') + return 0; + if (isspace(c)) + return get_extended_base_var(cs, name, c); + if (!iskeychar(c) && c != '.') + return -1; + strbuf_addch(name, tolower(c)); + } +} + +struct parse_event_data { + enum config_event_t previous_type; + size_t previous_offset; + const struct config_parse_options *opts; +}; + +static int do_event(struct config_source *cs, enum config_event_t type, + struct parse_event_data *data) +{ + size_t offset; + + if (!data->opts || !data->opts->event_fn) + return 0; + + if (type == CONFIG_EVENT_WHITESPACE && + data->previous_type == type) + return 0; + + offset = cs->do_ftell(cs); + /* + * At EOF, the parser always "inserts" an extra '\n', therefore + * the end offset of the event is the current file position, otherwise + * we will already have advanced to the next event. + */ + if (type != CONFIG_EVENT_EOF) + offset--; + + if (data->previous_type != CONFIG_EVENT_EOF && + data->opts->event_fn(data->previous_type, data->previous_offset, + offset, cs, data->opts->event_fn_data) < 0) + return -1; + + data->previous_type = type; + data->previous_offset = offset; + + return 0; +} + +static void kvi_from_source(struct config_source *cs, + enum config_scope scope, + struct key_value_info *out) +{ + out->filename = strintern(cs->name); + out->origin_type = cs->origin_type; + out->linenr = cs->linenr; + out->scope = scope; + out->path = cs->path; +} + +static int git_parse_source(struct config_source *cs, config_fn_t fn, + struct key_value_info *kvi, void *data, + const struct config_parse_options *opts) +{ + int comment = 0; + size_t baselen = 0; + struct strbuf *var = &cs->var; + + /* U+FEFF Byte Order Mark in UTF8 */ + const char *bomptr = utf8_bom; + + /* For the parser event callback */ + struct parse_event_data event_data = { + CONFIG_EVENT_EOF, 0, opts + }; + + for (;;) { + int c; + + c = get_next_char(cs); + if (bomptr && *bomptr) { + /* We are at the file beginning; skip UTF8-encoded BOM + * if present. Sane editors won't put this in on their + * own, but e.g. Windows Notepad will do it happily. */ + if (c == (*bomptr & 0377)) { + bomptr++; + continue; + } else { + /* Do not tolerate partial BOM. */ + if (bomptr != utf8_bom) + break; + /* No BOM at file beginning. Cool. */ + bomptr = NULL; + } + } + if (c == '\n') { + if (cs->eof) { + if (do_event(cs, CONFIG_EVENT_EOF, &event_data) < 0) + return -1; + return 0; + } + if (do_event(cs, CONFIG_EVENT_WHITESPACE, &event_data) < 0) + return -1; + comment = 0; + continue; + } + if (comment) + continue; + if (isspace(c)) { + if (do_event(cs, CONFIG_EVENT_WHITESPACE, &event_data) < 0) + return -1; + continue; + } + if (c == '#' || c == ';') { + if (do_event(cs, CONFIG_EVENT_COMMENT, &event_data) < 0) + return -1; + comment = 1; + continue; + } + if (c == '[') { + if (do_event(cs, CONFIG_EVENT_SECTION, &event_data) < 0) + return -1; + + /* Reset prior to determining a new stem */ + strbuf_reset(var); + if (get_base_var(cs, var) < 0 || var->len < 1) + break; + strbuf_addch(var, '.'); + baselen = var->len; + continue; + } + if (!isalpha(c)) + break; + + if (do_event(cs, CONFIG_EVENT_ENTRY, &event_data) < 0) + return -1; + + /* + * Truncate the var name back to the section header + * stem prior to grabbing the suffix part of the name + * and the value. + */ + strbuf_setlen(var, baselen); + strbuf_addch(var, tolower(c)); + if (get_value(cs, kvi, fn, data, var) < 0) + break; + } + /* + * FIXME for whatever reason, do_event passes the _previous_ event, so + * in order for our callback to receive the error event, we have to call + * do_event twice + */ + do_event(cs, CONFIG_EVENT_ERROR, &event_data); + do_event(cs, CONFIG_EVENT_ERROR, &event_data); + return -1; +} + +/* + * All source specific fields in the union, die_on_error, name and the callbacks + * fgetc, ungetc, ftell of top need to be initialized before calling + * this function. + */ +static int do_config_from(struct config_source *top, config_fn_t fn, + void *data, enum config_scope scope, + const struct config_parse_options *opts) +{ + struct key_value_info kvi = KVI_INIT; + int ret; + + /* push config-file parsing state stack */ + top->linenr = 1; + top->eof = 0; + top->total_len = 0; + strbuf_init(&top->value, 1024); + strbuf_init(&top->var, 1024); + kvi_from_source(top, scope, &kvi); + + ret = git_parse_source(top, fn, &kvi, data, opts); + + strbuf_release(&top->value); + strbuf_release(&top->var); + + return ret; +} + +static int do_config_from_file(config_fn_t fn, + const enum config_origin_type origin_type, + const char *name, const char *path, FILE *f, + void *data, enum config_scope scope, + const struct config_parse_options *opts) +{ + struct config_source top = CONFIG_SOURCE_INIT; + int ret; + + top.u.file = f; + top.origin_type = origin_type; + top.name = name; + top.path = path; + top.do_fgetc = config_file_fgetc; + top.do_ungetc = config_file_ungetc; + top.do_ftell = config_file_ftell; + + flockfile(f); + ret = do_config_from(&top, fn, data, scope, opts); + funlockfile(f); + return ret; +} + +int git_config_from_stdin(config_fn_t fn, void *data, enum config_scope scope, + const struct config_parse_options *config_opts) +{ + return do_config_from_file(fn, CONFIG_ORIGIN_STDIN, "", NULL, stdin, + data, scope, config_opts); +} + +int git_config_from_file_with_options(config_fn_t fn, const char *filename, + void *data, enum config_scope scope, + const struct config_parse_options *opts) +{ + int ret = -1; + FILE *f; + + if (!filename) + BUG("filename cannot be NULL"); + f = fopen_or_warn(filename, "r"); + if (f) { + ret = do_config_from_file(fn, CONFIG_ORIGIN_FILE, filename, + filename, f, data, scope, opts); + fclose(f); + } + return ret; +} + +int git_config_from_mem(config_fn_t fn, + const enum config_origin_type origin_type, + const char *name, const char *buf, size_t len, + void *data, enum config_scope scope, + const struct config_parse_options *opts) +{ + struct config_source top = CONFIG_SOURCE_INIT; + + top.u.buf.buf = buf; + top.u.buf.len = len; + top.u.buf.pos = 0; + top.origin_type = origin_type; + top.name = name; + top.path = NULL; + top.do_fgetc = config_buf_fgetc; + top.do_ungetc = config_buf_ungetc; + top.do_ftell = config_buf_ftell; + + return do_config_from(&top, fn, data, scope, opts); +} diff --git a/config-parse.h b/config-parse.h new file mode 100644 index 0000000000..ac73a826d9 --- /dev/null +++ b/config-parse.h @@ -0,0 +1,155 @@ +/* + * Low level config parsing. + */ +#ifndef CONFIG_PARSE_H +#define CONFIG_PARSE_H + +#include "strbuf.h" + +/* git_config_parse_key() returns these negated: */ +#define CONFIG_INVALID_KEY 1 +#define CONFIG_NO_SECTION_OR_NAME 2 + +int git_config_parse_key(const char *, char **, size_t *); + +enum config_scope { + CONFIG_SCOPE_UNKNOWN = 0, + CONFIG_SCOPE_SYSTEM, + CONFIG_SCOPE_GLOBAL, + CONFIG_SCOPE_LOCAL, + CONFIG_SCOPE_WORKTREE, + CONFIG_SCOPE_COMMAND, + CONFIG_SCOPE_SUBMODULE, +}; +const char *config_scope_name(enum config_scope scope); + +enum config_origin_type { + CONFIG_ORIGIN_UNKNOWN = 0, + CONFIG_ORIGIN_BLOB, + CONFIG_ORIGIN_FILE, + CONFIG_ORIGIN_STDIN, + CONFIG_ORIGIN_SUBMODULE_BLOB, + CONFIG_ORIGIN_CMDLINE +}; + +enum config_event_t { + CONFIG_EVENT_SECTION, + CONFIG_EVENT_ENTRY, + CONFIG_EVENT_WHITESPACE, + CONFIG_EVENT_COMMENT, + CONFIG_EVENT_EOF, + CONFIG_EVENT_ERROR +}; + +struct config_source; +/* + * The parser event function (if not NULL) is called with the event type and + * the begin/end offsets of the parsed elements. + * + * Note: for CONFIG_EVENT_ENTRY (i.e. config variables), the trailing newline + * character is considered part of the element. + */ +typedef int (*config_parser_event_fn_t)(enum config_event_t type, + size_t begin_offset, size_t end_offset, + struct config_source *cs, + void *event_fn_data); + +struct config_parse_options { + /* + * event_fn and event_fn_data are for internal use only. Handles events + * emitted by the config parser. + */ + config_parser_event_fn_t event_fn; + void *event_fn_data; +}; + +struct config_source { + struct config_source *prev; + union { + FILE *file; + struct config_buf { + const char *buf; + size_t len; + size_t pos; + } buf; + } u; + enum config_origin_type origin_type; + const char *name; + const char *path; + int linenr; + int eof; + size_t total_len; + struct strbuf value; + struct strbuf var; + unsigned subsection_case_sensitive : 1; + + int (*do_fgetc)(struct config_source *c); + int (*do_ungetc)(int c, struct config_source *conf); + long (*do_ftell)(struct config_source *c); +}; +#define CONFIG_SOURCE_INIT { 0 } + +/* Config source metadata for a given config key-value pair */ +struct key_value_info { + const char *filename; + int linenr; + enum config_origin_type origin_type; + enum config_scope scope; + const char *path; +}; +#define KVI_INIT { \ + .filename = NULL, \ + .linenr = -1, \ + .origin_type = CONFIG_ORIGIN_UNKNOWN, \ + .scope = CONFIG_SCOPE_UNKNOWN, \ + .path = NULL, \ +} + +/* Captures additional information that a config callback can use. */ +struct config_context { + /* Config source metadata for key and value. */ + const struct key_value_info *kvi; +}; +#define CONFIG_CONTEXT_INIT { 0 } + +/** + * A config callback function takes four parameters: + * + * - the name of the parsed variable. This is in canonical "flat" form: the + * section, subsection, and variable segments will be separated by dots, + * and the section and variable segments will be all lowercase. E.g., + * `core.ignorecase`, `diff.SomeType.textconv`. + * + * - the value of the found variable, as a string. If the variable had no + * value specified, the value will be NULL (typically this means it + * should be interpreted as boolean true). + * + * - the 'config context', that is, additional information about the config + * iteration operation provided by the config machinery. For example, this + * includes information about the config source being parsed (e.g. the + * filename). + * + * - a void pointer passed in by the caller of the config API; this can + * contain callback-specific data + * + * A config callback should return 0 for success, or -1 if the variable + * could not be parsed properly. + */ +typedef int (*config_fn_t)(const char *, const char *, + const struct config_context *, void *); + +int git_config_from_file_with_options(config_fn_t fn, const char *, + void *, enum config_scope, + const struct config_parse_options *); + +int git_config_from_mem(config_fn_t fn, + const enum config_origin_type, + const char *name, + const char *buf, size_t len, + void *data, enum config_scope scope, + const struct config_parse_options *opts); + +int git_config_from_stdin(config_fn_t fn, void *data, enum config_scope scope, + const struct config_parse_options *config_opts); + +#endif /* CONFIG_PARSE_H */ diff --git a/config.c b/config.c index 40cc9dbc40..787b42c228 100644 --- a/config.c +++ b/config.c @@ -42,32 +42,6 @@ #include "wrapper.h" #include "write-or-die.h" -struct config_source { - struct config_source *prev; - union { - FILE *file; - struct config_buf { - const char *buf; - size_t len; - size_t pos; - } buf; - } u; - enum config_origin_type origin_type; - const char *name; - const char *path; - int linenr; - int eof; - size_t total_len; - struct strbuf value; - struct strbuf var; - unsigned subsection_case_sensitive : 1; - - int (*do_fgetc)(struct config_source *c); - int (*do_ungetc)(int c, struct config_source *conf); - long (*do_ftell)(struct config_source *c); -}; -#define CONFIG_SOURCE_INIT { 0 } - static int pack_compression_seen; static int zlib_compression_seen; @@ -82,47 +56,6 @@ static int zlib_compression_seen; */ static struct config_set protected_config; -static int config_file_fgetc(struct config_source *conf) -{ - return getc_unlocked(conf->u.file); -} - -static int config_file_ungetc(int c, struct config_source *conf) -{ - return ungetc(c, conf->u.file); -} - -static long config_file_ftell(struct config_source *conf) -{ - return ftell(conf->u.file); -} - - -static int config_buf_fgetc(struct config_source *conf) -{ - if (conf->u.buf.pos < conf->u.buf.len) - return conf->u.buf.buf[conf->u.buf.pos++]; - - return EOF; -} - -static int config_buf_ungetc(int c, struct config_source *conf) -{ - if (conf->u.buf.pos > 0) { - conf->u.buf.pos--; - if (conf->u.buf.buf[conf->u.buf.pos] != c) - BUG("config_buf can only ungetc the same character"); - return c; - } - - return EOF; -} - -static long config_buf_ftell(struct config_source *conf) -{ - return conf->u.buf.pos; -} - struct config_include_data { int depth; config_fn_t fn; @@ -528,80 +461,6 @@ void git_config_push_env(const char *spec) free(key); } -static inline int iskeychar(int c) -{ - return isalnum(c) || c == '-'; -} - -/* - * Auxiliary function to sanity-check and split the key into the section - * identifier and variable name. - * - * Returns 0 on success, -1 when there is an invalid character in the key and - * -2 if there is no section name in the key. - * - * store_key - pointer to char* which will hold a copy of the key with - * lowercase section and variable name - * baselen - pointer to size_t which will hold the length of the - * section + subsection part, can be NULL - */ -int git_config_parse_key(const char *key, char **store_key, size_t *baselen_) -{ - size_t i, baselen; - int dot; - const char *last_dot = strrchr(key, '.'); - - /* - * Since "key" actually contains the section name and the real - * key name separated by a dot, we have to know where the dot is. - */ - - if (last_dot == NULL || last_dot == key) { - error(_("key does not contain a section: %s"), key); - return -CONFIG_NO_SECTION_OR_NAME; - } - - if (!last_dot[1]) { - error(_("key does not contain variable name: %s"), key); - return -CONFIG_NO_SECTION_OR_NAME; - } - - baselen = last_dot - key; - if (baselen_) - *baselen_ = baselen; - - /* - * Validate the key and while at it, lower case it for matching. - */ - *store_key = xmallocz(strlen(key)); - - dot = 0; - for (i = 0; key[i]; i++) { - unsigned char c = key[i]; - if (c == '.') - dot = 1; - /* Leave the extended basename untouched.. */ - if (!dot || i > baselen) { - if (!iskeychar(c) || - (i == baselen + 1 && !isalpha(c))) { - error(_("invalid key: %s"), key); - goto out_free_ret_1; - } - c = tolower(c); - } else if (c == '\n') { - error(_("invalid key (newline): %s"), key); - goto out_free_ret_1; - } - (*store_key)[i] = c; - } - - return 0; - -out_free_ret_1: - FREE_AND_NULL(*store_key); - return -CONFIG_INVALID_KEY; -} - static int config_parse_pair(const char *key, const char *value, struct key_value_info *kvi, config_fn_t fn, void *data) @@ -786,251 +645,6 @@ int git_config_from_parameters(config_fn_t fn, void *data) return ret; } -static int get_next_char(struct config_source *cs) -{ - int c = cs->do_fgetc(cs); - - if (c == '\r') { - /* DOS like systems */ - c = cs->do_fgetc(cs); - if (c != '\n') { - if (c != EOF) - cs->do_ungetc(c, cs); - c = '\r'; - } - } - - if (c != EOF && ++cs->total_len > INT_MAX) { - /* - * This is an absurdly long config file; refuse to parse - * further in order to protect downstream code from integer - * overflows. Note that we can't return an error specifically, - * but we can mark EOF and put trash in the return value, - * which will trigger a parse error. - */ - cs->eof = 1; - return 0; - } - - if (c == '\n') - cs->linenr++; - if (c == EOF) { - cs->eof = 1; - cs->linenr++; - c = '\n'; - } - return c; -} - -static char *parse_value(struct config_source *cs) -{ - int quote = 0, comment = 0, space = 0; - - strbuf_reset(&cs->value); - for (;;) { - int c = get_next_char(cs); - if (c == '\n') { - if (quote) { - cs->linenr--; - return NULL; - } - return cs->value.buf; - } - if (comment) - continue; - if (isspace(c) && !quote) { - if (cs->value.len) - space++; - continue; - } - if (!quote) { - if (c == ';' || c == '#') { - comment = 1; - continue; - } - } - for (; space; space--) - strbuf_addch(&cs->value, ' '); - if (c == '\\') { - c = get_next_char(cs); - switch (c) { - case '\n': - continue; - case 't': - c = '\t'; - break; - case 'b': - c = '\b'; - break; - case 'n': - c = '\n'; - break; - /* Some characters escape as themselves */ - case '\\': case '"': - break; - /* Reject unknown escape sequences */ - default: - return NULL; - } - strbuf_addch(&cs->value, c); - continue; - } - if (c == '"') { - quote = 1-quote; - continue; - } - strbuf_addch(&cs->value, c); - } -} - -static int get_value(struct config_source *cs, struct key_value_info *kvi, - config_fn_t fn, void *data, struct strbuf *name) -{ - int c; - char *value; - int ret; - struct config_context ctx = { - .kvi = kvi, - }; - - /* Get the full name */ - for (;;) { - c = get_next_char(cs); - if (cs->eof) - break; - if (!iskeychar(c)) - break; - strbuf_addch(name, tolower(c)); - } - - while (c == ' ' || c == '\t') - c = get_next_char(cs); - - value = NULL; - if (c != '\n') { - if (c != '=') - return -1; - value = parse_value(cs); - if (!value) - return -1; - } - /* - * We already consumed the \n, but we need linenr to point to - * the line we just parsed during the call to fn to get - * accurate line number in error messages. - */ - cs->linenr--; - kvi->linenr = cs->linenr; - ret = fn(name->buf, value, &ctx, data); - if (ret >= 0) - cs->linenr++; - return ret; -} - -static int get_extended_base_var(struct config_source *cs, struct strbuf *name, - int c) -{ - cs->subsection_case_sensitive = 0; - do { - if (c == '\n') - goto error_incomplete_line; - c = get_next_char(cs); - } while (isspace(c)); - - /* We require the format to be '[base "extension"]' */ - if (c != '"') - return -1; - strbuf_addch(name, '.'); - - for (;;) { - int c = get_next_char(cs); - if (c == '\n') - goto error_incomplete_line; - if (c == '"') - break; - if (c == '\\') { - c = get_next_char(cs); - if (c == '\n') - goto error_incomplete_line; - } - strbuf_addch(name, c); - } - - /* Final ']' */ - if (get_next_char(cs) != ']') - return -1; - return 0; -error_incomplete_line: - cs->linenr--; - return -1; -} - -static int get_base_var(struct config_source *cs, struct strbuf *name) -{ - cs->subsection_case_sensitive = 1; - for (;;) { - int c = get_next_char(cs); - if (cs->eof) - return -1; - if (c == ']') - return 0; - if (isspace(c)) - return get_extended_base_var(cs, name, c); - if (!iskeychar(c) && c != '.') - return -1; - strbuf_addch(name, tolower(c)); - } -} - -struct parse_event_data { - enum config_event_t previous_type; - size_t previous_offset; - const struct config_parse_options *opts; -}; - -static int do_event(struct config_source *cs, enum config_event_t type, - struct parse_event_data *data) -{ - size_t offset; - - if (!data->opts || !data->opts->event_fn) - return 0; - - if (type == CONFIG_EVENT_WHITESPACE && - data->previous_type == type) - return 0; - - offset = cs->do_ftell(cs); - /* - * At EOF, the parser always "inserts" an extra '\n', therefore - * the end offset of the event is the current file position, otherwise - * we will already have advanced to the next event. - */ - if (type != CONFIG_EVENT_EOF) - offset--; - - if (data->previous_type != CONFIG_EVENT_EOF && - data->opts->event_fn(data->previous_type, data->previous_offset, - offset, cs, data->opts->event_fn_data) < 0) - return -1; - - data->previous_type = type; - data->previous_offset = offset; - - return 0; -} - -static void kvi_from_source(struct config_source *cs, - enum config_scope scope, - struct key_value_info *out) -{ - out->filename = strintern(cs->name); - out->origin_type = cs->origin_type; - out->linenr = cs->linenr; - out->scope = scope; - out->path = cs->path; -} - int git_config_err_fn(enum config_event_t type, size_t begin_offset UNUSED, size_t end_offset UNUSED, struct config_source *cs, void *data) @@ -1081,104 +695,6 @@ int git_config_err_fn(enum config_event_t type, size_t begin_offset UNUSED, return error_return; } -static int git_parse_source(struct config_source *cs, config_fn_t fn, - struct key_value_info *kvi, void *data, - const struct config_parse_options *opts) -{ - int comment = 0; - size_t baselen = 0; - struct strbuf *var = &cs->var; - - /* U+FEFF Byte Order Mark in UTF8 */ - const char *bomptr = utf8_bom; - - /* For the parser event callback */ - struct parse_event_data event_data = { - CONFIG_EVENT_EOF, 0, opts - }; - - for (;;) { - int c; - - c = get_next_char(cs); - if (bomptr && *bomptr) { - /* We are at the file beginning; skip UTF8-encoded BOM - * if present. Sane editors won't put this in on their - * own, but e.g. Windows Notepad will do it happily. */ - if (c == (*bomptr & 0377)) { - bomptr++; - continue; - } else { - /* Do not tolerate partial BOM. */ - if (bomptr != utf8_bom) - break; - /* No BOM at file beginning. Cool. */ - bomptr = NULL; - } - } - if (c == '\n') { - if (cs->eof) { - if (do_event(cs, CONFIG_EVENT_EOF, &event_data) < 0) - return -1; - return 0; - } - if (do_event(cs, CONFIG_EVENT_WHITESPACE, &event_data) < 0) - return -1; - comment = 0; - continue; - } - if (comment) - continue; - if (isspace(c)) { - if (do_event(cs, CONFIG_EVENT_WHITESPACE, &event_data) < 0) - return -1; - continue; - } - if (c == '#' || c == ';') { - if (do_event(cs, CONFIG_EVENT_COMMENT, &event_data) < 0) - return -1; - comment = 1; - continue; - } - if (c == '[') { - if (do_event(cs, CONFIG_EVENT_SECTION, &event_data) < 0) - return -1; - - /* Reset prior to determining a new stem */ - strbuf_reset(var); - if (get_base_var(cs, var) < 0 || var->len < 1) - break; - strbuf_addch(var, '.'); - baselen = var->len; - continue; - } - if (!isalpha(c)) - break; - - if (do_event(cs, CONFIG_EVENT_ENTRY, &event_data) < 0) - return -1; - - /* - * Truncate the var name back to the section header - * stem prior to grabbing the suffix part of the name - * and the value. - */ - strbuf_setlen(var, baselen); - strbuf_addch(var, tolower(c)); - if (get_value(cs, kvi, fn, data, var) < 0) - break; - } - - /* - * FIXME for whatever reason, do_event passes the _previous_ event, so - * in order for our callback to receive the error event, we have to call - * do_event twice - */ - do_event(cs, CONFIG_EVENT_ERROR, &event_data); - do_event(cs, CONFIG_EVENT_ERROR, &event_data); - return -1; -} - static uintmax_t get_unit_factor(const char *end) { if (!*end) @@ -1972,83 +1488,6 @@ int git_default_config(const char *var, const char *value, return 0; } -/* - * All source specific fields in the union, die_on_error, name and the callbacks - * fgetc, ungetc, ftell of top need to be initialized before calling - * this function. - */ -static int do_config_from(struct config_source *top, config_fn_t fn, - void *data, enum config_scope scope, - const struct config_parse_options *opts) -{ - struct key_value_info kvi = KVI_INIT; - int ret; - - /* push config-file parsing state stack */ - top->linenr = 1; - top->eof = 0; - top->total_len = 0; - strbuf_init(&top->value, 1024); - strbuf_init(&top->var, 1024); - kvi_from_source(top, scope, &kvi); - - ret = git_parse_source(top, fn, &kvi, data, opts); - - strbuf_release(&top->value); - strbuf_release(&top->var); - - return ret; -} - -static int do_config_from_file(config_fn_t fn, - const enum config_origin_type origin_type, - const char *name, const char *path, FILE *f, - void *data, enum config_scope scope, - const struct config_parse_options *opts) -{ - struct config_source top = CONFIG_SOURCE_INIT; - int ret; - - top.u.file = f; - top.origin_type = origin_type; - top.name = name; - top.path = path; - top.do_fgetc = config_file_fgetc; - top.do_ungetc = config_file_ungetc; - top.do_ftell = config_file_ftell; - - flockfile(f); - ret = do_config_from(&top, fn, data, scope, opts); - funlockfile(f); - return ret; -} - -static int git_config_from_stdin(config_fn_t fn, void *data, - enum config_scope scope, - const struct config_parse_options *config_opts) -{ - return do_config_from_file(fn, CONFIG_ORIGIN_STDIN, "", NULL, stdin, - data, scope, config_opts); -} - -int git_config_from_file_with_options(config_fn_t fn, const char *filename, - void *data, enum config_scope scope, - const struct config_parse_options *opts) -{ - int ret = -1; - FILE *f; - - if (!filename) - BUG("filename cannot be NULL"); - f = fopen_or_warn(filename, "r"); - if (f) { - ret = do_config_from_file(fn, CONFIG_ORIGIN_FILE, filename, - filename, f, data, scope, opts); - fclose(f); - } - return ret; -} - int git_config_from_file(config_fn_t fn, const char *filename, void *data) { struct config_parse_options config_opts = CP_OPTS_INIT(CONFIG_ERROR_DIE); @@ -2057,27 +1496,6 @@ int git_config_from_file(config_fn_t fn, const char *filename, void *data) CONFIG_SCOPE_UNKNOWN, &config_opts); } -int git_config_from_mem(config_fn_t fn, - const enum config_origin_type origin_type, - const char *name, const char *buf, size_t len, - void *data, enum config_scope scope, - const struct config_parse_options *opts) -{ - struct config_source top = CONFIG_SOURCE_INIT; - - top.u.buf.buf = buf; - top.u.buf.len = len; - top.u.buf.pos = 0; - top.origin_type = origin_type; - top.name = name; - top.path = NULL; - top.do_fgetc = config_buf_fgetc; - top.do_ungetc = config_buf_ungetc; - top.do_ftell = config_buf_ftell; - - return do_config_from(&top, fn, data, scope, opts); -} - int git_config_from_blob_oid(config_fn_t fn, const char *name, struct repository *repo, diff --git a/config.h b/config.h index 8ad399580f..3bad5e1c32 100644 --- a/config.h +++ b/config.h @@ -4,7 +4,7 @@ #include "hashmap.h" #include "string-list.h" #include "repository.h" - +#include "config-parse.h" /** * The config API gives callers a way to access Git configuration files @@ -23,9 +23,6 @@ struct object_id; -/* git_config_parse_key() returns these negated: */ -#define CONFIG_INVALID_KEY 1 -#define CONFIG_NO_SECTION_OR_NAME 2 /* git_config_set_gently(), git_config_set_multivar_gently() return the above or these: */ #define CONFIG_NO_LOCK -1 #define CONFIG_INVALID_FILE 3 @@ -36,17 +33,6 @@ struct object_id; #define CONFIG_REGEX_NONE ((void *)1) -enum config_scope { - CONFIG_SCOPE_UNKNOWN = 0, - CONFIG_SCOPE_SYSTEM, - CONFIG_SCOPE_GLOBAL, - CONFIG_SCOPE_LOCAL, - CONFIG_SCOPE_WORKTREE, - CONFIG_SCOPE_COMMAND, - CONFIG_SCOPE_SUBMODULE, -}; -const char *config_scope_name(enum config_scope scope); - struct git_config_source { unsigned int use_stdin:1; const char *file; @@ -54,46 +40,6 @@ struct git_config_source { enum config_scope scope; }; -enum config_origin_type { - CONFIG_ORIGIN_UNKNOWN = 0, - CONFIG_ORIGIN_BLOB, - CONFIG_ORIGIN_FILE, - CONFIG_ORIGIN_STDIN, - CONFIG_ORIGIN_SUBMODULE_BLOB, - CONFIG_ORIGIN_CMDLINE -}; - -enum config_event_t { - CONFIG_EVENT_SECTION, - CONFIG_EVENT_ENTRY, - CONFIG_EVENT_WHITESPACE, - CONFIG_EVENT_COMMENT, - CONFIG_EVENT_EOF, - CONFIG_EVENT_ERROR -}; - -struct config_source; -/* - * The parser event function (if not NULL) is called with the event type and - * the begin/end offsets of the parsed elements. - * - * Note: for CONFIG_EVENT_ENTRY (i.e. config variables), the trailing newline - * character is considered part of the element. - */ -typedef int (*config_parser_event_fn_t)(enum config_event_t type, - size_t begin_offset, size_t end_offset, - struct config_source *cs, - void *event_fn_data); - -struct config_parse_options { - /* - * event_fn and event_fn_data are for internal use only. Handles events - * emitted by the config parser. - */ - config_parser_event_fn_t event_fn; - void *event_fn_data; -}; - #define CP_OPTS_INIT(error_action) { \ .event_fn = git_config_err_fn, \ .event_fn_data = (enum config_error_action []){(error_action)}, \ @@ -126,59 +72,8 @@ enum config_error_action { int git_config_err_fn(enum config_event_t type, size_t begin_offset, size_t end_offset, struct config_source *cs, void *event_fn_data); - -/* Config source metadata for a given config key-value pair */ -struct key_value_info { - const char *filename; - int linenr; - enum config_origin_type origin_type; - enum config_scope scope; - const char *path; -}; -#define KVI_INIT { \ - .filename = NULL, \ - .linenr = -1, \ - .origin_type = CONFIG_ORIGIN_UNKNOWN, \ - .scope = CONFIG_SCOPE_UNKNOWN, \ - .path = NULL, \ -} - -/* Captures additional information that a config callback can use. */ -struct config_context { - /* Config source metadata for key and value. */ - const struct key_value_info *kvi; -}; -#define CONFIG_CONTEXT_INIT { 0 } - -/** - * A config callback function takes four parameters: - * - * - the name of the parsed variable. This is in canonical "flat" form: the - * section, subsection, and variable segments will be separated by dots, - * and the section and variable segments will be all lowercase. E.g., - * `core.ignorecase`, `diff.SomeType.textconv`. - * - * - the value of the found variable, as a string. If the variable had no - * value specified, the value will be NULL (typically this means it - * should be interpreted as boolean true). - * - * - the 'config context', that is, additional information about the config - * iteration operation provided by the config machinery. For example, this - * includes information about the config source being parsed (e.g. the - * filename). - * - * - a void pointer passed in by the caller of the config API; this can - * contain callback-specific data - * - * A config callback should return 0 for success, or -1 if the variable - * could not be parsed properly. - */ -typedef int (*config_fn_t)(const char *, const char *, - const struct config_context *, void *); - int git_default_config(const char *, const char *, const struct config_context *, void *); - /** * Read a specific file in git-config format. * This function takes the same callback and data parameters as `git_config`. @@ -186,16 +81,6 @@ int git_default_config(const char *, const char *, * Unlike git_config(), this function does not respect includes. */ int git_config_from_file(config_fn_t fn, const char *, void *); - -int git_config_from_file_with_options(config_fn_t fn, const char *, - void *, enum config_scope, - const struct config_parse_options *); -int git_config_from_mem(config_fn_t fn, - const enum config_origin_type, - const char *name, - const char *buf, size_t len, - void *data, enum config_scope scope, - const struct config_parse_options *opts); int git_config_from_blob_oid(config_fn_t fn, const char *name, struct repository *repo, const struct object_id *oid, void *data, @@ -333,8 +218,6 @@ int repo_config_set_worktree_gently(struct repository *, const char *, const cha */ void git_config_set(const char *, const char *); -int git_config_parse_key(const char *, char **, size_t *); - /* * The following macros specify flag bits that alter the behavior * of the git_config_set_multivar*() methods.