From 637e5adc5ed4fc4a2079fda68df9fcfe3f107f59 Mon Sep 17 00:00:00 2001 From: kxxt Date: Thu, 22 Sep 2022 22:59:24 +0800 Subject: [PATCH 1/3] refactor: use grep -E instead of egrep Change-Id: Iedeb3433c5d27488e7de0199a7f3effe1d79c82a --- plan9/mkerrors.sh | 4 ++-- unix/mkerrors.sh | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/plan9/mkerrors.sh b/plan9/mkerrors.sh index 85309c4a5b..4390e83bd6 100755 --- a/plan9/mkerrors.sh +++ b/plan9/mkerrors.sh @@ -126,7 +126,7 @@ errors=$( signals=$( echo '#include ' | $CC -x c - -E -dM $ccflags | awk '$1=="#define" && $2 ~ /^SIG[A-Z0-9]+$/ { print $2 }' | - egrep -v '(SIGSTKSIZE|SIGSTKSZ|SIGRT)' | + grep -Ev '(SIGSTKSIZE|SIGSTKSZ|SIGRT)' | sort ) @@ -136,7 +136,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]*=" }' | - egrep -v '(SIGSTKSIZE|SIGSTKSZ|SIGRT)' | + grep -Ev '(SIGSTKSIZE|SIGSTKSZ|SIGRT)' | sort >_signal.grep echo '// mkerrors.sh' "$@" diff --git a/unix/mkerrors.sh b/unix/mkerrors.sh index 2ab44aa659..0656479580 100755 --- a/unix/mkerrors.sh +++ b/unix/mkerrors.sh @@ -642,7 +642,7 @@ errors=$( signals=$( echo '#include ' | $CC -x c - -E -dM $ccflags | awk '$1=="#define" && $2 ~ /^SIG[A-Z0-9]+$/ { print $2 }' | - egrep -v '(SIGSTKSIZE|SIGSTKSZ|SIGRT|SIGMAX64)' | + grep -Ev '(SIGSTKSIZE|SIGSTKSZ|SIGRT|SIGMAX64)' | sort ) @@ -652,7 +652,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]*=" }' | - egrep -v '(SIGSTKSIZE|SIGSTKSZ|SIGRT|SIGMAX64)' | + grep -Ev '(SIGSTKSIZE|SIGSTKSZ|SIGRT|SIGMAX64)' | sort >_signal.grep echo '// mkerrors.sh' "$@" From 9f5c279168775de67ef8b2cde9d0f6ff5f827839 Mon Sep 17 00:00:00 2001 From: kxxt Date: Sat, 1 Oct 2022 08:07:51 +0800 Subject: [PATCH 2/3] simplify egrep syntax Change-Id: I1d9ccc8dd70051a962a2cc5195cb08148d5c3549 --- plan9/mkerrors.sh | 4 ++-- unix/mkerrors.sh | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/plan9/mkerrors.sh b/plan9/mkerrors.sh index 4390e83bd6..70355d699a 100755 --- a/plan9/mkerrors.sh +++ b/plan9/mkerrors.sh @@ -126,7 +126,7 @@ errors=$( signals=$( echo '#include ' | $CC -x c - -E -dM $ccflags | awk '$1=="#define" && $2 ~ /^SIG[A-Z0-9]+$/ { print $2 }' | - grep -Ev '(SIGSTKSIZE|SIGSTKSZ|SIGRT)' | + grep -Ev 'SIGSTKSIZE|SIGSTKSZ|SIGRT' | sort ) @@ -136,7 +136,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 -Ev '(SIGSTKSIZE|SIGSTKSZ|SIGRT)' | + grep -Ev 'SIGSTKSIZE|SIGSTKSZ|SIGRT' | sort >_signal.grep echo '// mkerrors.sh' "$@" diff --git a/unix/mkerrors.sh b/unix/mkerrors.sh index 0656479580..bcfb55b6c7 100755 --- a/unix/mkerrors.sh +++ b/unix/mkerrors.sh @@ -642,7 +642,7 @@ errors=$( signals=$( echo '#include ' | $CC -x c - -E -dM $ccflags | awk '$1=="#define" && $2 ~ /^SIG[A-Z0-9]+$/ { print $2 }' | - grep -Ev '(SIGSTKSIZE|SIGSTKSZ|SIGRT|SIGMAX64)' | + grep -Ev 'SIGSTKSIZE|SIGSTKSZ|SIGRT|SIGMAX64' | sort ) @@ -652,7 +652,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 -Ev '(SIGSTKSIZE|SIGSTKSZ|SIGRT|SIGMAX64)' | + grep -Ev 'SIGSTKSIZE|SIGSTKSZ|SIGRT|SIGMAX64' | sort >_signal.grep echo '// mkerrors.sh' "$@" From 1eee6147666503d274b244a65daa58cded466704 Mon Sep 17 00:00:00 2001 From: kxxt Date: Sat, 1 Oct 2022 08:12:21 +0800 Subject: [PATCH 3/3] use grep Change-Id: I94e912c90f2f0e3c4eee5b8f3d1a67d3a58ee066 --- plan9/mkerrors.sh | 4 ++-- unix/mkerrors.sh | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/plan9/mkerrors.sh b/plan9/mkerrors.sh index 70355d699a..526d04ab68 100755 --- a/plan9/mkerrors.sh +++ b/plan9/mkerrors.sh @@ -126,7 +126,7 @@ errors=$( signals=$( echo '#include ' | $CC -x c - -E -dM $ccflags | awk '$1=="#define" && $2 ~ /^SIG[A-Z0-9]+$/ { print $2 }' | - grep -Ev 'SIGSTKSIZE|SIGSTKSZ|SIGRT' | + grep -v 'SIGSTKSIZE\|SIGSTKSZ\|SIGRT' | sort ) @@ -136,7 +136,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 -Ev 'SIGSTKSIZE|SIGSTKSZ|SIGRT' | + grep -v 'SIGSTKSIZE\|SIGSTKSZ\|SIGRT' | sort >_signal.grep echo '// mkerrors.sh' "$@" diff --git a/unix/mkerrors.sh b/unix/mkerrors.sh index bcfb55b6c7..7456d9ddde 100755 --- a/unix/mkerrors.sh +++ b/unix/mkerrors.sh @@ -642,7 +642,7 @@ errors=$( signals=$( echo '#include ' | $CC -x c - -E -dM $ccflags | awk '$1=="#define" && $2 ~ /^SIG[A-Z0-9]+$/ { print $2 }' | - grep -Ev 'SIGSTKSIZE|SIGSTKSZ|SIGRT|SIGMAX64' | + grep -v 'SIGSTKSIZE\|SIGSTKSZ\|SIGRT\|SIGMAX64' | sort ) @@ -652,7 +652,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 -Ev 'SIGSTKSIZE|SIGSTKSZ|SIGRT|SIGMAX64' | + grep -v 'SIGSTKSIZE\|SIGSTKSZ\|SIGRT\|SIGMAX64' | sort >_signal.grep echo '// mkerrors.sh' "$@"