commit eb0f0005dd7c9fa9b95084632cc50d5d61ed81a0
from: Omar Polo <op@omarpolo.com>
via: Thomas Adam <thomas@xteddy.org>
date: Sat Mar 02 00:19:56 2024 UTC

improve execv error message

spotted using -portable on a system without openssh installed.
Showing the program we've failed to exec can be handy.

ok stsp@

commit - 9743baabb67ab4a15dc84abaf366f43dc19840b0
commit + eb0f0005dd7c9fa9b95084632cc50d5d61ed81a0
blob - 6fa757506d48c984249b92d3cdc2b11114394737
blob + 5614664a97583d54ff1a82c6e278319cacf69d87
--- lib/dial.c
+++ lib/dial.c
@@ -302,7 +302,7 @@ got_dial_ssh(pid_t *newpid, int *newfd, const char *ho
 		if (strlcpy(cmd, command, sizeof(cmd)) >= sizeof(cmd))
 			err(1, "snprintf");
 		if (execv(GOT_DIAL_PATH_SSH, (char *const *)argv) == -1)
-			err(1, "execv");
+			err(1, "execv %s", GOT_DIAL_PATH_SSH);
 		abort(); /* not reached */
 	} else {
 		if (close(pfd[0]) == -1)
blob - 636c1fd66bd630b65e959e51ebccac80c8acde76
blob + 3f89da6048ceac82d3f1890f2b12a693b1ceef33
--- lib/sigs.c
+++ lib/sigs.c
@@ -123,7 +123,7 @@ got_sigs_sign_tag_ssh(pid_t *newpid, int *in_fd, int *
 		if (dup2(out_pfd[1], 1) == -1)
 			err(1, "dup2");
 		if (execv(GOT_TAG_PATH_SSH_KEYGEN, (char **const)argv) == -1)
-			err(1, "execv");
+			err(1, "execv %s", GOT_TAG_PATH_SSH_KEYGEN);
 		abort(); /* not reached */
 	}
 	if (close(in_pfd[0]) == -1)
@@ -349,7 +349,7 @@ got_sigs_verify_tag_ssh(char **msg, struct got_tag_obj
 		if (dup2(out_pfd[1], 1) == -1)
 			err(1, "dup2");
 		if (execv(GOT_TAG_PATH_SSH_KEYGEN, (char **const)argv) == -1)
-			err(1, "execv");
+			err(1, "execv %s", GOT_TAG_PATH_SSH_KEYGEN);
 		abort(); /* not reached */
 	}
 	if (close(in_pfd[0]) == -1) {