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

Don't truncate configuration strings when displaying lists/menus 

Let UIFC do the truncation as necessary to fit windows/forms, when applicable.
Thanks for jc and nelgin for pointing this out via IRC.
parent de8fd237
No related branches found
No related tags found
1 merge request!463MRC mods by Codefenix (2024-10-20)
Pipeline #871 passed
Stage: build
Show whitespace changes
Inline Side-by-side
src/sbbs3/scfg/scfgchat.c
+ 2
− 4
View file @ 0c9cc2e6
/* $Id: scfgchat.c,v 1.23 2018/06/21 20:22:07 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) *
...@@ -114,8 +112,8 @@ void page_cfg() ...@@ -114,8 +112,8 @@ void page_cfg()
done=0; done=0;
while(!done) { while(!done) {
k=0; k=0;
sprintf(opt[k++],"%-27.27s%.40s","Command Line",cfg.page[i]->cmd); sprintf(opt[k++],"%-27.27s%s","Command Line",cfg.page[i]->cmd);
sprintf(opt[k++],"%-27.27s%.40s","Access Requirements",cfg.page[i]->arstr); sprintf(opt[k++],"%-27.27s%s","Access Requirements",cfg.page[i]->arstr);
sprintf(opt[k++],"%-27.27s%s","Intercept I/O" sprintf(opt[k++],"%-27.27s%s","Intercept I/O"
,(cfg.page[i]->misc&XTRN_STDIO) ? "Standard" ,(cfg.page[i]->misc&XTRN_STDIO) ? "Standard"
:cfg.page[i]->misc&XTRN_CONIO ? "Console":"No"); :cfg.page[i]->misc&XTRN_CONIO ? "Console":"No");
......
src/sbbs3/scfg/scfgmsg.c
+ 1
− 3
View file @ 0c9cc2e6
/* $Id: scfgmsg.c,v 1.74 2020/08/18 06:03:09 rswindell Exp $ */
/* Configuring Message Options and Message Groups (but not sub-boards) */ /* Configuring Message Options and Message Groups (but not sub-boards) */
/**************************************************************************** /****************************************************************************
...@@ -642,7 +640,7 @@ void msgs_cfg() ...@@ -642,7 +640,7 @@ void msgs_cfg()
sprintf(opt[j++],"%-27.27s%s","Long Name",cfg.grp[grpnum]->lname); sprintf(opt[j++],"%-27.27s%s","Long Name",cfg.grp[grpnum]->lname);
sprintf(opt[j++],"%-27.27s%s","Short Name",cfg.grp[grpnum]->sname); sprintf(opt[j++],"%-27.27s%s","Short Name",cfg.grp[grpnum]->sname);
sprintf(opt[j++],"%-27.27s%s","Internal Code Prefix",cfg.grp[grpnum]->code_prefix); sprintf(opt[j++],"%-27.27s%s","Internal Code Prefix",cfg.grp[grpnum]->code_prefix);
sprintf(opt[j++],"%-27.27s%.40s","Access Requirements" sprintf(opt[j++],"%-27.27s%s","Access Requirements"
,cfg.grp[grpnum]->arstr); ,cfg.grp[grpnum]->arstr);
sprintf(opt[j++],"%-27.27s%s","Sort Group by Sub-board", area_sort_desc[cfg.grp[grpnum]->sort]); sprintf(opt[j++],"%-27.27s%s","Sort Group by Sub-board", area_sort_desc[cfg.grp[grpnum]->sort]);
strcpy(opt[j++],"Clone Options"); strcpy(opt[j++],"Clone Options");
......
src/sbbs3/scfg/scfgnet.c
+ 9
− 24
View file @ 0c9cc2e6
/* $Id: scfgnet.c,v 1.49 2020/05/01 17:21:48 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,21 +11,9 @@ ...@@ -14,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. *
****************************************************************************/ ****************************************************************************/
...@@ -293,13 +278,13 @@ void net_cfg() ...@@ -293,13 +278,13 @@ void net_cfg()
strcat(tmp, ", ..."); strcat(tmp, ", ...");
sprintf(opt[i++],"%-33.33s%s" sprintf(opt[i++],"%-33.33s%s"
,"System Addresses",tmp); ,"System Addresses",tmp);
sprintf(opt[i++],"%-33.33s%.40s" sprintf(opt[i++],"%-33.33s%s"
,"Default Origin Line", cfg.origline); ,"Default Origin Line", cfg.origline);
sprintf(opt[i++],"%-33.33s%.40s" sprintf(opt[i++],"%-33.33s%s"
,"NetMail Semaphore",cfg.netmail_sem); ,"NetMail Semaphore",cfg.netmail_sem);
sprintf(opt[i++],"%-33.33s%.40s" sprintf(opt[i++],"%-33.33s%s"
,"EchoMail Semaphore",cfg.echomail_sem); ,"EchoMail Semaphore",cfg.echomail_sem);
sprintf(opt[i++],"%-33.33s%.40s" sprintf(opt[i++],"%-33.33s%s"
,"NetMail Directory",cfg.netmail_dir); ,"NetMail Directory",cfg.netmail_dir);
sprintf(opt[i++],"%-33.33s%s" sprintf(opt[i++],"%-33.33s%s"
,"Allow Sending of NetMail" ,"Allow Sending of NetMail"
...@@ -652,9 +637,9 @@ void net_cfg() ...@@ -652,9 +637,9 @@ void net_cfg()
i=0; i=0;
sprintf(opt[i++],"%-27.27s%s" sprintf(opt[i++],"%-27.27s%s"
,"System Address",cfg.sys_inetaddr); ,"System Address",cfg.sys_inetaddr);
sprintf(opt[i++],"%-27.27s%.40s" sprintf(opt[i++],"%-27.27s%s"
,"Inbound E-mail Semaphore",cfg.smtpmail_sem); ,"Inbound E-mail Semaphore",cfg.smtpmail_sem);
sprintf(opt[i++],"%-27.27s%.40s" sprintf(opt[i++],"%-27.27s%s"
,"Outbound E-mail Semaphore",cfg.inetmail_sem); ,"Outbound E-mail Semaphore",cfg.inetmail_sem);
sprintf(opt[i++],"%-27.27s%s" sprintf(opt[i++],"%-27.27s%s"
,"Allow Sending of E-mail" ,"Allow Sending of E-mail"
...@@ -839,9 +824,9 @@ void qhub_edit(int num) ...@@ -839,9 +824,9 @@ void qhub_edit(int num)
while(!done) { while(!done) {
i=0; i=0;
sprintf(opt[i++],"%-27.27s%s","Hub System ID",cfg.qhub[num]->id); sprintf(opt[i++],"%-27.27s%s","Hub System ID",cfg.qhub[num]->id);
sprintf(opt[i++],"%-27.27s%.40s","Pack Command Line",cfg.qhub[num]->pack); sprintf(opt[i++],"%-27.27s%s","Pack Command Line",cfg.qhub[num]->pack);
sprintf(opt[i++],"%-27.27s%.40s","Unpack Command Line",cfg.qhub[num]->unpack); sprintf(opt[i++],"%-27.27s%s","Unpack Command Line",cfg.qhub[num]->unpack);
sprintf(opt[i++],"%-27.27s%.40s","Call-out Command Line",cfg.qhub[num]->call); sprintf(opt[i++],"%-27.27s%s","Call-out Command Line",cfg.qhub[num]->call);
if(cfg.qhub[num]->node == NODE_ANY) if(cfg.qhub[num]->node == NODE_ANY)
SAFECOPY(str, "Any"); SAFECOPY(str, "Any");
else else
......
src/sbbs3/scfg/scfgnode.c
+ 6
− 20
View file @ 0c9cc2e6
/* $Id: scfgnode.c,v 1.37 2020/08/08 19:24:27 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. *
****************************************************************************/ ****************************************************************************/
...@@ -184,7 +170,7 @@ void node_cfg() ...@@ -184,7 +170,7 @@ void node_cfg()
while(1) { while(1) {
i=0; i=0;
sprintf(opt[i++],"%-27.27s%s","Phone Number",cfg.node_phone); sprintf(opt[i++],"%-27.27s%s","Phone Number",cfg.node_phone);
sprintf(opt[i++],"%-27.27s%.40s","Logon Requirements",cfg.node_arstr); sprintf(opt[i++],"%-27.27s%s","Logon Requirements",cfg.node_arstr);
strcpy(opt[i++],"Toggle Options..."); strcpy(opt[i++],"Toggle Options...");
strcpy(opt[i++],"Advanced Options..."); strcpy(opt[i++],"Advanced Options...");
opt[i][0]=0; opt[i][0]=0;
...@@ -390,9 +376,9 @@ void node_cfg() ...@@ -390,9 +376,9 @@ void node_cfg()
,cfg.sec_warn); ,cfg.sec_warn);
sprintf(opt[i++],"%-27.27s%u seconds","Inactivity Disconnection" sprintf(opt[i++],"%-27.27s%u seconds","Inactivity Disconnection"
,cfg.sec_hangup); ,cfg.sec_hangup);
sprintf(opt[i++],"%-27.27s%.40s","Daily Event",cfg.node_daily); sprintf(opt[i++],"%-27.27s%s","Daily Event",cfg.node_daily);
sprintf(opt[i++],"%-27.27s%.40s","Node Directory",cfg.node_path[cfg.node_num-1]); sprintf(opt[i++],"%-27.27s%s","Node Directory",cfg.node_path[cfg.node_num-1]);
sprintf(opt[i++],"%-27.27s%.40s","Text Directory",cfg.text_dir); sprintf(opt[i++],"%-27.27s%s","Text Directory",cfg.text_dir);
opt[i][0]=0; opt[i][0]=0;
uifc.helpbuf= uifc.helpbuf=
"`Node Advanced Options:`\n" "`Node Advanced Options:`\n"
......
src/sbbs3/scfg/scfgsub.c
+ 7
− 21
View file @ 0c9cc2e6
/* $Id: scfgsub.c,v 1.62 2020/05/27 02:49:22 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. *
****************************************************************************/ ****************************************************************************/
...@@ -344,15 +330,15 @@ void sub_cfg(uint grpnum) ...@@ -344,15 +330,15 @@ void sub_cfg(uint grpnum)
sprintf(opt[n++],"%-27.27s%s%s","Internal Code" sprintf(opt[n++],"%-27.27s%s%s","Internal Code"
,cfg.grp[cfg.sub[i]->grp]->code_prefix, cfg.sub[i]->code_suffix); ,cfg.grp[cfg.sub[i]->grp]->code_prefix, cfg.sub[i]->code_suffix);
sprintf(opt[n++],"%-27.27s%s","Newsgroup Name",cfg.sub[i]->newsgroup); sprintf(opt[n++],"%-27.27s%s","Newsgroup Name",cfg.sub[i]->newsgroup);
sprintf(opt[n++],"%-27.27s%.40s","Access Requirements" sprintf(opt[n++],"%-27.27s%s","Access Requirements"
,cfg.sub[i]->arstr); ,cfg.sub[i]->arstr);
sprintf(opt[n++],"%-27.27s%.40s","Reading Requirements" sprintf(opt[n++],"%-27.27s%s","Reading Requirements"
,cfg.sub[i]->read_arstr); ,cfg.sub[i]->read_arstr);
sprintf(opt[n++],"%-27.27s%.40s","Posting Requirements" sprintf(opt[n++],"%-27.27s%s","Posting Requirements"
,cfg.sub[i]->post_arstr); ,cfg.sub[i]->post_arstr);
sprintf(opt[n++],"%-27.27s%.40s","Operator Requirements" sprintf(opt[n++],"%-27.27s%s","Operator Requirements"
,cfg.sub[i]->op_arstr); ,cfg.sub[i]->op_arstr);
sprintf(opt[n++],"%-27.27s%.40s","Moderated Posting User" sprintf(opt[n++],"%-27.27s%s","Moderated Posting User"
,cfg.sub[i]->mod_arstr); ,cfg.sub[i]->mod_arstr);
if(cfg.sub[i]->maxmsgs) if(cfg.sub[i]->maxmsgs)
sprintf(str, "%"PRIu32, cfg.sub[i]->maxmsgs); sprintf(str, "%"PRIu32, cfg.sub[i]->maxmsgs);
...@@ -1421,8 +1407,8 @@ void sub_cfg(uint grpnum) ...@@ -1421,8 +1407,8 @@ void sub_cfg(uint grpnum)
sprintf(str,"%ssubs/",cfg.data_dir); sprintf(str,"%ssubs/",cfg.data_dir);
else else
strcpy(str,cfg.sub[i]->data_dir); strcpy(str,cfg.sub[i]->data_dir);
sprintf(opt[n++],"%-27.27s%.40s","Storage Directory",str); sprintf(opt[n++],"%-27.27s%s","Storage Directory",str);
sprintf(opt[n++],"%-27.27s%.40s","Semaphore File",cfg.sub[i]->post_sem); sprintf(opt[n++],"%-27.27s%s","Semaphore File",cfg.sub[i]->post_sem);
sprintf(opt[n++],"%-27.27s%u","Pointer File Index",cfg.sub[i]->ptridx); sprintf(opt[n++],"%-27.27s%u","Pointer File Index",cfg.sub[i]->ptridx);
sprintf(opt[n++],"%-27.27sNow %u / Was %u","Sub-board Index", i, cfg.sub[i]->subnum); sprintf(opt[n++],"%-27.27sNow %u / Was %u","Sub-board Index", i, cfg.sub[i]->subnum);
opt[n][0]=0; opt[n][0]=0;
......
src/sbbs3/scfg/scfgsys.c
+ 5
− 19
View file @ 0c9cc2e6
/* $Id: scfgsys.c,v 1.63 2020/08/18 06:03:09 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. *
****************************************************************************/ ****************************************************************************/
...@@ -1334,13 +1320,13 @@ void sys_cfg(void) ...@@ -1334,13 +1320,13 @@ void sys_cfg(void)
while(!done) { while(!done) {
i=0; i=0;
sprintf(opt[i++],"%-27.27s%s","New User Magic Word",cfg.new_magic); sprintf(opt[i++],"%-27.27s%s","New User Magic Word",cfg.new_magic);
sprintf(opt[i++],"%-27.27s%.40s","Data Directory" sprintf(opt[i++],"%-27.27s%s","Data Directory"
,cfg.data_dir); ,cfg.data_dir);
sprintf(opt[i++],"%-27.27s%.40s","Logs Directory" sprintf(opt[i++],"%-27.27s%s","Logs Directory"
,cfg.logs_dir); ,cfg.logs_dir);
sprintf(opt[i++],"%-27.27s%.40s","Exec Directory" sprintf(opt[i++],"%-27.27s%s","Exec Directory"
,cfg.exec_dir); ,cfg.exec_dir);
sprintf(opt[i++],"%-27.27s%.40s","Mods Directory" sprintf(opt[i++],"%-27.27s%s","Mods Directory"
,cfg.mods_dir); ,cfg.mods_dir);
sprintf(opt[i++],"%-27.27s%s","Input SIF Questionnaire" sprintf(opt[i++],"%-27.27s%s","Input SIF Questionnaire"
,cfg.new_sif); ,cfg.new_sif);
...@@ -1358,7 +1344,7 @@ void sys_cfg(void) ...@@ -1358,7 +1344,7 @@ void sys_cfg(void)
,cfg.sys_lastnode); ,cfg.sys_lastnode);
sprintf(opt[i++],"%-27.27s%s","Phone Number Format" sprintf(opt[i++],"%-27.27s%s","Phone Number Format"
,cfg.sys_phonefmt); ,cfg.sys_phonefmt);
sprintf(opt[i++],"%-27.27s%.40s","Sysop Chat Override" sprintf(opt[i++],"%-27.27s%s","Sysop Chat Override"
,cfg.sys_chat_arstr); ,cfg.sys_chat_arstr);
if(cfg.user_backup_level) if(cfg.user_backup_level)
sprintf(str,"%hu",cfg.user_backup_level); sprintf(str,"%hu",cfg.user_backup_level);
......
src/sbbs3/scfg/scfgxfr2.c
+ 11
− 25
View file @ 0c9cc2e6
/* $Id: scfgxfr2.c,v 1.62 2019/08/12 06:21:28 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. *
****************************************************************************/ ****************************************************************************/
...@@ -388,11 +374,11 @@ void xfer_cfg() ...@@ -388,11 +374,11 @@ void xfer_cfg()
sprintf(opt[j++],"%-27.27s%s","Long Name",cfg.lib[i]->lname); sprintf(opt[j++],"%-27.27s%s","Long Name",cfg.lib[i]->lname);
sprintf(opt[j++],"%-27.27s%s","Short Name",cfg.lib[i]->sname); sprintf(opt[j++],"%-27.27s%s","Short Name",cfg.lib[i]->sname);
sprintf(opt[j++],"%-27.27s%s","Internal Code Prefix",cfg.lib[i]->code_prefix); sprintf(opt[j++],"%-27.27s%s","Internal Code Prefix",cfg.lib[i]->code_prefix);
sprintf(opt[j++],"%-27.27s%.40s","Parent Directory" sprintf(opt[j++],"%-27.27s%s","Parent Directory"
,cfg.lib[i]->parent_path); ,cfg.lib[i]->parent_path);
sprintf(opt[j++],"%-27.27s%.40s","Access Requirements" sprintf(opt[j++],"%-27.27s%s","Access Requirements"
,cfg.lib[i]->arstr); ,cfg.lib[i]->arstr);
sprintf(opt[j++],"%-27.27s%.40s","Access to Sub-directories" sprintf(opt[j++],"%-27.27s%s","Access to Sub-directories"
,cfg.lib[i]->misc&LIB_DIRS ? "Yes":"No"); ,cfg.lib[i]->misc&LIB_DIRS ? "Yes":"No");
sprintf(opt[j++],"%-27.27s%s","Sort Library By Directory", area_sort_desc[cfg.lib[i]->sort]); sprintf(opt[j++],"%-27.27s%s","Sort Library By Directory", area_sort_desc[cfg.lib[i]->sort]);
strcpy(opt[j++],"Clone Options"); strcpy(opt[j++],"Clone Options");
...@@ -1143,15 +1129,15 @@ void dir_cfg(uint libnum) ...@@ -1143,15 +1129,15 @@ void dir_cfg(uint libnum)
sprintf(opt[n++],"%-27.27s%s","Short Name",cfg.dir[i]->sname); sprintf(opt[n++],"%-27.27s%s","Short Name",cfg.dir[i]->sname);
sprintf(opt[n++],"%-27.27s%s%s","Internal Code" sprintf(opt[n++],"%-27.27s%s%s","Internal Code"
,cfg.lib[cfg.dir[i]->lib]->code_prefix, cfg.dir[i]->code_suffix); ,cfg.lib[cfg.dir[i]->lib]->code_prefix, cfg.dir[i]->code_suffix);
sprintf(opt[n++],"%-27.27s%.40s","Access Requirements" sprintf(opt[n++],"%-27.27s%s","Access Requirements"
,cfg.dir[i]->arstr); ,cfg.dir[i]->arstr);
sprintf(opt[n++],"%-27.27s%.40s","Upload Requirements" sprintf(opt[n++],"%-27.27s%s","Upload Requirements"
,cfg.dir[i]->ul_arstr); ,cfg.dir[i]->ul_arstr);
sprintf(opt[n++],"%-27.27s%.40s","Download Requirements" sprintf(opt[n++],"%-27.27s%s","Download Requirements"
,cfg.dir[i]->dl_arstr); ,cfg.dir[i]->dl_arstr);
sprintf(opt[n++],"%-27.27s%.40s","Operator Requirements" sprintf(opt[n++],"%-27.27s%s","Operator Requirements"
,cfg.dir[i]->op_arstr); ,cfg.dir[i]->op_arstr);
sprintf(opt[n++],"%-27.27s%.40s","Exemption Requirements" sprintf(opt[n++],"%-27.27s%s","Exemption Requirements"
,cfg.dir[i]->ex_arstr); ,cfg.dir[i]->ex_arstr);
SAFECOPY(path, cfg.dir[i]->path); SAFECOPY(path, cfg.dir[i]->path);
if(!path[0]) { if(!path[0]) {
...@@ -1171,7 +1157,7 @@ void dir_cfg(uint libnum) ...@@ -1171,7 +1157,7 @@ void dir_cfg(uint libnum)
SAFECOPY(str, path); SAFECOPY(str, path);
else else
SAFEPRINTF(str, "[%s]", path); SAFEPRINTF(str, "[%s]", path);
sprintf(opt[n++],"%-27.27s%.40s","Transfer File Path" sprintf(opt[n++],"%-27.27s%s","Transfer File Path"
,str); ,str);
sprintf(opt[n++],"%-27.27s%u","Maximum Number of Files" sprintf(opt[n++],"%-27.27s%u","Maximum Number of Files"
,cfg.dir[i]->maxfiles); ,cfg.dir[i]->maxfiles);
...@@ -1867,9 +1853,9 @@ void dir_cfg(uint libnum) ...@@ -1867,9 +1853,9 @@ void dir_cfg(uint libnum)
sprintf(str,"[%sdirs/]",cfg.data_dir); sprintf(str,"[%sdirs/]",cfg.data_dir);
else else
strcpy(str,cfg.dir[i]->data_dir); strcpy(str,cfg.dir[i]->data_dir);
sprintf(opt[n++],"%-27.27s%.40s","Data Directory" sprintf(opt[n++],"%-27.27s%s","Data Directory"
,str); ,str);
sprintf(opt[n++],"%-27.27s%.40s","Upload Semaphore File" sprintf(opt[n++],"%-27.27s%s","Upload Semaphore File"
,cfg.dir[i]->upload_sem); ,cfg.dir[i]->upload_sem);
sprintf(opt[n++],"%-27.27s%s","Sort Value and Direction" sprintf(opt[n++],"%-27.27s%s","Sort Value and Direction"
, cfg.dir[i]->sort==SORT_NAME_A ? "Name Ascending" , cfg.dir[i]->sort==SORT_NAME_A ? "Name Ascending"
......
src/sbbs3/scfg/scfgxtrn.c
+ 17
− 17
View file @ 0c9cc2e6
...@@ -346,9 +346,9 @@ void fevents_cfg() ...@@ -346,9 +346,9 @@ void fevents_cfg()
while(1) { while(1) {
i=0; i=0;
sprintf(opt[i++],"%-32.32s%.40s","Logon Event",cfg.sys_logon); sprintf(opt[i++],"%-32.32s%s","Logon Event",cfg.sys_logon);
sprintf(opt[i++],"%-32.32s%.40s","Logout Event",cfg.sys_logout); sprintf(opt[i++],"%-32.32s%s","Logout Event",cfg.sys_logout);
sprintf(opt[i++],"%-32.32s%.40s","Daily Event",cfg.sys_daily); sprintf(opt[i++],"%-32.32s%s","Daily Event",cfg.sys_daily);
opt[i][0]=0; opt[i][0]=0;
uifc.helpbuf= uifc.helpbuf=
"`External Events:`\n" "`External Events:`\n"
...@@ -420,7 +420,7 @@ void tevents_cfg() ...@@ -420,7 +420,7 @@ void tevents_cfg()
while(1) { while(1) {
for(i=0;i<cfg.total_events && i<MAX_OPTS;i++) for(i=0;i<cfg.total_events && i<MAX_OPTS;i++)
sprintf(opt[i],"%-8.8s %.50s",cfg.event[i]->code,cfg.event[i]->cmd); sprintf(opt[i],"%-8.8s %s",cfg.event[i]->code,cfg.event[i]->cmd);
opt[i][0]=0; opt[i][0]=0;
j=WIN_SAV|WIN_ACT|WIN_CHE|WIN_RHT; j=WIN_SAV|WIN_ACT|WIN_CHE|WIN_RHT;
if(cfg.total_events) if(cfg.total_events)
...@@ -487,8 +487,8 @@ void tevents_cfg() ...@@ -487,8 +487,8 @@ void tevents_cfg()
while(!done) { while(!done) {
k=0; k=0;
sprintf(opt[k++],"%-32.32s%s","Internal Code",cfg.event[i]->code); sprintf(opt[k++],"%-32.32s%s","Internal Code",cfg.event[i]->code);
sprintf(opt[k++],"%-32.32s%.40s","Start-up Directory",cfg.event[i]->dir); sprintf(opt[k++],"%-32.32s%s","Start-up Directory",cfg.event[i]->dir);
sprintf(opt[k++],"%-32.32s%.40s","Command Line",cfg.event[i]->cmd); sprintf(opt[k++],"%-32.32s%s","Command Line",cfg.event[i]->cmd);
sprintf(opt[k++],"%-32.32s%s","Enabled" sprintf(opt[k++],"%-32.32s%s","Enabled"
,cfg.event[i]->misc&EVENT_DISABLED ? "No":"Yes"); ,cfg.event[i]->misc&EVENT_DISABLED ? "No":"Yes");
if(cfg.event[i]->node == NODE_ANY) if(cfg.event[i]->node == NODE_ANY)
...@@ -981,16 +981,16 @@ void xtrn_cfg(uint section) ...@@ -981,16 +981,16 @@ void xtrn_cfg(uint section)
k=0; k=0;
sprintf(opt[k++],"%-27.27s%s","Name",cfg.xtrn[i]->name); sprintf(opt[k++],"%-27.27s%s","Name",cfg.xtrn[i]->name);
sprintf(opt[k++],"%-27.27s%s","Internal Code",cfg.xtrn[i]->code); sprintf(opt[k++],"%-27.27s%s","Internal Code",cfg.xtrn[i]->code);
sprintf(opt[k++],"%-27.27s%.40s","Start-up Directory",cfg.xtrn[i]->path); sprintf(opt[k++],"%-27.27s%s","Start-up Directory",cfg.xtrn[i]->path);
sprintf(opt[k++],"%-27.27s%.40s","Command Line",cfg.xtrn[i]->cmd); sprintf(opt[k++],"%-27.27s%s","Command Line",cfg.xtrn[i]->cmd);
sprintf(opt[k++],"%-27.27s%.40s","Clean-up Command Line",cfg.xtrn[i]->clean); sprintf(opt[k++],"%-27.27s%s","Clean-up Command Line",cfg.xtrn[i]->clean);
if(cfg.xtrn[i]->cost) if(cfg.xtrn[i]->cost)
sprintf(str,"%"PRIu32" credits",cfg.xtrn[i]->cost); sprintf(str,"%"PRIu32" credits",cfg.xtrn[i]->cost);
else else
strcpy(str,"None"); strcpy(str,"None");
sprintf(opt[k++],"%-27.27s%s","Execution Cost",str); sprintf(opt[k++],"%-27.27s%s","Execution Cost",str);
sprintf(opt[k++],"%-27.27s%.40s","Access Requirements",cfg.xtrn[i]->arstr); sprintf(opt[k++],"%-27.27s%s","Access Requirements",cfg.xtrn[i]->arstr);
sprintf(opt[k++],"%-27.27s%.40s","Execution Requirements" sprintf(opt[k++],"%-27.27s%s","Execution Requirements"
,cfg.xtrn[i]->run_arstr); ,cfg.xtrn[i]->run_arstr);
sprintf(opt[k++],"%-27.27s%s","Multiple Concurrent Users" sprintf(opt[k++],"%-27.27s%s","Multiple Concurrent Users"
,cfg.xtrn[i]->misc&MULTIUSER ? "Yes" : "No"); ,cfg.xtrn[i]->misc&MULTIUSER ? "Yes" : "No");
...@@ -1583,7 +1583,7 @@ void xedit_cfg() ...@@ -1583,7 +1583,7 @@ void xedit_cfg()
while(1) { while(1) {
for(i=0;i<cfg.total_xedits && i<MAX_OPTS;i++) for(i=0;i<cfg.total_xedits && i<MAX_OPTS;i++)
sprintf(opt[i],"%-8.8s %.40s",cfg.xedit[i]->code,cfg.xedit[i]->rcmd); sprintf(opt[i],"%-8.8s %s",cfg.xedit[i]->code,cfg.xedit[i]->rcmd);
opt[i][0]=0; opt[i][0]=0;
j=WIN_SAV|WIN_ACT|WIN_CHE|WIN_RHT; j=WIN_SAV|WIN_ACT|WIN_CHE|WIN_RHT;
if(cfg.total_xedits) if(cfg.total_xedits)
...@@ -1668,8 +1668,8 @@ void xedit_cfg() ...@@ -1668,8 +1668,8 @@ void xedit_cfg()
k=0; k=0;
sprintf(opt[k++],"%-32.32s%s","Name",cfg.xedit[i]->name); sprintf(opt[k++],"%-32.32s%s","Name",cfg.xedit[i]->name);
sprintf(opt[k++],"%-32.32s%s","Internal Code",cfg.xedit[i]->code); sprintf(opt[k++],"%-32.32s%s","Internal Code",cfg.xedit[i]->code);
sprintf(opt[k++],"%-32.32s%.40s","Command Line",cfg.xedit[i]->rcmd); sprintf(opt[k++],"%-32.32s%s","Command Line",cfg.xedit[i]->rcmd);
sprintf(opt[k++],"%-32.32s%.40s","Access Requirements",cfg.xedit[i]->arstr); sprintf(opt[k++],"%-32.32s%s","Access Requirements",cfg.xedit[i]->arstr);
sprintf(opt[k++],"%-32.32s%s%s","Intercept I/O" sprintf(opt[k++],"%-32.32s%s%s","Intercept I/O"
,cfg.xedit[i]->misc&XTRN_STDIO ? "Standard" ,cfg.xedit[i]->misc&XTRN_STDIO ? "Standard"
:cfg.xedit[i]->misc&XTRN_CONIO ? "Console":"No" :cfg.xedit[i]->misc&XTRN_CONIO ? "Console":"No"
...@@ -2368,7 +2368,7 @@ void xtrnsec_cfg() ...@@ -2368,7 +2368,7 @@ void xtrnsec_cfg()
k=0; k=0;
sprintf(opt[k++],"%-27.27s%s","Name",cfg.xtrnsec[i]->name); sprintf(opt[k++],"%-27.27s%s","Name",cfg.xtrnsec[i]->name);
sprintf(opt[k++],"%-27.27s%s","Internal Code",cfg.xtrnsec[i]->code); sprintf(opt[k++],"%-27.27s%s","Internal Code",cfg.xtrnsec[i]->code);
sprintf(opt[k++],"%-27.27s%.40s","Access Requirements" sprintf(opt[k++],"%-27.27s%s","Access Requirements"
,cfg.xtrnsec[i]->arstr); ,cfg.xtrnsec[i]->arstr);
sprintf(opt[k++],"%s","Available Online Programs..."); sprintf(opt[k++],"%s","Available Online Programs...");
opt[k][0]=0; opt[k][0]=0;
...@@ -2431,7 +2431,7 @@ void hotkey_cfg(void) ...@@ -2431,7 +2431,7 @@ void hotkey_cfg(void)
while(1) { while(1) {
for(i=0;i<cfg.total_hotkeys && i<MAX_OPTS;i++) for(i=0;i<cfg.total_hotkeys && i<MAX_OPTS;i++)
sprintf(opt[i],"Ctrl-%c %.40s" sprintf(opt[i],"Ctrl-%c %s"
,cfg.hotkey[i]->key+'@' ,cfg.hotkey[i]->key+'@'
,cfg.hotkey[i]->cmd); ,cfg.hotkey[i]->cmd);
opt[i][0]=0; opt[i][0]=0;
...@@ -2516,7 +2516,7 @@ void hotkey_cfg(void) ...@@ -2516,7 +2516,7 @@ void hotkey_cfg(void)
k=0; k=0;
sprintf(opt[k++],"%-27.27sCtrl-%c","Global Hot Key" sprintf(opt[k++],"%-27.27sCtrl-%c","Global Hot Key"
,cfg.hotkey[i]->key+'@'); ,cfg.hotkey[i]->key+'@');
sprintf(opt[k++],"%-27.27s%.40s","Command Line",cfg.hotkey[i]->cmd); sprintf(opt[k++],"%-27.27s%s","Command Line",cfg.hotkey[i]->cmd);
opt[k][0]=0; opt[k][0]=0;
uifc.helpbuf= uifc.helpbuf=
"`Global Hot Key Event:`\n" "`Global Hot Key Event:`\n"
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment