From f173f39f9f09921eba6733eccef2eca6b150491e Mon Sep 17 00:00:00 2001 From: "Todd C. Miller" Date: Sat, 30 Jun 2007 13:20:43 +0000 Subject: Update to tzcode2007f from elsie.nci.nih.gov --- lib/libc/time/Theory | 8 +++---- lib/libc/time/ialloc.c | 4 ++-- lib/libc/time/private.h | 6 ++--- lib/libc/time/tz-art.htm | 52 ++++++++++++++++++++++++++++++++++++++++++- lib/libc/time/tz-link.htm | 16 +++++++++----- lib/libc/time/zdump.c | 6 ++--- lib/libc/time/zic.8 | 6 ++--- lib/libc/time/zic.c | 56 ++++++++++++++++++++++++++++------------------- 8 files changed, 110 insertions(+), 44 deletions(-) diff --git a/lib/libc/time/Theory b/lib/libc/time/Theory index 0ba9235f5f6..d5a9f5092c4 100644 --- a/lib/libc/time/Theory +++ b/lib/libc/time/Theory @@ -1,5 +1,5 @@ -$OpenBSD: Theory,v 1.12 2007/02/06 19:35:16 millert Exp $ -@(#)Theory 8.1 +$OpenBSD: Theory,v 1.13 2007/06/30 13:20:42 millert Exp $ +@(#)Theory 8.2 ----- Outline ----- @@ -66,11 +66,11 @@ POSIX has the following properties and limitations. where week 1 is the first week in which day d appears, and `5' stands for the last week in which day d appears (which may be either the 4th or 5th week). - + Here is an example POSIX TZ string, for US Pacific time using rules appropriate from 1987 through 2006: - TZ='PST8PDT,M4.1.0/02:00,M10.5.0/02:00' + TZ='PST8PDT,M4.1.0/02:00,M10.5.0/02:00' This POSIX TZ string is hard to remember, and mishandles time stamps before 1987 and after 2006. With this package you can use this diff --git a/lib/libc/time/ialloc.c b/lib/libc/time/ialloc.c index 4de6ab915a6..1a110dd2bec 100644 --- a/lib/libc/time/ialloc.c +++ b/lib/libc/time/ialloc.c @@ -1,4 +1,4 @@ -/* $OpenBSD: ialloc.c,v 1.10 2005/08/08 08:05:38 espie Exp $ */ +/* $OpenBSD: ialloc.c,v 1.11 2007/06/30 13:20:42 millert Exp $ */ /* ** This file is in the public domain, so clarified as of ** Feb 14, 2003 by Arthur David Olson (arthur_david_olson@nih.gov). @@ -59,7 +59,7 @@ const char * const new; oldsize = strlen(old); if ((result = irealloc(old, oldsize + newsize + 1)) != NULL) if (new != NULL) - (void) strlcpy(result + oldsize, new, newsize + 1); + (void) memcpy(result + oldsize, new, newsize + 1); return result; } diff --git a/lib/libc/time/private.h b/lib/libc/time/private.h index 933029fb6cb..869fe8603ca 100644 --- a/lib/libc/time/private.h +++ b/lib/libc/time/private.h @@ -1,4 +1,4 @@ -/* $OpenBSD: private.h,v 1.19 2007/02/06 19:35:16 millert Exp $ */ +/* $OpenBSD: private.h,v 1.20 2007/06/30 13:20:42 millert Exp $ */ #ifndef PRIVATE_H #define PRIVATE_H @@ -33,7 +33,7 @@ #if 0 #ifndef lint #ifndef NOID -static char privatehid[] = "@(#)private.h 8.2"; +static char privatehid[] = "@(#)private.h 8.3"; #endif /* !defined NOID */ #endif /* !defined lint */ #endif @@ -360,7 +360,7 @@ char *ctime_r P((time_t const *, char *)); #ifndef SECSPERREPEAT #define SECSPERREPEAT ((int_fast64_t) YEARSPERREPEAT * (int_fast64_t) AVGSECSPERYEAR) #endif /* !defined SECSPERREPEAT */ - + #ifndef SECSPERREPEAT_BITS #define SECSPERREPEAT_BITS 34 /* ceil(log2(SECSPERREPEAT)) */ #endif /* !defined SECSPERREPEAT_BITS */ diff --git a/lib/libc/time/tz-art.htm b/lib/libc/time/tz-art.htm index c23c5176ff7..53ff94ec902 100644 --- a/lib/libc/time/tz-art.htm +++ b/lib/libc/time/tz-art.htm @@ -9,7 +9,7 @@ PUBLIC "-//W3C//DTD HTML 4.01//EN"

Time and the Arts

-@(#)tz-art.htm 8.5 +@(#)tz-art.htm 8.6

Please send corrections to this web page to the @@ -178,6 +178,56 @@ Richard Teitelbaum, modular moog and micromoog synthesizer NotesIncludes the song "Central Standard Time." Thanks to Colin Bowern for this information. AMG Rating2.5 stars   + +ArtistColdplay +SongClocks +Copyright Date2003 +LabelCapitol Records +ID52608 +Total Time4:13 +NotesWon the 2004 Record of the Year honor at the +Grammy Awards. Co-written and performed by Chris Martin, +great-great-grandson of DST inventor William Willett. The song's first +line is "Lights go out and I can't be saved". +  + +ArtistIrving Kahal and Harry Richman +SongThere Ought to be a Moonlight Saving Time +Copyright Date1931 +NotesThis musical standard was a #1 hit for Guy Lombardo +in 1931, and was also performed by Maurice Chevalier, Blossom Dearie +and many others. The phrase "Moonlight saving time" also appears in +the 1995 country song "Not Enough Hours in the Night" written by Aaron +Barker, Kim Williams and Rob Harbin and performed by Doug +Supernaw. +  + +TV episode titleThe Lost Hour +TV seriesEerie, Indiana +TV episode number10 +NetworkNBC +Air date1991-12-01 +NotesDespite Indiana's then-lack of DST, Marshall changes his clock with unusual consequences. +  + +TV episode titleTime Tunnel +TV seriesThe Adventures of Pete & Pete +TV episode number5, season 2 +NetworkNickelodeon +Air date1994-10-23 +NotesThe two Petes travel back in time an hour on the day that DST ends. +  + +TV episode titleKing-Size Homer +TV seriesThe Simpsons +TV episode number135 +NetworkFox +Air date1995-11-05 +NotesHomer, working from home, remarks "8:58, first +time I've ever been early for work. Except for all those daylight +savings days. Lousy farmers." +  + ArtistJules Verne BookLe Tour du Monde en Quatre-Vingts Jours (Around the World in Eighty Days) diff --git a/lib/libc/time/tz-link.htm b/lib/libc/time/tz-link.htm index c467df53f2f..ff3bc58ce2d 100644 --- a/lib/libc/time/tz-link.htm +++ b/lib/libc/time/tz-link.htm @@ -8,7 +8,7 @@ - + @@ -18,7 +18,7 @@

Sources for Time Zone and Daylight Saving Time Data

-@(#)tz-link.htm 8.10 +@(#)tz-link.htm 8.11

Please send corrections to this web page to the @@ -49,6 +49,7 @@ C Library used in Cygwin, DJGPP, +AIX, HP-UX, IRIX, Mac OS X, @@ -176,13 +177,18 @@ href="http://www.w3.org/2000/01/foo">schema was sketched out.

Other tz compilers