Source-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[src/trunk]: src/lib Robustness fix: handle libraries that contain . in their...



details:   https://anonhg.NetBSD.org/src/rev/1e948dd36536
branches:  trunk
changeset: 1023588:1e948dd36536
user:      christos <christos%NetBSD.org@localhost>
date:      Fri Sep 17 02:12:16 2021 +0000

description:
Robustness fix: handle libraries that contain . in their basename.

diffstat:

 lib/checkver |  14 ++++++++++----
 1 files changed, 10 insertions(+), 4 deletions(-)

diffs (31 lines):

diff -r 15492f032353 -r 1e948dd36536 lib/checkver
--- a/lib/checkver      Thu Sep 16 23:32:49 2021 +0000
+++ b/lib/checkver      Fri Sep 17 02:12:16 2021 +0000
@@ -1,5 +1,5 @@
 #!/bin/sh
-#      $NetBSD: checkver,v 1.16 2013/02/17 02:36:21 christos Exp $
+#      $NetBSD: checkver,v 1.17 2021/09/17 02:12:16 christos Exp $
 #
 # Copyright (c) 1998 The NetBSD Foundation, Inc.
 # All rights reserved.
@@ -96,11 +96,17 @@
 usefile=0
 usesets=0
 CWD=$(pwd)
+: ${AWK:=awk}
 
 fixone() {
-       local instmajor=$(basename $1 | awk 'BEGIN { FS="." } { print $3 }')
-       local instminor=$(basename $1 | awk 'BEGIN { FS="." } { print $4 }')
-       local instteeny=$(basename $1 | awk 'BEGIN { FS="." } { print $5 + 0 }')
+       eval $(${AWK} -v 'LIB=$1' '
+BEGIN {
+       gsub(".*\.so\.", "", LIB);
+       split(LIB, VER, ".");
+       printf("local instmajor=%d\n", V[1] + 0);
+       printf("local instminor=%d\n", V[2] + 0);
+       printf("local instteeny=%d\n", V[3] + 0);
+}')
        local ms="The following libraries have versions greater than the source"
 
        # If they're greater than the source, complain.



Home | Main Index | Thread Index | Old Index