From: Jeff King <peff@peff.net>
To: Ramkumar Ramachandra <artagnon@gmail.com>
Cc: Git List <git@vger.kernel.org>,
Jonathan Nieder <jrnieder@gmail.com>,
Junio C Hamano <gitster@pobox.com>,
Christian Couder <chriscool@tuxfamily.org>,
Daniel Barkalow <barkalow@iabervon.org>
Subject: Re: [PATCH 02/18] config: Introduce functions to write non-standard file
Date: Tue, 19 Jul 2011 15:55:04 -0400 [thread overview]
Message-ID: <20110719195504.GA3957@sigill.intra.peff.net> (raw)
In-Reply-To: <1311095876-3098-3-git-send-email-artagnon@gmail.com>
On Tue, Jul 19, 2011 at 10:47:40PM +0530, Ramkumar Ramachandra wrote:
> -int git_config_set_multivar(const char *key, const char *value,
> - const char *value_regex, int multi_replace)
> +int git_config_set_multivar_in_file(const char *key, const char *value,
> + const char *value_regex, int multi_replace,
> + const char *filename)
> {
> int fd = -1, in_fd;
> int ret;
> char *config_filename;
> + const char *saved_config_filename;
> struct lock_file *lock = NULL;
>
> + saved_config_filename = config_exclusive_filename;
> + config_exclusive_filename = filename;
> +
> if (config_exclusive_filename)
> config_filename = xstrdup(config_exclusive_filename);
> else
> @@ -1379,6 +1390,7 @@ out_free:
> if (lock)
> rollback_lock_file(lock);
> free(config_filename);
> + config_exclusive_filename = saved_config_filename;
> return ret;
>
> write_err_out:
Is there a need for this "config_exclusive_filename" hackery at all?
I was thinking the result would look more like:
diff --git a/config.c b/config.c
index ee643eb..35be842 100644
--- a/config.c
+++ b/config.c
@@ -1193,19 +1193,14 @@ out_free_ret_1:
* - the config file is removed and the lock file rename()d to it.
*
*/
-int git_config_set_multivar(const char *key, const char *value,
+int git_config_set_multivar_in_file(const char *config_filename,
+ const char *key, const char *value,
const char *value_regex, int multi_replace)
{
int fd = -1, in_fd;
int ret;
- char *config_filename;
struct lock_file *lock = NULL;
- if (config_exclusive_filename)
- config_filename = xstrdup(config_exclusive_filename);
- else
- config_filename = git_pathdup("config");
-
/* parse-key returns negative; flip the sign to feed exit(3) */
ret = 0 - git_config_parse_key(key, &store.key, &store.baselen);
if (ret)
@@ -1382,7 +1377,6 @@ int git_config_set_multivar(const char *key, const char *value,
out_free:
if (lock)
rollback_lock_file(lock);
- free(config_filename);
return ret;
write_err_out:
@@ -1391,6 +1385,24 @@ write_err_out:
}
+int git_config_set_multivar(const char *key, const char *value,
+ const char *value_regex, int multi_replace)
+{
+ char *config_filename;
+ int r;
+
+ if (config_exclusive_filename)
+ config_filename = xstrdup(config_exclusive_filename);
+ else
+ config_filename = git_pathdup("config");
+
+ r = git_config_set_multivar_in_file(config_filename, key, value,
+ value_regex, multi_replace);
+
+ free(config_filename);
+ return r;
+}
+
static int section_name_match (const char *buf, const char *name)
{
int i = 0, j = 0, dot = 0;
Which is a bit cleaner to read, IMHO.
BTW, I'm unclear why we bother duplicating the filename in the first
place. It seems like we could go even simpler with:
int git_config_set_multivar(const char *key, const char *value,
const char *value_regex, int multi_replace)
{
char *config_filename;
if (config_exclusive_filename)
config_filename = config_exclusive_filename;
else
config_filename = git_path("config");
return git_config_set_multivar_in_file(config_filename, key, value,
value_regex, multi_replace);
}
next prev parent reply other threads:[~2011-07-19 19:55 UTC|newest]
Thread overview: 43+ messages / expand[flat|nested] mbox.gz Atom feed top
2011-07-19 17:17 [GSoC update] Sequencer for inclusion v2 Ramkumar Ramachandra
2011-07-19 17:17 ` [PATCH 01/18] advice: Introduce error_resolve_conflict Ramkumar Ramachandra
2011-07-21 15:35 ` Phil Hord
2011-07-22 22:35 ` Jeff King
2011-07-24 10:23 ` Ramkumar Ramachandra
2011-07-24 18:15 ` Junio C Hamano
2011-07-25 21:17 ` Phil Hord
2011-07-19 17:17 ` [PATCH 02/18] config: Introduce functions to write non-standard file Ramkumar Ramachandra
2011-07-19 19:55 ` Jeff King [this message]
2011-07-19 20:35 ` Jonathan Nieder
2011-07-19 21:26 ` Junio C Hamano
2011-07-19 21:57 ` Jeff King
2011-07-24 10:17 ` Ramkumar Ramachandra
2011-07-19 17:17 ` [PATCH 03/18] revert: Simplify and inline add_message_to_msg Ramkumar Ramachandra
2011-07-19 17:17 ` [PATCH 04/18] revert: Don't check lone argument in get_encoding Ramkumar Ramachandra
2011-07-19 17:17 ` [PATCH 05/18] revert: Rename no_replay to record_origin Ramkumar Ramachandra
2011-07-19 17:17 ` [PATCH 06/18] revert: Propogate errors upwards from do_pick_commit Ramkumar Ramachandra
2011-07-19 17:17 ` [PATCH 07/18] revert: Eliminate global "commit" variable Ramkumar Ramachandra
2011-07-19 17:17 ` [PATCH 08/18] revert: Introduce struct to keep command-line options Ramkumar Ramachandra
2011-07-19 17:17 ` [PATCH 09/18] revert: Separate cmdline parsing from functional code Ramkumar Ramachandra
2011-07-19 17:17 ` [PATCH 10/18] revert: Don't create invalid replay_opts in parse_args Ramkumar Ramachandra
2011-07-19 17:17 ` [PATCH 11/18] revert: Save data for continuing after conflict resolution Ramkumar Ramachandra
2011-07-19 17:17 ` [PATCH 12/18] revert: Save command-line options for continuing operation Ramkumar Ramachandra
2011-07-19 17:17 ` [PATCH 13/18] revert: Make pick_commits functionally act on a commit list Ramkumar Ramachandra
2011-07-19 17:17 ` [PATCH 14/18] revert: Introduce --reset to remove sequencer state Ramkumar Ramachandra
2011-07-19 17:17 ` [PATCH 15/18] reset: Make reset remove the " Ramkumar Ramachandra
2011-07-19 17:17 ` [PATCH 16/18] revert: Remove sequencer state when no commits are pending Ramkumar Ramachandra
2011-07-19 17:17 ` [PATCH 17/18] revert: Don't implictly stomp pending sequencer operation Ramkumar Ramachandra
2011-07-19 17:17 ` [PATCH 18/18] revert: Introduce --continue to continue the operation Ramkumar Ramachandra
2011-07-19 18:47 ` [GSoC update] Sequencer for inclusion v2 Junio C Hamano
2011-07-20 9:02 ` Ramkumar Ramachandra
2011-07-19 23:54 ` Junio C Hamano
2011-07-24 10:11 ` Ramkumar Ramachandra
2011-07-24 18:17 ` Junio C Hamano
-- strict thread matches above, loose matches on Subject: below --
2011-07-27 3:18 [PATCH 00/18] GSoC update: Sequencer for inclusion v3 Ramkumar Ramachandra
2011-07-27 3:18 ` [PATCH 02/18] config: Introduce functions to write non-standard file Ramkumar Ramachandra
2011-07-27 3:39 ` Jonathan Nieder
2011-07-27 5:42 ` Jeff King
2011-07-28 15:40 ` Ramkumar Ramachandra
2011-07-28 16:52 [PATCH 00/18] Sequencer for inclusion v4 Ramkumar Ramachandra
2011-07-28 16:52 ` [PATCH 02/18] config: Introduce functions to write non-standard file Ramkumar Ramachandra
2011-07-28 17:35 ` Jonathan Nieder
2011-07-28 20:15 ` Ramkumar Ramachandra
2011-08-01 18:06 [PATCH v5 00/18] Sequencer for inclusion Ramkumar Ramachandra
2011-08-01 18:06 ` [PATCH 02/18] config: Introduce functions to write non-standard file Ramkumar Ramachandra
2011-08-04 10:38 [PATCH 00/18] Sequencer for inclusion v6 Ramkumar Ramachandra
2011-08-04 10:39 ` [PATCH 02/18] config: Introduce functions to write non-standard file Ramkumar Ramachandra
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
List information: http://vger.kernel.org/majordomo-info.html
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20110719195504.GA3957@sigill.intra.peff.net \
--to=peff@peff.net \
--cc=artagnon@gmail.com \
--cc=barkalow@iabervon.org \
--cc=chriscool@tuxfamily.org \
--cc=git@vger.kernel.org \
--cc=gitster@pobox.com \
--cc=jrnieder@gmail.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
Code repositories for project(s) associated with this public inbox
https://80x24.org/mirrors/git.git
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).