From bacf06d3ebfa5dad1a29d9528c642aed061e9bd3 Mon Sep 17 00:00:00 2001
From: stskeeps <devnull@localhost>
Date: Sat, 26 May 2001 19:27:14 +0000
Subject: [PATCH] +- Merged McSkaf's hostname patch, debug patch, s_misc patch

---
 Changes       | 2 ++
 src/bsd.c     | 2 +-
 src/s_bsd.c   | 2 +-
 src/s_debug.c | 3 +++
 src/s_misc.c  | 4 ----
 src/s_serv.c  | 4 ++--
 6 files changed, 9 insertions(+), 8 deletions(-)

diff --git a/Changes b/Changes
index 9ded41bc9..9661a7cc6 100644
--- a/Changes
+++ b/Changes
@@ -523,3 +523,5 @@ seen. gmtime warning still there
 - Added McSkaf's rehash patch
 - Made the Status Dialog update its values every 5 seconds
 - Made slot arrangement be different.
+- Merged McSkaf's hostname patch, debug patch, s_misc patch
+   
\ No newline at end of file
diff --git a/src/bsd.c b/src/bsd.c
index 756c076ec..d46671ae4 100644
--- a/src/bsd.c
+++ b/src/bsd.c
@@ -160,7 +160,7 @@ int  deliver_it(aClient *cptr, char *str, int len)
 # ifndef _WIN32
 		Debug((DEBUG_ERROR, "write error (%s) to %s", sys_errlist[errno], cptr->name));
 # else
-		Debug((DEBUG_ERROR, "write error (%s) to %s", sys_errlist[WSAGetLastError()], cptr->name));
+		Debug((DEBUG_ERROR, "write error (%s) to %s", strerror[WSAGetLastError()], cptr->name));
 # endif
 
 	}
diff --git a/src/s_bsd.c b/src/s_bsd.c
index a0a17c6bc..f446c0051 100644
--- a/src/s_bsd.c
+++ b/src/s_bsd.c
@@ -2492,7 +2492,7 @@ int  connect_server(aconf, by, hp)
 #endif
 			hp = gethost_byname(s, &lin);
 			if (!hp)
-				return 0;
+				return -2;
 			bcopy(hp->h_addr, (char *)&aconf->ipnum,
 			    sizeof(struct IN_ADDR));
 		}
diff --git a/src/s_debug.c b/src/s_debug.c
index 88fadfd67..949e824c3 100644
--- a/src/s_debug.c
+++ b/src/s_debug.c
@@ -183,10 +183,12 @@ void debug(int level, char *form, ...)
 		(void)ircsprintf(debugbuf, form, p1, p2, p3, p4, p5, p6, p7, p8, p9, p10);
 #else
 		(void)ircvsprintf(debugbuf, form, vl);
+#if 0
 # ifdef _WIN32
 		strcat(debugbuf,"\r\n");
 # endif
 #endif
+#endif
 
 #if 0
 		if (local[2])
@@ -202,6 +204,7 @@ void debug(int level, char *form, ...)
 # ifndef _WIN32GUI
 		Cio_Puts(hCio, debugbuf, strlen(debugbuf));
 # else
+		strcat(debugbuf, "\r\n");
 		OutputDebugString(debugbuf);
 # endif
 #endif
diff --git a/src/s_misc.c b/src/s_misc.c
index db80b0419..79e178ba5 100644
--- a/src/s_misc.c
+++ b/src/s_misc.c
@@ -808,11 +808,7 @@ void tstats(cptr, name)
 
 	sp = &tmp;
 	bcopy((char *)ircstp, (char *)sp, sizeof(*sp));
-#ifndef _WIN32
-	for (i = 0; i < MAXCONNECTIONS; i++)
-#else
 	for (i = 0; i <= LastSlot; i++)
-#endif
 	{
 		if (!(acptr = local[i]))
 			continue;
diff --git a/src/s_serv.c b/src/s_serv.c
index 019368277..83ad0d28e 100644
--- a/src/s_serv.c
+++ b/src/s_serv.c
@@ -3325,8 +3325,8 @@ void load_tunefile(void)
 		      me.name, parv[0], aconf->servername);
 		  break;
 	  case -2:
-		  sendto_one(sptr, ":%s NOTICE %s :*** Host %s is unknown.",
-		      me.name, parv[0], aconf->servername);
+		  sendto_one(sptr, ":%s NOTICE %s :*** Hostname %s is unknown for server %s.",
+		      me.name, parv[0], aconf->hostname, aconf->servername);
 		  break;
 	  default:
 		  sendto_one(sptr,