From owner-p4-projects  Tue Nov 12 15:48:54 2002
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id CD65C37B404; Tue, 12 Nov 2002 15:48:52 -0800 (PST)
Delivered-To: perforce@freebsd.org
Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125])
	by hub.freebsd.org (Postfix) with ESMTP id 640EA37B401
	for <perforce@freebsd.org>; Tue, 12 Nov 2002 15:48:52 -0800 (PST)
Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115])
	by mx1.FreeBSD.org (Postfix) with ESMTP id 21EDF43E3B
	for <perforce@freebsd.org>; Tue, 12 Nov 2002 15:48:52 -0800 (PST)
	(envelope-from green@freebsd.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.12.6/8.12.6) with ESMTP id gACNkSmV032276
	for <perforce@freebsd.org>; Tue, 12 Nov 2002 15:46:28 -0800 (PST)
	(envelope-from green@freebsd.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.12.6/8.12.6/Submit) id gACNkRbb032273
	for perforce@freebsd.org; Tue, 12 Nov 2002 15:46:27 -0800 (PST)
Date: Tue, 12 Nov 2002 15:46:27 -0800 (PST)
Message-Id: <200211122346.gACNkRbb032273@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to green@freebsd.org using -f
From: Brian Feldman <green@FreeBSD.org>
Subject: PERFORCE change 21015 for review
To: Perforce Change Reviews <perforce@freebsd.org>
Sender: owner-p4-projects@FreeBSD.ORG
Precedence: bulk
List-ID: <p4-projects.FreeBSD.ORG>
List-Archive: <http://docs.freebsd.org/mail/> (Web Archive)
List-Help: <mailto:majordomo@FreeBSD.ORG?subject=help> (List Instructions)
List-Subscribe: <mailto:majordomo@FreeBSD.ORG?subject=subscribe%20p4-projects>
List-Unsubscribe: <mailto:majordomo@FreeBSD.ORG?subject=unsubscribe%20p4-projects>
X-Loop: FreeBSD.ORG

http://perforce.freebsd.org/chv.cgi?CH=21015

Change 21015 by green@green_laptop_2 on 2002/11/12 15:45:46

	Really correct the initial issue in ls(1): test for whether
	there is a parent directory without paying attention to any
	fields other than fts_parent and fts_name when attempting
	to find a MAC label for a given FTSENT.

Affected files ...

.. //depot/projects/trustedbsd/mac/bin/ls/ls.c#21 edit

Differences ...

==== //depot/projects/trustedbsd/mac/bin/ls/ls.c#21 (text+ko) ====

@@ -697,9 +697,13 @@
 						goto label_out;
 					}
 
-					snprintf(name, sizeof(name), "%s/%s",
-					    cur->fts_parent->fts_accpath,
-					    cur->fts_name);
+					if (cur->fts_parent == NULL)
+						snprintf(name, sizeof(name),
+						"%s", p->fts_name);
+					else
+						snprintf(name, sizeof(name),
+						    "%s/%s", cur->fts_parent->
+						    fts_accpath, cur->fts_name);
 
 					if (options & FTS_LOGICAL)
 						error = mac_get_file(name,

To Unsubscribe: send mail to majordomo@FreeBSD.org
with "unsubscribe p4-projects" in the body of the message