From owner-svn-src-head@FreeBSD.ORG Thu Apr 3 05:48:29 2014 Return-Path: Delivered-To: svn-src-head@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 52AA5F66; Thu, 3 Apr 2014 05:48:29 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 25B51B53; Thu, 3 Apr 2014 05:48:29 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.8/8.14.8) with ESMTP id s335mSi1093493; Thu, 3 Apr 2014 05:48:28 GMT (envelope-from grog@svn.freebsd.org) Received: (from grog@localhost) by svn.freebsd.org (8.14.8/8.14.8/Submit) id s335mSMb093491; Thu, 3 Apr 2014 05:48:28 GMT (envelope-from grog@svn.freebsd.org) Message-Id: <201404030548.s335mSMb093491@svn.freebsd.org> From: Greg Lehey Date: Thu, 3 Apr 2014 05:48:28 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r264064 - head/bin/ls X-SVN-Group: head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.17 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 03 Apr 2014 05:48:29 -0000 Author: grog Date: Thu Apr 3 05:48:28 2014 New Revision: 264064 URL: http://svnweb.freebsd.org/changeset/base/264064 Log: Make -f set -a, as required by the standard. From the original OpenBSD commit message: restore the traditional behavior of -f implying -a; apparently Keith Bostic forgot to restore it when the -f flag was put back on 2nd of September 1989, after being removed on 16th of August as a consequence of issues getting it working over NFS, so deviation from traditional UNIX behavior in all BSDs looks like an historical accident; as a side effect, this change accommodates behavior of this option to IEEE Std 1003.1-2008 (``POSIX.1''). joint work with jmc@ (who found the inaccuracy in our implementation), schwarze@ (who provided a detailed tracking of historical facts) and millert@ Submitted by: Igor Sobrado Discussed with: mckusick Obtained from: OpenBSD project MFC after: 2 weeks Modified: head/bin/ls/ls.1 head/bin/ls/ls.c Modified: head/bin/ls/ls.1 ============================================================================== --- head/bin/ls/ls.1 Thu Apr 3 01:46:03 2014 (r264063) +++ head/bin/ls/ls.1 Thu Apr 3 05:48:28 2014 (r264064) @@ -194,6 +194,8 @@ Use time when file status was last chang Directories are listed as plain files (not searched recursively). .It Fl f Output is not sorted. +This option turns on +.Fl a . .It Fl g This option is deprecated and is only available for compatibility with Modified: head/bin/ls/ls.c ============================================================================== --- head/bin/ls/ls.c Thu Apr 3 01:46:03 2014 (r264063) +++ head/bin/ls/ls.c Thu Apr 3 05:48:28 2014 (r264064) @@ -226,6 +226,9 @@ main(int argc, char *argv[]) f_accesstime = 0; f_statustime = 0; break; + case 'f': + f_nosort = 1; + /* FALLTHROUGH */ case 'a': fts_options |= FTS_SEEDOT; /* FALLTHROUGH */ @@ -300,9 +303,6 @@ main(int argc, char *argv[]) f_listdir = 1; f_recursive = 0; break; - case 'f': - f_nosort = 1; - break; case 'g': /* Compatibility with 4.3BSD. */ break; case 'h':