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 04ae824d64ec8e3adf26c3afeeae2c1a0e8ccd3d..caf4192b886af079df36677bb0205e6db3fe642e 100644 (file)
--- 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 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 *);
 
 /* 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 79aa104712364a8c18964feecd4c8079449a78cf..06fd9e0577f48b2587f92ea5fa3abcae53dba337 100644 (file)
--- 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 23d347c45fcf2a93ee59b9ddea996ec432038200..923d9d1cd10e65f72b226fff0b215bc8ac31ccf1 100644 (file)
--- a/sha1_file.c
+++ b/sha1_file.c
@@ -83,13 +83,6 @@ int get_sha1_hex(const char *hex, unsigned char *sha1)
        return 0;
 }
 
        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);
 int safe_create_leading_directories(char *path)
 {
        char *pos = path + offset_1st_component(path);