[PATCH] Add -k kill keyword expansion option to git-cvsimport - revised

diff --git a/read-cache.c b/read-cache.c
index 5a61bf752bdc15f311215f91ea923f5422e8ad5c..5820f18d9a79fd83ff5a418a5dfc68bbf7c5c354 100644 (file)
--- a/read-cache.c
+++ b/read-cache.c
@@ -171,6 +171,30 @@ int ce_same_name(struct cache_entry *a, struct cache_entry *b)
        return ce_namelen(b) == len && !memcmp(a->name, b->name, len);
 }
 
+int ce_path_match(const struct cache_entry *ce, const char **pathspec)
+{
+       const char *match, *name;
+       int len;
+
+       if (!pathspec)
+               return 1;
+
+       len = ce_namelen(ce);
+       name = ce->name;
+       while ((match = *pathspec++) != NULL) {
+               int matchlen = strlen(match);
+               if (matchlen > len)
+                       continue;
+               if (memcmp(name, match, matchlen))
+                       continue;
+               if (matchlen && name[matchlen-1] == '/')
+                       return 1;
+               if (name[matchlen] == '/' || !name[matchlen])
+                       return 1;
+       }
+       return 0;
+}
+
 /*
  * Do we have another file that has the beginning components being a
  * proper superset of the name we're trying to add?
@@ -368,7 +392,7 @@ int read_cache(void)
                return (errno == ENOENT) ? 0 : error("open failed");
 
        size = 0; // avoid gcc warning
-       map = (void *)-1;
+       map = MAP_FAILED;
        if (!fstat(fd, &st)) {
                size = st.st_size;
                errno = EINVAL;
@@ -376,7 +400,7 @@ int read_cache(void)
                        map = mmap(NULL, size, PROT_READ | PROT_WRITE, MAP_PRIVATE, fd, 0);
        }
        close(fd);
-       if (-1 == (int)(long)map)
+       if (map == MAP_FAILED)
                return error("mmap failed");
 
        hdr = map;