From owner-svn-src-user@FreeBSD.ORG Thu Feb 18 21:21:54 2010
Return-Path: <owner-svn-src-user@FreeBSD.ORG>
Delivered-To: svn-src-user@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
by hub.freebsd.org (Postfix) with ESMTP id EABFE106566B;
Thu, 18 Feb 2010 21:21:54 +0000 (UTC)
(envelope-from edwin@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
by mx1.freebsd.org (Postfix) with ESMTP id BFE2B8FC08;
Thu, 18 Feb 2010 21:21:54 +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 o1ILLsT9082034;
Thu, 18 Feb 2010 21:21:54 GMT (envelope-from edwin@svn.freebsd.org)
Received: (from edwin@localhost)
by svn.freebsd.org (8.14.3/8.14.3/Submit) id o1ILLs24082031;
Thu, 18 Feb 2010 21:21:54 GMT (envelope-from edwin@svn.freebsd.org)
Message-Id: <201002182121.o1ILLs24082031@svn.freebsd.org>
From: Edwin Groothuis <edwin@FreeBSD.org>
Date: Thu, 18 Feb 2010 21:21:54 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-user@freebsd.org
X-SVN-Group: user
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc:
Subject: svn commit: r204062 - user/edwin/calendar
X-BeenThere: svn-src-user@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: "SVN commit messages for the experimental " user"
src tree" <svn-src-user.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-user>,
<mailto:svn-src-user-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-user>
List-Post: <mailto:svn-src-user@freebsd.org>
List-Help: <mailto:svn-src-user-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-user>,
<mailto:svn-src-user-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Thu, 18 Feb 2010 21:21:55 -0000
Author: edwin
Date: Thu Feb 18 21:21:54 2010
New Revision: 204062
URL: http://svn.freebsd.org/changeset/base/204062
Log:
Fix usage of -l when -U is used.
Document -l and -U
Modified:
user/edwin/calendar/calendar.1
user/edwin/calendar/calendar.c
Modified: user/edwin/calendar/calendar.1
==============================================================================
--- user/edwin/calendar/calendar.1 Thu Feb 18 21:14:29 2010 (r204061)
+++ user/edwin/calendar/calendar.1 Thu Feb 18 21:21:54 2010 (r204062)
@@ -54,6 +54,8 @@
.Ek
.Oc
.Op Fl W Ar num
+.Op Fl U Ar UTF-offset
+.Op Fl l Ar longitude
.Sh DESCRIPTION
The
.Nm
@@ -93,6 +95,12 @@ as the default calendar file.
.Sm on
.Xc
For test purposes only: set date directly to argument values.
+.It Fl l Ar longitude , Fl U Ar UTC-offset
+Only one is needed:
+Perform lunar and solar calculations from this longitude or from
+this UTC offset.
+If neither is specified, the calculations will be based on the
+difference between UTC time and localtime.
.It Fl W Ar num
Print lines from today and the next
.Ar num
Modified: user/edwin/calendar/calendar.c
==============================================================================
--- user/edwin/calendar/calendar.c Thu Feb 18 21:14:29 2010 (r204061)
+++ user/edwin/calendar/calendar.c Thu Feb 18 21:21:54 2010 (r204062)
@@ -174,7 +174,7 @@ main(int argc, char *argv[])
} else if (UTCoffset == UTCOFFSET_NOTSET) {
/* Base on information given */
UTCoffset = eastlongitude / 15;
- } else {
+ } else if (eastlongitude == LONGITUDE_NOTSET) {
/* Base on information given */
eastlongitude = UTCoffset * 15;
}
@@ -218,9 +218,11 @@ static void __dead2
usage(void)
{
- fprintf(stderr, "%s\n%s\n",
+ fprintf(stderr, "%s\n%s\n%s\n",
"usage: calendar [-a] [-A days] [-B days] [-F friday] "
"[-f calendarfile]",
- " [-d] [-t dd[.mm[.year]]] [-W days]");
+ " [-d] [-t dd[.mm[.year]]] [-W days]",
+ " [-U utcoffset] [-l longitude]"
+ );
exit(1);
}