git-clean: correct printing relative path

When the given path contains '..' then git-clean incorrectly printed names
of files. This patch changes cmd_clean to use quote_path_relative().
Also, "failed to remove ..." message used absolutely path, but not it is
corrected to use relative path.

Signed-off-by: Dmitry Potapov <dpotapov@gmail.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>

diff --git a/builtin-clean.c b/builtin-clean.c
index 3b220d5060b90318e2d2331d3cd0f5b6a70164ee..fefec3010c434219234e7832051ada9ed2e52335 100644 (file)
--- a/builtin-clean.c
+++ b/builtin-clean.c
@@ -10,6 +10,7 @@
 #include "cache.h"
 #include "dir.h"
 #include "parse-options.h"
 #include "cache.h"
 #include "dir.h"
 #include "parse-options.h"

+#include "quote.h"

 
 static int force = -1; /* unset */
 
 
 static int force = -1; /* unset */
 


@@ -34,7 +35,8 @@ int cmd_clean(int argc, const char **argv, const char *prefix)
        struct dir_struct dir;
        const char *path, *base;
        static const char **pathspec;
        struct dir_struct dir;
        const char *path, *base;
        static const char **pathspec;

-       int prefix_offset = 0;
+       struct strbuf buf;
+       const char *qname;

        char *seen = NULL;
        struct option options[] = {
                OPT__QUIET(&quiet),
        char *seen = NULL;
        struct option options[] = {
                OPT__QUIET(&quiet),


@@ -56,6 +58,7 @@ int cmd_clean(int argc, const char **argv, const char *prefix)
 
        argc = parse_options(argc, argv, options, builtin_clean_usage, 0);
 
 
        argc = parse_options(argc, argv, options, builtin_clean_usage, 0);
 

+       strbuf_init(&buf, 0);

        memset(&dir, 0, sizeof(dir));
        if (ignored_only)
                dir.show_ignored = 1;
        memset(&dir, 0, sizeof(dir));
        if (ignored_only)
                dir.show_ignored = 1;


@@ -72,8 +75,6 @@ int cmd_clean(int argc, const char **argv, const char *prefix)
        if (!ignored)
                setup_standard_excludes(&dir);
 
        if (!ignored)
                setup_standard_excludes(&dir);
 

-       if (prefix)
-               prefix_offset = strlen(prefix);

        pathspec = get_pathspec(prefix, argv);
        read_cache();
 
        pathspec = get_pathspec(prefix, argv);
        read_cache();
 


@@ -134,39 +135,34 @@ int cmd_clean(int argc, const char **argv, const char *prefix)
 
                if (S_ISDIR(st.st_mode)) {
                        strbuf_addstr(&directory, ent->name);
 
                if (S_ISDIR(st.st_mode)) {
                        strbuf_addstr(&directory, ent->name);

+                       qname = quote_path_relative(directory.buf, directory.len, &buf, prefix);

                        if (show_only && (remove_directories || matches)) {
                        if (show_only && (remove_directories || matches)) {

-                               printf("Would remove %s\n",
-                                      directory.buf + prefix_offset);
+                               printf("Would remove %s\n", qname);

                        } else if (remove_directories || matches) {
                                if (!quiet)
                        } else if (remove_directories || matches) {
                                if (!quiet)

-                                       printf("Removing %s\n",
-                                              directory.buf + prefix_offset);
+                                       printf("Removing %s\n", qname);

                                if (remove_dir_recursively(&directory, 0) != 0) {
                                if (remove_dir_recursively(&directory, 0) != 0) {

-                                       warning("failed to remove '%s'",
-                                               directory.buf + prefix_offset);
+                                       warning("failed to remove '%s'", qname);

                                        errors++;
                                }
                        } else if (show_only) {
                                        errors++;
                                }
                        } else if (show_only) {

-                               printf("Would not remove %s\n",
-                                      directory.buf + prefix_offset);
+                               printf("Would not remove %s\n", qname);

                        } else {
                        } else {

-                               printf("Not removing %s\n",
-                                      directory.buf + prefix_offset);
+                               printf("Not removing %s\n", qname);

                        }
                        strbuf_reset(&directory);
                } else {
                        if (pathspec && !matches)
                                continue;
                        }
                        strbuf_reset(&directory);
                } else {
                        if (pathspec && !matches)
                                continue;

+                       qname = quote_path_relative(ent->name, -1, &buf, prefix);

                        if (show_only) {
                        if (show_only) {

-                               printf("Would remove %s\n",
-                                      ent->name + prefix_offset);
+                               printf("Would remove %s\n", qname);

                                continue;
                        } else if (!quiet) {
                                continue;
                        } else if (!quiet) {

-                               printf("Removing %s\n",
-                                      ent->name + prefix_offset);
+                               printf("Removing %s\n", qname);

                        }
                        if (unlink(ent->name) != 0) {
                        }
                        if (unlink(ent->name) != 0) {

-                               warning("failed to remove '%s'", ent->name);
+                               warning("failed to remove '%s'", qname);

                                errors++;
                        }
                }
                                errors++;
                        }
                }