summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorrillig <rillig@pkgsrc.org>2005-12-05 23:50:16 +0000
committerrillig <rillig@pkgsrc.org>2005-12-05 23:50:16 +0000
commita86447cb0763e94327a0380243bb3a2cc0ecbb68 (patch)
tree286d388a8211b624e672f94f6754225ca2dd052a
parent95c876eda27a4dd1b10b8a5977a6c59ec11eef06 (diff)
downloadpkgsrc-a86447cb0763e94327a0380243bb3a2cc0ecbb68.tar.gz
- Improved the regular expression for shell words by recognizing make(1)
variables that are not nested.
-rw-r--r--pkgtools/pkglint/files/pkglint.pl3
1 files changed, 2 insertions, 1 deletions
diff --git a/pkgtools/pkglint/files/pkglint.pl b/pkgtools/pkglint/files/pkglint.pl
index 748b242d242..32574761be1 100644
--- a/pkgtools/pkglint/files/pkglint.pl
+++ b/pkgtools/pkglint/files/pkglint.pl
@@ -11,7 +11,7 @@
# Freely redistributable. Absolutely no warranty.
#
# From Id: portlint.pl,v 1.64 1998/02/28 02:34:05 itojun Exp
-# $NetBSD: pkglint.pl,v 1.416 2005/12/05 21:56:13 rillig Exp $
+# $NetBSD: pkglint.pl,v 1.417 2005/12/05 23:50:16 rillig Exp $
#
# This version contains lots of changes necessary for NetBSD packages
# done by:
@@ -765,6 +765,7 @@ my $regex_shellword = qr"\s*(
| \"(?:\\.|[^\"\\])*\"
| \`[^\`]*\`
| \\.
+ | \$\{[^}]+\}
| [^'\"\\\s;&\|<>\#]
)+ | ;;? | &&? | \|\|? | <<? | >>? | \#.*)"sx;