config: add $egrep

Introduce a new variable set in $PLAN9/config:
$egrep, which is conditionally set to either
`egrep` or `grep -E`, based on platform, and use
this when we want to invoke `egrep`.

This works around the endless warnings from GNU
grep stating that `egrep` is deprecated in favor
of `grep -E`, when run on e.g. Linux.

9 files changed, 27 insertions, 11 deletions

diff --git a/INSTALL b/INSTALL
index bfc08d52..f64b8acd 100755
--- a/INSTALL
+++ b/INSTALL
@@ -65,11 +65,18 @@ DragonFly|*BSD)
 	echo "CFLAGS='-pthread'" >> $PLAN9/config
 	awk=awk
 	;;
+*Linux*)
+	awk=awk
+	egrep='grep -E'
+	;;
 *)
+	egrep=egrep
 	awk=awk
 	;;
 esac
 
+echo "egrep='$egrep'" >>$PLAN9/config
+
 (
 if [ `uname` = SunOS ]; then
 	# On Solaris x86, uname -p cannot be trusted.
diff --git a/bin/9c b/bin/9c
index ccfbe7e9..195fec81 100755
--- a/bin/9c
+++ b/bin/9c
@@ -8,6 +8,7 @@ usegcc()
 		-O2 \
 		-c \
 		-Wall \
+		-Wno-array-parameter \
 		-Wno-parentheses \
 		-Wno-missing-braces \
 		-Wno-switch \
@@ -23,7 +24,7 @@ usegcc()
 		-fno-omit-frame-pointer \
 		-fsigned-char \
 		-fcommon \
-		-std=c11 \
+		-std=gnu11 \
 	"
 	# want to put -fno-optimize-sibling-calls here but
 	# that option only works with gcc3+ it seems
@@ -56,7 +57,7 @@ quiet()
 	ignore=$ignore'|expanded from macro'
 
 	grep -v '__p9l_autolib_' "$1" |
-	egrep -v "$ignore" |
+	$egrep -v "$ignore" |
 	sed 's/ .first use in this function.$//; s/\"\([^\"][^\"]*\)\", line \([0-9][0-9]*\)/\1:\2/g' |
 	$(which uniq) 1>&2  # avoid built-in uniq on SunOS
 }
diff --git a/bin/9l b/bin/9l
index 2b1c5906..e3079e38 100755
--- a/bin/9l
+++ b/bin/9l
@@ -146,7 +146,7 @@ then
 					grep '__p9l_autolib_[a-zA-Z0-9+-]*' |
 					sed 's/.*__p9l_autolib_//; s/:.*//' |
 					sort -u |
-					egrep -v '^(thread|draw)$'
+					$egrep -v '^(thread|draw)$'
 				`
 				a="$a $b"
 			done
@@ -337,7 +337,7 @@ quiet()
 	ignore=$ignore'|ld: warning: ignoring duplicate libraries:'
 
 	sed 's/.*: In function `[^:]*: *//' "$1" |
-	egrep -v "$ignore"
+	$egrep -v "$ignore"
 }
 
 # Must use temp file to avoid pipe; pipe loses status.
diff --git a/dist/checkman.awk b/dist/checkman.awk
index 947888dc..eebb4370 100644
--- a/dist/checkman.awk
+++ b/dist/checkman.awk
@@ -446,7 +446,7 @@ END {
 			gsub("\\(", " \\(", b)
 			gsub("\\)", "\\)", b)
 			split(tolower(i), a, "/")
-			print "egrep -in '^\\.IR.*" b "' $PLAN9/man/man*/* # Need " tolower(i) |"sort"
+			print "grep -in '^\\.IR.*" b "' $PLAN9/man/man*/* # Need " tolower(i) |"sort"
 		}
 	}
 	close("sort")
diff --git a/src/cmd/auxstats/mkfile b/src/cmd/auxstats/mkfile
index 818e9d39..9ff0e65b 100644
--- a/src/cmd/auxstats/mkfile
+++ b/src/cmd/auxstats/mkfile
@@ -12,6 +12,6 @@ HFILES=\
 
 <$PLAN9/src/mkone
 
