===================================================================
RCS file: /cvsrepo/anoncvs/cvs/src/usr.bin/mandoc/roff.c,v
retrieving revision 1.82
retrieving revision 1.83
diff -c -r1.82 -r1.83
*** src/usr.bin/mandoc/roff.c	2014/04/23 16:07:06	1.82
--- src/usr.bin/mandoc/roff.c	2014/06/25 00:19:17	1.83
***************
*** 1,4 ****
! /*	$Id: roff.c,v 1.82 2014/04/23 16:07:06 schwarze Exp $ */
  /*
   * Copyright (c) 2010, 2011, 2012 Kristaps Dzonsons <kristaps@bsd.lv>
   * Copyright (c) 2010-2014 Ingo Schwarze <schwarze@openbsd.org>
--- 1,4 ----
! /*	$Id: roff.c,v 1.83 2014/06/25 00:19:17 schwarze Exp $ */
  /*
   * Copyright (c) 2010, 2011, 2012 Kristaps Dzonsons <kristaps@bsd.lv>
   * Copyright (c) 2010-2014 Ingo Schwarze <schwarze@openbsd.org>
***************
*** 1934,1940 ****
  {
  	char *name;
  
! 	mandoc_msg(MANDOCERR_SO, r->parse, ln, ppos, NULL);
  
  	/*
  	 * Handle `so'.  Be EXTREMELY careful, as we shouldn't be
--- 1934,1941 ----
  {
  	char *name;
  
! 	name = *bufp + pos;
! 	mandoc_vmsg(MANDOCERR_SO, r->parse, ln, ppos, ".so %s", name);
  
  	/*
  	 * Handle `so'.  Be EXTREMELY careful, as we shouldn't be
***************
*** 1943,1951 ****
  	 * or using absolute paths.
  	 */
  
- 	name = *bufp + pos;
  	if ('/' == *name || strstr(name, "../") || strstr(name, "/..")) {
! 		mandoc_msg(MANDOCERR_SOPATH, r->parse, ln, pos, NULL);
  		return(ROFF_ERR);
  	}
  
--- 1944,1952 ----
  	 * or using absolute paths.
  	 */
  
  	if ('/' == *name || strstr(name, "../") || strstr(name, "/..")) {
! 		mandoc_vmsg(MANDOCERR_SO_PATH, r->parse, ln, ppos,
! 		    ".so %s", name);
  		return(ROFF_ERR);
  	}