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

Re-word the text around native programs. 

Make it clear that if it's not a 16-bit DOS program, it's "native".

Changed "New Shell / New Context" to "New Shell or New Context"
parent ca424956
No related branches found
No related tags found
1 merge request!463MRC mods by Codefenix (2024-10-20)
Show whitespace changes
Inline Side-by-side
src/sbbs3/scfg/scfgxfr1.c
+ 2
− 16
View file @ d9e107ba
/* $Id: scfgxfr1.c,v 1.30 2019/07/13 23:13:58 rswindell Exp $ */
/**************************************************************************** /****************************************************************************
* @format.tab-size 4 (Plain Text/Source Code File Header) * * @format.tab-size 4 (Plain Text/Source Code File Header) *
* @format.use-tabs true (see http://www.synchro.net/ptsc_hdr.html) * * @format.use-tabs true (see http://www.synchro.net/ptsc_hdr.html) *
...@@ -13,21 +11,9 @@ ...@@ -13,21 +11,9 @@
* See the GNU General Public License for more details: gpl.txt or * * See the GNU General Public License for more details: gpl.txt or *
* http://www.fsf.org/copyleft/gpl.html * * http://www.fsf.org/copyleft/gpl.html *
* * * *
* Anonymous FTP access to the most recent released source is available at *
* ftp://vert.synchro.net, ftp://cvs.synchro.net and ftp://ftp.synchro.net *
* *
* Anonymous CVS access to the development source and modification history *
* is available at cvs.synchro.net:/cvsroot/sbbs, example: *
* cvs -d :pserver:anonymous@cvs.synchro.net:/cvsroot/sbbs login *
* (just hit return, no password is necessary) *
* cvs -d :pserver:anonymous@cvs.synchro.net:/cvsroot/sbbs checkout src *
* *
* For Synchronet coding style and modification guidelines, see * * For Synchronet coding style and modification guidelines, see *
* http://www.synchro.net/source.html * * http://www.synchro.net/source.html *
* * * *
* You are encouraged to submit any modifications (preferably in Unix diff *
* format) via e-mail to mods@synchro.net *
* *
* Note: If this box doesn't appear square, then you need to fix your tabs. * * Note: If this box doesn't appear square, then you need to fix your tabs. *
****************************************************************************/ ****************************************************************************/
...@@ -967,7 +953,7 @@ void xfer_opts() ...@@ -967,7 +953,7 @@ void xfer_opts()
,cfg.prot[i]->batdlcmd); ,cfg.prot[i]->batdlcmd);
sprintf(opt[j++],"%-30.30s%-40s","Bi-dir Command Line" sprintf(opt[j++],"%-30.30s%-40s","Bi-dir Command Line"
,cfg.prot[i]->bicmd); ,cfg.prot[i]->bicmd);
sprintf(opt[j++],"%-30.30s%s", "Native (32-bit) Executable" sprintf(opt[j++],"%-30.30s%s", "Native Executable/Script"
,cfg.prot[i]->misc&PROT_NATIVE ? "Yes" : "No"); ,cfg.prot[i]->misc&PROT_NATIVE ? "Yes" : "No");
sprintf(opt[j++],"%-30.30s%s", "Supports DSZLOG" sprintf(opt[j++],"%-30.30s%s", "Supports DSZLOG"
,cfg.prot[i]->misc&PROT_DSZLOG ? "Yes":"No"); ,cfg.prot[i]->misc&PROT_DSZLOG ? "Yes":"No");
...@@ -1030,7 +1016,7 @@ void xfer_opts() ...@@ -1030,7 +1016,7 @@ void xfer_opts()
case 8: case 8:
l=cfg.prot[i]->misc&PROT_NATIVE ? 0:1; l=cfg.prot[i]->misc&PROT_NATIVE ? 0:1;
l=uifc.list(WIN_MID|WIN_SAV,0,0,0,&l,0 l=uifc.list(WIN_MID|WIN_SAV,0,0,0,&l,0
,"Native (32-bit) Executable",uifcYesNoOpts); ,"Native Executable/Script",uifcYesNoOpts);
if((l==0 && !(cfg.prot[i]->misc&PROT_NATIVE)) if((l==0 && !(cfg.prot[i]->misc&PROT_NATIVE))
|| (l==1 && cfg.prot[i]->misc&PROT_NATIVE)) { || (l==1 && cfg.prot[i]->misc&PROT_NATIVE)) {
cfg.prot[i]->misc^=PROT_NATIVE; cfg.prot[i]->misc^=PROT_NATIVE;
......
src/sbbs3/scfg/scfgxtrn.c
+ 18
− 44
View file @ d9e107ba
/* $Id: scfgxtrn.c,v 1.71 2020/08/08 20:18:07 rswindell Exp $ */
// vi: tabstop=4
/**************************************************************************** /****************************************************************************
* @format.tab-size 4 (Plain Text/Source Code File Header) * * @format.tab-size 4 (Plain Text/Source Code File Header) *
* @format.use-tabs true (see http://www.synchro.net/ptsc_hdr.html) * * @format.use-tabs true (see http://www.synchro.net/ptsc_hdr.html) *
...@@ -14,33 +11,18 @@ ...@@ -14,33 +11,18 @@
* See the GNU General Public License for more details: gpl.txt or * * See the GNU General Public License for more details: gpl.txt or *
* http://www.fsf.org/copyleft/gpl.html * * http://www.fsf.org/copyleft/gpl.html *
* * * *
* Anonymous FTP access to the most recent released source is available at *
* ftp://vert.synchro.net, ftp://cvs.synchro.net and ftp://ftp.synchro.net *
* *
* Anonymous CVS access to the development source and modification history *
* is available at cvs.synchro.net:/cvsroot/sbbs, example: *
* cvs -d :pserver:anonymous@cvs.synchro.net:/cvsroot/sbbs login *
* (just hit return, no password is necessary) *
* cvs -d :pserver:anonymous@cvs.synchro.net:/cvsroot/sbbs checkout src *
* *
* For Synchronet coding style and modification guidelines, see * * For Synchronet coding style and modification guidelines, see *
* http://www.synchro.net/source.html * * http://www.synchro.net/source.html *
* * * *
* You are encouraged to submit any modifications (preferably in Unix diff *
* format) via e-mail to mods@synchro.net *
* *
* Note: If this box doesn't appear square, then you need to fix your tabs. * * Note: If this box doesn't appear square, then you need to fix your tabs. *
****************************************************************************/ ****************************************************************************/
/****************************************************************************/
/* Synchronet configuration utility */
/****************************************************************************/
#include "scfg.h" #include "scfg.h"
char *daystr(char days); char *daystr(char days);
static void hotkey_cfg(void); static void hotkey_cfg(void);
static char* use_shell_opt = "Use Shell / New Context"; static char* use_shell_opt = "Use Shell or New Context";
static char* use_shell_help = static char* use_shell_help =
"`Use System Shell or New JavaScript Context to Execute:`\n" "`Use System Shell or New JavaScript Context to Execute:`\n"
"\n" "\n"
...@@ -54,6 +36,12 @@ static char* use_shell_help = ...@@ -54,6 +36,12 @@ static char* use_shell_help =
"context for it to execute within, for every invocation." "context for it to execute within, for every invocation."
; ;
static char* use_shell_prompt = "Use System Shell or New JavaScript Context to Execute"; static char* use_shell_prompt = "Use System Shell or New JavaScript Context to Execute";
static char* native_help =
"`Native Executable/Script:`\n"
"\n"
"If this program is `16-bit MS-DOS` executable, set this option to `No`,\n"
"otherwise (it is a native program or script) set this option to `Yes`.\n"
;
#define CUT_XTRNSEC_NUM USHRT_MAX #define CUT_XTRNSEC_NUM USHRT_MAX
...@@ -525,7 +513,7 @@ void tevents_cfg() ...@@ -525,7 +513,7 @@ void tevents_cfg()
,cfg.event[i]->misc&EVENT_EXCL ? "Yes":"No"); ,cfg.event[i]->misc&EVENT_EXCL ? "Yes":"No");
sprintf(opt[k++],"%-32.32s%s","Force Users Off-line For Event" sprintf(opt[k++],"%-32.32s%s","Force Users Off-line For Event"
,cfg.event[i]->misc&EVENT_FORCE ? "Yes":"No"); ,cfg.event[i]->misc&EVENT_FORCE ? "Yes":"No");
sprintf(opt[k++],"%-32.32s%s","Native Executable" sprintf(opt[k++],"%-32.32s%s","Native Executable/Script"
,cfg.event[i]->misc&EX_NATIVE ? "Yes" : "No"); ,cfg.event[i]->misc&EX_NATIVE ? "Yes" : "No");
sprintf(opt[k++],"%-32.32s%s",use_shell_opt sprintf(opt[k++],"%-32.32s%s",use_shell_opt
,cfg.event[i]->misc&XTRN_SH ? "Yes" : "No"); ,cfg.event[i]->misc&XTRN_SH ? "Yes" : "No");
...@@ -797,14 +785,9 @@ void tevents_cfg() ...@@ -797,14 +785,9 @@ void tevents_cfg()
case 11: case 11:
k=(cfg.event[i]->misc&EX_NATIVE) ? 0:1; k=(cfg.event[i]->misc&EX_NATIVE) ? 0:1;
uifc.helpbuf= uifc.helpbuf=native_help;
"`Native Executable:`\n"
"\n"
"If this event program is a native (e.g. non-DOS) executable, set this\n"
"option to `Yes`.\n"
;
k=uifc.list(WIN_MID|WIN_SAV,0,0,0,&k,0 k=uifc.list(WIN_MID|WIN_SAV,0,0,0,&k,0
,"Native Executable",uifcYesNoOpts); ,"Native Executable/Script",uifcYesNoOpts);
if(!k && !(cfg.event[i]->misc&EX_NATIVE)) { if(!k && !(cfg.event[i]->misc&EX_NATIVE)) {
cfg.event[i]->misc|=EX_NATIVE; cfg.event[i]->misc|=EX_NATIVE;
uifc.changes=TRUE; uifc.changes=TRUE;
...@@ -1018,7 +1001,7 @@ void xtrn_cfg(uint section) ...@@ -1018,7 +1001,7 @@ void xtrn_cfg(uint section)
==(XTRN_STDIO|WWIVCOLOR) ? ", WWIV Color" : nulstr ==(XTRN_STDIO|WWIVCOLOR) ? ", WWIV Color" : nulstr
,(cfg.xtrn[i]->misc&(XTRN_STDIO|XTRN_NOECHO)) ,(cfg.xtrn[i]->misc&(XTRN_STDIO|XTRN_NOECHO))
==(XTRN_STDIO|XTRN_NOECHO) ? ", No Echo" : nulstr); ==(XTRN_STDIO|XTRN_NOECHO) ? ", No Echo" : nulstr);
sprintf(opt[k++],"%-27.27s%s","Native Executable" sprintf(opt[k++],"%-27.27s%s","Native Executable/Script"
,cfg.xtrn[i]->misc&XTRN_NATIVE ? "Yes" : "No"); ,cfg.xtrn[i]->misc&XTRN_NATIVE ? "Yes" : "No");
sprintf(opt[k++],"%-27.27s%s",use_shell_opt sprintf(opt[k++],"%-27.27s%s",use_shell_opt
,cfg.xtrn[i]->misc&XTRN_SH ? "Yes" : "No"); ,cfg.xtrn[i]->misc&XTRN_SH ? "Yes" : "No");
...@@ -1266,12 +1249,7 @@ void xtrn_cfg(uint section) ...@@ -1266,12 +1249,7 @@ void xtrn_cfg(uint section)
break; break;
case 10: case 10:
k=(cfg.xtrn[i]->misc&XTRN_NATIVE) ? 0:1; k=(cfg.xtrn[i]->misc&XTRN_NATIVE) ? 0:1;
uifc.helpbuf= uifc.helpbuf=native_help;
"`Native Executable:`\n"
"\n"
"If this online program is a native (e.g. non-DOS) executable,\n"
"set this option to `Yes`.\n"
;
k=uifc.list(WIN_MID|WIN_SAV,0,0,0,&k,0 k=uifc.list(WIN_MID|WIN_SAV,0,0,0,&k,0
,"Native",uifcYesNoOpts); ,"Native",uifcYesNoOpts);
if(!k && !(cfg.xtrn[i]->misc&XTRN_NATIVE)) { if(!k && !(cfg.xtrn[i]->misc&XTRN_NATIVE)) {
...@@ -1697,7 +1675,7 @@ void xedit_cfg() ...@@ -1697,7 +1675,7 @@ void xedit_cfg()
:cfg.xedit[i]->misc&XTRN_CONIO ? "Console":"No" :cfg.xedit[i]->misc&XTRN_CONIO ? "Console":"No"
,(cfg.xedit[i]->misc&(XTRN_STDIO|WWIVCOLOR)) ,(cfg.xedit[i]->misc&(XTRN_STDIO|WWIVCOLOR))
==(XTRN_STDIO|WWIVCOLOR) ? ", WWIV Color" : nulstr); ==(XTRN_STDIO|WWIVCOLOR) ? ", WWIV Color" : nulstr);
sprintf(opt[k++],"%-32.32s%s","Native Executable" sprintf(opt[k++],"%-32.32s%s","Native Executable/Script"
,cfg.xedit[i]->misc&XTRN_NATIVE ? "Yes" : "No"); ,cfg.xedit[i]->misc&XTRN_NATIVE ? "Yes" : "No");
sprintf(opt[k++],"%-32.32s%s",use_shell_opt sprintf(opt[k++],"%-32.32s%s",use_shell_opt
,cfg.xedit[i]->misc&XTRN_SH ? "Yes" : "No"); ,cfg.xedit[i]->misc&XTRN_SH ? "Yes" : "No");
...@@ -1867,11 +1845,7 @@ void xedit_cfg() ...@@ -1867,11 +1845,7 @@ void xedit_cfg()
break; break;
case 5: case 5:
k=(cfg.xedit[i]->misc&XTRN_NATIVE) ? 0:1; k=(cfg.xedit[i]->misc&XTRN_NATIVE) ? 0:1;
uifc.helpbuf= uifc.helpbuf=native_help;
"`Native Executable:`\n"
"\n"
"If this editor is a native (non-DOS) executable, set this option to `Yes`.\n"
;
k=uifc.list(WIN_MID|WIN_SAV,0,0,0,&k,0 k=uifc.list(WIN_MID|WIN_SAV,0,0,0,&k,0
,"Native",uifcYesNoOpts); ,"Native",uifcYesNoOpts);
if(!k && !(cfg.xedit[i]->misc&XTRN_NATIVE)) { if(!k && !(cfg.xedit[i]->misc&XTRN_NATIVE)) {
...@@ -2194,10 +2168,10 @@ int natvpgm_cfg() ...@@ -2194,10 +2168,10 @@ int natvpgm_cfg()
uifc.helpbuf= uifc.helpbuf=
"`Native Program List:`\n" "`Native Program List:`\n"
"\n" "\n"
"This is a list of all native (non-DOS) external program (executable file)\n" "This is a list of all native (non-DOS) external program names that\n"
"names that you may execute under `Synchronet`. This list is not\n" "you may execute in the Terminal Server. Any programs `not` listed\n"
"used in Synchronet for DOS. Any programs not listed here will be assumed\n" "here will be assumed to be DOS programs (unless otherwise flagged as\n"
"to be DOS programs and executed accordingly.\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"
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment