stdout/stderr improvements

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

diff --git a/usign-exec.c b/usign-exec.c
index 687cb7dcfeaaf98203a31e3f40846ba46842229e..7f6106580b166ca110f0f0e10bce0ff54a7f9cd6 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
@@ -37,6 +43,7 @@ int _usign_key_is_revoked(const char *fingerprint, const char *pubkeydir) {
        return false;
 }
 
+#ifdef UCERT_FULL
 /*
  * call usign -S ...
  * return WEXITSTATUS or -1 if fork or execv fails
@@ -47,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;
@@ -65,7 +72,13 @@ 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 (
+#ifdef UCERT_HOST_BUILD
+                       execvp(usign_argv[0], (char *const *)usign_argv)
+#else
+                       execv(usign_argv[0], (char *const *)usign_argv)
+#endif
+                  )
                        return -1;
 
                break;
@@ -77,6 +90,11 @@ int usign_s(const char *msgfile, const char *seckeyfile, const char *sigfile, bo
 
        return -1;
 }
+#else
+int usign_s(const char *msgfile, const char *seckeyfile, const char *sigfile, bool quiet) {
+       return -1;
+};
+#endif
 
 /*
  * call usign -F ... and set fingerprint returned
@@ -92,7 +110,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) {
@@ -123,21 +141,33 @@ 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 (
+#ifdef UCERT_HOST_BUILD
+                   execvp(usign_argv[0], (char *const *)usign_argv)
+#else
+                   execv(usign_argv[0], (char *const *)usign_argv)
+#endif
+                  )
                        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;
@@ -179,16 +209,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;
@@ -217,7 +247,13 @@ int usign_v(const char *msgfile, const char *pubkeyfile,
                return -1;
 
        case 0:
-               if (execv(usign_argv[0], usign_argv))
+               if (
+#ifdef UCERT_HOST_BUILD
+                   execvp(usign_argv[0], (char *const *)usign_argv)
+#else
+                   execv(usign_argv[0], (char *const *)usign_argv)
+#endif
+                  )
                        return -1;
 
                break;