From 2c7dad3eead265b21d5a1e48e74bcdb54df03a8d Mon Sep 17 00:00:00 2001 From: Wolfgang Helbig Date: Sun, 8 Mar 1998 09:19:48 +0000 Subject: [PATCH] Replaced by ncal --- usr.bin/cal/Makefile | 5 - usr.bin/cal/README | 42 ----- usr.bin/cal/cal.1 | 82 -------- usr.bin/cal/cal.c | 441 ------------------------------------------- 4 files changed, 570 deletions(-) delete mode 100644 usr.bin/cal/Makefile delete mode 100644 usr.bin/cal/README delete mode 100644 usr.bin/cal/cal.1 delete mode 100644 usr.bin/cal/cal.c diff --git a/usr.bin/cal/Makefile b/usr.bin/cal/Makefile deleted file mode 100644 index aed0afa4e7cd..000000000000 --- a/usr.bin/cal/Makefile +++ /dev/null @@ -1,5 +0,0 @@ -# @(#)Makefile 8.1 (Berkeley) 6/6/93 - -PROG= cal - -.include diff --git a/usr.bin/cal/README b/usr.bin/cal/README deleted file mode 100644 index 638ac9dffb6e..000000000000 --- a/usr.bin/cal/README +++ /dev/null @@ -1,42 +0,0 @@ -The cal(1) date routines were written from scratch, basically from first -principles. The algorithm for calculating the day of week from any -Gregorian date was "reverse engineered". This was necessary as most of -the documented algorithms have to do with date calculations for other -calendars (e.g. julian) and are only accurate when converted to gregorian -within a narrow range of dates. - -1 Jan 1 is a Saturday because that's what cal says and I couldn't change -that even if I was dumb enough to try. From this we can easily calculate -the day of week for any date. The algorithm for a zero based day of week: - - calculate the number of days in all prior years (year-1)*365 - add the number of leap years (days?) since year 1 - (not including this year as that is covered later) - add the day number within the year - this compensates for the non-inclusive leap year - calculation - if the day in question occurs before the gregorian reformation - (3 sep 1752 for our purposes), then simply return - (value so far - 1 + SATURDAY's value of 6) modulo 7. - if the day in question occurs during the reformation (3 sep 1752 - to 13 sep 1752 inclusive) return THURSDAY. This is my - idea of what happened then. It does not matter much as - this program never tries to find day of week for any day - that is not the first of a month. - otherwise, after the reformation, use the same formula as the - days before with the additional step of subtracting the - number of days (11) that were adjusted out of the calendar - just before taking the modulo. - -It must be noted that the number of leap years calculation is sensitive -to the date for which the leap year is being calculated. A year that occurs -before the reformation is determined to be a leap year if its modulo of -4 equals zero. But after the reformation, a year is only a leap year if -its modulo of 4 equals zero and its modulo of 100 does not. Of course, -there is an exception for these century years. If the modulo of 400 equals -zero, then the year is a leap year anyway. This is, in fact, what the -gregorian reformation was all about (a bit of error in the old algorithm -that caused the calendar to be inaccurate.) - -Once we have the day in year for the first of the month in question, the -rest is trivial. diff --git a/usr.bin/cal/cal.1 b/usr.bin/cal/cal.1 deleted file mode 100644 index ebfcb84abbbb..000000000000 --- a/usr.bin/cal/cal.1 +++ /dev/null @@ -1,82 +0,0 @@ -.\" Copyright (c) 1989, 1990, 1993 -.\" The Regents of the University of California. All rights reserved. -.\" -.\" This code is derived from software contributed to Berkeley by -.\" Kim Letkeman. -.\" -.\" Redistribution and use in source and binary forms, with or without -.\" modification, are permitted provided that the following conditions -.\" are met: -.\" 1. Redistributions of source code must retain the above copyright -.\" notice, this list of conditions and the following disclaimer. -.\" 2. Redistributions in binary form must reproduce the above copyright -.\" notice, this list of conditions and the following disclaimer in the -.\" documentation and/or other materials provided with the distribution. -.\" 3. All advertising materials mentioning features or use of this software -.\" must display the following acknowledgement: -.\" This product includes software developed by the University of -.\" California, Berkeley and its contributors. -.\" 4. Neither the name of the University nor the names of its contributors -.\" may be used to endorse or promote products derived from this software -.\" without specific prior written permission. -.\" -.\" THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND -.\" ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE -.\" IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE -.\" ARE DISCLAIMED. IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE -.\" FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL -.\" DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS -.\" OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) -.\" HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT -.\" 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. -.\" -.\" @(#)cal.1 8.2 (Berkeley) 4/28/95 -.\" -.Dd April 28, 1995 -.Dt CAL 1 -.Os -.Sh NAME -.Nm cal -.Nd displays a calendar -.Sh SYNOPSIS -.Nm cal -.Op Fl jy -.Op Oo Ar month Oc Ar \ year -.Sh DESCRIPTION -.Nm Cal -displays a simple calendar. -If arguments are not specified, -the current month is displayed. -The options are as follows: -.Bl -tag -width Ds -.It Fl j -Display julian dates (days one-based, numbered from January 1). -.It Fl y -Display a calendar for the current year. -.El -.Pp -A single parameter specifies the year (1 - 9999) to be displayed; -note the year must be fully specified: -.Dq Li cal 89 -will -.Em not -display a calendar for 1989. -Two parameters denote the month (1 - 12) and year. -If no parameters are specified, the current month's calendar is -displayed. -.Pp -A year starts on Jan 1. -.Pp -The Gregorian Reformation is assumed to have occurred in 1752 after the 2nd -of September. -By this time, most countries had recognized the reformation (although a -few did not recognize it until the early 1900's.) -Eleven days following that date were eliminated by the reformation, so the -calendar for that month is a bit unusual. -.Sh HISTORY -A -.Nm -command appeared in -.At v6 . diff --git a/usr.bin/cal/cal.c b/usr.bin/cal/cal.c deleted file mode 100644 index fbd58eecc832..000000000000 --- a/usr.bin/cal/cal.c +++ /dev/null @@ -1,441 +0,0 @@ -/* - * Copyright (c) 1989, 1993, 1994 - * The Regents of the University of California. All rights reserved. - * - * This code is derived from software contributed to Berkeley by - * Kim Letkeman. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions - * are met: - * 1. Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * 2. Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer in the - * documentation and/or other materials provided with the distribution. - * 3. All advertising materials mentioning features or use of this software - * must display the following acknowledgement: - * This product includes software developed by the University of - * California, Berkeley and its contributors. - * 4. Neither the name of the University nor the names of its contributors - * may be used to endorse or promote products derived from this software - * without specific prior written permission. - * - * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND - * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE - * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE - * ARE DISCLAIMED. IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE - * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL - * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS - * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) - * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT - * 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. - */ - -#ifndef lint -static char copyright[] = -"@(#) Copyright (c) 1989, 1993, 1994\n\ - The Regents of the University of California. All rights reserved.\n"; -#endif /* not lint */ - -#ifndef lint -static char sccsid[] = "@(#)cal.c 8.4 (Berkeley) 4/2/94"; -#endif /* not lint */ - -#include - -#include -#include -#include -#include -#include -#include -#include -#include - -#define THURSDAY 4 /* for reformation */ -#define SATURDAY 6 /* 1 Jan 1 was a Saturday */ - -#define FIRST_MISSING_DAY 639787 /* 3 Sep 1752 */ -#define NUMBER_MISSING_DAYS 11 /* 11 day correction */ - -#define MAXDAYS 42 /* max slots in a month array */ -#define SPACE -1 /* used in day array */ - -static int days_in_month[2][13] = { - {0, 31, 28, 31, 30, 31, 30, 31, 31, 30, 31, 30, 31}, - {0, 31, 29, 31, 30, 31, 30, 31, 31, 30, 31, 30, 31}, -}; - -int sep1752[MAXDAYS] = { - SPACE, SPACE, 1, 2, 14, 15, 16, - 17, 18, 19, 20, 21, 22, 23, - 24, 25, 26, 27, 28, 29, 30, - SPACE, SPACE, SPACE, SPACE, SPACE, SPACE, SPACE, - SPACE, SPACE, SPACE, SPACE, SPACE, SPACE, SPACE, - SPACE, SPACE, SPACE, SPACE, SPACE, SPACE, SPACE, -}, j_sep1752[MAXDAYS] = { - SPACE, SPACE, 245, 246, 258, 259, 260, - 261, 262, 263, 264, 265, 266, 267, - 268, 269, 270, 271, 272, 273, 274, - SPACE, SPACE, SPACE, SPACE, SPACE, SPACE, SPACE, - SPACE, SPACE, SPACE, SPACE, SPACE, SPACE, SPACE, - SPACE, SPACE, SPACE, SPACE, SPACE, SPACE, SPACE, -}, empty[MAXDAYS] = { - SPACE, SPACE, SPACE, SPACE, SPACE, SPACE, SPACE, - SPACE, SPACE, SPACE, SPACE, SPACE, SPACE, SPACE, - SPACE, SPACE, SPACE, SPACE, SPACE, SPACE, SPACE, - SPACE, SPACE, SPACE, SPACE, SPACE, SPACE, SPACE, - SPACE, SPACE, SPACE, SPACE, SPACE, SPACE, SPACE, - SPACE, SPACE, SPACE, SPACE, SPACE, SPACE, SPACE, -}; - -char *month_names[12]; - -char day_headings[] = " "; -char j_day_headings[] = " "; - -/* leap year -- account for gregorian reformation in 1752 */ -#define leap_year(yr) \ - ((yr) <= 1752 ? !((yr) % 4) : \ - !((yr) % 4) && ((yr) % 100) || !((yr) % 400)) - -/* number of centuries since 1700, not inclusive */ -#define centuries_since_1700(yr) \ - ((yr) > 1700 ? (yr) / 100 - 17 : 0) - -/* number of centuries since 1700 whose modulo of 400 is 0 */ -#define quad_centuries_since_1700(yr) \ - ((yr) > 1600 ? ((yr) - 1600) / 400 : 0) - -/* number of leap years between year 1 and this year, not inclusive */ -#define leap_years_since_year_1(yr) \ - ((yr) / 4 - centuries_since_1700(yr) + quad_centuries_since_1700(yr)) - -int julian; - -void ascii_day __P((char *, int)); -void center __P((char *, int, int)); -void day_array __P((int, int, int *)); -int day_in_week __P((int, int, int)); -int day_in_year __P((int, int, int)); -void j_yearly __P((int)); -void monthly __P((int, int)); -void trim_trailing_spaces __P((char *)); -void usage __P((void)); -void yearly __P((int)); - -int -main(argc, argv) - int argc; - char **argv; -{ - struct tm *local_time; - static struct tm zero_tm; - time_t now; - int ch, month, year, yflag, i; - char buf[40]; - - (void) setlocale(LC_TIME, ""); - - yflag = 0; - while ((ch = getopt(argc, argv, "jy")) != -1) - switch(ch) { - case 'j': - julian = 1; - break; - case 'y': - yflag = 1; - break; - case '?': - default: - usage(); - } - argc -= optind; - argv += optind; - - month = 0; - switch(argc) { - case 2: - if ((month = atoi(*argv++)) < 1 || month > 12) - errx(1, "illegal month value: use 1-12"); - /* FALLTHROUGH */ - case 1: - if ((year = atoi(*argv)) < 1 || year > 9999) - errx(1, "illegal year value: use 1-9999"); - break; - case 0: - (void)time(&now); - local_time = localtime(&now); - year = local_time->tm_year + 1900; - if (!yflag) - month = local_time->tm_mon + 1; - break; - default: - usage(); - } - - for (i = 0; i < 12; i++) { - zero_tm.tm_mon = i; - strftime(buf, sizeof(buf), "%B", &zero_tm); - month_names[i] = strdup(buf); - } - for (i = 0; i < 7; i++) { - zero_tm.tm_wday = i; - strftime(buf, sizeof(buf), "%a", &zero_tm); - strncpy(day_headings + i * 3, buf, 2); - strncpy(j_day_headings + i * 4 + 1, buf, 2); - } - - if (month) - monthly(month, year); - else if (julian) - j_yearly(year); - else - yearly(year); - exit(0); -} - -#define DAY_LEN 3 /* 3 spaces per day */ -#define J_DAY_LEN 4 /* 4 spaces per day */ -#define WEEK_LEN 20 /* 7 * 3 - one space at the end */ -#define J_WEEK_LEN 27 /* 7 * 4 - one space at the end */ -#define HEAD_SEP 2 /* spaces between day headings */ -#define J_HEAD_SEP 2 - -void -monthly(month, year) - int month, year; -{ - int col, row, len, days[MAXDAYS]; - char *p, lineout[30]; - - day_array(month, year, days); - len = sprintf(lineout, "%s %d", month_names[month - 1], year); - (void)printf("%*s%s\n%s\n", - ((julian ? J_WEEK_LEN : WEEK_LEN) - len) / 2, "", - lineout, julian ? j_day_headings : day_headings); - for (row = 0; row < 6; row++) { - for (col = 0, p = lineout; col < 7; col++, - p += julian ? J_DAY_LEN : DAY_LEN) - ascii_day(p, days[row * 7 + col]); - *p = '\0'; - trim_trailing_spaces(lineout); - (void)printf("%s\n", lineout); - } -} - -void -j_yearly(year) - int year; -{ - int col, *dp, i, month, row, which_cal; - int days[12][MAXDAYS]; - char *p, lineout[80]; - - (void)sprintf(lineout, "%d", year); - center(lineout, J_WEEK_LEN * 2 + J_HEAD_SEP, 0); - (void)printf("\n\n"); - for (i = 0; i < 12; i++) - day_array(i + 1, year, days[i]); - (void)memset(lineout, ' ', sizeof(lineout) - 1); - lineout[sizeof(lineout) - 1] = '\0'; - for (month = 0; month < 12; month += 2) { - center(month_names[month], J_WEEK_LEN, J_HEAD_SEP); - center(month_names[month + 1], J_WEEK_LEN, 0); - (void)printf("\n%s%*s%s\n", j_day_headings, J_HEAD_SEP, "", - j_day_headings); - for (row = 0; row < 6; row++) { - for (which_cal = 0; which_cal < 2; which_cal++) { - p = lineout + which_cal * (J_WEEK_LEN + 2); - dp = &days[month + which_cal][row * 7]; - for (col = 0; col < 7; col++, p += J_DAY_LEN) - ascii_day(p, *dp++); - } - *p = '\0'; - trim_trailing_spaces(lineout); - (void)printf("%s\n", lineout); - } - } - (void)printf("\n"); -} - -void -yearly(year) - int year; -{ - int col, *dp, i, month, row, which_cal; - int days[12][MAXDAYS]; - char *p, lineout[80]; - - (void)sprintf(lineout, "%d", year); - center(lineout, WEEK_LEN * 3 + HEAD_SEP * 2, 0); - (void)printf("\n\n"); - for (i = 0; i < 12; i++) - day_array(i + 1, year, days[i]); - (void)memset(lineout, ' ', sizeof(lineout) - 1); - lineout[sizeof(lineout) - 1] = '\0'; - for (month = 0; month < 12; month += 3) { - center(month_names[month], WEEK_LEN, HEAD_SEP); - center(month_names[month + 1], WEEK_LEN, HEAD_SEP); - center(month_names[month + 2], WEEK_LEN, 0); - (void)printf("\n%s%*s%s%*s%s\n", day_headings, HEAD_SEP, - "", day_headings, HEAD_SEP, "", day_headings); - for (row = 0; row < 6; row++) { - for (which_cal = 0; which_cal < 3; which_cal++) { - p = lineout + which_cal * (WEEK_LEN + 2); - dp = &days[month + which_cal][row * 7]; - for (col = 0; col < 7; col++, p += DAY_LEN) - ascii_day(p, *dp++); - } - *p = '\0'; - trim_trailing_spaces(lineout); - (void)printf("%s\n", lineout); - } - } - (void)printf("\n"); -} - -/* - * day_array -- - * Fill in an array of 42 integers with a calendar. Assume for a moment - * that you took the (maximum) 6 rows in a calendar and stretched them - * out end to end. You would have 42 numbers or spaces. This routine - * builds that array for any month from Jan. 1 through Dec. 9999. - */ -void -day_array(month, year, days) - int month, year; - int *days; -{ - int day, dw, dm; - - if (month == 9 && year == 1752) { - memmove(days, - julian ? j_sep1752 : sep1752, MAXDAYS * sizeof(int)); - return; - } - memmove(days, empty, MAXDAYS * sizeof(int)); - dm = days_in_month[leap_year(year)][month]; - dw = day_in_week(1, month, year); - day = julian ? day_in_year(1, month, year) : 1; - while (dm--) - days[dw++] = day++; -} - -/* - * day_in_year -- - * return the 1 based day number within the year - */ -int -day_in_year(day, month, year) - int day, month, year; -{ - int i, leap; - - leap = leap_year(year); - for (i = 1; i < month; i++) - day += days_in_month[leap][i]; - return (day); -} - -/* - * day_in_week - * return the 0 based day number for any date from 1 Jan. 1 to - * 31 Dec. 9999. Assumes the Gregorian reformation eliminates - * 3 Sep. 1752 through 13 Sep. 1752. Returns Thursday for all - * missing days. - */ -int -day_in_week(day, month, year) - int day, month, year; -{ - long temp; - - temp = (long)(year - 1) * 365 + leap_years_since_year_1(year - 1) - + day_in_year(day, month, year); - if (temp < FIRST_MISSING_DAY) - return ((temp - 1 + SATURDAY) % 7); - if (temp >= (FIRST_MISSING_DAY + NUMBER_MISSING_DAYS)) - return (((temp - 1 + SATURDAY) - NUMBER_MISSING_DAYS) % 7); - return (THURSDAY); -} - -void -ascii_day(p, day) - char *p; - int day; -{ - int display, val; - static char *aday[] = { - "", - " 1", " 2", " 3", " 4", " 5", " 6", " 7", - " 8", " 9", "10", "11", "12", "13", "14", - "15", "16", "17", "18", "19", "20", "21", - "22", "23", "24", "25", "26", "27", "28", - "29", "30", "31", - }; - - if (day == SPACE) { - memset(p, ' ', julian ? J_DAY_LEN : DAY_LEN); - return; - } - if (julian) { - if (val = day / 100) { - day %= 100; - *p++ = val + '0'; - display = 1; - } else { - *p++ = ' '; - display = 0; - } - val = day / 10; - if (val || display) - *p++ = val + '0'; - else - *p++ = ' '; - *p++ = day % 10 + '0'; - } else { - *p++ = aday[day][0]; - *p++ = aday[day][1]; - } - *p = ' '; -} - -void -trim_trailing_spaces(s) - char *s; -{ - char *p; - - for (p = s; *p; ++p) - continue; - while (p > s && isspace(*--p)) - continue; - if (p > s) - ++p; - *p = '\0'; -} - -void -center(str, len, separate) - char *str; - int len; - int separate; -{ - - len -= strlen(str); - (void)printf("%*s%s%*s", len / 2, "", str, len / 2 + len % 2, ""); - if (separate) - (void)printf("%*s", separate, ""); -} - -void -usage() -{ - - (void)fprintf(stderr, "usage: cal [-jy] [[month] year]\n"); - exit(1); -}