* 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 a9325a2b3ebe3ccee2ceb61b28ec71f84db26ec1..49dee67b222d472886705ec1aa12ad6c1d314111 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
@@ -52,8 +50,10 @@
 int sock_connect(char *host, char *service)
 {
        struct in6_addr serveraddr;
-       struct addrinfo hints, *res = NULL;
-       int rc;
+       struct addrinfo hints;
+       struct addrinfo *res = NULL;
+       struct addrinfo *ai = NULL;
+       int rc = (-1);
        int sock = (-1);
 
        if ((host == NULL) || IsEmptyStr(host))
@@ -92,17 +92,13 @@ int sock_connect(char *host, char *service)
        /*
         * Try all available addresses until we connect to one or until we run out.
         */
-       struct addrinfo *ai;
        for (ai = res; ai != NULL; ai = ai->ai_next) {
-               /* FIXME display the address to which we are trying to connect */
-
                sock = socket(ai->ai_family, ai->ai_socktype, ai->ai_protocol);
                if (sock < 0) {
                        CtdlLogPrintf(CTDL_ERR, "socket() failed: %s\n", strerror(errno));
                        return(-1);
                }
-
-               rc = connect(sock, res->ai_addr, res->ai_addrlen);
+               rc = connect(sock, ai->ai_addr, ai->ai_addrlen);
                if (rc >= 0) {
                        return(sock);
                }
@@ -205,17 +201,8 @@ int sock_getln(int *sock, char *buf, int bufsize)
 
        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) {
@@ -261,6 +248,34 @@ int sock_write(int *sock, const 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
@@ -268,17 +283,22 @@ int sock_write(int *sock, const char *buf, int nbytes)
  */
 int ml_sock_gets(int *sock, char *buf)
 {
+       int rc = 0;
        char bigbuf[1024];
        int g;
 
-       g = sock_getln(sock, buf, SIZ);
+       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);
+               g = sock_getln_err(sock, bigbuf, SIZ, &rc);
+               if (rc < 0)
+                       return rc;
                if (g < 0)
                        return (g);
        } while ((g >= 4) && (bigbuf[3] == '-'));