GitHub/pbot
3
0
Fork 0
mirror of https://github.com/pragma-/pbot.git synced 2024-12-23 19:22:40 +01:00
Code Issues Projects Releases Wiki Activity

Properly handle single-quotes inside of single-quoted text

Browse Source
This commit is contained in:
Pragmatic Software 2010-05-13 23:28:38 +00:00
parent 33a32f29a3
commit 24740da78b
1 changed files with 18 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

35
PBot/FactoidModuleLauncher.pm
View File

@ -51,10 +51,14 @@ sub execute_module {
my $module = $self->{pbot}->factoids->factoids->{$keyword}{module}; my $module = $self->{pbot}->factoids->factoids->{$keyword}{module};
my $module_dir = $self->{pbot}->module_dir; my $module_dir = $self->{pbot}->module_dir;
$self->{pbot}->logger->log("(" . (defined $from ? $from : "(undef)") . "): $nick!$user\@$host: Executing module $module $arguments\n"); $self->{pbot}->logger->log("(" . (defined $from ? $from : "(undef)") . "): $nick!$user\@$host: Executing module $module $arguments\n");
$arguments =~ s/\$nick/$nick/g; $arguments =~ s/\$nick/$nick/g;
$arguments = quotemeta($arguments);
$arguments =~ s/\\\s/ /g;
if(exists $self->{pbot}->factoids->factoids->{$keyword}{modulelauncher_subpattern}) { if(exists $self->{pbot}->factoids->factoids->{$keyword}{modulelauncher_subpattern}) {
if($self->{pbot}->factoids->factoids->{$keyword}{modulelauncher_subpattern} =~ m/s\/(.*?)\/(.*)\//) { if($self->{pbot}->factoids->factoids->{$keyword}{modulelauncher_subpattern} =~ m/s\/(.*?)\/(.*)\//) {
my ($p1, $p2) = ($1, $2); my ($p1, $p2) = ($1, $2);
@ -86,30 +90,27 @@ sub execute_module {
} }
} }
my $unquoted_args = $arguments; my $argsbuf = $arguments;
$arguments = ""; $arguments = "";
while($unquoted_args =~ s/(.*?)('.*)//) { my $lr;
my $prefix = $1; while(1) {
my $remainder = $2; my ($e, $r, $p) = extract_delimited($argsbuf, "'", "[^']+");
$arguments .= quotemeta($prefix); if(defined $e) {
$e =~ s/\\//g;
my ($e, $r) = extract_delimited($remainder, "'"); $e =~ s/'/'\\''/g;
$e =~ s/^'\\''/'/;
if(not defined $e) { $e =~ s/'\\''$/'/;
$arguments .= quotemeta($r); $arguments .= $p;
} else {
$arguments .= $e; $arguments .= $e;
$unquoted_args = $r; $lr = $r;
} else {
$arguments .= $lr;
last;
} }
} }
$arguments .= $unquoted_args;
$arguments =~ s/\\\s/ /g;
$arguments =~ s/\\-/-/g;
my $pid = fork; my $pid = fork;
if(not defined $pid) { if(not defined $pid) {
$self->{pbot}->logger->log("Could not fork module: $!\n"); $self->{pbot}->logger->log("Could not fork module: $!\n");