|
Lines 43-50
sub new {
Link Here
|
| 43 |
|
43 |
|
| 44 |
if($v =~ /0.9.6/) { |
44 |
if($v =~ /0.9.6/) { |
| 45 |
$self->{'version'} = "0.9.6"; |
45 |
$self->{'version'} = "0.9.6"; |
| 46 |
} elsif ($v =~ /0.9.7/) { |
46 |
} elsif ($v =~ /0.9.7[abcd]/) { |
| 47 |
$self->{'version'} = "0.9.7"; |
47 |
$self->{'version'} = "0.9.7old"; |
|
|
48 |
} elsif ($v =~ /0.9.7[^abcd]/) { |
| 49 |
$self->{'version'} = "0.9.7"; |
| 48 |
} elsif ($v =~ /0.9.8/) { |
50 |
} elsif ($v =~ /0.9.8/) { |
| 49 |
$self->{'version'} = "0.9.8"; |
51 |
$self->{'version'} = "0.9.8"; |
| 50 |
} |
52 |
} |
|
Lines 821-840
sub convdata {
Link Here
|
| 821 |
print $wtfh "$opts->{'data'}\n"; |
823 |
print $wtfh "$opts->{'data'}\n"; |
| 822 |
while(<$rdfh>){ |
824 |
while(<$rdfh>){ |
| 823 |
$ext .= $_; |
825 |
$ext .= $_; |
| 824 |
# print STDERR "DEBUG: cmd ret: $_"; |
826 |
# print STDERR "DEBUG: cmd ret: $_"; |
| 825 |
}; |
827 |
}; |
| 826 |
waitpid($pid, 0); |
828 |
waitpid($pid, 0); |
| 827 |
$ret = $?>>8; |
829 |
$ret = $?>>8; |
| 828 |
|
830 |
|
| 829 |
if(($ret != 0 && $opts->{'cmd'} ne 'crl') || |
831 |
if( $self->{'version'} =~ '(0.9.7old|0.9.6)' ) { |
| 830 |
($ret != 0 && $opts->{'outform'} ne 'TEXT' && $opts->{'cmd'} eq 'crl') || |
832 |
if(($ret != 0 && $opts->{'cmd'} ne 'crl') || |
| 831 |
($ret != 1 && $opts->{'outform'} eq 'TEXT' && $opts->{'cmd'} eq 'crl')) { |
833 |
($ret != 0 && $opts->{'outform'} ne 'TEXT' && $opts->{'cmd'} eq 'crl') || |
| 832 |
unlink($file); |
834 |
($ret != 1 && $opts->{'outform'} eq 'TEXT' && $opts->{'cmd'} eq 'crl')) { |
| 833 |
return($ret, undef, $ext); |
835 |
unlink($file); |
|
|
836 |
return($ret, undef, $ext); |
| 837 |
} else { |
| 838 |
$ret = 0; |
| 839 |
} |
| 834 |
} else { |
840 |
} else { |
| 835 |
$ret = 0; |
841 |
if($ret != 0) { |
|
|
842 |
unlink($file); |
| 843 |
return($ret, undef, $ext); |
| 844 |
} else { |
| 845 |
$ret = 0; |
| 846 |
} |
| 836 |
} |
847 |
} |
| 837 |
|
848 |
|
| 838 |
open(IN, $file) || do { |
849 |
open(IN, $file) || do { |
| 839 |
my $t = sprintf(gettext("Can't open file %s: %s"), $file, $!); |
850 |
my $t = sprintf(gettext("Can't open file %s: %s"), $file, $!); |
| 840 |
GUI::HELPERS::print_warning($t); |
851 |
GUI::HELPERS::print_warning($t); |
