Module Name: src
Committed By: tls
Date: Sun Aug 10 06:58:14 UTC 2014
Modified Files:
src/usr.bin/grep [tls-earlyentropy]: grep.c util.c
Log Message:
Rebase.
To generate a diff of this commit:
cvs rdiff -u -r1.11 -r1.11.8.1 src/usr.bin/grep/grep.c
cvs rdiff -u -r1.17 -r1.17.6.1 src/usr.bin/grep/util.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/usr.bin/grep/grep.c
diff -u src/usr.bin/grep/grep.c:1.11 src/usr.bin/grep/grep.c:1.11.8.1
--- src/usr.bin/grep/grep.c:1.11 Sun May 6 22:27:00 2012
+++ src/usr.bin/grep/grep.c Sun Aug 10 06:58:14 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: grep.c,v 1.11 2012/05/06 22:27:00 joerg Exp $ */
+/* $NetBSD: grep.c,v 1.11.8.1 2014/08/10 06:58:14 tls Exp $ */
/* $FreeBSD: head/usr.bin/grep/grep.c 211519 2010-08-19 22:55:17Z delphij $ */
/* $OpenBSD: grep.c,v 1.42 2010/07/02 22:18:03 tedu Exp $ */
@@ -34,7 +34,7 @@
#endif
#include <sys/cdefs.h>
-__RCSID("$NetBSD: grep.c,v 1.11 2012/05/06 22:27:00 joerg Exp $");
+__RCSID("$NetBSD: grep.c,v 1.11.8.1 2014/08/10 06:58:14 tls Exp $");
#include <sys/stat.h>
#include <sys/types.h>
@@ -159,7 +159,6 @@ usage(void)
{
fprintf(stderr, getstr(4), __progname);
fprintf(stderr, "%s", getstr(5));
- fprintf(stderr, "%s", getstr(5));
fprintf(stderr, "%s", getstr(6));
fprintf(stderr, "%s", getstr(7));
exit(2);
Index: src/usr.bin/grep/util.c
diff -u src/usr.bin/grep/util.c:1.17 src/usr.bin/grep/util.c:1.17.6.1
--- src/usr.bin/grep/util.c:1.17 Mon Jan 21 03:24:43 2013
+++ src/usr.bin/grep/util.c Sun Aug 10 06:58:14 2014
@@ -1,4 +1,4 @@
-/* $NetBSD: util.c,v 1.17 2013/01/21 03:24:43 msaitoh Exp $ */
+/* $NetBSD: util.c,v 1.17.6.1 2014/08/10 06:58:14 tls Exp $ */
/* $FreeBSD: head/usr.bin/grep/util.c 211496 2010-08-19 09:28:59Z des $ */
/* $OpenBSD: util.c,v 1.39 2010/07/02 22:18:03 tedu Exp $ */
@@ -34,7 +34,7 @@
#endif
#include <sys/cdefs.h>
-__RCSID("$NetBSD: util.c,v 1.17 2013/01/21 03:24:43 msaitoh Exp $");
+__RCSID("$NetBSD: util.c,v 1.17.6.1 2014/08/10 06:58:14 tls Exp $");
#include <sys/stat.h>
#include <sys/types.h>
@@ -324,7 +324,7 @@ procline(struct str *l, int nottext)
continue;
/* Check for whole word match */
if (fg_pattern[i].word && pmatch.rm_so != 0) {
- wint_t wbegin, wend;
+ wchar_t wbegin, wend;
wbegin = wend = L' ';
if (pmatch.rm_so != 0 &&
