projects
/
apps
/
madmutt.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
old disabled code
[apps/madmutt.git]
/
lib-sys
/
mutt_socket.c
diff --git
a/lib-sys/mutt_socket.c
b/lib-sys/mutt_socket.c
index
e3cd00d
..
fa054ae
100644
(file)
--- a/
lib-sys/mutt_socket.c
+++ b/
lib-sys/mutt_socket.c
@@
-9,28
+9,18
@@
* please see the file GPL in the top level source directory.
*/
* please see the file GPL in the top level source directory.
*/
-#if HAVE_CONFIG_H
-# include "config.h"
-#endif
+#include <lib-lib/lib-lib.h>
-#include <unistd.h>
#include <netinet/in.h>
#include <netdb.h>
#include <netinet/in.h>
#include <netdb.h>
-#include <stdlib.h>
-#include <fcntl.h>
-#include <sys/types.h>
#include <sys/socket.h>
#include <sys/socket.h>
-#include <string.h>
-#include <errno.h>
-#include <lib-lib/mem.h>
-#include <lib-lib/str.h>
-#include <lib-lib/macros.h>
-#include <lib-lib/debug.h>
+#include <lib-ui/curses.h>
#include "mutt.h"
#include "globals.h"
#include "mutt.h"
#include "globals.h"
+#include "unix.h"
#include "mutt_socket.h"
#include "mutt_tunnel.h"
#include "mutt_signal.h"
#include "mutt_socket.h"
#include "mutt_tunnel.h"
#include "mutt_signal.h"
@@
-59,9
+49,7
@@
int mutt_socket_close (CONNECTION * conn)
{
int rc = -1;
{
int rc = -1;
- if (conn->fd < 0)
- debug_print (1, ("Attempt to close closed connection.\n"));
- else
+ if (conn->fd >= 0)
rc = conn->conn_close (conn);
conn->fd = -1;
rc = conn->conn_close (conn);
conn->fd = -1;
@@
-70,12
+58,11
@@
int mutt_socket_close (CONNECTION * conn)
return rc;
}
return rc;
}
-int mutt_socket_read (CONNECTION * conn, char *buf, size_t len)
+int mutt_socket_read (CONNECTION * conn, char *buf, s
s
ize_t len)
{
int rc;
if (conn->fd < 0) {
{
int rc;
if (conn->fd < 0) {
- debug_print (1, ("attempt to read from closed connection\n"));
return -1;
}
return -1;
}
@@
-91,30
+78,22
@@
int mutt_socket_read (CONNECTION * conn, char *buf, size_t len)
return rc;
}
return rc;
}
-int mutt_socket_write
_d (CONNECTION * conn, const char *buf, int dbg
)
+int mutt_socket_write
(CONNECTION * conn, const char *buf
)
{
int rc;
int len;
{
int rc;
int len;
- debug_print (dbg, ("> %s", buf));
-
if (conn->fd < 0) {
if (conn->fd < 0) {
- debug_print (1, ("attempt to write to closed connection\n"));
return -1;
}
len = m_strlen(buf);
if ((rc = conn->conn_write (conn, buf, len)) < 0) {
return -1;
}
len = m_strlen(buf);
if ((rc = conn->conn_write (conn, buf, len)) < 0) {
- debug_print (1, ("error writing, closing socket\n"));
mutt_socket_close (conn);
return -1;
}
mutt_socket_close (conn);
return -1;
}
- if (rc < len) {
- debug_print (1, ("ERROR: wrote %d of %d bytes!\n", rc, len));
- }
-
return rc;
}
return rc;
}
@@
-126,7
+105,6
@@
int mutt_socket_readchar (CONNECTION * conn, char *c)
conn->available =
conn->conn_read (conn, conn->inbuf, sizeof (conn->inbuf));
else {
conn->available =
conn->conn_read (conn, conn->inbuf, sizeof (conn->inbuf));
else {
- debug_print (1, ("attempt to read from closed connection.\n"));
return -1;
}
conn->bufpos = 0;
return -1;
}
conn->bufpos = 0;
@@
-144,8
+122,7
@@
int mutt_socket_readchar (CONNECTION * conn, char *c)
return 1;
}
return 1;
}
-int mutt_socket_readln_d (char *buf, ssize_t buflen, CONNECTION * conn,
- int dbg)
+int mutt_socket_readln(char *buf, ssize_t buflen, CONNECTION * conn)
{
char ch;
ssize_t i;
{
char ch;
ssize_t i;
@@
-167,8
+144,6
@@
int mutt_socket_readln_d (char *buf, ssize_t buflen, CONNECTION * conn,
else
buf[i] = '\0';
else
buf[i] = '\0';
- debug_print (dbg, ("< %s\n", buf));
-
/* number of bytes read, not m_strlen*/
return i + 1;
}
/* number of bytes read, not m_strlen*/
return i + 1;
}
@@
-267,9
+242,7
@@
static int socket_preconnect (void)
int save_errno;
if (m_strlen(Preconnect)) {
int save_errno;
if (m_strlen(Preconnect)) {
- debug_print (2, ("Executing preconnect: %s\n", Preconnect));
rc = mutt_system (Preconnect);
rc = mutt_system (Preconnect);
- debug_print (2, ("Preconnect result: %d\n", rc));
if (rc) {
save_errno = errno;
mutt_perror (_("Preconnect command failed."));
if (rc) {
save_errno = errno;
mutt_perror (_("Preconnect command failed."));
@@
-295,7
+268,6
@@
static int socket_connect (int fd, struct sockaddr *sa)
sa_size = sizeof (struct sockaddr_in6);
#endif
else {
sa_size = sizeof (struct sockaddr_in6);
#endif
else {
- debug_print (1, ("Unknown address family!\n"));
return -1;
}
return -1;
}
@@
-308,7
+280,6
@@
static int socket_connect (int fd, struct sockaddr *sa)
if (connect (fd, sa, sa_size) < 0) {
save_errno = errno;
if (connect (fd, sa, sa_size) < 0) {
save_errno = errno;
- debug_print (2, ("Connection failed. errno: %d...\n", errno));
SigInt = 0; /* reset in case we caught SIGINTR while in connect() */
}
SigInt = 0; /* reset in case we caught SIGINTR while in connect() */
}
@@
-335,7
+306,7
@@
int raw_socket_close (CONNECTION * conn)
return close (conn->fd);
}
return close (conn->fd);
}
-int raw_socket_read (CONNECTION * conn, char *buf, size_t len)
+int raw_socket_read (CONNECTION * conn, char *buf, s
s
ize_t len)
{
int rc;
{
int rc;
@@
-348,7
+319,7
@@
int raw_socket_read (CONNECTION * conn, char *buf, size_t len)
return rc;
}
return rc;
}
-int raw_socket_write (CONNECTION * conn, const char *buf, size_t count)
+int raw_socket_write (CONNECTION * conn, const char *buf, s
s
ize_t count)
{
int rc;
{
int rc;