Skip to content

Commit 66da631

Browse files
sthibaulrhc54
authored andcommitted
hurd: Fix build
Use PTRE_PATH_MAX instead of PATH_MAX or MAXPATHLEN Signed-off-by: Samuel Thibault <[email protected]> (cherry picked from commit bf36855)
1 parent 3bc0a12 commit 66da631

File tree

6 files changed

+12
-12
lines changed

6 files changed

+12
-12
lines changed

Diff for: src/mca/common/alps/common_alps.c

+1-1
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@ int prte_common_alps_proc_in_pagg(bool *flag)
4646
int rc = PRTE_SUCCESS;
4747
const char proc_job_file[] = "/proc/job";
4848
FILE *fd = NULL, *fd_task_is_app = NULL;
49-
char task_is_app_fname[PATH_MAX];
49+
char task_is_app_fname[PRTE_PATH_MAX];
5050

5151
if (flag == NULL) {
5252
return PRTE_ERR_BAD_PARAM;

Diff for: src/mca/ess/base/ess_base_std_prted.c

+2-2
Original file line numberDiff line numberDiff line change
@@ -95,7 +95,7 @@ int prte_ess_base_prted_setup(void)
9595
{
9696
int ret = PRTE_ERROR;
9797
int fd;
98-
char log_file[PATH_MAX];
98+
char log_file[PRTE_PATH_MAX];
9999
char *error = NULL;
100100
char *tmp = NULL;
101101
prte_job_t *jdata = NULL;
@@ -269,7 +269,7 @@ int prte_ess_base_prted_setup(void)
269269
*/
270270

271271
/* define a log file name in the session directory */
272-
snprintf(log_file, PATH_MAX, "output-prted-%s-%s.log",
272+
snprintf(log_file, PRTE_PATH_MAX, "output-prted-%s-%s.log",
273273
prte_process_info.myproc.nspace,
274274
prte_process_info.nodename);
275275
log_path = pmix_os_path(false, prte_process_info.top_session_dir, log_file, NULL);

Diff for: src/mca/filem/raw/filem_raw_module.c

+2-2
Original file line numberDiff line numberDiff line change
@@ -842,7 +842,7 @@ static int link_archive(prte_filem_raw_incoming_t *inbnd)
842842
{
843843
FILE *fp;
844844
char *cmd;
845-
char path[MAXPATHLEN];
845+
char path[PRTE_PATH_MAX];
846846

847847
PMIX_OUTPUT_VERBOSE((1, prte_filem_base_framework.framework_output,
848848
"%s filem:raw: identifying links for archive %s",
@@ -1060,7 +1060,7 @@ static void write_handler(int fd, short event, void *cbdata)
10601060
prte_filem_raw_output_t *output;
10611061
int num_written;
10621062
char *dirname, *cmd;
1063-
char homedir[MAXPATHLEN];
1063+
char homedir[PRTE_PATH_MAX];
10641064
int rc;
10651065
PRTE_HIDE_UNUSED_PARAMS(fd, event);
10661066

Diff for: src/mca/odls/base/odls_base_default_fns.c

+3-3
Original file line numberDiff line numberDiff line change
@@ -821,7 +821,7 @@ int prte_odls_base_default_construct_child_list(pmix_data_buffer_t *buffer, pmix
821821
static int setup_path(prte_app_context_t *app, char **wdir)
822822
{
823823
int rc = PRTE_SUCCESS;
824-
char dir[MAXPATHLEN];
824+
char dir[PRTE_PATH_MAX];
825825
char *session_dir;
826826
bool usercwd = false;
827827
prte_job_t *job;
@@ -1124,7 +1124,7 @@ void prte_odls_base_default_launch_local(int fd, short sd, void *cbdata)
11241124
prte_app_context_t *app;
11251125
prte_proc_t *child = NULL;
11261126
int rc = PRTE_SUCCESS;
1127-
char basedir[MAXPATHLEN];
1127+
char basedir[PRTE_PATH_MAX];
11281128
int j, idx;
11291129
int total_num_local_procs = 0;
11301130
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,
19791979
int rc;
19801980
prte_app_context_t *app;
19811981
prte_job_t *jobdat;
1982-
char basedir[MAXPATHLEN];
1982+
char basedir[PRTE_PATH_MAX];
19831983
char *wdir = NULL;
19841984
prte_odls_spawn_caddy_t *cd;
19851985
prte_event_base_t *evb;

Diff for: src/mca/odls/default/odls_default_module.c

+1-1
Original file line numberDiff line numberDiff line change
@@ -291,7 +291,7 @@ static void do_child(prte_odls_spawn_caddy_t *cd, int write_fd)
291291
{
292292
int i;
293293
sigset_t sigs;
294-
char dir[MAXPATHLEN];
294+
char dir[PRTE_PATH_MAX];
295295

296296
#if HAVE_SETPGID
297297
/* Set a new process group for this child, so that any

Diff for: src/mca/ras/alps/ras_alps_module.c

+3-3
Original file line numberDiff line numberDiff line change
@@ -136,7 +136,7 @@ static int parser_ini(char **val_if_found, FILE *fp, const char *var_name)
136136
return PRTE_ERR_FILE_OPEN_FAILURE;
137137
}
138138
*cpr = '\0';
139-
if (strlen(cpq) + 8 > PATH_MAX) { /* Bad configuration */
139+
if (strlen(cpq) + 8 > PRTE_PATH_MAX) { /* Bad configuration */
140140
free(alps_config_str);
141141
PRTE_ERROR_LOG(PRTE_ERR_FILE_OPEN_FAILURE);
142142
return PRTE_ERR_FILE_OPEN_FAILURE;
@@ -203,7 +203,7 @@ static int parser_separated_columns(char **val_if_found, FILE *fp, const char *v
203203
}
204204
*cpr = '\0';
205205
/* Bad configuration sanity check */
206-
if (strlen(cpq) + 8 > PATH_MAX) {
206+
if (strlen(cpq) + 8 > PRTE_PATH_MAX) {
207207
free(alps_config_str);
208208
PRTE_ERROR_LOG(PRTE_ERR_FILE_OPEN_FAILURE);
209209
return PRTE_ERR_FILE_OPEN_FAILURE;
@@ -340,7 +340,7 @@ static int prte_ras_alps_allocate(prte_job_t *jdata, pmix_list_t *nodes)
340340
return ret;
341341
}
342342

343-
#define RAS_BASE_FILE_MAX_LINE_LENGTH (PATH_MAX * 2)
343+
#define RAS_BASE_FILE_MAX_LINE_LENGTH (PRTE_PATH_MAX * 2)
344344

345345
static char *ras_alps_getline(FILE *fp)
346346
{

0 commit comments

Comments
 (0)