ipcalc: enable by default for WIN32

6 files changed, 16 insertions, 15 deletions

diff --git a/configs/mingw32_defconfig b/configs/mingw32_defconfig
index d56e3e76a..ee36768b1 100644
--- a/configs/mingw32_defconfig
+++ b/configs/mingw32_defconfig
@@ -1,7 +1,7 @@
 #
 # Automatically generated make config: don't edit
 # Busybox version: 1.24.0.git
-# Fri Jul  3 14:08:24 2015
+# Mon Jul 13 12:28:05 2015
 #
 CONFIG_HAVE_DOT_CONFIG=y
 # CONFIG_PLATFORM_POSIX is not set
@@ -833,9 +833,9 @@ CONFIG_IFUPDOWN_IFSTATE_PATH=""
 # CONFIG_IPROUTE is not set
 # CONFIG_IPTUNNEL is not set
 # CONFIG_IPRULE is not set
-# CONFIG_IPCALC is not set
-# CONFIG_FEATURE_IPCALC_FANCY is not set
-# CONFIG_FEATURE_IPCALC_LONG_OPTIONS is not set
+CONFIG_IPCALC=y
+CONFIG_FEATURE_IPCALC_FANCY=y
+CONFIG_FEATURE_IPCALC_LONG_OPTIONS=y
 # CONFIG_NETSTAT is not set
 # CONFIG_FEATURE_NETSTAT_WIDE is not set
 # CONFIG_FEATURE_NETSTAT_PRG is not set
diff --git a/configs/mingw64_defconfig b/configs/mingw64_defconfig
index 633975996..29fa65a49 100644
--- a/configs/mingw64_defconfig
+++ b/configs/mingw64_defconfig
@@ -1,7 +1,7 @@
 #
 # Automatically generated make config: don't edit
 # Busybox version: 1.24.0.git
-# Fri Jul  3 13:59:27 2015
+# Mon Jul 13 12:28:05 2015
 #
 CONFIG_HAVE_DOT_CONFIG=y
 # CONFIG_PLATFORM_POSIX is not set
@@ -833,9 +833,9 @@ CONFIG_IFUPDOWN_IFSTATE_PATH=""
 # CONFIG_IPROUTE is not set
 # CONFIG_IPTUNNEL is not set
 # CONFIG_IPRULE is not set
-# CONFIG_IPCALC is not set
-# CONFIG_FEATURE_IPCALC_FANCY is not set
-# CONFIG_FEATURE_IPCALC_LONG_OPTIONS is not set
+CONFIG_IPCALC=y
+CONFIG_FEATURE_IPCALC_FANCY=y
+CONFIG_FEATURE_IPCALC_LONG_OPTIONS=y
 # CONFIG_NETSTAT is not set
 # CONFIG_FEATURE_NETSTAT_WIDE is not set
 # CONFIG_FEATURE_NETSTAT_PRG is not set
diff --git a/include/libbb.h b/include/libbb.h
index 2ac95835a..5cccbd15f 100644
--- a/include/libbb.h
+++ b/include/libbb.h
@@ -141,7 +141,7 @@
 # endif
 # include <winsock2.h>
 # include <ws2tcpip.h>
-# undef s_addr
+//# undef s_addr
 #else
 # include <arpa/inet.h>
 # if !defined(__socklen_t_defined) && !defined(_SOCKLEN_T_DECLARED)
@@ -571,7 +571,7 @@ char *strftime_YYYYMMDDHHMMSS(char *buf, unsigned len, time_t *tp) FAST_FUNC;
 int xsocket(int domain, int type, int protocol) FAST_FUNC;
 void xbind(int sockfd, struct sockaddr *my_addr, socklen_t addrlen) FAST_FUNC;
 void xlisten(int s, int backlog) FAST_FUNC;
-void xconnect(int s, const struct sockaddr *s_addr, socklen_t addrlen) FAST_FUNC;
+void xconnect(int s, const struct sockaddr *saddr, socklen_t addrlen) FAST_FUNC;
 ssize_t xsendto(int s, const void *buf, size_t len, const struct sockaddr *to,
                                 socklen_t tolen) FAST_FUNC;
 /* SO_REUSEADDR allows a server to rebind to an address that is already
diff --git a/libbb/xconnect.c b/libbb/xconnect.c
index 2a96e03dc..442482a8b 100644
--- a/libbb/xconnect.c
+++ b/libbb/xconnect.c
@@ -77,15 +77,15 @@ len_and_sockaddr* FAST_FUNC get_peer_lsa(int fd)
         return get_lsa(fd, getpeername);
 }
 
-void FAST_FUNC xconnect(int s, const struct sockaddr *s_addr, socklen_t addrlen)
+void FAST_FUNC xconnect(int s, const struct sockaddr *saddr, socklen_t addrlen)
 {
-        if (connect(s, s_addr, addrlen) < 0) {
+        if (connect(s, saddr, addrlen) < 0) {
                 if (ENABLE_FEATURE_CLEAN_UP)
                         close(s);
-                if (s_addr->sa_family == AF_INET)
+                if (saddr->sa_family == AF_INET)
                         bb_perror_msg_and_die("%s (%s)",
                                 "can't connect to remote host",
-                                inet_ntoa(((struct sockaddr_in *)s_addr)->sin_addr));
+                                inet_ntoa(((struct sockaddr_in *)saddr)->sin_addr));
                 bb_perror_msg_and_die("can't connect to remote host");
         }
 }
diff --git a/networking/ipcalc.c b/networking/ipcalc.c
index 3c8b8bfc9..f4bacd7dc 100644
--- a/networking/ipcalc.c
+++ b/networking/ipcalc.c
@@ -13,7 +13,8 @@
  */
 
 //usage:#define ipcalc_trivial_usage
-//usage:       "[OPTIONS] ADDRESS[[/]NETMASK] [NETMASK]"
+//usage:       "[OPTIONS] ADDRESS"
+//usage:       IF_FEATURE_IPCALC_FANCY("[/PREFIX]") " [NETMASK]"
 //usage:#define ipcalc_full_usage "\n\n"
 //usage:       "Calculate IP network settings from a IP address\n"
 //usage:        IF_FEATURE_IPCALC_LONG_OPTIONS(
diff --git a/win32/arpa/inet.h b/win32/arpa/inet.h
new file mode 100644
index 000000000..e69de29bb
--- /dev/null
+++ b/win32/arpa/inet.h