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);
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);
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
###############################
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;
};
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";
if (defined $line) { # only if we found a sig here - we never remove revocation packets for instance
$answer = "yes";
};
} else {
- $stdout =~ s/\n/\\n/g;
debug("[sigremoval] no sig line here, only got: ".$stdout);
};
($stdout, $stderr, $status) =