===================================================================
RCS file: /cvsrepo/anoncvs/cvs/src/usr.bin/mandoc/main.c,v
retrieving revision 1.252
retrieving revision 1.253
diff -c -r1.252 -r1.253
*** src/usr.bin/mandoc/main.c	2020/06/11 16:12:14	1.252
--- src/usr.bin/mandoc/main.c	2020/06/15 17:25:03	1.253
***************
*** 1,4 ****
! /* $OpenBSD: main.c,v 1.252 2020/06/11 16:12:14 otto Exp $ */
  /*
   * Copyright (c) 2010-2012, 2014-2020 Ingo Schwarze <schwarze@openbsd.org>
   * Copyright (c) 2008-2012 Kristaps Dzonsons <kristaps@bsd.lv>
--- 1,4 ----
! /* $OpenBSD: main.c,v 1.253 2020/06/15 17:25:03 schwarze Exp $ */
  /*
   * Copyright (c) 2010-2012, 2014-2020 Ingo Schwarze <schwarze@openbsd.org>
   * Copyright (c) 2008-2012 Kristaps Dzonsons <kristaps@bsd.lv>
***************
*** 107,114 ****
  static	void		  passthrough(int, int);
  static	void		  process_onefile(struct mparse *, struct manpage *,
  				int, struct outstate *, struct manconf *);
! static	void		  run_pager(struct tag_files *, char *);
! static	pid_t		  spawn_pager(struct tag_files *, char *);
  static	void		  usage(enum argmode) __attribute__((__noreturn__));
  static	int		  woptions(char *, enum mandoc_os *, int *);
  
--- 107,114 ----
  static	void		  passthrough(int, int);
  static	void		  process_onefile(struct mparse *, struct manpage *,
  				int, struct outstate *, struct manconf *);
! static	void		  run_pager(struct outstate *, char *);
! static	pid_t		  spawn_pager(struct outstate *, char *);
  static	void		  usage(enum argmode) __attribute__((__noreturn__));
  static	int		  woptions(char *, enum mandoc_os *, int *);
  
***************
*** 621,627 ****
  
  	if (outst.tag_files != NULL) {
  		if (term_tag_close() != -1)
! 			run_pager(outst.tag_files, conf.output.tag);
  		term_tag_unlink();
  	} else if (outst.had_output && outst.outtype != OUTT_LINT)
  		mandoc_msg_summary();
--- 621,627 ----
  
  	if (outst.tag_files != NULL) {
  		if (term_tag_close() != -1)
! 			run_pager(&outst, conf.output.tag);
  		term_tag_unlink();
  	} else if (outst.had_output && outst.outtype != OUTT_LINT)
  		mandoc_msg_summary();
***************
*** 1122,1136 ****
   * then fork the pager and wait for the user to close it.
   */
  static void
! run_pager(struct tag_files *tag_files, char *tag_target)
  {
  	int	 signum, status;
  	pid_t	 man_pgid, tc_pgid;
  	pid_t	 pager_pid, wait_pid;
  
  	man_pgid = getpgid(0);
! 	tag_files->tcpgid = man_pgid == getpid() ? getpgid(getppid()) :
! 	    man_pgid;
  	pager_pid = 0;
  	signum = SIGSTOP;
  
--- 1122,1136 ----
   * then fork the pager and wait for the user to close it.
   */
  static void
! run_pager(struct outstate *outst, char *tag_target)
  {
  	int	 signum, status;
  	pid_t	 man_pgid, tc_pgid;
  	pid_t	 pager_pid, wait_pid;
  
  	man_pgid = getpgid(0);
! 	outst->tag_files->tcpgid =
! 	    man_pgid == getpid() ? getpgid(getppid()) : man_pgid;
  	pager_pid = 0;
  	signum = SIGSTOP;
  
***************
*** 1144,1150 ****
  				if (signum == SIGTTIN)
  					continue;
  			} else
! 				tag_files->tcpgid = tc_pgid;
  			kill(0, signum);
  			continue;
  		}
--- 1144,1150 ----
  				if (signum == SIGTTIN)
  					continue;
  			} else
! 				outst->tag_files->tcpgid = tc_pgid;
  			kill(0, signum);
  			continue;
  		}
***************
*** 1155,1161 ****
  			(void)tcsetpgrp(STDOUT_FILENO, pager_pid);
  			kill(pager_pid, SIGCONT);
  		} else
! 			pager_pid = spawn_pager(tag_files, tag_target);
  
  		/* Wait for the pager to stop or exit. */
  
--- 1155,1161 ----
  			(void)tcsetpgrp(STDOUT_FILENO, pager_pid);
  			kill(pager_pid, SIGCONT);
  		} else
! 			pager_pid = spawn_pager(outst, tag_target);
  
  		/* Wait for the pager to stop or exit. */
  
***************
*** 1176,1182 ****
  }
  
  static pid_t
! spawn_pager(struct tag_files *tag_files, char *tag_target)
  {
  	const struct timespec timeout = { 0, 100000000 };  /* 0.1s */
  #define MAX_PAGER_ARGS 16
--- 1176,1182 ----
  }
  
  static pid_t
! spawn_pager(struct outstate *outst, char *tag_target)
  {
  	const struct timespec timeout = { 0, 100000000 };  /* 0.1s */
  #define MAX_PAGER_ARGS 16
***************
*** 1187,1194 ****
  	int		 argc, use_ofn;
  	pid_t		 pager_pid;
  
! 	assert(tag_files->ofd == -1);
! 	assert(tag_files->tfs == NULL);
  
  	pager = getenv("MANPAGER");
  	if (pager == NULL || *pager == '\0')
--- 1187,1194 ----
  	int		 argc, use_ofn;
  	pid_t		 pager_pid;
  
! 	assert(outst->tag_files->ofd == -1);
! 	assert(outst->tag_files->tfs == NULL);
  
  	pager = getenv("MANPAGER");
  	if (pager == NULL || *pager == '\0')
***************
*** 1218,1228 ****
  	/* For more(1) and less(1), use the tag file. */
  
  	use_ofn = 1;
! 	if (*tag_files->tfn != '\0' && (cmdlen = strlen(argv[0])) >= 4) {
  		cp = argv[0] + cmdlen - 4;
  		if (strcmp(cp, "less") == 0 || strcmp(cp, "more") == 0) {
  			argv[argc++] = mandoc_strdup("-T");
! 			argv[argc++] = tag_files->tfn;
  			if (tag_target != NULL) {
  				argv[argc++] = mandoc_strdup("-t");
  				argv[argc++] = tag_target;
--- 1218,1229 ----
  	/* For more(1) and less(1), use the tag file. */
  
  	use_ofn = 1;
! 	if (*outst->tag_files->tfn != '\0' &&
! 	    (cmdlen = strlen(argv[0])) >= 4) {
  		cp = argv[0] + cmdlen - 4;
  		if (strcmp(cp, "less") == 0 || strcmp(cp, "more") == 0) {
  			argv[argc++] = mandoc_strdup("-T");
! 			argv[argc++] = outst->tag_files->tfn;
  			if (tag_target != NULL) {
  				argv[argc++] = mandoc_strdup("-t");
  				argv[argc++] = tag_target;
***************
*** 1230,1237 ****
  			}
  		}
  	}
! 	if (use_ofn)
! 		argv[argc++] = tag_files->ofn;
  	argv[argc] = NULL;
  
  	switch (pager_pid = fork()) {
--- 1231,1244 ----
  			}
  		}
  	}
! 	if (use_ofn) {
! 		if (outst->outtype == OUTT_HTML && tag_target != NULL)
! 			mandoc_asprintf(&argv[argc], "file://%s#%s",
! 			    outst->tag_files->ofn, tag_target);
! 		else
! 			argv[argc] = outst->tag_files->ofn;
! 		argc++;
! 	}
  	argv[argc] = NULL;
  
  	switch (pager_pid = fork()) {
***************
*** 1248,1254 ****
  			    "%s", strerror(errno));
  			exit(mandoc_msg_getrc());
  		}
! 		tag_files->pager_pid = pager_pid;
  		return pager_pid;
  	}
  
--- 1255,1261 ----
  			    "%s", strerror(errno));
  			exit(mandoc_msg_getrc());
  		}
! 		outst->tag_files->pager_pid = pager_pid;
  		return pager_pid;
  	}