#include "cache.h"
#include "blob.h"
#include "tree.h"
+#include "quote.h"
static int line_termination = '\n';
#define LS_RECURSIVE 1
int err = 0;
if (e != &root_entry) {
- printf("%06o %s %s %s%s", e->mode, entry_type(e),
- entry_hex(e), pathbuf, e->name);
+ int pathlen = strlen(pathbuf);
+ printf("%06o %s %s ",
+ e->mode, entry_type(e), entry_hex(e));
+ write_name_quoted(pathbuf, pathlen, e->name,
+ line_termination, stdout);
putchar(line_termination);
}
return err;
}
-static int list(char **path)
+static int list(const char **path)
{
int i;
int err = 0;
static const char ls_tree_usage[] =
"git-ls-tree [-d] [-r] [-z] <tree-ish> [path...]";
-int main(int argc, char **argv)
+int main(int argc, const char **argv)
{
- static char *path0[] = { "", NULL };
- char **path;
+ static const char *path0[] = { "", NULL };
+ const char **path;
unsigned char sha1[20];
+ int nongit = 0;
+ const char *prefix = setup_git_directory_gently(&nongit);
+
+ if (prefix)
+ path0[0] = prefix;
while (1 < argc && argv[1][0] == '-') {
switch (argv[1][1]) {
if (get_sha1(argv[1], sha1) < 0)
usage(ls_tree_usage);
- path = (argc == 2) ? path0 : (argv + 2);
+ if (argc == 2)
+ path = path0;
+ else
+ path = get_pathspec(prefix, argv + 2);
+
prepare_root(sha1);
if (list(path) < 0)
die("list failed");