===================================================================
RCS file: /cvsrepo/anoncvs/cvs/src/usr.bin/mandoc/mandocdb.c,v
retrieving revision 1.106
retrieving revision 1.107
diff -c -r1.106 -r1.107
*** src/usr.bin/mandoc/mandocdb.c	2014/05/12 19:11:20	1.106
--- src/usr.bin/mandoc/mandocdb.c	2014/06/05 07:13:53	1.107
***************
*** 1,4 ****
! /*	$Id: mandocdb.c,v 1.106 2014/05/12 19:11:20 espie Exp $ */
  /*
   * Copyright (c) 2011, 2012 Kristaps Dzonsons <kristaps@bsd.lv>
   * Copyright (c) 2011, 2012, 2013, 2014 Ingo Schwarze <schwarze@openbsd.org>
--- 1,4 ----
! /*	$Id: mandocdb.c,v 1.107 2014/06/05 07:13:53 espie Exp $ */
  /*
   * Copyright (c) 2011, 2012 Kristaps Dzonsons <kristaps@bsd.lv>
   * Copyright (c) 2011, 2012, 2013, 2014 Ingo Schwarze <schwarze@openbsd.org>
***************
*** 792,798 ****
  		return;
  	}
  
! 	if (strstr(buf, basedir) == buf)
  		start = buf + strlen(basedir) + 1;
  	else if (OP_TEST == op)
  		start = buf;
--- 792,798 ----
  		return;
  	}
  
! 	if (strstr(buf, basedir) == buf && strcmp(basedir, "/") != 0)
  		start = buf + strlen(basedir) + 1;
  	else if (OP_TEST == op)
  		start = buf;
***************
*** 821,827 ****
  			say(file, "Filename too long");
  			return;
  		}
! 		start = strstr(buf, basedir) == buf ?
  		    buf + strlen(basedir) + 1 : buf;
  	}
  
--- 821,828 ----
  			say(file, "Filename too long");
  			return;
  		}
! 		start = strstr(buf, basedir) == buf && 
! 		    strcmp(basedir, "/") != 0 ?
  		    buf + strlen(basedir) + 1 : buf;
  	}