revision: --topo-order and --unpacked

[git.git] / imap-send.c

diff --git a/imap-send.c b/imap-send.c
index fddaac0..e33c78b 100644 (file)
--- a/imap-send.c
+++ b/imap-send.c
@@ -28,6 +28,7 @@
 #include <netinet/in.h>
 #include <netinet/tcp.h>
 #include <arpa/inet.h>
+#include <sys/socket.h>
 #include <netdb.h>
 
 typedef struct store_conf {
@@ -371,7 +372,7 @@ free_generic_messages( message_t *msgs )
 }
 
 static int
-vasprintf( char **strp, const char *fmt, va_list ap )
+git_vasprintf( char **strp, const char *fmt, va_list ap )
 {
        int len;
        char tmp[1024];
@@ -401,7 +402,7 @@ nfsnprintf( char *buf, int blen, const char *fmt, ... )
 static int
 nfvasprintf( char **str, const char *fmt, va_list va )
 {
-       int ret = vasprintf( str, fmt, va );
+       int ret = git_vasprintf( str, fmt, va );
        if (ret < 0)
                die( "Fatal: Out of memory\n");
        return ret;
@@ -945,7 +946,7 @@ imap_open_store( imap_server_conf_t *srvc )
                                _exit( 127 );
                        close( a[0] );
                        close( a[1] );
-                       execl( "/bin/sh", "sh", "-c", srvc->tunnel, 0 );
+                       execl( "/bin/sh", "sh", "-c", srvc->tunnel, NULL );
                        _exit( 127 );
                }