Skip to content
GitLab
Explore
Sign in
Register
Primary navigation
Search or go to…
Project
Synchronet
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Wiki
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Package registry
Container registry
Model registry
Operate
Environments
Terraform modules
Monitor
Incidents
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
Main
Synchronet
Commits
6b74a4a9
Commit
6b74a4a9
authored
4 years ago
by
Rob Swindell
Browse files
Options
Downloads
Plain Diff
Merge branch 'master' of gitlab.synchro.net:sbbs/sbbs
parents
04b104aa
2516fbca
No related branches found
No related tags found
No related merge requests found
Changes
1
Show whitespace changes
Inline
Side-by-side
Showing
1 changed file
src/sbbs3/scfglib1.c
+8
-6
8 additions, 6 deletions
src/sbbs3/scfglib1.c
with
8 additions
and
6 deletions
src/sbbs3/scfglib1.c
+
8
−
6
View file @
6b74a4a9
...
@@ -62,7 +62,7 @@ BOOL read_node_cfg(scfg_t* cfg, char* error)
...
@@ -62,7 +62,7 @@ BOOL read_node_cfg(scfg_t* cfg, char* error)
long
offset
=
0
;
long
offset
=
0
;
FILE
*
instream
;
FILE
*
instream
;
strcpy
(
fname
,
"node.cnf"
);
SAFECOPY
(
fname
,
"node.cnf"
);
sprintf
(
str
,
"%s%s"
,
cfg
->
node_dir
,
fname
);
sprintf
(
str
,
"%s%s"
,
cfg
->
node_dir
,
fname
);
if
((
instream
=
fnopen
(
NULL
,
str
,
O_RDONLY
))
==
NULL
)
{
if
((
instream
=
fnopen
(
NULL
,
str
,
O_RDONLY
))
==
NULL
)
{
sprintf
(
error
,
"%d (%s) opening %s"
,
errno
,
STRERROR
(
errno
),
str
);
sprintf
(
error
,
"%d (%s) opening %s"
,
errno
,
STRERROR
(
errno
),
str
);
...
@@ -101,11 +101,13 @@ BOOL read_node_cfg(scfg_t* cfg, char* error)
...
@@ -101,11 +101,13 @@ BOOL read_node_cfg(scfg_t* cfg, char* error)
get_int
(
cfg
->
node_scrnblank
,
instream
);
get_int
(
cfg
->
node_scrnblank
,
instream
);
get_str
(
cfg
->
text_dir
,
instream
);
/* ctrl directory */
get_str
(
cfg
->
text_dir
,
instream
);
/* ctrl directory */
get_str
(
cfg
->
text_dir
,
instream
);
/* text directory */
get_str
(
cfg
->
text_dir
,
instream
);
/* text directory */
if
(
!
cfg
->
text_dir
[
0
])
SAFECOPY
(
cfg
->
text_dir
,
"../text/"
);
get_str
(
cfg
->
temp_dir
,
instream
);
/* temp directory */
get_str
(
cfg
->
temp_dir
,
instream
);
/* temp directory */
#if 0 /* removed Sep-9-2003, always use nodex/temp (rrs) */
#if 0 /* removed Sep-9-2003, always use nodex/temp (rrs) */
if(!cfg->temp_dir[0])
if(!cfg->temp_dir[0])
#endif
#endif
strcpy
(
cfg
->
temp_dir
,
"temp"
);
SAFECOPY
(
cfg
->
temp_dir
,
"temp"
);
for
(
i
=
0
;
i
<
10
;
i
++
)
/* WFC 0-9 DOS commands */
for
(
i
=
0
;
i
<
10
;
i
++
)
/* WFC 0-9 DOS commands */
get_str
(
cfg
->
wfc_cmd
[
i
],
instream
);
get_str
(
cfg
->
wfc_cmd
[
i
],
instream
);
...
@@ -141,8 +143,8 @@ BOOL read_main_cfg(scfg_t* cfg, char* error)
...
@@ -141,8 +143,8 @@ BOOL read_main_cfg(scfg_t* cfg, char* error)
long
offset
=
0
;
long
offset
=
0
;
FILE
*
instream
;
FILE
*
instream
;
strcpy
(
fname
,
"main.cnf"
);
SAFECOPY
(
fname
,
"main.cnf"
);
sprintf
(
str
,
"%s%s"
,
cfg
->
ctrl_dir
,
fname
);
SAFEPRINTF2
(
str
,
"%s%s"
,
cfg
->
ctrl_dir
,
fname
);
if
((
instream
=
fnopen
(
NULL
,
str
,
O_RDONLY
))
==
NULL
)
{
if
((
instream
=
fnopen
(
NULL
,
str
,
O_RDONLY
))
==
NULL
)
{
sprintf
(
error
,
"%d (%s) opening %s"
,
errno
,
STRERROR
(
errno
),
str
);
sprintf
(
error
,
"%d (%s) opening %s"
,
errno
,
STRERROR
(
errno
),
str
);
return
(
FALSE
);
return
(
FALSE
);
...
@@ -206,7 +208,7 @@ BOOL read_main_cfg(scfg_t* cfg, char* error)
...
@@ -206,7 +208,7 @@ BOOL read_main_cfg(scfg_t* cfg, char* error)
get_str
(
cfg
->
new_sif
,
instream
);
get_str
(
cfg
->
new_sif
,
instream
);
get_str
(
cfg
->
new_sof
,
instream
);
get_str
(
cfg
->
new_sof
,
instream
);
if
(
!
cfg
->
new_sof
[
0
])
/* if output not specified, use input file */
if
(
!
cfg
->
new_sof
[
0
])
/* if output not specified, use input file */
strcpy
(
cfg
->
new_sof
,
cfg
->
new_sif
);
SAFECOPY
(
cfg
->
new_sof
,
cfg
->
new_sif
);
/*********************/
/*********************/
/* New User Settings */
/* New User Settings */
...
@@ -393,7 +395,7 @@ BOOL read_msgs_cfg(scfg_t* cfg, char* error)
...
@@ -393,7 +395,7 @@ BOOL read_msgs_cfg(scfg_t* cfg, char* error)
long
offset
=
0
;
long
offset
=
0
;
FILE
*
instream
;
FILE
*
instream
;
strcpy
(
fname
,
"msgs.cnf"
);
SAFECOPY
(
fname
,
"msgs.cnf"
);
sprintf
(
str
,
"%s%s"
,
cfg
->
ctrl_dir
,
fname
);
sprintf
(
str
,
"%s%s"
,
cfg
->
ctrl_dir
,
fname
);
if
((
instream
=
fnopen
(
NULL
,
str
,
O_RDONLY
))
==
NULL
)
{
if
((
instream
=
fnopen
(
NULL
,
str
,
O_RDONLY
))
==
NULL
)
{
sprintf
(
error
,
"%d (%s) opening %s"
,
errno
,
STRERROR
(
errno
),
str
);
sprintf
(
error
,
"%d (%s) opening %s"
,
errno
,
STRERROR
(
errno
),
str
);
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment