From 60fc0a484dcb5b034b6e3a2ffc9b4a62cf4bcc8b Mon Sep 17 00:00:00 2001
From: Vassily Litvinov <vasslitvinov@users.noreply.github.com>
Date: Fri, 20 Dec 2024 20:03:18 -0800
Subject: [PATCH] Quote user arguments passed to slurm launchers

Signed-off-by: Vassily Litvinov <vasslitvinov@users.noreply.github.com>
---
 .../src/launch/slurm-gasnetrun_common/slurm-gasnetrun_common.h  | 2 +-
 runtime/src/launch/slurm-srun/launch-slurm-srun.c               | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/runtime/src/launch/slurm-gasnetrun_common/slurm-gasnetrun_common.h b/runtime/src/launch/slurm-gasnetrun_common/slurm-gasnetrun_common.h
index 9fd90e83c8d3..13ac701e9ce3 100644
--- a/runtime/src/launch/slurm-gasnetrun_common/slurm-gasnetrun_common.h
+++ b/runtime/src/launch/slurm-gasnetrun_common/slurm-gasnetrun_common.h
@@ -347,7 +347,7 @@ static char* chpl_launch_create_command(int argc, char* argv[],
                    chpl_get_real_binary_wrapper(),
                    chpl_get_real_binary_name());
     for (i=1; i<argc; i++) {
-      len += snprintf(iCom+len, sizeof(iCom)-len, " %s", argv[i]);
+      len += snprintf(iCom+len, sizeof(iCom)-len, " '%s'", argv[i]);
     }
 
     snprintf(baseCommand, sizeof(baseCommand), "salloc %s", iCom);
diff --git a/runtime/src/launch/slurm-srun/launch-slurm-srun.c b/runtime/src/launch/slurm-srun/launch-slurm-srun.c
index 43ba7bb65b46..789526dc0f04 100644
--- a/runtime/src/launch/slurm-srun/launch-slurm-srun.c
+++ b/runtime/src/launch/slurm-srun/launch-slurm-srun.c
@@ -585,7 +585,7 @@ static char* chpl_launch_create_command(int argc, char* argv[],
 
     // add any arguments passed to the launcher to the binary
     for (i=1; i<argc; i++) {
-      len += snprintf(iCom+len, sizeof(iCom)-len, " %s", argv[i]);
+      len += snprintf(iCom+len, sizeof(iCom)-len, " '%s'", argv[i]);
     }
 
     // launch the job using srun