perl 4.0 patch 31: patch #20, continued

See patch #20.

1 files changed, 17 insertions, 11 deletions

diff --git a/lib/shellwords.pl b/lib/shellwords.pl
index 168991fa3f..5d593daa50 100644
--- a/lib/shellwords.pl
+++ b/lib/shellwords.pl
@@ -1,12 +1,12 @@
-#; shellwords.pl
-#;
-#; Usage:
-#;	require 'shellwords.pl';
-#;	@words = &shellwords($line);
-#;	or
-#;	@words = &shellwords(@lines);
-#;	or
-#;	@words = &shellwords;		# defaults to $_ (and clobbers it)
+;# shellwords.pl
+;#
+;# Usage:
+;#	require 'shellwords.pl';
+;#	@words = &shellwords($line);
+;#	or
+;#	@words = &shellwords(@lines);
+;#	or
+;#	@words = &shellwords;		# defaults to $_ (and clobbers it)
 
 sub shellwords {
     package shellwords;
@@ -17,12 +17,18 @@ sub shellwords {
     while ($_ ne '') {
 	$field = '';
 	for (;;) {
-	    if (s/^"(([^"\\]+|\\[\\"])*)"//) {
+	    if (s/^"(([^"\\]|\\[\\"])*)"//) {
 		($snippet = $1) =~ s#\\(.)#$1#g;
 	    }
-	    elsif (s/^'(([^'\\]+|\\[\\'])*)'//) {
+	    elsif (/^"/) {
+		die "Unmatched double quote: $_\n";
+	    }
+	    elsif (s/^'(([^'\\]|\\[\\'])*)'//) {
 		($snippet = $1) =~ s#\\(.)#$1#g;
 	    }
+	    elsif (/^'/) {
+		die "Unmatched single quote: $_\n";
+	    }
 	    elsif (s/^\\(.)//) {
 		$snippet = $1;
 	    }