diff -uNr ircservices-5.0.17/Changes ircservices-5.0.18/Changes
--- ircservices-5.0.17/Changes	2003-04-20 16:32:03.000000000 +0900
+++ ircservices-5.0.18/Changes	2003-04-28 15:04:43.000000000 +0900
@@ -1,5 +1,18 @@
 Version 5.0
 -----------
+2003/04/28 .18	Fixed bug causing chunks of output to get lost in the middle
+		    of HTTP server responses.  Reported by several people.
+2003/04/28	Fixed cosmetic bug in error message for colliding nicknames.
+2003/04/28	Fixed bug preventing forbidden nicknames from being imported.
+2003/04/28	Added a workaround to convert-db for an apparent bug in
+		    Auspice Services causing CR characters to appear in
+		    mode locks.
+2003/04/23	Fixed bug causing NickServ LIST to not return matches to
+		    Services admins for a pattern matching real hostnames
+		    but not fake ones.  Reported by Craig Edwards
+		    <brain@brainbox.winbot.co.uk>
+2003/04/22	Fixed bug processing %hd and missing my_snprintf() in
+		    vsnprintf.c.
 2003/04/20 .17	Fixed crash when using UNLINK FORCE with non-linked nicks.
 		    Reported by Matthew Hodgson <arathorn@theonering.net>
 2003/04/15	The configure script now uses "conf-tmp" instead of "tmp"
バイナリー・ファイルircservices-5.0.17/coreとircservices-5.0.18/coreは違います
diff -uNr ircservices-5.0.17/docs/1.html ircservices-5.0.18/docs/1.html
--- ircservices-5.0.17/docs/1.html	2003-03-21 12:19:41.000000000 +0900
+++ ircservices-5.0.18/docs/1.html	2003-04-23 10:02:18.000000000 +0900
@@ -294,7 +294,7 @@
 <ul>
 <li><tt><a href="ftp://ftp.esper.net/ircservices/">ftp://ftp.esper.net/ircservices/</a></tt> (Western USA)
 <li><tt><a href="ftp://ftp.electrocity.com/pub/ircservices/">ftp://ftp.electrocity.com/pub/ircservices/</a></tt> (Eastern USA)
-<li><tt><a href="http://ftp.freenet.de/pub/ftp.esper.net/ircservices/">http://ftp.freenet.de/pub/ftp.esper.net/ircservices/</a></tt> (Germany, also accessible via <a href="ftp://ftp.freenet.de/pub/ftp.esper.net/ircservices/">FTP</a>) <!-- updated daily at 18:00 local time -->
+<li><tt><a href="http://ftp.freenet.de/pub/ftp.ircservices.za.net/pub/ircservices/">http://ftp.freenet.de/pub/ftp.ircservices.za.net/pub/ircservices/</a></tt> (Germany, also accessible via <a href="ftp://ftp.freenet.de/pub/ftp.ircservices.za.net/pub/ircservices/">FTP</a>) <!-- updated daily at 18:00 local time -->
 <li><tt><a href="ftp://ftp.ircd.com.br/ircservices/">ftp://ftp.ircd.com.br/ircservices/</a></tt> (Brazil)
 <li><tt><a href="http://www.irc.gr/ircservices/">http://www.irc.gr/ircservices/</a></tt> (Greece)
 <li><tt><a href="http://ircservices.swissirc.ch/">http://ircservices.swissirc.ch/</a></tt> (Switzerland)
diff -uNr ircservices-5.0.17/main.c ircservices-5.0.18/main.c
--- ircservices-5.0.17/main.c	2003-04-20 19:28:15.000000000 +0900
+++ ircservices-5.0.18/main.c	2003-04-28 20:00:27.000000000 +0900
@@ -80,6 +80,7 @@
 #ifdef CLEAN_COMPILE
     param_unused = param_unused;
 #endif
+    sock_set_blocking(s, 1);
     sock_setcb(s, SCB_READLINE, readfirstline_callback);
     send_server();
 }
