From 4765dd57e6115d6e04e26a652676f02abe9c143d Mon Sep 17 00:00:00 2001 From: Linus Torvalds Date: Wed, 27 Apr 2005 10:21:13 -0700 Subject: [PATCH] diff.c: don't add extra '/' to pathname The "base" string already contains any finishing "/", so the way to get the full pathname is to just concatenate the base and path directly, with no extra slashes in between. --- diff.c | 2 -- 1 file changed, 2 deletions(-) diff --git a/diff.c b/diff.c index 73834898f..4cc41f097 100644 --- a/diff.c +++ b/diff.c @@ -256,7 +256,6 @@ void diff_addremove(int addremove, unsigned mode, if (path) { strcpy(concatpath, base); - strcat(concatpath, "/"); strcat(concatpath, path); } run_external_diff(path ? concatpath : base, one, two); @@ -278,7 +277,6 @@ void diff_change(unsigned old_mode, unsigned new_mode, if (path) { strcpy(concatpath, base); - strcat(concatpath, "/"); strcat(concatpath, path); } run_external_diff(path ? concatpath : base, &spec[0], &spec[1]); -- 2.26.2