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 <kevans91 at ksu.edu>
Reported by:	mandree
Differential Revision:	https://reviews.freebsd.org/D10451
This commit is contained in:
Ed Maste 2017-05-02 13:38:20 +00:00
parent 16804dc779
commit cc41ba26bb
Notes: svn2git 2020-12-20 02:59:44 +00:00
svn path=/head/; revision=317678
13 changed files with 17 additions and 1 deletions

View File

@ -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

View File

@ -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;

View File

@ -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"

View File

@ -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"

View File

@ -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"

View File

@ -11,3 +11,4 @@ $quote "
7 "\t[--null] [minta] [fájl ...]\n"
8 "%s bináris fájl illeszkedik\n"
9 "%s (BSD grep) %s\n"
10 "%s (BSD grep, GNU compatible) %s\n"

View File

@ -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"

View File

@ -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"

View File

@ -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"

View File

@ -11,3 +11,4 @@ $quote "
7 "\t[--null] [padrão] [arquivo ...]\n"
8 "arquivo binário %s casa com o padrão\n"
9 "%s (BSD grep) %s\n"
10 "%s (BSD grep, GNU compatible) %s\n"

View File

@ -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"

View File

@ -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"

View File

@ -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"