GIT 0.99.9k

[git.git] / config.c

diff --git a/config.c b/config.c
index 697d79f..5cc8535 100644 (file)
--- a/config.c
+++ b/config.c
@@ -143,7 +143,7 @@ static int get_base_var(char *name)
                        return -1;
                if (c == ']')
                        return baselen;
-               if (!isalnum(c))
+               if (!isalnum(c) && c != '.')
                        return -1;
                if (baselen > MAXNAME / 2)
                        return -1;
@@ -236,11 +236,6 @@ int git_default_config(const char *var, const char *value)
                return 0;
        }
 
-       if (!strcmp(var, "diff.renamelimit")) {
-               diff_rename_limit_default = git_config_int(var, value);
-               return 0;
-       }
-
        /* Add other config variables here.. */
        return 0;
 }
@@ -269,6 +264,7 @@ int git_config(config_fn_t fn)
 static struct {
        int baselen;
        char* key;
+       int do_not_match;
        regex_t* value_regex;
        int multi_replace;
        off_t offset[MAX_MATCHES];
@@ -276,13 +272,19 @@ static struct {
        int seen;
 } store;
 
+static int matches(const char* key, const char* value)
+{
+       return !strcmp(key, store.key) &&
+               (store.value_regex == NULL ||
+                (store.do_not_match ^
+                 !regexec(store.value_regex, value, 0, NULL, 0)));
+}
+
 static int store_aux(const char* key, const char* value)
 {
        switch (store.state) {
        case KEY_SEEN:
-               if (!strcmp(key, store.key) &&
-                               (store.value_regex == NULL ||
-                               !regexec(store.value_regex, value, 0, NULL, 0))) {
+               if (matches(key, value)) {
                        if (store.seen == 1 && store.multi_replace == 0) {
                                fprintf(stderr,
                                        "Warning: %s has multiple values\n",
@@ -306,9 +308,7 @@ static int store_aux(const char* key, const char* value)
                /* fallthru */
        case SECTION_END_SEEN:
        case START:
-               if (!strcmp(key, store.key) &&
-                               (store.value_regex == NULL ||
-                               !regexec(store.value_regex, value, 0, NULL, 0))) {
+               if (matches(key, value)) {
                        store.offset[store.seen] = ftell(config_file);
                        store.state = KEY_SEEN;
                        store.seen++;
@@ -398,35 +398,37 @@ int git_config_set_multivar(const char* key, const char* value,
        int i;
        struct stat st;
        int fd;
-       char* config_file = strdup(git_path("config"));
+       char* config_filename = strdup(git_path("config"));
        char* lock_file = strdup(git_path("config.lock"));
-
-       store.multi_replace = multi_replace;
+       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.
         */
-       for (store.baselen = 0;
-                       key[store.baselen] != '.' && key[store.baselen];
-                       store.baselen++);
-       if (!key[store.baselen] || !key[store.baselen+1]) {
+
+       if (last_dot == NULL) { 
                fprintf(stderr, "key does not contain a section: %s\n", key);
                return 2;
        }
+       store.baselen = last_dot - key;
+
+       store.multi_replace = multi_replace;
 
        /*
         * Validate the key and while at it, lower case it for matching.
         */
        store.key = (char*)malloc(strlen(key)+1);
        for (i = 0; key[i]; i++)
-               if (i != store.baselen && (!isalnum(key[i]) ||
-                               (i == store.baselen+1 && !isalpha(key[i])))) {
+               if (i != store.baselen &&
+                               ((!isalnum(key[i]) && key[i] != '.') ||
+                                (i == store.baselen+1 && !isalpha(key[i])))) {
                        fprintf(stderr, "invalid key: %s\n", key);
                        free(store.key);
                        return 1;
                } else
                        store.key[i] = tolower(key[i]);
+       store.key[i] = 0;
 
        /*
         * The lock_file serves a purpose in addition to locking: the new
@@ -442,7 +444,7 @@ int git_config_set_multivar(const char* key, const char* value,
        /*
         * If .git/config does not exist yet, write a minimal version.
         */
-       if (stat(config_file, &st)) {
+       if (stat(config_filename, &st)) {
                static const char contents[] =
                        "#\n"
                        "# This is the config file\n"
@@ -471,6 +473,12 @@ int git_config_set_multivar(const char* key, const char* value,
                if (value_regex == NULL)
                        store.value_regex = NULL;
                else {
+                       if (value_regex[0] == '!') {
+                               store.do_not_match = 1;
+                               value_regex++;
+                       } else
+                               store.do_not_match = 0;
+
                        store.value_regex = (regex_t*)malloc(sizeof(regex_t));
                        if (regcomp(store.value_regex, value_regex,
                                        REG_EXTENDED)) {
@@ -515,7 +523,7 @@ int git_config_set_multivar(const char* key, const char* value,
                        return 5;
                }
 
-               in_fd = open(config_file, O_RDONLY, 0666);
+               in_fd = open(config_filename, O_RDONLY, 0666);
                contents = mmap(NULL, st.st_size, PROT_READ,
                        MAP_PRIVATE, in_fd, 0);
                close(in_fd);
@@ -556,12 +564,12 @@ int git_config_set_multivar(const char* key, const char* value,
                                st.st_size - copy_begin);
 
                munmap(contents, st.st_size);
-               unlink(config_file);
+               unlink(config_filename);
        }
 
        close(fd);
 
-       if (rename(lock_file, config_file) < 0) {
+       if (rename(lock_file, config_filename) < 0) {
                fprintf(stderr, "Could not rename the lock file?\n");
                return 4;
        }