===================================================================
RCS file: /cvsrepo/anoncvs/cvs/src/usr.bin/mandoc/mansearch.c,v
retrieving revision 1.34
retrieving revision 1.35
diff -c -r1.34 -r1.35
*** src/usr.bin/mandoc/mansearch.c	2014/09/01 22:45:11	1.34
--- src/usr.bin/mandoc/mansearch.c	2014/09/03 18:08:26	1.35
***************
*** 1,4 ****
! /*	$OpenBSD: mansearch.c,v 1.34 2014/09/01 22:45:11 schwarze Exp $ */
  /*
   * Copyright (c) 2012 Kristaps Dzonsons <kristaps@bsd.lv>
   * Copyright (c) 2013, 2014 Ingo Schwarze <schwarze@openbsd.org>
--- 1,4 ----
! /*	$OpenBSD: mansearch.c,v 1.35 2014/09/03 18:08:26 schwarze Exp $ */
  /*
   * Copyright (c) 2012 Kristaps Dzonsons <kristaps@bsd.lv>
   * Copyright (c) 2013, 2014 Ingo Schwarze <schwarze@openbsd.org>
***************
*** 72,78 ****
  struct	match {
  	uint64_t	 pageid; /* identifier in database */
  	char		*desc; /* manual page description */
! 	int		 form; /* 0 == catpage */
  };
  
  static	void		 buildnames(struct manpage *, sqlite3 *,
--- 72,78 ----
  struct	match {
  	uint64_t	 pageid; /* identifier in database */
  	char		*desc; /* manual page description */
! 	int		 form; /* bit field: formatted, zipped? */
  };
  
  static	void		 buildnames(struct manpage *, sqlite3 *,
***************
*** 390,395 ****
--- 390,396 ----
  {
  	char		*newnames, *prevsec, *prevarch;
  	const char	*oldnames, *sep1, *name, *sec, *sep2, *arch, *fsec;
+ 	const char	*gzip;
  	size_t		 i;
  	int		 c;
  
***************
*** 455,470 ****
  		if (NULL != mpage->file)
  			continue;
  
! 		if (form) {
  			sep1 = "man";
  			fsec = sec;
  		} else {
  			sep1 = "cat";
  			fsec = "0";
  		}
  		sep2 = '\0' == *arch ? "" : "/";
! 		mandoc_asprintf(&mpage->file, "%s/%s%s%s%s/%s.%s",
! 		    path, sep1, sec, sep2, arch, name, fsec);
  	}
  	if (SQLITE_DONE != c)
  		fprintf(stderr, "%s\n", sqlite3_errmsg(db));
--- 456,475 ----
  		if (NULL != mpage->file)
  			continue;
  
! 		if (form & FORM_SRC) {
  			sep1 = "man";
  			fsec = sec;
  		} else {
  			sep1 = "cat";
  			fsec = "0";
  		}
+ 		if (form & FORM_GZ)
+ 			gzip = ".gz";
+ 		else
+ 			gzip = "";
  		sep2 = '\0' == *arch ? "" : "/";
! 		mandoc_asprintf(&mpage->file, "%s/%s%s%s%s/%s.%s%s",
! 		    path, sep1, sec, sep2, arch, name, fsec, gzip);
  	}
  	if (SQLITE_DONE != c)
  		fprintf(stderr, "%s\n", sqlite3_errmsg(db));