int bytes,
int timeout)
{
- CitContext *CCC=CC;
+ CitContext *CCC = MyContext();
const char *Error;
int retval = 0;
int sock_read_to(int *sock, char *buf, int bytes, int timeout, int keep_reading_until_full)
{
- CitContext *CCC=CC;
+ CitContext *CCC = MyContext();
int rc;
+ FlushStrBuf(CCC->MigrateBuf);
rc = socket_read_blob(sock,
CCC->sMigrateBuf,
bytes,
int CtdlSockGetLine(int *sock, StrBuf *Target)
{
- CitContext *CCC=CC;
+ CitContext *CCC = MyContext();
const char *Error;
int rc;
+ FlushStrBuf(Target);
rc = StrBufTCP_read_buffered_line_fast(Target,
CCC->sReadBuf,
&CCC->sPos,
int sock_getln(int *sock, char *buf, int bufsize)
{
int i, retval;
- CitContext *CCC=CC;
+ CitContext *CCC = MyContext();
const char *pCh;
+ FlushStrBuf(CCC->sMigrateBuf);
retval = CtdlSockGetLine(sock, CCC->sMigrateBuf);
i = StrLength(CCC->sMigrateBuf);
FlushStrBuf(CCC->sMigrateBuf);
if (retval < 0) {
safestrncpy(&buf[i], "000", bufsize - i);
+ i += 3;
}
- return(retval >= 0);
+ return i;
}