usign-exec: fix exec error handling

[oweals/ucert.git] / usign-exec.c

diff --git a/usign-exec.c b/usign-exec.c
index 2ab2cd3c434bee4f5f8110feaa3feabab4591c82..22fdc14e7ebb956a7cd155f94c5992f9edff9248 100644 (file)
--- a/usign-exec.c
+++ b/usign-exec.c
@@ -20,7 +20,11 @@
 
 #include "usign.h"
 
+#ifdef UCERT_HOST_BUILD
+#define USIGN_EXEC "usign"
+#else
 #define USIGN_EXEC "/usr/bin/usign"
+#endif
 
 /*
  * check for revoker deadlink in pubkeydir
@@ -68,10 +72,10 @@ int usign_s(const char *msgfile, const char *seckeyfile, const char *sigfile, bo
                return -1;
 
        case 0:
-               if (execv(usign_argv[0], usign_argv))
-                       return -1;
-
-               break;
+               execvp(usign_argv[0], (char *const *)usign_argv);
+               if (!quiet)
+                       perror("Failed to execute usign");
+               _exit(1);
 
        default:
                waitpid(pid, &status, 0);
@@ -90,7 +94,7 @@ int usign_s(const char *msgfile, const char *seckeyfile, const char *sigfile, bo
  * call usign -F ... and set fingerprint returned
  * return WEXITSTATUS or -1 if fork or execv fails
  */
-static int usign_f(char *fingerprint, const char *pubkeyfile, const char *seckeyfile, const char *sigfile) {
+static int usign_f(char *fingerprint, const char *pubkeyfile, const char *seckeyfile, const char *sigfile, bool quiet) {
        int fds[2];
        pid_t pid;
        int status;
@@ -131,18 +135,19 @@ static int usign_f(char *fingerprint, const char *pubkeyfile, const char *seckey
                close(fds[0]);
                close(fds[1]);
 
-               if (execv(usign_argv[0], usign_argv))
-                       return -1;
-
-               break;
+               execvp(usign_argv[0], (char *const *)usign_argv);
+               if (!quiet)
+                       perror("Failed to execute usign");
+               _exit(1);
 
        default:
                waitpid(pid, &status, 0);
                status = WEXITSTATUS(status);
                if (fingerprint && !WEXITSTATUS(status)) {
+                       ssize_t r;
                        memset(fingerprint, 0, 17);
-                       read(fds[0], fingerprint, 17);
-                       if (fingerprint[16] != '\n')
+                       r = read(fds[0], fingerprint, 17);
+                       if (r < 16)
                                status = -1;
 
                        fingerprint[16] = '\0';
@@ -159,22 +164,22 @@ static int usign_f(char *fingerprint, const char *pubkeyfile, const char *seckey
 /*
  * call usign -F -p ...
  */
-int usign_f_pubkey(char *fingerprint, const char *pubkeyfile) {
-       return usign_f(fingerprint, pubkeyfile, NULL, NULL);
+int usign_f_pubkey(char *fingerprint, const char *pubkeyfile, bool quiet) {
+       return usign_f(fingerprint, pubkeyfile, NULL, NULL, quiet);
 }
 
 /*
  * call usign -F -s ...
  */
-int usign_f_seckey(char *fingerprint, const char *seckeyfile) {
-       return usign_f(fingerprint, NULL, seckeyfile, NULL);
+int usign_f_seckey(char *fingerprint, const char *seckeyfile, bool quiet) {
+       return usign_f(fingerprint, NULL, seckeyfile, NULL, quiet);
 }
 
 /*
  * call usign -F -x ...
  */
-int usign_f_sig(char *fingerprint, const char *sigfile) {
-       return usign_f(fingerprint, NULL, NULL, sigfile);
+int usign_f_sig(char *fingerprint, const char *sigfile, bool quiet) {
+       return usign_f(fingerprint, NULL, NULL, sigfile, quiet);
 }
 
 
@@ -190,15 +195,15 @@ int usign_v(const char *msgfile, const char *pubkeyfile,
        unsigned int usign_argc = 0;
        char fingerprint[17];
 
-       if (usign_f_sig(fingerprint, sigfile)) {
+       if (usign_f_sig(fingerprint, sigfile, quiet)) {
                if (!quiet)
-                       fprintf(stdout, "cannot get signing key fingerprint\n");
+                       fprintf(stderr, "cannot get signing key fingerprint\n");
                return 1;
        }
 
        if (pubkeydir && _usign_key_is_revoked(fingerprint, pubkeydir)) {
                if (!quiet)
-                       fprintf(stdout, "key %s has been revoked!\n", fingerprint);
+                       fprintf(stderr, "key %s has been revoked!\n", fingerprint);
                return 1;
        }
        usign_argv[usign_argc++] = USIGN_EXEC;
@@ -230,10 +235,10 @@ int usign_v(const char *msgfile, const char *pubkeyfile,
                return -1;
 
        case 0:
-               if (execv(usign_argv[0], usign_argv))
-                       return -1;
-
-               break;
+               execvp(usign_argv[0], (char *const *)usign_argv);
+               if (!quiet)
+                       perror("Failed to execute usign");
+               _exit(1);
 
        default:
                waitpid(pid, &status, 0);