D10484.diff
No OneTemporary
Actions

Size

1 KB

Referenced Files

None

Subscribers

None

D10484.diff
View Options

	Index: head/usr.bin/diff/diffreg.c
	===================================================================
	--- head/usr.bin/diff/diffreg.c
	+++ head/usr.bin/diff/diffreg.c
	@@ -1082,7 +1082,7 @@
	{
	static size_t max_context = 64;
	long curpos;
	- int i, nc;
	+ int i, nc, f;
	const char *walk;

	restart:
	@@ -1214,9 +1214,10 @@
	if (a <= b && c <= d && diff_format == D_NORMAL)
	diff_output("---\n");
	}
	+ f = 0;
	if (diff_format != D_GFORMAT)
	- i = fetch(ixnew, c, d, f2, diff_format == D_NORMAL ? '>' : '\0', 0, *pflags);
	- if (i != 0 && diff_format == D_EDIT) {
	+ f = fetch(ixnew, c, d, f2, diff_format == D_NORMAL ? '>' : '\0', 0, *pflags);
	+ if (f != 0 && diff_format == D_EDIT) {
	/*
	* A non-zero return value for D_EDIT indicates that the
	* last line printed was a bare dot (".") that has been
	@@ -1225,10 +1226,10 @@
	* back and restart where we left off.
	*/
	diff_output(".\n");
	- diff_output("%ds/.//\n", a + i - 1);
	- b = a + i - 1;
	+ diff_output("%ds/.//\n", a + f - 1);
	+ b = a + f - 1;
	a = b + 1;
	- c += i;
	+ c += f;
	goto restart;
	}
	if ((diff_format == D_EDIT \|\| diff_format == D_REVERSE) && c <= d)