From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752516AbcF1KXo (ORCPT ); Tue, 28 Jun 2016 06:23:44 -0400 Received: from mail-lf0-f66.google.com ([209.85.215.66]:34049 "EHLO mail-lf0-f66.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752385AbcF1KUW (ORCPT ); Tue, 28 Jun 2016 06:20:22 -0400 From: Alexander Kapshuk To: linux-kernel@vger.kernel.org Cc: gregkh@linuxfoundation.org, Alexander Kapshuk Subject: [PATCH 20/32] ver_linux: wrap up querying for version of 'Linux C Library' in awk function Date: Tue, 28 Jun 2016 13:18:54 +0300 Message-Id: <1467109146-20331-20-git-send-email-alexander.kapshuk@gmail.com> X-Mailer: git-send-email 2.7.3 In-Reply-To: <1467109146-20331-1-git-send-email-alexander.kapshuk@gmail.com> References: <1467109146-20331-1-git-send-email-alexander.kapshuk@gmail.com> Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Wrap up querying for version of 'Linux C Library', and the resulting formatted output in an awk function. Signed-off-by: Alexander Kapshuk --- scripts/ver_linux | 16 ++++++++++------ 1 file changed, 10 insertions(+), 6 deletions(-) diff --git a/scripts/ver_linux b/scripts/ver_linux index bb51c5d..d3faf4a 100755 --- a/scripts/ver_linux +++ b/scripts/ver_linux @@ -30,12 +30,16 @@ BEGIN { printversion("Isdn4k-utils", version("isdnctrl 2>&1")) printversion("Nfs-utils", version("showmount --version 2>&1")) -test -r /proc/self/maps && -sed ' - /.*libc-\(.*\)\.so$/!d - s//Linux C Library\t\t\1/ - q -' /proc/self/maps + if (system("test -r /proc/self/maps") == 0) { + 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 + } + } + } ldd --version 2>&1 | awk '/^ldd/{ -- 2.7.3