From owner-p4-projects  Wed Nov 13  8:41:15 2002
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 3507337B404; Wed, 13 Nov 2002 08:41:13 -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 CB24537B401
	for <perforce@freebsd.org>; Wed, 13 Nov 2002 08:41:12 -0800 (PST)
Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115])
	by mx1.FreeBSD.org (Postfix) with ESMTP id 8581643E7B
	for <perforce@freebsd.org>; Wed, 13 Nov 2002 08:41:12 -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 gADGcjmV042907
	for <perforce@freebsd.org>; Wed, 13 Nov 2002 08:38:45 -0800 (PST)
	(envelope-from green@freebsd.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.12.6/8.12.6/Submit) id gADGciVD042901
	for perforce@freebsd.org; Wed, 13 Nov 2002 08:38:44 -0800 (PST)
Date: Wed, 13 Nov 2002 08:38:44 -0800 (PST)
Message-Id: <200211131638.gADGciVD042901@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 21034 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=21034

Change 21034 by green@green_laptop_2 on 2002/11/13 08:38:20

	Okay, I really hate this code, fts(3), etc.  I'm SURE it works
	now.  Net changes are a single extra comparison and correct
	printing of pathname in errors.

Affected files ...

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

Differences ...

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

@@ -448,7 +448,8 @@
 	 * If not recursing down this tree and don't need stat info, just get
 	 * the names.
 	 */
-	ch_options = !f_recursive && options & FTS_NOSTAT ? FTS_NAMEONLY : 0;
+	ch_options = !f_recursive && !f_label &&
+	    options & FTS_NOSTAT ? FTS_NAMEONLY : 0;
 
 	while ((p = fts_read(ftsp)) != NULL)
 		switch (p->fts_info) {
@@ -697,9 +698,9 @@
 						goto label_out;
 					}
 
-					if (cur->fts_parent == NULL)
+					if (cur->fts_level == FTS_ROOTLEVEL)
 						snprintf(name, sizeof(name),
-						"%s", p->fts_name);
+						    "%s", cur->fts_name);
 					else
 						snprintf(name, sizeof(name),
 						    "%s/%s", cur->fts_parent->

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