Changeset 3a6277a

Timestamp:

Aug 20, 2009, 2:46:46 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:

362c932

Parents:

c854e74

git-author:

Anders Kaseorg <andersk@mit.edu> (08/20/09 02:17:47)

git-committer:

Anders Kaseorg <andersk@mit.edu> (08/20/09 02:46:46)

Message:

BarnOwl::Message::Zephyr: Use multi-argument quote.

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

File:

• perl/lib/BarnOwl/Message/Zephyr.pm (modified) (3 diffs)

perl/lib/BarnOwl/Message/Zephyr.pm

@@ -83 +83 @@
     my $mclass = shift;
     my $minstance = shift;
-    my $class = "";
+    my @class;
     if (lc($mclass) ne "message") {
-        $class = "-c " . BarnOwl::quote($mclass);
-    }
-    my $instance = "";
+        @class = ('-c', $mclass);
+    }
+    my @instance;
     if (lc($minstance) ne "personal") {
-        $instance = "-i " . BarnOwl::quote($minstance);
-    }
-    if (($class eq "") or  ($instance eq "")) {
-        return $class . $instance;
-    } else {
-        return $class . " " . $instance;
-    }
+        @instance = ('-i', $minstance);
+    }
+    return (@class, @instance);
 }
 
 sub personal_context {
     my ($m) = @_;
-    return context_reply_cmd($m->class, $m->instance);
+    return BarnOwl::quote(context_reply_cmd($m->class, $m->instance));
 }
 
@@ -178 +174 @@
     }
 
-    my $cmd;
+    my @cmd;
     if(lc $self->opcode eq 'crypt' and ( not $sender or $self->is_private)) {
         # Responses to zcrypted messages should be zcrypted, so long as we
         # aren't switching to personals
-        $cmd = 'zcrypt';
+        @cmd = ('zcrypt');
     } else {
-        $cmd = 'zwrite';
-    }
-
-    my $context_part = context_reply_cmd($class, $instance);
-    $cmd .= " " . $context_part unless ($context_part eq '');
+        @cmd = ('zwrite');
+    }
+
+    push @cmd, context_reply_cmd($class, $instance);
     if ($to ne '') {
         $to = strip_realm($to);
@@ -196 +191 @@
             delete $cc{strip_realm(BarnOwl::zephyr_getsender())};
             @cc = keys %cc;
-            $cmd .= " -C " . join(" ", @cc);
+            push @cmd, '-C', @cc;
         } else {
             if(BarnOwl::getvar('smartstrip') eq 'on') {
                 $to = BarnOwl::zephyr_smartstrip_user($to);
             }
-            $cmd .= " $to";
+            push @cmd, $to;
         }
     }
-    return $cmd;
+    return BarnOwl::quote(@cmd);
 }