[PATCH 02/18] config: Introduce functions to write non-standard file

From

Ramkumar Ramachandra <artagnon@gmail.com>

Date

Jul 19, 2011, 17:17 UTC

Message-ID

<1311095876-3098-3-git-send-email-artagnon@gmail.com>

In-Reply-To

<1311095876-3098-1-git-send-email-artagnon@gmail.com>

Suggested-by: Jeff King <peff@peff.net>
Signed-off-by: Ramkumar Ramachandra <artagnon@gmail.com>
---
 cache.h  |    2 ++
 config.c |   25 ++++++++++++++++++++++---
 2 files changed, 24 insertions(+), 3 deletions(-)

diff --git a/cache.h b/cache.h
index bc9e5eb..833ee75 100644
--- a/cache.h
+++ b/cache.h
@@ -1056,9 +1056,11 @@ extern int git_config_bool(const char *, const char *);
 extern int git_config_maybe_bool(const char *, const char *);
 extern int git_config_string(const char **, const char *, const char *);
 extern int git_config_pathname(const char **, const char *, const char *);
+extern int git_config_set_in_file(const char *, const char *, const char *);
 extern int git_config_set(const char *, const char *);
 extern int git_config_parse_key(const char *, char **, int *);
 extern int git_config_set_multivar(const char *, const char *, const char *, int);
+extern int git_config_set_multivar_in_file(const char *, const char *, const char *, int, const char *);
 extern int git_config_rename_section(const char *, const char *);
 extern const char *git_etc_gitconfig(void);
 extern int check_repository_format_version(const char *var, const char *value, void *cb);
diff --git a/config.c b/config.c
index 1fc063b..443324e 100644
--- a/config.c
+++ b/config.c
@@ -1092,9 +1092,15 @@ contline:
 	return offset;
 }
 
+int git_config_set_in_file(const char *key, const char *value,
+			const char *filename)
+{
+	return git_config_set_multivar_in_file(key, value, NULL, 0, filename);
+}
+
 int git_config_set(const char *key, const char *value)
 {
-	return git_config_set_multivar(key, value, NULL, 0);
+	return git_config_set_in_file(key, value, config_exclusive_filename);
 }
 
 /*
@@ -1189,14 +1195,19 @@ 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,
-	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:
@@ -1387,6 +1399,13 @@ write_err_out:
 
 }
 
+int git_config_set_multivar(const char *key, const char *value,
+			const char *value_regex, int multi_replace)
+{
+	return git_config_set_multivar_in_file(key, value, value_regex,
+					multi_replace, config_exclusive_filename);
+}
+
 static int section_name_match (const char *buf, const char *name)
 {
 	int i = 0, j = 0, dot = 0;

-- 
1.7.4.rc1.7.g2cf08.dirty