===================================================================
RCS file: /cvsrepo/anoncvs/cvs/src/usr.bin/mandoc/term_tab.c,v
retrieving revision 1.4
retrieving revision 1.5
diff -c -r1.4 -r1.5
*** src/usr.bin/mandoc/term_tab.c	2017/06/17 14:55:02	1.4
--- src/usr.bin/mandoc/term_tab.c	2021/10/04 18:56:24	1.5
***************
*** 1,6 ****
! /*	$OpenBSD: term_tab.c,v 1.4 2017/06/17 14:55:02 schwarze Exp $ */
  /*
!  * Copyright (c) 2017 Ingo Schwarze <schwarze@openbsd.org>
   *
   * Permission to use, copy, modify, and distribute this software for any
   * purpose with or without fee is hereby granted, provided that the above
--- 1,6 ----
! /* $OpenBSD: term_tab.c,v 1.5 2021/10/04 18:56:24 schwarze Exp $ */
  /*
!  * Copyright (c) 2017, 2021 Ingo Schwarze <schwarze@openbsd.org>
   *
   * Permission to use, copy, modify, and distribute this software for any
   * purpose with or without fee is hereby granted, provided that the above
***************
*** 17,22 ****
--- 17,24 ----
  #include <sys/types.h>
  
  #include <stddef.h>
+ #include <stdlib.h>
+ #include <string.h>
  
  #include "mandoc_aux.h"
  #include "out.h"
***************
*** 31,36 ****
--- 33,39 ----
  static struct {
  	struct tablist	 a;	/* All tab positions for lookup. */
  	struct tablist	 p;	/* Periodic tab positions to add. */
+ 	struct tablist	*r;	/* Tablist currently being recorded. */
  	size_t		 d;	/* Default tab width in units of n. */
  } tabs;
  
***************
*** 38,45 ****
  void
  term_tab_set(const struct termp *p, const char *arg)
  {
- 	static int	 recording_period;
- 
  	struct roffsu	 su;
  	struct tablist	*tl;
  	size_t		 pos;
--- 41,46 ----
***************
*** 49,55 ****
  
  	if (arg == NULL) {
  		tabs.a.n = tabs.p.n = 0;
! 		recording_period = 0;
  		if (tabs.d == 0) {
  			a2roffsu(".8i", &su, SCALE_IN);
  			tabs.d = term_hen(p, &su);
--- 50,56 ----
  
  	if (arg == NULL) {
  		tabs.a.n = tabs.p.n = 0;
! 		tabs.r = &tabs.a;
  		if (tabs.d == 0) {
  			a2roffsu(".8i", &su, SCALE_IN);
  			tabs.d = term_hen(p, &su);
***************
*** 57,63 ****
  		return;
  	}
  	if (arg[0] == 'T' && arg[1] == '\0') {
! 		recording_period = 1;
  		return;
  	}
  
--- 58,64 ----
  		return;
  	}
  	if (arg[0] == 'T' && arg[1] == '\0') {
! 		tabs.r = &tabs.p;
  		return;
  	}
  
***************
*** 73,79 ****
  
  	/* Select the list, and extend it if it is full. */
  
! 	tl = recording_period ? &tabs.p : &tabs.a;
  	if (tl->n >= tl->s) {
  		tl->s += 8;
  		tl->t = mandoc_reallocarray(tl->t, tl->s, sizeof(*tl->t));
--- 74,80 ----
  
  	/* Select the list, and extend it if it is full. */
  
! 	tl = tabs.r;
  	if (tl->n >= tl->s) {
  		tl->s += 8;
  		tl->t = mandoc_reallocarray(tl->t, tl->s, sizeof(*tl->t));
***************
*** 125,128 ****
--- 126,138 ----
  		if (prev < tabs.a.t[i])
  			return tabs.a.t[i];
  	}
+ }
+ 
+ void
+ term_tab_free(void)
+ {
+ 	free(tabs.a.t);
+ 	free(tabs.p.t);
+ 	memset(&tabs, 0, sizeof(tabs));
+ 	tabs.r = &tabs.a;
  }