View | Details | Raw Unified | Return to bug 7006
Collapse All | Expand All

(-)OpenSSL.pm.orig (-9 / +7 lines)
Lines 821-840 sub convdata { Link Here
821
   print $wtfh "$opts->{'data'}\n";
821
   print $wtfh "$opts->{'data'}\n";
822
   while(<$rdfh>){
822
   while(<$rdfh>){
823
      $ext .= $_;
823
      $ext .= $_;
824
      # print STDERR "DEBUG: cmd ret: $_";
824
	   # print STDERR "DEBUG: cmd ret: $_";
825
   };
825
   };
826
   waitpid($pid, 0);
826
   waitpid($pid, 0);
827
   $ret = $?>>8;
827
   $ret = $?>>8;
828
828
829
   if(($ret != 0 && $opts->{'cmd'} ne 'crl') ||
829
   if($ret != 0) {
830
      ($ret != 0 && $opts->{'outform'} ne 'TEXT' && $opts->{'cmd'} eq 'crl') ||
830
		   unlink($file);
831
      ($ret != 1 && $opts->{'outform'} eq 'TEXT' && $opts->{'cmd'} eq 'crl')) { 
831
		   return($ret, undef, $ext);
832
      unlink($file);
832
   } else { 
833
      return($ret, undef, $ext);
833
		   $ret = 0;
834
   } else {
835
      $ret = 0;
836
   }
834
   }
837
835
		   
838
   open(IN, $file) || do {
836
   open(IN, $file) || do {
839
      my $t = sprintf(gettext("Can't open file %s: %s"), $file, $!);
837
      my $t = sprintf(gettext("Can't open file %s: %s"), $file, $!);
840
      GUI::HELPERS::print_warning($t);
838
      GUI::HELPERS::print_warning($t);

Return to bug 7006