-KVM=`{if uname |egrep 'BSD' | egrep -v 'OpenBSD' >/dev/null; then echo -lkvm; fi}
+KVM=`{if uname | grep 'BSD' | grep -v 'OpenBSD' >/dev/null; then echo -lkvm; fi}
 LDFLAGS=$LDFLAGS $KVM
 
diff --git a/src/cmd/devdraw/mkwsysrules.sh b/src/cmd/devdraw/mkwsysrules.sh
index 56dff55a..f41d173e 100644
--- a/src/cmd/devdraw/mkwsysrules.sh
+++ b/src/cmd/devdraw/mkwsysrules.sh
@@ -24,7 +24,7 @@ fi
 
 if [ "x$WSYSTYPE" = "x" ]; then
 	if [ "x`uname`" = "xDarwin" ]; then
-		if sw_vers | egrep 'ProductVersion:	(10\.[0-9]\.|10\.1[012])$' >/dev/null; then
+		if sw_vers | $egrep 'ProductVersion:	(10\.[0-9]\.|10\.1[012])$' >/dev/null; then
 			echo 1>&2 'OS X 10.12 and older are not supported'
 			exit 1
 		fi
diff --git a/src/cmd/mkfile b/src/cmd/mkfile
index 2d0c657e..ac98725a 100644
--- a/src/cmd/mkfile
+++ b/src/cmd/mkfile
@@ -1,11 +1,11 @@
 <$PLAN9/src/mkhdr
 
-TARG=`ls *.[cy] *.lx | egrep -v "\.tab\.c$|^x\." | sed 's/\.[cy]//; s/\.lx//'`
+TARG=`ls *.[cy] *.lx | $egrep -v "\.tab\.c$|^x\." | sed 's/\.[cy]//; s/\.lx//'`
 
 <$PLAN9/src/mkmany
 
 BUGGERED='CVS|faces|factotum|lp|ip|mailfs|upas|vncv|mnihongo|mpm|index|u9fs|secstore|smugfs|snarfer'
-DIRS=lex `ls -l |sed -n 's/^d.* //p' |egrep -v "^($BUGGERED)$"|egrep -v '^lex$'` $FONTSRV
+DIRS=lex `ls -l |sed -n 's/^d.* //p' |$egrep -v "^($BUGGERED)$"|grep -v '^lex$'` $FONTSRV
 
 <$PLAN9/src/mkdirs
 
diff --git a/src/cmd/rc/checkparse b/src/cmd/rc/checkparse
index 0a1472b2..4ddd0910 100755
--- a/src/cmd/rc/checkparse
+++ b/src/cmd/rc/checkparse
@@ -1,5 +1,13 @@
 #!/bin/bash
 
+egrep=egrep
+tag="${SYSNAME:-`uname`}"
+case "$tag" in
+*Linux*)
+	egrep='grep -E'
+	;;
+esac
+
 aflag=false
 if [ "$1" = -a ]; then
 	aflag=true
@@ -10,7 +18,7 @@ files="$@"
 if [ $# = 0 ]; then
 	files=$(echo ./test.rc;
 		grep -l '^#!/usr/local/plan9/bin/rc' /usr/local/plan9/bin/{*,*/*} 2>/dev/null;
-		grep -R -l '^#!/bin/rc' $HOME/pub/plan9 | egrep -v 'plan9/(lib/(oui|pci)|sys/man|sys/lib/man|sys/lib/scsicodes)' 2>/dev/null)
+		grep -R -l '^#!/bin/rc' $HOME/pub/plan9 | $egrep -v 'plan9/(lib/(oui|pci)|sys/man|sys/lib/man|sys/lib/scsicodes)' 2>/dev/null)
 fi
 
 for i in $files
diff --git a/src/mkfile b/src/mkfile
index d17ca6b6..c18109fe 100644
--- a/src/mkfile
+++ b/src/mkfile
@@ -1,7 +1,7 @@
 <mkhdr
 
 BUGGERED='fs|fmt|utf'
-LIBDIRS=`ls -ld lib* | sed -n 's/^d.* //p' |egrep -v "^lib($BUGGERED)$"`
+LIBDIRS=`ls -ld lib* | sed -n 's/^d.* //p' |$egrep -v "^lib($BUGGERED)$"`
 
 DIRS=\
 	$LIBDIRS\