From owner-cvs-src@FreeBSD.ORG  Fri Mar 24 16:47:23 2006
Return-Path: <owner-cvs-src@FreeBSD.ORG>
X-Original-To: cvs-src@FreeBSD.org
Delivered-To: cvs-src@FreeBSD.org
Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125])
	by hub.freebsd.org (Postfix) with ESMTP id 1084B16A41F;
	Fri, 24 Mar 2006 16:47:23 +0000 (UTC) (envelope-from jhb@FreeBSD.org)
Received: from repoman.freebsd.org (repoman.freebsd.org [216.136.204.115])
	by mx1.FreeBSD.org (Postfix) with ESMTP id C085143D46;
	Fri, 24 Mar 2006 16:47:22 +0000 (GMT) (envelope-from jhb@FreeBSD.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.13.1/8.13.1) with ESMTP id k2OGlMH5002840;
	Fri, 24 Mar 2006 16:47:22 GMT (envelope-from jhb@repoman.freebsd.org)
Received: (from jhb@localhost)
	by repoman.freebsd.org (8.13.1/8.13.1/Submit) id k2OGlMxZ002839;
	Fri, 24 Mar 2006 16:47:22 GMT (envelope-from jhb)
Message-Id: <200603241647.k2OGlMxZ002839@repoman.freebsd.org>
From: John Baldwin <jhb@FreeBSD.org>
Date: Fri, 24 Mar 2006 16:47:22 +0000 (UTC)
To: src-committers@FreeBSD.org, cvs-src@FreeBSD.org, cvs-all@FreeBSD.org
X-FreeBSD-CVS-Branch: HEAD
Cc: 
Subject: cvs commit: src/bin/ls ls.c
X-BeenThere: cvs-src@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: CVS commit messages for the src tree <cvs-src.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/cvs-src>,
	<mailto:cvs-src-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/cvs-src>
List-Post: <mailto:cvs-src@freebsd.org>
List-Help: <mailto:cvs-src-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/cvs-src>,
	<mailto:cvs-src-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Fri, 24 Mar 2006 16:47:23 -0000

jhb         2006-03-24 16:47:22 UTC

  FreeBSD src repository

  Modified files:
    bin/ls               ls.c 
  Log:
  Fix a bug such that if you enabled sorting by size (-S) and enabled a
  flag to use a time other than modtime (-c, -u, or -U), the output would
  actually be sorted by the specified time rather than size.  This does
  alter the behavior in the case where both -S and -t are specified.  Now,
  -S is always preferred.  Previously, -t was preferred if one of -c, -u, or
  -U was specified, and -S was preferred otherwise.  Perhaps -S and -t should
  override each other (last one specified wins).
  
  Revision  Changes    Path
  1.84      +4 -4      src/bin/ls/ls.c