From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S932157AbcF1KVR (ORCPT ); Tue, 28 Jun 2016 06:21:17 -0400 Received: from mail-lf0-f67.google.com ([209.85.215.67]:34072 "EHLO mail-lf0-f67.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752436AbcF1KUW (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 22/32] ver_linux: wrap up querying for version of 'Linux C++ Library' in awk functions Date: Tue, 28 Jun 2016 13:18:56 +0300 Message-Id: <1467109146-20331-22-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', the code to process its output, and the resulting formatted output in awk functions. Signed-off-by: Alexander Kapshuk --- 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