X-Git-Url: https://git.octo.it/?a=blobdiff_plain;f=ls-tree.c;h=7f8f8644afbcec3eac39230cabbd1298ceaa537d;hb=29c2cce41bc623e0a0d770a2634bf6c544345ea7;hp=05c743ab6ab3a779c027eaa77e104d188ac0b698;hpb=7912c07037cf704394e9bcb7cb24c05ee03aa921;p=git.git

diff --git a/ls-tree.c b/ls-tree.c
index 05c743ab..7f8f8644 100644
--- a/ls-tree.c
+++ b/ls-tree.c
@@ -5,49 +5,106 @@
  */
 #include "cache.h"
 
-static int list(unsigned char *sha1)
+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)
 {
-	void *buffer;
-	unsigned long size;
-	char type[20];
+	if (prefix) {
+		if (prefix->prev)
+			print_path_prefix(prefix->prev);
+		fputs(prefix->name, stdout);
+		putchar('/');
+	}
+}
+
+static void list_recursive(void *buffer,
+			   const unsigned char *type,
+			   unsigned long size,
+			   struct path_prefix *prefix)
+{
+	struct path_prefix this_prefix;
+	this_prefix.prev = prefix;
 
-	buffer = read_sha1_file(sha1, type, &size);
-	if (!buffer)
-		usage("unable to read sha1 file");
 	if (strcmp(type, "tree"))
-		usage("expected a 'tree' node");
+		die("expected a 'tree' node");
+
 	while (size) {
-		int len = strlen(buffer)+1;
-		unsigned char *sha1 = buffer + len;
-		char *path = strchr(buffer, ' ')+1;
+		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;
-		unsigned char *type;
 
-		if (size < len + 20 || sscanf(buffer, "%o", &mode) != 1)
-			usage("corrupt 'tree' file");
+		if (size < namelen + 20 || sscanf(buffer, "%o", &mode) != 1)
+			die("corrupt 'tree' file");
 		buffer = sha1 + 20;
-		size -= len + 20;
-		/* XXX: We do some ugly mode heuristics here.
-		 * It seems not worth it to read each file just to get this
-		 * and the file size. -- pasky@ucw.cz */
-		type = S_ISDIR(mode) ? "tree" : "blob";
-		printf("%03o\t%s\t%s\t%s\n", mode, type, sha1_to_hex(sha1), path);
+		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))
+			continue;
+
+		if (! (eltbuf = read_sha1_file(sha1, elttype, &eltsize)) ) {
+			error("cannot read %s", sha1_to_hex(sha1));
+			continue;
+		}
+		this_prefix.name = path;
+		list_recursive(eltbuf, elttype, eltsize, &this_prefix);
+		free(eltbuf);
 	}
+}
+
+static int list(unsigned char *sha1)
+{
+	void *buffer;
+	unsigned long size;
+
+	buffer = read_object_with_reference(sha1, "tree", &size, 0);
+	if (!buffer)
+		die("unable to read sha1 file");
+	list_recursive(buffer, "tree", size, NULL);
 	return 0;
 }
 
+static const char *ls_tree_usage = "ls-tree [-r] [-z] <key>";
+
 int main(int argc, char **argv)
 {
 	unsigned char sha1[20];
 
+	while (1 < argc && argv[1][0] == '-') {
+		switch (argv[1][1]) {
+		case 'z':
+			line_termination = 0;
+			break;
+		case 'r':
+			recursive = 1;
+			break;
+		default:
+			usage(ls_tree_usage);
+		}
+		argc--; argv++;
+	}
+
 	if (argc != 2)
-		usage("ls-tree <key>");
-	if (get_sha1_hex(argv[1], sha1) < 0)
-		usage("ls-tree <key>");
-	sha1_file_directory = getenv(DB_ENVIRONMENT);
-	if (!sha1_file_directory)
-		sha1_file_directory = DEFAULT_DB_ENVIRONMENT;
+		usage(ls_tree_usage);
+	if (get_sha1(argv[1], sha1) < 0)
+		usage(ls_tree_usage);
 	if (list(sha1) < 0)
-		usage("list failed");
+		die("list failed");
 	return 0;
 }