 @@ -1,16 +1,16 @@
-# $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
 MAINTAINER=	rillig@NetBSD.org
 HOMEPAGE=	# none
 COMMENT=	Check extracted files for typical portability issues
 LICENSE=	2-clause-bsd
 USE_TOOLS+=		cp
 CHECK_PORTABILITY_SKIP=	* # avoid circular dependency
 CHECK_PERMS_SKIP=	* # avoid circular dependency
 USE_LANGUAGES=		c99
 USE_BSD_MAKEFILE=	yes

 @@ -1,14 +1,14 @@
-/* $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
  All rights reserved.
  Redistribution and use in source and binary forms, with or without
  modification, are permitted provided that the following conditions
  are met:
 . Redistributions of source code must retain the above copyright
     notice, this list of conditions and the following disclaimer.
 . Redistributions in binary form must reproduce the above copyright
     notice, this list of conditions and the following disclaimer in the
 @@ -391,27 +391,27 @@ checkline_sh_dollar_random(cstr filename
 struct checkline_sh_test_eqeq_actiondata {
 	cstr filename;
 	size_t lineno;
 	cstr line;
 };
 static void
 checkline_sh_test_eqeq_error(
     cstr filename, cstr line, size_t lineno, size_t column)
+{
 	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,
 	    "The \"test\" command, as well as the \"[\" command, are not required to know",
 	    "the \"==\" operator. Only a few implementations like bash and some",
 	    "versions of ksh support it.",
 	    "",
 	    "When you run \"test foo == foo\" on a platform that does not support the",
 	    "\"==\" operator, the result will be \"false\" instead of \"true\". This can",
 	    "lead to unexpected behavior.",
 	    nullptr);
 	explain_how_to_fix();
+}

 @@ -13,33 +13,33 @@ files/testdata/Makefile.am:7:5: double b
 	for the package to build. Then choose any of these variants:
 .  Add a patch for the file
 	    (see https://www.netbsd.org/docs/pkgsrc/pkgsrc.html#components.patches)
 .  Add a SUBST block for the file to the package Makefile
 	    (see mk/subst.mk)
 .  Add CHECK_PORTABILITY_SKIP+= shell/glob to the package Makefile
 	    (see mk/check/check-portability.mk)
 files/testdata/Makefile.am:8:5: double brackets: 	if [[ ${COND} ]] || [[ $(COND) ]]; then :; fi
 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
 	versions of ksh support it.
 	When you run "test foo == foo" on a platform that does not support the
 	"==" operator, the result will be "false" instead of "true". This can
 	lead to unexpected behavior.
 files/testdata/random:7:1: $RANDOM: $RANDOM
 	The variable $RANDOM is not required for a POSIX-conforming shell, and
 	many implementations of /bin/sh do not support it. It should therefore
 	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:7:8: found test ... == ...: test a == b	# bad
-files/testdata/test-eqeq:10:4: found test ... == ...: [ a == b ]	# bad
+files/testdata/test-eqeq:10:5: found test ... == ...: [ a == b ]	# bad
-files/testdata/test-eqeq:14:4: found test ... == ...: [ a == b -a c == d ]
+files/testdata/test-eqeq:14:5: found test ... == ...: [ a == b -a c == d ]