Author: gabor
Date: Thu Apr 7 13:03:35 2011
New Revision: 220422
URL: http://svn.freebsd.org/changeset/base/220422
Log:
- Adjust a comment to actual behaviour
- Makefile nit
- Add more CVS/SVN keywords to make it easier to track changes from NetBSD
in case they add further improvements
Approved by: delphij (mentor)
Obtained from: The NetBSD Project
Modified:
head/usr.bin/grep/Makefile
head/usr.bin/grep/fastgrep.c
head/usr.bin/grep/file.c
head/usr.bin/grep/grep.1
head/usr.bin/grep/grep.c
head/usr.bin/grep/grep.h
head/usr.bin/grep/queue.c
head/usr.bin/grep/util.c
Modified: head/usr.bin/grep/Makefile
==============================================================================
--- head/usr.bin/grep/Makefile Thu Apr 7 13:01:03 2011 (r220421)
+++ head/usr.bin/grep/Makefile Thu Apr 7 13:03:35 2011 (r220422)
@@ -1,13 +1,15 @@
+# $NetBSD: Makefile,v 1.4 2011/02/16 01:31:33 joerg Exp $
# $FreeBSD$
# $OpenBSD: Makefile,v 1.6 2003/06/25 15:00:04 millert Exp $
PROG= grep
SRCS= fastgrep.c file.c grep.c queue.c util.c
+
LINKS= ${BINDIR}/grep ${BINDIR}/egrep \
${BINDIR}/grep ${BINDIR}/fgrep \
${BINDIR}/grep ${BINDIR}/zgrep \
${BINDIR}/grep ${BINDIR}/zegrep \
- ${BINDIR}/grep ${BINDIR}/zfgrep \
+ ${BINDIR}/grep ${BINDIR}/zfgrep
MLINKS= grep.1 egrep.1 \
grep.1 fgrep.1 \
Modified: head/usr.bin/grep/fastgrep.c
==============================================================================
--- head/usr.bin/grep/fastgrep.c Thu Apr 7 13:01:03 2011
(r220421)
+++ head/usr.bin/grep/fastgrep.c Thu Apr 7 13:03:35 2011
(r220422)
@@ -1,4 +1,6 @@
/* $OpenBSD: util.c,v 1.36 2007/10/02 17:59:18 otto Exp $ */
+/* $NetBSD: fastgrep.c,v 1.4 2011/02/27 17:33:37 joerg Exp $ */
+/* $FreeBSD$ */
/*-
* Copyright (c) 1999 James Howard and Dag-Erling Coïdan Smørgrav
@@ -112,9 +114,9 @@ fastcomp(fastgrep_t *fg, const char *pat
}
/*
- * Copy pattern minus '^' and '$' characters as well as word
- * match character classes at the beginning and ending of the
- * string respectively.
+ * pat has been adjusted earlier to not include '^', '$' or
+ * the word match character classes at the beginning and ending
+ * of the string respectively.
*/
fg->pattern = grep_malloc(fg->len + 1);
memcpy(fg->pattern, pat, fg->len);
Modified: head/usr.bin/grep/file.c
==============================================================================
--- head/usr.bin/grep/file.c Thu Apr 7 13:01:03 2011 (r220421)
+++ head/usr.bin/grep/file.c Thu Apr 7 13:03:35 2011 (r220422)
@@ -1,3 +1,5 @@
+/* $NetBSD: file.c,v 1.5 2011/02/16 18:35:39 joerg Exp $ */
+/* $FreeBSD$ */
/* $OpenBSD: file.c,v 1.11 2010/07/02 20:48:48 nicm Exp $ */
/*-
Modified: head/usr.bin/grep/grep.1
==============================================================================
--- head/usr.bin/grep/grep.1 Thu Apr 7 13:01:03 2011 (r220421)
+++ head/usr.bin/grep/grep.1 Thu Apr 7 13:03:35 2011 (r220422)
@@ -1,3 +1,4 @@
+.\" $NetBSD: grep.1,v 1.2 2011/02/16 01:31:33 joerg Exp $
.\" $FreeBSD$
.\" $OpenBSD: grep.1,v 1.38 2010/04/05 06:30:59 jmc Exp $
.\" Copyright (c) 1980, 1990, 1993
Modified: head/usr.bin/grep/grep.c
==============================================================================
--- head/usr.bin/grep/grep.c Thu Apr 7 13:01:03 2011 (r220421)
+++ head/usr.bin/grep/grep.c Thu Apr 7 13:03:35 2011 (r220422)
@@ -1,3 +1,5 @@
+/* $NetBSD: grep.c,v 1.4 2011/02/16 01:31:33 joerg Exp $ */
+/* $FreeBSD$ */
/* $OpenBSD: grep.c,v 1.42 2010/07/02 22:18:03 tedu Exp $ */
/*-
Modified: head/usr.bin/grep/grep.h
==============================================================================
--- head/usr.bin/grep/grep.h Thu Apr 7 13:01:03 2011 (r220421)
+++ head/usr.bin/grep/grep.h Thu Apr 7 13:03:35 2011 (r220422)
@@ -1,3 +1,4 @@
+/* $NetBSD: grep.h,v 1.5 2011/02/27 17:33:37 joerg Exp $ */
/* $OpenBSD: grep.h,v 1.15 2010/04/05 03:03:55 tedu Exp $ */
/* $FreeBSD$ */
Modified: head/usr.bin/grep/queue.c
==============================================================================
--- head/usr.bin/grep/queue.c Thu Apr 7 13:01:03 2011 (r220421)
+++ head/usr.bin/grep/queue.c Thu Apr 7 13:03:35 2011 (r220422)
@@ -1,3 +1,6 @@
+/* $NetBSD: queue.c,v 1.2 2011/02/16 01:31:33 joerg Exp $ */
+/* $FreeBSD$ */
+
/*-
* Copyright (c) 1999 James Howard and Dag-Erling Coïdan Smørgrav
* All rights reserved.
Modified: head/usr.bin/grep/util.c
==============================================================================
--- head/usr.bin/grep/util.c Thu Apr 7 13:01:03 2011 (r220421)
+++ head/usr.bin/grep/util.c Thu Apr 7 13:03:35 2011 (r220422)
@@ -1,3 +1,5 @@
+/* $NetBSD: util.c,v 1.9 2011/02/27 17:33:37 joerg Exp $ */
+/* $FreeBSD$ */
/* $OpenBSD: util.c,v 1.39 2010/07/02 22:18:03 tedu Exp $ */
/*-
_______________________________________________
svn-src-head@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-head
To unsubscribe, send any mail to "svn-src-head-unsubscr...@freebsd.org"
