===================================================================
RCS file: /cvsrepo/anoncvs/cvs/src/usr.bin/mandoc/man_validate.c,v
retrieving revision 1.86
retrieving revision 1.87
diff -c -r1.86 -r1.87
*** src/usr.bin/mandoc/man_validate.c	2015/04/02 22:06:17	1.86
--- src/usr.bin/mandoc/man_validate.c	2015/04/02 23:47:43	1.87
***************
*** 1,4 ****
! /*	$OpenBSD: man_validate.c,v 1.86 2015/04/02 22:06:17 schwarze Exp $ */
  /*
   * Copyright (c) 2008, 2009, 2010, 2011 Kristaps Dzonsons <kristaps@bsd.lv>
   * Copyright (c) 2010, 2012-2015 Ingo Schwarze <schwarze@openbsd.org>
--- 1,4 ----
! /*	$OpenBSD: man_validate.c,v 1.87 2015/04/02 23:47:43 schwarze Exp $ */
  /*
   * Copyright (c) 2008, 2009, 2010, 2011 Kristaps Dzonsons <kristaps@bsd.lv>
   * Copyright (c) 2010, 2012-2015 Ingo Schwarze <schwarze@openbsd.org>
***************
*** 303,318 ****
  
  	free(man->meta.title);
  	free(man->meta.vol);
! 	free(man->meta.source);
  	free(man->meta.msec);
  	free(man->meta.date);
  
  	man->meta.title = man->meta.vol = man->meta.date =
! 	    man->meta.msec = man->meta.source = NULL;
  
  	nb = n;
  
! 	/* ->TITLE<- MSEC DATE SOURCE VOL */
  
  	n = n->child;
  	if (n && n->string) {
--- 303,318 ----
  
  	free(man->meta.title);
  	free(man->meta.vol);
! 	free(man->meta.os);
  	free(man->meta.msec);
  	free(man->meta.date);
  
  	man->meta.title = man->meta.vol = man->meta.date =
! 	    man->meta.msec = man->meta.os = NULL;
  
  	nb = n;
  
! 	/* ->TITLE<- MSEC DATE OS VOL */
  
  	n = n->child;
  	if (n && n->string) {
***************
*** 334,340 ****
  		    nb->line, nb->pos, "TH");
  	}
  
! 	/* TITLE ->MSEC<- DATE SOURCE VOL */
  
  	if (n)
  		n = n->next;
--- 334,340 ----
  		    nb->line, nb->pos, "TH");
  	}
  
! 	/* TITLE ->MSEC<- DATE OS VOL */
  
  	if (n)
  		n = n->next;
***************
*** 346,352 ****
  		    nb->line, nb->pos, "TH %s", man->meta.title);
  	}
  
! 	/* TITLE MSEC ->DATE<- SOURCE VOL */
  
  	if (n)
  		n = n->next;
--- 346,352 ----
  		    nb->line, nb->pos, "TH %s", man->meta.title);
  	}
  
! 	/* TITLE MSEC ->DATE<- OS VOL */
  
  	if (n)
  		n = n->next;
***************
*** 362,375 ****
  		    n ? n->pos : nb->pos, "TH");
  	}
  
! 	/* TITLE MSEC DATE ->SOURCE<- VOL */
  
  	if (n && (n = n->next))
! 		man->meta.source = mandoc_strdup(n->string);
  	else if (man->defos != NULL)
! 		man->meta.source = mandoc_strdup(man->defos);
  
! 	/* TITLE MSEC DATE SOURCE ->VOL<- */
  	/* If missing, use the default VOL name for MSEC. */
  
  	if (n && (n = n->next))
--- 362,375 ----
  		    n ? n->pos : nb->pos, "TH");
  	}
  
! 	/* TITLE MSEC DATE ->OS<- VOL */
  
  	if (n && (n = n->next))
! 		man->meta.os = mandoc_strdup(n->string);
  	else if (man->defos != NULL)
! 		man->meta.os = mandoc_strdup(man->defos);
  
! 	/* TITLE MSEC DATE OS ->VOL<- */
  	/* If missing, use the default VOL name for MSEC. */
  
  	if (n && (n = n->next))
***************
*** 444,451 ****
  			p = bsd_versions[0];
  	}
  
! 	free(man->meta.source);
! 	man->meta.source = mandoc_strdup(p);
  }
  
  static void
--- 444,451 ----
  			p = bsd_versions[0];
  	}
  
! 	free(man->meta.os);
! 	man->meta.os = mandoc_strdup(p);
  }
  
  static void
***************
*** 483,490 ****
  			p = unix_versions[0];
  	}
  
! 	free(man->meta.source);
! 	man->meta.source = mandoc_strdup(p);
  }
  
  static void
--- 483,490 ----
  			p = unix_versions[0];
  	}
  
! 	free(man->meta.os);
! 	man->meta.os = mandoc_strdup(p);
  }
  
  static void