[PATCH 1/2] Teach Git how to parse standard power of 2 suffixes.
From: Shawn O. Pearce <hidden>
Date: 2016-06-15 22:42:47
Subsystem:
the rest · Maintainer:
Linus Torvalds
Sometimes its necessary to supply a value as a power of two in a configuration parameter. In this case the user may want to use the standard suffixes such as K, KB, KiB, etc. to indicate that the numerical value should be multiplied by a constant base before being used. The new git_config_datasize function can be used in config file handler functions to obtain a size_t in bytes. Signed-off-by: Shawn O. Pearce <redacted> --- Applies on top of sp/mmap, but was broken out to make it easier to apply earlier in case someone else needed this function. cache.h | 1 + config.c | 25 +++++++++++++++++++++++++ 2 files changed, 26 insertions(+), 0 deletions(-)
diff --git a/cache.h b/cache.h
index a5fc232..abbcab3 100644
--- a/cache.h
+++ b/cache.h@@ -418,6 +418,7 @@ extern int git_config_from_file(config_fn_t fn, const char *); extern int git_config(config_fn_t fn); extern int git_config_int(const char *, const char *); extern int git_config_bool(const char *, const char *); +extern size_t git_config_datasize(const char *, const char *); extern int git_config_set(const char *, const char *); extern int git_config_set_multivar(const char *, const char *, const char *, int); extern int git_config_rename_section(const char *, const char *);
diff --git a/config.c b/config.c
index 2e0d5a8..07ad2f1 100644
--- a/config.c
+++ b/config.c@@ -255,6 +255,31 @@ int git_config_bool(const char *name, const char *value) return git_config_int(name, value) != 0; } +size_t git_config_datasize(const char *name, const char *value) +{ + if (value && *value) { + char *end; + unsigned long val = strtoul(value, &end, 0); + while (isspace(*end)) + end++; + if (!*end) + return val; + if (!strcasecmp(end, "k") + || !strcasecmp(end, "kb") + || !strcasecmp(end, "kib")) + return val * 1024; + if (!strcasecmp(end, "m") + || !strcasecmp(end, "mb") + || !strcasecmp(end, "mib")) + return val * 1024 * 1024; + if (!strcasecmp(end, "g") + || !strcasecmp(end, "gb") + || !strcasecmp(end, "gib")) + return val * 1024 * 1024 * 1024; + } + die("bad config value for '%s' in %s", name, config_file_name); +} + int git_default_config(const char *var, const char *value) { /* This needs a better name */
--
1.5.0.rc0.g6bb1