* Copyright (C) Linus Torvalds, 2005
*/
#include "cache.h"
+#include "blob.h"
+#include "tree.h"
+#include "quote.h"
static int line_termination = '\n';
-static int recursive = 0;
+#define LS_RECURSIVE 1
+#define LS_TREE_ONLY 2
+#define LS_SHOW_TREES 4
+#define LS_NAME_ONLY 8
+static int ls_options = 0;
+const char **pathspec;
-struct path_prefix {
- struct path_prefix *prev;
- const char *name;
-};
+static const char ls_tree_usage[] =
+ "git-ls-tree [-d] [-r] [-t] [-z] [--name-only] [--name-status] <tree-ish> [path...]";
-#define DEBUG(fmt, ...)
-
-static int string_path_prefix(char *buff, size_t blen, struct path_prefix *prefix)
+static int show_recursive(const char *base, int baselen, const char *pathname)
{
- int len = 0;
- if (prefix) {
- if (prefix->prev) {
- len = string_path_prefix(buff,blen,prefix->prev);
- buff += len;
- blen -= len;
- if (blen > 0) {
- *buff = '/';
- len++;
- buff++;
- blen--;
- }
- }
- strncpy(buff,prefix->name,blen);
- return len + strlen(prefix->name);
- }
+ const char **s;
- return 0;
-}
-
-static void print_path_prefix(struct path_prefix *prefix)
-{
- if (prefix) {
- if (prefix->prev) {
- print_path_prefix(prefix->prev);
- putchar('/');
- }
- fputs(prefix->name, stdout);
- }
-}
-
-/*
- * return:
- * -1 if prefix is *not* a subset of path
- * 0 if prefix == path
- * 1 if prefix is a subset of path
- */
-static int pathcmp(const char *path, struct path_prefix *prefix)
-{
- char buff[PATH_MAX];
- int len,slen;
-
- if (prefix == NULL)
+ if (ls_options & LS_RECURSIVE)
return 1;
- len = string_path_prefix(buff, sizeof buff, prefix);
- slen = strlen(path);
+ s = pathspec;
+ if (!s)
+ return 0;
- if (slen < len)
- return -1;
+ for (;;) {
+ const char *spec = *s++;
+ int len, speclen;
- if (strncmp(path,buff,len) == 0) {
- if (slen == len)
+ if (!spec)
return 0;
- else
- return 1;
- }
-
- return -1;
-}
-
-/*
- * match may be NULL, or a *sorted* list of paths
- */
-static void list_recursive(void *buffer,
- const char *type,
- unsigned long size,
- struct path_prefix *prefix,
- char **match, int matches)
-{
- struct path_prefix this_prefix;
- this_prefix.prev = prefix;
-
- if (strcmp(type, "tree"))
- die("expected a 'tree' node");
-
- if (matches)
- recursive = 1;
-
- while (size) {
- int namelen = strlen(buffer)+1;
- void *eltbuf = NULL;
- char elttype[20];
- unsigned long eltsize;
- unsigned char *sha1 = buffer + namelen;
- char *path = strchr(buffer, ' ') + 1;
- unsigned int mode;
- const char *matched = NULL;
- int mtype = -1;
- int mindex;
-
- if (size < namelen + 20 || sscanf(buffer, "%o", &mode) != 1)
- die("corrupt 'tree' file");
- buffer = sha1 + 20;
- size -= namelen + 20;
-
- this_prefix.name = path;
- for ( mindex = 0; mindex < matches; mindex++) {
- mtype = pathcmp(match[mindex],&this_prefix);
- if (mtype >= 0) {
- matched = match[mindex];
- break;
- }
- }
-
- /*
- * If we're not matching, or if this is an exact match,
- * print out the info
- */
- if (!matches || (matched != NULL && mtype == 0)) {
- printf("%06o\t%s\t%s\t", mode,
- S_ISDIR(mode) ? "tree" : "blob",
- sha1_to_hex(sha1));
- print_path_prefix(&this_prefix);
- putchar(line_termination);
- }
-
- if (! recursive || ! S_ISDIR(mode))
+ if (strncmp(base, spec, baselen))
continue;
-
- if (matches && ! matched)
+ len = strlen(pathname);
+ spec += baselen;
+ speclen = strlen(spec);
+ if (speclen <= len)
continue;
-
- if (! (eltbuf = read_sha1_file(sha1, elttype, &eltsize)) ) {
- error("cannot read %s", sha1_to_hex(sha1));
+ if (memcmp(pathname, spec, len))
continue;
- }
-
- /* If this is an exact directory match, we may have
- * directory files following this path. Match on them.
- * Otherwise, we're at a pach subcomponent, and we need
- * to try to match again.
- */
- if (mtype == 0)
- mindex++;
-
- list_recursive(eltbuf, elttype, eltsize, &this_prefix, &match[mindex], matches-mindex);
- free(eltbuf);
+ return 1;
}
}
-static int qcmp(const void *a, const void *b)
+static int show_tree(unsigned char *sha1, const char *base, int baselen, const char *pathname, unsigned mode, int stage)
{
- return strcmp(*(char **)a, *(char **)b);
-}
-
-static int list(unsigned char *sha1,char **path)
-{
- void *buffer;
- unsigned long size;
- int npaths;
-
- for (npaths = 0; path[npaths] != NULL; npaths++)
- ;
-
- qsort(path,npaths,sizeof(char *),qcmp);
-
- buffer = read_object_with_reference(sha1, "tree", &size, NULL);
- if (!buffer)
- die("unable to read sha1 file");
- list_recursive(buffer, "tree", size, NULL, path, npaths);
- free(buffer);
- return 0;
+ int retval = 0;
+ const char *type = "blob";
+
+ if (S_ISDIR(mode)) {
+ if (show_recursive(base, baselen, pathname)) {
+ retval = READ_TREE_RECURSIVE;
+ if (!(ls_options & LS_SHOW_TREES))
+ return retval;
+ }
+ type = "tree";
+ }
+ else if (ls_options & LS_TREE_ONLY)
+ return 0;
+
+ if (!(ls_options & LS_NAME_ONLY))
+ printf("%06o %s %s\t", mode, type, sha1_to_hex(sha1));
+ write_name_quoted(base, baselen, pathname, line_termination, stdout);
+ putchar(line_termination);
+ return retval;
}
-static const char *ls_tree_usage = "git-ls-tree [-r] [-z] <key> [paths...]";
-
-int main(int argc, char **argv)
+int main(int argc, const char **argv)
{
+ const char *prefix;
unsigned char sha1[20];
+ char *buf;
+ unsigned long size;
+ prefix = setup_git_directory();
while (1 < argc && argv[1][0] == '-') {
switch (argv[1][1]) {
case 'z':
line_termination = 0;
break;
case 'r':
- recursive = 1;
+ ls_options |= LS_RECURSIVE;
+ break;
+ case 'd':
+ ls_options |= LS_TREE_ONLY;
break;
+ case 't':
+ ls_options |= LS_SHOW_TREES;
+ break;
+ case '-':
+ if (!strcmp(argv[1]+2, "name-only") ||
+ !strcmp(argv[1]+2, "name-status")) {
+ ls_options |= LS_NAME_ONLY;
+ break;
+ }
+ /* otherwise fallthru */
default:
usage(ls_tree_usage);
}
argc--; argv++;
}
+ /* -d -r should imply -t, but -d by itself should not have to. */
+ if ( (LS_TREE_ONLY|LS_RECURSIVE) ==
+ ((LS_TREE_ONLY|LS_RECURSIVE) & ls_options))
+ ls_options |= LS_SHOW_TREES;
if (argc < 2)
usage(ls_tree_usage);
if (get_sha1(argv[1], sha1) < 0)
usage(ls_tree_usage);
- if (list(sha1, &argv[2]) < 0)
- die("list failed");
+
+ pathspec = get_pathspec(prefix, argv + 2);
+ buf = read_object_with_reference(sha1, "tree", &size, NULL);
+ if (!buf)
+ die("not a tree object");
+ read_tree_recursive(buf, size, "", 0, 0, pathspec, show_tree);
+
return 0;
}