Mark user-manual as UTF-8

diff --git a/config.c b/config.c
index 58d3ed5d371b6d7548f6677e65135bd3f01851d0..f89a61191591c1242ba8fb3ac5b03330cdb1c06b 100644 (file)
--- a/config.c
+++ b/config.c
@@ -233,21 +233,55 @@ static int git_parse_file(config_fn_t fn)
        die("bad config file line %d in %s", config_linenr, config_file_name);
 }
 
-int git_config_int(const char *name, const char *value)
+static unsigned long get_unit_factor(const char *end)
+{
+       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);
+}
+
+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);
+               return 1;
+       }
+       return 0;
+}
+
+int git_parse_ulong(const char *value, unsigned long *ret)
 {
        if (value && *value) {
                char *end;
-               int val = strtol(value, &end, 0);
-               if (!*end)
-                       return val;
-               if (!strcasecmp(end, "k"))
-                       return val * 1024;
-               if (!strcasecmp(end, "m"))
-                       return val * 1024 * 1024;
-               if (!strcasecmp(end, "g"))
-                       return val * 1024 * 1024 * 1024;
-       }
-       die("bad config value for '%s' in %s", name, config_file_name);
+               unsigned long val = strtoul(value, &end, 0);
+               *ret = val * get_unit_factor(end);
+               return 1;
+       }
+       return 0;
+}
+
+int git_config_int(const char *name, const char *value)
+{
+       long ret;
+       if (!git_parse_long(value, &ret))
+               die("bad config value for '%s' in %s", name, config_file_name);
+       return ret;
+}
+
+unsigned long git_config_ulong(const char *name, const char *value)
+{
+       unsigned long ret;
+       if (!git_parse_ulong(value, &ret))
+               die("bad config value for '%s' in %s", name, config_file_name);
+       return ret;
 }
 
 int git_config_bool(const char *name, const char *value)
@@ -271,6 +305,11 @@ int git_default_config(const char *var, const char *value)
                return 0;
        }
 
+       if (!strcmp(var, "core.quotepath")) {
+               quote_path_fully = git_config_bool(var, value);
+               return 0;
+       }
+
        if (!strcmp(var, "core.symlinks")) {
                has_symlinks = git_config_bool(var, value);
                return 0;
@@ -382,6 +421,11 @@ int git_default_config(const char *var, const char *value)
                return 0;
        }
 
+       if (!strcmp(var, "core.pager")) {
+               pager_program = xstrdup(value);
+               return 0;
+       }
+
        /* Add other config variables here and to Documentation/config.txt. */
        return 0;
 }
@@ -523,7 +567,7 @@ static int store_aux(const char* key, const char* value)
        return 0;
 }
 
-static int write_error()
+static int write_error(void)
 {
        fprintf(stderr, "Failed to write new configuration file\n");