X-Git-Url: http://winboard.nl/cgi-bin?p=xboard.git;a=blobdiff_plain;f=backend.c;h=e197f00243b9e0615646be2ca04009b5ffd0fc48;hp=0bbe876c9aeb5c2ba47a835fa3de4e6210c8cf9b;hb=6ee5f4d3418f9b1b6c537ebf8a9ddd59341877c5;hpb=b62cf5e6c96ca7a64c184b6218c18eb045142a7b

diff --git a/backend.c b/backend.c
index 0bbe876..e197f00 100755
--- a/backend.c
+++ b/backend.c
@@ -2055,9 +2055,9 @@ read_from_ics(isr, closure, data, count, error)
     static char buf[BUF_SIZE + 1];
     static int firstTime = TRUE, intfSet = FALSE;
     static ColorClass prevColor = ColorNormal;
-    static int savingComment = FALSE;
-	static int cmatch = 0; // continuation sequence match
-	char *bp;
+    static int savingComment = FALSE;
+    static int cmatch = 0; // continuation sequence match
+    char *bp;
     char str[500];
     int i, oldi;
     int buf_len;
@@ -2088,53 +2088,67 @@ read_from_ics(isr, closure, data, count, error)
 	      buf[i] = buf[leftover_start + i];
 	}
 
-    /* copy new characters into the buffer */
-    bp = buf + leftover_len;
-    buf_len=leftover_len;
-    for (i=0; i<count; i++)
-    {
-        // ignore these
-        if (data[i] == '\r')
-            continue;
-
-        // join lines split by ICS?
-        if (!appData.noJoin)
-        {
-            /*
-                Joining just consists of finding matches against the
-                continuation sequence, and discarding that sequence
-                if found instead of copying it.  So, until a match
-                fails, there's nothing to do since it might be the
-                complete sequence, and thus, something we don't want
-                copied.
-            */
-            if (data[i] == cont_seq[cmatch])
-            {
-                cmatch++;
-                if (cmatch == strlen(cont_seq))
-                    cmatch = 0; // complete match.  just reset the counter
-                continue;
-            }
-            else if (cmatch)
-            {
-                /*
-                    match failed, so we have to copy what matched before
-                    falling through and copying this character.  In reality,
-                    this will only ever be just the newline character, but
-                    it doesn't hurt to be precise.
-                */
-                strncpy(bp, cont_seq, cmatch);
-                bp += cmatch;
-                buf_len += cmatch;
-                cmatch = 0;
-            }
-        }
-
-        // copy this char
-        *bp++ = data[i];
-        buf_len++;
-    }
-
+    /* copy new characters into the buffer */
+    bp = buf + leftover_len;
+    buf_len=leftover_len;
+    for (i=0; i<count; i++)
+    {
+        // ignore these
+        if (data[i] == '\r')
+            continue;
+
+        // join lines split by ICS?
+        if (!appData.noJoin)
+        {
+            /*
+                Joining just consists of finding matches against the
+                continuation sequence, and discarding that sequence
+                if found instead of copying it.  So, until a match
+                fails, there's nothing to do since it might be the
+                complete sequence, and thus, something we don't want
+                copied.
+            */
+            if (data[i] == cont_seq[cmatch])
+            {
+                cmatch++;
+                if (cmatch == strlen(cont_seq))
+                {
+                    cmatch = 0; // complete match.  just reset the counter
+
+                    /*
+                        it's possible for the ICS to not include the space
+                        at the end of the last word, making our [correct]
+                        join operation fuse two separate words.  the server
+                        does this when the space occurs at the width setting.
+                    */
+                    if (!buf_len || buf[buf_len-1] != ' ')
+                    {
+                        *bp++ = ' ';
+                        buf_len++;
+                    }
+                }
+                continue;
+            }
+            else if (cmatch)
+            {
+                /*
+                    match failed, so we have to copy what matched before
+                    falling through and copying this character.  In reality,
+                    this will only ever be just the newline character, but
+                    it doesn't hurt to be precise.
+                */
+                strncpy(bp, cont_seq, cmatch);
+                bp += cmatch;
+                buf_len += cmatch;
+                cmatch = 0;
+            }
+        }
+
+        // copy this char
+        *bp++ = data[i];
+        buf_len++;
+    }
+
 	buf[buf_len] = NULLCHAR;
 	next_out = leftover_len;
 	leftover_start = 0;