CVS commit: pkgsrc/pkgtools/check-portability

["Roland Illig" <rillig%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   rillig
Date:           Sat May 23 22:18:11 UTC 2020

Modified Files:
        pkgsrc/pkgtools/check-portability: Makefile
        pkgsrc/pkgtools/check-portability/files: check-portability.c
        pkgsrc/pkgtools/check-portability/files/testdata: zzz_expected

Log Message:
pkgtools/check-portability: update to 20.1.1

Changes since 20.1.0:

Fixed off-by-one error in diagnostic for test ==.


To generate a diff of this commit:
cvs rdiff -u -r1.9 -r1.10 pkgsrc/pkgtools/check-portability/Makefile
cvs rdiff -u -r1.15 -r1.16 \
    pkgsrc/pkgtools/check-portability/files/check-portability.c
cvs rdiff -u -r1.1 -r1.2 \
    pkgsrc/pkgtools/check-portability/files/testdata/zzz_expected

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/pkgtools/check-portability/Makefile
diff -u pkgsrc/pkgtools/check-portability/Makefile:1.9 pkgsrc/pkgtools/check-portability/Makefile:1.10
--- pkgsrc/pkgtools/check-portability/Makefile:1.9      Sun Apr 19 12:05:14 2020
+++ pkgsrc/pkgtools/check-portability/Makefile  Sat May 23 22:18:10 2020
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.9 2020/04/19 12:05:14 rillig Exp $
+# $NetBSD: Makefile,v 1.10 2020/05/23 22:18:10 rillig Exp $
 
-PKGNAME=       check-portability-20.1.0
+PKGNAME=       check-portability-20.1.1
 CATEGORIES=    pkgtools
 DISTFILES=     # none
 

Index: pkgsrc/pkgtools/check-portability/files/check-portability.c
diff -u pkgsrc/pkgtools/check-portability/files/check-portability.c:1.15 pkgsrc/pkgtools/check-portability/files/check-portability.c:1.16
--- pkgsrc/pkgtools/check-portability/files/check-portability.c:1.15    Sat May 23 22:12:31 2020
+++ pkgsrc/pkgtools/check-portability/files/check-portability.c Sat May 23 22:18:11 2020
@@ -1,4 +1,4 @@
-/* $NetBSD: check-portability.c,v 1.15 2020/05/23 22:12:31 rillig Exp $ */
+/* $NetBSD: check-portability.c,v 1.16 2020/05/23 22:18:11 rillig Exp $ */
 
 /*
  Copyright (c) 2020 Roland Illig
@@ -401,7 +401,7 @@ checkline_sh_test_eqeq_error(
 {
        printf(
            "%s:%zu:%zu: found test ... == ...: %s\n",
-           cstr_charptr(filename), lineno, column, cstr_charptr(line));
+           cstr_charptr(filename), lineno, column + 1, cstr_charptr(line));
        nerrors++;
        explain(
            W_test_eqeq,

Index: pkgsrc/pkgtools/check-portability/files/testdata/zzz_expected
diff -u pkgsrc/pkgtools/check-portability/files/testdata/zzz_expected:1.1 pkgsrc/pkgtools/check-portability/files/testdata/zzz_expected:1.2
--- pkgsrc/pkgtools/check-portability/files/testdata/zzz_expected:1.1   Sat Mar 21 15:02:20 2020
+++ pkgsrc/pkgtools/check-portability/files/testdata/zzz_expected       Sat May 23 22:18:11 2020
@@ -23,7 +23,7 @@ files/testdata/Makefile.am:8:5: double b
 files/testdata/double-brackets:8:4: double brackets: if [[ test ]]; then
 files/testdata/double-brackets:10:1: double brackets: [[ test ]]
 files/testdata/double-brackets:12:1: double brackets: [[ test ]] || echo
-files/testdata/env-sh:8:4: found test ... == ...: [ a == b ]
+files/testdata/env-sh:8:5: found test ... == ...: [ a == b ]
 
        The "test" command, as well as the "[" command, are not required to know
        the "==" operator. Only a few implementations like bash and some
@@ -40,6 +40,6 @@ files/testdata/random:7:1: $RANDOM: $RAN
        not be used in shell programs that are meant to be portable across a
        large number of POSIX-like systems.
 
-files/testdata/test-eqeq:7:7: found test ... == ...: test a == b       # bad
-files/testdata/test-eqeq:10:4: found test ... == ...: [ a == b ]       # bad
-files/testdata/test-eqeq:14:4: found test ... == ...: [ a == b -a c == d ]
+files/testdata/test-eqeq:7:8: found test ... == ...: test a == b       # bad
+files/testdata/test-eqeq:10:5: found test ... == ...: [ a == b ]       # bad
+files/testdata/test-eqeq:14:5: found test ... == ...: [ a == b -a c == d ]