snark/st
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Using strtok_r for the string parsing.

Browse source
This commit is contained in:
Christoph Lohmann 2013-02-25 13:36:40 +01:00
parent 37863356b0
commit 7cb0d95509
1 changed files with 14 additions and 18 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

32
st.c
View file

@ -1300,8 +1300,10 @@ csiparse(void) {
long int v;
csiescseq.narg = 0;
if(*p == '?')
csiescseq.priv = 1, p++;
if(*p == '?') {
csiescseq.priv = 1;
p++;
}
while(p < csiescseq.buf+csiescseq.len) {
np = NULL;
@ -1928,24 +1930,18 @@ strhandle(void) {
void
strparse(void) {
/*
* TODO: Implement parsing like for CSI when required.
* Format: ESC type cmd ';' arg0 [';' argn] ESC \
*/
int narg = 0;
char *start = strescseq.buf, *end = start + strescseq.len;
strescseq.args[0] = start;
while(start < end && narg < LEN(strescseq.args)) {
start = memchr(start, ';', end - start);
if(!start)
break;
*start++ = '\0';
if(start < end) {
strescseq.args[++narg] = start;
char *p = strescseq.buf, *np, *sp;
strescseq.narg = 0;
np = strtok_r(strescseq.buf, ";", &sp);
while(p < strescseq.buf+strescseq.len && np != NULL) {
strescseq.args[strescseq.narg++] = p;
np = strtok_r(NULL, ";", &sp);
if(np != NULL)
p = np;
}
}
strescseq.narg = narg + 1;
}
void
strdump(void) {