From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S932088AbbJLSlF (ORCPT ); Mon, 12 Oct 2015 14:41:05 -0400 Received: from mail-lb0-f179.google.com ([209.85.217.179]:36513 "EHLO mail-lb0-f179.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752275AbbJLSlA (ORCPT ); Mon, 12 Oct 2015 14:41:00 -0400 From: Alexander Kapshuk To: linux-kernel@vger.kernel.org Cc: gregkh@linuxfoundation.org, jim.epost@gmail.com, richard@nod.at, tytso@mit.edu, Alexander Kapshuk Subject: [PATCH 14/22] ver_linux: ldd, look for numerical input, not field number Date: Mon, 12 Oct 2015 21:39:54 +0300 Message-Id: <1444675202-1375-14-git-send-email-alexander.kapshuk@gmail.com> X-Mailer: git-send-email 2.4.9 In-Reply-To: <1444675202-1375-1-git-send-email-alexander.kapshuk@gmail.com> References: <1444675202-1375-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 Rely on regex to find the version number, rather than rely on numerical input to be found in a particular input field. Proposed implementation also eliminates the necessity to invoke 'head' + 'awk'. The '-v' flag either seems to have been deprecated in some distros, e.g. Gentoo, or is an alias for '--version' in others. The proposed implementation uses the latter flag only. Signed-off-by: Alexander Kapshuk --- scripts/ver_linux | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/scripts/ver_linux b/scripts/ver_linux index 909d039..a7d0eca 100755 --- a/scripts/ver_linux +++ b/scripts/ver_linux @@ -114,8 +114,12 @@ sed ' q ' /proc/self/maps -ldd -v > /dev/null 2>&1 && ldd -v || ldd --version |head -n 1 | awk \ -'NR==1{print "Dynamic linker (ldd) ", $NF}' +ldd --version 2>&1 | +awk '/^ldd/{ + match($0, /[0-9]+([.]?[0-9]+)+/) + printf("Dynamic linker (ldd)\t%s\n", + substr($0,RSTART,RLENGTH)) +}' ls -l /usr/lib/libg++.so /usr/lib/libstdc++.so 2>/dev/null | awk -F. \ '{print "Linux C++ Library " $4"."$5"."$6}' -- 2.4.9