===================================================================
RCS file: /cvs/mandoc/main.c,v
retrieving revision 1.48
retrieving revision 1.51
diff -u -p -r1.48 -r1.51
--- mandoc/main.c	2009/10/26 08:18:16	1.48
+++ mandoc/main.c	2009/10/27 08:26:11	1.51
@@ -1,4 +1,4 @@
-/*	$Id: main.c,v 1.48 2009/10/26 08:18:16 kristaps Exp $ */
+/*	$Id: main.c,v 1.51 2009/10/27 08:26:11 kristaps Exp $ */
 /*
  * Copyright (c) 2008, 2009 Kristaps Dzonsons <kristaps@kth.se>
  *
@@ -35,6 +35,7 @@
 
 #ifdef __linux__
 extern	int		  getsubopt(char **, char * const *, char **);
+extern	size_t	  	  strlcat(char *, const char *, size_t);
 # ifndef __dead
 #  define __dead __attribute__((__noreturn__))
 # endif
@@ -88,7 +89,7 @@ struct	curparse {
 	out_man	  	  outman;
 	out_free	  outfree;
 	void		 *outdata;
-	char		 *outopts;
+	char		  outopts[BUFSIZ];
 };
 
 static	int		  foptions(int *, char *);
@@ -118,7 +119,7 @@ main(int argc, char *argv[])
 	struct buf	 ln, blk;
 	struct curparse	 curp;
 
-	bzero(&curp, sizeof(struct curparse));
+	memset(&curp, 0, sizeof(struct curparse));
 
 	curp.inttype = INTT_AUTO;
 	curp.outtype = OUTT_ASCII;
@@ -135,7 +136,8 @@ main(int argc, char *argv[])
 				return(EXIT_FAILURE);
 			break;
 		case ('O'):
-			curp.outopts = optarg;
+			(void)strlcat(curp.outopts, optarg, BUFSIZ);
+			(void)strlcat(curp.outopts, ",", BUFSIZ);
 			break;
 		case ('T'):
 			if ( ! toptions(&curp.outtype, optarg))
@@ -156,8 +158,8 @@ main(int argc, char *argv[])
 	argc -= optind;
 	argv += optind;
 
-	bzero(&ln, sizeof(struct buf));
-	bzero(&blk, sizeof(struct buf));
+	memset(&ln, 0, sizeof(struct buf));
+	memset(&blk, 0, sizeof(struct buf));
 
 	rc = 1;
 
@@ -569,7 +571,7 @@ static int
 foptions(int *fflags, char *arg)
 {
 	char		*v, *o;
-	const char	*toks[7];
+	const char	*toks[8];
 
 	toks[0] = "ign-scope";
 	toks[1] = "no-ign-escape";
@@ -577,7 +579,8 @@ foptions(int *fflags, char *arg)
 	toks[3] = "no-ign-chars";
 	toks[4] = "ign-errors";
 	toks[5] = "strict";
-	toks[6] = NULL;
+	toks[6] = "ign-escape";
+	toks[7] = NULL;
 
 	while (*arg) {
 		o = arg;
@@ -600,6 +603,9 @@ foptions(int *fflags, char *arg)
 		case (5):
 			*fflags |= NO_IGN_ESCAPE | 
 			 	   NO_IGN_MACRO | NO_IGN_CHARS;
+			break;
+		case (6):
+			*fflags &= ~NO_IGN_ESCAPE;
 			break;
 		default:
 			warnx("bad argument: -f%s", o);