- struct path_prefix this_prefix;
- this_prefix.prev = prefix;
-
- if (strcmp(type, "tree"))
- die("expected a 'tree' node");
-
- 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;
-
- if (size < namelen + 20 || sscanf(buffer, "%o", &mode) != 1)
- die("corrupt 'tree' file");
- buffer = sha1 + 20;
- size -= namelen + 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
- * ... that is, when we are not recursive -- junkio@cox.net
- */
- eltbuf = (recursive ? read_sha1_file(sha1, elttype, &eltsize) :
- NULL);
- if (! eltbuf) {
- if (recursive)
- error("cannot read %s", sha1_to_hex(sha1));
- type = S_ISDIR(mode) ? "tree" : "blob";
- }
- else
- type = elttype;
-
- printf("%03o\t%s\t%s\t", mode, type, sha1_to_hex(sha1));
- print_path_prefix(prefix);
- fputs(path, stdout);
- putchar(line_termination);
-
- if (eltbuf && !strcmp(type, "tree")) {
- this_prefix.name = path;
- list_recursive(eltbuf, elttype, eltsize, &this_prefix);
+ 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;