Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
Synchronet
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
126
Issues
126
List
Boards
Labels
Service Desk
Milestones
Merge Requests
1
Merge Requests
1
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Operations
Operations
Metrics
Environments
Packages & Registries
Packages & Registries
Package Registry
Container Registry
Analytics
Analytics
CI / CD
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Main
Synchronet
Commits
3e4464eb
Commit
3e4464eb
authored
Dec 01, 2019
by
rswindell
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Create/use common function for getting a sub-boards's newsgroup name
(configured or auto-generated): getsubnewsgroupname().
parent
4dfe1ff4
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
37 additions
and
31 deletions
+37
-31
src/sbbs3/js_msg_area.c
src/sbbs3/js_msg_area.c
+1
-31
src/sbbs3/sbbs.h
src/sbbs3/sbbs.h
+1
-0
src/sbbs3/str_util.c
src/sbbs3/str_util.c
+35
-0
No files found.
src/sbbs3/js_msg_area.c
View file @
3e4464eb
...
...
@@ -107,7 +107,6 @@ struct js_msg_area_priv {
BOOL
DLLCALL
js_CreateMsgAreaProperties
(
JSContext
*
cx
,
scfg_t
*
cfg
,
JSObject
*
subobj
,
uint
subnum
)
{
char
str
[
128
];
int
c
;
JSString
*
js_str
;
jsval
val
;
sub_t
*
sub
;
...
...
@@ -154,36 +153,7 @@ BOOL DLLCALL js_CreateMsgAreaProperties(JSContext* cx, scfg_t* cfg, JSObject* su
if
(
!
JS_DefineProperty
(
cx
,
subobj
,
"qwk_name"
,
STRING_TO_JSVAL
(
js_str
)
,
NULL
,
NULL
,
JSPROP_ENUMERATE
|
JSPROP_READONLY
))
return
(
FALSE
);
if
(
sub
->
newsgroup
[
0
])
SAFECOPY
(
str
,
sub
->
newsgroup
);
else
{
sprintf
(
str
,
"%s.%s"
,
cfg
->
grp
[
sub
->
grp
]
->
sname
,
sub
->
sname
);
/*
* From RFC5536:
* newsgroup-name = component *( "." component )
* component = 1*component-char
* component-char = ALPHA / DIGIT / "+" / "-" / "_"
*/
if
(
str
[
0
]
==
'.'
)
str
[
0
]
=
'_'
;
for
(
c
=
0
;
str
[
c
];
c
++
)
{
/* Legal characters */
if
((
str
[
c
]
>=
'A'
&&
str
[
c
]
<=
'Z'
)
||
(
str
[
c
]
>=
'a'
&&
str
[
c
]
<=
'z'
)
||
(
str
[
c
]
>=
'0'
&&
str
[
c
]
<=
'9'
)
||
str
[
c
]
==
'+'
||
str
[
c
]
==
'-'
||
str
[
c
]
==
'_'
||
str
[
c
]
==
'.'
)
continue
;
str
[
c
]
=
'_'
;
}
c
--
;
if
(
str
[
c
]
==
'.'
)
str
[
c
]
=
'_'
;
}
if
((
js_str
=
JS_NewStringCopyZ
(
cx
,
str
))
==
NULL
)
if
((
js_str
=
JS_NewStringCopyZ
(
cx
,
subnewsgroupname
(
cfg
,
sub
,
str
,
sizeof
(
str
))))
==
NULL
)
return
(
FALSE
);
if
(
!
JS_DefineProperty
(
cx
,
subobj
,
"newsgroup"
,
STRING_TO_JSVAL
(
js_str
)
,
NULL
,
NULL
,
JSPROP_ENUMERATE
|
JSPROP_READONLY
))
...
...
src/sbbs3/sbbs.h
View file @
3e4464eb
...
...
@@ -1175,6 +1175,7 @@ extern "C" {
DLLEXPORT
BOOL
str_has_ctrl
(
const
char
*
);
DLLEXPORT
BOOL
str_is_ascii
(
const
char
*
);
DLLEXPORT
char
*
utf8_to_cp437_str
(
char
*
str
);
DLLEXPORT
char
*
subnewsgroupname
(
scfg_t
*
,
sub_t
*
,
char
*
,
size_t
);
/* msg_id.c */
DLLEXPORT
char
*
DLLCALL
ftn_msgid
(
sub_t
*
,
smbmsg_t
*
,
char
*
msgid
,
size_t
);
...
...
src/sbbs3/str_util.c
View file @
3e4464eb
...
...
@@ -684,3 +684,38 @@ char* utf8_to_cp437_str(char* str)
,
/* unsupported zero-width ch: */
0
,
/* decode error char: */
CP437_INVERTED_EXCLAMATION_MARK
);
}
char
*
subnewsgroupname
(
scfg_t
*
cfg
,
sub_t
*
sub
,
char
*
str
,
size_t
size
)
{
memset
(
str
,
0
,
size
);
if
(
sub
->
newsgroup
[
0
])
strncpy
(
str
,
sub
->
newsgroup
,
size
-
1
);
else
{
snprintf
(
str
,
size
-
1
,
"%s.%s"
,
cfg
->
grp
[
sub
->
grp
]
->
sname
,
sub
->
sname
);
/*
* From RFC5536:
* newsgroup-name = component *( "." component )
* component = 1*component-char
* component-char = ALPHA / DIGIT / "+" / "-" / "_"
*/
if
(
str
[
0
]
==
'.'
)
str
[
0
]
=
'_'
;
size_t
c
;
for
(
c
=
0
;
str
[
c
]
!=
0
;
c
++
)
{
/* Legal characters */
if
((
str
[
c
]
>=
'A'
&&
str
[
c
]
<=
'Z'
)
||
(
str
[
c
]
>=
'a'
&&
str
[
c
]
<=
'z'
)
||
(
str
[
c
]
>=
'0'
&&
str
[
c
]
<=
'9'
)
||
str
[
c
]
==
'+'
||
str
[
c
]
==
'-'
||
str
[
c
]
==
'_'
||
str
[
c
]
==
'.'
)
continue
;
str
[
c
]
=
'_'
;
}
c
--
;
if
(
str
[
c
]
==
'.'
)
str
[
c
]
=
'_'
;
}
return
str
;
}
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment