]>
Commit | Line | Data |
---|---|---|
ff5d98b8 JR |
1 | --- amavisd-new-20030314/amavisd Tue Jun 17 18:50:14 2003 |
2 | +++ amavisd Tue Jun 17 21:13:43 2003 | |
3 | @@ -7224,7 +7224,7 @@ | |
4 | ($scan_status,$output,$virusnames) = &$command(@_); | |
5 | } else { | |
6 | my(@args) = split(' ',$args); | |
7 | - if (grep { m[^({}/)?\*$] } @args) { # must list each file individually | |
8 | + if (grep { m#^({}/)?\*$# } @args) { # must list each file individually | |
9 | local(*DIR); my($f); my(@bare_fnames); | |
10 | opendir(DIR, "$tempdir/parts") | |
11 | or die "Can't open directory $tempdir/parts: $!"; | |
12 | @@ -7241,10 +7241,15 @@ | |
13 | } | |
14 | closedir(DIR) or die "$av_name: Can't close directory: $!"; | |
15 | # replace * with bare file name | |
16 | - for my $a (@args) | |
17 | - { $a =~ s[^({}/)?\*$][ join(' ', map {$1.$_} @bare_fnames) ]e } | |
18 | +# don't use $a: perldoc -f sort | |
19 | +# for my $a (@args) | |
20 | +# { $a =~ s#^({}/)?\*$# join(' ', map {$1.$_} @bare_fnames) #e } | |
21 | + @args = map { | |
22 | + s#^({}/)?\*$# join(' ', map {$1.$_} @bare_fnames) #e; | |
23 | + split / +/; | |
24 | + } @args; | |
25 | } | |
26 | - for (@args) { s[{}][$tempdir/parts]g } # replace {} with directory name | |
27 | + for (@args) { s#{}#$tempdir/parts#g } # replace {} with directory name | |
28 | # NOTE: RAV does not like '</dev/null' in its command! | |
29 | do_log(2, "Using $av_name: " . join(' ',$command,@args)); | |
30 | my($proc_fh) = run_command(undef, "&1", $command, @args); |