summaryrefslogtreecommitdiff
path: root/git-compat-util.h
diff options
context:
space:
mode:
authorJim Meyering <jim@meyering.net>2007-04-09 23:01:44 (GMT)
committerJunio C Hamano <junkio@cox.net>2007-04-12 02:13:55 (GMT)
commit6aead43db34313e6cdbc72e2f7a70f6b82c78cf2 (patch)
tree6b07be3cba39adf0b1edeac27a1e73d16f3b4bb7 /git-compat-util.h
parent171ddd91771f042e49db49ff068694b5ed6f845d (diff)
downloadgit-6aead43db34313e6cdbc72e2f7a70f6b82c78cf2.zip
git-6aead43db34313e6cdbc72e2f7a70f6b82c78cf2.tar.gz
git-6aead43db34313e6cdbc72e2f7a70f6b82c78cf2.tar.bz2
sscanf/strtoul: parse integers robustly
* builtin-grep.c (strtoul_ui): Move function definition from here, to... * git-compat-util.h (strtoul_ui): ...here, with an added "base" parameter. * builtin-grep.c (cmd_grep): Update use of strtoul_ui to include base, "10". * builtin-update-index.c (read_index_info): Diagnose an invalid mode integer that is out of range or merely larger than INT_MAX. (cmd_update_index): Use strtoul_ui, not sscanf. * convert-objects.c (write_subdirectory): Likewise. Signed-off-by: Jim Meyering <jim@meyering.net> Signed-off-by: Junio C Hamano <junkio@cox.net>
Diffstat (limited to 'git-compat-util.h')
-rw-r--r--git-compat-util.h13
1 files changed, 13 insertions, 0 deletions
diff --git a/git-compat-util.h b/git-compat-util.h
index 139fc19..5f6a281 100644
--- a/git-compat-util.h
+++ b/git-compat-util.h
@@ -301,4 +301,17 @@ static inline int prefixcmp(const char *str, const char *prefix)
return strncmp(str, prefix, strlen(prefix));
}
+static inline int strtoul_ui(char const *s, int base, unsigned int *result)
+{
+ unsigned long ul;
+ char *p;
+
+ errno = 0;
+ ul = strtoul(s, &p, base);
+ if (errno || *p || p == s || (unsigned int) ul != ul)
+ return -1;
+ *result = ul;
+ return 0;
+}
+
#endif