undef/git-commit-vandalism
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

git-clean: correct printing relative path

Browse Source 
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>
This commit is contained in:
Dmitry Potapov 2008-03-07 04:13:17 +03:00 committed by Junio C Hamano
parent a734d0b10b
commit 1fb328947c
1 changed files with 14 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
builtin-clean.c
View File

@ -10,6 +10,7 @@
#include "cache.h" #include "cache.h"
#include "dir.h" #include "dir.h"
#include "parse-options.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; struct dir_struct dir;
const char *path, *base; const char *path, *base;
static const char **pathspec; static const char **pathspec;
int prefix_offset = 0; struct strbuf buf;
const char *qname;
char *seen = NULL; char *seen = NULL;
struct option options[] = { struct option options[] = {
OPT__QUIET(&quiet), 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)); memset(&dir, 0, sizeof(dir));
if (ignored_only) if (ignored_only)
dir.show_ignored = 1; dir.show_ignored = 1;
@ -72,8 +75,6 @@ int cmd_clean(int argc, const char **argv, const char *prefix)
if (!ignored) if (!ignored)
setup_standard_excludes(&dir); setup_standard_excludes(&dir);
if (prefix)
prefix_offset = strlen(prefix);
pathspec = get_pathspec(prefix, argv); pathspec = get_pathspec(prefix, argv);
read_cache(); read_cache();
@ -134,39 +135,34 @@ int cmd_clean(int argc, const char **argv, const char *prefix)
if (S_ISDIR(st.st_mode)) { if (S_ISDIR(st.st_mode)) {
strbuf_addstr(&directory, ent->name); 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", printf("Would remove %s\n", qname);
directory.buf + prefix_offset);
} else if (remove_directories || matches) { } else if (remove_directories || matches) {
if (!quiet) if (!quiet)
printf("Removing %s\n", printf("Removing %s\n", qname);
directory.buf + prefix_offset);
if (remove_dir_recursively(&directory, 0) != 0) { if (remove_dir_recursively(&directory, 0) != 0) {
warning("failed to remove '%s'", warning("failed to remove '%s'", qname);
directory.buf + prefix_offset);
errors++; errors++;
} }
} else if (show_only) { } else if (show_only) {
printf("Would not remove %s\n", printf("Would not remove %s\n", qname);
directory.buf + prefix_offset);
} else { } else {
printf("Not removing %s\n", printf("Not removing %s\n", qname);
directory.buf + prefix_offset);
} }
strbuf_reset(&directory); strbuf_reset(&directory);
} else { } else {
if (pathspec && !matches) if (pathspec && !matches)
continue; continue;
qname = quote_path_relative(ent->name, -1, &buf, prefix);
if (show_only) { if (show_only) {
printf("Would remove %s\n", printf("Would remove %s\n", qname);
ent->name + prefix_offset);
continue; continue;
} else if (!quiet) { } else if (!quiet) {
printf("Removing %s\n", printf("Removing %s\n", qname);
ent->name + prefix_offset);
} }
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++;
} }
} }