From owner-p4-projects  Tue Nov 12 12:30:52 2002
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 40EE037B404; Tue, 12 Nov 2002 12:30:49 -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 CAD1B37B401
	for <perforce@freebsd.org>; Tue, 12 Nov 2002 12:30:48 -0800 (PST)
Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115])
	by mx1.FreeBSD.org (Postfix) with ESMTP id 86C2843E4A
	for <perforce@freebsd.org>; Tue, 12 Nov 2002 12:30:48 -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 gACKSPmV014635
	for <perforce@freebsd.org>; Tue, 12 Nov 2002 12:28:25 -0800 (PST)
	(envelope-from green@freebsd.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.12.6/8.12.6/Submit) id gACKSPMx014630
	for perforce@freebsd.org; Tue, 12 Nov 2002 12:28:25 -0800 (PST)
Date: Tue, 12 Nov 2002 12:28:25 -0800 (PST)
Message-Id: <200211122028.gACKSPMx014630@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 21008 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=21008

Change 21008 by green@green_laptop_2 on 2002/11/12 12:27:37

	Make ls(1) use correct logic for finding the path names for
	files to look up MAC labels for.

Affected files ...

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

Differences ...

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

@@ -691,17 +691,15 @@
 
 					error = mac_prepare_file_label(&label);
 					if (error == -1) {
-						warn("%s", cur->fts_name);
+						warn("MAC label for %s/%s",
+						    cur->fts_parent->fts_path,
+						    cur->fts_name);
 						goto label_out;
 					}
 
-					if (cur->fts_level == FTS_ROOTLEVEL)
-						snprintf(name, sizeof(name),
-						    "%s", cur->fts_name);
-					else
-						snprintf(name, sizeof(name),
-						    "%s/%s", cur->fts_parent->fts_accpath,
-						    cur->fts_name);
+					snprintf(name, sizeof(name), "%s/%s",
+					    cur->fts_parent->fts_accpath,
+					    cur->fts_name);
 
 					if (options & FTS_LOGICAL)
 						error = mac_get_file(name,
@@ -710,7 +708,9 @@
 						error = mac_get_link(name,
 						    label);
 					if (error == -1) {
-						warn("%s", cur->fts_name);
+						warn("MAC label for %s/%s",
+						    cur->fts_parent->fts_path,
+						    cur->fts_name);
 						mac_free(label);
 						goto label_out;
 					}
@@ -718,7 +718,9 @@
 					error = mac_to_text(label,
 					    &labelstr);
 					if (error == -1) {
-						warn("%s", cur->fts_name);
+						warn("MAC label for %s/%s",
+						    cur->fts_parent->fts_path,
+						    cur->fts_name);
 						mac_free(label);
 						goto label_out;
 					}

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