JasonWoof Got questions, comments, patches, etc.? Contact Jason Woofenden
Remove non defined behaviour in selcopy
authorRoberto E. Vargas Caballero <k0ga@shike2.com>
Fri, 31 Jan 2014 16:30:00 +0000 (17:30 +0100)
committerRoberto E. Vargas Caballero <k0ga@shike2.com>
Sun, 2 Feb 2014 18:42:01 +0000 (19:42 +0100)
It is not defined when lateral effects of expressions are
calculated, so an expression as:

--last >= gp && !(selected(last - gp, y)

is non portable.

st.c

diff --git a/st.c b/st.c
index c59bf1d..6e7077a 100644 (file)
--- a/st.c
+++ b/st.c
@@ -953,11 +953,12 @@ selcopy(void) {
                /* append every set & selected glyph to the selection */
                for(y = sel.nb.y; y < sel.ne.y + 1; y++) {
                        gp = &term.line[y][0];
-                       last = gp + term.col;
+                       last = &gp[term.col-1];
 
-                       while(--last >= gp && !(selected(last - gp, y) && \
-                                               strcmp(last->c, " ") != 0))
-                               /* nothing */;
+                       while(last >= gp && !(selected(last - gp, y) &&
+                                             strcmp(last->c, " ") != 0)) {
+                               --last;
+                       }
 
                        for(x = 0; gp <= last; x++, ++gp) {
                                if(!selected(x, y) || (gp->mode & ATTR_WDUMMY))