Commits (1)
......@@ -519,7 +519,7 @@ int main(int argc, char **argv)
char error[512];
char str[MAX_PATH+1];
char tmp[MAX_PATH+1];
char *p;
const char *p;
char exist,listgiven=0,namegiven=0,ext[LEN_EXTDESC + 1]
,auto_name[MAX_PATH+1]="FILES.BBS";
int i,j;
......
......@@ -91,7 +91,8 @@ bool delfile(const char *filename)
int main(int argc, char **argv)
{
char str[256],not[MAX_NOTS][LEN_EXTCODE + 1],nots=0,*p;
char str[256],not[MAX_NOTS][LEN_EXTCODE + 1],nots=0;
const char *p;
char fpath[MAX_PATH+1];
int i,j,dirnum,libnum;
size_t fi;
......
......@@ -85,7 +85,8 @@ char *display_filename(scfg_t *cfg, uint dirnum, uint32_t fil_off)
int main(int argc,char **argv)
{
char str[256], *p;
char str[256];
const char *p;
uint32_t **fcrc,*foundcrc;
ulong total_found=0L;
ulong g;
......
......@@ -35,6 +35,7 @@
#include "sbbsecho.h"
#include "sockwrap.h"
#include "str_util.h"
#include "getctrl.h"
char **opt;
......
......@@ -20,7 +20,7 @@ int
main (int argc, char *argv[])
{
int node;
char *ctrl_dir;
const char *ctrl_dir;
GtkWidget *WaitWindow;
setlocale(LC_ALL, "");
......@@ -41,7 +41,7 @@ main (int argc, char *argv[])
/*
* Request a chat
*/
if(chat_open(node, ctrl_dir))
if(chat_open(node, (char*)ctrl_dir))
return(1);
/*
......
......@@ -2,6 +2,7 @@ OBJS := \
$(MTOBJODIR)/ars$(OFILE) \
$(MTOBJODIR)/dat_rec$(OFILE) \
$(MTOBJODIR)/date_str$(OFILE) \
$(MTOBJODIR)/getctrl$(OFILE) \
$(MTOBJODIR)/load_cfg$(OFILE) \
$(MTOBJODIR)/readtext$(OFILE) \
$(MTOBJODIR)/text_defaults$(OFILE) \
......@@ -9,6 +10,7 @@ OBJS := \
$(MTOBJODIR)/scfglib1$(OFILE) \
$(MTOBJODIR)/scfglib2$(OFILE) \
$(MTOBJODIR)/userdat$(OFILE) \
$(MTOBJODIR)/findstr$(OFILE) \
$(MTOBJODIR)/getstats$(OFILE) \
$(MTOBJODIR)/msgdate$(OFILE) \
$(MTOBJODIR)/str_util$(OFILE) \
......
......@@ -24,6 +24,7 @@
#include "scfgdefs.h" // scfg_t
#include "smblib.h"
#include "getctrl.h"
#include "dllexport.h"
#ifdef __cplusplus
......
......@@ -70,7 +70,7 @@ char *usage="\nusage: makeuser [ctrl_dir] name [-param value] [...]\n"
/*********************/
int main(int argc, char **argv)
{
char* p;
const char* p;
char error[512];
char revision[16];
int i;
......
......@@ -180,6 +180,7 @@ SBBSECHO_OBJS = $(LOAD_CFG_OBJS) \
ECHOCFG_OBJS = \
$(MTOBJODIR)/echocfg$(OFILE) \
$(MTOBJODIR)/getctrl$(OFILE) \
$(MTOBJODIR)/rechocfg$(OFILE) \
$(MTOBJODIR)/str_util$(OFILE) \
$(UIFC_OBJS) \
......@@ -304,12 +305,14 @@ UPGRADE_TO_V319_OBJS = $(LOAD_CFG_OBJS) \
$(OBJODIR)/upgrade_to_v319$(OFILE)
LOAD_CFG_OBJS = \
$(OBJODIR)/getctrl$(OFILE) \
$(OBJODIR)/load_cfg$(OFILE) \
$(OBJODIR)/readtext$(OFILE) \
$(OBJODIR)/text_defaults$(OFILE) \
$(OBJODIR)/scfglib1$(OFILE) \
$(OBJODIR)/scfglib2$(OFILE) \
$(OBJODIR)/str_util$(OFILE) \
$(OBJODIR)/findstr$(OFILE) \
$(OBJODIR)/ars$(OFILE) \
$(OBJODIR)/nopen$(OFILE)
......@@ -72,7 +72,7 @@ static const char* strFileIndexScript ="FileIndexScript";
#define DEFAULT_BIND_RETRY_COUNT 2
#define DEFAULT_BIND_RETRY_DELAY 15
void sbbs_get_ini_fname(char* ini_file, char* ctrl_dir, char* pHostName)
void sbbs_get_ini_fname(char* ini_file, const char* ctrl_dir)
{
/* pHostName is no longer used since iniFileName calls gethostname() itself */
......
/* Synchronet initialization (.ini) file routines */
/* $Id: sbbs_ini.h,v 1.13 2019/07/24 04:41:49 rswindell Exp $ */
/****************************************************************************
* @format.tab-size 4 (Plain Text/Source Code File Header) *
* @format.use-tabs true (see http://www.synchro.net/ptsc_hdr.html) *
......@@ -15,21 +13,9 @@
* See the GNU General Public License for more details: gpl.txt or *
* 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 *
* 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. *
****************************************************************************/
......@@ -50,8 +36,7 @@ extern "C" {
void sbbs_get_ini_fname(
char* ini_file
,char* ctrl_dir
,char* host_name
,const char* ctrl_dir
);
void sbbs_read_ini(
......
......@@ -1377,7 +1377,7 @@ int main(int argc, char** argv)
char ch;
char* p;
char* arg;
char* ctrl_dir;
const char* ctrl_dir;
char str[MAX_PATH+1];
char error[256];
char host_name[128]="";
......@@ -1419,7 +1419,7 @@ int main(int argc, char** argv)
if(!winsock_cleanup())
return(-1);
sbbs_get_ini_fname(ini_file, ctrl_dir, host_name);
sbbs_get_ini_fname(ini_file, ctrl_dir);
/* Initialize BBS startup structure */
memset(&bbs_startup,0,sizeof(bbs_startup));
bbs_startup.size=sizeof(bbs_startup);
......
......@@ -17,6 +17,7 @@ OBJS = $(MTOBJODIR)/scfg$(OFILE)\
$(MTOBJODIR)/scfgsave$(OFILE)\
$(MTOBJODIR)/scfglib1$(OFILE)\
$(MTOBJODIR)/scfglib2$(OFILE)\
$(MTOBJODIR)/getctrl$(OFILE)\
$(MTOBJODIR)/load_cfg$(OFILE)\
$(MTOBJODIR)/readtext$(OFILE)\
$(MTOBJODIR)/text_defaults$(OFILE)\
......@@ -27,4 +28,5 @@ OBJS = $(MTOBJODIR)/scfg$(OFILE)\
$(MTOBJODIR)/getstats$(OFILE)\
$(MTOBJODIR)/msgdate$(OFILE)\
$(MTOBJODIR)/date_str$(OFILE)\
$(MTOBJODIR)/findstr$(OFILE)\
$(MTOBJODIR)/str_util$(OFILE)
......@@ -82,7 +82,8 @@ void bail(int code)
int main(int argc, char **argv)
{
char str[256],*p;
char str[256];
const char *p;
int i,j,file;
off_t length;
ulong max_users=0xffffffff;
......
......@@ -4,6 +4,7 @@ OBJS = \
$(MTOBJODIR)$(DIRSEP)date_str$(OFILE) \
$(MTOBJODIR)$(DIRSEP)getmail$(OFILE) \
$(MTOBJODIR)$(DIRSEP)getstats$(OFILE) \
$(MTOBJODIR)$(DIRSEP)getctrl$(OFILE) \
$(MTOBJODIR)$(DIRSEP)load_cfg$(OFILE) \
$(MTOBJODIR)$(DIRSEP)readtext$(OFILE) \
$(MTOBJODIR)$(DIRSEP)text_defaults$(OFILE) \
......@@ -13,5 +14,6 @@ OBJS = \
$(MTOBJODIR)$(DIRSEP)scfglib1$(OFILE) \
$(MTOBJODIR)$(DIRSEP)scfglib2$(OFILE) \
$(MTOBJODIR)$(DIRSEP)str_util$(OFILE) \
$(MTOBJODIR)$(DIRSEP)findstr$(OFILE) \
$(MTOBJODIR)$(DIRSEP)uedit$(OFILE) \
$(MTOBJODIR)$(DIRSEP)userdat$(OFILE)
......@@ -1898,9 +1898,7 @@ int main(int argc, char** argv) {
SAFECOPY(ctrl_dir, get_ctrl_dir(/* warn: */TRUE));
gethostname(str,sizeof(str)-1);
sbbs_get_ini_fname(ini_file, ctrl_dir, str);
sbbs_get_ini_fname(ini_file, ctrl_dir);
/* Initialize BBS startup structure */
memset(&bbs_startup,0,sizeof(bbs_startup));
......
......@@ -5,6 +5,7 @@ OBJS := \
$(MTOBJODIR)$(DIRSEP)date_str$(OFILE) \
$(MTOBJODIR)$(DIRSEP)getmail$(OFILE) \
$(MTOBJODIR)$(DIRSEP)getstats$(OFILE) \
$(MTOBJODIR)$(DIRSEP)getctrl$(OFILE) \
$(MTOBJODIR)$(DIRSEP)load_cfg$(OFILE) \
$(MTOBJODIR)$(DIRSEP)readtext$(OFILE) \
$(MTOBJODIR)$(DIRSEP)text_defaults$(OFILE) \
......@@ -15,5 +16,6 @@ OBJS := \
$(MTOBJODIR)$(DIRSEP)scfglib2$(OFILE) \
$(MTOBJODIR)$(DIRSEP)spyon$(OFILE) \
$(MTOBJODIR)$(DIRSEP)str_util$(OFILE) \
$(MTOBJODIR)$(DIRSEP)findstr$(OFILE) \
$(MTOBJODIR)$(DIRSEP)umonitor$(OFILE) \
$(MTOBJODIR)$(DIRSEP)userdat$(OFILE)
......@@ -844,9 +844,7 @@ int main(int argc, char** argv) {
SAFECOPY(ctrl_dir, get_ctrl_dir(/* warn: */TRUE));
backslash(ctrl_dir);
gethostname(str,sizeof(str)-1);
sbbs_get_ini_fname(ini_file, ctrl_dir, str);
sbbs_get_ini_fname(ini_file, ctrl_dir);
/* Initialize BBS startup structure */
memset(&bbs_startup,0,sizeof(bbs_startup));
......