From: tobias <tobias@openbsd.org>
Date: Tue, 13 Oct 2015 16:37:17 +0000 (+0000)
Subject: Replace our /^\.\././ expression with /.//. The term is simpler and has
X-Git-Url: http://artulab.com/gitweb/?a=commitdiff_plain;h=e5826585f03f5a2902dc5485ed05159c83ddd24d;p=openbsd

Replace our /^\.\././ expression with /.//. The term is simpler and has
the same meaning in our diff ed-context.

As a bonus, our ed-diff output can be processed by GNU patch now, too.

okay millert@
---

diff --git a/usr.bin/diff/diffreg.c b/usr.bin/diff/diffreg.c
index 8226ff803c8..cbac7796332 100644
--- a/usr.bin/diff/diffreg.c
+++ b/usr.bin/diff/diffreg.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: diffreg.c,v 1.88 2015/10/05 20:15:00 millert Exp $	*/
+/*	$OpenBSD: diffreg.c,v 1.89 2015/10/13 16:37:17 tobias Exp $	*/
 
 /*
  * Copyright (C) Caldera International Inc.  2001-2002.
@@ -1084,7 +1084,7 @@ proceed:
 		 * back and restart where we left off.
 		 */
 		diff_output(".\n");
-		diff_output("%ds/^\\.\\././\n", a);
+		diff_output("%ds/.//\n", a);
 		a += i;
 		c += i;
 		goto restart;