Skip to content
Snippets Groups Projects
Commit cf3ecb0a authored by Rob Swindell's avatar Rob Swindell :speech_balloon:
Browse files

Clarify in the help text: if you include a file extension (e.g. .exe)...

Then you must also include the file extension on all the configured command-lines.

The opposite is not true: excluding the file extension in the native program list will still work if the command-line includes the file extension.
parent 32fa13dd
No related branches found
No related tags found
1 merge request!463MRC mods by Codefenix (2024-10-20)
Pipeline #2686 passed
...@@ -2169,6 +2169,14 @@ int natvpgm_cfg() ...@@ -2169,6 +2169,14 @@ int natvpgm_cfg()
char str[81]; char str[81];
int j; int j;
uint i,u; uint i,u;
#define NATIVE_PROGRAM_NAME_NOTE "\n`Note:` If a file extension (e.g. `.exe`) is included in the filename,\n" \
" all command-lines must also include the file extension."
char* native_program_name_help =
"`Native Program Name:`\n"
"\n"
"This is the executable filename of the Native external program.\n"
NATIVE_PROGRAM_NAME_NOTE
;
while(1) { while(1) {
for(i=0;i<MAX_OPTS && i<cfg.total_natvpgms;i++) for(i=0;i<MAX_OPTS && i<cfg.total_natvpgms;i++)
...@@ -2183,13 +2191,14 @@ int natvpgm_cfg() ...@@ -2183,13 +2191,14 @@ int natvpgm_cfg()
"`Native Program List:`\n" "`Native Program List:`\n"
"\n" "\n"
"This is a list of all native (non-DOS) external program names that\n" "This is a list of all native (non-DOS) external program names that\n"
"you may execute in the Terminal Server. Any programs `not` listed\n" "may be executed in the Terminal Server. Any programs `not` listed\n"
"here will be assumed to be DOS programs (unless otherwise flagged as\n" "here will be assumed to be DOS programs (unless otherwise flagged as\n"
"'`Native`') and executed accordingly, or not, depending on the system.\n" "'`Native`') and executed accordingly, or not, depending on the system.\n"
"\n" "\n"
"Use ~ INS ~ and ~ DELETE ~ to add and remove native program names.\n" "Use ~ INS ~ and ~ DELETE ~ to add and remove native program names.\n"
"\n" "\n"
"To change the filename of a program, hit ~ ENTER ~.\n" "To change the filename of a program, hit ~ ENTER ~.\n"
NATIVE_PROGRAM_NAME_NOTE
; ;
i=uifc.list(j,0,0,30,&dflt,&bar,"Native Program List",opt); i=uifc.list(j,0,0,30,&dflt,&bar,"Native Program List",opt);
if((signed)i==-1) if((signed)i==-1)
...@@ -2197,11 +2206,7 @@ int natvpgm_cfg() ...@@ -2197,11 +2206,7 @@ int natvpgm_cfg()
int msk = i & MSK_ON; int msk = i & MSK_ON;
i &= MSK_OFF; i &= MSK_OFF;
if(msk == MSK_INS) { if(msk == MSK_INS) {
uifc.helpbuf= uifc.helpbuf=native_program_name_help;
"`Native Program Name:`\n"
"\n"
"This is the executable filename of the native external program.\n"
;
if(uifc.input(WIN_MID|WIN_SAV,0,0,"Native Program Name",str,12 if(uifc.input(WIN_MID|WIN_SAV,0,0,"Native Program Name",str,12
,0)<1) ,0)<1)
continue; continue;
...@@ -2235,11 +2240,7 @@ int natvpgm_cfg() ...@@ -2235,11 +2240,7 @@ int natvpgm_cfg()
} }
if (msk != 0) if (msk != 0)
continue; continue;
uifc.helpbuf= uifc.helpbuf=native_program_name_help;
"`Native Program Name:`\n"
"\n"
"This is the executable filename of the Native external program.\n"
;
SAFECOPY(str,cfg.natvpgm[i]->name); SAFECOPY(str,cfg.natvpgm[i]->name);
if(uifc.input(WIN_MID|WIN_SAV,0,5,"Native Program Name",str,12 if(uifc.input(WIN_MID|WIN_SAV,0,5,"Native Program Name",str,12
,K_EDIT)>0) ,K_EDIT)>0)
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment