linux-kernel - [PATCH 22/32] ver_linux: wrap up querying for version of 'Linux C++ Library' in awk functions

lists.openwall.net		lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC
Open Source and information security mailing list archives

Hash Suite: Windows password security audit tool. GUI, reports in PDF.

[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]

Message-Id: <1467109146-20331-22-git-send-email-alexander.kapshuk@gmail.com>
Date:	Tue, 28 Jun 2016 13:18:56 +0300
From:	Alexander Kapshuk <alexander.kapshuk@...il.com>
To:	linux-kernel@...r.kernel.org
Cc:	gregkh@...uxfoundation.org,
	Alexander Kapshuk <alexander.kapshuk@...il.com>
Subject: [PATCH 22/32] ver_linux: wrap up querying for version of 'Linux C++ Library' in awk functions

Wrap up querying for version of 'Linux C++ Library', the code to process
its output, and the resulting formatted output in awk functions.

Signed-off-by: Alexander Kapshuk <alexander.kapshuk@...il.com>
---
 scripts/ver_linux | 19 ++++++++-----------
 1 file changed, 8 insertions(+), 11 deletions(-)

diff --git a/scripts/ver_linux b/scripts/ver_linux
index 08f3d5b..6111489 100755
--- a/scripts/ver_linux
+++ b/scripts/ver_linux
@@ -43,18 +43,15 @@ BEGIN {
 
 	printversion("Dynamic linker (ldd)", version("ldd --version 2>&1"))
 
-libcpp=`ldconfig -p 2>/dev/null |
-	awk '/(libg|stdc)[+]+\.so/ {
-	print $NF
-	exit
+	while ("ldconfig -p 2>/dev/null" | getline > 0) {
+		if (/(libg|stdc)[+]+\.so/) {
+			libcpp = $NF
+			break
+		}
 	}
-'`
-test -r "$libcpp" &&
-ls -l $libcpp |
-sed '
-	s!.*so\.!!
-	s!^!Linux C++ Library\t!
-'
+	if (system("test -r " libcpp) == 0)
+		printversion("Linux C++ Library", version("readlink " libcpp))
+
 ps --version 2>&1 |
 awk '/version/{
 	match($0, /[0-9]+([.]?[0-9]+)+/)
-- 
2.7.3