remove init_pathspec() in favor of parse_pathspec()

diff --git a/builtin/ls-files.c b/builtin/ls-files.c
index f1be425129d4e76a5df10527a67f5d3a87cff2ec..d3a0495f7d485134176c41e302b5a644a824dcfd 100644 (file)
--- a/builtin/ls-files.c
+++ b/builtin/ls-files.c
@@ -216,7 +216,7 @@ static void show_files(struct dir_struct *dir)
 
        /* For cached/deleted files we don't need to even do the readdir */
        if (show_others || show_killed) {
-               fill_directory(dir, pathspec.raw);
+               fill_directory(dir, &pathspec);
                if (show_others)
                        show_other_files(dir);
                if (show_killed)
@@ -315,13 +315,12 @@ void overlay_tree_on_cache(const char *tree_name, const char *prefix)
        }
 
        if (prefix) {
-               static const char *(matchbuf[2]);
-               matchbuf[0] = prefix;
-               matchbuf[1] = NULL;
-               init_pathspec(&pathspec, matchbuf);
-               pathspec.items[0].nowildcard_len = pathspec.items[0].len;
+               static const char *(matchbuf[1]);
+               matchbuf[0] = NULL;
+               parse_pathspec(&pathspec, PATHSPEC_ALL_MAGIC,
+                              PATHSPEC_PREFER_CWD, prefix, matchbuf);
        } else
-               init_pathspec(&pathspec, NULL);
+               memset(&pathspec, 0, sizeof(pathspec));
        if (read_tree(tree, 1, &pathspec))
                die("unable to read tree entries %s", tree_name);
 
@@ -346,15 +345,16 @@ void overlay_tree_on_cache(const char *tree_name, const char *prefix)
        }
 }
 
-int report_path_error(const char *ps_matched, const char **pathspec, const char *prefix)
+int report_path_error(const char *ps_matched,
+                     const struct pathspec *pathspec,
+                     const char *prefix)
 {
        /*
         * Make sure all pathspec matched; otherwise it is an error.
         */
        struct strbuf sb = STRBUF_INIT;
-       const char *name;
        int num, errors = 0;
-       for (num = 0; pathspec[num]; num++) {
+       for (num = 0; num < pathspec->nr; num++) {
                int other, found_dup;
 
                if (ps_matched[num])
@@ -362,13 +362,16 @@ int report_path_error(const char *ps_matched, const char **pathspec, const char
                /*
                 * The caller might have fed identical pathspec
                 * twice.  Do not barf on such a mistake.
+                * FIXME: parse_pathspec should have eliminated
+                * duplicate pathspec.
                 */
                for (found_dup = other = 0;
-                    !found_dup && pathspec[other];
+                    !found_dup && other < pathspec->nr;
                     other++) {
                        if (other == num || !ps_matched[other])
                                continue;
-                       if (!strcmp(pathspec[other], pathspec[num]))
+                       if (!strcmp(pathspec->items[other].original,
+                                   pathspec->items[num].original))
                                /*
                                 * Ok, we have a match already.
                                 */
@@ -377,9 +380,8 @@ int report_path_error(const char *ps_matched, const char **pathspec, const char
                if (found_dup)
                        continue;
 
-               name = quote_path_relative(pathspec[num], -1, &sb, prefix);
                error("pathspec '%s' did not match any file(s) known to git.",
-                     name);
+                     pathspec->items[num].original);
                errors++;
        }
        strbuf_release(&sb);
@@ -543,7 +545,7 @@ int cmd_ls_files(int argc, const char **argv, const char *cmd_prefix)
                       prefix, argv);
 
        /* Find common prefix for all pathspec's */
-       max_prefix = common_prefix(pathspec.raw);
+       max_prefix = common_prefix(&pathspec);
        max_prefix_len = max_prefix ? strlen(max_prefix) : 0;
 
        /* Treat unmatching pathspec elements as errors */
@@ -575,7 +577,7 @@ int cmd_ls_files(int argc, const char **argv, const char *cmd_prefix)
 
        if (ps_matched) {
                int bad;
-               bad = report_path_error(ps_matched, pathspec.raw, prefix);
+               bad = report_path_error(ps_matched, &pathspec, prefix);
                if (bad)
                        fprintf(stderr, "Did you forget to 'git add'?\n");