sync with 0.8.1cvs7

diff --git a/ChangeLog b/ChangeLog
index dbb03a531404f35f43683dacd00ff9a0e9452b8b..89ed885ad2ca4d78030a9f9ab7ab935d2daad656 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,19 @@
+2002-08-01
+
+       * src/compose.c: compose_wrap_line_all(): fixed character buffer
+         initialization.
+
+2002-07-31
+
+       * src/socket.c:
+         corrected a typo (HAVE_SYS_SELECT -> HAVE_SYS_SELECT_H)
+
+2002-07-31
+
+       * src/socket.c: implemented socket I/O timeout.
+         fd_recv(): new.
+       * src/pop.c: check errors and return error value correctly.
+
 2002-07-31
 
        * src/prefs_actions.c: made the action's input/output dialog display

diff --git a/ChangeLog.claws b/ChangeLog.claws
index 0dec01c8b4f884e44d42e7e4a27b76178324e88b..35cd75e9021ab6e6423e48ea303204786a0426c7 100644 (file)
--- a/ChangeLog.claws
+++ b/ChangeLog.claws
@@ -1,3 +1,8 @@
+2002-08-01 [paul]      0.8.1claws7
+
+       * sync with 0.8.1cvs7
+               see ChangeLog 2002-07-31 and 2002-08-01
+
 2002-07-31 [christoph] 0.8.1claws6
 
        * src/mainwindow.c

diff --git a/ChangeLog.jp b/ChangeLog.jp
index 82d3e7170e56cfe2d73d9ceb75e4c058bb582b9b..bbb56ff2d1c72c8e40a7c4ae963e163fe6acf33a 100644 (file)
--- a/ChangeLog.jp
+++ b/ChangeLog.jp
@@ -1,3 +1,18 @@
+2002-08-01
+
+       * src/compose.c: compose_wrap_line_all(): ʸ»ú¥Ð¥Ã¥Õ¥¡¤Î½é´ü²½¤ò
+         ½¤Àµ¡£
+
+2002-07-31
+
+       * src/socket.c: typo ¤ò½¤Àµ(HAVE_SYS_SELECT -> HAVE_SYS_SELECT_H)
+
+2002-07-31
+
+       * src/socket.c: socket I/O ¥¿¥¤¥à¥¢¥¦¥È¤ò¼ÂÁõ¡£
+         fd_recv(): ¿·µ¬¡£
+       * src/pop.c: Àµ¤·¤¯¥¨¥é¡¼¤ò¥Á¥§¥Ã¥¯¤·¤Æ¥¨¥é¡¼ÃͤòÊÖ¤¹¤è¤¦¤Ë¤·¤¿¡£
+
 2002-07-31
 
        * src/prefs_actions.c: ¥¢¥¯¥·¥ç¥ó¤ÎÆþ½ÐÎÏ¥À¥¤¥¢¥í¥°¤òÃٱ䤵¤»¤º¤Ë

diff --git a/configure.in b/configure.in
index c38705d80515e7991731977b846232751026690a..e5010f856766376a543f0b48b304e0147424f4d3 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -8,7 +8,7 @@ MINOR_VERSION=8
 MICRO_VERSION=1
 INTERFACE_AGE=0
 BINARY_AGE=0
-EXTRA_VERSION=claws6
+EXTRA_VERSION=claws7
 VERSION=$MAJOR_VERSION.$MINOR_VERSION.$MICRO_VERSION$EXTRA_VERSION
 
 dnl set $target
@@ -331,7 +331,7 @@ AC_HEADER_DIRENT
 AC_HEADER_STDC
 AC_HEADER_SYS_WAIT
 AC_CHECK_HEADERS(fcntl.h sys/file.h unistd.h paths.h \
-                sys/param.h sys/utsname.h \
+                sys/param.h sys/utsname.h sys/select.h \
                 wchar.h wctype.h)
 
 dnl Checks for typedefs, structures, and compiler characteristics.

