 @@ -1,16 +1,16 @@
 #!@PERL5@
-# $NetBSD: lintpkgsrc.pl,v 1.57 2022/08/09 18:14:22 rillig Exp $
+# $NetBSD: lintpkgsrc.pl,v 1.58 2022/08/09 18:35:43 rillig Exp $
 # Written by David Brownlee <abs@netbsd.org>.
+#
 # Caveats:
 #	The 'Makefile parsing' algorithm used to obtain package versions and
 #	DEPENDS information is geared towards speed rather than perfection,
 #	though it has gotten somewhat better over time, it only parses the
 #	simpler Makefile conditionals.
+#
 # TODO: Handle fun DEPENDS like avifile-devel with
 #			{qt2-designer>=2.2.4,qt2-designer-kde>=2.3.1nb1}
 use locale;
 @@ -869,68 +869,74 @@ sub list_pkgsrc_pkgdirs($$) {
 		&& $_ ne 'pkg'
 		&& $_ ne 'CVS'
 		&& substr($_, 0, 1) ne '.',
 		readdir(CAT));
 	closedir(CAT);
 	@pkgdirs;
+}
 # Convert the glob pattern to a regular expression.
 # Return '' if the regular expression equals the glob expression.
 # Return undef on error.
 sub glob2regex($) {
 	my ($glob) = @_;
 	my (@chars, $in_alt);
 	my ($regex);
-	@chars = split(//, $glob);
+	my @chars = split(//, $glob);
 	my $alternative_depth = 0;
 	my $regex = '';
 	while (defined($_ = shift @chars)) {
 		if ($_ eq '*') {
 			$regex .= '.*';
 		} elsif ($_ eq '?') {
 			$regex .= '.';
 		} elsif ($_ eq '+') {
 			$regex .= '\\+';
-		} elsif ($_ eq '\\') {
+		} elsif ($_ eq '\\' && @chars > 0) {
-			$regex .= $_ . shift @chars;
+			my $next = shift @chars;
 			$regex .= $next =~ /\w/ ? "$next" : "\\$next";
 		} elsif ($_ eq '.' || $_ eq '|') {
 			$regex .= quotemeta;
 		} elsif ($_ eq '{') {
 			$regex .= '(';
-			++$in_alt;
+			++$alternative_depth;
 		} elsif ($_ eq '}') {
-			if (!$in_alt) {
+			if ($alternative_depth == 0) {
 				# Error
 				return undef;
+			}
 			$regex .= ')';
-			--$in_alt;
+			--$alternative_depth;
-		} elsif ($_ eq ',' && $in_alt) {
+		} elsif ($_ eq ',' && $alternative_depth) {
 			$regex .= '|';
 		} elsif ($_ eq '[') {
 			$regex .= '[';
 			while (defined($_ = shift @chars)) {
 				$regex .= $_;
 				if ($_ eq ']') {
 					last;
 				} elsif ($_ eq '\\' && @chars > 0) {
 					$regex .= shift @chars;
+				}
+			}
 			return undef if $_ ne ']';
 		} else {
 			$regex .= $_;
+		}
+	}
-	if ($in_alt) {
+	return undef if $alternative_depth > 0;
-		# Error
+	return '' if $regex eq $glob; # XXX: why?
 		return undef;
 	$opt{D} and print "glob2regex: $glob -> $regex\n";
 	if ($regex eq $glob) {
 		return ('');
 	if ($opt{D}) {
 		print "glob2regex: $glob -> $regex\n";
 	'^' . $regex . '$';
+}
 # Perform some (reasonable) subset of 'pkg_info -e' / glob(3)
 # Returns (sometimes best guess at) package name,
 # and either 'problem version' or undef if all OK
+#
 sub package_globmatch($) {
 	my ($pkgmatch) = @_;
 	my ($matchpkgname, $matchver, $regex);
 	if ($pkgmatch =~ /^([^*?[]+)(<|>|<=|>=|-)(\d[^*?[{]*)$/) {

 @@ -1,56 +1,59 @@
-# $NetBSD: glob.t,v 1.5 2022/08/09 18:14:22 rillig Exp $
+# $NetBSD: glob.t,v 1.6 2022/08/09 18:35:43 rillig Exp $
 use strict;
 use warnings;
 use Test;
 BEGIN { plan tests => 12, onfail => sub { die } }
 require('../lintpkgsrc.pl');
 sub test_glob2regex() {
 	ok(glob2regex('*'), '^.*$');
 	ok(glob2regex('\*'), '');
 	ok(glob2regex('?'), '^.$');
 	ok(glob2regex('\?'), '');
-	ok(glob2regex('[a-z]'), '');
+	# Ordinary characters in glob patterns.
 	ok(glob2regex('+'), '^\+$');
 	ok(glob2regex('\+'), '');
 	ok(glob2regex('|'), '^\|$');
 	ok(glob2regex('\|'), '');
 	ok(glob2regex('\.'), '');
 	ok(glob2regex('\n'), '^n$');
 	ok(glob2regex('\\\\'), '');
 	ok(glob2regex('\['), '');
 	ok(glob2regex('\{'), '');
 	ok(glob2regex('\-'), '');
 	ok(glob2regex('[a-z]'), '');
 	ok(glob2regex('[a-z0-9]'), '');
 	ok(glob2regex('[a-z0-9_]'), '');
 	ok(glob2regex('[*]'), '');
 	# Outside of braces, the ',' is a regular character.
 	ok(glob2regex('a,b'), '');
 	# FIXME: Inside brackets, the '*' is a literal '*'.
 	ok(glob2regex('[*]'), '^[.*]$');
 	ok(glob2regex('\*'), '');
 	ok(glob2regex('*.[ch]'), '^.*\.[ch]$');
 	# Outside of braces, the ',' is a regular character.
 	ok(glob2regex('a,b'), '');
 	ok(glob2regex('{one,two}'), '^(one|two)$');
 	ok(glob2regex('{{thi,fou}r,fif}teen'), '^((thi|fou)r|fif)teen$');
 	# There is an unbalanced '}' at the very end.
-	ok(glob2regex('{{thi,fou}r,fif}teen}'), undef);
+	ok(glob2regex('{four,fif}teen}'), undef);
 	ok(glob2regex('a+b|c'), '^a\+b\|c$');
 	# An escaped '[' does not start a character class.
 	ok(glob2regex('a\[b*'), '^a\[b.*$');
-	ok(glob2regex('a\+b'), '');
+	ok(glob2regex('a\n*'), '^an.*$');
 	ok(glob2regex('a\?b'), '');
 	# XXX: Depending on the exact implementation, the '\n' may be
 	# interpreted as a newline, a literal 'n' or a literal '\' 'n'.
 	ok(glob2regex('a\n*'), '^a\n.*$');
 	# https://gnats.netbsd.org/12996
 	ok(glob2regex('libsigc++'), '^libsigc\+\+$');
 	my $re = 'a\nb';
 	ok("a\nb" =~ $re, 1);
+}
 test_glob2regex();