X-Git-Url: http://git.sthu.org/?a=blobdiff_plain;f=caff%2Fcaff;h=f3cb06338c22cc70f5e87d4209c26f4e1985b845;hb=1f25fea57b73d2ea874e280014f3298d90eceb41;hp=73aacd55e37ea27e2297f4ad89cf5ca2a711605d;hpb=867fc0dc05487e335fc76970534447e0d417ec2f;p=pgp-tools.git

diff --git a/caff/caff b/caff/caff
index 73aacd5..f3cb063 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);
@@ -452,7 +463,7 @@ $CONFIG{'owner'}
 
 	$message_entity->head->add("Subject", "Your signed PGP key 0x$key_id");
 	$message_entity->head->add("To", $address);
-	$message_entity->head->add("From", $CONFIG{'owner'}.' <'.$CONFIG{'email'}.'>');
+	$message_entity->head->add("From", '"'.$CONFIG{'owner'}.'" <'.$CONFIG{'email'}.'>');
 	$message_entity->head->add("User-Agent", $USER_AGENT);
 	$message_entity->send();
 	$message_entity->stringify();
@@ -507,21 +518,34 @@ if ($CONFIG{'no-download'}) {
 	$gpg->options->meta_interactive( 0 );
 	my ($inputfd, $stdoutfd, $stderrfd, $statusfd, $handles) = make_gpg_fds();
 	
-	my $pid = $gpg->recv_keys(handles => $handles, command_args => [ @KEYIDS ]);
-	my ($stdout, $stderr, $status) = readwrite_gpg('', $inputfd, $stdoutfd, $stderrfd, $statusfd);
-	waitpid $pid, 0;
+	my @local_keyids = @KEYIDS;
+	for my $keyid (@local_keyids) {
+		info ("fetching $keyid...");
+		my $pid = $gpg->recv_keys(handles => $handles, command_args => [ $keyid ]);
+		my ($stdout, $stderr, $status) = readwrite_gpg('', $inputfd, $stdoutfd, $stderrfd, $statusfd);
+		waitpid $pid, 0;
 
 # [GNUPG:] IMPORT_OK 0 5B00C96D5D54AEE1206BAF84DE7AAF6E94C09C7F
 # [GNUPG:] NODATA 1
 # [GNUPG:] NODATA 1
 # [GNUPG:] IMPORT_OK 0 25FC1614B8F87B52FF2F99B962AF4031C82E0039
-	for my $line (split /\n/, $status) {
-		if ($line =~ /^\[GNUPG:\] IMPORT_OK/) {
-			push @keyids_ok, shift @KEYIDS;
-		} elsif ($line =~ /^\[GNUPG:\] NODATA/) {
+		my $handled = 0;
+		for my $line (split /\n/, $status) {
+			if ($line =~ /^\[GNUPG:\] IMPORT_OK/) {
+				push @keyids_ok, shift @KEYIDS;
+				$handled = 1;
+				last;
+			} elsif ($line =~ /^\[GNUPG:\] NODATA/) {
+				push @keyids_failed, shift @KEYIDS;
+				$handled = 1;
+				last;
+			};
+		};
+		unless ($handled) {
+			notice ("Huh, what's up with $keyid?");
 			push @keyids_failed, shift @KEYIDS;
 		};
-	}
+	};
 	die ("Still keys in \@KEYIDS.  This should not happen.") if scalar @KEYIDS;
 	notice ("Import failed for: ". (join ' ', @keyids_failed).".") if scalar @keyids_failed;
 };
@@ -530,14 +554,15 @@ if ($CONFIG{'no-download'}) {
 # sign keys
 ###########
 unless ($CONFIG{'no-sign'}) {
-	info("Sign the following keys according to your policy...");
+	info("Sign the following keys according to your policy, then exit gpg with 'save' after signing each key");
 	for my $keyid (@keyids_ok) {
 		my @command;
 		push @command, $CONFIG{'gpg-sign'};
 		push @command, '--local-user', $USER if (defined $USER);
 		push @command, "--homedir=$GNUPGHOME";
 		push @command, '--secret-keyring', $CONFIG{'secret-keyring'};
-		push @command, '--sign-key', $keyid;
+		push @command, '--edit', $keyid;
+		push @command, 'sign';
 		print join(' ', @command),"\n";
 		system (@command);
 	};
@@ -585,7 +610,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 +679,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;
 		};