* sockets for the Citadel client; for that you must look in ipc_c_tcp.c
* (which, uncoincidentally, bears a striking similarity to this file).
*
- * Copyright (c) 1987-2010 by the citadel.org team
+ * Copyright (c) 1987-2011 by the citadel.org team
*
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; either version 3 of the License, or
- * (at your option) any later version.
+ * This program is open source software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License, version 3.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*/
#include "sysdep.h"
#include <pwd.h>
#include <errno.h>
#include <stdarg.h>
+#include <syslog.h>
#include <libcitadel.h>
#include "citadel.h"
#include "server.h"
-#ifndef HAVE_SNPRINTF
-#include "snprintf.h"
-#endif
#include "sysdep_decls.h"
#include "config.h"
#include "clientsocket.h"
rc = getaddrinfo(host, service, &hints, &res);
if (rc != 0) {
- CtdlLogPrintf(CTDL_ERR, "%s: %s\n", host, gai_strerror(rc));
+ syslog(LOG_ERR, "%s: %s", host, gai_strerror(rc));
return(-1);
}
for (ai = res; ai != NULL; ai = ai->ai_next) {
sock = socket(ai->ai_family, ai->ai_socktype, ai->ai_protocol);
if (sock < 0) {
- CtdlLogPrintf(CTDL_ERR, "socket() failed: %s\n", strerror(errno));
+ syslog(LOG_ERR, "socket() failed: %s", strerror(errno));
freeaddrinfo(res);
return(-1);
}
return(sock);
}
else {
- CtdlLogPrintf(CTDL_ERR, "connect() failed: %s\n", strerror(errno));
+ syslog(LOG_ERR, "connect() failed: %s", strerror(errno));
close(sock);
}
}
retval = StrBufReadBLOBBuffered(Target,
- CCC->sReadBuf,
- &CCC->sPos,
+ CCC->SBuf.Buf,
+ &CCC->SBuf.ReadWritePointer,
Socket, 1, bytes, O_TERM, &Error);
+
if (retval < 0) {
- CtdlLogPrintf(CTDL_CRIT,
- "%s failed: %s\n", __FUNCTION__, Error);
+ syslog(LOG_CRIT, "socket_read_blob() failed: %s", Error);
}
return retval;
}
FlushStrBuf(Target);
rc = StrBufTCP_read_buffered_line_fast(Target,
- CCC->sReadBuf,
- &CCC->sPos,
+ CCC->SBuf.Buf,
+ &CCC->SBuf.ReadWritePointer,
sock, nSec, 1, &Error);
if ((rc < 0) && (Error != NULL))
- CtdlLogPrintf(CTDL_CRIT,
- "%s failed: %s\n", __FUNCTION__, Error);
+ syslog(LOG_CRIT, "CtdlSockGetLine() failed: %s", Error);
return rc;
}