linux-kernel - [PATCH 25/32] ver_linux: wrap up call to 'loadkeys -V' in awk function

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]

Date:	Tue, 28 Jun 2016 13:18:59 +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 25/32] ver_linux: wrap up call to 'loadkeys -V' in awk function

Wrap up the call to 'loadkeys -V', 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 | 9 ++-------
 1 file changed, 2 insertions(+), 7 deletions(-)

diff --git a/scripts/ver_linux b/scripts/ver_linux
index ac5a7f9..5eff838 100755
--- a/scripts/ver_linux
+++ b/scripts/ver_linux
@@ -54,13 +54,8 @@ BEGIN {
 
 	printversion("Procps", version("ps --version 2>&1"))
 	printversion("Net-tools", version("ifconfig --version 2>&1"))
-
-loadkeys -V 2>&1 |
-awk '/[0-9]+([.]?[0-9]+)+/ && !/not found$/{
-	match($0, /[0-9]+([.]?[0-9]+)+/)
-	$0 = substr($0,RSTART,RLENGTH)
-	printf("Kbd\t\t\t%s\nConsole-tools\t\t%s\n",$0,$0)
-}'
+	printversion("Kbd", version("loadkeys -V 2>&1"))
+	printversion("Console-tools", version("loadkeys -V 2>&1"))
 
 oprofiled --version 2>&1 | awk \
 '(NR==1 && ($2 == "oprofile")) {print "oprofile              ", $3}'
-- 
2.7.3