OpenE2K/linux
6
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

ver_linux: Assign constant RE to variable name for clarity

Browse Source 
The regular expression that matches the version number of a utility
being queried is used as a constant expression in the current
implementation. Assigning the RE in question to a variable gives it a
meaningful name that clearly expresses the intended use of the expression
without having to think about the details of implementation.

Signed-off-by: Alexander Kapshuk <alexander.kapshuk@gmail.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
This commit is contained in:
Alexander Kapshuk 2019-01-05 19:09:23 +02:00 committed by Greg Kroah-Hartman
parent d7ac3c6ef5
commit 2ca46ed207
1 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
scripts/ver_linux
View File

@ -13,6 +13,8 @@ BEGIN {
system("uname -a") system("uname -a")
printf("\n") printf("\n")
vernum = "[0-9]+([.]?[0-9]+)+"
printversion("GNU C", version("gcc -dumpversion")) printversion("GNU C", version("gcc -dumpversion"))
printversion("GNU Make", version("make --version")) printversion("GNU Make", version("make --version"))
printversion("Binutils", version("ld -v")) printversion("Binutils", version("ld -v"))
@ -34,7 +36,7 @@ BEGIN {
while (getline <"/proc/self/maps" > 0) { while (getline <"/proc/self/maps" > 0) {
if (/libc.*\.so$/) { if (/libc.*\.so$/) {
n = split($0, procmaps, "/") n = split($0, procmaps, "/")
if (match(procmaps[n], /[0-9]+([.]?[0-9]+)+/)) { if (match(procmaps[n], vernum)) {
ver = substr(procmaps[n], RSTART, RLENGTH) ver = substr(procmaps[n], RSTART, RLENGTH)
printversion("Linux C Library", ver) printversion("Linux C Library", ver)
break break
@ -70,7 +72,7 @@ BEGIN {
function version(cmd, ver) { function version(cmd, ver) {
cmd = cmd " 2>&1" cmd = cmd " 2>&1"
while (cmd | getline > 0) { while (cmd | getline > 0) {
if (match($0, /[0-9]+([.]?[0-9]+)+/)) { if (match($0, vernum)) {
ver = substr($0, RSTART, RLENGTH) ver = substr($0, RSTART, RLENGTH)
break break
} }