usign-exec: simplify usign execv calls

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

diff --git a/usign-exec.c b/usign-exec.c
index 70319fa5809ee436511bfb14296ea1e7c0009146..4ff2e63c5be166788534efc04bcb62a7c57fdbec 100644 (file)
--- a/usign-exec.c
+++ b/usign-exec.c
@@ -20,6 +20,12 @@
 
 #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
  * return true if a revoker exists, false otherwise
@@ -48,7 +54,7 @@ int usign_s(const char *msgfile, const char *seckeyfile, const char *sigfile, bo
        const char *usign_argv[16] = {0};
        unsigned int usign_argc = 0;
 
-       usign_argv[usign_argc++] = "/usr/bin/usign";
+       usign_argv[usign_argc++] = USIGN_EXEC;
        usign_argv[usign_argc++] = "-S";
        usign_argv[usign_argc++] = "-m";
        usign_argv[usign_argc++] = msgfile;
@@ -66,7 +72,7 @@ int usign_s(const char *msgfile, const char *seckeyfile, const char *sigfile, bo
                return -1;
 
        case 0:
-               if (execv(usign_argv[0], usign_argv))
+               if (execvp(usign_argv[0], (char *const *)usign_argv))
                        return -1;
 
                break;
@@ -98,7 +104,7 @@ static int usign_f(char *fingerprint, const char *pubkeyfile, const char *seckey
        if (pipe(fds))
                return -1;
 
-       usign_argv[usign_argc++] = "/usr/bin/usign";
+       usign_argv[usign_argc++] = USIGN_EXEC;
        usign_argv[usign_argc++] = "-F";
 
        if (pubkeyfile) {
@@ -129,21 +135,27 @@ 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))
+               if (execvp(usign_argv[0], (char *const *)usign_argv))
                        return -1;
 
                break;
 
        default:
                waitpid(pid, &status, 0);
+               status = WEXITSTATUS(status);
                if (fingerprint && !WEXITSTATUS(status)) {
-                       memset(fingerprint, 0, 16);
-                       read(fds[0], fingerprint, 16);
+                       ssize_t r;
+                       memset(fingerprint, 0, 17);
+                       r = read(fds[0], fingerprint, 17);
+                       if (r < 16)
+                               status = -1;
+
                        fingerprint[16] = '\0';
+
                }
                close(fds[0]);
                close(fds[1]);
-               return WEXITSTATUS(status);
+               return status;
        }
 
        return -1;
@@ -185,16 +197,16 @@ int usign_v(const char *msgfile, const char *pubkeyfile,
 
        if (usign_f_sig(fingerprint, sigfile)) {
                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++] = "/usr/bin/usign";
+       usign_argv[usign_argc++] = USIGN_EXEC;
        usign_argv[usign_argc++] = "-V";
        usign_argv[usign_argc++] = "-m";
        usign_argv[usign_argc++] = msgfile;
@@ -223,7 +235,7 @@ int usign_v(const char *msgfile, const char *pubkeyfile,
                return -1;
 
        case 0:
-               if (execv(usign_argv[0], usign_argv))
+               if (execvp(usign_argv[0], (char *const *)usign_argv))
                        return -1;
 
                break;