summaryrefslogtreecommitdiff
path: root/fml/lib/FML
diff options
context:
space:
mode:
authorfukachan <fukachan>2008-07-20 09:15:55 +0000
committerfukachan <fukachan>2008-07-20 09:15:55 +0000
commitede26402fb0ed91d37a18bd073d1c255c63ce7cf (patch)
tree1ffaeab945428d3c62997702b892e356709ff38d /fml/lib/FML
parentfc590347427e32c2b8f14a39f0d256b015bfcab4 (diff)
downloadfml8-ede26402fb0ed91d37a18bd073d1c255c63ce7cf.tar.gz
fml8-ede26402fb0ed91d37a18bd073d1c255c63ce7cf.tar.bz2
fml8-ede26402fb0ed91d37a18bd073d1c255c63ce7cf.zip
isolate the current incoming message if matched
Diffstat (limited to 'fml/lib/FML')
-rw-r--r--fml/lib/FML/Process/Command.pm16
-rw-r--r--fml/lib/FML/Process/Distribute.pm3
2 files changed, 15 insertions, 4 deletions
diff --git a/fml/lib/FML/Process/Command.pm b/fml/lib/FML/Process/Command.pm
index 0c47e299..00402a0a 100644
--- a/fml/lib/FML/Process/Command.pm
+++ b/fml/lib/FML/Process/Command.pm
@@ -1,9 +1,9 @@
#-*- perl -*-
#
-# Copyright (C) 2000,2001,2002,2003,2004,2005,2006 Ken'ichi Fukamachi
+# Copyright (C) 2000,2001,2002,2003,2004,2005,2006,2008 Ken'ichi Fukamachi
# All rights reserved.
#
-# $FML: Command.pm,v 1.120 2006/06/25 11:05:12 fukachan Exp $
+# $FML: Command.pm,v 1.121 2006/07/09 12:11:13 fukachan Exp $
#
package FML::Process::Command;
@@ -345,6 +345,12 @@ sub _command_process_loop
$curproc->reply_message_nl('command.stop', "stopped.");
last COMMAND;
}
+
+ # 3. we need to isolate the incoming message.
+ if ($curproc->restriction_state_get_isolate_reason()) {
+ $curproc->incoming_message_isolate_content();
+ last COMMAND;
+ }
}
}
@@ -429,6 +435,10 @@ sub _command_switch
$num_ignored++;
$curproc->logdebug("command mail should be ignored");
}
+ elsif ($result eq "isolate") {
+ $num_ignored++;
+ $curproc->logdebug("command mail need to be isolated");
+ }
else {
$num_ignored++;
$curproc->reply_message("\n$_prompt");
@@ -596,7 +606,7 @@ Ken'ichi Fukamachi
=head1 COPYRIGHT
-Copyright (C) 2000,2001,2002,2003,2004,2005,2006 Ken'ichi Fukamachi
+Copyright (C) 2000,2001,2002,2003,2004,2005,2006,2008 Ken'ichi Fukamachi
All rights reserved. This program is free software; you can
redistribute it and/or modify it under the same terms as Perl itself.
diff --git a/fml/lib/FML/Process/Distribute.pm b/fml/lib/FML/Process/Distribute.pm
index 78cbccbe..48a9f096 100644
--- a/fml/lib/FML/Process/Distribute.pm
+++ b/fml/lib/FML/Process/Distribute.pm
@@ -3,7 +3,7 @@
# Copyright (C) 2000,2001,2002,2003,2004,2005,2006,2008 Ken'ichi Fukamachi
# All rights reserved.
#
-# $FML: Distribute.pm,v 1.180 2008/07/06 05:31:47 fukachan Exp $
+# $FML: Distribute.pm,v 1.181 2008/07/19 12:27:59 fukachan Exp $
#
package FML::Process::Distribute;
@@ -267,6 +267,7 @@ sub run
elsif ($action eq 'isolate') {
# XXX NEED actual isolate operation !
$curproc->log("isolate article");
+ $curproc->incoming_message_isolate_content();
$curproc->stop_this_process();
}
else { # reject and anything.