From owner-svn-src-all@FreeBSD.ORG Fri Jan 22 23:35:06 2010 Return-Path: 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 8DC581065670; Fri, 22 Jan 2010 23:35:06 +0000 (UTC) (envelope-from delphij@FreeBSD.org) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c]) by mx1.freebsd.org (Postfix) with ESMTP id 6402C8FC18; Fri, 22 Jan 2010 23:35:06 +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 o0MNZ6PR024736; Fri, 22 Jan 2010 23:35:06 GMT (envelope-from delphij@svn.freebsd.org) Received: (from delphij@localhost) by svn.freebsd.org (8.14.3/8.14.3/Submit) id o0MNZ6ej024733; Fri, 22 Jan 2010 23:35:06 GMT (envelope-from delphij@svn.freebsd.org) Message-Id: <201001222335.o0MNZ6ej024733@svn.freebsd.org> From: Xin LI Date: Fri, 22 Jan 2010 23:35:06 +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: r202845 - head/usr.bin/bc 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 " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 22 Jan 2010 23:35:06 -0000 Author: delphij Date: Fri Jan 22 23:35:06 2010 New Revision: 202845 URL: http://svn.freebsd.org/changeset/base/202845 Log: - Remove --debug option and intentionally undocument -d, which is only kept for compatibility with 4.4BSD behavior. - Sync SYNOPSIS with usage(). - Use an alternative way to represent short and long options which have same semantics. Reviewed by: gabor Modified: head/usr.bin/bc/bc.1 head/usr.bin/bc/bc.y Modified: head/usr.bin/bc/bc.1 ============================================================================== --- head/usr.bin/bc/bc.1 Fri Jan 22 23:32:10 2010 (r202844) +++ head/usr.bin/bc/bc.1 Fri Jan 22 23:35:06 2010 (r202845) @@ -35,7 +35,7 @@ .\" .\" @(#)bc.1 6.8 (Berkeley) 8/8/91 .\" -.Dd May 31 2007 +.Dd January 22, 2010 .Dt BC 1 .Os .Sh NAME @@ -43,7 +43,7 @@ .Nd arbitrary-precision arithmetic language and calculator .Sh SYNOPSIS .Nm bc -.Op Fl cl +.Op Fl chlqv .Op Fl e Ar expression .Op Ar file ... .Sh DESCRIPTION @@ -56,8 +56,6 @@ any files given, then reads the standard Options available: .Bl -tag -width Ds .It Fl c -.It Fl d -.It Fl Fl debug .Nm is actually a preprocessor for .Xr dc 1 , @@ -71,24 +69,22 @@ instructions are sent to the standard ou instead of being interpreted by a running .Xr dc 1 process. -.It Fl e Ar exp -.It Fl Fl expression Ar exp +.It Fl e Ar expression , Fl Fl expression Ar expression Evaluate .Ar expression . If multiple .Fl e options are specified, they are processed in the order given, separated by newlines. -.It Fl h -.It Fl Fl help +.It Fl h , Fl Fl help Prints usage information. -.It Fl l -.It Fl Fl mathlib +.It Fl l , Fl Fl mathlib Allow specification of an arbitrary precision math library. The definitions in the library are available to command line expressions. -.It Fl v -.It Fl Fl version +Synonym for +.Fl l . +.It Fl v , Fl Fl version Prints version information. .El .Pp @@ -373,7 +369,7 @@ are extensions to that specification. .Sh HISTORY The .Nm -first command appeared in +command first appeared in .At v6 . A complete rewrite of the .Nm Modified: head/usr.bin/bc/bc.y ============================================================================== --- head/usr.bin/bc/bc.y Fri Jan 22 23:32:10 2010 (r202844) +++ head/usr.bin/bc/bc.y Fri Jan 22 23:35:06 2010 (r202845) @@ -129,7 +129,6 @@ extern char *__progname; const struct option long_options[] = { - {"debug", no_argument, NULL, 'd'}, {"expression", required_argument, NULL, 'e'}, {"help", no_argument, NULL, 'h'}, {"mathlib", no_argument, NULL, 'l'}, @@ -1014,7 +1013,7 @@ init(void) static void usage(void) { - fprintf(stderr, "usage: %s [-cdhlqv] [-e expression] [file ...]\n", + fprintf(stderr, "usage: %s [-chlqv] [-e expression] [file ...]\n", __progname); exit(1); }