diff.c: don't add extra '/' to pathname

Linus Torvalds · Linus Torvalds · commit 4765dd57e611 · 2005-04-27T10:21:13.000-07:00
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 --git 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]);

Original file line number	Diff line number	Diff line change
`@@ -256,7 +256,6 @@ void diff_addremove(int addremove, unsigned mode,`
`256`	`256`
`257`	`257`	`if (path) {`
`258`	`258`	`strcpy(concatpath, base);`
`259`		`- strcat(concatpath, "/");`
`260`	`259`	`strcat(concatpath, path);`
`261`	`260`	`}`
`262`	`261`	`run_external_diff(path ? concatpath : base, one, two);`
`@@ -278,7 +277,6 @@ void diff_change(unsigned old_mode, unsigned new_mode,`
`278`	`277`
`279`	`278`	`if (path) {`
`280`	`279`	`strcpy(concatpath, base);`
`281`		`- strcat(concatpath, "/");`
`282`	`280`	`strcat(concatpath, path);`
`283`	`281`	`}`
`284`	`282`	`run_external_diff(path ? concatpath : base, &spec[0], &spec[1]);`