--- previous/src/slirp/misc.c	2018/04/24 19:30:44	1.1
+++ previous/src/slirp/misc.c	2018/04/24 19:32:44	1.1.1.2
@@ -12,15 +12,118 @@
 u_int curtime, time_fasttimo, last_slowtimo, detach_time;
 u_int detach_wait = 600000;	/* 10 minutes */
 
+#ifdef __MINGW32__
+
+#define NS_INADDRSZ  4
+#define NS_INT16SZ   2
+
+static int inet_pton4(const char *src, char *dst)
+{
+    uint8_t tmp[NS_INADDRSZ], *tp;
+
+    int saw_digit = 0;
+    int octets = 0;
+    *(tp = tmp) = 0;
+
+    int ch;
+    while ((ch = *src++) != '\0')
+    {
+        if (ch >= '0' && ch <= '9')
+        {
+            uint32_t n = *tp * 10 + (ch - '0');
+
+            if (saw_digit && *tp == 0)
+                return 0;
+
+            if (n > 255)
+                return 0;
+
+            *tp = n;
+            if (!saw_digit)
+            {
+                if (++octets > 4)
+                    return 0;
+                saw_digit = 1;
+            }
+        }
+        else if (ch == '.' && saw_digit)
+        {
+            if (octets == 4)
+                return 0;
+            *++tp = 0;
+            saw_digit = 0;
+        }
+        else
+            return 0;
+    }
+    if (octets < 4)
+        return 0;
+
+    memcpy(dst, tmp, NS_INADDRSZ);
+
+    return 1;
+}
+
+static int inet_pton(int af, const char *src, char *dst)
+{
+    switch (af)
+    {
+    case AF_INET:
+        return inet_pton4(src, dst);
+    default:
+        return -1;
+    }
+}
+
+static size_t strlcpy(char * __restrict dst, const char * __restrict src, size_t siz) {
+	char *d = dst;
+	const char *s = src;
+	size_t n = siz;
+	if (n != 0) {
+		while (--n != 0) {
+			if ((*d++ = *s++) == '\0')
+				break;
+		}
+	}
+	if (n == 0) {
+		if (siz != 0)
+			*d = '\0';
+		while (*s++)
+			;
+	}
+	return(s - src - 1);
+}
+
+static char *inet_ntop4(const u_char *src, char *dst, socklen_t size) {
+	static const char fmt[128] = "%u.%u.%u.%u";
+	char tmp[sizeof "255.255.255.255"];
+	int l;
+
+    l = snprintf( tmp, fmt, src[0], src[1], src[2], src[3] );
+	if (l <= 0 || (socklen_t) l >= size) {
+		return (NULL);
+	}
+	strlcpy(dst, tmp, size);
+	return (dst);
+}
+
+char * inet_ntop(int af, const void *src, char *dst, socklen_t size)
+{
+	switch (af) {
+	case AF_INET:
+		return (inet_ntop4( (unsigned char*)src, (char*)dst, size));
+	default:
+        return 0 ;
+	}
+}
+#endif
+
 #if 0
 int x_port = -1;
 int x_display = 0;
 int x_screen = 0;
 
-int
-show_x(buff, inso)
-	char *buff;
-	struct socket *inso;
+int show_x(char *buff, struct socket *inso)
 {
 	if (x_port < 0) {
 		lprint("X Redir: X not being redirected.\r\n");
@@ -40,12 +143,7 @@ show_x(buff, inso)
 /*
  * XXX Allow more than one X redirection?
  */
-void
-redir_x(inaddr, start_port, display, screen)
-	u_int32_t inaddr;
-	int start_port;
-	int display;
-	int screen;
+void redir_x(u_int32_t inaddr, int start_port, int display, int screen)
 {
 	int i;
 	
@@ -69,34 +167,33 @@ redir_x(inaddr, start_port, display, scr
 #endif
 
 #ifndef HAVE_INET_ATON
-int
-inet_aton(cp, ia)
-	const char *cp;
-	struct in_addr *ia;
+int inet_aton(const char *cp, struct in_addr *ia)
 {
-	u_int32_t addr = inet_addr(cp);
-	if (addr == 0xffffffff)
-		return 0;
-	ia->s_addr = addr;
-	return 1;
+	return inet_pton(AF_INET, cp, &ia->s_addr);
 }
 #endif
 
 /*
  * Get our IP address and put it in our_addr
  */
-void
-getouraddr()
+void getouraddr()
 {
 	char buff[256];
-	struct hostent *he = NULL;
-	
-	if (gethostname(buff,256) == 0)
-            he = gethostbyname(buff);
-        if (he)
-            our_addr = *(struct in_addr *)he->h_addr;
-        if (our_addr.s_addr == 0)
-            our_addr.s_addr = loopback_addr.s_addr;
+
+	if (gethostname(buff, sizeof(buff)) == 0)
+	{
+		struct addrinfo hints = { 0 };
+		hints.ai_flags = AI_NUMERICHOST;
+		hints.ai_family = AF_INET;
+		struct addrinfo* ai;
+		if (getaddrinfo(buff, NULL, &hints, &ai) == 0)
+		{
+			our_addr = *(struct in_addr *)ai->ai_addr->sa_data;
+			freeaddrinfo(ai);
+		}
+	}
+    if (our_addr.s_addr == 0)
+        our_addr.s_addr = loopback_addr.s_addr;
 }
 
 struct quehead {
@@ -104,9 +201,7 @@ struct quehead {
 	struct quehead *qh_rlink;
 };
 
-void
-insque(a, b)
-	void *a, *b;
+void insque(void *a, void *b)
 {
 	register struct quehead *element = (struct quehead *) a;
 	register struct quehead *head = (struct quehead *) b;
@@ -117,9 +212,7 @@ insque(a, b)
 	= (struct quehead *)element;
 }
 
-void
-remque(a)
-     void *a;
+void remque(void *a)
 {
   register struct quehead *element = (struct quehead *) a;
   ((struct quehead *)(element->qh_link))->qh_rlink = element->qh_rlink;
@@ -131,13 +224,7 @@ remque(a)
 /* #endif */
 
 
-int
-add_exec(ex_ptr, do_pty, exec, addr, port)
-	struct ex_list **ex_ptr;
-	int do_pty;
-	char *exec;
-	int addr;
-	int port;
+int add_exec(struct ex_list **ex_ptr, int do_pty, char *exec, int addr, int port)
 {
 	struct ex_list *tmp_ptr;
 	
@@ -166,9 +253,7 @@ add_exec(ex_ptr, do_pty, exec, addr, por
 extern int sys_nerr;
 extern char *sys_errlist[];
 
-char *
-strerror(error)
-	int error;
+char *strerror(int error)
 {
 	if (error < sys_nerr)
 	   return sys_errlist[error];
@@ -181,11 +266,7 @@ strerror(error)
 
 #ifdef _WIN32
 
-int
-fork_exec(so, ex, do_pty)
-	struct socket *so;
-	char *ex;
-	int do_pty;
+int fork_exec(struct socket *so, char *ex, int do_pty)
 {
     /* not implemented */
     return 0;
@@ -193,9 +274,7 @@ fork_exec(so, ex, do_pty)
 
 #else
 
-int
-slirp_openpty(amaster, aslave)
-     int *amaster, *aslave;
+int slirp_openpty(int *amaster, int *aslave)
 {
 	register int master, slave;
 
@@ -269,11 +348,7 @@ slirp_openpty(amaster, aslave)
  * do_pty = 1   Fork/exec using slirp.telnetd
  * do_ptr = 2   Fork/exec using pty
  */
-int
-fork_exec(so, ex, do_pty)
-	struct socket *so;
-	char *ex;
-	int do_pty;
+int fork_exec(struct socket *so, char *ex, int do_pty)
 {
 	int s;
 	struct sockaddr_in addr;
@@ -428,10 +503,8 @@ fork_exec(so, ex, do_pty)
 }
 #endif
 
-#if !(defined HAVE_STRDUP || defined __GNUC__)
-char *
-strdup(str)
-	const char *str;
+#ifndef HAVE_STRDUP
+char *strdup(const char *str)
 {
 	char *bptr;
 	
@@ -443,9 +516,7 @@ strdup(str)
 #endif
 
 #if 0
-void
-snooze_hup(num)
-	int num;
+void snooze_hup(int num)
 {
 	int s, ret;
 #ifndef NO_UNIX_SOCKETS
@@ -485,8 +556,7 @@ snooze_hup(num)
 }
 	
 	
-void
-snooze()
+void snooze()
 {
 	sigset_t s;
 	int i;
@@ -510,9 +580,7 @@ snooze()
 	exit(255);
 }
 
-void
-relay(s)
-	int s;
+void relay(int s)
 {
 	char buf[8192];
 	int n;
@@ -572,25 +640,14 @@ relay(s)
 }
 #endif
 
-int (*lprint_print) _P((void *, const char *, va_list));
+int (*lprint_print)(void *, const char *, va_list);
 char *lprint_ptr, *lprint_ptr2, **lprint_arg;
 
-void
-#ifdef __STDC__
-lprint(const char *format, ...)
-#else
-lprint(va_alist) va_dcl
-#endif
+void lprint(const char *format, ...)
 {
 	va_list args;
         
-#ifdef __STDC__
-        va_start(args, format);
-#else
-        char *format;
-        va_start(args);
-        format = va_arg(args, char *);
-#endif
+    va_start(args, format);
 #if 0
 	/* If we're printing to an sbuf, make sure there's enough room */
 	/* XXX +100? */
@@ -639,9 +696,7 @@ lprint(va_alist) va_dcl
 	va_end(args);
 }
 
-void
-add_emu(buff)
-	char *buff;
+void add_emu(char *buff)
 {
 	u_int lport, fport;
 	u_int8_t tos = 0, emu = 0;
@@ -733,42 +788,24 @@ add_emu(buff)
  * Some BSD-derived systems have a sprintf which returns char *
  */
 
-int
-vsprintf_len(string, format, args)
-	char *string;
-	const char *format;
-	va_list args;
+int vsprintf_len(char *string, const char *format, va_list args)
 {
 	vsprintf(string, format, args);
 	return strlen(string);
 }
 
-int
-#ifdef __STDC__
-sprintf_len(char *string, const char *format, ...)
-#else
-sprintf_len(va_alist) va_dcl
-#endif
+int sprintf_len(char *string, const char *format, ...)
 {
 	va_list args;
-#ifdef __STDC__
 	va_start(args, format);
-#else
-	char *string;
-	char *format;
-	va_start(args);
-	string = va_arg(args, char *);
-	format = va_arg(args, char *);
-#endif
 	vsprintf(string, format, args);
+	va_end(args);
 	return strlen(string);
 }
 
 #endif
 
-void
-u_sleep(usec)
-	int usec;
+void u_sleep(int usec)
 {
 	struct timeval t;
 	fd_set fdset;
@@ -785,9 +822,7 @@ u_sleep(usec)
  * Set fd blocking and non-blocking
  */
 
-void
-fd_nonblock(fd)
-	int fd;
+void fd_nonblock(int fd)
 {
 #if defined USE_FIONBIO && defined FIONBIO
 	ioctlsockopt_t opt = 1;
@@ -802,9 +837,7 @@ fd_nonblock(fd)
 #endif
 }
 
-void
-fd_block(fd)
-	int fd;
+void fd_block(int fd)
 {
 #if defined USE_FIONBIO && defined FIONBIO
 	ioctlsockopt_t opt = 0;
@@ -824,13 +857,8 @@ fd_block(fd)
 /*
  * invoke RSH
  */
-int
-rsh_exec(so,ns, user, host, args)
-	struct socket *so;
-	struct socket *ns;
-	char *user;
-	char *host;
-	char *args;
+int rsh_exec(struct socket *so, struct socket *ns,
+	char *user, char *host, char *args)
 {
 	int fd[2];
 	int fd0[2];