diff options
Diffstat (limited to 'src/usr.bin/calendar')
| -rw-r--r-- | src/usr.bin/calendar/calendar.1 | 8 | ||||
| -rw-r--r-- | src/usr.bin/calendar/calendar.c | 12 | ||||
| -rw-r--r-- | src/usr.bin/calendar/calendar.h | 4 | ||||
| -rw-r--r-- | src/usr.bin/calendar/calendars/calendar.history | 4 | ||||
| -rw-r--r-- | src/usr.bin/calendar/calendars/calendar.judaic | 15 | ||||
| -rw-r--r-- | src/usr.bin/calendar/calendars/calendar.music | 6 | ||||
| -rw-r--r-- | src/usr.bin/calendar/calendars/calendar.openbsd | 6 | ||||
| -rw-r--r-- | src/usr.bin/calendar/calendars/calendar.ushistory | 4 | ||||
| -rw-r--r-- | src/usr.bin/calendar/day.c | 4 | ||||
| -rw-r--r-- | src/usr.bin/calendar/io.c | 4 | ||||
| -rw-r--r-- | src/usr.bin/calendar/ostern.c | 4 |
11 files changed, 38 insertions, 33 deletions
diff --git a/src/usr.bin/calendar/calendar.1 b/src/usr.bin/calendar/calendar.1 index 306d2e1..777de34 100644 --- a/src/usr.bin/calendar/calendar.1 +++ b/src/usr.bin/calendar/calendar.1 @@ -1,4 +1,4 @@ -.\" $OpenBSD: calendar.1,v 1.43 2018/06/03 06:50:35 jmc Exp $ +.\" $OpenBSD: calendar.1,v 1.44 2019/01/29 22:28:30 tedu Exp $ .\" .\" Copyright (c) 1989, 1990, 1993 .\" The Regents of the University of California. All rights reserved. @@ -29,7 +29,7 @@ .\" .\" @(#)calendar.1 8.1 (Berkeley) 6/29/93 .\" -.Dd $Mdocdate: June 3 2018 $ +.Dd $Mdocdate: January 29 2019 $ .Dt CALENDAR 1 .Os .Sh NAME @@ -119,7 +119,9 @@ They may be entered in almost any format, either numeric or as character strings. If proper locale is set, national months and weekdays names can be used. -A single asterisk (`*') matches every month. +A single asterisk +.Pq Sq * +matches every month. A day without a month matches that day of every week. A month without a day matches the first of that month. Two numbers default to the month followed by the day. diff --git a/src/usr.bin/calendar/calendar.c b/src/usr.bin/calendar/calendar.c index 547ba08..7886fd3 100644 --- a/src/usr.bin/calendar/calendar.c +++ b/src/usr.bin/calendar/calendar.c @@ -1,4 +1,4 @@ -/* $OpenBSD: calendar.c,v 1.35 2015/12/07 18:46:35 espie Exp $ */ +/* $OpenBSD: calendar.c,v 1.37 2019/02/01 16:22:53 millert Exp $ */ /* * Copyright (c) 1989, 1993, 1994 @@ -57,9 +57,9 @@ int daynames = 0; time_t f_time = 0; int bodun_always = 0; -int f_dayAfter = 0; /* days after current date */ -int f_dayBefore = 0; /* days before current date */ -int f_SetdayAfter = 0; /* calendar invoked with -A */ +int f_dayAfter = 0; /* days after current date */ +int f_dayBefore = 0; /* days before current date */ +int f_Setday = 0; /* calendar invoked with -A or -B */ struct specialev spev[NUMEV]; @@ -100,13 +100,15 @@ main(int argc, char *argv[]) f_dayAfter = strtonum(optarg, 0, INT_MAX, &errstr); if (errstr) errx(1, "-A %s: %s", optarg, errstr); - f_SetdayAfter = 1; + f_Setday = 1; break; case 'B': /* days before current date */ f_dayBefore = strtonum(optarg, 0, INT_MAX, &errstr); if (errstr) errx(1, "-B %s: %s", optarg, errstr); + if (f_dayBefore != 0) + f_Setday = 1; break; case 'w': diff --git a/src/usr.bin/calendar/calendar.h b/src/usr.bin/calendar/calendar.h index ac33b0d..482306c 100644 --- a/src/usr.bin/calendar/calendar.h +++ b/src/usr.bin/calendar/calendar.h @@ -1,4 +1,4 @@ -/* $OpenBSD: calendar.h,v 1.15 2015/12/07 18:46:35 espie Exp $ */ +/* $OpenBSD: calendar.h,v 1.17 2019/02/01 16:22:53 millert Exp $ */ /* * Copyright (c) 1989, 1993, 1994 @@ -105,7 +105,7 @@ void setnnames(void); extern int f_dayAfter; /* days after current date */ extern int f_dayBefore; /* days before current date */ -extern int f_SetdayAfter; /* calendar invoked with -A */ +extern int f_Setday; /* calendar invoked with -A or -B */ /* Special events; see also setnnames() in day.c */ /* '=' is not a valid character in a special event name */ diff --git a/src/usr.bin/calendar/calendars/calendar.history b/src/usr.bin/calendar/calendars/calendar.history index 94f1cdc..a91bc9a 100644 --- a/src/usr.bin/calendar/calendars/calendar.history +++ b/src/usr.bin/calendar/calendars/calendar.history @@ -1,7 +1,7 @@ /* * History * - * $OpenBSD: calendar.history,v 1.80 2016/11/19 12:41:22 otto Exp $ + * $OpenBSD: calendar.history,v 1.81 2019/01/30 07:24:53 bentley Exp $ */ #ifndef _calendar_history_ @@ -331,7 +331,7 @@ 08/31 Independent union "Solidarnosc" born, Gdansk, 1980 09/01 Bobby Fischer defeats Boris Spassky in World Chess Match, 1972 09/02 Great Britain adopts Gregorian Calendar, 1752 -09/02 Japan signs unconditional surrender on US battleship `Missouri', 1945 +09/02 Japan signs unconditional surrender on US battleship 'Missouri', 1945 09/03 Anniversary of the Founding of the Republic in San Marino 09/04 Napoleon III is deposed and the Third Republic is declared, 1870 09/05 St. Gotthard Tunnel opens in Switzerland, 1980 diff --git a/src/usr.bin/calendar/calendars/calendar.judaic b/src/usr.bin/calendar/calendars/calendar.judaic index fa2937a..417cab3 100644 --- a/src/usr.bin/calendar/calendars/calendar.judaic +++ b/src/usr.bin/calendar/calendars/calendar.judaic @@ -1,13 +1,13 @@ /* * Judaic * - * $OpenBSD: calendar.judaic,v 1.5 2005/09/06 23:42:59 mickey Exp $ + * $OpenBSD: calendar.judaic,v 1.7 2019/03/31 16:10:35 bcallah Exp $ */ #ifndef _calendar_judaic_ #define _calendar_judaic_ -Pesach+163 First Day of Rosh Hashanah (Jewish Lunar New Year; 5741 == 1980; +Pesach+163 First Day of Rosh Hashanah (Jewish Lunar New Year; 5779 == 2018; sabbatical) Pesach+164 Rosh Hashanah (sabbatical) Pesach+166 Fast of Gedalya (Murder of Gedalya and subsequent Exile; fast day) @@ -17,8 +17,9 @@ Pesach+179 Succot (sabbatical) Pesach+184 Hoshanah Rabba (7th day of Succos) Pesach+185 Shmini Atzeres (8th Day of Gathering; sabbatical) Pesach+186 Shmini Atzeres/Simchas Torah (Rejoicing of the Law; sabbatical) -12/12* First Day of Chanukah -12/27* Fast of Asara B'Tevet (Babylonians put siege on Jerusalem; fast day) +12/03* First Day of Chanukah +12/18* Fast of Asara B'Tevet (Babylonians put siege on Jerusalem; fast day) +01/20* Tu B'Shevat (New Year of the Trees) Pesach-31 Fast of Esther (Battle of Purim; fast day) Pesach-30 Purim (Feast of Lots) Pesach-29 Purim (Feast of Lots) @@ -26,11 +27,11 @@ Pesach Pesach (First Day of Passover; sabbatical) Pesach+1 Pesach (sabbatical) Pesach+6 Pesach (sabbatical) Pesach+7 Pesach (Last Day of Passover; 8th day of Pesach; sabbatical) -Pesach+34 Lag Ba`omer (Commemoration of the Great Rebellion) -05/22* Yom Yerushalayim (Reunification of Jerusalem) +Pesach+34 Lag Ba'omer (Commemoration of the Great Rebellion) +06/01* Yom Yerushalayim (Reunification of Jerusalem) Pesach+50 Shavuot (Festival of Weeks; sabbatical) Pesach+51 Shavuot (Festival of Weeks; sabbatical) -07/10* Fast of Shiv'a Asar B'Tammuz (Romans breach Wall of Jerusalem; fast day) +07/21* Fast of Shiv'a Asar B'Tammuz (Romans breach Wall of Jerusalem; fast day) Pesach+81 Fast of Tish'a B'Av (Babylon destroys Holy Temple; fast day) #endif /* !_calendar_judaic_ */ diff --git a/src/usr.bin/calendar/calendars/calendar.music b/src/usr.bin/calendar/calendars/calendar.music index 7f031a0..e05c1b0 100644 --- a/src/usr.bin/calendar/calendars/calendar.music +++ b/src/usr.bin/calendar/calendars/calendar.music @@ -1,7 +1,7 @@ /* * Music * - * $OpenBSD: calendar.music,v 1.34 2016/03/27 18:15:51 tim Exp $ + * $OpenBSD: calendar.music,v 1.36 2019/03/31 19:43:41 sthen Exp $ */ #ifndef _calendar_music_ @@ -19,6 +19,7 @@ 01/08 David Bowie (then David Robert Jones) is born in London, 1947 01/08 Arcangelo Corelli dies in Italy, 1713 01/09 James Patrick Page (Led Zeppelin) is born in Middlesex, England, 1945 +01/09 Scott Walker (born Noel Scott Engel) is born in Hamilton, Ohio, 1943 01/10 Blues guitarist Howlin' Wolf dies in Chicago, 1976 01/10 Jim Croce is born in Philadelphia, 1943 01/10 Pat Benatar is born in Long Island, 1952 @@ -136,6 +137,7 @@ 03/22 Ten Years After plays their last concert, 1974 03/22 Jean-Baptiste Lully dies, 1687 03/22 Vaclav Nelhybel dies, 1996 +03/22 Scott Walker (born Noel Scott Engel) dies in London, England, 2019 03/25 Aretha Franklin is born in Detroit, 1943 03/25 Bela Bartok is born in Nagyszentmiklos, Hungary, 1881 03/25 Claude Debussy dies in Paris, France, 1918 to the sound of World War I @@ -470,7 +472,7 @@ 11/23 Thomas Tallis dies, 1585 11/24 Scott Joplin born near Linden, Texas, 1867 11/25 "The Last Waltz" concert is played by The Band at Winterland, 1976 -11/25 Johann Strauss, Jr., writes `On the Beautiful Blue Danube', 1867 +11/25 Johann Strauss, Jr., writes 'On the Beautiful Blue Danube', 1867 11/25 Virgil Thomson is born in Missouri, 1896 11/26 Cream performs their farewell concert at Royal Albert Hall, 1968 11/26 Paul Hindemith is born in Hanau, Germany, 1895 diff --git a/src/usr.bin/calendar/calendars/calendar.openbsd b/src/usr.bin/calendar/calendars/calendar.openbsd index 373881e..b6b2ef6 100644 --- a/src/usr.bin/calendar/calendars/calendar.openbsd +++ b/src/usr.bin/calendar/calendars/calendar.openbsd @@ -1,7 +1,7 @@ /* * OpenBSD-related dates to celebrate * - * $OpenBSD: calendar.openbsd,v 1.40 2018/04/24 19:14:04 mlarkin Exp $ + * $OpenBSD: calendar.openbsd,v 1.41 2019/01/30 07:24:53 bentley Exp $ */ #ifndef _calendar_openbsd_ @@ -16,7 +16,7 @@ Jan 20 Bind 9 goes into the tree, 2003 Jan 26 Anoncvs service inaugurated, 1996 Jan 26 n2k9: Network hackathon, Basel, Switzerland, 19 developers, 2009 Jan 27 OpenBSD/amd64 port is added, from NetBSD, 2004 -Jan 29 ``second anoncvs server is 100 miles from the first'', 1996 +Jan 29 "second anoncvs server is 100 miles from the first", 1996 Jan 31 OpenBSD/cats port is added, from NetBSD, 2004 Feb 03 Describe the ports mechanism [in OpenBSD], 1997 Feb 13 Unpatented fast block cipher for new password hashing, 1997 @@ -43,7 +43,7 @@ May 05 n2k8: Network hackathon, Ito, Japan, 18 developers, 2008 May 08 c2k3 General hackathon, Calgary, Alberta, 51 developers, 2003 May 09 First commit to OpenBSD stable branch, OPENBSD_2_7, 2000 May 09 OpenBSD/aviion port is added, 2006 -May 19 OpenBSD 2.3 released, including ``ports'' system, 1998 +May 19 OpenBSD 2.3 released, including "ports" system, 1998 May 21 c2k5: General hackathon, Calgary, Alberta, 60 developers, 2005 May 21 c2k6: General hackathon, Calgary, Alberta, 47 developers, 2006 May 24 OpenBSD gets a trunk(4), 2005 diff --git a/src/usr.bin/calendar/calendars/calendar.ushistory b/src/usr.bin/calendar/calendars/calendar.ushistory index a46a542..61adfe1 100644 --- a/src/usr.bin/calendar/calendars/calendar.ushistory +++ b/src/usr.bin/calendar/calendars/calendar.ushistory @@ -1,7 +1,7 @@ /* * USA history * - * $OpenBSD: calendar.ushistory,v 1.7 2017/06/29 07:01:49 jmc Exp $ + * $OpenBSD: calendar.ushistory,v 1.8 2019/01/30 07:24:53 bentley Exp $ */ #ifndef _calendar_ushistory_ @@ -99,7 +99,7 @@ 07/04 New York abstains on Declaration of Independence vote, 1776 07/04 The Louisiana Purchase is announced to the American people, 1803 07/04 Battles of Vicksburg and Gettysburg won by Union forces, 1863 -07/06 First `talkie' (talking motion picture) premiere in New York, 1928 +07/06 First 'talkie' (talking motion picture) premiere in New York, 1928 07/08 First public reading of the Declaration of Independence, 1776 07/08 Liberty Bell cracks while being rung at funeral of John Marshall, 1835 07/09 10-hour working day set by law, NH, 1847 diff --git a/src/usr.bin/calendar/day.c b/src/usr.bin/calendar/day.c index a34e785..c94a844 100644 --- a/src/usr.bin/calendar/day.c +++ b/src/usr.bin/calendar/day.c @@ -1,4 +1,4 @@ -/* $OpenBSD: day.c,v 1.34 2016/09/14 15:09:46 millert Exp $ */ +/* $OpenBSD: day.c,v 1.36 2019/02/01 16:22:53 millert Exp $ */ /* * Copyright (c) 1989, 1993, 1994 @@ -166,7 +166,7 @@ settime(time_t *now) cumdays = daytab[0]; /* Friday displays Monday's events */ offset = tp->tm_wday == 5 ? 3 : 1; - if (f_SetdayAfter) + if (f_Setday) offset = 0; /* Except not when range is set explicitly */ header[5].iov_base = dayname; diff --git a/src/usr.bin/calendar/io.c b/src/usr.bin/calendar/io.c index 7d4353e..3a58850 100644 --- a/src/usr.bin/calendar/io.c +++ b/src/usr.bin/calendar/io.c @@ -1,4 +1,4 @@ -/* $OpenBSD: io.c,v 1.47 2017/09/25 19:13:56 krw Exp $ */ +/* $OpenBSD: io.c,v 1.48 2019/01/29 22:28:30 tedu Exp $ */ /* * Copyright (c) 1989, 1993, 1994 @@ -326,7 +326,7 @@ opencal(void) if (!(chdir(home) == 0 && chdir(calendarHome) == 0 && (fdin = open(calendarFile, O_RDONLY)) != -1)) - errx(1, "no calendar file: ``%s'' or ``~/%s/%s''", + errx(1, "no calendar file: \"%s\" or \"~/%s/%s\"", calendarFile, calendarHome, calendarFile); } } diff --git a/src/usr.bin/calendar/ostern.c b/src/usr.bin/calendar/ostern.c index 85d4d47..536e7b8 100644 --- a/src/usr.bin/calendar/ostern.c +++ b/src/usr.bin/calendar/ostern.c @@ -1,4 +1,4 @@ -/* $OpenBSD: ostern.c,v 1.8 2015/03/15 00:41:28 millert Exp $ */ +/* $OpenBSD: ostern.c,v 1.9 2019/01/17 06:15:44 tedu Exp $ */ /* * Copyright (c) 1996 Wolfram Schneider <wosch@FreeBSD.org>. Berlin. @@ -24,8 +24,6 @@ * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. - * - * $Id: ostern.c,v 1.8 2015/03/15 00:41:28 millert Exp $ */ #include <stdio.h> |