diff options
| -rw-r--r-- | Makefile | 5 | ||||
| -rw-r--r-- | show-files.c | 164 |
2 files changed, 168 insertions, 1 deletions
@@ -2,7 +2,7 @@ CFLAGS=-g -O3 -Wall CC=gcc PROG= update-cache show-diff init-db write-tree read-tree commit-tree \ - cat-file fsck-cache checkout-cache diff-tree rev-tree + cat-file fsck-cache checkout-cache diff-tree rev-tree show-files all: $(PROG) @@ -43,6 +43,9 @@ diff-tree: diff-tree.o read-cache.o rev-tree: rev-tree.o read-cache.o $(CC) $(CFLAGS) -o rev-tree rev-tree.o read-cache.o $(LIBS) +show-files: show-files.o read-cache.o + $(CC) $(CFLAGS) -o show-files show-files.o read-cache.o $(LIBS) + read-cache.o: cache.h show-diff.o: cache.h diff --git a/show-files.c b/show-files.c new file mode 100644 index 0000000..9c396ec --- /dev/null +++ b/show-files.c @@ -0,0 +1,164 @@ +/* + * This merges the file listing in the directory cache index + * with the actual working directory list, and shows different + * combinations of the two. + * + * Copyright (C) Linus Torvalds, 2005 + */ +#include <dirent.h> +#include <sys/param.h> + +#include "cache.h" + +static int show_deleted = 0; +static int show_cached = 0; +static int show_others = 0; +static int show_ignored = 0; + +static const char **dir; +static int nr_dir; +static int dir_alloc; + +static void add_name(const char *pathname, int len) +{ + char *name; + + if (cache_name_pos(pathname, len) >= 0) + return; + + if (nr_dir == dir_alloc) { + dir_alloc = alloc_nr(dir_alloc); + dir = realloc(dir, dir_alloc*sizeof(char *)); + } + name = malloc(len + 1); + memcpy(name, pathname, len + 1); + dir[nr_dir++] = name; +} + +/* + * Read a directory tree. We currently ignore anything but + * directories and regular files. That's because git doesn't + * handle them at all yet. Maybe that will change some day. + * + * Also, we currently ignore all names starting with a dot. + * That likely will not change. + */ +static void read_directory(const char *path, const char *base, int baselen) +{ + DIR *dir = opendir(path); + + if (dir) { + struct dirent *de; + char fullname[MAXPATHLEN + 1]; + memcpy(fullname, base, baselen); + + while ((de = readdir(dir)) != NULL) { + int len; + + if (de->d_name[0] == '.') + continue; + len = strlen(de->d_name); + memcpy(fullname + baselen, de->d_name, len+1); + + switch (de->d_type) { + struct stat st; + default: + continue; + case DT_UNKNOWN: + if (lstat(fullname, &st)) + continue; + if (S_ISREG(st.st_mode)) + break; + if (!S_ISDIR(st.st_mode)) + continue; + /* fallthrough */ + case DT_DIR: + memcpy(fullname + baselen + len, "/", 2); + read_directory(fullname, fullname, baselen + len + 1); + continue; + case DT_REG: + break; + } + add_name(fullname, baselen + len); + } + closedir(dir); + } +} + +static int cmp_name(const void *p1, const void *p2) +{ + const char *n1 = *(const char **)p1; + const char *n2 = *(const char **)p2; + int l1 = strlen(n1), l2 = strlen(n2); + + return cache_name_compare(n1, l1, n2, l2); +} + +static void show_files(void) +{ + int i; + + /* For cached/deleted files we don't need to even do the readdir */ + if (show_others | show_ignored) { + read_directory(".", "", 0); + qsort(dir, nr_dir, sizeof(char *), cmp_name); + } + if (show_others) { + for (i = 0; i < nr_dir; i++) + printf("%s\n", dir[i]); + } + if (show_cached) { + for (i = 0; i < active_nr; i++) { + struct cache_entry *ce = active_cache[i]; + printf("%s\n", ce->name); + } + } + if (show_deleted) { + for (i = 0; i < active_nr; i++) { + struct cache_entry *ce = active_cache[i]; + struct stat st; + if (!stat(ce->name, &st)) + continue; + printf("%s\n", ce->name); + } + } + if (show_ignored) { + /* We don't have any "ignore" list yet */ + } +} + +int main(int argc, char **argv) +{ + int i; + + for (i = 1; i < argc; i++) { + char *arg = argv[i]; + + if (!strcmp(arg, "--cached")) { + show_cached = 1; + continue; + } + if (!strcmp(arg, "--deleted")) { + show_deleted = 1; + continue; + } + if (!strcmp(arg, "--others")) { + show_others = 1; + continue; + } + if (!strcmp(arg, "--ignored")) { + show_ignored = 1; + continue; + } + + usage("show-files (--[cached|deleted|others|ignoded])*"); + } + + /* With no flags, we default to showing the cached files */ + if (!(show_cached | show_deleted | show_others | show_ignored)) + show_cached = 1; + + read_cache(); + show_files(); + return 0; +} |