git-rebase -i: clean-up error check codepath.

diff --git a/config.c b/config.c
index 15b3d07349b246d3a46721c5d84c65a2093d9ad3..80db92990aa9e51fe5eccac6e734b5570c51a12f 100644 (file)
--- a/config.c
+++ b/config.c
@@ -234,17 +234,23 @@ static int git_parse_file(config_fn_t fn)
        die("bad config file line %d in %s", config_linenr, config_file_name);
 }
 
-static unsigned long get_unit_factor(const char *end)
+static int parse_unit_factor(const char *end, unsigned long *val)
 {
        if (!*end)
                return 1;
-       else if (!strcasecmp(end, "k"))
-               return 1024;
-       else if (!strcasecmp(end, "m"))
-               return 1024 * 1024;
-       else if (!strcasecmp(end, "g"))
-               return 1024 * 1024 * 1024;
-       die("unknown unit: '%s'", end);
+       else if (!strcasecmp(end, "k")) {
+               *val *= 1024;
+               return 1;
+       }
+       else if (!strcasecmp(end, "m")) {
+               *val *= 1024 * 1024;
+               return 1;
+       }
+       else if (!strcasecmp(end, "g")) {
+               *val *= 1024 * 1024 * 1024;
+               return 1;
+       }
+       return 0;
 }
 
 int git_parse_long(const char *value, long *ret)
@@ -252,7 +258,10 @@ int git_parse_long(const char *value, long *ret)
        if (value && *value) {
                char *end;
                long val = strtol(value, &end, 0);
-               *ret = val * get_unit_factor(end);
+               unsigned long factor = 1;
+               if (!parse_unit_factor(end, &factor))
+                       return 0;
+               *ret = val * factor;
                return 1;
        }
        return 0;
@@ -263,7 +272,9 @@ int git_parse_ulong(const char *value, unsigned long *ret)
        if (value && *value) {
                char *end;
                unsigned long val = strtoul(value, &end, 0);
-               *ret = val * get_unit_factor(end);
+               if (!parse_unit_factor(end, &val))
+                       return 0;
+               *ret = val;
                return 1;
        }
        return 0;
@@ -439,6 +450,11 @@ int git_default_config(const char *var, const char *value)
                return 0;
        }
 
+       if (!strcmp(var, "core.whitespace")) {
+               whitespace_rule_cfg = parse_whitespace_rule(value);
+               return 0;
+       }
+
        /* Add other config variables here and to Documentation/config.txt. */
        return 0;
 }
@@ -605,46 +621,36 @@ static int write_error(void)
 
 static int store_write_section(int fd, const char* key)
 {
-       const char *dot = strchr(key, '.');
-       int len1 = store.baselen, len2 = -1;
+       const char *dot;
+       int i, success;
+       struct strbuf sb;
 
-       dot = strchr(key, '.');
+       strbuf_init(&sb, 0);
+       dot = memchr(key, '.', store.baselen);
        if (dot) {
-               int dotlen = dot - key;
-               if (dotlen < len1) {
-                       len2 = len1 - dotlen - 1;
-                       len1 = dotlen;
+               strbuf_addf(&sb, "[%.*s \"", (int)(dot - key), key);
+               for (i = dot - key + 1; i < store.baselen; i++) {
+                       if (key[i] == '"')
+                               strbuf_addch(&sb, '\\');
+                       strbuf_addch(&sb, key[i]);
                }
+               strbuf_addstr(&sb, "\"]\n");
+       } else {
+               strbuf_addf(&sb, "[%.*s]\n", store.baselen, key);
        }
 
-       if (write_in_full(fd, "[", 1) != 1 ||
-           write_in_full(fd, key, len1) != len1)
-               return 0;
-       if (len2 >= 0) {
-               if (write_in_full(fd, " \"", 2) != 2)
-                       return 0;
-               while (--len2 >= 0) {
-                       unsigned char c = *++dot;
-                       if (c == '"')
-                               if (write_in_full(fd, "\\", 1) != 1)
-                                       return 0;
-                       if (write_in_full(fd, &c, 1) != 1)
-                               return 0;
-               }
-               if (write_in_full(fd, "\"", 1) != 1)
-                       return 0;
-       }
-       if (write_in_full(fd, "]\n", 2) != 2)
-               return 0;
+       success = write_in_full(fd, sb.buf, sb.len) == sb.len;
+       strbuf_release(&sb);
 
-       return 1;
+       return success;
 }
 
 static int store_write_pair(int fd, const char* key, const char* value)
 {
-       int i;
-       int length = strlen(key+store.baselen+1);
-       int quote = 0;
+       int i, success;
+       int length = strlen(key + store.baselen + 1);
+       const char *quote = "";
+       struct strbuf sb;
 
        /*
         * Check to see if the value needs to be surrounded with a dq pair.
@@ -654,43 +660,38 @@ static int store_write_pair(int fd, const char* key, const char* value)
         * configuration parser.
         */
        if (value[0] == ' ')
-               quote = 1;
+               quote = "\"";
        for (i = 0; value[i]; i++)
                if (value[i] == ';' || value[i] == '#')
-                       quote = 1;
-       if (i && value[i-1] == ' ')
-               quote = 1;
+                       quote = "\"";
+       if (i && value[i - 1] == ' ')
+               quote = "\"";
+
+       strbuf_init(&sb, 0);
+       strbuf_addf(&sb, "\t%.*s = %s",
+                   length, key + store.baselen + 1, quote);
 
-       if (write_in_full(fd, "\t", 1) != 1 ||
-           write_in_full(fd, key+store.baselen+1, length) != length ||
-           write_in_full(fd, " = ", 3) != 3)
-               return 0;
-       if (quote && write_in_full(fd, "\"", 1) != 1)
-               return 0;
        for (i = 0; value[i]; i++)
                switch (value[i]) {
                case '\n':
-                       if (write_in_full(fd, "\\n", 2) != 2)
-                               return 0;
+                       strbuf_addstr(&sb, "\\n");
                        break;
                case '\t':
-                       if (write_in_full(fd, "\\t", 2) != 2)
-                               return 0;
+                       strbuf_addstr(&sb, "\\t");
                        break;
                case '"':
                case '\\':
-                       if (write_in_full(fd, "\\", 1) != 1)
-                               return 0;
+                       strbuf_addch(&sb, '\\');
                default:
-                       if (write_in_full(fd, value+i, 1) != 1)
-                               return 0;
+                       strbuf_addch(&sb, value[i]);
                        break;
                }
-       if (quote && write_in_full(fd, "\"", 1) != 1)
-               return 0;
-       if (write_in_full(fd, "\n", 1) != 1)
-               return 0;
-       return 1;
+       strbuf_addf(&sb, "%s\n", quote);
+
+       success = write_in_full(fd, sb.buf, sb.len) == sb.len;
+       strbuf_release(&sb);
+
+       return success;
 }
 
 static ssize_t find_beginning_of_line(const char* contents, size_t size,