diff mbox series

[OpenWrt-Devel,ucert,04/13] usign-exec: simplify usign execv calls

Message ID a9be4fb17df233fb9d23d3dae7aa6ce19fd7f38c.1589663193.git.mschiffer@universe-factory.net
State Accepted
Delegated to: Matthias Schiffer
Headers show
Series ucert fixes and cleanup | expand

Commit Message

Matthias Schiffer May 16, 2020, 9:13 p.m. UTC 
When the executable to exec is passed as an absolute path, execv() and
execvp() are equivalent, so there it no need to make the code hard to
read with #ifdefs.

Signed-off-by: Matthias Schiffer <mschiffer@universe-factory.net>
---
 usign-exec.c | 24 +++---------------------
 1 file changed, 3 insertions(+), 21 deletions(-)
diff mbox series

Patch

diff --git a/usign-exec.c b/usign-exec.c
index 7f6106580b16..4ff2e63c5be1 100644
--- 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], (char *const *)usign_argv)
-#else
-			execv(usign_argv[0], (char *const *)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], (char *const *)usign_argv)
-#else
-		    execv(usign_argv[0], (char *const *)usign_argv)
-#endif
-		   )
+		if (execvp(usign_argv[0], (char *const *)usign_argv))
 			return -1;
 
 		break;
@@ -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], (char *const *)usign_argv)
-#else
-		    execv(usign_argv[0], (char *const *)usign_argv)
-#endif
-		   )
+		if (execvp(usign_argv[0], (char *const *)usign_argv))
 			return -1;
 
 		break;