[PATCH] Correct show-diff output for deleted files
[alt-git.git] / show-files.c
blob9c396ec8e5e9c9b9ab79fe15baea5141c2de530a
1 /*
2 * This merges the file listing in the directory cache index
3 * with the actual working directory list, and shows different
4 * combinations of the two.
6 * Copyright (C) Linus Torvalds, 2005
7 */
8 #include <dirent.h>
9 #include <sys/param.h>
11 #include "cache.h"
13 static int show_deleted = 0;
14 static int show_cached = 0;
15 static int show_others = 0;
16 static int show_ignored = 0;
18 static const char **dir;
19 static int nr_dir;
20 static int dir_alloc;
22 static void add_name(const char *pathname, int len)
24 char *name;
26 if (cache_name_pos(pathname, len) >= 0)
27 return;
29 if (nr_dir == dir_alloc) {
30 dir_alloc = alloc_nr(dir_alloc);
31 dir = realloc(dir, dir_alloc*sizeof(char *));
33 name = malloc(len + 1);
34 memcpy(name, pathname, len + 1);
35 dir[nr_dir++] = name;
39 * Read a directory tree. We currently ignore anything but
40 * directories and regular files. That's because git doesn't
41 * handle them at all yet. Maybe that will change some day.
43 * Also, we currently ignore all names starting with a dot.
44 * That likely will not change.
46 static void read_directory(const char *path, const char *base, int baselen)
48 DIR *dir = opendir(path);
50 if (dir) {
51 struct dirent *de;
52 char fullname[MAXPATHLEN + 1];
53 memcpy(fullname, base, baselen);
55 while ((de = readdir(dir)) != NULL) {
56 int len;
58 if (de->d_name[0] == '.')
59 continue;
60 len = strlen(de->d_name);
61 memcpy(fullname + baselen, de->d_name, len+1);
63 switch (de->d_type) {
64 struct stat st;
65 default:
66 continue;
67 case DT_UNKNOWN:
68 if (lstat(fullname, &st))
69 continue;
70 if (S_ISREG(st.st_mode))
71 break;
72 if (!S_ISDIR(st.st_mode))
73 continue;
74 /* fallthrough */
75 case DT_DIR:
76 memcpy(fullname + baselen + len, "/", 2);
77 read_directory(fullname, fullname, baselen + len + 1);
78 continue;
79 case DT_REG:
80 break;
82 add_name(fullname, baselen + len);
84 closedir(dir);
88 static int cmp_name(const void *p1, const void *p2)
90 const char *n1 = *(const char **)p1;
91 const char *n2 = *(const char **)p2;
92 int l1 = strlen(n1), l2 = strlen(n2);
94 return cache_name_compare(n1, l1, n2, l2);
97 static void show_files(void)
99 int i;
101 /* For cached/deleted files we don't need to even do the readdir */
102 if (show_others | show_ignored) {
103 read_directory(".", "", 0);
104 qsort(dir, nr_dir, sizeof(char *), cmp_name);
106 if (show_others) {
107 for (i = 0; i < nr_dir; i++)
108 printf("%s\n", dir[i]);
110 if (show_cached) {
111 for (i = 0; i < active_nr; i++) {
112 struct cache_entry *ce = active_cache[i];
113 printf("%s\n", ce->name);
116 if (show_deleted) {
117 for (i = 0; i < active_nr; i++) {
118 struct cache_entry *ce = active_cache[i];
119 struct stat st;
120 if (!stat(ce->name, &st))
121 continue;
122 printf("%s\n", ce->name);
125 if (show_ignored) {
126 /* We don't have any "ignore" list yet */
130 int main(int argc, char **argv)
132 int i;
134 for (i = 1; i < argc; i++) {
135 char *arg = argv[i];
137 if (!strcmp(arg, "--cached")) {
138 show_cached = 1;
139 continue;
141 if (!strcmp(arg, "--deleted")) {
142 show_deleted = 1;
143 continue;
145 if (!strcmp(arg, "--others")) {
146 show_others = 1;
147 continue;
149 if (!strcmp(arg, "--ignored")) {
150 show_ignored = 1;
151 continue;
154 usage("show-files (--[cached|deleted|others|ignoded])*");
157 /* With no flags, we default to showing the cached files */
158 if (!(show_cached | show_deleted | show_others | show_ignored))
159 show_cached = 1;
161 read_cache();
162 show_files();
163 return 0;