Commit 71bdd87f authored by Alexander Kapshuk's avatar Alexander Kapshuk Committed by Greg Kroah-Hartman

ver_linux: Do not check for ver_linux pattern in version function

Checking whether output of commands matches the ver_linux pattern in
the version function is original shell implementation legacy code. When
the original implementation failed to locate a particular utility,
it generated error output along the lines of:

ver_linux:line number: command not found.

The awk implementation, does not contain the name of the script within the
body of the error message returned by the subshell when a given utility
fails to be located. The error message returned is along the lines of:

sh: name of utility: command not found

Safeguarding against the ver_linux pattern being found in the output
being parsed may thus be safely omitted.
Signed-off-by: default avatarAlexander Kapshuk <alexander.kapshuk@gmail.com>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 34fe3cfd
...@@ -70,7 +70,7 @@ BEGIN { ...@@ -70,7 +70,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 (!/ver_linux/ && match($0, /[0-9]+([.]?[0-9]+)+/)) { if (match($0, /[0-9]+([.]?[0-9]+)+/)) {
ver = substr($0, RSTART, RLENGTH) ver = substr($0, RSTART, RLENGTH)
break break
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment