projects
/
monkeysphere.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
91ab8af
)
gpg2ssh: check the return status of the base64 pipe so we can fail properly if it...
author
Daniel Kahn Gillmor
<dkg@fifthhorseman.net>
Wed, 9 Apr 2008 16:46:33 +0000
(12:46 -0400)
committer
Daniel Kahn Gillmor
<dkg@fifthhorseman.net>
Wed, 9 Apr 2008 16:46:33 +0000
(12:46 -0400)
gpg2ssh.c
patch
|
blob
|
history
diff --git
a/gpg2ssh.c
b/gpg2ssh.c
index f696f659cc903d8938f9cdb21efd14b5118a389c..615554990161f4bff2aefeac390a693ec7011d2f 100644
(file)
--- a/
gpg2ssh.c
+++ b/
gpg2ssh.c
@@
-48,6
+48,7
@@
int main(int argc, char* argv[]) {
char* const args[] = {"/usr/bin/base64", "--wrap=0", NULL};
const char* algoname;
int mpicount;
char* const args[] = {"/usr/bin/base64", "--wrap=0", NULL};
const char* algoname;
int mpicount;
+ int pipestatus;
init_gnutls();
init_gnutls();
@@
-258,23
+259,27
@@
int main(int argc, char* argv[]) {
snprintf(output_data, sizeof(output_data), "%s %s ", userid, algoname);
snprintf(output_data, sizeof(output_data), "%s %s ", userid, algoname);
- write(1, output_data, strlen(output_data));
-
pipefd = create_writing_pipe(&child_pid, args[0], args);
if (pipefd < 0) {
err("failed to create a writing pipe (returned %d)\n", pipefd);
return pipefd;
}
pipefd = create_writing_pipe(&child_pid, args[0], args);
if (pipefd < 0) {
err("failed to create a writing pipe (returned %d)\n", pipefd);
return pipefd;
}
+ write(1, output_data, strlen(output_data));
+
if (0 != write_data_fd_with_length(pipefd, all, mpicount)) {
err("was not able to write out RSA key data\n");
return 1;
}
close(pipefd);
if (0 != write_data_fd_with_length(pipefd, all, mpicount)) {
err("was not able to write out RSA key data\n");
return 1;
}
close(pipefd);
- if (child_pid != waitpid(child_pid,
NULL
, 0)) {
+ if (child_pid != waitpid(child_pid,
&pipestatus
, 0)) {
err("could not wait for child process to return for some reason.\n");
return 1;
}
err("could not wait for child process to return for some reason.\n");
return 1;
}
+ if (pipestatus != 0) {
+ err("base64 pipe died with return code %d\n", pipestatus);
+ return pipestatus;
+ }
write(1, "\n", 1);
write(1, "\n", 1);