X-Git-Url: https://git.sthu.org/?a=blobdiff_plain;f=caff%2Fcaff;h=b7d19d71aff159d9fad76ec710a4f683ef0e3dff;hb=de54917e506a6b5ce6dd4748890a19ccb0f29d0e;hp=718e847eb876656da0431dc349be2b741b803b8e;hpb=245c68e937d090a496fe5f34381fcacc33dfd76b;p=pgp-tools.git

diff --git a/caff/caff b/caff/caff
index 718e847..b7d19d7 100755
--- a/caff/caff
+++ b/caff/caff
@@ -247,21 +247,31 @@ sub readwrite_gpg($$$$$%) {
 
 	my ($stdout, $stderr, $status) = ("", "", "");
 	my $exitwhenstatusmatches = $options{'exitwhenstatusmatches'};
-	trace("doign stuff until we find $exitwhenstatusmatches") if defined $exitwhenstatusmatches;
+	trace("doing 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);
@@ -585,7 +596,7 @@ for my $keyid (@keyids_ok) {
 	while (1) {
 		my $this_uid_text = '';
 		$uid_number++;
-		info("Doing key $keyid, uid $uid_number");
+		debug("Doing key $keyid, uid $uid_number");
 
 		# import into temporary gpghome
 		###############################
@@ -654,7 +665,7 @@ for my $keyid (@keyids_ok) {
 			next;
 		};
 		unless ($have_one) {
-			info("Uid ".($uid_number-1)." was the last, there is no $uid_number.");
+			debug("Uid ".($uid_number-1)." was the last, there is no $uid_number.");
 			info("key $keyid done.");
 			last;
 		};
@@ -684,10 +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);
+			$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).");
@@ -700,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);