From owner-svn-src-head@FreeBSD.ORG  Tue Oct 13 21:51:51 2009
Return-Path: <owner-svn-src-head@FreeBSD.ORG>
Delivered-To: svn-src-head@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 082EA106568F;
	Tue, 13 Oct 2009 21:51:51 +0000 (UTC)
	(envelope-from jilles@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id EAF008FC1C;
	Tue, 13 Oct 2009 21:51:50 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id n9DLpoHi017649;
	Tue, 13 Oct 2009 21:51:50 GMT (envelope-from jilles@svn.freebsd.org)
Received: (from jilles@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id n9DLpo1A017647;
	Tue, 13 Oct 2009 21:51:50 GMT (envelope-from jilles@svn.freebsd.org)
Message-Id: <200910132151.n9DLpo1A017647@svn.freebsd.org>
From: Jilles Tjoelker <jilles@FreeBSD.org>
Date: Tue, 13 Oct 2009 21:51:50 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
	svn-src-head@freebsd.org
X-SVN-Group: head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r198056 - head/bin/ls
X-BeenThere: svn-src-head@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: SVN commit messages for the src tree for head/-current
	<svn-src-head.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-head>,
	<mailto:svn-src-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-head>
List-Post: <mailto:svn-src-head@freebsd.org>
List-Help: <mailto:svn-src-head-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-head>,
	<mailto:svn-src-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Tue, 13 Oct 2009 21:51:51 -0000

Author: jilles
Date: Tue Oct 13 21:51:50 2009
New Revision: 198056
URL: http://svn.freebsd.org/changeset/base/198056

Log:
  ls: Make -p not inhibit following symlinks.
  
  According to the man page, when neither -H/-L nor -F/-d/-l are given, -H is
  implied. This agrees with POSIX, GNU ls and Solaris ls. This means that -p,
  although it is very similar to -F, does not prevent the implicit following
  of symlinks.
  
  PR:		standards/128546

Modified:
  head/bin/ls/ls.c

Modified: head/bin/ls/ls.c
==============================================================================
--- head/bin/ls/ls.c	Tue Oct 13 21:28:51 2009	(r198055)
+++ head/bin/ls/ls.c	Tue Oct 13 21:51:50 2009	(r198056)
@@ -399,7 +399,7 @@ main(int argc, char *argv[])
 	 * If not -F, -d or -l options, follow any symbolic links listed on
 	 * the command line.
 	 */
-	if (!f_longform && !f_listdir && !f_type)
+	if (!f_longform && !f_listdir && (!f_type || f_slash))
 		fts_options |= FTS_COMFOLLOW;
 
 	/*