libarchive: open_zipped() does not need to check extensions for e.g. gzip

[oweals/busybox.git] / libbb / xconnect.c

diff --git a/libbb/xconnect.c b/libbb/xconnect.c
index 2de6de7c51830167da7e992237d57fb13caca3ee..1c8bb2b7309a7ad0c77a1107e54c78da5d633eaf 100644 (file)
--- a/libbb/xconnect.c
+++ b/libbb/xconnect.c
@@ -4,7 +4,7 @@
  *
  * Connect to host at port using address resolution from getaddrinfo
  *
- * Licensed under GPLv2, see file LICENSE in this tarball for details.
+ * Licensed under GPLv2, see file LICENSE in this source tree.
  */
 
 #include <sys/types.h>
@@ -134,16 +134,18 @@ int FAST_FUNC get_nport(const struct sockaddr *sa)
        return -1;
 }
 
-void FAST_FUNC set_nport(len_and_sockaddr *lsa, unsigned port)
+void FAST_FUNC set_nport(struct sockaddr *sa, unsigned port)
 {
 #if ENABLE_FEATURE_IPV6
-       if (lsa->u.sa.sa_family == AF_INET6) {
-               lsa->u.sin6.sin6_port = port;
+       if (sa->sa_family == AF_INET6) {
+               struct sockaddr_in6 *sin6 = (void*) sa;
+               sin6->sin6_port = port;
                return;
        }
 #endif
-       if (lsa->u.sa.sa_family == AF_INET) {
-               lsa->u.sin.sin_port = port;
+       if (sa->sa_family == AF_INET) {
+               struct sockaddr_in *sin = (void*) sa;
+               sin->sin_port = port;
                return;
        }
        /* What? UNIX socket? IPX?? :) */
@@ -255,7 +257,7 @@ IF_NOT_FEATURE_IPV6(sa_family_t af = AF_INET;)
 
        memset(&hint, 0 , sizeof(hint));
        hint.ai_family = af;
-       /* Needed. Or else we will get each address thrice (or more)
+       /* Need SOCK_STREAM, or else we get each address thrice (or more)
         * for each possible socket type (tcp,udp,raw...): */
        hint.ai_socktype = SOCK_STREAM;
        hint.ai_flags = ai_flags & ~DIE_ON_ERROR;
@@ -283,9 +285,10 @@ IF_NOT_FEATURE_IPV6(sa_family_t af = AF_INET;)
        memcpy(&r->u.sa, used_res->ai_addr, used_res->ai_addrlen);
 
  set_port:
-       set_nport(r, htons(port));
+       set_nport(&r->u.sa, htons(port));
  ret:
-       freeaddrinfo(result);
+       if (result)
+               freeaddrinfo(result);
        return r;
 }
 #if !ENABLE_FEATURE_IPV6
@@ -319,26 +322,28 @@ len_and_sockaddr* FAST_FUNC xdotted2sockaddr(const char *host, int port)
        return str2sockaddr(host, port, AF_UNSPEC, AI_NUMERICHOST | DIE_ON_ERROR);
 }
 
-#undef xsocket_type
-int FAST_FUNC xsocket_type(len_and_sockaddr **lsap, IF_FEATURE_IPV6(int family,) int sock_type)
+int FAST_FUNC xsocket_type(len_and_sockaddr **lsap, int family, int sock_type)
 {
-       IF_NOT_FEATURE_IPV6(enum { family = AF_INET };)
        len_and_sockaddr *lsa;
        int fd;
        int len;
 
-#if ENABLE_FEATURE_IPV6
        if (family == AF_UNSPEC) {
+#if ENABLE_FEATURE_IPV6
                fd = socket(AF_INET6, sock_type, 0);
                if (fd >= 0) {
                        family = AF_INET6;
                        goto done;
                }
+#endif
                family = AF_INET;
        }
-#endif
+
        fd = xsocket(family, sock_type, 0);
+
        len = sizeof(struct sockaddr_in);
+       if (family == AF_UNIX)
+               len = sizeof(struct sockaddr_un);
 #if ENABLE_FEATURE_IPV6
        if (family == AF_INET6) {
  done:
@@ -354,7 +359,7 @@ int FAST_FUNC xsocket_type(len_and_sockaddr **lsap, IF_FEATURE_IPV6(int family,)
 
 int FAST_FUNC xsocket_stream(len_and_sockaddr **lsap)
 {
-       return xsocket_type(lsap, IF_FEATURE_IPV6(AF_UNSPEC,) SOCK_STREAM);
+       return xsocket_type(lsap, AF_UNSPEC, SOCK_STREAM);
 }
 
 static int create_and_bind_or_die(const char *bindaddr, int port, int sock_type)
@@ -367,8 +372,8 @@ static int create_and_bind_or_die(const char *bindaddr, int port, int sock_type)
                /* user specified bind addr dictates family */
                fd = xsocket(lsa->u.sa.sa_family, sock_type, 0);
        } else {
-               fd = xsocket_type(&lsa, IF_FEATURE_IPV6(AF_UNSPEC,) sock_type);
-               set_nport(lsa, htons(port));
+               fd = xsocket_type(&lsa, AF_UNSPEC, sock_type);
+               set_nport(&lsa->u.sa, htons(port));
        }
        setsockopt_reuseaddr(fd);
        xbind(fd, &lsa->u.sa, lsa->len);