From 3355aca17c0d79547ab4e3eb33f1b052e7137893 Mon Sep 17 00:00:00 2001 From: Samuel Thibault Date: Tue, 28 Jan 2025 01:23:04 +0100 Subject: [PATCH] hurd: Fix build Use PTRE_PATH_MAX instead of PATH_MAX or MAXPATHLEN Signed-off-by: Samuel Thibault --- src/mca/common/alps/common_alps.c | 2 +- src/mca/ess/base/ess_base_std_prted.c | 4 ++-- src/mca/filem/raw/filem_raw_module.c | 4 ++-- src/mca/odls/base/odls_base_default_fns.c | 6 +++--- src/mca/odls/default/odls_default_module.c | 2 +- src/mca/ras/alps/ras_alps_module.c | 6 +++--- 6 files changed, 12 insertions(+), 12 deletions(-) diff --git a/src/mca/common/alps/common_alps.c b/src/mca/common/alps/common_alps.c index cbf9b9a0ec..c57656f9b5 100644 --- a/src/mca/common/alps/common_alps.c +++ b/src/mca/common/alps/common_alps.c @@ -46,7 +46,7 @@ int prte_common_alps_proc_in_pagg(bool *flag) int rc = PRTE_SUCCESS; const char proc_job_file[] = "/proc/job"; FILE *fd = NULL, *fd_task_is_app = NULL; - char task_is_app_fname[PATH_MAX]; + char task_is_app_fname[PRTE_PATH_MAX]; if (flag == NULL) { return PRTE_ERR_BAD_PARAM; diff --git a/src/mca/ess/base/ess_base_std_prted.c b/src/mca/ess/base/ess_base_std_prted.c index 4b9b7520fc..7cbe2633dd 100644 --- a/src/mca/ess/base/ess_base_std_prted.c +++ b/src/mca/ess/base/ess_base_std_prted.c @@ -95,7 +95,7 @@ int prte_ess_base_prted_setup(void) { int ret = PRTE_ERROR; int fd; - char log_file[PATH_MAX]; + char log_file[PRTE_PATH_MAX]; char *error = NULL; char *tmp = NULL; prte_job_t *jdata = NULL; @@ -269,7 +269,7 @@ int prte_ess_base_prted_setup(void) */ /* define a log file name in the session directory */ - snprintf(log_file, PATH_MAX, "output-prted-%s-%s.log", + snprintf(log_file, PRTE_PATH_MAX, "output-prted-%s-%s.log", prte_process_info.myproc.nspace, prte_process_info.nodename); log_path = pmix_os_path(false, prte_process_info.top_session_dir, log_file, NULL); diff --git a/src/mca/filem/raw/filem_raw_module.c b/src/mca/filem/raw/filem_raw_module.c index 220aa7939f..19be843138 100644 --- a/src/mca/filem/raw/filem_raw_module.c +++ b/src/mca/filem/raw/filem_raw_module.c @@ -842,7 +842,7 @@ static int link_archive(prte_filem_raw_incoming_t *inbnd) { FILE *fp; char *cmd; - char path[MAXPATHLEN]; + char path[PRTE_PATH_MAX]; PMIX_OUTPUT_VERBOSE((1, prte_filem_base_framework.framework_output, "%s filem:raw: identifying links for archive %s", @@ -1060,7 +1060,7 @@ static void write_handler(int fd, short event, void *cbdata) prte_filem_raw_output_t *output; int num_written; char *dirname, *cmd; - char homedir[MAXPATHLEN]; + char homedir[PRTE_PATH_MAX]; int rc; PRTE_HIDE_UNUSED_PARAMS(fd, event); diff --git a/src/mca/odls/base/odls_base_default_fns.c b/src/mca/odls/base/odls_base_default_fns.c index 35b732154a..1548ee422f 100644 --- a/src/mca/odls/base/odls_base_default_fns.c +++ b/src/mca/odls/base/odls_base_default_fns.c @@ -821,7 +821,7 @@ int prte_odls_base_default_construct_child_list(pmix_data_buffer_t *buffer, pmix static int setup_path(prte_app_context_t *app, char **wdir) { int rc = PRTE_SUCCESS; - char dir[MAXPATHLEN]; + char dir[PRTE_PATH_MAX]; char *session_dir; bool usercwd = false; prte_job_t *job; @@ -1124,7 +1124,7 @@ void prte_odls_base_default_launch_local(int fd, short sd, void *cbdata) prte_app_context_t *app; prte_proc_t *child = NULL; int rc = PRTE_SUCCESS; - char basedir[MAXPATHLEN]; + char basedir[PRTE_PATH_MAX]; int j, idx; int total_num_local_procs = 0; prte_odls_launch_local_t *caddy = (prte_odls_launch_local_t *) cbdata; @@ -1979,7 +1979,7 @@ int prte_odls_base_default_restart_proc(prte_proc_t *child, int rc; prte_app_context_t *app; prte_job_t *jobdat; - char basedir[MAXPATHLEN]; + char basedir[PRTE_PATH_MAX]; char *wdir = NULL; prte_odls_spawn_caddy_t *cd; prte_event_base_t *evb; diff --git a/src/mca/odls/default/odls_default_module.c b/src/mca/odls/default/odls_default_module.c index 33fb7b2e78..d29c190499 100644 --- a/src/mca/odls/default/odls_default_module.c +++ b/src/mca/odls/default/odls_default_module.c @@ -291,7 +291,7 @@ static void do_child(prte_odls_spawn_caddy_t *cd, int write_fd) { int i; sigset_t sigs; - char dir[MAXPATHLEN]; + char dir[PRTE_PATH_MAX]; #if HAVE_SETPGID /* Set a new process group for this child, so that any diff --git a/src/mca/ras/alps/ras_alps_module.c b/src/mca/ras/alps/ras_alps_module.c index 1841d2381a..54031f2c41 100644 --- a/src/mca/ras/alps/ras_alps_module.c +++ b/src/mca/ras/alps/ras_alps_module.c @@ -136,7 +136,7 @@ static int parser_ini(char **val_if_found, FILE *fp, const char *var_name) return PRTE_ERR_FILE_OPEN_FAILURE; } *cpr = '\0'; - if (strlen(cpq) + 8 > PATH_MAX) { /* Bad configuration */ + if (strlen(cpq) + 8 > PRTE_PATH_MAX) { /* Bad configuration */ free(alps_config_str); PRTE_ERROR_LOG(PRTE_ERR_FILE_OPEN_FAILURE); return PRTE_ERR_FILE_OPEN_FAILURE; @@ -203,7 +203,7 @@ static int parser_separated_columns(char **val_if_found, FILE *fp, const char *v } *cpr = '\0'; /* Bad configuration sanity check */ - if (strlen(cpq) + 8 > PATH_MAX) { + if (strlen(cpq) + 8 > PRTE_PATH_MAX) { free(alps_config_str); PRTE_ERROR_LOG(PRTE_ERR_FILE_OPEN_FAILURE); return PRTE_ERR_FILE_OPEN_FAILURE; @@ -340,7 +340,7 @@ static int prte_ras_alps_allocate(prte_job_t *jdata, pmix_list_t *nodes) return ret; } -#define RAS_BASE_FILE_MAX_LINE_LENGTH (PATH_MAX * 2) +#define RAS_BASE_FILE_MAX_LINE_LENGTH (PRTE_PATH_MAX * 2) static char *ras_alps_getline(FILE *fp) {