===================================================================
RCS file: /cvsrepo/anoncvs/cvs/src/usr.bin/mandoc/man_validate.c,v
retrieving revision 1.118
retrieving revision 1.119
diff -c -r1.118 -r1.119
*** src/usr.bin/mandoc/man_validate.c	2019/03/13 18:29:26	1.118
--- src/usr.bin/mandoc/man_validate.c	2019/06/27 15:05:14	1.119
***************
*** 1,4 ****
! /*	$OpenBSD: man_validate.c,v 1.118 2019/03/13 18:29:26 schwarze Exp $ */
  /*
   * Copyright (c) 2008, 2009, 2010, 2011 Kristaps Dzonsons <kristaps@bsd.lv>
   * Copyright (c) 2010, 2012-2018 Ingo Schwarze <schwarze@openbsd.org>
--- 1,4 ----
! /*	$OpenBSD: man_validate.c,v 1.119 2019/06/27 15:05:14 schwarze Exp $ */
  /*
   * Copyright (c) 2008, 2009, 2010, 2011 Kristaps Dzonsons <kristaps@bsd.lv>
   * Copyright (c) 2010, 2012-2018 Ingo Schwarze <schwarze@openbsd.org>
***************
*** 183,190 ****
  
  		man->meta.title = mandoc_strdup("");
  		man->meta.msec = mandoc_strdup("");
! 		man->meta.date = man->quick ? mandoc_strdup("") :
! 		    mandoc_normdate(man, NULL, n->line, n->pos);
  	}
  
  	if (man->meta.os_e &&
--- 183,189 ----
  
  		man->meta.title = mandoc_strdup("");
  		man->meta.msec = mandoc_strdup("");
! 		man->meta.date = mandoc_normdate(man, NULL, n->line, n->pos);
  	}
  
  	if (man->meta.os_e &&
***************
*** 367,374 ****
  	/* ->TITLE<- MSEC DATE OS VOL */
  
  	n = n->child;
! 	if (n && n->string) {
! 		for (p = n->string; '\0' != *p; p++) {
  			/* Only warn about this once... */
  			if (isalpha((unsigned char)*p) &&
  			    ! isupper((unsigned char)*p)) {
--- 366,373 ----
  	/* ->TITLE<- MSEC DATE OS VOL */
  
  	n = n->child;
! 	if (n != NULL && n->string != NULL) {
! 		for (p = n->string; *p != '\0'; p++) {
  			/* Only warn about this once... */
  			if (isalpha((unsigned char)*p) &&
  			    ! isupper((unsigned char)*p)) {
***************
*** 386,394 ****
  
  	/* TITLE ->MSEC<- DATE OS VOL */
  
! 	if (n)
  		n = n->next;
! 	if (n && n->string)
  		man->meta.msec = mandoc_strdup(n->string);
  	else {
  		man->meta.msec = mandoc_strdup("");
--- 385,393 ----
  
  	/* TITLE ->MSEC<- DATE OS VOL */
  
! 	if (n != NULL)
  		n = n->next;
! 	if (n != NULL && n->string != NULL)
  		man->meta.msec = mandoc_strdup(n->string);
  	else {
  		man->meta.msec = mandoc_strdup("");
***************
*** 398,414 ****
  
  	/* TITLE MSEC ->DATE<- OS VOL */
  
! 	if (n)
  		n = n->next;
! 	if (n && n->string && '\0' != n->string[0]) {
! 		man->meta.date = man->quick ?
! 		    mandoc_strdup(n->string) :
! 		    mandoc_normdate(man, n->string, n->line, n->pos);
! 	} else {
  		man->meta.date = mandoc_strdup("");
  		mandoc_msg(MANDOCERR_DATE_MISSING,
! 		    n ? n->line : nb->line,
! 		    n ? n->pos : nb->pos, "TH");
  	}
  
  	/* TITLE MSEC DATE ->OS<- VOL */
--- 397,412 ----
  
  	/* TITLE MSEC ->DATE<- OS VOL */
  
! 	if (n != NULL)
  		n = n->next;
! 	if (n != NULL && n->string != NULL && n->string[0] != '\0')
! 		man->meta.date = mandoc_normdate(man,
! 		    n->string, n->line, n->pos);
! 	else {
  		man->meta.date = mandoc_strdup("");
  		mandoc_msg(MANDOCERR_DATE_MISSING,
! 		    n == NULL ? nb->line : n->line,
! 		    n == NULL ? nb->pos : n->pos, "TH");
  	}
  
  	/* TITLE MSEC DATE ->OS<- VOL */