===================================================================
RCS file: /cvsrepo/anoncvs/cvs/src/usr.bin/mandoc/main.c,v
retrieving revision 1.149
retrieving revision 1.150
diff -c -r1.149 -r1.150
*** src/usr.bin/mandoc/main.c	2015/07/28 18:38:05	1.149
--- src/usr.bin/mandoc/main.c	2015/10/06 18:30:43	1.150
***************
*** 1,4 ****
! /*	$OpenBSD: main.c,v 1.149 2015/07/28 18:38:05 schwarze Exp $ */
  /*
   * Copyright (c) 2008-2012 Kristaps Dzonsons <kristaps@bsd.lv>
   * Copyright (c) 2010-2012, 2014, 2015 Ingo Schwarze <schwarze@openbsd.org>
--- 1,4 ----
! /*	$OpenBSD: main.c,v 1.150 2015/10/06 18:30:43 schwarze Exp $ */
  /*
   * Copyright (c) 2008-2012 Kristaps Dzonsons <kristaps@bsd.lv>
   * Copyright (c) 2010-2012, 2014, 2015 Ingo Schwarze <schwarze@openbsd.org>
***************
*** 139,145 ****
  
  	if (0 == strncmp(progname, "mandocdb", 8) ||
  	    0 == strncmp(progname, "makewhatis", 10))
! 		return(mandocdb(argc, argv));
  
  	/* Search options. */
  
--- 139,145 ----
  
  	if (0 == strncmp(progname, "mandocdb", 8) ||
  	    0 == strncmp(progname, "makewhatis", 10))
! 		return mandocdb(argc, argv);
  
  	/* Search options. */
  
***************
*** 200,212 ****
  				fprintf(stderr,
  				    "%s: -I %s: Bad argument\n",
  				    progname, optarg);
! 				return((int)MANDOCLEVEL_BADARG);
  			}
  			if (defos) {
  				fprintf(stderr,
  				    "%s: -I %s: Duplicate argument\n",
  				    progname, optarg);
! 				return((int)MANDOCLEVEL_BADARG);
  			}
  			defos = mandoc_strdup(optarg + 3);
  			break;
--- 200,212 ----
  				fprintf(stderr,
  				    "%s: -I %s: Bad argument\n",
  				    progname, optarg);
! 				return (int)MANDOCLEVEL_BADARG;
  			}
  			if (defos) {
  				fprintf(stderr,
  				    "%s: -I %s: Duplicate argument\n",
  				    progname, optarg);
! 				return (int)MANDOCLEVEL_BADARG;
  			}
  			defos = mandoc_strdup(optarg + 3);
  			break;
***************
*** 215,221 ****
  			break;
  		case 'K':
  			if ( ! koptions(&options, optarg))
! 				return((int)MANDOCLEVEL_BADARG);
  			break;
  		case 'k':
  			search.argmode = ARG_EXPR;
--- 215,221 ----
  			break;
  		case 'K':
  			if ( ! koptions(&options, optarg))
! 				return (int)MANDOCLEVEL_BADARG;
  			break;
  		case 'k':
  			search.argmode = ARG_EXPR;
***************
*** 244,254 ****
  			break;
  		case 'T':
  			if ( ! toptions(&curp, optarg))
! 				return((int)MANDOCLEVEL_BADARG);
  			break;
  		case 'W':
  			if ( ! woptions(&curp, optarg))
! 				return((int)MANDOCLEVEL_BADARG);
  			break;
  		case 'w':
  			outmode = OUTMODE_FLN;
--- 244,254 ----
  			break;
  		case 'T':
  			if ( ! toptions(&curp, optarg))
! 				return (int)MANDOCLEVEL_BADARG;
  			break;
  		case 'W':
  			if ( ! woptions(&curp, optarg))
! 				return (int)MANDOCLEVEL_BADARG;
  			break;
  		case 'w':
  			outmode = OUTMODE_FLN;
