Using strtok_r for the string parsing.

[st.git] / st.c

diff --git a/st.c b/st.c
index afa6813..7ddce0c 100644 (file)
--- a/st.c
+++ b/st.c
@@ -1296,17 +1296,24 @@ tnewline(int first_col) {
 void
 csiparse(void) {
        /* int noarg = 1; */
-       char *p = csiescseq.buf;
+       char *p = csiescseq.buf, *np;
+       long int v;
 
        csiescseq.narg = 0;
-       if(*p == '?')
-               csiescseq.priv = 1, p++;
+       if(*p == '?') {
+               csiescseq.priv = 1;
+               p++;
+       }
 
        while(p < csiescseq.buf+csiescseq.len) {
-               while(isdigit(*p)) {
-                       csiescseq.arg[csiescseq.narg] *= 10;
-                       csiescseq.arg[csiescseq.narg] += *p++ - '0'/*, noarg = 0 */;
-               }
+               np = NULL;
+               v = strtol(p, &np, 10);
+               if(v == LONG_MAX || v == LONG_MIN)
+                       v = -1;
+               csiescseq.arg[csiescseq.narg] = v;
+               if(np != NULL)
+                       p = np;
+
                if(*p == ';' && csiescseq.narg+1 < ESC_ARG_SIZ) {
                        csiescseq.narg++, p++;
                } else {
@@ -1923,23 +1930,17 @@ 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
@@ -2116,7 +2117,8 @@ tputc(char *c, int len) {
                        if(BETWEEN(ascii, 0x40, 0x7E)
                                        || csiescseq.len >= ESC_BUF_SIZ) {
                                term.esc = 0;
-                               csiparse(), csihandle();
+                               csiparse();
+                               csihandle();
                        }
                } else if(term.esc & ESC_STR_END) {
                        term.esc = 0;