* fix returnvalue of wrapper to be identical to as before

diff --git a/citadel/sysdep.c b/citadel/sysdep.c
index 33c42696d65e50f7568a94955e8dbff9d67da1ac..c39d85ba6092ad975302b98d149e6253df48cc7b 100644 (file)
--- a/citadel/sysdep.c
+++ b/citadel/sysdep.c
@@ -588,7 +588,7 @@ int client_read_blob(StrBuf *Target, int bytes, int timeout)
                              __FUNCTION__,
                              Error);
        }
-       return retval;
+       return retval == bytes;
 }
 
 int client_read_to(char *buf, int bytes, int timeout)
@@ -648,6 +648,26 @@ int CtdlClientGetLine(StrBuf *Target)
        else 
 #endif
        {
+               char fn [SIZ];
+               FILE *fd;
+               int len, rlen, nlen, nrlen;
+               const char *pch;
+
+               snprintf(fn, SIZ, "/tmp/foolog_%s.%d", CCC->ServiceName, CCC->cs_pid);
+
+               fd = fopen(fn, "a+");
+               pch = ChrPtr(CCC->ReadBuf);
+               len = StrLength(CCC->ReadBuf);
+               if (CCC->Pos != NULL)
+                       rlen = CC->Pos - pch;
+               else
+                       rlen = 0;
+
+/*             fprintf(fd, "\n\n\nBufSize: %d BufPos: %d \nBufContent: [%s]\n\n_____________________\n",
+                       len, rlen, pch);
+*/
+               fprintf(fd, "\n\n\nBufSize: %d BufPos: %d \n_____________________\n",
+                       len, rlen);
                rc = StrBufTCP_read_buffered_line_fast(Target, 
                                                       CCC->ReadBuf,
                                                       &CCC->Pos,
@@ -656,6 +676,23 @@ int CtdlClientGetLine(StrBuf *Target)
                                                       1,
                                                       &Error);
 
+                pch = ChrPtr(CCC->ReadBuf);
+                nlen = StrLength(CCC->ReadBuf);
+                if (CCC->Pos != NULL)
+                        nrlen = CC->Pos - pch;
+                else
+                        nrlen = 0;
+/*
+                fprintf(fd, "\n\n\nBufSize: was: %d is: %d BufPos: was: %d is: %d \nBufContent: [%s]\n\n_____________________\n",
+                        len, nlen, rlen, nrlen, pch);
+*/
+                fprintf(fd, "\n\n\nBufSize: was: %d is: %d BufPos: was: %d is: %d \n",
+                        len, nlen, rlen, nrlen);
+
+                fprintf(fd, "Read: BufSize: %d BufContent: [%s]\n\n*************\n",
+                        StrLength(Target), ChrPtr(Target));
+                fclose(fd);
+
                if ((rc < 0) && (Error != NULL))
                        CtdlLogPrintf(CTDL_CRIT, 
                                      "%s failed: %s\n",