jexec_env: get error code from child process, #816

olevole · olevole · commit ae7ea476ee82 · 2025-07-25T10:08:25.000+03:00
diff --git a/misc/src/jexec_env.c b/misc/src/jexec_env.c
@@ -43,6 +43,8 @@ int execute_cmd(char *jname, char **argv)
 	int home_set=0, jexec_index=0, freebsd_ver=0;
 	FILE *fp;
 	char buffer[128];
+	int status=0;
+	int errcode=0;
 
 	if (!workdir) {
 		fprintf(stderr, "Environment variable 'workdir' is not set.\n");
@@ -143,28 +145,27 @@ int execute_cmd(char *jname, char **argv)
 //			fprintf(stderr, "No command specified.\n");
 //			exit(1);
 //		}
-
 		// Execute the command with the new environment
 		execv("/usr/sbin/jexec", jexec_argv);
 		// If execv returns, it failed
 		perror("execv failed");
 		exit(1);
 	} else if (pid > 0) {
-		wait(NULL);
+		waitpid(pid, &status, 0);
+		errcode=WEXITSTATUS(status);
 	} else {
 		perror("fork failed");
 		exit(1);
 	}
 
-	return 0;
+	return errcode;
 }
 
 int main(int argc, char **argv)
 {
+	int errcode=0;
 	char *jname = NULL;
-
 	jname=argv[1];
-
-	execute_cmd(jname, argv);
-	return 0;
+	errcode=execute_cmd(jname, argv);
+	exit(errcode);
 }
