Changeset fc92e6e2 for perl/lib

Timestamp:

Aug 20, 2009, 1:29:54 AM (15 years ago)

Author:

Anders Kaseorg <andersk@mit.edu>

Branches:

master, release-1.10, release-1.4, release-1.5, release-1.6, release-1.7, release-1.8, release-1.9

Children:

0b5168d

Parents:

4cbb1b4

git-author:

Anders Kaseorg <andersk@mit.edu> (08/20/09 01:21:30)

git-committer:

Anders Kaseorg <andersk@mit.edu> (08/20/09 01:29:54)

Message:

BarnOwl::quote: accept a list of strings to be quoted individually.

Signed-off-by: Anders Kaseorg <andersk@mit.edu>

File:

• perl/lib/BarnOwl.pm (modified) (1 diff)

perl/lib/BarnOwl.pm

@@ -290 +290 @@
 }
 
-=head2 quote STRING
-
-Return a version of STRING fully quoted to survive processing by
-BarnOwl's command parser.
+=head2 quote LIST
+
+Quotes each of the strings in LIST and returns a string that will be
+correctly decoded to LIST by the BarnOwl command parser.  For example:
+
+    quote('zwrite', 'andersk', '-m', 'Hello, world!')
+    # returns "zwrite andersk -m 'Hello, world!'"
 
 =cut
 
 sub quote {
-    my $str = shift;
-    return "''" if $str eq '';
-    if ($str !~ /['" ]/) {
-        return "$str";
+    my @quoted;
+    for my $str (@_) {
+        if ($str eq '') {
+            push @quoted, "''";
+        } elsif ($str !~ /['" ]/) {
+            push @quoted, "$str";
+        } elsif ($str !~ /'/) {
+            push @quoted, "'$str'";
+        } else {
+            (my $qstr = $str) =~ s/"/"'"'"/g;
+            push @quoted, '"' . $qstr . '"';
+        }
     }
-    if ($str !~ /'/) {
-        return "'$str'";
-    }
-    $str =~ s/"/"'"'"/g;
-    return '"' . $str . '"';
+    return join(' ', @quoted);
 }