From a6ede937d8b8c3c08f35c74b37dafeff1d47a7fe Mon Sep 17 00:00:00 2001
From: Moe Jette <jette1@llnl.gov>
Date: Fri, 14 Apr 2006 17:01:23 +0000
Subject: [PATCH] For multi-prog mode make file name be argv[0] and the
 configuration file be argv[1] (used to be argv[0] and file name was not
 available).

---
 src/slurmd/slurmstepd/task.c | 2 +-
 src/srun/opt.c               | 6 +++---
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/slurmd/slurmstepd/task.c b/src/slurmd/slurmstepd/task.c
index b68c7928668..b6063572a08 100644
--- a/src/slurmd/slurmstepd/task.c
+++ b/src/slurmd/slurmstepd/task.c
@@ -341,7 +341,7 @@ exec_task(slurmd_job_t *job, int i, int waitfd)
 	log_fini();
 
 	if (job->multi_prog)
-		task_exec(job->argv[0], job->env);
+		task_exec(job->argv[1], job->env);
 	else
 		execve(job->argv[0], job->argv, job->env);
 
diff --git a/src/srun/opt.c b/src/srun/opt.c
index e62b9dd7e31..781c32a1923 100644
--- a/src/srun/opt.c
+++ b/src/srun/opt.c
@@ -1529,10 +1529,10 @@ static void _load_multi(int *argc, char **argv)
 			data_read += i;
 	}
 	close(config_fd);
-	for (i=0; i<*argc; i++)
+	for (i=1; i<*argc; i++)
 		xfree(argv[i]);
-	argv[0] = data_buf;
-	*argc = 1;
+	argv[1] = data_buf;
+	*argc = 2;
 }
 
 /*
-- 
GitLab