diff options
| author | obrien <obrien@FreeBSD.org> | 2013-02-08 16:10:16 +0000 |
|---|---|---|
| committer | obrien <obrien@FreeBSD.org> | 2013-02-08 16:10:16 +0000 |
| commit | 3028e3f8aba938dfd0bf9fda987b8a72140b8027 (patch) | |
| tree | b2f038222ff8a70f687652441df00d2b564c8abe /usr.bin/calendar | |
| parent | 952a6d5a7cd3d3f9007acfa06805262fc04a105f (diff) | |
| parent | 1d08d5f677c1dfa810e381073590adbae19cc69f (diff) | |
| download | FreeBSD-src-3028e3f8aba938dfd0bf9fda987b8a72140b8027.zip FreeBSD-src-3028e3f8aba938dfd0bf9fda987b8a72140b8027.tar.gz | |
Sync with HEAD.
Diffstat (limited to 'usr.bin/calendar')
| -rw-r--r-- | usr.bin/calendar/calendars/calendar.freebsd | 2 | ||||
| -rw-r--r-- | usr.bin/calendar/calendars/calendar.history | 2 | ||||
| -rw-r--r-- | usr.bin/calendar/parsedata.c | 12 |
3 files changed, 8 insertions, 8 deletions
diff --git a/usr.bin/calendar/calendars/calendar.freebsd b/usr.bin/calendar/calendars/calendar.freebsd index 5f517a6..f7f449b 100644 --- a/usr.bin/calendar/calendars/calendar.freebsd +++ b/usr.bin/calendar/calendars/calendar.freebsd @@ -165,6 +165,7 @@ 05/22 Clive Tong-I Lin <clive@FreeBSD.org> born in Changhua, Taiwan, Republic of China, 1978 05/22 Michael Bushkov <bushman@FreeBSD.org> born in Rostov-on-Don, Russian Federation, 1985 05/22 Rui Paulo <rpaulo@FreeBSD.org> born in Evora, Portugal, 1986 +05/22 David Naylor <dbn@FreeBSD.org> born in Johannesburg, South Africa, 1988 05/23 Munechika Sumikawa <sumikawa@FreeBSD.org> born in Osaka, Osaka, Japan, 1972 05/24 Duncan McLennan Barclay <dmlb@FreeBSD.org> born in London, Middlesex, United Kingdom, 1970 05/24 Oliver Lehmann <oliver@FreeBSD.org> born in Karlsburg, Germany, 1981 @@ -297,6 +298,7 @@ 09/30 Hiten M. Pandya <hmp@FreeBSD.org> born in Dar-es-Salaam, Tanzania, East Africa, 1986 09/30 Third quarter status reports are due on 10/15 10/02 Beat Gaetzi <beat@FreeBSD.org> born in Zurich, Switzerland, 1980 +10/02 Grzegorz Blach <gblach@FreeBSD.org> born in Starachowice, Poland, 1985 10/05 Hiroki Sato <hrs@FreeBSD.org> born in Yamagata, Japan, 1977 10/05 Chris Costello <chris@FreeBSD.org> born in Houston, Texas, United States, 1985 10/09 Stefan Walter <stefan@FreeBSD.org> born in Werne, Nordrhein-Westfalen, Germany, 1978 diff --git a/usr.bin/calendar/calendars/calendar.history b/usr.bin/calendar/calendars/calendar.history index de8fb00..a05a6ff 100644 --- a/usr.bin/calendar/calendars/calendar.history +++ b/usr.bin/calendar/calendars/calendar.history @@ -411,7 +411,7 @@ 11/09 Roosevelt establishes the Civil Works Administration, 1933 11/10 41 Women arrested in suffragette demonstrations near White House, 1917 11/10 Cpt. Wirz, commandant of Andersonville Prison hanged, 1865 -11/10 Henry Stanley asks David Livingston, "Dr. Livingston, I presume?", 1871 +11/10 Henry Stanley asks David Livingstone, "Dr. Livingstone, I presume?", 1871 11/11 Washington becomes the 42nd state, 1889 11/12 Dr. Sun Yat-sen's Birthday in Taiwan 11/12 USA first exports oil to Europe, 1861 diff --git a/usr.bin/calendar/parsedata.c b/usr.bin/calendar/parsedata.c index 63e4395..4ece663 100644 --- a/usr.bin/calendar/parsedata.c +++ b/usr.bin/calendar/parsedata.c @@ -940,15 +940,13 @@ indextooffset(char *s) { int i; struct fixs *n; + char *es; if (s[0] == '+' || s[0] == '-') { - char ss[9]; - for (i = -100; i < 100; i++) { - sprintf(ss, "%s%d", (i > 0) ? "+" : "", i); - if (strcmp(ss, s) == 0) - return (i); - } - return (0); + i = strtol (s, &es, 10); + if (*es != '\0') /* trailing junk */ + errx (1, "Invalid specifier format: %s\n", s); + return (i); } for (i = 0; i < 6; i++) { |