diff --git a/src/compose.c b/src/compose.c
index 075469b7d93f47f5cb889887c6e6d45083592d74..126cdcd8ea10a45e3976c1e1fbcb65cd415e7489 100644 (file)
--- a/src/compose.c
+++ b/src/compose.c
@@ -2400,7 +2400,7 @@ static void compose_wrap_line_all(Compose *compose)
                /* we have encountered line break */
                if (ch_len == 1 && *cbuf == '\n') {
                        gint clen;
-                       gchar cb[MB_CUR_MAX];
+                       gchar cb[MB_LEN_MAX];
 
                        /* should we join the next line */
                        if ((i_len != cur_len) && do_delete &&

diff --git a/src/pop.c b/src/pop.c
index 63b59552d3346ed906823c1a36f2921cd210d15d..e32b015943b83aee2af3c4dd746429f3820e2b8b 100644 (file)
--- a/src/pop.c
+++ b/src/pop.c
@@ -103,8 +103,10 @@ gint pop3_greeting_recv(SockInfo *sock, gpointer data)
                        return POP3_GETAUTH_APOP_SEND;
                else
                        return POP3_GETAUTH_USER_SEND;
-       } else
+       } else {
+               state->inc_state = INC_ERROR;
                return -1;
+       }
 }
 
 #if USE_SSL
@@ -121,8 +123,11 @@ gint pop3_stls_recv(SockInfo *sock, gpointer data)
        gint ok;
 
        if ((ok = pop3_ok(sock, NULL)) == PS_SUCCESS) {
-               if (!ssl_init_socket_with_method(sock, SSL_METHOD_TLSv1))
+               if (!ssl_init_socket_with_method(sock, SSL_METHOD_TLSv1)) {
+                       state->error_val = PS_SOCKET;
+                       state->inc_state = INC_ERROR;
                        return -1;
+               }
                if (state->ac_prefs->protocol == A_APOP)
                        return POP3_GETAUTH_APOP_SEND;
                else
@@ -132,8 +137,10 @@ gint pop3_stls_recv(SockInfo *sock, gpointer data)
                state->error_val = PS_PROTOCOL;
                state->inc_state = INC_ERROR;
                return POP3_LOGOUT_SEND;
-       } else
+       } else {
+               state->inc_state = INC_ERROR;
                return -1;
+       }
 }
 #endif /* USE_SSL */
 
@@ -200,11 +207,15 @@ gint pop3_getauth_apop_send(SockInfo *sock, gpointer data)
        if ((start = strchr(state->greeting, '<')) == NULL) {
                log_warning(_("Required APOP timestamp not found "
                              "in greeting\n"));
+               state->error_val = PS_PROTOCOL;
+               state->inc_state = INC_ERROR;
                return -1;
        }
 
        if ((end = strchr(start, '>')) == NULL || end == start + 1) {
                log_warning(_("Timestamp syntax error in greeting\n"));
+               state->error_val = PS_PROTOCOL;
+               state->inc_state = INC_ERROR;
                return -1;
        }
 
@@ -250,6 +261,8 @@ gint pop3_getrange_stat_recv(SockInfo *sock, gpointer data)
                if (sscanf(buf, "%d %d", &state->count, &state->total_bytes)
                    != 2) {
                        log_warning(_("POP3 protocol error\n"));
+                       state->error_val = PS_PROTOCOL;
+                       state->inc_state = INC_ERROR;
                        return -1;
                } else {
                        if (state->count == 0) {
@@ -262,10 +275,12 @@ gint pop3_getrange_stat_recv(SockInfo *sock, gpointer data)
                                return POP3_GETRANGE_UIDL_SEND;
                        }
                }
-       } else if (ok == PS_PROTOCOL)
+       } else if (ok == PS_PROTOCOL) {
                return POP3_LOGOUT_SEND;
-       else
+       } else {
+               state->inc_state = INC_ERROR;
                return -1;
+       }
 }
 
 gint pop3_getrange_last_send(SockInfo *sock, gpointer data)
@@ -285,6 +300,8 @@ gint pop3_getrange_last_recv(SockInfo *sock, gpointer data)
 
                if (sscanf(buf, "%d", &last) == 0) {
                        log_warning(_("POP3 protocol error\n"));
+                       state->error_val = PS_PROTOCOL;
+                       state->inc_state = INC_ERROR;
                        return -1;
                } else {
                        if (state->count == last)
@@ -312,6 +329,7 @@ gint pop3_getrange_uidl_recv(SockInfo *sock, gpointer data)
        gboolean get_all = FALSE;
        gchar buf[POPBUFSIZE];
        gchar id[IDLEN + 1];
+       gint len;
        gint next_state;
 
        if (!state->uidl_table) new = TRUE;
@@ -330,7 +348,7 @@ gint pop3_getrange_uidl_recv(SockInfo *sock, gpointer data)
                        return POP3_GETSIZE_LIST_SEND;
        }
 
