*** empty log message ***

[spider.git] / src / client.c

diff --git a/src/client.c b/src/client.c
index ac8911448f4d12a390eddd7b97d78ffd92a4d6aa..5991ed76ffc6aa4bf1935ce5df6fce75c34ad405 100644 (file)
--- a/src/client.c
+++ b/src/client.c
@@ -230,7 +230,9 @@ int fcb_handler(sel_t *sp, int in, int out, int err)
                                        ++p;
                                        break;
                                default:
-                                       if (*p == nl) {
+                                       if (nl == '\n' && *p == '\r') {
+                                               p++;
+                                       } else if (*p == nl) {
                                                if (mp->inp == mp->data)
                                                        *mp->inp++ = ' ';
                                                *mp->inp = 0;              /* zero terminate it, but don't include it in the length */
@@ -499,8 +501,10 @@ void process_node()
                        case 'D':
                                if (p) {
                                        int l = mp->inp - (unsigned char *) p;
+                                       if (nl == '\n' && l >= 1 && p[l-1] == '\r')       /* kludge for GB7DXM */
+                                               l--;
                                        send_text(in, p, l);
-                       }
+                               }
                                break;
                        default:
                                break;