projects
/
apps
/
madmutt.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
rework includes a bit
[apps/madmutt.git]
/
lib-sys
/
mutt_socket.c
diff --git
a/lib-sys/mutt_socket.c
b/lib-sys/mutt_socket.c
index
e3874d1
..
b085c17
100644
(file)
--- a/
lib-sys/mutt_socket.c
+++ b/
lib-sys/mutt_socket.c
@@
-13,6
+13,16
@@
# include "config.h"
#endif
# include "config.h"
#endif
+#include <unistd.h>
+#include <netinet/in.h>
+#include <netdb.h>
+#include <stdlib.h>
+#include <fcntl.h>
+#include <sys/types.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/mem.h>
#include <lib-lib/str.h>
#include <lib-lib/macros.h>
@@
-20,25
+30,15
@@
#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_socket.h"
#include "mutt_tunnel.h"
-#if defined(USE_SSL) || defined(USE_GNUTLS)
-# include "mutt_ssl.h"
-#endif
+#include "mutt_signal.h"
+#include "mutt_ssl.h"
#include "mutt_idna.h"
#include "mutt_idna.h"
-
-#include <unistd.h>
-#include <netinet/in.h>
-#include <netdb.h>
-#include <stdlib.h>
-#include <fcntl.h>
-#include <sys/types.h>
-#include <sys/socket.h>
-#include <string.h>
-#include <errno.h>
-
/* support for multiple socket connections */
static CONNECTION *Connections = NULL;
/* support for multiple socket connections */
static CONNECTION *Connections = NULL;
@@
-71,7
+71,7
@@
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;
{
int rc;
@@
-336,7
+336,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;
@@
-349,7
+349,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;