Changeset 744769e

Timestamp:

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

0b4aef2

Parents:

0b5168d

git-author:

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

git-committer:

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

Message:

IRC: Add quoting for reply commands and editwin prompt.

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

Location:

perl/modules/IRC/lib/BarnOwl/Module

Files:

• IRC.pm (modified) (2 diffs)
• IRC/Connection.pm (modified) (4 diffs)

perl/modules/IRC/lib/BarnOwl/Module/IRC.pm

@@ -387 +387 @@
         process_msg($conn, $to, join(" ", @_));
     } else {
-        BarnOwl::start_edit_win("/msg -a " . $conn->alias . " $to", sub {process_msg($conn, $to, @_)});
+        BarnOwl::start_edit_win(BarnOwl::quote('/msg', '-a', $conn->alias, $to), sub {process_msg($conn, $to, @_)});
     }
     return;
@@ -414 +414 @@
         is_private($to) ?
           (isprivate  => 'true') : (channel => $to),
-        replycmd    => "irc-msg -a " . $conn->alias . " $to",
-        replysendercmd => "irc-msg -a " . $conn->alias . " $to"
+        replycmd    => BarnOwl::quote('irc-msg',  '-a', $conn->alias, $to),
+        replysendercmd => BarnOwl::quote('irc-msg', '-a', $conn->alias, $to),
        );
     BarnOwl::queue_message($msg);

perl/modules/IRC/lib/BarnOwl/Module/IRC/Connection.pm

@@ -119 +119 @@
         is_private($recipient) ?
           (isprivate  => 'true') : (channel => $recipient),
-        replycmd    => 'irc-msg -a ' . $self->alias . ' ' .
-            (is_private($recipient) ? $evt->nick : $recipient),
-        replysendercmd => 'irc-msg -a ' . $self->alias . ' ' . $evt->nick
+        replycmd    => BarnOwl::quote('irc-msg', '-a', $self->alias,
+          (is_private($recipient) ? $evt->nick : $recipient)),
+        replysendercmd => BarnOwl::quote('irc-msg', '-a', $self->alias, $evt->nick),
        );
 
@@ -170 +170 @@
         action     => 'join',
         channel    => $evt->to,
-        replycmd => 'irc-msg -a ' . $self->alias . ' ' . join(' ', $evt->to),
-        replysendercmd => 'irc-msg -a ' . $self->alias . ' ' . $evt->nick
+        replycmd   => BarnOwl::quote('irc-msg', '-a', $self->alias, $evt->to),
+        replysendercmd => BarnOwl::quote('irc-msg', '-a', $self->alias, $evt->nick),
         );
     BarnOwl::queue_message($msg);
@@ -182 +182 @@
         action     => 'part',
         channel    => $evt->to,
-        replycmd => 'irc-msg -a ' . $self->alias . ' ' . join(' ', $evt->to),
-        replysendercmd => 'irc-msg -a ' . $self->alias . ' ' . $evt->nick
+        replycmd   => BarnOwl::quote('irc-msg', '-a', $self->alias, $evt->to),
+        replysendercmd => BarnOwl::quote('irc-msg', '-a', $self->alias, $evt->nick),
         );
     BarnOwl::queue_message($msg);
@@ -195 +195 @@
         from       => $evt->to,
         reason     => [$evt->args]->[0],
-        replycmd => 'irc-msg -a ' . $self->alias . ' ' . $evt->nick,
-        replysendercmd => 'irc-msg -a ' . $self->alias . ' ' . $evt->nick
+        replycmd   => BarnOwl::quote('irc-msg', '-a', $self->alias, $evt->nick),
+        replysendercmd => BarnOwl::quote('irc-msg', '-a', $self->alias, $evt->nick),
         );
     BarnOwl::queue_message($msg);