X-Git-Url: https://git.octo.it/?a=blobdiff_plain;f=ls-tree.c;h=dae377d99585d4e6a176f85f0101d8ae29668f2f;hb=ee34518d629331dadd58b1a75294369d679eda8b;hp=c063640c114634dc7cf950ce44863dd17ddf83c1;hpb=0f2303f71957ec68c92487f185435fbec6bd1c79;p=git.git

diff --git a/ls-tree.c b/ls-tree.c
index c063640c..dae377d9 100644
--- a/ls-tree.c
+++ b/ls-tree.c
@@ -4,111 +4,123 @@
  * Copyright (C) Linus Torvalds, 2005
  */
 #include "cache.h"
-
-int line_termination = '\n';
-int recursive = 0;
-
-struct path_prefix {
-	struct path_prefix *prev;
-	const char *name;
-};
-
-static void print_path_prefix(struct path_prefix *prefix)
+#include "blob.h"
+#include "tree.h"
+#include "quote.h"
+
+static int line_termination = '\n';
+#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;
+
+static const char ls_tree_usage[] =
+	"git-ls-tree [-d] [-r] [-t] [-z] [--name-only] [--name-status] <tree-ish> [path...]";
+
+static int show_recursive(const char *base, int baselen, const char *pathname)
 {
-	if (prefix) {
-		if (prefix->prev)
-			print_path_prefix(prefix->prev);
-		fputs(prefix->name, stdout);
-		putchar('/');
-	}
-}
+	const char **s;
 
-static void list_recursive(void *buffer,
-			  unsigned char *type,
-			  unsigned long size,
-			  struct path_prefix *prefix)
-{
-	struct path_prefix this_prefix;
-	this_prefix.prev = prefix;
+	if (ls_options & LS_RECURSIVE)
+		return 1;
 
-	if (strcmp(type, "tree"))
-		die("expected a 'tree' node");
+	s = pathspec;
+	if (!s)
+		return 0;
 
-	while (size) {
-		int namelen = strlen(buffer)+1;
-		void *eltbuf;
-		char elttype[20];
-		unsigned long eltsize;
-		unsigned char *sha1 = buffer + namelen;
-		char *path = strchr(buffer, ' ') + 1;
-		unsigned int mode;
+	for (;;) {
+		const char *spec = *s++;
+		int len, speclen;
 
-		if (size < namelen + 20 || sscanf(buffer, "%o", &mode) != 1)
-			die("corrupt 'tree' file");
-		buffer = sha1 + 20;
-		size -= namelen + 20;
-
-		printf("%06o\t%s\t%s\t", mode,
-		       S_ISDIR(mode) ? "tree" : "blob",
-		       sha1_to_hex(sha1));
-		print_path_prefix(prefix);
-		fputs(path, stdout);
-		putchar(line_termination);
-
-		if (! recursive || ! S_ISDIR(mode))
+		if (!spec)
+			return 0;
+		if (strncmp(base, spec, baselen))
 			continue;
-
-		if (! (eltbuf = read_sha1_file(sha1, elttype, &eltsize)) ) {
-			error("cannot read %s", sha1_to_hex(sha1));
+		len = strlen(pathname);
+		spec += baselen;
+		speclen = strlen(spec);
+		if (speclen <= len)
 			continue;
-		}
-		this_prefix.name = path;
-		list_recursive(eltbuf, elttype, eltsize, &this_prefix);
-		free(eltbuf);
+		if (memcmp(pathname, spec, len))
+			continue;
+		return 1;
 	}
 }
 
-static int list(unsigned char *sha1)
+static int show_tree(unsigned char *sha1, const char *base, int baselen, const char *pathname, unsigned mode, int stage)
 {
-	void *buffer;
-	unsigned long size;
-	char type[20];
-
-	buffer = read_sha1_file(sha1, type, &size);
-	if (!buffer)
-		die("unable to read sha1 file");
-	list_recursive(buffer, type, size, NULL);
-	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 = "ls-tree [-r] [-z] <key>";
-
-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)
+	if (argc < 2)
 		usage(ls_tree_usage);
-	if (get_sha1_hex(argv[1], sha1) < 0)
+	if (get_sha1(argv[1], sha1) < 0)
 		usage(ls_tree_usage);
-	sha1_file_directory = getenv(DB_ENVIRONMENT);
-	if (!sha1_file_directory)
-		sha1_file_directory = DEFAULT_DB_ENVIRONMENT;
-	if (list(sha1) < 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;
 }