-       while (sock_gets(sock, buf, sizeof(buf)) >= 0) {
+       while ((len = sock_gets(sock, buf, sizeof(buf))) > 0) {
                gint num;
                time_t recv_time;
 
@@ -356,8 +374,14 @@ gint pop3_getrange_uidl_recv(SockInfo *sock, gpointer data)
                }
        }
 
-       state->uidl_is_valid = TRUE;
+       if (len < 0) {
+               log_error(_("Socket error\n"));
+               state->error_val = PS_SOCKET;
+               state->inc_state = INC_ERROR;
+               return -1;
+       }
 
+       state->uidl_is_valid = TRUE;
        if (pop3_sd_state(state, POP3_GETRANGE_UIDL_RECV, &next_state))
                return next_state;
 
@@ -378,18 +402,22 @@ gint pop3_getsize_list_recv(SockInfo *sock, gpointer data)
 {
        Pop3State *state = (Pop3State *)data;
        gchar buf[POPBUFSIZE];
+       gint len;
        gint next_state;
 
        if (pop3_ok(sock, NULL) != PS_SUCCESS) return POP3_LOGOUT_SEND;
 
        state->cur_total_bytes = 0;
 
-       while (sock_gets(sock, buf, sizeof(buf)) >= 0) {
+       while ((len = sock_gets(sock, buf, sizeof(buf))) > 0) {
                guint num, size;
 
                if (buf[0] == '.') break;
-               if (sscanf(buf, "%u %u", &num, &size) != 2)
+               if (sscanf(buf, "%u %u", &num, &size) != 2) {
+                       state->error_val = PS_PROTOCOL;
+                       state->inc_state = INC_ERROR;
                        return -1;
+               }
 
                if (num > 0 && num <= state->count)
                        state->msg[num].size = size;
@@ -397,10 +425,17 @@ gint pop3_getsize_list_recv(SockInfo *sock, gpointer data)
                        state->cur_total_bytes += size;
        }
 
+       if (len < 0) {
+               log_error(_("Socket error\n"));
+               state->error_val = PS_SOCKET;
+               state->inc_state = INC_ERROR;
+               return -1;
+       }
+
        if (pop3_sd_state(state, POP3_GETSIZE_LIST_RECV, &next_state))
                return next_state;
 
-       LOOKUP_NEXT_MSG();      
+       LOOKUP_NEXT_MSG();
        return POP3_RETR_SEND;
 }
  
@@ -491,10 +526,12 @@ gint pop3_retr_recv(SockInfo *sock, gpointer data)
                        return POP3_RETR_SEND;
                } else
                        return POP3_LOGOUT_SEND;
-       } else if (ok == PS_PROTOCOL)
+       } else if (ok == PS_PROTOCOL) {
                return POP3_LOGOUT_SEND;
-       else
+       } else {
+               state->inc_state = INC_ERROR;
                return -1;
+       }
 }
 
 gint pop3_delete_send(SockInfo *sock, gpointer data)
@@ -513,7 +550,6 @@ gint pop3_delete_recv(SockInfo *sock, gpointer data)
        gint ok;
 
        if ((ok = pop3_ok(sock, NULL)) == PS_SUCCESS) {
-
                state->msg[state->cur_msg].deleted = TRUE;
                
                if (pop3_sd_state(state, POP3_DELETE_RECV, &next_state))
@@ -525,10 +561,12 @@ gint pop3_delete_recv(SockInfo *sock, gpointer data)
                        return POP3_RETR_SEND;
                } else
                        return POP3_LOGOUT_SEND;
-       } else if (ok == PS_PROTOCOL)
+       } else if (ok == PS_PROTOCOL) {
                return POP3_LOGOUT_SEND;
-       else
+       } else {
+               state->inc_state = INC_ERROR;
                return -1;
+       }
 }
 
 gint pop3_logout_send(SockInfo *sock, gpointer data)
@@ -540,10 +578,12 @@ gint pop3_logout_send(SockInfo *sock, gpointer data)
 
 gint pop3_logout_recv(SockInfo *sock, gpointer data)
 {
-       if (pop3_ok(sock, NULL) == PS_SUCCESS)
-               return -1;
-       else
-               return -1;
+       Pop3State *state = (Pop3State *)data;
+
+       if (pop3_ok(sock, NULL) != PS_SUCCESS)
+               state->inc_state = INC_ERROR;
+
+       return -1;
 }
 
 static gint pop3_ok(SockInfo *sock, gchar *argbuf)

