From cbf0eb65e7bacca61a408b25429879f49c878a0b Mon Sep 17 00:00:00 2001 From: John Troy Date: Fri, 27 Sep 2024 19:29:44 +0000 Subject: [PATCH] unix: fix grep syntax to work on non-GNU greps CL 432835 changed two grep commands in unix/mkerrors.sh in such a way that is incompatible with AIX's grep, which, unlike GNU grep, does not support extended regular expressions without the -E flag. The intent of this PR is to restore the egrep behavior by invoking grep as grep -E. My assumption is that GNU grep is not meant to be a requirement to run mkerrors.sh, and given that, grep -E looks like the most cross-platform approach. Example of current (incorrect) behavior on AIX: bash-5.2$ printf 'SIGHUP\nSIGMAX64\nSIGTERM' | grep -v 'SIGSTKSIZE\|SIGSTKSZ\|SIGRT\|SIGMAX64' SIGHUP SIGMAX64 SIGTERM Behavior before CL 432835: bash-5.2$ printf 'SIGHUP\nSIGMAX64\nSIGTERM' | egrep -v '(SIGSTKSIZE|SIGSTKSZ|SIGRT|SIGMAX64)' SIGHUP SIGTERM Behavior of proposed change: bash-5.2$ printf 'SIGHUP\nSIGMAX64\nSIGTERM' | grep -E -v '(SIGSTKSIZE|SIGSTKSZ|SIGRT|SIGMAX64)' SIGHUP SIGTERM OpenBSD's grep behaves the same as AIX for the above commands, which is why I cast this as GNU vs. non-GNU. I haven't tested any other implementations. Fixes golang/go#69365 Change-Id: I009353ee630463475a5c131d019f59c5e69efd34 GitHub-Last-Rev: e1166046e1f6d97d0efe28f96e692f2df790be6f GitHub-Pull-Request: golang/sys#217 Reviewed-on: https://go-review.googlesource.com/c/sys/+/615755 Reviewed-by: Michael Knyszek Auto-Submit: Ian Lance Taylor LUCI-TryBot-Result: Go LUCI Reviewed-by: Ian Lance Taylor --- unix/mkerrors.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/unix/mkerrors.sh b/unix/mkerrors.sh index e14b766a3..ac54ecaba 100755 --- a/unix/mkerrors.sh +++ b/unix/mkerrors.sh @@ -656,7 +656,7 @@ errors=$( signals=$( echo '#include ' | $CC -x c - -E -dM $ccflags | awk '$1=="#define" && $2 ~ /^SIG[A-Z0-9]+$/ { print $2 }' | - grep -v 'SIGSTKSIZE\|SIGSTKSZ\|SIGRT\|SIGMAX64' | + grep -E -v '(SIGSTKSIZE|SIGSTKSZ|SIGRT|SIGMAX64)' | sort ) @@ -666,7 +666,7 @@ echo '#include ' | $CC -x c - -E -dM $ccflags | sort >_error.grep echo '#include ' | $CC -x c - -E -dM $ccflags | awk '$1=="#define" && $2 ~ /^SIG[A-Z0-9]+$/ { print "^\t" $2 "[ \t]*=" }' | - grep -v 'SIGSTKSIZE\|SIGSTKSZ\|SIGRT\|SIGMAX64' | + grep -E -v '(SIGSTKSIZE|SIGSTKSZ|SIGRT|SIGMAX64)' | sort >_signal.grep echo '// mkerrors.sh' "$@"