* sock_getln (): CtdlSockGetLine() gives us lines without \r\n, no need to look for...

[citadel.git] / citadel / clientsocket.c

diff --git a/citadel/clientsocket.c b/citadel/clientsocket.c
index 3a3ac483eb7309ce4fa595f623b60ff8022ff0b5..36f160a97fdd6b2af59130ed1f57c2e9d60b97e5 100644 (file)
--- a/citadel/clientsocket.c
+++ b/citadel/clientsocket.c
@@ -1,6 +1,4 @@
 /*
- * $Id$
- *
  * This module handles client-side sockets opened by the Citadel server (for
  * the client side of Internet protocols, etc.)   It does _not_ handle client
  * sockets for the Citadel client; for that you must look in ipc_c_tcp.c
@@ -180,6 +178,7 @@ int sock_read_to(int *sock, char *buf, int bytes, int timeout, int keep_reading_
        CitContext *CCC=CC;
        int rc;
 
+       FlushStrBuf(CCC->MigrateBuf);
        rc = socket_read_blob(sock, 
                              CCC->sMigrateBuf, 
                              bytes, 
@@ -209,6 +208,7 @@ int CtdlSockGetLine(int *sock, StrBuf *Target)
        const char *Error;
        int rc;
 
+       FlushStrBuf(Target);
        rc = StrBufTCP_read_buffered_line_fast(Target, 
                                               CCC->sReadBuf,
                                               &CCC->sPos,
@@ -236,27 +236,20 @@ int sock_getln(int *sock, char *buf, int bufsize)
        CitContext *CCC=CC;
        const char *pCh;
 
+       FlushStrBuf(CCC->sMigrateBuf);
        retval = CtdlSockGetLine(sock, CCC->sMigrateBuf);
 
        i = StrLength(CCC->sMigrateBuf);
        pCh = ChrPtr(CCC->sMigrateBuf);
-       /* Strip the trailing LF, and the trailing CR if present.
-        */
-       if (bufsize <= i)
-               i = bufsize - 1;
-       while ( (i > 0)
-               && ( (pCh[i - 1]==13)
-                    || ( pCh[i - 1]==10)) ) {
-               i--;
-       }
-       memcpy(buf, pCh, i);
-       buf[i] = 0;
+
+       memcpy(buf, pCh, i + 1);
 
        FlushStrBuf(CCC->sMigrateBuf);
        if (retval < 0) {
                safestrncpy(&buf[i], "000", bufsize - i);
+               i += 3;
        }
-       return(retval >= 0);
+       return i;
 }
 
 
@@ -274,7 +267,7 @@ INLINE int sock_read(int *sock, char *buf, int bytes, int keep_reading_until_ful
  * sock_write() - send binary to server.
  * Returns the number of bytes written, or -1 for error.
  */
-int sock_write(int *sock, char *buf, int nbytes)
+int sock_write(int *sock, const char *buf, int nbytes)
 {
        int bytes_written = 0;
        int retval;
@@ -295,23 +288,61 @@ int sock_write(int *sock, char *buf, int nbytes)
 }
 
 
+
+/*
+ * client_getln()   ...   Get a LF-terminated line of text from the client.
+ * (This is implemented in terms of client_read() and could be
+ * justifiably moved out of sysdep.c)
+ */
+int sock_getln_err(int *sock, char *buf, int bufsize, int *rc)
+{
+       int i, retval;
+       CitContext *CCC = MyContext();
+       const char *pCh;
+
+       FlushStrBuf(CCC->sMigrateBuf);
+       *rc = retval = CtdlSockGetLine(sock, CCC->sMigrateBuf);
+
+       i = StrLength(CCC->sMigrateBuf);
+       pCh = ChrPtr(CCC->sMigrateBuf);
+
+       memcpy(buf, pCh, i + 1);
+
+       FlushStrBuf(CCC->sMigrateBuf);
+       if (retval < 0) {
+               safestrncpy(&buf[i], "000", bufsize - i);
+               i += 3;
+       }
+       return i;
+}
+
 /*
  * Multiline version of sock_gets() ... this is a convenience function for
  * client side protocol implementations.  It only returns the first line of
  * a multiline response, discarding the rest.
  */
-int ml_sock_gets(int *sock, char *buf) {
+
+int ml_sock_gets(int *sock, char *buf)
+{
+       int rc = 0;
        char bigbuf[1024];
        int g;
 
-       g = sock_getln(sock, buf, SIZ);
-       if (g < 4) return(g);
-       if (buf[3] != '-') return(g);
+       g = sock_getln_err(sock, buf, SIZ, &rc);
+       if (rc < 0)
+               return rc;
+       if (g < 4)
+               return (g);
+       if (buf[3] != '-')
+               return (g);
 
        do {
-               g = sock_getln(sock, bigbuf, SIZ);
-               if (g < 0) return(g);
-       } while ( (g >= 4) && (bigbuf[3] == '-') );
+               g = sock_getln_err(sock, bigbuf, SIZ, &rc);
+               if (rc < 0)
+                       return rc;
+               if (g < 0)
+                       return (g);
+       } while ((g >= 4) && (bigbuf[3] == '-'));
 
        return(strlen(buf));
 }