[PATCH] fast-export: quote paths with spaces
- From
Jay Soffian <jaysoffian@gmail.com>
- Date
- Jun 25, 2012, 20:12 UTC
- Message-ID
- <1340655120-89736-1-git-send-email-jaysoffian@gmail.com>
A path containing a space must be quoted when used as an argument to either the copy or rename commands. 6280dfdc3b (fast-export: quote paths in output, 2011-08-05) previously attempted to fix fast-export's quoting by passing all paths through quote_c_style(). However, that function does not consider the space to be a character which requires quoting, so let's special-case the space inside print_path(). This will cause space-containing paths to also be quoted in other commands where such quoting is not strictly necessary, but it does not hurt to do so.
Signed-off-by: Jay Soffian <jaysoffian@gmail.com> --- Sorry, not test added. I barely had time to get out this patch. :-(
builtin/fast-export.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-)
diff --git a/builtin/fast-export.c b/builtin/fast-export.c index ef7c012094..cc5ef82fe6 100644 --- a/builtin/fast-export.c +++ b/builtin/fast-export.c @@ -183,9 +183,11 @@ static int depth_first(const void *a_, const void *b_) static void print_path(const char *path) { int need_quote = quote_c_style(path, NULL, NULL, 0); - if (need_quote) + if (need_quote) { quote_c_style(path, NULL, stdout, 0); - else + } else if (strchr(path, ' ')) { + printf("\"%s\"", path); + } else printf("%s", path); }
-- 1.7.11