Let's see if this fixes our race with gpg

[pgp-tools.git] / caff / caff

diff --git a/caff/caff b/caff/caff
index 4c5e6411c2b3da9e33f5f287cd0dc138a4dbe40f..71a9dda1c33e3159a34554acc9074a4bb462e698 100755 (executable)
--- a/caff/caff
+++ b/caff/caff
@@ -200,7 +200,7 @@ sub info($) {
 };
 sub debug($) {
        my ($line) = @_;
-       #print "[DEBUG] $line\n";
+       print "[DEBUG] $line\n";
 };
 sub trace($) {
        my ($line) = @_;
@@ -249,19 +249,29 @@ sub readwrite_gpg($$$$$%) {
        my $exitwhenstatusmatches = $options{'exitwhenstatusmatches'};
        trace("doign stuff until we find $exitwhenstatusmatches") if defined $exitwhenstatusmatches;
 
+       my $readwrote_stuff_this_time = 0;
+       my $do_not_wait_on_select = 0;
        my ($readyr, $readyw, $written);
        while ($sout->count() > 0 || (defined($sin) && ($sin->count() > 0))) {
                if (defined $exitwhenstatusmatches) {
                        if ($status =~ /$exitwhenstatusmatches/m) {
                                trace("readwrite_gpg found match on $exitwhenstatusmatches");
-                               last;
+                               if ($readwrote_stuff_this_time) {
+                                       trace("read/write some more\n");
+                                       $do_not_wait_on_select = 1;
+                               } else {
+                                       trace("that's it in our while loop.\n");
+                                       last;
+                               }
                        };
                };
 
+               $readwrote_stuff_this_time = 0;
                trace("select waiting for ".($sout->count())." fds.");
-               ($readyr, $readyw, undef) = IO::Select::select($sout, $sin, undef, 1);
+               ($readyr, $readyw, undef) = IO::Select::select($sout, $sin, undef, $do_not_wait_on_select ? 0 : 1);
                trace("ready: write: ".(defined $readyw ? scalar @$readyw : 0 )."; read: ".(defined $readyr ? scalar @$readyr : 0));
                for my $wfd (@$readyw) {
+                       $readwrote_stuff_this_time = 1;
                        if (length($in) != $offset) {
                                trace("writing to $wfd.");
                                $written = $wfd->syswrite($in, length($in) - $offset, $offset);
@@ -281,6 +291,7 @@ sub readwrite_gpg($$$$$%) {
                next unless (defined(@$readyr)); # Wait some more.
 
                for my $rfd (@$readyr) {
+                       $readwrote_stuff_this_time = 1;
                        if ($rfd->eof) {
                                trace("reading from $rfd done.");
                                $sout->remove($rfd);
@@ -684,11 +695,12 @@ for my $keyid (@keyids_ok) {
                while($status =~ /$KEYEDIT_DELSIG_PROMPT/m) {
                        # sig:?::17:EA2199412477CAF8:1058095214:::::13x:
                        my @sigline = grep { /^sig/ } (split /\n/, $stdout);
-                       notice("[sigremoval] why are there ".(scalar @sigline)." siglines in that part of the dialog!?.") if scalar @sigline >= 2; # XXX
+                       $stdout =~ s/\n/\\n/g;
+                       notice("[sigremoval] why are there ".(scalar @sigline)." siglines in that part of the dialog!? got: $stdout") if scalar @sigline >= 2; # XXX
                        my $line = pop @sigline;
                        my $answer = "no";
-                       debug("[sigremoval] doing line $line.");
                        if (defined $line) { # only if we found a sig here - we never remove revocation packets for instance
+                               debug("[sigremoval] doing line $line.");
                                my ($dummy1, $dummy2, $dummy3, $dummy4, $signer, $created, $dummy7, $dummy8, $dummy9) = split /:/, $line;
                                if ($signer eq $longkeyid) {
                                        debug("[sigremoval] selfsig ($signer).");
@@ -701,6 +713,8 @@ for my $keyid (@keyids_ok) {
                                        debug("[sigremoval] not interested in that sig ($signer).");
                                        $answer = "yes";
                                };
+                       } else {
+                               debug("[sigremoval] no sig line here, only got: ".$stdout);
                        };
                        ($stdout, $stderr, $status) =
                                readwrite_gpg($answer."\n", $inputfd, $stdoutfd, $stderrfd, $statusfd, exitwhenstatusmatches => $KEYEDIT_KEYEDIT_OR_DELSIG_PROMPT, nocloseinput => 1);