From 735e84252350cdad81c4a336d0f5c42e803de203 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Wilfried=20G=C3=B6esgens?= Date: Wed, 17 Feb 2010 18:56:48 +0000 Subject: [PATCH] * fix returnvalue of wrapper to be identical to as before --- citadel/sysdep.c | 39 ++++++++++++++++++++++++++++++++++++++- 1 file changed, 38 insertions(+), 1 deletion(-) diff --git a/citadel/sysdep.c b/citadel/sysdep.c index 33c42696d..c39d85ba6 100644 --- 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", -- 2.30.2