diff --git a/src/socket.c b/src/socket.c
index 86c95be08bff8ac11406c5c5efd84fbb123ea7b8..3f3457ffc96d3f2c78c32ee4087d1ddaf6d60c3d 100644 (file)
--- a/src/socket.c
+++ b/src/socket.c
@@ -37,6 +37,9 @@
 #include <errno.h>
 #include <signal.h>
 #include <setjmp.h>
+#if HAVE_SYS_SELECT_H
+#  include <sys/select.h>
+#endif
 
 #include "socket.h"
 #include "utils.h"
@@ -49,6 +52,7 @@
 #endif
 
 #define BUFFSIZE       8192
+#define IO_TIMEOUT     60
 
 static gint sock_connect_with_timeout  (gint                    sock,
                                         const struct sockaddr  *serv_addr,
@@ -178,6 +182,31 @@ gboolean sock_is_nonblocking_mode(SockInfo *sock)
        return is_nonblocking_mode(sock->sock);
 }
 
+static gint fd_check_io(gint fd, GIOCondition cond)
+{
+       struct timeval timeout;
+       fd_set fds;
+
+       timeout.tv_sec  = IO_TIMEOUT;
+       timeout.tv_usec = 0;
+
+       FD_ZERO(&fds);
+       FD_SET(fd, &fds);
+
+       if (cond == G_IO_IN) {
+               select(fd + 1, &fds, NULL, NULL, &timeout);
+       } else {
+               select(fd + 1, NULL, &fds, NULL, &timeout);
+       }
+
+       if (FD_ISSET(fd, &fds)) {
+               return 0;
+       } else {
+               g_warning("Socket IO timeout\n");
+               return -1;
+       }
+}
+
 static sigjmp_buf jmpenv;
 
 static void timeout_handler(gint sig)
@@ -237,7 +266,7 @@ static gint sock_connect_by_hostname(gint sock, const gchar *hostname,
 {
        struct hostent *hp;
        struct sockaddr_in ad;
-       guint timeout_secs = 30;
+       guint timeout_secs = IO_TIMEOUT;
 
        memset(&ad, 0, sizeof(ad));
        ad.sin_family = AF_INET;
@@ -286,7 +315,7 @@ static gint sock_connect_by_getaddrinfo(const gchar *hostname, gushort      port)
 {
        gint sock = -1, gai_error;
        struct addrinfo hints, *res, *ai;
-       guint timeout_secs = 30;
+       guint timeout_secs = IO_TIMEOUT;
        gchar port_str[6];
 
        memset(&hints, 0, sizeof(hints));
@@ -421,6 +450,9 @@ gint sock_read(SockInfo *sock, gchar *buf, gint len)
 
 gint fd_read(gint fd, gchar *buf, gint len)
 {
+       if (fd_check_io(fd, G_IO_IN) < 0)
+               return -1;
+
        return read(fd, buf, len);
 }
 
@@ -447,6 +479,8 @@ gint fd_write(gint fd, const gchar *buf, gint len)
        gint n, wrlen = 0;
 
        while (len) {
+               if (fd_check_io(fd, G_IO_OUT) < 0)
+                       return -1;
                signal(SIGPIPE, SIG_IGN);
                n = write(fd, buf, len);
                if (n <= 0) {
@@ -479,6 +513,14 @@ gint ssl_write(SSL *ssl, const gchar *buf, gint len)
 }
 #endif
 
+gint fd_recv(gint fd, gchar *buf, gint len, gint flags)
+{
+       if (fd_check_io(fd, G_IO_IN) < 0)
+               return -1;
+
+       return recv(fd, buf, len, flags);
+}
+
 gint fd_gets(gint fd, gchar *buf, gint len)
 {
        gchar *newline, *bp = buf;
@@ -487,11 +529,11 @@ gint fd_gets(gint fd, gchar *buf, gint len)
        if (--len < 1)
                return -1;
        do {
-               if ((n = recv(fd, bp, len, MSG_PEEK)) <= 0)
+               if ((n = fd_recv(fd, bp, len, MSG_PEEK)) <= 0)
                        return -1;
                if ((newline = memchr(bp, '\n', n)) != NULL)
                        n = newline - bp + 1;
-               if ((n = read(fd, bp, n)) < 0)
+               if ((n = fd_read(fd, bp, n)) < 0)
                        return -1;
                bp += n;
                len -= n;