|
Line 0
Link Here
|
|
|
1 |
Index: revision.h |
| 2 |
=================================================================== |
| 3 |
--- revision.h (revision 68) |
| 4 |
+++ revision.h (working copy) |
| 5 |
@@ -4,4 +4,4 @@ |
| 6 |
* Generated by ./bin/svn-revision. |
| 7 |
*/ |
| 8 |
|
| 9 |
-#define REVISION 64 |
| 10 |
+#define REVISION 68 |
| 11 |
Index: agent/pl/listqueue.pl |
| 12 |
=================================================================== |
| 13 |
--- agent/pl/listqueue.pl (revision 68) |
| 14 |
+++ agent/pl/listqueue.pl (working copy) |
| 15 |
@@ -79,7 +79,7 @@ |
| 16 |
$: = " ,"; # Break recipients on white space or colon |
| 17 |
format STDOUT = |
| 18 |
@<<<<<<<<<@>>>>>>>@@<<<<<<<<<< @<<<<<<<< @<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<< |
| 19 |
-$file $size $star $queued $status $sender |
| 20 |
+$file, $size,$star,$queued, $status, $sender |
| 21 |
^<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<< |
| 22 |
$recipient |
| 23 |
~ ^<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<<< |
| 24 |
Index: agent/pl/callout.pl |
| 25 |
=================================================================== |
| 26 |
--- agent/pl/callout.pl (revision 68) |
| 27 |
+++ agent/pl/callout.pl (working copy) |
| 28 |
@@ -90,7 +90,7 @@ |
| 29 |
last; |
| 30 |
} |
| 31 |
close CALLOUT; |
| 32 |
- return unless defined %Callout; # Nothing loaded, empty file... |
| 33 |
+ return unless %Callout; # Nothing loaded, empty file... |
| 34 |
|
| 35 |
local($next_callout) = (sort keys %Callout)[0]; |
| 36 |
if ($next_callout != $first_callout) { |
| 37 |
@@ -111,7 +111,7 @@ |
| 38 |
local($time, $action, $type, $no_input) = @_; |
| 39 |
&'add_log("queueing callout on $time ($action)") if $'loglvl > 15; |
| 40 |
$callout_changed++; |
| 41 |
- &load unless defined %Callout; |
| 42 |
+ &load unless %Callout; |
| 43 |
local($qname) = '-'; # File not queued by default |
| 44 |
if ($type ne $SHELL && !$no_input) { |
| 45 |
# 'agent' or 'cmd' callouts have input by default, unless $no_input |
| 46 |
@@ -140,7 +140,7 @@ |
| 47 |
local($file) = @_; |
| 48 |
local($directory, $base) = $file =~ m|(.*)/(.*)|; |
| 49 |
$file = $directory eq $cf'queue ? $base : $file; |
| 50 |
- &load unless defined %Callout; |
| 51 |
+ &load unless %Callout; |
| 52 |
local($time, $files); |
| 53 |
foreach $time (keys %Callfile) { |
| 54 |
$files = $Callfile{$time}; |
| 55 |
@@ -155,7 +155,7 @@ |
| 56 |
sub run { |
| 57 |
&'add_log("running callout queue") if $'loglvl > 15; |
| 58 |
$callout_changed++; |
| 59 |
- &load unless defined %Callout; |
| 60 |
+ &load unless %Callout; |
| 61 |
local(@type, @action, @file); |
| 62 |
local($type, $action, $file); |
| 63 |
do { |
| 64 |
Index: agent/pl/mh.pl |
| 65 |
=================================================================== |
| 66 |
--- agent/pl/mh.pl (revision 68) |
| 67 |
+++ agent/pl/mh.pl (working copy) |
| 68 |
@@ -123,7 +123,7 @@ |
| 69 |
|
| 70 |
# Read MH profile, fill in %Profile entries. |
| 71 |
sub profile { |
| 72 |
- return if defined %Profile; |
| 73 |
+ return if %Profile; |
| 74 |
# Make sure there is at least a valid Path entry, in case they made a |
| 75 |
# mistake and asked for MH folder saving without a valid .mh_profile... |
| 76 |
local($dflt) = defined($'XENV{'maildir'}) ? $'XENV{'maildir'} : 'Mail'; |
| 77 |
Index: agent/pl/rulenv.pl |
| 78 |
=================================================================== |
| 79 |
--- agent/pl/rulenv.pl (revision 68) |
| 80 |
+++ agent/pl/rulenv.pl (working copy) |
| 81 |
@@ -61,7 +61,7 @@ |
| 82 |
# Set-up initial environment for rules. |
| 83 |
# This routine is called once for every mail parsed. |
| 84 |
sub setup { |
| 85 |
- &init unless defined %Spec; |
| 86 |
+ &init unless %Spec; |
| 87 |
eval $SETUP if $SETUP ne ''; |
| 88 |
&'add_log("ERROR env'setup: $@") if $@; |
| 89 |
undef %Var; |
| 90 |
@@ -106,7 +106,7 @@ |
| 91 |
# If an action is required by the resetting of a variable, it is performed |
| 92 |
# following the directive from the %Spec table. |
| 93 |
sub restore { |
| 94 |
- return unless defined %Var; |
| 95 |
+ return unless %Var; |
| 96 |
local($code) = ''; # Code built to restore original variable values |
| 97 |
foreach $var (keys %Var) { |
| 98 |
$code .= "\$$var = \$Var{'$var'};\n"; |
| 99 |
Index: agent/pl/cmdserv.pl |
| 100 |
=================================================================== |
| 101 |
--- agent/pl/cmdserv.pl (revision 68) |
| 102 |
+++ agent/pl/cmdserv.pl (working copy) |
| 103 |
@@ -890,7 +890,7 @@ |
| 104 |
&cmdenv'set_cmd(join(' ', @command)); # Set command environment |
| 105 |
local($failed) = &dispatch; # Execute command |
| 106 |
|
| 107 |
- if (defined %powers) { |
| 108 |
+ if (%powers) { |
| 109 |
$cmdenv'powers = $powers; |
| 110 |
%cmdenv'powers = %powers; |
| 111 |
print MAILER "Restored powers ($powers).\n"; |