folkert/simh-testsetgenerator
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

SCP: Pass all external environment variables through to spawned commands

Browse source 
As discussed in #1057
This commit is contained in:
Mark Pizzolato 2021-07-31 12:49:56 -07:00
parent 3943f9b24f
commit 2c820dca5c
1 changed files with 20 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

21
scp.c
View file

@ -3741,6 +3741,7 @@ return SCPE_OK;
t_stat spawn_cmd (int32 flag, CONST char *cptr) t_stat spawn_cmd (int32 flag, CONST char *cptr)
{ {
t_stat status; t_stat status;
int i;
if ((cptr == NULL) || (strlen (cptr) == 0)) if ((cptr == NULL) || (strlen (cptr) == 0))
cptr = getenv("SHELL"); cptr = getenv("SHELL");
@ -3755,11 +3756,16 @@ if (sim_log) /* flush log if enabled
fflush (sim_log); fflush (sim_log);
if (sim_deb) /* flush debug if enabled */ if (sim_deb) /* flush debug if enabled */
fflush (sim_deb); fflush (sim_deb);
/* Pass along externally defined (command alias conflicting) environment variables */
for (i = 0; i < sim_external_env_count; i++)
setenv (sim_external_env[i].name, sim_external_env[i].value, 1);
status = system (cptr); status = system (cptr);
#if defined (VMS) #if defined (VMS)
printf ("\n"); printf ("\n");
#endif #endif
/* Remove the externally defined (command alias conflicting) environment variables again */
for (i = 0; i < sim_external_env_count; i++)
unsetenv (sim_external_env[i].name);
return status; return status;
} }
@ -5547,6 +5553,7 @@ return SCPE_OK;
t_stat sim_set_environment (int32 flag, CONST char *cptr) t_stat sim_set_environment (int32 flag, CONST char *cptr)
{ {
char varname[CBUFSIZE], prompt[CBUFSIZE], cbuf[CBUFSIZE]; char varname[CBUFSIZE], prompt[CBUFSIZE], cbuf[CBUFSIZE];
int i;
if ((!cptr) || (*cptr == 0)) /* now eol? */ if ((!cptr) || (*cptr == 0)) /* now eol? */
return SCPE_2FARG; return SCPE_2FARG;
@ -5616,6 +5623,18 @@ else {
} }
} }
setenv(varname, cptr, 1); setenv(varname, cptr, 1);
/* remove the newly set name from the collection of alias conflicting external names */
for (i = 0; i < sim_external_env_count; i++) {
if (0 == strcmp (varname, sim_external_env[i].name)) {
int j;
free (sim_external_env[i].name);
free (sim_external_env[i].value);
for (j = 0; (i + j) < sim_external_env_count; j++)
sim_external_env[i + j] = sim_external_env[i + j + 1];
--sim_external_env_count;
}
}
return SCPE_OK; return SCPE_OK;
} }