===================================================================
RCS file: /cvsrepo/anoncvs/cvs/src/usr.bin/mandoc/mdoc_validate.c,v
retrieving revision 1.133
retrieving revision 1.134
diff -c -r1.133 -r1.134
*** src/usr.bin/mandoc/mdoc_validate.c	2014/06/20 17:23:09	1.133
--- src/usr.bin/mandoc/mdoc_validate.c	2014/06/20 22:58:41	1.134
***************
*** 1,4 ****
! /*	$Id: mdoc_validate.c,v 1.133 2014/06/20 17:23:09 schwarze Exp $ */
  /*
   * Copyright (c) 2008-2012 Kristaps Dzonsons <kristaps@bsd.lv>
   * Copyright (c) 2010-2014 Ingo Schwarze <schwarze@openbsd.org>
--- 1,4 ----
! /*	$Id: mdoc_validate.c,v 1.134 2014/06/20 22:58:41 schwarze Exp $ */
  /*
   * Copyright (c) 2008-2012 Kristaps Dzonsons <kristaps@bsd.lv>
   * Copyright (c) 2010-2014 Ingo Schwarze <schwarze@openbsd.org>
***************
*** 1641,1655 ****
  static int
  post_root(POST_ARGS)
  {
! 	int		  erc;
  	struct mdoc_node *n;
  
! 	erc = 0;
  
  	/* Check that we have a finished prologue. */
  
  	if ( ! (MDOC_PBODY & mdoc->flags)) {
! 		erc++;
  		mdoc_nmsg(mdoc, mdoc->first, MANDOCERR_NODOCPROLOG);
  	}
  
--- 1641,1655 ----
  static int
  post_root(POST_ARGS)
  {
! 	int		  ret;
  	struct mdoc_node *n;
  
! 	ret = 1;
  
  	/* Check that we have a finished prologue. */
  
  	if ( ! (MDOC_PBODY & mdoc->flags)) {
! 		ret = 0;
  		mdoc_nmsg(mdoc, mdoc->first, MANDOCERR_NODOCPROLOG);
  	}
  
***************
*** 1658,1674 ****
  
  	/* Check that we begin with a proper `Sh'. */
  
! 	if (NULL == n->child) {
! 		erc++;
! 		mdoc_nmsg(mdoc, n, MANDOCERR_NODOCBODY);
! 	} else if (MDOC_BLOCK != n->child->type ||
! 	    MDOC_Sh != n->child->tok) {
! 		erc++;
! 		/* Can this be lifted?  See rxdebug.1 for example. */
! 		mdoc_nmsg(mdoc, n, MANDOCERR_NODOCBODY);
! 	}
  
! 	return(erc ? 0 : 1);
  }
  
  static int
--- 1658,1670 ----
  
  	/* Check that we begin with a proper `Sh'. */
  
! 	if (NULL == n->child)
! 		mdoc_nmsg(mdoc, n, MANDOCERR_DOC_EMPTY);
! 	else if (MDOC_BLOCK != n->child->type ||
! 	    MDOC_Sh != n->child->tok)
! 		mdoc_nmsg(mdoc, n->child, MANDOCERR_SEC_BEFORE);
  
! 	return(ret);
  }
  
  static int