Author: adam-guest
Date: 2008-08-09 18:36:28 +0000 (Sat, 09 Aug 2008)
New Revision: 1586

Modified:
   trunk/debian/changelog
   trunk/scripts/checkbashisms.pl
Log:
checkbashisms: Flag "read without variable" and "read with options other
than -r" separately to ensure that all uses are correctly matched. Thanks
to Frank Lichtenheld for pointing this out via a related bug in lintian.

Modified: trunk/debian/changelog
===================================================================
--- trunk/debian/changelog      2008-08-08 22:11:40 UTC (rev 1585)
+++ trunk/debian/changelog      2008-08-09 18:36:28 UTC (rev 1586)
@@ -1,6 +1,9 @@
 devscripts (2.10.36) UNRELEASED; urgency=low
 
   [ Adam D. Barratt ]
+  * checkbashisms: Flag "read without variable" and "read with options other
+    than -r" separately to ensure that all uses are correctly matched. Thanks
+    to Frank Lichtenheld for pointing this out via a related bug in lintian.
   * debsign: When copying .changes files from a remote host, attempt to process
     each copied file if a wildcard was used in the filename (Closes: #491627)
   * tagpending: Fix a typo in the help output. Thanks Thijs Kinkhorst.

Modified: trunk/scripts/checkbashisms.pl
===================================================================
--- trunk/scripts/checkbashisms.pl      2008-08-08 22:11:40 UTC (rev 1585)
+++ trunk/scripts/checkbashisms.pl      2008-08-09 18:36:28 UTC (rev 1586)
@@ -454,7 +454,9 @@
        qr'[^\\\$]\{([^\s\\\}]+?,)+[^\\\}\s]+\}' =>
                                       q<brace expansion>,
        qr'(?:^|\s+)\w+\[\d+\]=' =>      q<bash arrays, H[0]>,
-       $LEADIN . qr'(read\s*(-[^r]+)*(?:;|$))' => q<should be read [-r] 
variable>,
+       $LEADIN . qr'read\s+(?:-[a-qs-zA-Z\d-]+)' => q<read with option other 
than -r>,
+       $LEADIN . qr'read\s*(?:-\w+\s*)*(?:\".*?\"|[\'].*?[\'])?\s*(?:;|$)'
+           => q<read without variable>,
        $LEADIN . qr'echo\s+(-n\s+)?-n?en?\s' =>      q<echo -e>,
        $LEADIN . qr'exec\s+-[acl]' =>    q<exec -c/-l/-a name>,
        $LEADIN . qr'let\s' =>            q<let ...>,



-- 
To unsubscribe, send mail to [EMAIL PROTECTED]

Reply via email to