* buybuy serv_read

[citadel.git] / webcit / tcp_sockets.c

diff --git a/webcit/tcp_sockets.c b/webcit/tcp_sockets.c
index 5833c4bda4a37f6b965d707e9d5296ad31326abf..b1205c7e8dd2eb4f58878e3888406059b23b7c77 100644 (file)
--- a/webcit/tcp_sockets.c
+++ b/webcit/tcp_sockets.c
@@ -38,13 +38,15 @@ int uds_connectsock(char *sockpath)
 
        s = socket(AF_UNIX, SOCK_STREAM, 0);
        if (s < 0) {
-               lprintf(1, "Can't create socket: %s\n",
+               lprintf(1, "Can't create socket[%s]: %s\n",
+                       sockpath,
                        strerror(errno));
                return(-1);
        }
 
        if (connect(s, (struct sockaddr *) &addr, sizeof(addr)) < 0) {
-               lprintf(1, "Can't connect: %s\n",
+               lprintf(1, "Can't connect [%s]: %s\n",
+                       sockpath,
                        strerror(errno));
                close(s);
                return(-1);
@@ -141,15 +143,6 @@ inline void _serv_read(char *buf, int bytes, wcsession *WCC)
        }
 }
 
-void serv_read(char *buf, int bytes)
-{
-       wcsession *WCC = WC;
-
-       WCC->ReadPos = NULL;
-
-       _serv_read(buf, bytes, WCC);
-}
-
 /*
  *  input string from pipe
  */
@@ -232,6 +225,7 @@ int StrBuf_ServGetBLOBBuffered(StrBuf *buf, long BlobSize)
                                    &WCC->serv_sock, 
                                    1, 
                                    BlobSize, 
+                                   NNN_TERM,
                                    &Err);
        if (rc < 0)
        {