aboutsummaryrefslogtreecommitdiff
path: root/compat/mingw.h
diff options
context:
space:
mode:
authorJohannes Schindelin <johannes.schindelin@gmx.de>2016-01-12 08:57:22 +0100
committerJunio C Hamano <gitster@pobox.com>2016-01-12 10:39:40 -0800
commit2f36eed936f70105e80681aafac645ff34acc667 (patch)
tree5a226a4147e6f56a021d0492b713c39907a7b4da /compat/mingw.h
parent833e48259e23aea76f3765d28d1b2200332301f7 (diff)
downloadgit-2f36eed936f70105e80681aafac645ff34acc667.tar.gz
git-2f36eed936f70105e80681aafac645ff34acc667.tar.xz
Refactor skipping DOS drive prefixes
Junio noticed that there is an implicit assumption in pretty much all the code calling has_dos_drive_prefix(): it forces all of its callsites to hardcode the knowledge that the DOS drive prefix is always two bytes long. While this assumption is pretty safe, we can still make the code more readable and less error-prone by introducing a function that skips the DOS drive prefix safely. While at it, we change the has_dos_drive_prefix() return value: it now returns the number of bytes to be skipped if there is a DOS drive prefix. Signed-off-by: Johannes Schindelin <johannes.schindelin@gmx.de> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'compat/mingw.h')
-rw-r--r--compat/mingw.h10
1 files changed, 9 insertions, 1 deletions
diff --git a/compat/mingw.h b/compat/mingw.h
index 738865c6c..9b5db4ecc 100644
--- a/compat/mingw.h
+++ b/compat/mingw.h
@@ -358,7 +358,15 @@ HANDLE winansi_get_osfhandle(int fd);
* git specific compatibility
*/
-#define has_dos_drive_prefix(path) (isalpha(*(path)) && (path)[1] == ':')
+#define has_dos_drive_prefix(path) \
+ (isalpha(*(path)) && (path)[1] == ':' ? 2 : 0)
+static inline int mingw_skip_dos_drive_prefix(char **path)
+{
+ int ret = has_dos_drive_prefix(*path);
+ *path += ret;
+ return ret;
+}
+#define skip_dos_drive_prefix mingw_skip_dos_drive_prefix
#define is_dir_sep(c) ((c) == '/' || (c) == '\\')
static inline char *mingw_find_last_dir_sep(const char *path)
{