Merge tag 'spi-fix-v4.19-rc4' of https://git.kernel.org/pub/scm/linux/kernel/git...

[linux-2.6-block.git] / scripts / ver_linux

diff --git a/scripts/ver_linux b/scripts/ver_linux
index 7227994ccf63a2a96732399457c0384452672d8a..a6c728db05ce06ab3d82cd1be9944ace1789b114 100755 (executable)
--- a/scripts/ver_linux
+++ b/scripts/ver_linux
@@ -32,11 +32,13 @@ BEGIN {
        printversion("Nfs-utils", version("showmount --version"))
 
        while (getline <"/proc/self/maps" > 0) {
-               n = split($0, procmaps, "/")
-               if (/libc.*so$/ && match(procmaps[n], /[0-9]+([.]?[0-9]+)+/)) {
-                       ver = substr(procmaps[n], RSTART, RLENGTH)
-                       printversion("Linux C Library", ver)
-                       break
+               if (/libc.*\.so$/) {
+                       n = split($0, procmaps, "/")
+                       if (match(procmaps[n], /[0-9]+([.]?[0-9]+)+/)) {
+                               ver = substr(procmaps[n], RSTART, RLENGTH)
+                               printversion("Linux C Library", ver)
+                               break
+                       }
                }
        }
 
@@ -68,7 +70,7 @@ BEGIN {
 function version(cmd,    ver) {
        cmd = cmd " 2>&1"
        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)
                        break
                }