diff.c: Properly quote file names in diff --summary output.
Signed-off-by: Alexandre Julliard <julliard@winehq.org> Signed-off-by: Junio C Hamano <junkio@cox.net>
Alexandre Julliard committed
Feb 10, 2007 at 15:37 UTC
0d26a64ece4d2692463a7bcb5235b75ee2f35ec0
1 file changed
+12
-5
diff.c
+12
-5
@@ -2409,19 +2409,24 @@ static void flush_one_pair(struct diff_filepair *p, struct diff_options *opt)
2409
2410
static void show_file_mode_name(const char *newdelete, struct diff_filespec *fs)
2411
{
2412
+ char *name = quote_one(fs->path);
2413
if (fs->mode)
2413
- printf(" %s mode %06o %s\n", newdelete, fs->mode, fs->path);
2414
+ printf(" %s mode %06o %s\n", newdelete, fs->mode, name);
2415
else
2415
- printf(" %s %s\n", newdelete, fs->path);
2416
+ printf(" %s %s\n", newdelete, name);
2417
+ free(name);
2418
}
2419
2420
2421
static void show_mode_change(struct diff_filepair *p, int show_name)
2422
{
2423
if (p->one->mode && p->two->mode && p->one->mode != p->two->mode) {
2422
- if (show_name)
2424
+ if (show_name) {
2425
+ char *name = quote_one(p->two->path);
2426
printf(" mode change %06o => %06o %s\n",
2424
- p->one->mode, p->two->mode, p->two->path);
2427
+ p->one->mode, p->two->mode, name);
2428
+ free(name);
2429
+ }
2430
else
2431
printf(" mode change %06o => %06o\n",
2432
p->one->mode, p->two->mode);
@@ -2455,8 +2460,10 @@ static void diff_summary(struct diff_filepair *p)
2460
break;
2461
default:
2462
if (p->score) {
2458
- printf(" rewrite %s (%d%%)\n", p->two->path,
2463
+ char *name = quote_one(p->two->path);
2464
+ printf(" rewrite %s (%d%%)\n", name,
2465
(int)(0.5 + p->score * 100.0/MAX_SCORE));
2466
+ free(name);
2467
show_mode_change(p, 0);
2468
} else show_mode_change(p, 1);
2469
break;