usign-exec: simplify usign execv calls

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

diff --git a/usign-exec.c b/usign-exec.c
index 949e83e7395981e2592add724bc5c712bb30060f..4ff2e63c5be166788534efc04bcb62a7c57fdbec 100644 (file)
--- a/usign-exec.c
+++ b/usign-exec.c
@@ -72,13 +72,7 @@ int usign_s(const char *msgfile, const char *seckeyfile, const char *sigfile, bo
                return -1;
 
        case 0:
-               if (
-#ifdef UCERT_HOST_BUILD
-                       execvp(usign_argv[0], usign_argv)
-#else
-                       execv(usign_argv[0], usign_argv)
-#endif
-                  )
+               if (execvp(usign_argv[0], (char *const *)usign_argv))
                        return -1;
 
                break;
@@ -141,13 +135,7 @@ static int usign_f(char *fingerprint, const char *pubkeyfile, const char *seckey
                close(fds[0]);
                close(fds[1]);
 
-               if (
-#ifdef UCERT_HOST_BUILD
-                   execvp(usign_argv[0], usign_argv)
-#else
-                   execv(usign_argv[0], usign_argv)
-#endif
-                  )
+               if (execvp(usign_argv[0], (char *const *)usign_argv))
                        return -1;
 
                break;
@@ -209,13 +197,13 @@ 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++] = USIGN_EXEC;
@@ -247,13 +235,7 @@ int usign_v(const char *msgfile, const char *pubkeyfile,
                return -1;
 
        case 0:
-               if (
-#ifdef UCERT_HOST_BUILD
-                   execvp(usign_argv[0], usign_argv)
-#else
-                   execv(usign_argv[0], usign_argv)
-#endif
-                  )
+               if (execvp(usign_argv[0], (char *const *)usign_argv))
                        return -1;
 
                break;