From owner-svn-src-all@FreeBSD.ORG  Thu Dec  9 23:57:23 2010
Return-Path: <owner-svn-src-all@FreeBSD.ORG>
Delivered-To: svn-src-all@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id C17DB1065679;
	Thu,  9 Dec 2010 23:57:23 +0000 (UTC)
	(envelope-from dougb@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id B0D488FC16;
	Thu,  9 Dec 2010 23:57:23 +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 oB9NvNBp054791;
	Thu, 9 Dec 2010 23:57:23 GMT (envelope-from dougb@svn.freebsd.org)
Received: (from dougb@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id oB9NvNUT054789;
	Thu, 9 Dec 2010 23:57:23 GMT (envelope-from dougb@svn.freebsd.org)
Message-Id: <201012092357.oB9NvNUT054789@svn.freebsd.org>
From: Doug Barton <dougb@FreeBSD.org>
Date: Thu, 9 Dec 2010 23:57:23 +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: r216343 - head/usr.bin/stat
X-BeenThere: svn-src-all@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: "SVN commit messages for the entire src tree \(except for &quot;
	user&quot; and &quot; projects&quot; \)" <svn-src-all.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-all>,
	<mailto:svn-src-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-all>
List-Post: <mailto:svn-src-all@freebsd.org>
List-Help: <mailto:svn-src-all-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-all>,
	<mailto:svn-src-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Thu, 09 Dec 2010 23:57:23 -0000

Author: dougb
Date: Thu Dec  9 23:57:23 2010
New Revision: 216343
URL: http://svn.freebsd.org/changeset/base/216343

Log:
  Bring in the change from OpenBSD's 1.14:
  
  "synchronize synopsis and usage; "-l", "-r", "-s" and "-x" are mutually
  exclusive; while here, slightly improve spacing in the source code
  so it fits on a 80-column display again.
  
  diff greatly improved by martynas@"
  
  Obtained from:	sobrado@OpenBSD.org

Modified:
  head/usr.bin/stat/stat.c

Modified: head/usr.bin/stat/stat.c
==============================================================================
--- head/usr.bin/stat/stat.c	Thu Dec  9 22:05:16 2010	(r216342)
+++ head/usr.bin/stat/stat.c	Thu Dec  9 23:57:23 2010	(r216343)
@@ -30,7 +30,8 @@
 #include <sys/cdefs.h>
 #if 0
 #ifndef lint
-__RCSID("$NetBSD: stat.c,v 1.30 2010/11/25 04:33:30 dholland Exp $");
+__RCSID("$NetBSD: stat.c,v 1.30 2010/11/25 04:33:30 dholland Exp $"
+"$OpenBSD: stat.c,v 1.14 2009/06/24 09:44:25 sobrado Exp $");
 #endif
 #endif
 
@@ -226,7 +227,8 @@ main(int argc, char *argv[])
 		quiet = 1;
 	} else {
 		options = "f:FlLnqrst:x";
-		synopsis = "[-FlLnqrsx] [-f format] [-t timefmt] [file ...]";
+		synopsis = "[-FLnq] [-f format | -l | -r | -s | -x] "
+		    "[-t timefmt] [file ...]";
 	}
 
 	while ((ch = getopt(argc, argv, options)) != -1)