diff options
author | Linus Torvalds <torvalds@ppc970.osdl.org> | 2005-04-27 10:21:13 -0700 |
---|---|---|
committer | Linus Torvalds <torvalds@ppc970.osdl.org> | 2005-04-27 10:21:13 -0700 |
commit | 4765dd57e6115d6e04e26a652676f02abe9c143d (patch) | |
tree | 37f46a6a23ddf614a1f2c2dbf7c09a309a11ac7a | |
parent | diff-cache: handle modified new files correctly (diff) | |
download | tgif-4765dd57e6115d6e04e26a652676f02abe9c143d.tar.xz |
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.
-rw-r--r-- | diff.c | 2 |
1 files changed, 0 insertions, 2 deletions
@@ -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]); |