Merge branch 'master' of ssh://git.citadel.org/appl/gitroot/citadel

diff --git a/citadel/clientsocket.c b/citadel/clientsocket.c
index 1f66a261bab66bcb72c46c6d2a30e8f86ba7b17a..49dee67b222d472886705ec1aa12ad6c1d314111 100644 (file)
--- a/citadel/clientsocket.c
+++ b/citadel/clientsocket.c
@@ -201,17 +201,8 @@ int sock_getln(int *sock, char *buf, int bufsize)
 
        i = StrLength(CCC->sMigrateBuf);
        pCh = ChrPtr(CCC->sMigrateBuf);
-       /* Strip the trailing LF, and the trailing CR if present.
-        */
-       if (bufsize <= i)
-               i = bufsize - 1;
-       while ((i > 0)
-              && ((pCh[i - 1] == 13)
-                  || (pCh[i - 1] == 10))) {
-               i--;
-       }
-       memcpy(buf, pCh, i);
-       buf[i] = 0;
+
+       memcpy(buf, pCh, i + 1);
 
        FlushStrBuf(CCC->sMigrateBuf);
        if (retval < 0) {
@@ -257,6 +248,34 @@ int sock_write(int *sock, const char *buf, int nbytes)
 }
 
 
+
+/*
+ * client_getln()   ...   Get a LF-terminated line of text from the client.
+ * (This is implemented in terms of client_read() and could be
+ * justifiably moved out of sysdep.c)
+ */
+int sock_getln_err(int *sock, char *buf, int bufsize, int *rc)
+{
+       int i, retval;
+       CitContext *CCC = MyContext();
+       const char *pCh;
+
+       FlushStrBuf(CCC->sMigrateBuf);
+       *rc = retval = CtdlSockGetLine(sock, CCC->sMigrateBuf);
+
+       i = StrLength(CCC->sMigrateBuf);
+       pCh = ChrPtr(CCC->sMigrateBuf);
+
+       memcpy(buf, pCh, i + 1);
+
+       FlushStrBuf(CCC->sMigrateBuf);
+       if (retval < 0) {
+               safestrncpy(&buf[i], "000", bufsize - i);
+               i += 3;
+       }
+       return i;
+}
+
 /*
  * Multiline version of sock_gets() ... this is a convenience function for
  * client side protocol implementations.  It only returns the first line of
@@ -264,17 +283,22 @@ int sock_write(int *sock, const char *buf, int nbytes)
  */
 int ml_sock_gets(int *sock, char *buf)
 {
+       int rc = 0;
        char bigbuf[1024];
        int g;
 
-       g = sock_getln(sock, buf, SIZ);
+       g = sock_getln_err(sock, buf, SIZ, &rc);
+       if (rc < 0)
+               return rc;
        if (g < 4)
                return (g);
        if (buf[3] != '-')
                return (g);
 
        do {
-               g = sock_getln(sock, bigbuf, SIZ);
+               g = sock_getln_err(sock, bigbuf, SIZ, &rc);
+               if (rc < 0)
+                       return rc;
                if (g < 0)
                        return (g);
        } while ((g >= 4) && (bigbuf[3] == '-'));

diff --git a/citadel/modules/smtp/serv_smtp.c b/citadel/modules/smtp/serv_smtp.c
index ab01bbd7db9bbc1fb10f4c2049d8be55c49f10a5..3c5e02c0acd145cd1517c8a49d1e20d8a3a726a6 100644 (file)
--- a/citadel/modules/smtp/serv_smtp.c
+++ b/citadel/modules/smtp/serv_smtp.c
@@ -1081,7 +1081,21 @@ void smtp_try(const char *key, const char *addr, int *status,
                CtdlLogPrintf(CTDL_DEBUG, "SMTP client: connecting to %s : %s ...\n", mx_host, mx_port);
                sock = sock_connect(mx_host, mx_port);
                snprintf(dsn, SIZ, "Could not connect: %s", strerror(errno));
-               if (sock >= 0) CtdlLogPrintf(CTDL_DEBUG, "SMTP client: connected!\n");
+               if (sock >= 0) 
+               {
+                       CtdlLogPrintf(CTDL_DEBUG, "SMTP client: connected!\n");
+                               int fdflags; 
+                               fdflags = fcntl(sock, F_GETFL);
+                               if (fdflags < 0)
+                                       CtdlLogPrintf(CTDL_DEBUG,
+                                                     "unable to get SMTP-Client socket flags! %s \n",
+                                                     strerror(errno));
+                               fdflags = fdflags | O_NONBLOCK;
+                               if (fcntl(sock, F_SETFL, fdflags) < 0)
+                                       CtdlLogPrintf(CTDL_DEBUG,
+                                                     "unable to set SMTP-Client socket nonblocking flags! %s \n",
+                                                     strerror(errno));
+               }
                if (sock < 0) {
                        if (errno > 0) {
                                snprintf(dsn, SIZ, "%s", strerror(errno));

diff --git a/libcitadel/bootstrap b/libcitadel/bootstrap
index 9d70ce5006b400cf301992f492bf0cd811a84885..3c4c7bd455f501da82b01286dc2fafa41643b94d 100755 (executable)
--- a/libcitadel/bootstrap
+++ b/libcitadel/bootstrap
@@ -1,4 +1,4 @@
 #!/bin/sh
-
+ 
 autoconf
-autoheader
\ No newline at end of file
+autoheader

diff --git a/libcitadel/lib/html_to_ascii.c b/libcitadel/lib/html_to_ascii.c
index ccf074a48574e8dbb4b15e71cb38da1d15eae401..b80272aecd0d7f8517801062fbcf8a1ac3b80cab 100644 (file)
--- a/libcitadel/lib/html_to_ascii.c
+++ b/libcitadel/lib/html_to_ascii.c
@@ -49,13 +49,13 @@
  * screenwidth   = desired output screenwidth
  * do_citaformat = set to 1 to indent newlines with spaces
  */
-char *html_to_ascii(char *inputmsg, int msglen, int screenwidth, int do_citaformat) {
+char *html_to_ascii(const char *inputmsg, int msglen, int screenwidth, int do_citaformat) {
        char inbuf[SIZ];
        int inbuf_len = 0;
        char outbuf[SIZ];
        char tag[1024];
        int done_reading = 0;
-       char *inptr;
+       const char *inptr;
        char *outptr;
        size_t outptr_buffer_size;
        size_t output_len = 0;

diff --git a/libcitadel/lib/libcitadel.h b/libcitadel/lib/libcitadel.h
index c52fa6e2e0369689dfc2fafd657fc750737a111f..b8309761cf087da081d4b67bd0acfd32ea25f165 100644 (file)
--- a/libcitadel/lib/libcitadel.h
+++ b/libcitadel/lib/libcitadel.h
@@ -366,7 +366,7 @@ char *rfc2047encode(char *line, long length);
 int is_msg_in_mset(const char *mset, long msgnum);
 int pattern2(char *search, char *patn);
 void stripltlen(char *, int *);
-char *html_to_ascii(char *inputmsg, int msglen, int screenwidth, int do_citaformat);
+char *html_to_ascii(const char *inputmsg, int msglen, int screenwidth, int do_citaformat);
 void LoadEntityList(char *FileName);