summaryrefslogtreecommitdiffstats
path: root/usr.bin
diff options
context:
space:
mode:
authorkevans <kevans@FreeBSD.org>2017-08-17 17:17:28 +0000
committerkevans <kevans@FreeBSD.org>2017-08-17 17:17:28 +0000
commit2cf785f328f3ef2deff0a7d2626b8e1a81e725e7 (patch)
treec3e49ab04ab3a02fb331841934cdd0d8234e49ab /usr.bin
parente986b18c867bd283af7811e671c4abb150aac98a (diff)
downloadFreeBSD-src-2cf785f328f3ef2deff0a7d2626b8e1a81e725e7.zip
FreeBSD-src-2cf785f328f3ef2deff0a7d2626b8e1a81e725e7.tar.gz
bsdgrep: bump version number to 2.6.0 and update copyright information
MFC r319132: bsdgrep: bump version number and add Kyle Evans copyright The following changes have been made over the last couple of months: Features: - With bsdgrep -r, the working directory is implied if no directory is specified - bsdgrep will now behave as bsdgrep -r does when it's named rgrep - bsdgrep now understands -z/--null-data to use \0 as EOL - GNU regex compatibility is now indicated with a "GNU compatible" in the version string Fixes: - --mmap no longer hangs when coming across an EOF without an accompanying EOL - -o/--color matching generally improved, now produces earliest / longest matches - Context output now more closely aligns with GNU grep - Zero-length matches no longer exhibit broken behavior - Every output line now honors -b/-H/-n flags Tests have been added for previous regressions as well as other previously untested behaviors. Various other fixes have been commited, and refactoring for further / later improvements has taken place. (The original submission changed the version string to 2.5.2, but I decided to use 2.6.0 to reflect the addition of new features.) MFC r320754: Update copyright e-mail address to @FreeBSD.org address Approved by: emaste (mentor, blanket MFC)
Diffstat (limited to 'usr.bin')
-rw-r--r--usr.bin/grep/grep.h2
-rwxr-xr-xusr.bin/grep/tests/grep_freebsd_test.sh2
-rw-r--r--usr.bin/grep/util.c1
3 files changed, 3 insertions, 2 deletions
diff --git a/usr.bin/grep/grep.h b/usr.bin/grep/grep.h
index d206c59..932e149 100644
--- a/usr.bin/grep/grep.h
+++ b/usr.bin/grep/grep.h
@@ -51,7 +51,7 @@ extern nl_catd catalog;
extern const char *errstr[];
-#define VERSION "2.5.1-FreeBSD"
+#define VERSION "2.6.0-FreeBSD"
#define GREP_FIXED 0
#define GREP_BASIC 1
diff --git a/usr.bin/grep/tests/grep_freebsd_test.sh b/usr.bin/grep/tests/grep_freebsd_test.sh
index ab998ec..e3d35d2 100755
--- a/usr.bin/grep/tests/grep_freebsd_test.sh
+++ b/usr.bin/grep/tests/grep_freebsd_test.sh
@@ -1,5 +1,5 @@
#
-# Copyright (c) 2017 Kyle Evans <kevans91@ksu.edu>
+# Copyright (c) 2017 Kyle Evans <kevans@FreeBSD.org>
# All rights reserved.
#
# Redistribution and use in source and binary forms, with or without
diff --git a/usr.bin/grep/util.c b/usr.bin/grep/util.c
index 4b9f568..a2eecc4 100644
--- a/usr.bin/grep/util.c
+++ b/usr.bin/grep/util.c
@@ -5,6 +5,7 @@
/*-
* Copyright (c) 1999 James Howard and Dag-Erling Coïdan Smørgrav
* Copyright (C) 2008-2010 Gabor Kovesdan <gabor@FreeBSD.org>
+ * Copyright (C) 2017 Kyle Evans <kevans@FreeBSD.org>
* All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
OpenPOWER on IntegriCloud