 @@ -1,14 +1,14 @@
-/*	$NetBSD: gencat.c,v 1.34 2011/12/29 22:58:27 wiz Exp $	*/
+/*	$NetBSD: gencat.c,v 1.35 2012/03/09 18:54:28 ginsbach Exp $	*/
 /*
  * Copyright (c) 1996 The NetBSD Foundation, Inc.
  * All rights reserved.
+ *
  * This code is derived from software contributed to The NetBSD Foundation
  * by J.T. Conklin.
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
 @@ -21,27 +21,27 @@
  * TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
  * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE FOUNDATION OR CONTRIBUTORS
  * BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
  * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
  * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
  * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
  * CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
  * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
  * POSSIBILITY OF SUCH DAMAGE.
  */
 #include <sys/cdefs.h>
 #if defined(__RCSID) && !defined(lint)
-__RCSID("$NetBSD: gencat.c,v 1.34 2011/12/29 22:58:27 wiz Exp $");
+__RCSID("$NetBSD: gencat.c,v 1.35 2012/03/09 18:54:28 ginsbach Exp $");
 #endif
 /***********************************************************
 Copyright 1990, by Alfalfa Software Incorporated, Cambridge, Massachusetts.
                         All Rights Reserved
 Permission to use, copy, modify, and distribute this software and its
 documentation for any purpose and without fee is hereby granted,
 provided that the above copyright notice appear in all copies and that
 both that copyright notice and this permission notice appear in
 supporting documentation, and that Alfalfa's name not be used in
 advertising or publicity pertaining to distribution of the software
 @@ -335,52 +335,69 @@ cskip(char *cptr)
 		warning(cptr, "wasn't expecting a space");
 		return (cptr);
+	}
 	while (*cptr && !isspace((unsigned char) *cptr))
 		++cptr;
 	return (cptr);
+}
 static char *
 getmsg(int fd, char *cptr, char quote)
+{
 	static char *msg = NULL;
 	static size_t msglen = 0;
-	size_t    clen, i;
+	size_t  clen, i;
 	int     in_quote = 0;
 	char   *tptr;
 	if (quote && *cptr == quote) {
 		++cptr;
 		in_quote = 1;
+	}
 	clen = strlen(cptr) + 1;
 	if (clen > msglen) {
 		if (msglen)
 			msg = xrealloc(msg, clen);
 		else
 			msg = xmalloc(clen);
 		msglen = clen;
+	}
 	tptr = msg;
 	while (*cptr) {
 		if (quote && *cptr == quote) {
 			char   *tmp;
 			tmp = cptr + 1;
-			if (*tmp && (!isspace((unsigned char) *tmp) || *wskip(tmp))) {
+			if (!in_quote) {
 				/* XXX hard error? */
 				warning(cptr, "unexpected quote character, ignoring");
 				*tptr++ = *cptr++;
 			} else {
-				*cptr = '\0';
+				cptr++;
 				/* don't use wskip() */
 				while (*cptr && isspace((unsigned char) *cptr))
 #ifndef _BACKWARDS_COMPAT
 					cptr++;
 #else
 					*tptr++ = *cptr++;
 #endif
 				/* XXX hard error? */
 				if (*cptr)
 					warning(tmp, "unexpected extra characters, ignoring");
 				in_quote = 0;
 #ifndef _BACKWARDS_COMPAT
 				break;
 #endif
+			}
 		} else {
 			if (*cptr == '\\') {
 				++cptr;
 				switch (*cptr) {
 				case '\0':
 					cptr = get_line(fd);
 					if (!cptr)
 						error("premature end of file");
 					msglen += strlen(cptr);
 					i = tptr - msg;
 					msg = xrealloc(msg, msglen);
 					tptr = msg + i;
 @@ -427,26 +444,30 @@ getmsg(int fd, char *cptr, char quote)
 							*tptr += (*cptr - '0');
 							++cptr;
+						}
 					} else {
 						warning(cptr, "unrecognized escape sequence");
+					}
 					break;
+				}
 			} else {
 				*tptr++ = *cptr++;
+			}
+		}
+	}
 	if (in_quote)
 		warning(cptr, "unterminated quoted message, ignoring");
 	*tptr = '\0';
 	return (msg);
+}
 static void
 MCParse(int fd)
+{
 	char   *cptr, *str;
 	int	msgid = 0;
 	int     setid = 0;
 	char    quote = 0;
 	/* XXX: init sethead? */