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
340dea55
Commit
340dea55
authored
4 months ago
by
Deucе
Browse files
Options
Downloads
Patches
Plain Diff
Allow NUL in Stari ST VT-52 sequences.
It seems at least some Atari ST VT-52 implementations do.
parent
3622e0ce
No related branches found
No related tags found
No related merge requests found
Pipeline
#8633
passed
4 months ago
Stage: build
Stage: test
Stage: cleanup
Changes
2
Pipelines
3
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
src/conio/cterm.c
+9
-6
9 additions, 6 deletions
src/conio/cterm.c
src/conio/cterm.h
+1
-0
1 addition, 0 deletions
src/conio/cterm.h
with
10 additions
and
6 deletions
src/conio/cterm.c
+
9
−
6
View file @
340dea55
...
@@ -1420,7 +1420,7 @@ incomplete:
...
@@ -1420,7 +1420,7 @@ incomplete:
}
}
static
enum
sequence_state
static
enum
sequence_state
st_vt_52_legal_sequence
(
const
char
*
seq
,
size_t
max_len
)
st_vt_52_legal_sequence
(
const
char
*
seq
,
size_t
seqsz
,
size_t
max_len
)
{
{
static
const
char
*
all_seconds
=
"ABCDEFGHIJKLMYZbcdefjklopqvw[
\\
=>
\x1b
"
;
static
const
char
*
all_seconds
=
"ABCDEFGHIJKLMYZbcdefjklopqvw[
\\
=>
\x1b
"
;
...
@@ -1431,13 +1431,13 @@ st_vt_52_legal_sequence(const char *seq, size_t max_len)
...
@@ -1431,13 +1431,13 @@ st_vt_52_legal_sequence(const char *seq, size_t max_len)
switch
(
seq
[
0
])
{
switch
(
seq
[
0
])
{
case
'b'
:
case
'b'
:
case
'c'
:
case
'c'
:
if
(
seq
[
1
]
)
if
(
seq
sz
==
2
)
return
SEQ_COMPLETE
;
return
SEQ_COMPLETE
;
break
;
break
;
case
'Y'
:
case
'Y'
:
if
(
seq
[
1
]
>
31
&&
seq
[
2
]
>
31
)
if
(
seqsz
==
3
&&
seq
[
1
]
>
31
&&
seq
[
2
]
>
31
)
return
SEQ_COMPLETE
;
return
SEQ_COMPLETE
;
if
(
seq
[
1
]
&&
seq
[
2
]
)
if
(
seq
sz
==
3
)
return
SEQ_BROKEN
;
return
SEQ_BROKEN
;
break
;
break
;
default:
default:
...
@@ -2568,6 +2568,7 @@ do_st_vt_52(struct cterminal *cterm, char *retbuf, size_t retsize)
...
@@ -2568,6 +2568,7 @@ do_st_vt_52(struct cterminal *cterm, char *retbuf, size_t retsize)
break
;
break
;
}
}
cterm
->
escbuf
[
0
]
=
0
;
cterm
->
escbuf
[
0
]
=
0
;
cterm
->
escbufsz
=
0
;
cterm
->
sequence
=
0
;
cterm
->
sequence
=
0
;
}
}
...
@@ -5752,12 +5753,13 @@ CIOLIBEXPORT size_t cterm_write(struct cterminal * cterm, const void *vbuf, int
...
@@ -5752,12 +5753,13 @@ CIOLIBEXPORT size_t cterm_write(struct cterminal * cterm, const void *vbuf, int
}
}
}
}
else
if
(
cterm
->
emulation
==
CTERM_EMULATION_ATARIST_VT52
)
{
else
if
(
cterm
->
emulation
==
CTERM_EMULATION_ATARIST_VT52
)
{
ustrcat
(
cterm
->
escbuf
,
ch
)
;
cterm
->
escbuf
[
cterm
->
escbufsz
++
]
=
ch
[
0
]
;
switch
(
st_vt_52_legal_sequence
(
cterm
->
escbuf
,
sizeof
(
cterm
->
escbuf
)
-
1
))
{
switch
(
st_vt_52_legal_sequence
(
cterm
->
escbuf
,
cterm
->
escbufsz
,
sizeof
(
cterm
->
escbuf
)
-
1
))
{
case
SEQ_BROKEN
:
case
SEQ_BROKEN
:
/* Broken sequence detected */
/* Broken sequence detected */
// Just throw it out (see COMMANDO.TXT)
// Just throw it out (see COMMANDO.TXT)
cterm
->
escbuf
[
0
]
=
0
;
cterm
->
escbuf
[
0
]
=
0
;
cterm
->
escbufsz
=
0
;
cterm
->
sequence
=
0
;
cterm
->
sequence
=
0
;
break
;
break
;
case
SEQ_INCOMPLETE
:
case
SEQ_INCOMPLETE
:
...
@@ -6553,6 +6555,7 @@ CIOLIBEXPORT size_t cterm_write(struct cterminal * cterm, const void *vbuf, int
...
@@ -6553,6 +6555,7 @@ CIOLIBEXPORT size_t cterm_write(struct cterminal * cterm, const void *vbuf, int
prn
[
0
]
=
0
;
prn
[
0
]
=
0
;
prnpos
=
prn
;
prnpos
=
prn
;
cterm
->
sequence
=
1
;
cterm
->
sequence
=
1
;
cterm
->
escbufsz
=
0
;
break
;
break
;
case
28
:
case
28
:
case
29
:
case
29
:
...
...
This diff is collapsed.
Click to expand it.
src/conio/cterm.h
+
1
−
0
View file @
340dea55
...
@@ -161,6 +161,7 @@ struct cterminal {
...
@@ -161,6 +161,7 @@ struct cterminal {
char
*
strbuf
;
char
*
strbuf
;
size_t
strbuflen
;
size_t
strbuflen
;
size_t
strbufsize
;
size_t
strbufsize
;
size_t
escbufsz
;
char
escbuf
[
1024
];
char
escbuf
[
1024
];
cterm_music_t
music_enable
;
// The remotely/locally controled music state
cterm_music_t
music_enable
;
// The remotely/locally controled music state
char
musicbuf
[
1024
];
char
musicbuf
[
1024
];
...
...
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