[ViewVC] Diff of: cvs/syncmail/folder.pm

Comparing syncmail/folder.pm (file contents):
Revision 1.5 by root, Mon Oct 29 00:37:41 2001 UTC vs.
Revision 1.6 by root, Mon Oct 29 02:36:32 2001 UTC

          $mid = $digest->hexdigest;
       };
    }
 }
-sub flushfh {
+sub fflush {
    my $oldfh = select $_[0];
-   $| = 1;
+   $| = 1; $| = 0;
    select $oldfh;
 }
 # rename a file and fsync the directory
 sub replace {
       print $fh "[DIFF $_->[0]]\n";
       print $fh "+$_\n" for @{$_->[1]};
       print $fh "-$_\n" for @{$_->[2]};
    }
-   flushfh($fh);
+   fflush($fh);
    File::Sync::fsync($fh);
    close $fh
       or die "$path~: unable to create updated .mdif: $!";
    replace("$path~", $path);
 sub close {
    my $self = shift;
    if ($self->{rw} && $self->{fh}) {
-      flushfh($self->{fh});
+      fflush($self->{fh});
       File::Sync::fsync($self->{fh});
    }
    $self->write_mdif;
    my $mail;
    my $msg = $self->{iidx}{$hash}
       or die "$hash: no such message in $self->{path}";
+   print STDERR "$self->{fh}, $msg->[0], SEEK_SET\n";#d#
    seek $self->{fh}, $msg->[0], SEEK_SET
       or die "$self->{path}: $!";
+   print STDERR "$msg->[1] == read $self->{fh}, $msg->[1]\n";#d#
    $msg->[1] == read $self->{fh}, $mail, $msg->[1]
       or die "$self->{path}: $!";
    $mail =~ /^From \S/
    for (@_) {
       if (exists $self->{iidx}{$_}) { # at least one message exists
          my $guard = $::lockdisk->guard;
          my %del; @del{@_} = ();
          my @nidx;
+         my $dofs = 0;
-         open my $fh, ">", $temp
+         open my $fh, "+>", $temp
             or die "$temp: $!";
          eval {
             0 == setlkw(fileno $fh, 2)
                or die "$self->{path}~: $!";
             $self->{fsize} = 0; # we virtually truncated the file
-            my $dofs = 0;
             for (@{delete $self->{idx}}) {
                my $hash = $_->[1];
                my $buf;
                unless (exists $del{$hash}) {
             close $fh;
             unlink $temp;
             die;
          }
+         fflush($fh);
          File::Sync::fsync($fh);
          replace $temp, $self->{path};
          $self->{fh} = $fh;
          $self->{rw} = 1;
          delete $self->{iidx};
          $self->{idx} = \@nidx;
-         $self->{fsize} = $ofs;
+         $self->{fsize} = $dofs;
          return;
       }
    }
 }
 }
 sub end_update {
    my $self = shift;
-   $self->gendiff((delete $self->{oidx}, $self->{idx}));
+   $self->gendiff((delete $self->{oidx}), $self->{idx});
-   flushfh($self->{fh});
+   fflush($self->{fh});
    File::Sync::fsync($self->{fh});
    stat $self->{fh}
       or die "$self->{path}: $!";

Diff Legend

-–
+Removed lines
-+
+Added lines
-<
+Changed lines
->
+Changed lines

Comparing syncmail/folder.pm (file contents): Revision 1.5 by root, Mon Oct 29 00:37:41 2001 UTC vs. Revision 1.6 by root, Mon Oct 29 02:36:32 2001 UTC

Diff Legend

Comparing syncmail/folder.pm (file contents):
Revision 1.5 by root, Mon Oct 29 00:37:41 2001 UTC vs.
Revision 1.6 by root, Mon Oct 29 02:36:32 2001 UTC