===================================================================
RCS file: /cvsrepo/anoncvs/cvs/src/usr.bin/mandoc/main.c,v
retrieving revision 1.102
retrieving revision 1.103
diff -c -r1.102 -r1.103
*** src/usr.bin/mandoc/main.c	2014/10/28 17:35:42	1.102
--- src/usr.bin/mandoc/main.c	2014/10/30 00:05:02	1.103
***************
*** 1,4 ****
! /*	$OpenBSD: main.c,v 1.102 2014/10/28 17:35:42 schwarze Exp $ */
  /*
   * Copyright (c) 2008-2012 Kristaps Dzonsons <kristaps@bsd.lv>
   * Copyright (c) 2010, 2011, 2012, 2014 Ingo Schwarze <schwarze@openbsd.org>
--- 1,4 ----
! /*	$OpenBSD: main.c,v 1.103 2014/10/30 00:05:02 schwarze Exp $ */
  /*
   * Copyright (c) 2008-2012 Kristaps Dzonsons <kristaps@bsd.lv>
   * Copyright (c) 2010, 2011, 2012, 2014 Ingo Schwarze <schwarze@openbsd.org>
***************
*** 75,80 ****
--- 75,81 ----
  	char		  outopts[BUFSIZ]; /* buf of output opts */
  };
  
+ static	int		  koptions(int *, char *);
  int			  mandocdb(int, char**);
  static	int		  moptions(int *, char *);
  static	void		  mmsg(enum mandocerr, enum mandoclevel,
***************
*** 145,158 ****
  	memset(&curp, 0, sizeof(struct curparse));
  	curp.outtype = OUTT_ASCII;
  	curp.wlevel  = MANDOCLEVEL_FATAL;
! 	options = MPARSE_SO;
  	defos = NULL;
  
  	use_pager = 1;
  	show_usage = 0;
  	outmode = OUTMODE_DEF;
  
! 	while (-1 != (c = getopt(argc, argv, "aC:cfhI:iklM:m:O:S:s:T:VW:w"))) {
  		switch (c) {
  		case 'a':
  			outmode = OUTMODE_ALL;
--- 146,160 ----
  	memset(&curp, 0, sizeof(struct curparse));
  	curp.outtype = OUTT_ASCII;
  	curp.wlevel  = MANDOCLEVEL_FATAL;
! 	options = MPARSE_SO | MPARSE_UTF8 | MPARSE_LATIN1;
  	defos = NULL;
  
  	use_pager = 1;
  	show_usage = 0;
  	outmode = OUTMODE_DEF;
  
! 	while (-1 != (c = getopt(argc, argv,
! 			"aC:cfhI:iK:klM:m:O:S:s:T:VW:w"))) {
  		switch (c) {
  		case 'a':
  			outmode = OUTMODE_ALL;
***************
*** 188,193 ****
--- 190,199 ----
  		case 'i':
  			outmode = OUTMODE_INT;
  			break;
+ 		case 'K':
+ 			if ( ! koptions(&options, optarg))
+ 				return((int)MANDOCLEVEL_BADARG);
+ 			break;
  		case 'k':
  			search.argmode = ARG_EXPR;
  			break;
***************
*** 581,586 ****
--- 587,612 ----
  	fprintf(stderr, "%s: %s: SYSERR: %s: %s",
  	    progname, file, syscall, strerror(errno));
  	return(MANDOCLEVEL_SYSERR);
+ }
+ 
+ static int
+ koptions(int *options, char *arg)
+ {
+ 
+ 	if ( ! strcmp(arg, "utf-8")) {
+ 		*options |=  MPARSE_UTF8;
+ 		*options &= ~MPARSE_LATIN1;
+ 	} else if ( ! strcmp(arg, "iso-8859-1")) {
+ 		*options |=  MPARSE_LATIN1;
+ 		*options &= ~MPARSE_UTF8;
+ 	} else if ( ! strcmp(arg, "us-ascii")) {
+ 		*options &= ~(MPARSE_UTF8 | MPARSE_LATIN1);
+ 	} else {
+ 		fprintf(stderr, "%s: -K%s: Bad argument\n",
+ 		    progname, arg);
+ 		return(0);
+ 	}
+ 	return(1);
  }
  
  static int