diff -uNr ircservices-5.0.17/modules/httpd/main.c ircservices-5.0.18/modules/httpd/main.c
--- ircservices-5.0.17/modules/httpd/main.c	2003-04-20 19:28:16.000000000 +0900
+++ ircservices-5.0.18/modules/httpd/main.c	2003-04-28 20:00:27.000000000 +0900
@@ -116,6 +116,7 @@
 	    set_timeout(&clients[i]);
 	    sock_setcb(new, SCB_READLINE, do_readline);
 	    sock_setcb(new, SCB_DISCONNECT, do_disconnect);
+	    sock_set_blocking(new, 1);
 	    if (LogConnections)
 		module_log("Accepted connection from %s",
 			   clients[i].address);
@@ -205,13 +206,13 @@
 	    http_error(c, HTTP_E_BAD_REQUEST, NULL);
 	    return;
 	}
-	if (strcmp(method, "GET") == 0)
+	if (strcmp(method, "GET") == 0) {
 	    c->method = METHOD_GET;
-	else if (strcmp(method, "HEAD") == 0)
+	} else if (strcmp(method, "HEAD") == 0) {
 	    c->method = METHOD_HEAD;
-	else if (strcmp(method, "POST") == 0)
+	} else if (strcmp(method, "POST") == 0) {
 	    c->method = METHOD_POST;
-	else {
+	} else {
 	    module_log("%s: Unimplemented/unsupported method `%s' requested",
 		       c->address, method);
 	    http_error(c, HTTP_F_NOT_IMPLEMENTED, NULL);
diff -uNr ircservices-5.0.17/modules/misc/xml-import.c ircservices-5.0.18/modules/misc/xml-import.c
--- ircservices-5.0.17/modules/misc/xml-import.c	2003-04-20 19:28:16.000000000 +0900
+++ ircservices-5.0.18/modules/misc/xml-import.c	2003-04-28 20:00:28.000000000 +0900
@@ -1393,18 +1393,32 @@
 	error("<nick> tag missing from nick, ignoring");
 	my_free_nickinfo(ni);
 	return CONTINUE;
-    } else if (!ni->last_usermask) {
-	error("Nick %s has no <last_usermask> tag, ignoring", ni->nick);
-	my_free_nickinfo(ni);
-	return CONTINUE;
-    } else if (!ni->last_realname) {
-	error("Nick %s has no <last_realname> tag, ignoring", ni->nick);
-	my_free_nickinfo(ni);
-	return CONTINUE;
-    } else if (!ni->nickgroup && !(ni->status & NS_VERBOTEN)) {
-	error("Nick %s has no nick group, ignoring", ni->nick);
-	my_free_nickinfo(ni);
-	return CONTINUE;
+    } else if (!(ni->status & NS_VERBOTEN)) {
+	if (!ni->nickgroup) {
+	    error("Nick %s has no nick group, ignoring", ni->nick);
+	    my_free_nickinfo(ni);
+	    return CONTINUE;
+	}
+	if (!ni->last_usermask) {
+	    error("Warning: Nick %s has no <last_usermask> tag, setting to"
+		  " `@'", ni->nick);
+	    ni->last_usermask = strdup("@");
+	    if (!ni->last_usermask) {
+		error("Out of memory");
+		my_free_nickinfo(ni);
+		return CONTINUE;
+	    }
+	}
+	if (!ni->last_realname) {
+	    error("Warning: Nick %s has no <last_realname> tag, setting to"
+		  " `'", ni->nick);
+	    ni->last_realname = strdup("");
+	    if (!ni->last_realname) {
+		error("Out of memory");
+		my_free_nickinfo(ni);
+		return CONTINUE;
+	    }
+	}
     }
     if (!ni->time_registered) {
 	/* Don't warn for forbidden nicks--old versions didn't record the
@@ -2155,7 +2169,7 @@
 			 * break out of the loop afterward, so we can
 			 * reuse `i' here. */
 			ARRAY_FOREACH (i, ngi->nicks)
-			    fprintf(stderr, " %s", ngi->nicks[i]);
+			    printf(" %s", ngi->nicks[i]);
 			printf("\n");
 			LIST_INSERT(ngi, ngi_discarded);
 			ngi = NULL;
diff -uNr ircservices-5.0.17/modules/nickserv/main.c ircservices-5.0.18/modules/nickserv/main.c
--- ircservices-5.0.17/modules/nickserv/main.c	2003-04-20 19:28:16.000000000 +0900
+++ ircservices-5.0.18/modules/nickserv/main.c	2003-04-28 20:00:28.000000000 +0900
@@ -923,7 +923,12 @@
 	notice_lang(s_NickServ, u, NICK_LIST_HEADER, pattern);
 	for (ni = first_nickinfo(); ni; ni = next_nickinfo()) {
 	    int usermask_seen = 0;  /* does user get to see the usermask? */
+	    const char *mask;  /* which mask to show? (fake vs. real) */
 
+	    if (u == ni->user || is_services_admin(u))
+		mask = ni->last_realmask;
+	    else
+		mask = ni->last_usermask;
 	    ngi = get_nickgroupinfo(ni->nickgroup);
 	    if (!is_servadmin && ((ngi && (ngi->flags & NF_PRIVATE))
 				  || (ni->status & NS_VERBOTEN)))
@@ -943,12 +948,11 @@
 		snprintf(buf, sizeof(buf), "%-20s  [Forbidden]", ni->nick);
 	    } else {
 		usermask_seen = 1;
-		snprintf(buf, sizeof(buf), "%-20s  %s", ni->nick,
-			 ni->last_usermask);
+		snprintf(buf, sizeof(buf), "%-20s  %s", ni->nick, mask);
 	    }
 	    if ((!mask_has_at && match_wild_nocase(pattern, ni->nick))
 	     || (mask_has_at && usermask_seen
-		 && match_wild_nocase(pattern, ni->last_usermask))
+		 && match_wild_nocase(pattern, mask))
 	    ) {
 		if (++nnicks <= NSListMax) {
 		    char suspended_char = ' ';
diff -uNr ircservices-5.0.17/sockets.c ircservices-5.0.18/sockets.c
--- ircservices-5.0.17/sockets.c	2003-04-20 19:28:15.000000000 +0900
+++ ircservices-5.0.18/sockets.c	2003-04-28 20:00:27.000000000 +0900
@@ -57,6 +57,7 @@
 #define SF_DELETEME	0x0080	/* Delete socket when convenient */
 #define SF_DISCONN_CB	0x0100	/* Disconnect callback has been called (used
 				 *    to prevent duplicate calls) */
+#define SF_BLOCKING	0x0200	/* Writes are blocking */
 
 /*************************************************************************/
 
@@ -90,7 +91,7 @@
 static void relocate_buf(char *buf, char *ptr, char *end, char *top);
 static int reclaim_buffer_space_one(Socket *s);
 static int reclaim_buffer_space(void);
-static int buffered_write(Socket *s, char *buf, int len);
+static int buffered_write(Socket *s, const char *buf, int len);
 static int do_disconn(Socket *s, void *code);
 
 /*************************************************************************/
@@ -210,6 +211,41 @@
 
 /*************************************************************************/
 
+/* Set whether socket writes should block (blocking != 0) or not
+ * (blocking == 0).
+ */
+
+void sock_set_blocking(Socket *s, int blocking)
+{
+    if (!s) {
+	log("sockets: sock_set_blocking() with NULL socket!");
+	errno = EINVAL;
+	return;
+    }
+    if (blocking)
+	s->flags |= SF_BLOCKING;
+    else
+	s->flags &= ~SF_BLOCKING;
+}
+
+/*************************************************************************/
+
+/* Return whether socket writes are blocking (return value != 0) or not
+ * (return value == 0).
+ */
+
+int sock_get_blocking(Socket *s)
+{
+    if (!s) {
+	log("sockets: socket_get_blocking() with NULL socket!");
+	errno = EINVAL;
+	return -1;
+    }
+    return s->flags & SF_BLOCKING;
+}
+
+/*************************************************************************/
+
 /* Return amount of data in read buffer. */
 
 inline uint32 read_buffer_len(const Socket *s)
@@ -782,7 +818,7 @@
  * written, or -1 on error.
  */
 
-int32 swrite(Socket *s, char *buf, int32 len)
+int32 swrite(Socket *s, const char *buf, int32 len)
 {
     if (!s || !buf || len < 0) {
 	log("sockets: swrite() with %s!",
@@ -1248,7 +1284,7 @@
 
 /* Write data to a socket with buffering. */
 
-static int buffered_write(Socket *s, char *buf, int len)
+static int buffered_write(Socket *s, const char *buf, int len)
 {
     int nwritten, left = len;
     int errno_save = errno;
@@ -1259,6 +1295,7 @@
     }
 
     while (left > 0) {
+
 	/* Fill up to the current buffer size. */
 	if (write_buffer_len(s) < s->wbufsize-1) {
 	    if (s->wptr == s->wbuf) {
@@ -1301,26 +1338,37 @@
 	errno_save = errno;
 	if (write_buffer_len(s) >= s->wbufsize-1) {
 	    /* Write failed on full buffer; try to expand the buffer. */
-	    if (NetBufferSize && s->rbufsize + s->wbufsize >= NetBufferSize) {
-		if (!(s->flags & SF_WARNED)) {
-		    log("sockets: socket %d exceeded per-connection buffer"
-			" size limit (%d)", s->fd, NetBufferSize);
-		    s->flags |= SF_WARNED;
-		}
-		errno_save = EAGAIN;
-		break;
-	    }
-	    if (TotalNetBufferSize && total_bufsize >= TotalNetBufferSize) {
-		if (!(s->flags & SF_WARNED)) {
-		    log("sockets: total buffer size limit (%d) exceeded for"
-			" write on socket %d", TotalNetBufferSize, s->fd);
-		    s->flags |= SF_WARNED;
+	    int over = 0, over_total = 0;
+	    if (NetBufferSize && s->rbufsize + s->wbufsize >= NetBufferSize)
+		over = 1;
+	    if (TotalNetBufferSize && total_bufsize >= TotalNetBufferSize)
+		over_total = 1;
+	    if (over || over_total) {
+		if (s->flags & SF_BLOCKING) {
+		    fd_set fds;
+		    FD_ZERO(&fds);
+		    FD_SET(s->fd, &fds);
+		    if (select(s->fd+1, NULL, &fds, NULL, NULL) < 0) {
+			log("sockets: waiting on blocking socket %d: %s",
+			    s->fd, strerror(errno));
+			break;
+		    }
+		    continue;  /* don't expand the buffer, since it's at max */
+		} else {
+		    if (!(s->flags & SF_WARNED)) {
+			log("sockets: socket %d exceeded %s buffer size"
+			    " limit (%d)", s->fd,
+			    over ? "per-connection" : "total",
+			    over ? NetBufferSize : TotalNetBufferSize);
+			s->flags |= SF_WARNED;
+		    }
+		    errno_save = EAGAIN;
+		    break;
 		}
-		errno_save = EAGAIN;
-		break;
 	    }
 	    resize_wbuf(s, s->wbufsize + NET_MIN_BUFSIZE);
 	}
+
     } /* while (left > 0) */
 
     /* If data is left in the write buffer, tell check_sockets() to try
diff -uNr ircservices-5.0.17/sockets.h ircservices-5.0.18/sockets.h
--- ircservices-5.0.17/sockets.h	2003-04-20 19:28:15.000000000 +0900
+++ ircservices-5.0.18/sockets.h	2003-04-28 20:00:27.000000000 +0900
@@ -19,10 +19,16 @@
  * Sockets are created using sock_new() and freed using sock_free();
  * callbacks are registered using sock_setcb(SCB_*,function).  The
  * check_sockets() function does the actual checking for socket activity,
- * and should be called by the main loop.
+ * and should be called by the program's main loop.
  *
- * Sockets at present only support text input/output.  Binary support, i.e.
- * read()/write() equivalents, will be added at a later date.
+ * By default, sockets are non-blocking; if a socket is not ready for
+ * writing and no more buffer space is available, write attempts will stop
+ * at that point, setting errno to EAGAIN.  sock_set_blocking() allows
+ * sockets to be set to blocking mode, which causes write attempts to wait
+ * until either buffer space becomes available or a hard error (such as the
+ * connection being broken) occurs.  sock_get_blocking() returns whether
+ * the socket is set to blocking mode (nonzero return value, but not -1) or
+ * not (zero).
  *
  * When a callback function is called, it is passed two parameters: a
  * pointer to the socket structure (Socket *) for the socket on which the
@@ -105,6 +111,8 @@
 extern void sock_setcb(Socket *s, int which, SocketCallback func);
 extern int sock_isconn(const Socket *s);
 extern int sock_remote(const Socket *s, struct sockaddr *sa, int *lenptr);
+extern void sock_set_blocking(Socket *s, int blocking);
+extern int sock_get_blocking(Socket *s);
 extern uint32 read_buffer_len(const Socket *s);
 extern uint32 write_buffer_len(const Socket *s);
 extern void sock_rwstat(const Socket *s, uint32 *readkb_ret,
@@ -121,7 +129,7 @@
 extern int open_listener(Socket *s, const char *host, int port, int backlog);
 extern int close_listener(Socket *s);
 extern int32 sread(Socket *s, char *buf, int32 len);
-extern int32 swrite(Socket *s, char *buf, int32 len);
+extern int32 swrite(Socket *s, const char *buf, int32 len);
 extern int sgetc(Socket *s);
 extern char *sgets(char *buf, int32 len, Socket *s);
 extern char *sgets2(char *buf, int32 len, Socket *s);
diff -uNr ircservices-5.0.17/tools/convert-sirv.c ircservices-5.0.18/tools/convert-sirv.c
--- ircservices-5.0.17/tools/convert-sirv.c	2003-04-20 19:28:15.000000000 +0900
+++ ircservices-5.0.18/tools/convert-sirv.c	2003-04-28 20:00:27.000000000 +0900
@@ -427,6 +427,22 @@
 	    if (type == TYPE_AUSPICE) {
 		SAFE(read_buffer(mlock_on_auspice, f));
 		SAFE(read_buffer(mlock_off_auspice, f));
+		/* An apparent bug in (at least) Auspice 2.7 causes CRs to
+		 * sometimes appear in mode locks. */
+		s = mlock_on_auspice;
+		while (*s) {
+		    if (*s == 13)
+			memmove(s, s+1, strlen(s+1)+1);
+		    else
+			s++;
+		}
+		s = mlock_off_auspice;
+		while (*s) {
+		    if (*s == 13)
+			memmove(s, s+1, strlen(s+1)+1);
+		    else
+			s++;
+		}
 	    } else {
 		SAFE(read_variable(mlock_on_sirv, f));
 		SAFE(read_variable(mlock_off_sirv, f));
diff -uNr ircservices-5.0.17/version.sh ircservices-5.0.18/version.sh
--- ircservices-5.0.17/version.sh	2003-04-20 16:33:46.000000000 +0900
+++ ircservices-5.0.18/version.sh	2003-04-28 15:04:52.000000000 +0900
@@ -3,7 +3,7 @@
 # Build the version.c file which contains all the version related info and
 # needs to be updated on a per-build basis.
 
-VERSION=5.0.17
+VERSION=5.0.18
 
 # Increment Services build number
 if [ -f version.c ] ; then
diff -uNr ircservices-5.0.17/vsnprintf.c ircservices-5.0.18/vsnprintf.c
--- ircservices-5.0.17/vsnprintf.c	2003-04-20 19:28:15.000000000 +0900
+++ ircservices-5.0.18/vsnprintf.c	2003-04-28 20:00:27.000000000 +0900
@@ -15,6 +15,7 @@
 		(const char *buf, size_t len, void *arg1, void *arg2);
 
 int my_vsnprintf(char *string, size_t size, const char *format, va_list args);
+int my_snprintf(char *string, size_t size, const char *format, ...);
 
 /*************************************************************************/
 
@@ -209,7 +210,7 @@
 		case 'x':
 		case 'X':
 		    if (argsize == 1)
-			intval = va_arg(args, short);
+			intval = va_arg(args, int);
 		    else if (argsize == 2)
 			intval = va_arg(args, long);
 		    else
@@ -523,4 +524,15 @@
     return ret;
 }
 
+int my_snprintf(char *string, size_t size, const char *format, ...)
+{
+    va_list args;
+    int ret;
+
+    va_start(args, format);
+    ret = my_vsnprintf(string, size, format, args);
+    va_end(args);
+    return ret;
+}
+
 /*************************************************************************/