Fixed STR sequence termination condition

[st.git] / st.c

diff --git a/st.c b/st.c
index 00fca99..827ed08 100644 (file)
--- a/st.c
+++ b/st.c
@@ -996,6 +996,8 @@ selnotify(XEvent *e) {
 
        ofs = 0;
        xsev = (XSelectionEvent *)e;
 
        ofs = 0;
        xsev = (XSelectionEvent *)e;

+       if (xsev->property == None)
+           return;

        do {
                if(XGetWindowProperty(xw.dpy, xw.win, xsev->property, ofs,
                                        BUFSIZ/4, False, AnyPropertyType,
        do {
                if(XGetWindowProperty(xw.dpy, xw.win, xsev->property, ofs,
                                        BUFSIZ/4, False, AnyPropertyType,


@@ -2270,12 +2272,23 @@ strhandle(void) {
 
 void
 strparse(void) {
 
 void
 strparse(void) {

+       int c;

        char *p = strescseq.buf;
 
        strescseq.narg = 0;
        strescseq.buf[strescseq.len] = '\0';
        char *p = strescseq.buf;
 
        strescseq.narg = 0;
        strescseq.buf[strescseq.len] = '\0';

-       while(p && strescseq.narg < STR_ARG_SIZ)
-               strescseq.args[strescseq.narg++] = strsep(&p, ";");
+
+       if(*p == '\0')
+               return;
+
+       while(strescseq.narg < STR_ARG_SIZ) {
+               strescseq.args[strescseq.narg++] = p;
+               while((c = *p) != ';' && c != '\0')
+                       ++p;
+               if(c == '\0')
+                       return;
+               *p++ = '\0';
+       }

 }
 
 void
 }
 
 void


@@ -2650,7 +2663,7 @@ tputc(char *c, int len) {
         * character.
         */
        if(term.esc & ESC_STR) {
         * character.
         */
        if(term.esc & ESC_STR) {

-               if(width == 1 &&
+               if(len == 1 &&

                   (ascii == '\a' || ascii == 030 ||
                    ascii == 032  || ascii == 033 ||
                    ISCONTROLC1(unicodep))) {
                   (ascii == '\a' || ascii == 030 ||
                    ascii == 032  || ascii == 033 ||
                    ISCONTROLC1(unicodep))) {