projects
/
git.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Use a hashtable for objects instead of a sorted list
[git.git]
/
config.c
diff --git
a/config.c
b/config.c
index
5cc8535
..
8355224
100644
(file)
--- a/
config.c
+++ b/
config.c
@@
-11,6
+11,7
@@
#define MAXNAME (256)
static FILE *config_file;
#define MAXNAME (256)
static FILE *config_file;
+static const char *config_file_name;
static int config_linenr;
static int get_next_char(void)
{
static int config_linenr;
static int get_next_char(void)
{
@@
-186,7
+187,7
@@
static int git_parse_file(config_fn_t fn)
if (get_value(fn, var, baselen+1) < 0)
break;
}
if (get_value(fn, var, baselen+1) < 0)
break;
}
- die("bad config file line %d
", config_linenr
);
+ die("bad config file line %d
in %s", config_linenr, config_file_name
);
}
int git_config_int(const char *name, const char *value)
}
int git_config_int(const char *name, const char *value)
@@
-197,7
+198,7
@@
int git_config_int(const char *name, const char *value)
if (!*end)
return val;
}
if (!*end)
return val;
}
- die("bad config value for '%s'
",
name);
+ die("bad config value for '%s'
in %s", name, config_file_
name);
}
int git_config_bool(const char *name, const char *value)
}
int git_config_bool(const char *name, const char *value)
@@
-236,25
+237,37
@@
int git_default_config(const char *var, const char *value)
return 0;
}
return 0;
}
+ if (!strcmp(var, "i18n.commitencoding")) {
+ strncpy(git_commit_encoding, value, sizeof(git_commit_encoding));
+ return 0;
+ }
+
/* Add other config variables here.. */
return 0;
}
/* Add other config variables here.. */
return 0;
}
-int git_config
(config_fn_t fn
)
+int git_config
_from_file(config_fn_t fn, const char *filename
)
{
int ret;
{
int ret;
- FILE *f = fopen(
git_path("config")
, "r");
+ FILE *f = fopen(
filename
, "r");
ret = -1;
if (f) {
config_file = f;
ret = -1;
if (f) {
config_file = f;
+ config_file_name = filename;
config_linenr = 1;
ret = git_parse_file(fn);
fclose(f);
config_linenr = 1;
ret = git_parse_file(fn);
fclose(f);
+ config_file_name = NULL;
}
return ret;
}
}
return ret;
}
+int git_config(config_fn_t fn)
+{
+ return git_config_from_file(fn, git_path("config"));
+}
+
/*
* Find all the stuff for git_config_set() below.
*/
/*
* Find all the stuff for git_config_set() below.
*/
@@
-396,8
+409,7
@@
int git_config_set_multivar(const char* key, const char* value,
const char* value_regex, int multi_replace)
{
int i;
const char* value_regex, int multi_replace)
{
int i;
- struct stat st;
- int fd;
+ int fd, in_fd;
char* config_filename = strdup(git_path("config"));
char* lock_file = strdup(git_path("config.lock"));
const char* last_dot = strrchr(key, '.');
char* config_filename = strdup(git_path("config"));
char* lock_file = strdup(git_path("config.lock"));
const char* last_dot = strrchr(key, '.');
@@
-444,15
+456,17
@@
int git_config_set_multivar(const char* key, const char* value,
/*
* If .git/config does not exist yet, write a minimal version.
*/
/*
* If .git/config does not exist yet, write a minimal version.
*/
- if (stat(config_filename, &st)) {
- static const char contents[] =
- "#\n"
- "# This is the config file\n"
- "#\n"
- "\n";
-
+ in_fd = open(config_filename, O_RDONLY);
+ if ( in_fd < 0 ) {
free(store.key);
free(store.key);
+ if ( ENOENT != errno ) {
+ error("opening %s: %s", config_filename,
+ strerror(errno));
+ close(fd);
+ unlink(lock_file);
+ return 3; /* same as "invalid config file" */
+ }
/* if nothing to unset, error out */
if (value == NULL) {
close(fd);
/* if nothing to unset, error out */
if (value == NULL) {
close(fd);
@@
-461,12
+475,10
@@
int git_config_set_multivar(const char* key, const char* value,
}
store.key = (char*)key;
}
store.key = (char*)key;
-
- write(fd, contents, sizeof(contents)-1);
store_write_section(fd, key);
store_write_pair(fd, key, value);
} else{
store_write_section(fd, key);
store_write_pair(fd, key, value);
} else{
-
int in_fd
;
+
struct stat st
;
char* contents;
int i, copy_begin, copy_end, new_line = 0;
char* contents;
int i, copy_begin, copy_end, new_line = 0;
@@
-482,7
+494,7
@@
int git_config_set_multivar(const char* key, const char* value,
store.value_regex = (regex_t*)malloc(sizeof(regex_t));
if (regcomp(store.value_regex, value_regex,
REG_EXTENDED)) {
store.value_regex = (regex_t*)malloc(sizeof(regex_t));
if (regcomp(store.value_regex, value_regex,
REG_EXTENDED)) {
- fprintf(stderr, "Invalid pattern: %s",
+ fprintf(stderr, "Invalid pattern: %s
\n
",
value_regex);
free(store.value_regex);
return 6;
value_regex);
free(store.value_regex);
return 6;
@@
-523,7
+535,7
@@
int git_config_set_multivar(const char* key, const char* value,
return 5;
}
return 5;
}
-
in_fd = open(config_filename, O_RDONLY, 0666
);
+
fstat(in_fd, &st
);
contents = mmap(NULL, st.st_size, PROT_READ,
MAP_PRIVATE, in_fd, 0);
close(in_fd);
contents = mmap(NULL, st.st_size, PROT_READ,
MAP_PRIVATE, in_fd, 0);
close(in_fd);