From cc41ba26bb5e655548b4875e52f15aaa892889ef Mon Sep 17 00:00:00 2001 From: Ed Maste Date: Tue, 2 May 2017 13:38:20 +0000 Subject: [PATCH] bsdgrep: Add GNU compatible version string indicator As reported in r218614 it's useful to have an indication of whether or not BSD grep was built with GNU_GREP_COMPAT. Submitted by: Kyle Evans Reported by: mandree Differential Revision: https://reviews.freebsd.org/D10451 --- usr.bin/grep/Makefile | 2 +- usr.bin/grep/grep.c | 5 +++++ usr.bin/grep/nls/C.msg | 1 + usr.bin/grep/nls/es_ES.ISO8859-1.msg | 1 + usr.bin/grep/nls/gl_ES.ISO8859-1.msg | 1 + usr.bin/grep/nls/hu_HU.ISO8859-2.msg | 1 + usr.bin/grep/nls/ja_JP.SJIS.msg | 1 + usr.bin/grep/nls/ja_JP.UTF-8.msg | 1 + usr.bin/grep/nls/ja_JP.eucJP.msg | 1 + usr.bin/grep/nls/pt_BR.ISO8859-1.msg | 1 + usr.bin/grep/nls/ru_RU.KOI8-R.msg | 1 + usr.bin/grep/nls/uk_UA.UTF-8.msg | 1 + usr.bin/grep/nls/zh_CN.UTF-8.msg | 1 + 13 files changed, 17 insertions(+), 1 deletion(-) diff --git a/usr.bin/grep/Makefile b/usr.bin/grep/Makefile index c6b25f06182d..758eac7f9388 100644 --- a/usr.bin/grep/Makefile +++ b/usr.bin/grep/Makefile @@ -82,7 +82,7 @@ CFLAGS+= -DWITHOUT_BZIP2 .endif .if ${MK_GNU_GREP_COMPAT} != "no" -CFLAGS+= -I${DESTDIR}/usr/include/gnu +CFLAGS+= -I${DESTDIR}/usr/include/gnu -DWITH_GNU LIBADD+= gnuregex .endif diff --git a/usr.bin/grep/grep.c b/usr.bin/grep/grep.c index 20aec53f59cc..a4506120478d 100644 --- a/usr.bin/grep/grep.c +++ b/usr.bin/grep/grep.c @@ -74,6 +74,7 @@ const char *errstr[] = { /* 7*/ "\t[--null] [pattern] [file ...]\n", /* 8*/ "Binary file %s matches\n", /* 9*/ "%s (BSD grep) %s\n", +/* 10*/ "%s (BSD grep, GNU compatible) %s\n", }; /* Flags passed to regcomp() and regexec() */ @@ -596,7 +597,11 @@ main(int argc, char *argv[]) filebehave = FILE_MMAP; break; case 'V': +#ifdef WITH_GNU + printf(getstr(10), getprogname(), VERSION); +#else printf(getstr(9), getprogname(), VERSION); +#endif exit(0); case 'v': vflag = true; diff --git a/usr.bin/grep/nls/C.msg b/usr.bin/grep/nls/C.msg index 6327b2780726..fa753eb95ecc 100644 --- a/usr.bin/grep/nls/C.msg +++ b/usr.bin/grep/nls/C.msg @@ -11,3 +11,4 @@ $quote " 7 "\t[--null] [pattern] [file ...]\n" 8 "Binary file %s matches\n" 9 "%s (BSD grep) %s\n" +10 "%s (BSD grep, GNU compatible) %s\n" diff --git a/usr.bin/grep/nls/es_ES.ISO8859-1.msg b/usr.bin/grep/nls/es_ES.ISO8859-1.msg index 208e91d7987c..bad2ea6b3211 100644 --- a/usr.bin/grep/nls/es_ES.ISO8859-1.msg +++ b/usr.bin/grep/nls/es_ES.ISO8859-1.msg @@ -11,3 +11,4 @@ $quote " 7 "\t[--null] [pauta] [fichero ...]\n" 8 "fichero binario %s se ajusta\n" 9 "%s (BSD grep) %s\n" +10 "%s (BSD grep, GNU compatible) %s\n" diff --git a/usr.bin/grep/nls/gl_ES.ISO8859-1.msg b/usr.bin/grep/nls/gl_ES.ISO8859-1.msg index 9f3915a3dadf..84c4f5d02bb2 100644 --- a/usr.bin/grep/nls/gl_ES.ISO8859-1.msg +++ b/usr.bin/grep/nls/gl_ES.ISO8859-1.msg @@ -11,3 +11,4 @@ $quote " 7 "\t[--null] [pauta] [ficheiro ...]\n" 8 "ficheiro binario %s conforma\n" 9 "%s (BSD grep) %s\n" +10 "%s (BSD grep, GNU compatible) %s\n" diff --git a/usr.bin/grep/nls/hu_HU.ISO8859-2.msg b/usr.bin/grep/nls/hu_HU.ISO8859-2.msg index 6d3c1c91a83a..fd4a83c93b24 100644 --- a/usr.bin/grep/nls/hu_HU.ISO8859-2.msg +++ b/usr.bin/grep/nls/hu_HU.ISO8859-2.msg @@ -11,3 +11,4 @@ $quote " 7 "\t[--null] [minta] [f疔l ...]\n" 8 "%s bin疵is f疔l illeszkedik\n" 9 "%s (BSD grep) %s\n" +10 "%s (BSD grep, GNU compatible) %s\n" diff --git a/usr.bin/grep/nls/ja_JP.SJIS.msg b/usr.bin/grep/nls/ja_JP.SJIS.msg index d18edd523c6f..0d676d5c65d9 100644 --- a/usr.bin/grep/nls/ja_JP.SJIS.msg +++ b/usr.bin/grep/nls/ja_JP.SJIS.msg @@ -11,3 +11,4 @@ $quote " 7 "\t[--null] [パターン] [ファイル名 ...]\n" 8 "バイナリファイル %s にマッチしました\n" 9 "%s (BSD grep) %s\n" +10 "%s (BSD grep, GNU compatible) %s\n" diff --git a/usr.bin/grep/nls/ja_JP.UTF-8.msg b/usr.bin/grep/nls/ja_JP.UTF-8.msg index 84c6f4501081..44850986ac00 100644 --- a/usr.bin/grep/nls/ja_JP.UTF-8.msg +++ b/usr.bin/grep/nls/ja_JP.UTF-8.msg @@ -11,3 +11,4 @@ $quote " 7 "\t[--null] [繝代ち繝ｼ繝ｳ] [繝輔ぃ繧､繝ｫ蜷 ...]\n" 8 "繝舌う繝翫Μ繝輔ぃ繧､繝ｫ %s 縺ｫ繝槭ャ繝√＠縺ｾ縺励◆\n" 9 "%s (BSD grep) %s\n" +10 "%s (BSD grep, GNU compatible) %s\n" diff --git a/usr.bin/grep/nls/ja_JP.eucJP.msg b/usr.bin/grep/nls/ja_JP.eucJP.msg index e778c5f855a1..b9060dd8ff28 100644 --- a/usr.bin/grep/nls/ja_JP.eucJP.msg +++ b/usr.bin/grep/nls/ja_JP.eucJP.msg @@ -11,3 +11,4 @@ $quote " 7 "\t[--null] [･ﾑ･ｿ｡ｼ･] [･ﾕ･｡･､･ﾌｾ ...]\n" 8 "･ﾐ･､･ﾊ･･ﾕ･｡･､･ %s ､ﾋ･ﾞ･ﾃ･ﾁ､ｷ､ﾞ､ｷ､ｿ\n" 9 "%s (BSD grep) %s\n" +10 "%s (BSD grep, GNU compatible) %s\n" diff --git a/usr.bin/grep/nls/pt_BR.ISO8859-1.msg b/usr.bin/grep/nls/pt_BR.ISO8859-1.msg index 79c026ef5b71..07a74b7054dc 100644 --- a/usr.bin/grep/nls/pt_BR.ISO8859-1.msg +++ b/usr.bin/grep/nls/pt_BR.ISO8859-1.msg @@ -11,3 +11,4 @@ $quote " 7 "\t[--null] [padr縊] [arquivo ...]\n" 8 "arquivo bin疵io %s casa com o padr縊\n" 9 "%s (BSD grep) %s\n" +10 "%s (BSD grep, GNU compatible) %s\n" diff --git a/usr.bin/grep/nls/ru_RU.KOI8-R.msg b/usr.bin/grep/nls/ru_RU.KOI8-R.msg index 6880d51016c1..5dfa0ae4c0ea 100644 --- a/usr.bin/grep/nls/ru_RU.KOI8-R.msg +++ b/usr.bin/grep/nls/ru_RU.KOI8-R.msg @@ -11,3 +11,4 @@ $quote " 7 "\t[--null] [ﾛﾁﾂﾌﾏﾎ] [ﾆﾁﾊﾌ ...]\n" 8 "ﾄﾗﾏﾉﾞﾎﾙﾊ ﾆﾁﾊﾌ %s ﾓﾏﾗﾐﾁﾄﾁﾅﾔ\n" 9 "%s (BSD grep) %s\n" +10 "%s (BSD grep, GNU compatible) %s\n" diff --git a/usr.bin/grep/nls/uk_UA.UTF-8.msg b/usr.bin/grep/nls/uk_UA.UTF-8.msg index 4492d317bbed..a3d3d5508ec1 100644 --- a/usr.bin/grep/nls/uk_UA.UTF-8.msg +++ b/usr.bin/grep/nls/uk_UA.UTF-8.msg @@ -10,3 +10,4 @@ $quote " 7 "\t[--null] [ﾑ威ｰﾐｱﾐｻﾐｾﾐｽ] [ﾑﾐｰﾐｹﾐｻ ...]\n" 8 "ﾐｴﾐｲﾑ孟ｹﾐｺﾐｾﾐｲﾐｸﾐｹ ﾑﾐｰﾐｹﾐｻ %s ﾑﾐｿﾑ孟ｲﾐｿﾐｰﾐｴﾐｰﾑ能n" 9 "%s (BSD grep) %s\n" +10 "%s (BSD grep, GNU compatible) %s\n" diff --git a/usr.bin/grep/nls/zh_CN.UTF-8.msg b/usr.bin/grep/nls/zh_CN.UTF-8.msg index d5cd0c2ef665..a831bf3cb4bf 100644 --- a/usr.bin/grep/nls/zh_CN.UTF-8.msg +++ b/usr.bin/grep/nls/zh_CN.UTF-8.msg @@ -11,3 +11,4 @@ $quote " 7 "\t[--null] [讓｡蠑従 [譁莉ｶ蜷 ...]\n" 8 "莠瑚ｿ帛宛譁莉ｶ %s 蛹蜷ｫ讓｡蠑十n" 9 "%s (BSD grep) %s\n" +10 "%s (BSD grep, GNU compatible) %s\n"