From: Nguyễn Thái Ngọc Duy <pclouds@gmail.com>
Date: Tue, 16 Feb 2010 05:22:08 +0000 (+0700)
Subject: Move offset_1st_component() to path.c
X-Git-Tag: v1.7.1-rc0~89^2~2
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=4bb43de25977063187dedf054122985bc5a2660e;p=git.git

Move offset_1st_component() to path.c

The implementation is also lightly modified to use is_dir_sep()
instead of hardcoding '/'.

Signed-off-by: Nguyễn Thái Ngọc Duy <pclouds@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
---

diff --git a/cache.h b/cache.h
index 04ae824d6..caf4192b8 100644
--- a/cache.h
+++ b/cache.h
@@ -664,6 +664,7 @@ int normalize_path_copy(char *dst, const char *src);
 int longest_ancestor_length(const char *path, const char *prefix_list);
 char *strip_path_suffix(const char *path, const char *suffix);
 int daemon_avoid_alias(const char *path);
+int offset_1st_component(const char *path);
 
 /* Read and unpack a sha1 file into memory, write memory to a sha1 file */
 extern int sha1_object_info(const unsigned char *, unsigned long *);
diff --git a/path.c b/path.c
index 79aa10471..06fd9e057 100644
--- a/path.c
+++ b/path.c
@@ -649,3 +649,10 @@ int daemon_avoid_alias(const char *p)
 		}
 	}
 }
+
+int offset_1st_component(const char *path)
+{
+	if (has_dos_drive_prefix(path))
+		return 2 + is_dir_sep(path[2]);
+	return is_dir_sep(path[0]);
+}
diff --git a/sha1_file.c b/sha1_file.c
index 23d347c45..923d9d1cd 100644
--- a/sha1_file.c
+++ b/sha1_file.c
@@ -83,13 +83,6 @@ int get_sha1_hex(const char *hex, unsigned char *sha1)
 	return 0;
 }
 
-static inline int offset_1st_component(const char *path)
-{
-	if (has_dos_drive_prefix(path))
-		return 2 + (path[2] == '/');
-	return *path == '/';
-}
-
 int safe_create_leading_directories(char *path)
 {
 	char *pos = path + offset_1st_component(path);