Regen diffs.

3 files changed, 17 insertions, 26 deletions

diff --git a/usr.bin/awk/b.c.diff b/usr.bin/awk/b.c.diff
index 525fcbc..5b4905e 100644
--- a/usr.bin/awk/b.c.diff
+++ b/usr.bin/awk/b.c.diff
@@ -2,12 +2,9 @@ $FreeBSD$
 
 Index: b.c
 ===================================================================
-RCS file: /home/ncvs/src/contrib/one-true-awk/b.c,v
-retrieving revision 1.1.1.8
-diff -u -p -r1.1.1.8 b.c
---- b.c	16 May 2005 19:11:31 -0000	1.1.1.8
-+++ b.c	16 May 2005 19:12:40 -0000
-@@ -282,9 +282,21 @@ int quoted(char **pp)	/* pick up next th
+--- b.c	(revision 201951)
++++ b.c	(working copy)
+@@ -285,9 +285,21 @@ int quoted(char **pp)	/* pick up next thing after
  	return c;
  }
  
@@ -29,10 +26,10 @@ diff -u -p -r1.1.1.8 b.c
  	uschar *p = (uschar *) argp;
  	uschar *op, *bp;
  	static uschar *buf = 0;
-@@ -303,15 +315,18 @@ char *cclenter(const char *argp)	/* add 
+@@ -306,15 +318,18 @@ char *cclenter(const char *argp)	/* add a characte
  				c2 = *p++;
  				if (c2 == '\\')
-					c2 = quoted((char **) &p);
+ 					c2 = quoted((char **) &p);
 -				if (c > c2) {	/* empty; ignore */
 +				if (collate_range_cmp(c, c2) > 0) {
  					bp--;
@@ -44,8 +41,8 @@ diff -u -p -r1.1.1.8 b.c
 +					if ((collate_range_cmp(c, j) > 0) ||
 +					    collate_range_cmp(j, c2) > 0)
 +						continue;
-					if (!adjbuf((char **) &buf, &bufsz, bp-buf+2, 100, (char **) &bp, "cclenter1"))
-						FATAL("out of space for character class [%.10s...] 2", p);
+ 					if (!adjbuf((char **) &buf, &bufsz, bp-buf+2, 100, (char **) &bp, "cclenter1"))
+ 						FATAL("out of space for character class [%.10s...] 2", p);
 -					*bp++ = ++c;
 +					*bp++ = j;
  					i++;
diff --git a/usr.bin/awk/main.c.diff b/usr.bin/awk/main.c.diff
index a4793df..325efff 100644
--- a/usr.bin/awk/main.c.diff
+++ b/usr.bin/awk/main.c.diff
@@ -2,12 +2,9 @@ $FreeBSD$
 
 Index: main.c
 ===================================================================
-RCS file: /home/ncvs/src/contrib/one-true-awk/main.c,v
-retrieving revision 1.1.1.10
-diff -u -p -r1.1.1.10 main.c
---- main.c	16 May 2005 19:11:31 -0000	1.1.1.10
-+++ main.c	15 Sep 2006 13:21:30 -0000
-@@ -22,7 +22,7 @@ ARISING OUT OF OR IN CONNECTION WITH THE
+--- main.c	(revision 201951)
++++ main.c	(working copy)
+@@ -22,7 +22,7 @@ ARISING OUT OF OR IN CONNECTION WITH THE USE OR PE
  THIS SOFTWARE.
  ****************************************************************/
  
@@ -24,7 +21,7 @@ diff -u -p -r1.1.1.10 main.c
  	setlocale(LC_NUMERIC, "C"); /* for parsing cmdline & prog */
  	cmdname = argv[0];
  	if (argc == 1) {
-@@ -79,13 +80,18 @@ int main(int argc, char *argv[])
+@@ -86,13 +87,18 @@ int main(int argc, char *argv[])
  				safe = 1;
  			break;
  		case 'f':	/* next argument is program filename */
@@ -50,7 +47,7 @@ diff -u -p -r1.1.1.10 main.c
  			break;
  		case 'F':	/* set field separator */
  			if (argv[1][2] != 0) {	/* arg is -Fsomething */
-@@ -104,8 +110,14 @@ int main(int argc, char *argv[])
+@@ -111,8 +117,14 @@ int main(int argc, char *argv[])
  				WARNING("field separator FS is empty");
  			break;
  		case 'v':	/* -v a=1 to be done NOW.  one -v for each */
@@ -65,5 +62,5 @@ diff -u -p -r1.1.1.10 main.c
 +					setclvar(argv[1]);
 +			}
  			break;
- 		case 'm':	/* more memory: -mr=record, -mf=fields */
- 				/* no longer supported */
+ 		case 'd':
+ 			dbg = atoi(&argv[1][2]);
diff --git a/usr.bin/awk/run.c.diff b/usr.bin/awk/run.c.diff
index d491250..c0924ea 100644
--- a/usr.bin/awk/run.c.diff
+++ b/usr.bin/awk/run.c.diff
@@ -2,12 +2,9 @@ $FreeBSD$
 
 Index: run.c
 ===================================================================
-RCS file: /home/ncvs/src/contrib/one-true-awk/run.c,v
-retrieving revision 1.1.1.8
-diff -u -p -r1.1.1.8 run.c
---- run.c	16 May 2005 19:11:35 -0000	1.1.1.8
-+++ run.c	16 May 2005 19:12:47 -0000
-@@ -651,7 +651,7 @@ Cell *relop(Node **a, int n)	/* a[0 < a[
+--- run.c	(revision 201951)
++++ run.c	(working copy)
+@@ -653,7 +653,7 @@ Cell *relop(Node **a, int n)	/* a[0 < a[1], etc. *
  		j = x->fval - y->fval;
  		i = j<0? -1: (j>0? 1: 0);
  	} else {