***************
*** 397,403 ****
  	/* mandoc(1) */
  
  	if (search.argmode == ARG_FILE && ! moptions(&options, auxpaths))
! 		return((int)MANDOCLEVEL_BADARG);
  
  	if (use_pager && ! isatty(STDOUT_FILENO))
  		use_pager = 0;
--- 397,403 ----
  	/* mandoc(1) */
  
  	if (search.argmode == ARG_FILE && ! moptions(&options, auxpaths))
! 		return (int)MANDOCLEVEL_BADARG;
  
  	if (use_pager && ! isatty(STDOUT_FILENO))
  		use_pager = 0;
***************
*** 481,487 ****
  		tag_unlink();
  	}
  
! 	return((int)rc);
  }
  
  static void
--- 481,487 ----
  		tag_unlink();
  	}
  
! 	return (int)rc;
  }
  
  static void
***************
*** 559,565 ****
  		file = mandoc_strdup(*globinfo.gl_pathv);
  	globfree(&globinfo);
  	if (globres != 0)
! 		return(0);
  
  found:
  	fprintf(stderr, "%s: outdated mandoc.db lacks %s(%s) entry, run "
--- 559,565 ----
  		file = mandoc_strdup(*globinfo.gl_pathv);
  	globfree(&globinfo);
  	if (globres != 0)
! 		return 0;
  
  found:
  	fprintf(stderr, "%s: outdated mandoc.db lacks %s(%s) entry, run "
***************
*** 573,579 ****
  	page->bits = NAME_FILE & NAME_MASK;
  	page->sec = (*sec >= '1' && *sec <= '9') ? *sec - '1' + 1 : 10;
  	page->form = form;
! 	return(1);
  }
  
  static void
--- 573,579 ----
  	page->bits = NAME_FILE & NAME_MASK;
  	page->sec = (*sec >= '1' && *sec <= '9') ? *sec - '1' + 1 : 10;
  	page->form = form;
! 	return 1;
  }
  
  static void
***************
*** 798,806 ****
  	} else {
  		fprintf(stderr, "%s: -K %s: Bad argument\n",
  		    progname, arg);
! 		return(0);
  	}
! 	return(1);
  }
  
  static int
--- 798,806 ----
  	} else {
  		fprintf(stderr, "%s: -K %s: Bad argument\n",
  		    progname, arg);
! 		return 0;
  	}
! 	return 1;
  }
  
  static int
***************
*** 818,827 ****
  	else {
  		fprintf(stderr, "%s: -m %s: Bad argument\n",
  		    progname, arg);
! 		return(0);
  	}
  
! 	return(1);
  }
  
  static int
--- 818,827 ----
  	else {
  		fprintf(stderr, "%s: -m %s: Bad argument\n",
  		    progname, arg);
! 		return 0;
  	}
  
! 	return 1;
  }
  
  static int
***************
*** 852,861 ****
  	else {
  		fprintf(stderr, "%s: -T %s: Bad argument\n",
  		    progname, arg);
! 		return(0);
  	}
  
! 	return(1);
  }
  
  static int
--- 852,861 ----
  	else {
  		fprintf(stderr, "%s: -T %s: Bad argument\n",
  		    progname, arg);
! 		return 0;
  	}
  
! 	return 1;
  }
  
  static int
***************
*** 895,905 ****
  		default:
  			fprintf(stderr, "%s: -W %s: Bad argument\n",
  			    progname, o);
! 			return(0);
  		}
  	}
  
! 	return(1);
  }
  
  static void
--- 895,905 ----
  		default:
  			fprintf(stderr, "%s: -W %s: Bad argument\n",
  			    progname, o);
! 			return 0;
  		}
  	}
  
! 	return 1;
  }
  
  static void
***************
*** 980,986 ****
  	case 0:
  		break;
  	default:
! 		return(pager_pid);
  	}
  
  	/* The child process becomes the pager. */
--- 980,986 ----
  	case 0:
  		break;
  	default:
! 		return pager_pid;
  	}
  
  	/* The child process becomes the pager. */