From owner-svn-src-stable-7@FreeBSD.ORG  Fri Jun 26 06:59:47 2009
Return-Path: <owner-svn-src-stable-7@FreeBSD.ORG>
Delivered-To: svn-src-stable-7@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id EAB801065672;
	Fri, 26 Jun 2009 06:59:47 +0000 (UTC) (envelope-from imp@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id D89178FC1E;
	Fri, 26 Jun 2009 06:59:47 +0000 (UTC) (envelope-from imp@FreeBSD.org)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id n5Q6xlZt078119;
	Fri, 26 Jun 2009 06:59:47 GMT (envelope-from imp@svn.freebsd.org)
Received: (from imp@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id n5Q6xlfp078117;
	Fri, 26 Jun 2009 06:59:47 GMT (envelope-from imp@svn.freebsd.org)
Message-Id: <200906260659.n5Q6xlfp078117@svn.freebsd.org>
From: Warner Losh <imp@FreeBSD.org>
Date: Fri, 26 Jun 2009 06:59:47 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
	svn-src-stable@freebsd.org, svn-src-stable-7@freebsd.org
X-SVN-Group: stable-7
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r195043 - stable/7/sbin/restore
X-BeenThere: svn-src-stable-7@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: SVN commit messages for only the 7-stable src tree
	<svn-src-stable-7.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-stable-7>, 
	<mailto:svn-src-stable-7-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-stable-7>
List-Post: <mailto:svn-src-stable-7@freebsd.org>
List-Help: <mailto:svn-src-stable-7-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-stable-7>, 
	<mailto:svn-src-stable-7-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Fri, 26 Jun 2009 06:59:48 -0000

Author: imp
Date: Fri Jun 26 06:59:47 2009
New Revision: 195043
URL: http://svn.freebsd.org/changeset/base/195043

Log:
  Merge r187828: restore necessary NUL termination.

Modified:
  stable/7/sbin/restore/   (props changed)
  stable/7/sbin/restore/interactive.c

Modified: stable/7/sbin/restore/interactive.c
==============================================================================
--- stable/7/sbin/restore/interactive.c	Fri Jun 26 06:40:12 2009	(r195042)
+++ stable/7/sbin/restore/interactive.c	Fri Jun 26 06:59:47 2009	(r195043)
@@ -545,6 +545,7 @@ printlist(char *name, char *basename)
 			     strcmp(dp->d_name, ".") == 0 ||
 			     strcmp(dp->d_name, "..") == 0))
 				continue;
+			locname[namelen] = '\0';
 			if (namelen + dp->d_namlen >= MAXPATHLEN) {
 				fprintf(stderr, "%s%s: name exceeds %d char\n",
 					locname, dp->d_name, MAXPATHLEN);