From a4037c9e97c84c1e7243ab6de3a0f63e29f7eea0 Mon Sep 17 00:00:00 2001 From: Colin Leroy Date: Sun, 21 Jan 2007 14:15:40 +0000 Subject: [PATCH] 2007-01-21 [colin] 2.7.1cvs46 * src/common/socket.c * src/common/socket.h Same --- ChangeLog | 6 +++ PATCHSETS | 1 + configure.ac | 2 +- src/common/socket.c | 115 +++----------------------------------------- src/common/socket.h | 15 ------ 5 files changed, 15 insertions(+), 124 deletions(-) diff --git a/ChangeLog b/ChangeLog index 26cfe9a3a..11191dd15 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,9 @@ +2007-01-21 [colin] 2.7.1cvs46 + + * src/common/socket.c + * src/common/socket.h + Same + 2007-01-21 [colin] 2.7.1cvs45 * src/crash.c diff --git a/PATCHSETS b/PATCHSETS index 469cd1f2b..e233cfd91 100644 --- a/PATCHSETS +++ b/PATCHSETS @@ -2303,3 +2303,4 @@ ( cvs diff -u -r 1.3.2.6 -r 1.3.2.7 src/addrselect.c; cvs diff -u -r 1.1.14.5 -r 1.1.14.6 src/addrselect.h; cvs diff -u -r 1.65.2.53 -r 1.65.2.54 src/codeconv.c; cvs diff -u -r 1.15.2.17 -r 1.15.2.18 src/codeconv.h; cvs diff -u -r 1.382.2.354 -r 1.382.2.355 src/compose.c; cvs diff -u -r 1.50.2.30 -r 1.50.2.31 src/compose.h; cvs diff -u -r 1.1.4.5 -r 1.1.4.6 src/etpan/Makefile.am; cvs diff -u -r -1.1.4.5 -r -1.1.4.6 src/etpan/etpan-log.c; cvs diff -u -r -1.1.4.3 -r -1.1.4.4 src/etpan/etpan-log.h; cvs diff -u -r 1.2.2.15 -r 1.2.2.16 src/gtk/colorlabel.c; cvs diff -u -r 1.1.4.5 -r 1.1.4.6 src/gtk/colorlabel.h; cvs diff -u -r 1.9.2.14 -r 1.9.2.15 src/gtk/sslcertwindow.c; cvs diff -u -r 1.6.2.5 -r 1.6.2.6 src/gtk/sslcertwindow.h; ) > 2.7.1cvs43.patchset ( cvs diff -u -r 1.36.2.96 -r 1.36.2.97 src/common/utils.c; cvs diff -u -r 1.20.2.43 -r 1.20.2.44 src/common/utils.h; cvs diff -u -r 1.1.4.4 -r 1.1.4.5 src/etpan/etpan-thread-manager.c; cvs diff -u -r 1.1.4.3 -r 1.1.4.4 src/etpan/etpan-thread-manager.h; ) > 2.7.1cvs44.patchset ( cvs diff -u -r 1.23.2.20 -r 1.23.2.21 src/crash.c; cvs diff -u -r 1.5.2.17 -r 1.5.2.18 src/exporthtml.c; cvs diff -u -r 1.1.14.4 -r 1.1.14.5 src/exporthtml.h; cvs diff -u -r 1.1.4.15 -r 1.1.4.16 src/exportldif.c; cvs diff -u -r 1.1.4.4 -r 1.1.4.5 src/exportldif.h; cvs diff -u -r 1.213.2.132 -r 1.213.2.133 src/folder.c; cvs diff -u -r 1.87.2.36 -r 1.87.2.37 src/folder.h; cvs diff -u -r 1.2.2.18 -r 1.2.2.19 src/folder_item_prefs.c; cvs diff -u -r 1.2.2.7 -r 1.2.2.8 src/folder_item_prefs.h; cvs diff -u -r 1.207.2.145 -r 1.207.2.146 src/folderview.c; cvs diff -u -r 1.20.2.17 -r 1.20.2.18 src/folderview.h; cvs diff -u -r 1.1.2.7 -r 1.1.2.8 src/gedit-print.c; cvs diff -u -r 1.1.2.1 -r 1.1.2.2 src/gedit-print.h; cvs diff -u -r 1.115.2.129 -r 1.115.2.130 src/main.c; cvs diff -u -r 1.7.2.8 -r 1.7.2.9 src/main.h; cvs diff -u -r 1.13.2.25 -r 1.13.2.26 src/common/socket.c; cvs diff -u -r 1.13.2.10 -r 1.13.2.11 src/common/socket.h; cvs diff -u -r 1.9.2.49 -r 1.9.2.50 src/gtk/gtkaspell.c; cvs diff -u -r 1.5.2.10 -r 1.5.2.11 src/gtk/gtkaspell.h; cvs diff -u -r 1.1.2.59 -r 1.1.2.60 src/gtk/quicksearch.c; cvs diff -u -r 1.1.2.11 -r 1.1.2.12 src/gtk/quicksearch.h; ) > 2.7.1cvs45.patchset +( cvs diff -u -r 1.13.2.26 -r 1.13.2.27 src/common/socket.c; cvs diff -u -r 1.13.2.11 -r 1.13.2.12 src/common/socket.h; ) > 2.7.1cvs46.patchset diff --git a/configure.ac b/configure.ac index 3ff0cc3ca..e6a17f39c 100644 --- a/configure.ac +++ b/configure.ac @@ -11,7 +11,7 @@ MINOR_VERSION=7 MICRO_VERSION=1 INTERFACE_AGE=0 BINARY_AGE=0 -EXTRA_VERSION=45 +EXTRA_VERSION=46 EXTRA_RELEASE= EXTRA_GTK2_VERSION= diff --git a/src/common/socket.c b/src/common/socket.c index 2114b3730..32449cb07 100644 --- a/src/common/socket.c +++ b/src/common/socket.c @@ -1268,18 +1268,6 @@ static SockInfo *sockinfo_from_fd(const gchar *hostname, return sockinfo; } -gint sock_printf(SockInfo *sock, const gchar *format, ...) -{ - va_list args; - gchar buf[BUFFSIZE]; - - va_start(args, format); - g_vsnprintf(buf, sizeof(buf), format, args); - va_end(args); - - return sock_write_all(sock, buf, strlen(buf)); -} - static gint fd_read(gint fd, gchar *buf, gint len) { if (fd_check_io(fd, G_IO_IN) < 0) @@ -1291,7 +1279,7 @@ static gint fd_read(gint fd, gchar *buf, gint len) } #if USE_OPENSSL -gint ssl_read(SSL *ssl, gchar *buf, gint len) +static gint ssl_read(SSL *ssl, gchar *buf, gint len) { gint err, ret; @@ -1349,7 +1337,7 @@ gint fd_write(gint fd, const gchar *buf, gint len) } #if USE_OPENSSL -gint ssl_write(SSL *ssl, const gchar *buf, gint len) +static gint ssl_write(SSL *ssl, const gchar *buf, gint len) { gint ret; @@ -1414,7 +1402,7 @@ gint fd_write_all(gint fd, const gchar *buf, gint len) } #if USE_OPENSSL -gint ssl_write_all(SSL *ssl, const gchar *buf, gint len) +static gint ssl_write_all(SSL *ssl, const gchar *buf, gint len) { gint n, wrlen = 0; @@ -1505,7 +1493,9 @@ Single-byte send() and recv(). } #if USE_OPENSSL -gint ssl_gets(SSL *ssl, gchar *buf, gint len) +static gint ssl_peek (SSL *ssl, gchar *buf, gint len); + +static gint ssl_gets(SSL *ssl, gchar *buf, gint len) { gchar *newline, *bp = buf; gint n; @@ -1546,89 +1536,9 @@ gint sock_gets(SockInfo *sock, gchar *buf, gint len) return ret; } -static gint fd_getline(gint fd, gchar **str) -{ - gchar buf[BUFFSIZE]; - gint len; - gulong size = 1; - - while ((len = fd_gets(fd, buf, sizeof(buf))) > 0) { - size += len; - if (!*str) - *str = g_strdup(buf); - else { - *str = g_realloc(*str, size); - strcat(*str, buf); - } - if (buf[len - 1] == '\n' -#ifdef G_OS_WIN32 /* FIXME This does not seem to be correct. */ - || buf[len - 1] == '\r' -#endif - ) - break; - } - if (len == -1 && *str) - g_free(*str); - - return len; -} - -#if USE_OPENSSL -gint ssl_getline(SSL *ssl, gchar **str) -{ - gchar buf[BUFFSIZE]; - gint len; - gulong size = 1; - - while ((len = ssl_gets(ssl, buf, sizeof(buf))) > 0) { - size += len; - if (!*str) - *str = g_strdup(buf); - else { - *str = g_realloc(*str, size); - strcat(*str, buf); - } - if (buf[len - 1] == '\n') - break; - } - if (len == -1 && *str) - g_free(*str); - - return len; -} -#endif - -gchar *sock_getline(SockInfo *sock) -{ - gint ret; - gchar *str = NULL; - - g_return_val_if_fail(sock != NULL, NULL); - -#if USE_OPENSSL - if (sock->ssl) - ret = ssl_getline(sock->ssl, &str); - else -#endif - ret = fd_getline(sock->sock, &str); - - if (ret < 0) - sock->state = CONN_DISCONNECTED; - return str; -} - -gint sock_puts(SockInfo *sock, const gchar *buf) -{ - gint ret; - - if ((ret = sock_write_all(sock, buf, strlen(buf))) < 0) - return ret; - return sock_write_all(sock, "\r\n", 2); -} - /* peek at the socket data without actually reading it */ #if USE_OPENSSL -gint ssl_peek(SSL *ssl, gchar *buf, gint len) +static gint ssl_peek(SSL *ssl, gchar *buf, gint len) { gint err, ret; @@ -1660,17 +1570,6 @@ gint ssl_peek(SSL *ssl, gchar *buf, gint len) } #endif -gint sock_peek(SockInfo *sock, gchar *buf, gint len) -{ - g_return_val_if_fail(sock != NULL, -1); - -#if USE_OPENSSL - if (sock->ssl) - return ssl_peek(sock->ssl, buf, len); -#endif - return fd_recv(sock->sock, buf, len, MSG_PEEK); -} - gint sock_close(SockInfo *sock) { gint ret; diff --git a/src/common/socket.h b/src/common/socket.h index 3861a011f..668300cfb 100644 --- a/src/common/socket.h +++ b/src/common/socket.h @@ -91,15 +91,10 @@ gint sock_connect_async (const gchar *hostname, gushort port, gint sock_connect_async_cancel (gint id); /* Basic I/O functions */ -gint sock_printf (SockInfo *sock, const gchar *format, ...) - G_GNUC_PRINTF(2, 3); gint sock_read (SockInfo *sock, gchar *buf, gint len); gint sock_write (SockInfo *sock, const gchar *buf, gint len); gint sock_write_all (SockInfo *sock, const gchar *buf, gint len); gint sock_gets (SockInfo *sock, gchar *buf, gint len); -gchar *sock_getline (SockInfo *sock); -gint sock_puts (SockInfo *sock, const gchar *buf); -gint sock_peek (SockInfo *sock, gchar *buf, gint len); gint sock_close (SockInfo *sock); /* Functions to directly work on FD. They are needed for pipes */ @@ -112,14 +107,4 @@ gint fd_write_all (gint sock, const gchar *buf, gint len); gint fd_gets (gint sock, gchar *buf, gint len); gint fd_close (gint sock); -/* Functions for SSL */ -#if USE_OPENSSL -gint ssl_read (SSL *ssl, gchar *buf, gint len); -gint ssl_write (SSL *ssl, const gchar *buf, gint len); -gint ssl_write_all (SSL *ssl, const gchar *buf, gint len); -gint ssl_gets (SSL *ssl, gchar *buf, gint len); -gint ssl_getline (SSL *ssl, gchar **str); -gint ssl_peek (SSL *ssl, gchar *buf, gint len); -#endif - #endif /* __SOCKET_H__ */ -- 2.25.1