From 536a22bcc42794669a213c6a3bc812cf3caaebcc Mon Sep 17 00:00:00 2001 From: Aaron Merey Date: Tue, 23 Apr 2024 14:07:37 -0400 Subject: [PATCH] Replace egrep with grep -E Prevents the following message: "warning: egrep is obsolescent; using grep -E" --- Makefile.am | 4 ++-- Makefile.in | 4 ++-- man/stap.1.in | 2 +- scripts/tracepoint-diff | 4 ++-- stap-report | 12 ++++++------ testsuite/systemtap.base/alias_tapset.exp | 2 +- testsuite/systemtap.base/implicitptr.exp | 2 +- testsuite/systemtap.base/vta-test.exp | 2 +- testsuite/systemtap.exelib/pthreadprobes.exp | 2 +- 9 files changed, 17 insertions(+), 17 deletions(-) diff --git a/Makefile.am b/Makefile.am index 46ee9e2a4..79d3209a5 100644 --- a/Makefile.am +++ b/Makefile.am @@ -284,7 +284,7 @@ endif (cd $(srcdir)/tapset; find . \( -name '*.stp' -o -name '*.stpm' -o -name README \) -print \ | while read f; do $(INSTALL_DATA) -D $$f $(DESTDIR)$(pkgdatadir)/tapset/$$f; done) (cd $(srcdir)/testsuite/systemtap.examples; find . -type f -print \ - | egrep -v 'check.exp|ChangeLog|examples-index-gen.pl|html/.*\.tmpl|metadatabase.dbq$$' \ + | grep -E -v 'check.exp|ChangeLog|examples-index-gen.pl|html/.*\.tmpl|metadatabase.dbq$$' \ | while read f; do if test -x $$f; then \ i_cmd="$(INSTALL_PROGRAM)"; else \ i_cmd="$(INSTALL_DATA)"; fi; \ @@ -444,7 +444,7 @@ install-uprobes: .PHONY: $(PHONIES) dist-gzip: - cd $(srcdir); git status | egrep 'working.(tree|directory).clean' || (echo "You should commit your changes before 'make rpm'.") + cd $(srcdir); git status | grep -E 'working.(tree|directory).clean' || (echo "You should commit your changes before 'make rpm'.") (cd $(srcdir); git archive --prefix=systemtap-$(VERSION)/ --format=tar HEAD) | gzip > systemtap-$(VERSION).tar.gz rpm: dist-gzip diff --git a/Makefile.in b/Makefile.in index b503404a6..46505a827 100644 --- a/Makefile.in +++ b/Makefile.in @@ -2672,7 +2672,7 @@ install-data-local: (cd $(srcdir)/tapset; find . \( -name '*.stp' -o -name '*.stpm' -o -name README \) -print \ | while read f; do $(INSTALL_DATA) -D $$f $(DESTDIR)$(pkgdatadir)/tapset/$$f; done) (cd $(srcdir)/testsuite/systemtap.examples; find . -type f -print \ - | egrep -v 'check.exp|ChangeLog|examples-index-gen.pl|html/.*\.tmpl|metadatabase.dbq$$' \ + | grep -E -v 'check.exp|ChangeLog|examples-index-gen.pl|html/.*\.tmpl|metadatabase.dbq$$' \ | while read f; do if test -x $$f; then \ i_cmd="$(INSTALL_PROGRAM)"; else \ i_cmd="$(INSTALL_DATA)"; fi; \ @@ -2806,7 +2806,7 @@ install-uprobes: .PHONY: $(PHONIES) dist-gzip: - cd $(srcdir); git status | egrep 'working.(tree|directory).clean' || (echo "You should commit your changes before 'make rpm'.") + cd $(srcdir); git status | grep -E 'working.(tree|directory).clean' || (echo "You should commit your changes before 'make rpm'.") (cd $(srcdir); git archive --prefix=systemtap-$(VERSION)/ --format=tar HEAD) | gzip > systemtap-$(VERSION).tar.gz rpm: dist-gzip diff --git a/man/stap.1.in b/man/stap.1.in index 6e04fc3e6..75bca6253 100644 --- a/man/stap.1.in +++ b/man/stap.1.in @@ -1347,7 +1347,7 @@ valid regular expression.) .PP The regular expression syntax supports POSIX Extended Regular Expression features as documented in -.IR egrep (1) +.IR grep (1) except for subexpression reuse ("\\1") functionality. .PP diff --git a/scripts/tracepoint-diff b/scripts/tracepoint-diff index 42b492dda..512bf8707 100755 --- a/scripts/tracepoint-diff +++ b/scripts/tracepoint-diff @@ -24,8 +24,8 @@ trap 'rm -fr $tmp' 0 1 2 3 5 9 15 # blocklist # ftrace:function: "virtual" tracepoint unusable by stap echo gathering perf tracepoint list -${PERF-perf} list tracepoint | grep Tracepoint | egrep -v 'sys_(enter|exit)_' \ - | egrep -v 'hcall_(entry|exit)'| egrep -v 'ftrace:function' \ +${PERF-perf} list tracepoint | grep Tracepoint | grep -E -v 'sys_(enter|exit)_' \ + | grep -E -v 'hcall_(entry|exit)'| grep -E -v 'ftrace:function' \ | awk '{print $1}' | sort > $tmp/perf perf_tracepoints=`wc -l $tmp/perf | cut -f1 -d' '` echo " perf found $perf_tracepoints tracepoints" diff --git a/stap-report b/stap-report index 25d3f6d03..671be33fd 100755 --- a/stap-report +++ b/stap-report @@ -82,28 +82,28 @@ run "which stap" run "cat $HOME/.systemtap/rc" run "which stap-server" run "locate --regex '/stap(run|io|dyn)?$' | xargs ls -ald" -run "printenv | egrep '^PATH=|^LD_LIBRARY_PATH=|^SYSTEMTAP_.*=|^XDG_DATA.*=|^NSS.*='" +run "printenv | grep -E '^PATH=|^LD_LIBRARY_PATH=|^SYSTEMTAP_.*=|^XDG_DATA.*=|^NSS.*='" run "stap -vv --vp 0002 --poison-cache -p4 -e 'probe begin {exit()}'" run "gcc -v" run "java -version" run "uname -a" run "dmesg | fgrep 'Linux version'" -run "dmesg | egrep 'stap|systemtap' | tail -n 10" +run "dmesg | grep -E 'stap|systemtap' | tail -n 10" run "hostname" run "nslookup `hostname`" run "cat /etc/hosts" run "cat /var/log/stap-server/log" -run "cat /proc/cpuinfo | egrep 'processor|vendor_id|model name|flags|bugs'" +run "cat /proc/cpuinfo | grep -E 'processor|vendor_id|model name|flags|bugs'" run "cat /sys/kernel/security/lockdown" if [ -x /usr/bin/dpkg ]; then # debian/ubuntu - run "dpkg --list | egrep 'systemtap|elfutils|kernel|linux|gcc|dyninst|java|byteman|avahi|nss|nspr|dejagnu|libdw' | awk '{print \$2,\$3}' | sort" + run "dpkg --list | grep -E 'systemtap|elfutils|kernel|linux|gcc|dyninst|java|byteman|avahi|nss|nspr|dejagnu|libdw' | awk '{print \$2,\$3}' | sort" elif [ -x /usr/bin/rpm -o -x /bin/rpm ]; then # fedora/rhel/suse/... - run "rpm -qa --qf '%{name}-%{version} %{release}.%{arch}\\t%{buildtime:date}@%{buildhost}\\n' | egrep 'systemtap|elfutils|kernel|gcc|dyninst|java|byteman|avahi|nss|nspr|dejagnu|libdw' | sort" + run "rpm -qa --qf '%{name}-%{version} %{release}.%{arch}\\t%{buildtime:date}@%{buildhost}\\n' | grep -E 'systemtap|elfutils|kernel|gcc|dyninst|java|byteman|avahi|nss|nspr|dejagnu|libdw' | sort" elif [ -f /var/log/packages ]; then # slackware - run "cat /var/log/packages | egrep 'systemtap|elfutils|kernel|gcc|dyninst|java|byteman|avahi|nss|nspr|dejagnu' | sort -k9" + run "cat /var/log/packages | grep -E 'systemtap|elfutils|kernel|gcc|dyninst|java|byteman|avahi|nss|nspr|dejagnu' | sort -k9" fi run "egrep 'PROBE|RANDOMIZE|RELOC|TRACE|MARKER|KALLSYM|_DEBUG_|LOCKDEP|LOCKING|MODULE|FENTRY|_SIG|BPF' /lib/modules/`uname -r`/build/.config | grep -v not.set | sort | fmt -w 80" run "find /debugfs /proc/sys /sys/kernel /dev -type f -path '*kprobe*' -o -path '*yama*' 2>/dev/null | xargs grep -H ." diff --git a/testsuite/systemtap.base/alias_tapset.exp b/testsuite/systemtap.base/alias_tapset.exp index 50b1c0175..39b262643 100644 --- a/testsuite/systemtap.base/alias_tapset.exp +++ b/testsuite/systemtap.base/alias_tapset.exp @@ -7,7 +7,7 @@ set never_found 0 set kernel_function_found 0 set timer_found 0 -set cmd "bash -c {stap -p2 -I $srcdir/$subdir/${test} $srcdir/$subdir/${test}.stp | egrep '^kprobe|^kernel|^never|^timer'}" +set cmd "bash -c {stap -p2 -I $srcdir/$subdir/${test} $srcdir/$subdir/${test}.stp | grep -E '^kprobe|^kernel|^never|^timer'}" verbose -log "running $cmd" eval spawn $cmd expect { diff --git a/testsuite/systemtap.base/implicitptr.exp b/testsuite/systemtap.base/implicitptr.exp index 9e32ed6af..01af33292 100644 --- a/testsuite/systemtap.base/implicitptr.exp +++ b/testsuite/systemtap.base/implicitptr.exp @@ -13,7 +13,7 @@ set listspec "process(\"$test.exe\").statement(\"foo@*:17\")" proc exe_uses_implicit_ptr {exe} { if {[catch {exec readelf --debug-dump=info,loc $exe | \ - egrep -q {implicit_pointer| f2 .*User defined location op}} \ + grep -E -q {implicit_pointer| f2 .*User defined location op}} \ results]} { verbose -log "exe_uses_implicit_ptr caught: $results" return 0 diff --git a/testsuite/systemtap.base/vta-test.exp b/testsuite/systemtap.base/vta-test.exp index 82d76ff07..7de581035 100644 --- a/testsuite/systemtap.base/vta-test.exp +++ b/testsuite/systemtap.base/vta-test.exp @@ -41,7 +41,7 @@ for {set i 0} {$i < [all_compile_flags]} {incr i} { # DW_OP_stack_value for us. set regexp {[stack|implicit]_value} if {![catch {exec readelf --debug-dump=loc $test-$extra_name.exe \ - | egrep "$regexp"}]} { + | grep -E "$regexp"}]} { foreach runtime [get_runtime_list] { if {$runtime != ""} { if { [info procs ${runtime}_kfails] ne "" } { diff --git a/testsuite/systemtap.exelib/pthreadprobes.exp b/testsuite/systemtap.exelib/pthreadprobes.exp index d76a2a0e3..1be4aaded 100644 --- a/testsuite/systemtap.exelib/pthreadprobes.exp +++ b/testsuite/systemtap.exelib/pthreadprobes.exp @@ -8,7 +8,7 @@ if {$err != "" && [file exists $test]} then { fail "$test compile $err" } else { # find the location of the pthread library - catch {exec /usr/bin/ldd $test | egrep {^\s*libpthread.so} | awk {{print $3}} } pthread + catch {exec /usr/bin/ldd $test | grep -E {^\s*libpthread.so} | awk {{print $3}} } pthread } # First thing, do we have a version of glibc with the probes?? -- 2.43.5