Linus Torvalds | 8695c8b | 2005-04-11 18:55:38 -0700 | [diff] [blame] | 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. |
| 5 | * |
| 6 | * Copyright (C) Linus Torvalds, 2005 |
| 7 | */ |
Linus Torvalds | 8695c8b | 2005-04-11 18:55:38 -0700 | [diff] [blame] | 8 | #include "cache.h" |
Junio C Hamano | 22ddf71 | 2005-10-14 21:56:46 -0700 | [diff] [blame] | 9 | #include "quote.h" |
Linus Torvalds | 453ec4b | 2006-05-16 19:02:14 -0700 | [diff] [blame] | 10 | #include "dir.h" |
Peter Eriksen | 0864f26 | 2006-05-23 14:15:29 +0200 | [diff] [blame] | 11 | #include "builtin.h" |
Junio C Hamano | 64586e7 | 2007-09-12 16:04:22 -0700 | [diff] [blame] | 12 | #include "tree.h" |
Miklos Vajna | ce8e880 | 2009-02-17 15:27:11 +0100 | [diff] [blame] | 13 | #include "parse-options.h" |
Junio C Hamano | 9d9a2f4 | 2009-12-25 10:08:04 -0800 | [diff] [blame] | 14 | #include "resolve-undo.h" |
| 15 | #include "string-list.h" |
Linus Torvalds | 8695c8b | 2005-04-11 18:55:38 -0700 | [diff] [blame] | 16 | |
David Rientjes | 96f1e58 | 2006-08-15 10:23:48 -0700 | [diff] [blame] | 17 | static int abbrev; |
| 18 | static int show_deleted; |
| 19 | static int show_cached; |
| 20 | static int show_others; |
| 21 | static int show_stage; |
| 22 | static int show_unmerged; |
Junio C Hamano | 9d9a2f4 | 2009-12-25 10:08:04 -0800 | [diff] [blame] | 23 | static int show_resolve_undo; |
David Rientjes | 96f1e58 | 2006-08-15 10:23:48 -0700 | [diff] [blame] | 24 | static int show_modified; |
| 25 | static int show_killed; |
| 26 | static int show_valid_bit; |
Junio C Hamano | b83c834 | 2005-04-15 11:11:01 -0700 | [diff] [blame] | 27 | static int line_terminator = '\n'; |
Thomas Rast | 8497421 | 2010-07-31 00:35:59 +0200 | [diff] [blame] | 28 | static int debug_mode; |
Linus Torvalds | 8695c8b | 2005-04-11 18:55:38 -0700 | [diff] [blame] | 29 | |
Clemens Buchacher | efad1a5 | 2010-06-03 15:39:18 +0200 | [diff] [blame] | 30 | static const char *prefix; |
| 31 | static int max_prefix_len; |
David Rientjes | 96f1e58 | 2006-08-15 10:23:48 -0700 | [diff] [blame] | 32 | static int prefix_len; |
David Rientjes | 96f1e58 | 2006-08-15 10:23:48 -0700 | [diff] [blame] | 33 | static const char **pathspec; |
| 34 | static int error_unmatch; |
| 35 | static char *ps_matched; |
Junio C Hamano | 64586e7 | 2007-09-12 16:04:22 -0700 | [diff] [blame] | 36 | static const char *with_tree; |
Miklos Vajna | ce8e880 | 2009-02-17 15:27:11 +0100 | [diff] [blame] | 37 | static int exc_given; |
Linus Torvalds | 5be4efb | 2005-08-21 12:55:33 -0700 | [diff] [blame] | 38 | |
Petr Baudis | 20d37ef | 2005-04-21 19:47:08 -0700 | [diff] [blame] | 39 | static const char *tag_cached = ""; |
| 40 | static const char *tag_unmerged = ""; |
| 41 | static const char *tag_removed = ""; |
| 42 | static const char *tag_other = ""; |
Junio C Hamano | 6ca4594 | 2005-05-12 17:17:54 -0700 | [diff] [blame] | 43 | static const char *tag_killed = ""; |
Junio C Hamano | b039189 | 2005-09-19 15:11:15 -0700 | [diff] [blame] | 44 | static const char *tag_modified = ""; |
Nguyễn Thái Ngọc Duy | 44a3691 | 2009-08-20 20:46:57 +0700 | [diff] [blame] | 45 | static const char *tag_skip_worktree = ""; |
Junio C Hamano | 9d9a2f4 | 2009-12-25 10:08:04 -0800 | [diff] [blame] | 46 | static const char *tag_resolve_undo = ""; |
Petr Baudis | 20d37ef | 2005-04-21 19:47:08 -0700 | [diff] [blame] | 47 | |
Clemens Buchacher | efad1a5 | 2010-06-03 15:39:18 +0200 | [diff] [blame] | 48 | static void write_name(const char* name, size_t len) |
| 49 | { |
| 50 | write_name_quoted_relative(name, len, prefix, prefix_len, stdout, |
| 51 | line_terminator); |
| 52 | } |
| 53 | |
Linus Torvalds | 453ec4b | 2006-05-16 19:02:14 -0700 | [diff] [blame] | 54 | static void show_dir_entry(const char *tag, struct dir_entry *ent) |
Linus Torvalds | 5be4efb | 2005-08-21 12:55:33 -0700 | [diff] [blame] | 55 | { |
Clemens Buchacher | efad1a5 | 2010-06-03 15:39:18 +0200 | [diff] [blame] | 56 | int len = max_prefix_len; |
Linus Torvalds | 5be4efb | 2005-08-21 12:55:33 -0700 | [diff] [blame] | 57 | |
| 58 | if (len >= ent->len) |
Junio C Hamano | 7e44c93 | 2008-08-31 09:39:19 -0700 | [diff] [blame] | 59 | die("git ls-files: internal error - directory entry not superset of prefix"); |
Linus Torvalds | 5be4efb | 2005-08-21 12:55:33 -0700 | [diff] [blame] | 60 | |
Clemens Buchacher | 0b50922 | 2009-01-14 15:54:35 +0100 | [diff] [blame] | 61 | if (!match_pathspec(pathspec, ent->name, ent->len, len, ps_matched)) |
Linus Torvalds | 5be4efb | 2005-08-21 12:55:33 -0700 | [diff] [blame] | 62 | return; |
| 63 | |
Junio C Hamano | 22ddf71 | 2005-10-14 21:56:46 -0700 | [diff] [blame] | 64 | fputs(tag, stdout); |
Clemens Buchacher | efad1a5 | 2010-06-03 15:39:18 +0200 | [diff] [blame] | 65 | write_name(ent->name, ent->len); |
Linus Torvalds | 5be4efb | 2005-08-21 12:55:33 -0700 | [diff] [blame] | 66 | } |
| 67 | |
Linus Torvalds | 453ec4b | 2006-05-16 19:02:14 -0700 | [diff] [blame] | 68 | static void show_other_files(struct dir_struct *dir) |
Junio C Hamano | fcbc308 | 2005-11-06 17:26:31 -0800 | [diff] [blame] | 69 | { |
| 70 | int i; |
Linus Torvalds | 5698454 | 2007-04-14 16:22:08 -0700 | [diff] [blame] | 71 | |
Linus Torvalds | 453ec4b | 2006-05-16 19:02:14 -0700 | [diff] [blame] | 72 | for (i = 0; i < dir->nr; i++) { |
Linus Torvalds | 453ec4b | 2006-05-16 19:02:14 -0700 | [diff] [blame] | 73 | struct dir_entry *ent = dir->entries[i]; |
Jeff King | 98fa473 | 2008-10-16 11:07:26 -0400 | [diff] [blame] | 74 | if (!cache_name_is_other(ent->name, ent->len)) |
| 75 | continue; |
Junio C Hamano | fcbc308 | 2005-11-06 17:26:31 -0800 | [diff] [blame] | 76 | show_dir_entry(tag_other, ent); |
| 77 | } |
| 78 | } |
| 79 | |
Linus Torvalds | 453ec4b | 2006-05-16 19:02:14 -0700 | [diff] [blame] | 80 | static void show_killed_files(struct dir_struct *dir) |
Junio C Hamano | 6ca4594 | 2005-05-12 17:17:54 -0700 | [diff] [blame] | 81 | { |
| 82 | int i; |
Linus Torvalds | 453ec4b | 2006-05-16 19:02:14 -0700 | [diff] [blame] | 83 | for (i = 0; i < dir->nr; i++) { |
| 84 | struct dir_entry *ent = dir->entries[i]; |
Junio C Hamano | 6ca4594 | 2005-05-12 17:17:54 -0700 | [diff] [blame] | 85 | char *cp, *sp; |
| 86 | int pos, len, killed = 0; |
| 87 | |
| 88 | for (cp = ent->name; cp - ent->name < ent->len; cp = sp + 1) { |
| 89 | sp = strchr(cp, '/'); |
| 90 | if (!sp) { |
| 91 | /* If ent->name is prefix of an entry in the |
| 92 | * cache, it will be killed. |
| 93 | */ |
| 94 | pos = cache_name_pos(ent->name, ent->len); |
| 95 | if (0 <= pos) |
| 96 | die("bug in show-killed-files"); |
| 97 | pos = -pos - 1; |
| 98 | while (pos < active_nr && |
| 99 | ce_stage(active_cache[pos])) |
| 100 | pos++; /* skip unmerged */ |
| 101 | if (active_nr <= pos) |
| 102 | break; |
| 103 | /* pos points at a name immediately after |
| 104 | * ent->name in the cache. Does it expect |
| 105 | * ent->name to be a directory? |
| 106 | */ |
| 107 | len = ce_namelen(active_cache[pos]); |
| 108 | if ((ent->len < len) && |
| 109 | !strncmp(active_cache[pos]->name, |
| 110 | ent->name, ent->len) && |
| 111 | active_cache[pos]->name[ent->len] == '/') |
| 112 | killed = 1; |
| 113 | break; |
| 114 | } |
| 115 | if (0 <= cache_name_pos(ent->name, sp - ent->name)) { |
| 116 | /* If any of the leading directories in |
| 117 | * ent->name is registered in the cache, |
| 118 | * ent->name will be killed. |
| 119 | */ |
| 120 | killed = 1; |
| 121 | break; |
| 122 | } |
| 123 | } |
| 124 | if (killed) |
Linus Torvalds | 453ec4b | 2006-05-16 19:02:14 -0700 | [diff] [blame] | 125 | show_dir_entry(tag_killed, dir->entries[i]); |
Junio C Hamano | 6ca4594 | 2005-05-12 17:17:54 -0700 | [diff] [blame] | 126 | } |
Linus Torvalds | 8695c8b | 2005-04-11 18:55:38 -0700 | [diff] [blame] | 127 | } |
| 128 | |
Linus Torvalds | 5be4efb | 2005-08-21 12:55:33 -0700 | [diff] [blame] | 129 | static void show_ce_entry(const char *tag, struct cache_entry *ce) |
| 130 | { |
Clemens Buchacher | efad1a5 | 2010-06-03 15:39:18 +0200 | [diff] [blame] | 131 | int len = max_prefix_len; |
Linus Torvalds | 5be4efb | 2005-08-21 12:55:33 -0700 | [diff] [blame] | 132 | |
| 133 | if (len >= ce_namelen(ce)) |
Junio C Hamano | 7e44c93 | 2008-08-31 09:39:19 -0700 | [diff] [blame] | 134 | die("git ls-files: internal error - cache entry not superset of prefix"); |
Linus Torvalds | 5be4efb | 2005-08-21 12:55:33 -0700 | [diff] [blame] | 135 | |
Clemens Buchacher | 0b50922 | 2009-01-14 15:54:35 +0100 | [diff] [blame] | 136 | if (!match_pathspec(pathspec, ce->name, ce_namelen(ce), len, ps_matched)) |
Linus Torvalds | 5be4efb | 2005-08-21 12:55:33 -0700 | [diff] [blame] | 137 | return; |
| 138 | |
Junio C Hamano | 8bb2e03 | 2006-02-12 01:47:57 -0800 | [diff] [blame] | 139 | if (tag && *tag && show_valid_bit && |
Linus Torvalds | 7a51ed6 | 2008-01-14 16:03:17 -0800 | [diff] [blame] | 140 | (ce->ce_flags & CE_VALID)) { |
Junio C Hamano | 2bcab24 | 2006-02-08 21:50:18 -0800 | [diff] [blame] | 141 | static char alttag[4]; |
| 142 | memcpy(alttag, tag, 3); |
| 143 | if (isalpha(tag[0])) |
| 144 | alttag[0] = tolower(tag[0]); |
| 145 | else if (tag[0] == '?') |
| 146 | alttag[0] = '!'; |
| 147 | else { |
| 148 | alttag[0] = 'v'; |
| 149 | alttag[1] = tag[0]; |
| 150 | alttag[2] = ' '; |
| 151 | alttag[3] = 0; |
| 152 | } |
| 153 | tag = alttag; |
| 154 | } |
| 155 | |
Junio C Hamano | 22ddf71 | 2005-10-14 21:56:46 -0700 | [diff] [blame] | 156 | if (!show_stage) { |
| 157 | fputs(tag, stdout); |
Pierre Habouzit | 663af34 | 2007-09-20 00:42:15 +0200 | [diff] [blame] | 158 | } else { |
Junio C Hamano | 22ddf71 | 2005-10-14 21:56:46 -0700 | [diff] [blame] | 159 | printf("%s%06o %s %d\t", |
Linus Torvalds | 5be4efb | 2005-08-21 12:55:33 -0700 | [diff] [blame] | 160 | tag, |
Linus Torvalds | 7a51ed6 | 2008-01-14 16:03:17 -0800 | [diff] [blame] | 161 | ce->ce_mode, |
Erik Faye-Lund | 531e758 | 2010-03-20 19:55:28 +0100 | [diff] [blame] | 162 | find_unique_abbrev(ce->sha1,abbrev), |
Junio C Hamano | 22ddf71 | 2005-10-14 21:56:46 -0700 | [diff] [blame] | 163 | ce_stage(ce)); |
Junio C Hamano | 22ddf71 | 2005-10-14 21:56:46 -0700 | [diff] [blame] | 164 | } |
Clemens Buchacher | efad1a5 | 2010-06-03 15:39:18 +0200 | [diff] [blame] | 165 | write_name(ce->name, ce_namelen(ce)); |
Thomas Rast | 8497421 | 2010-07-31 00:35:59 +0200 | [diff] [blame] | 166 | if (debug_mode) { |
| 167 | printf(" ctime: %d:%d\n", ce->ce_ctime.sec, ce->ce_ctime.nsec); |
| 168 | printf(" mtime: %d:%d\n", ce->ce_mtime.sec, ce->ce_mtime.nsec); |
| 169 | printf(" dev: %d\tino: %d\n", ce->ce_dev, ce->ce_ino); |
| 170 | printf(" uid: %d\tgid: %d\n", ce->ce_uid, ce->ce_gid); |
| 171 | printf(" size: %d\tflags: %x\n", ce->ce_size, ce->ce_flags); |
| 172 | } |
Linus Torvalds | 5be4efb | 2005-08-21 12:55:33 -0700 | [diff] [blame] | 173 | } |
| 174 | |
Clemens Buchacher | efad1a5 | 2010-06-03 15:39:18 +0200 | [diff] [blame] | 175 | static void show_ru_info(void) |
Junio C Hamano | 9d9a2f4 | 2009-12-25 10:08:04 -0800 | [diff] [blame] | 176 | { |
Alex Riesen | 8a57c6e | 2010-07-03 14:41:54 +0200 | [diff] [blame] | 177 | struct string_list_item *item; |
| 178 | |
Junio C Hamano | 9d9a2f4 | 2009-12-25 10:08:04 -0800 | [diff] [blame] | 179 | if (!the_index.resolve_undo) |
| 180 | return; |
Alex Riesen | 8a57c6e | 2010-07-03 14:41:54 +0200 | [diff] [blame] | 181 | |
| 182 | for_each_string_list_item(item, the_index.resolve_undo) { |
| 183 | const char *path = item->string; |
| 184 | struct resolve_undo_info *ui = item->util; |
| 185 | int i, len; |
| 186 | |
| 187 | len = strlen(path); |
| 188 | if (len < max_prefix_len) |
| 189 | continue; /* outside of the prefix */ |
| 190 | if (!match_pathspec(pathspec, path, len, max_prefix_len, ps_matched)) |
| 191 | continue; /* uninterested */ |
| 192 | for (i = 0; i < 3; i++) { |
| 193 | if (!ui->mode[i]) |
| 194 | continue; |
| 195 | printf("%s%06o %s %d\t", tag_resolve_undo, ui->mode[i], |
| 196 | find_unique_abbrev(ui->sha1[i], abbrev), |
| 197 | i + 1); |
| 198 | write_name(path, len); |
| 199 | } |
| 200 | } |
Junio C Hamano | 9d9a2f4 | 2009-12-25 10:08:04 -0800 | [diff] [blame] | 201 | } |
| 202 | |
Clemens Buchacher | efad1a5 | 2010-06-03 15:39:18 +0200 | [diff] [blame] | 203 | static void show_files(struct dir_struct *dir) |
Linus Torvalds | 8695c8b | 2005-04-11 18:55:38 -0700 | [diff] [blame] | 204 | { |
| 205 | int i; |
| 206 | |
| 207 | /* For cached/deleted files we don't need to even do the readdir */ |
Junio C Hamano | 6ca4594 | 2005-05-12 17:17:54 -0700 | [diff] [blame] | 208 | if (show_others || show_killed) { |
Linus Torvalds | 1d8842d | 2009-05-14 13:22:36 -0700 | [diff] [blame] | 209 | fill_directory(dir, pathspec); |
Junio C Hamano | 6ca4594 | 2005-05-12 17:17:54 -0700 | [diff] [blame] | 210 | if (show_others) |
Linus Torvalds | 453ec4b | 2006-05-16 19:02:14 -0700 | [diff] [blame] | 211 | show_other_files(dir); |
Junio C Hamano | 6ca4594 | 2005-05-12 17:17:54 -0700 | [diff] [blame] | 212 | if (show_killed) |
Linus Torvalds | 453ec4b | 2006-05-16 19:02:14 -0700 | [diff] [blame] | 213 | show_killed_files(dir); |
Linus Torvalds | 8695c8b | 2005-04-11 18:55:38 -0700 | [diff] [blame] | 214 | } |
Junio C Hamano | aee4619 | 2005-04-16 08:33:23 -0700 | [diff] [blame] | 215 | if (show_cached | show_stage) { |
Linus Torvalds | 8695c8b | 2005-04-11 18:55:38 -0700 | [diff] [blame] | 216 | for (i = 0; i < active_nr; i++) { |
| 217 | struct cache_entry *ce = active_cache[i]; |
Jeff King | 500348a | 2009-10-30 15:05:52 -0400 | [diff] [blame] | 218 | int dtype = ce_to_dtype(ce); |
| 219 | if (dir->flags & DIR_SHOW_IGNORED && |
| 220 | !excluded(dir, ce->name, &dtype)) |
| 221 | continue; |
Linus Torvalds | eec8c63 | 2005-04-16 12:43:32 -0700 | [diff] [blame] | 222 | if (show_unmerged && !ce_stage(ce)) |
| 223 | continue; |
Linus Torvalds | 7a51ed6 | 2008-01-14 16:03:17 -0800 | [diff] [blame] | 224 | if (ce->ce_flags & CE_UPDATE) |
Junio C Hamano | 64586e7 | 2007-09-12 16:04:22 -0700 | [diff] [blame] | 225 | continue; |
Nguyễn Thái Ngọc Duy | 44a3691 | 2009-08-20 20:46:57 +0700 | [diff] [blame] | 226 | show_ce_entry(ce_stage(ce) ? tag_unmerged : |
| 227 | (ce_skip_worktree(ce) ? tag_skip_worktree : tag_cached), ce); |
Linus Torvalds | 8695c8b | 2005-04-11 18:55:38 -0700 | [diff] [blame] | 228 | } |
| 229 | } |
Junio C Hamano | b039189 | 2005-09-19 15:11:15 -0700 | [diff] [blame] | 230 | if (show_deleted | show_modified) { |
Linus Torvalds | 8695c8b | 2005-04-11 18:55:38 -0700 | [diff] [blame] | 231 | for (i = 0; i < active_nr; i++) { |
| 232 | struct cache_entry *ce = active_cache[i]; |
| 233 | struct stat st; |
Junio C Hamano | b039189 | 2005-09-19 15:11:15 -0700 | [diff] [blame] | 234 | int err; |
Jeff King | 500348a | 2009-10-30 15:05:52 -0400 | [diff] [blame] | 235 | int dtype = ce_to_dtype(ce); |
| 236 | if (dir->flags & DIR_SHOW_IGNORED && |
| 237 | !excluded(dir, ce->name, &dtype)) |
| 238 | continue; |
Junio C Hamano | 4b4e26d | 2008-11-16 00:10:25 -0800 | [diff] [blame] | 239 | if (ce->ce_flags & CE_UPDATE) |
| 240 | continue; |
Nguyễn Thái Ngọc Duy | b4d1690 | 2009-08-20 20:46:58 +0700 | [diff] [blame] | 241 | if (ce_skip_worktree(ce)) |
| 242 | continue; |
Junio C Hamano | b039189 | 2005-09-19 15:11:15 -0700 | [diff] [blame] | 243 | err = lstat(ce->name, &st); |
| 244 | if (show_deleted && err) |
| 245 | show_ce_entry(tag_removed, ce); |
Junio C Hamano | 2bcab24 | 2006-02-08 21:50:18 -0800 | [diff] [blame] | 246 | if (show_modified && ce_modified(ce, &st, 0)) |
Junio C Hamano | b039189 | 2005-09-19 15:11:15 -0700 | [diff] [blame] | 247 | show_ce_entry(tag_modified, ce); |
Linus Torvalds | 8695c8b | 2005-04-11 18:55:38 -0700 | [diff] [blame] | 248 | } |
| 249 | } |
Linus Torvalds | 8695c8b | 2005-04-11 18:55:38 -0700 | [diff] [blame] | 250 | } |
| 251 | |
Linus Torvalds | 5be4efb | 2005-08-21 12:55:33 -0700 | [diff] [blame] | 252 | /* |
| 253 | * Prune the index to only contain stuff starting with "prefix" |
| 254 | */ |
Linus Torvalds | 3e04228 | 2006-07-31 13:13:55 -0700 | [diff] [blame] | 255 | static void prune_cache(const char *prefix) |
Linus Torvalds | 5be4efb | 2005-08-21 12:55:33 -0700 | [diff] [blame] | 256 | { |
Clemens Buchacher | efad1a5 | 2010-06-03 15:39:18 +0200 | [diff] [blame] | 257 | int pos = cache_name_pos(prefix, max_prefix_len); |
Linus Torvalds | 5be4efb | 2005-08-21 12:55:33 -0700 | [diff] [blame] | 258 | unsigned int first, last; |
| 259 | |
| 260 | if (pos < 0) |
| 261 | pos = -pos-1; |
Keith Packard | 95af39f | 2007-10-02 22:44:15 -0700 | [diff] [blame] | 262 | memmove(active_cache, active_cache + pos, |
| 263 | (active_nr - pos) * sizeof(struct cache_entry *)); |
Linus Torvalds | 5be4efb | 2005-08-21 12:55:33 -0700 | [diff] [blame] | 264 | active_nr -= pos; |
| 265 | first = 0; |
| 266 | last = active_nr; |
| 267 | while (last > first) { |
| 268 | int next = (last + first) >> 1; |
| 269 | struct cache_entry *ce = active_cache[next]; |
Clemens Buchacher | efad1a5 | 2010-06-03 15:39:18 +0200 | [diff] [blame] | 270 | if (!strncmp(ce->name, prefix, max_prefix_len)) { |
Linus Torvalds | 5be4efb | 2005-08-21 12:55:33 -0700 | [diff] [blame] | 271 | first = next+1; |
| 272 | continue; |
| 273 | } |
| 274 | last = next; |
| 275 | } |
| 276 | active_nr = last; |
| 277 | } |
| 278 | |
Clemens Buchacher | efad1a5 | 2010-06-03 15:39:18 +0200 | [diff] [blame] | 279 | static const char *pathspec_prefix(const char *prefix) |
Linus Torvalds | 5be4efb | 2005-08-21 12:55:33 -0700 | [diff] [blame] | 280 | { |
Linus Torvalds | 56fc510 | 2005-08-21 17:27:50 -0700 | [diff] [blame] | 281 | const char **p, *n, *prev; |
Linus Torvalds | 56fc510 | 2005-08-21 17:27:50 -0700 | [diff] [blame] | 282 | unsigned long max; |
Linus Torvalds | 5be4efb | 2005-08-21 12:55:33 -0700 | [diff] [blame] | 283 | |
Clemens Buchacher | efad1a5 | 2010-06-03 15:39:18 +0200 | [diff] [blame] | 284 | if (!pathspec) { |
| 285 | max_prefix_len = prefix ? strlen(prefix) : 0; |
| 286 | return prefix; |
| 287 | } |
| 288 | |
Linus Torvalds | 56fc510 | 2005-08-21 17:27:50 -0700 | [diff] [blame] | 289 | prev = NULL; |
| 290 | max = PATH_MAX; |
| 291 | for (p = pathspec; (n = *p) != NULL; p++) { |
| 292 | int i, len = 0; |
| 293 | for (i = 0; i < max; i++) { |
| 294 | char c = n[i]; |
| 295 | if (prev && prev[i] != c) |
| 296 | break; |
Linus Torvalds | 5690614 | 2005-08-23 17:14:13 -0700 | [diff] [blame] | 297 | if (!c || c == '*' || c == '?') |
Linus Torvalds | 56fc510 | 2005-08-21 17:27:50 -0700 | [diff] [blame] | 298 | break; |
| 299 | if (c == '/') |
| 300 | len = i+1; |
| 301 | } |
| 302 | prev = n; |
| 303 | if (len < max) { |
| 304 | max = len; |
| 305 | if (!max) |
| 306 | break; |
| 307 | } |
Linus Torvalds | 5be4efb | 2005-08-21 12:55:33 -0700 | [diff] [blame] | 308 | } |
Linus Torvalds | 56fc510 | 2005-08-21 17:27:50 -0700 | [diff] [blame] | 309 | |
Clemens Buchacher | efad1a5 | 2010-06-03 15:39:18 +0200 | [diff] [blame] | 310 | max_prefix_len = max; |
Pierre Habouzit | 182af83 | 2007-09-16 00:32:36 +0200 | [diff] [blame] | 311 | return max ? xmemdupz(prev, max) : NULL; |
Linus Torvalds | 5be4efb | 2005-08-21 12:55:33 -0700 | [diff] [blame] | 312 | } |
| 313 | |
Johannes Schindelin | f3670a5 | 2009-02-07 14:43:03 +0100 | [diff] [blame] | 314 | static void strip_trailing_slash_from_submodules(void) |
| 315 | { |
| 316 | const char **p; |
| 317 | |
| 318 | for (p = pathspec; *p != NULL; p++) { |
| 319 | int len = strlen(*p), pos; |
| 320 | |
| 321 | if (len < 1 || (*p)[len - 1] != '/') |
| 322 | continue; |
| 323 | pos = cache_name_pos(*p, len - 1); |
| 324 | if (pos >= 0 && S_ISGITLINK(active_cache[pos]->ce_mode)) |
| 325 | *p = xstrndup(*p, len - 1); |
| 326 | } |
| 327 | } |
| 328 | |
Junio C Hamano | 64586e7 | 2007-09-12 16:04:22 -0700 | [diff] [blame] | 329 | /* |
| 330 | * Read the tree specified with --with-tree option |
| 331 | * (typically, HEAD) into stage #1 and then |
| 332 | * squash them down to stage #0. This is used for |
| 333 | * --error-unmatch to list and check the path patterns |
| 334 | * that were given from the command line. We are not |
| 335 | * going to write this index out. |
| 336 | */ |
Junio C Hamano | ee425e4 | 2007-11-18 01:13:32 -0800 | [diff] [blame] | 337 | void overlay_tree_on_cache(const char *tree_name, const char *prefix) |
Junio C Hamano | 64586e7 | 2007-09-12 16:04:22 -0700 | [diff] [blame] | 338 | { |
| 339 | struct tree *tree; |
| 340 | unsigned char sha1[20]; |
Nguyễn Thái Ngọc Duy | f0096c0 | 2011-03-25 16:34:19 +0700 | [diff] [blame] | 341 | struct pathspec pathspec; |
Junio C Hamano | 64586e7 | 2007-09-12 16:04:22 -0700 | [diff] [blame] | 342 | struct cache_entry *last_stage0 = NULL; |
| 343 | int i; |
| 344 | |
| 345 | if (get_sha1(tree_name, sha1)) |
| 346 | die("tree-ish %s not found.", tree_name); |
| 347 | tree = parse_tree_indirect(sha1); |
| 348 | if (!tree) |
| 349 | die("bad tree-ish %s", tree_name); |
| 350 | |
| 351 | /* Hoist the unmerged entries up to stage #3 to make room */ |
| 352 | for (i = 0; i < active_nr; i++) { |
| 353 | struct cache_entry *ce = active_cache[i]; |
| 354 | if (!ce_stage(ce)) |
| 355 | continue; |
Linus Torvalds | 7a51ed6 | 2008-01-14 16:03:17 -0800 | [diff] [blame] | 356 | ce->ce_flags |= CE_STAGEMASK; |
Junio C Hamano | 64586e7 | 2007-09-12 16:04:22 -0700 | [diff] [blame] | 357 | } |
| 358 | |
| 359 | if (prefix) { |
| 360 | static const char *(matchbuf[2]); |
| 361 | matchbuf[0] = prefix; |
Junio C Hamano | 07e77e4 | 2008-11-16 00:15:43 -0800 | [diff] [blame] | 362 | matchbuf[1] = NULL; |
Nguyễn Thái Ngọc Duy | f0096c0 | 2011-03-25 16:34:19 +0700 | [diff] [blame] | 363 | init_pathspec(&pathspec, matchbuf); |
Junio C Hamano | 33e0f62 | 2011-04-05 09:30:36 -0700 | [diff] [blame] | 364 | pathspec.items[0].use_wildcard = 0; |
Junio C Hamano | 64586e7 | 2007-09-12 16:04:22 -0700 | [diff] [blame] | 365 | } else |
Nguyễn Thái Ngọc Duy | f0096c0 | 2011-03-25 16:34:19 +0700 | [diff] [blame] | 366 | init_pathspec(&pathspec, NULL); |
| 367 | if (read_tree(tree, 1, &pathspec)) |
Junio C Hamano | 64586e7 | 2007-09-12 16:04:22 -0700 | [diff] [blame] | 368 | die("unable to read tree entries %s", tree_name); |
| 369 | |
| 370 | for (i = 0; i < active_nr; i++) { |
| 371 | struct cache_entry *ce = active_cache[i]; |
| 372 | switch (ce_stage(ce)) { |
| 373 | case 0: |
| 374 | last_stage0 = ce; |
| 375 | /* fallthru */ |
| 376 | default: |
| 377 | continue; |
| 378 | case 1: |
| 379 | /* |
| 380 | * If there is stage #0 entry for this, we do not |
| 381 | * need to show it. We use CE_UPDATE bit to mark |
| 382 | * such an entry. |
| 383 | */ |
| 384 | if (last_stage0 && |
| 385 | !strcmp(last_stage0->name, ce->name)) |
Linus Torvalds | 7a51ed6 | 2008-01-14 16:03:17 -0800 | [diff] [blame] | 386 | ce->ce_flags |= CE_UPDATE; |
Junio C Hamano | 64586e7 | 2007-09-12 16:04:22 -0700 | [diff] [blame] | 387 | } |
| 388 | } |
| 389 | } |
| 390 | |
Clemens Buchacher | efad1a5 | 2010-06-03 15:39:18 +0200 | [diff] [blame] | 391 | int report_path_error(const char *ps_matched, const char **pathspec, int prefix_len) |
Junio C Hamano | ee425e4 | 2007-11-18 01:13:32 -0800 | [diff] [blame] | 392 | { |
| 393 | /* |
| 394 | * Make sure all pathspec matched; otherwise it is an error. |
| 395 | */ |
| 396 | int num, errors = 0; |
| 397 | for (num = 0; pathspec[num]; num++) { |
| 398 | int other, found_dup; |
| 399 | |
| 400 | if (ps_matched[num]) |
| 401 | continue; |
| 402 | /* |
| 403 | * The caller might have fed identical pathspec |
| 404 | * twice. Do not barf on such a mistake. |
| 405 | */ |
| 406 | for (found_dup = other = 0; |
| 407 | !found_dup && pathspec[other]; |
| 408 | other++) { |
| 409 | if (other == num || !ps_matched[other]) |
| 410 | continue; |
| 411 | if (!strcmp(pathspec[other], pathspec[num])) |
| 412 | /* |
| 413 | * Ok, we have a match already. |
| 414 | */ |
| 415 | found_dup = 1; |
| 416 | } |
| 417 | if (found_dup) |
| 418 | continue; |
| 419 | |
| 420 | error("pathspec '%s' did not match any file(s) known to git.", |
Clemens Buchacher | efad1a5 | 2010-06-03 15:39:18 +0200 | [diff] [blame] | 421 | pathspec[num] + prefix_len); |
Junio C Hamano | ee425e4 | 2007-11-18 01:13:32 -0800 | [diff] [blame] | 422 | errors++; |
| 423 | } |
| 424 | return errors; |
| 425 | } |
| 426 | |
Miklos Vajna | ce8e880 | 2009-02-17 15:27:11 +0100 | [diff] [blame] | 427 | static const char * const ls_files_usage[] = { |
Štěpán Němec | 0adda93 | 2010-10-08 19:31:17 +0200 | [diff] [blame] | 428 | "git ls-files [options] [<file>...]", |
Miklos Vajna | ce8e880 | 2009-02-17 15:27:11 +0100 | [diff] [blame] | 429 | NULL |
| 430 | }; |
| 431 | |
| 432 | static int option_parse_z(const struct option *opt, |
| 433 | const char *arg, int unset) |
| 434 | { |
| 435 | line_terminator = unset ? '\n' : '\0'; |
| 436 | |
| 437 | return 0; |
| 438 | } |
| 439 | |
| 440 | static int option_parse_exclude(const struct option *opt, |
| 441 | const char *arg, int unset) |
| 442 | { |
| 443 | struct exclude_list *list = opt->value; |
| 444 | |
| 445 | exc_given = 1; |
| 446 | add_exclude(arg, "", 0, list); |
| 447 | |
| 448 | return 0; |
| 449 | } |
| 450 | |
| 451 | static int option_parse_exclude_from(const struct option *opt, |
| 452 | const char *arg, int unset) |
| 453 | { |
| 454 | struct dir_struct *dir = opt->value; |
| 455 | |
| 456 | exc_given = 1; |
| 457 | add_excludes_from_file(dir, arg); |
| 458 | |
| 459 | return 0; |
| 460 | } |
| 461 | |
| 462 | static int option_parse_exclude_standard(const struct option *opt, |
| 463 | const char *arg, int unset) |
| 464 | { |
| 465 | struct dir_struct *dir = opt->value; |
| 466 | |
| 467 | exc_given = 1; |
| 468 | setup_standard_excludes(dir); |
| 469 | |
| 470 | return 0; |
| 471 | } |
Nicolas Pitre | cf9a113 | 2005-04-28 15:06:25 -0700 | [diff] [blame] | 472 | |
Clemens Buchacher | efad1a5 | 2010-06-03 15:39:18 +0200 | [diff] [blame] | 473 | int cmd_ls_files(int argc, const char **argv, const char *cmd_prefix) |
Linus Torvalds | 8695c8b | 2005-04-11 18:55:38 -0700 | [diff] [blame] | 474 | { |
Miklos Vajna | ce8e880 | 2009-02-17 15:27:11 +0100 | [diff] [blame] | 475 | int require_work_tree = 0, show_tag = 0; |
Clemens Buchacher | efad1a5 | 2010-06-03 15:39:18 +0200 | [diff] [blame] | 476 | const char *max_prefix; |
Linus Torvalds | 453ec4b | 2006-05-16 19:02:14 -0700 | [diff] [blame] | 477 | struct dir_struct dir; |
Miklos Vajna | ce8e880 | 2009-02-17 15:27:11 +0100 | [diff] [blame] | 478 | struct option builtin_ls_files_options[] = { |
| 479 | { OPTION_CALLBACK, 'z', NULL, NULL, NULL, |
| 480 | "paths are separated with NUL character", |
| 481 | PARSE_OPT_NOARG, option_parse_z }, |
| 482 | OPT_BOOLEAN('t', NULL, &show_tag, |
| 483 | "identify the file status with tags"), |
| 484 | OPT_BOOLEAN('v', NULL, &show_valid_bit, |
| 485 | "use lowercase letters for 'assume unchanged' files"), |
| 486 | OPT_BOOLEAN('c', "cached", &show_cached, |
| 487 | "show cached files in the output (default)"), |
| 488 | OPT_BOOLEAN('d', "deleted", &show_deleted, |
| 489 | "show deleted files in the output"), |
| 490 | OPT_BOOLEAN('m', "modified", &show_modified, |
| 491 | "show modified files in the output"), |
| 492 | OPT_BOOLEAN('o', "others", &show_others, |
| 493 | "show other files in the output"), |
| 494 | OPT_BIT('i', "ignored", &dir.flags, |
| 495 | "show ignored files in the output", |
| 496 | DIR_SHOW_IGNORED), |
| 497 | OPT_BOOLEAN('s', "stage", &show_stage, |
| 498 | "show staged contents' object name in the output"), |
| 499 | OPT_BOOLEAN('k', "killed", &show_killed, |
| 500 | "show files on the filesystem that need to be removed"), |
| 501 | OPT_BIT(0, "directory", &dir.flags, |
| 502 | "show 'other' directories' name only", |
| 503 | DIR_SHOW_OTHER_DIRECTORIES), |
Jeff King | e9008b9 | 2009-05-08 01:01:17 -0400 | [diff] [blame] | 504 | OPT_NEGBIT(0, "empty-directory", &dir.flags, |
Jeff King | 2fb6d6d | 2009-03-07 20:27:22 -0500 | [diff] [blame] | 505 | "don't show empty directories", |
Miklos Vajna | ce8e880 | 2009-02-17 15:27:11 +0100 | [diff] [blame] | 506 | DIR_HIDE_EMPTY_DIRECTORIES), |
| 507 | OPT_BOOLEAN('u', "unmerged", &show_unmerged, |
| 508 | "show unmerged files in the output"), |
Junio C Hamano | 9d9a2f4 | 2009-12-25 10:08:04 -0800 | [diff] [blame] | 509 | OPT_BOOLEAN(0, "resolve-undo", &show_resolve_undo, |
| 510 | "show resolve-undo information"), |
Miklos Vajna | ce8e880 | 2009-02-17 15:27:11 +0100 | [diff] [blame] | 511 | { OPTION_CALLBACK, 'x', "exclude", &dir.exclude_list[EXC_CMDL], "pattern", |
| 512 | "skip files matching pattern", |
| 513 | 0, option_parse_exclude }, |
| 514 | { OPTION_CALLBACK, 'X', "exclude-from", &dir, "file", |
| 515 | "exclude patterns are read from <file>", |
| 516 | 0, option_parse_exclude_from }, |
| 517 | OPT_STRING(0, "exclude-per-directory", &dir.exclude_per_dir, "file", |
| 518 | "read additional per-directory exclude patterns in <file>"), |
| 519 | { OPTION_CALLBACK, 0, "exclude-standard", &dir, NULL, |
| 520 | "add the standard git exclusions", |
| 521 | PARSE_OPT_NOARG, option_parse_exclude_standard }, |
Clemens Buchacher | efad1a5 | 2010-06-03 15:39:18 +0200 | [diff] [blame] | 522 | { OPTION_SET_INT, 0, "full-name", &prefix_len, NULL, |
Miklos Vajna | ce8e880 | 2009-02-17 15:27:11 +0100 | [diff] [blame] | 523 | "make the output relative to the project top directory", |
| 524 | PARSE_OPT_NOARG | PARSE_OPT_NONEG, NULL }, |
| 525 | OPT_BOOLEAN(0, "error-unmatch", &error_unmatch, |
| 526 | "if any <file> is not in the index, treat this as an error"), |
| 527 | OPT_STRING(0, "with-tree", &with_tree, "tree-ish", |
| 528 | "pretend that paths removed since <tree-ish> are still present"), |
| 529 | OPT__ABBREV(&abbrev), |
Thomas Rast | 8497421 | 2010-07-31 00:35:59 +0200 | [diff] [blame] | 530 | OPT_BOOLEAN(0, "debug", &debug_mode, "show debugging data"), |
Miklos Vajna | ce8e880 | 2009-02-17 15:27:11 +0100 | [diff] [blame] | 531 | OPT_END() |
| 532 | }; |
Linus Torvalds | 8695c8b | 2005-04-11 18:55:38 -0700 | [diff] [blame] | 533 | |
Nguyễn Thái Ngọc Duy | cbb3167 | 2010-10-22 01:48:14 -0500 | [diff] [blame] | 534 | if (argc == 2 && !strcmp(argv[1], "-h")) |
| 535 | usage_with_options(ls_files_usage, builtin_ls_files_options); |
| 536 | |
Linus Torvalds | 453ec4b | 2006-05-16 19:02:14 -0700 | [diff] [blame] | 537 | memset(&dir, 0, sizeof(dir)); |
Clemens Buchacher | efad1a5 | 2010-06-03 15:39:18 +0200 | [diff] [blame] | 538 | prefix = cmd_prefix; |
Linus Torvalds | 5be4efb | 2005-08-21 12:55:33 -0700 | [diff] [blame] | 539 | if (prefix) |
Clemens Buchacher | efad1a5 | 2010-06-03 15:39:18 +0200 | [diff] [blame] | 540 | prefix_len = strlen(prefix); |
Johannes Schindelin | ef90d6d | 2008-05-14 18:46:53 +0100 | [diff] [blame] | 541 | git_config(git_default_config, NULL); |
Linus Torvalds | 5be4efb | 2005-08-21 12:55:33 -0700 | [diff] [blame] | 542 | |
Nguyễn Thái Ngọc Duy | c28b3d6 | 2009-08-20 20:47:01 +0700 | [diff] [blame] | 543 | if (read_cache() < 0) |
| 544 | die("index file corrupt"); |
| 545 | |
Stephen Boyd | 3778292 | 2009-05-23 11:53:12 -0700 | [diff] [blame] | 546 | argc = parse_options(argc, argv, prefix, builtin_ls_files_options, |
Miklos Vajna | ce8e880 | 2009-02-17 15:27:11 +0100 | [diff] [blame] | 547 | ls_files_usage, 0); |
| 548 | if (show_tag || show_valid_bit) { |
| 549 | tag_cached = "H "; |
| 550 | tag_unmerged = "M "; |
| 551 | tag_removed = "R "; |
| 552 | tag_modified = "C "; |
| 553 | tag_other = "? "; |
| 554 | tag_killed = "K "; |
Nguyễn Thái Ngọc Duy | 44a3691 | 2009-08-20 20:46:57 +0700 | [diff] [blame] | 555 | tag_skip_worktree = "S "; |
Junio C Hamano | 9d9a2f4 | 2009-12-25 10:08:04 -0800 | [diff] [blame] | 556 | tag_resolve_undo = "U "; |
Nicolas Pitre | 9ff768e | 2005-04-28 11:44:04 -0700 | [diff] [blame] | 557 | } |
Junio C Hamano | de2e3b0 | 2009-03-20 14:30:51 -0700 | [diff] [blame] | 558 | if (show_modified || show_others || show_deleted || (dir.flags & DIR_SHOW_IGNORED) || show_killed) |
Miklos Vajna | ce8e880 | 2009-02-17 15:27:11 +0100 | [diff] [blame] | 559 | require_work_tree = 1; |
| 560 | if (show_unmerged) |
| 561 | /* |
| 562 | * There's no point in showing unmerged unless |
| 563 | * you also show the stage information. |
| 564 | */ |
| 565 | show_stage = 1; |
| 566 | if (dir.exclude_per_dir) |
| 567 | exc_given = 1; |
Nicolas Pitre | 9ff768e | 2005-04-28 11:44:04 -0700 | [diff] [blame] | 568 | |
Mike Hommey | 7d8ae93 | 2007-11-03 12:23:12 +0100 | [diff] [blame] | 569 | if (require_work_tree && !is_inside_work_tree()) |
| 570 | setup_work_tree(); |
Johannes Schindelin | 6d9ba67 | 2007-01-23 13:30:20 +0100 | [diff] [blame] | 571 | |
Miklos Vajna | ce8e880 | 2009-02-17 15:27:11 +0100 | [diff] [blame] | 572 | pathspec = get_pathspec(prefix, argv); |
Linus Torvalds | 56fc510 | 2005-08-21 17:27:50 -0700 | [diff] [blame] | 573 | |
Mike Ralphson | 3ea3c21 | 2009-04-17 19:13:30 +0100 | [diff] [blame] | 574 | /* be nice with submodule paths ending in a slash */ |
Johannes Schindelin | f3670a5 | 2009-02-07 14:43:03 +0100 | [diff] [blame] | 575 | if (pathspec) |
| 576 | strip_trailing_slash_from_submodules(); |
| 577 | |
Clemens Buchacher | efad1a5 | 2010-06-03 15:39:18 +0200 | [diff] [blame] | 578 | /* Find common prefix for all pathspec's */ |
| 579 | max_prefix = pathspec_prefix(prefix); |
Linus Torvalds | 5be4efb | 2005-08-21 12:55:33 -0700 | [diff] [blame] | 580 | |
Junio C Hamano | bba319b | 2006-02-14 12:40:20 -0800 | [diff] [blame] | 581 | /* Treat unmatching pathspec elements as errors */ |
| 582 | if (pathspec && error_unmatch) { |
| 583 | int num; |
| 584 | for (num = 0; pathspec[num]; num++) |
| 585 | ; |
| 586 | ps_matched = xcalloc(1, num); |
| 587 | } |
| 588 | |
Ben Walton | ac78b00 | 2009-10-08 21:53:35 -0400 | [diff] [blame] | 589 | if ((dir.flags & DIR_SHOW_IGNORED) && !exc_given) |
| 590 | die("ls-files --ignored needs some exclude pattern"); |
Linus Torvalds | 8695c8b | 2005-04-11 18:55:38 -0700 | [diff] [blame] | 591 | |
| 592 | /* With no flags, we default to showing the cached files */ |
Junio C Hamano | b039189 | 2005-09-19 15:11:15 -0700 | [diff] [blame] | 593 | if (!(show_stage | show_deleted | show_others | show_unmerged | |
Junio C Hamano | 9d9a2f4 | 2009-12-25 10:08:04 -0800 | [diff] [blame] | 594 | show_killed | show_modified | show_resolve_undo)) |
Linus Torvalds | 8695c8b | 2005-04-11 18:55:38 -0700 | [diff] [blame] | 595 | show_cached = 1; |
| 596 | |
Clemens Buchacher | efad1a5 | 2010-06-03 15:39:18 +0200 | [diff] [blame] | 597 | if (max_prefix) |
| 598 | prune_cache(max_prefix); |
Junio C Hamano | 64586e7 | 2007-09-12 16:04:22 -0700 | [diff] [blame] | 599 | if (with_tree) { |
| 600 | /* |
| 601 | * Basic sanity check; show-stages and show-unmerged |
| 602 | * would not make any sense with this option. |
| 603 | */ |
| 604 | if (show_stage || show_unmerged) |
| 605 | die("ls-files --with-tree is incompatible with -s or -u"); |
Clemens Buchacher | efad1a5 | 2010-06-03 15:39:18 +0200 | [diff] [blame] | 606 | overlay_tree_on_cache(with_tree, max_prefix); |
Junio C Hamano | 64586e7 | 2007-09-12 16:04:22 -0700 | [diff] [blame] | 607 | } |
Clemens Buchacher | efad1a5 | 2010-06-03 15:39:18 +0200 | [diff] [blame] | 608 | show_files(&dir); |
Junio C Hamano | 9d9a2f4 | 2009-12-25 10:08:04 -0800 | [diff] [blame] | 609 | if (show_resolve_undo) |
Clemens Buchacher | efad1a5 | 2010-06-03 15:39:18 +0200 | [diff] [blame] | 610 | show_ru_info(); |
Junio C Hamano | bba319b | 2006-02-14 12:40:20 -0800 | [diff] [blame] | 611 | |
| 612 | if (ps_matched) { |
Junio C Hamano | ee425e4 | 2007-11-18 01:13:32 -0800 | [diff] [blame] | 613 | int bad; |
Clemens Buchacher | efad1a5 | 2010-06-03 15:39:18 +0200 | [diff] [blame] | 614 | bad = report_path_error(ps_matched, pathspec, prefix_len); |
Junio C Hamano | ee425e4 | 2007-11-18 01:13:32 -0800 | [diff] [blame] | 615 | if (bad) |
Andreas Ericsson | ced7b82 | 2006-11-30 12:28:28 +0100 | [diff] [blame] | 616 | fprintf(stderr, "Did you forget to 'git add'?\n"); |
| 617 | |
Junio C Hamano | ee425e4 | 2007-11-18 01:13:32 -0800 | [diff] [blame] | 618 | return bad ? 1 : 0; |
Junio C Hamano | bba319b | 2006-02-14 12:40:20 -0800 | [diff] [blame] | 619 | } |
| 620 | |
Linus Torvalds | 8695c8b | 2005-04-11 18:55:38 -0700 | [diff] [blame] | 621 | return 0; |
| 622 | } |