Improve error messages when int/long cannot be parsed from config

diff --git a/config.c b/config.c
index 9a5c5470cc5ac893399bcf2126e4d5ba601718ef..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;