summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: 5b486c3)
raw | patch | inline | side by side (parent: 5b486c3)
author | Thomas Glanzmann <sithglan@stud.uni-erlangen.de> | |
Thu, 19 May 2005 13:23:18 +0000 (15:23 +0200) | ||
committer | Linus Torvalds <torvalds@ppc970.osdl.org> | |
Thu, 19 May 2005 17:46:49 +0000 (10:46 -0700) |
Signed-off-by: Thomas Glanzmann <sithglan@stud.uni-erlangen.de>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
diff.c | patch | blob | history |
index c5ecc43fc1c0e0e0b3bd238fdf713b94ab3df4c9..92fcc677e454eb0156f2752c723e6e208a6e8be4 100644 (file)
--- a/diff.c
+++ b/diff.c
const char *name_b,
struct diff_tempfile *temp)
{
- int i, next_at;
+ int i, next_at, cmd_size;
const char *diff_cmd = "diff -L'%s%s' -L'%s%s'";
const char *diff_arg = "'%s' '%s'||:"; /* "||:" is to return 0 */
const char *input_name_sq[2];
* we use 2 spaces around diff-opts, and we need to count
* terminating NUL, so we subtract 9 here.
*/
- int cmd_size = (strlen(diff_cmd) + strlen(diff_opts) +
+ cmd_size = (strlen(diff_cmd) + strlen(diff_opts) +
strlen(diff_arg) - 9);
for (i = 0; i < 2; i++) {
input_name_sq[i] = sq_expand(temp[i].name);