Add copyright notice of Rene Scharfe to tar-tree.c

diff --git a/update-cache.c b/update-cache.c
index bb25fa114c1017380c8441f514ae2e66beef1e68..735d19920d998a3d53dbfd9a68336cc13780ef23 100644 (file)
--- a/update-cache.c
+++ b/update-cache.c
@@ -57,19 +57,15 @@ static int add_file_to_cache(char *path)
        struct cache_entry *ce;
        struct stat st;
        int fd;
+       char *target;
 
-       fd = open(path, O_RDONLY);
-       if (fd < 0) {
+       if (lstat(path, &st) < 0) {
                if (errno == ENOENT || errno == ENOTDIR) {
                        if (allow_remove)
                                return remove_file_from_cache(path);
                }
                return -1;
        }
-       if (fstat(fd, &st) < 0) {
-               close(fd);
-               return -1;
-       }
        namelen = strlen(path);
        size = cache_entry_size(namelen);
        ce = xmalloc(size);
@@ -78,10 +74,27 @@ static int add_file_to_cache(char *path)
        fill_stat_cache_info(ce, &st);
        ce->ce_mode = create_ce_mode(st.st_mode);
        ce->ce_flags = htons(namelen);
-
-       if (index_fd(ce->sha1, fd, &st) < 0)
+       switch (st.st_mode & S_IFMT) {
+       case S_IFREG:
+               fd = open(path, O_RDONLY);
+               if (fd < 0)
+                       return -1;
+               if (index_fd(ce->sha1, fd, &st) < 0)
+                       return -1;
+               break;
+       case S_IFLNK:
+               target = xmalloc(st.st_size+1);
+               if (readlink(path, target, st.st_size+1) != st.st_size) {
+                       free(target);
+                       return -1;
+               }
+               if (write_sha1_file(target, st.st_size, "blob", ce->sha1))
+                       return -1;
+               free(target);
+               break;
+       default:
                return -1;
-
+       }
        return add_cache_entry(ce, allow_add);
 }
 
@@ -120,6 +133,33 @@ static int compare_data(struct cache_entry *ce, unsigned long expected_size)
        return match;
 }
 
+static int compare_link(struct cache_entry *ce, unsigned long expected_size)
+{
+       int match = -1;
+       char *target;
+       void *buffer;
+       unsigned long size;
+       char type[10];
+       int len;
+
+       target = xmalloc(expected_size);
+       len = readlink(ce->name, target, expected_size);
+       if (len != expected_size) {
+               free(target);
+               return -1;
+       }
+       buffer = read_sha1_file(ce->sha1, type, &size);
+       if (!buffer) {
+               free(target);
+               return -1;
+       }
+       if (size == expected_size)
+               match = memcmp(buffer, target, size);
+       free(buffer);
+       free(target);
+       return match;
+}
+
 /*
  * "refresh" does not calculate a new sha1 file or bring the
  * cache up-to-date for mode/content changes. But what it
@@ -137,7 +177,7 @@ static struct cache_entry *refresh_entry(struct cache_entry *ce)
        struct cache_entry *updated;
        int changed, size;
 
-       if (stat(ce->name, &st) < 0)
+       if (lstat(ce->name, &st) < 0)
                return ERR_PTR(-errno);
 
        changed = cache_match_stat(ce, &st);
@@ -145,14 +185,24 @@ static struct cache_entry *refresh_entry(struct cache_entry *ce)
                return ce;
 
        /*
-        * If the mode has changed, there's no point in trying
+        * If the mode or type has changed, there's no point in trying
         * to refresh the entry - it's not going to match
         */
-       if (changed & MODE_CHANGED)
+       if (changed & (MODE_CHANGED | TYPE_CHANGED))
                return ERR_PTR(-EINVAL);
 
-       if (compare_data(ce, st.st_size))
+       switch (st.st_mode & S_IFMT) {
+       case S_IFREG:
+               if (compare_data(ce, st.st_size))
+                       return ERR_PTR(-EINVAL);
+               break;
+       case S_IFLNK:
+               if (compare_link(ce, st.st_size))
+                       return ERR_PTR(-EINVAL);
+               break;
+       default:
                return ERR_PTR(-EINVAL);
+       }
 
        size = ce_size(ce);
        updated = xmalloc(size);
@@ -187,6 +237,7 @@ static int refresh_cache(void)
                        }
                        continue;
                }
+               active_cache_changed = 1;
                active_cache[i] = new;
        }
        return has_errors;
@@ -332,5 +383,5 @@ int main(int argc, char **argv)
                die("Unable to write new cachefile");
 
        lockfile_name = NULL;
-       return has_errors;
+       return has_errors ? 1 : 0;
 }