===================================================================
RCS file: /cvsrepo/anoncvs/cvs/src/usr.bin/cvs/date.y,v
retrieving revision 1.3
retrieving revision 1.4
diff -c -r1.3 -r1.4
*** src/usr.bin/cvs/date.y	2005/03/24 15:40:43	1.3
--- src/usr.bin/cvs/date.y	2005/03/28 22:40:58	1.4
***************
*** 1,5 ****
  %{
! /*	$OpenBSD: date.y,v 1.3 2005/03/24 15:40:43 jfb Exp $	*/
  
  /*
  **  Originally written by Steven M. Bellovin <smb@research.att.com> while
--- 1,5 ----
  %{
! /*	$OpenBSD: date.y,v 1.4 2005/03/28 22:40:58 jfb Exp $	*/
  
  /*
  **  Originally written by Steven M. Bellovin <smb@research.att.com> while
***************
*** 40,66 ****
  } TABLE;
  
  
! /*
! **  Daylight-savings mode:  on, off, or not yet known.
! */
  typedef enum _DSTMODE {
  	DSTon, DSToff, DSTmaybe
  } DSTMODE;
  
! /*
! **  Meridian:  am, pm, or 24-hour style.
! */
  typedef enum _MERIDIAN {
  	MERam, MERpm, MER24
  } MERIDIAN;
  
  
  /*
! **  Global variables.  We could get rid of most of these by using a good
! **  union as the yacc stack.  (This routine was originally written before
! **  yacc had the %union construct.)  Maybe someday; right now we only use
! **  the %union very rarely.
! */
  static char	*yyInput;
  static DSTMODE	yyDSTmode;
  static time_t	yyDayOrdinal;
--- 40,62 ----
  } TABLE;
  
  
! /*  Daylight-savings mode:  on, off, or not yet known. */
  typedef enum _DSTMODE {
  	DSTon, DSToff, DSTmaybe
  } DSTMODE;
  
! /*  Meridian:  am, pm, or 24-hour style. */
  typedef enum _MERIDIAN {
  	MERam, MERpm, MER24
  } MERIDIAN;
  
  
  /*
!  *  Global variables.  We could get rid of most of these by using a good
!  *  union as the yacc stack.  (This routine was originally written before
!  *  yacc had the %union construct.)  Maybe someday; right now we only use
!  *  the %union very rarely.
!  */
  static char	*yyInput;
  static DSTMODE	yyDSTmode;
  static time_t	yyDayOrdinal;
***************
*** 379,390 ****
  /* Some of these are commented out because a time_t can't store a float. */
  static TABLE const TimezoneTable[] = {
  	{ "gmt",	tZONE,     HOUR( 0) },	/* Greenwich Mean */
! 	{ "ut",	tZONE,     HOUR( 0) },	/* Universal (Coordinated) */
  	{ "utc",	tZONE,     HOUR( 0) },
  	{ "wet",	tZONE,     HOUR( 0) },	/* Western European */
  	{ "bst",	tDAYZONE,  HOUR( 0) },	/* British Summer */
  	{ "wat",	tZONE,     HOUR( 1) },	/* West Africa */
! 	{ "at",	tZONE,     HOUR( 2) },	/* Azores */
  #if	0
  	/* For completeness.  BST is also British Summer, and GST is
  	 * also Guam Standard. */
--- 375,386 ----
  /* Some of these are commented out because a time_t can't store a float. */
  static TABLE const TimezoneTable[] = {
  	{ "gmt",	tZONE,     HOUR( 0) },	/* Greenwich Mean */
! 	{ "ut",		tZONE,     HOUR( 0) },	/* Universal (Coordinated) */
  	{ "utc",	tZONE,     HOUR( 0) },
  	{ "wet",	tZONE,     HOUR( 0) },	/* Western European */
  	{ "bst",	tDAYZONE,  HOUR( 0) },	/* British Summer */
  	{ "wat",	tZONE,     HOUR( 1) },	/* West Africa */
! 	{ "at",		tZONE,     HOUR( 2) },	/* Azores */
  #if	0
  	/* For completeness.  BST is also British Summer, and GST is
  	 * also Guam Standard. */
***************
*** 412,418 ****
  	{ "hdt",	tDAYZONE,  HOUR(10) },	/* Hawaii Daylight */
  	{ "cat",	tZONE,     HOUR(10) },	/* Central Alaska */
  	{ "ahst",	tZONE,     HOUR(10) },	/* Alaska-Hawaii Standard */
! 	{ "nt",	tZONE,     HOUR(11) },	/* Nome */
  	{ "idlw",	tZONE,     HOUR(12) },	/* International Date Line West */
  	{ "cet",	tZONE,     -HOUR(1) },	/* Central European */
  	{ "met",	tZONE,     -HOUR(1) },	/* Middle European */
--- 408,414 ----
  	{ "hdt",	tDAYZONE,  HOUR(10) },	/* Hawaii Daylight */
  	{ "cat",	tZONE,     HOUR(10) },	/* Central Alaska */
  	{ "ahst",	tZONE,     HOUR(10) },	/* Alaska-Hawaii Standard */
! 	{ "nt",		tZONE,     HOUR(11) },	/* Nome */
  	{ "idlw",	tZONE,     HOUR(12) },	/* International Date Line West */
  	{ "cet",	tZONE,     -HOUR(1) },	/* Central European */
  	{ "met",	tZONE,     -HOUR(1) },	/* Middle European */
***************
*** 423,431 ****
  	{ "fwt",	tZONE,     -HOUR(1) },	/* French Winter */
  	{ "fst",	tDAYZONE,  -HOUR(1) },	/* French Summer */
  	{ "eet",	tZONE,     -HOUR(2) },	/* Eastern Europe, USSR Zone 1 */
! 	{ "bt",	tZONE,     -HOUR(3) },	/* Baghdad, USSR Zone 2 */
  #if 0
! 	{ "it",	tZONE,     -HOUR(3.5) },/* Iran */
  #endif
  	{ "zp4",	tZONE,     -HOUR(4) },	/* USSR Zone 3 */
  	{ "zp5",	tZONE,     -HOUR(5) },	/* USSR Zone 4 */
--- 419,427 ----
  	{ "fwt",	tZONE,     -HOUR(1) },	/* French Winter */
  	{ "fst",	tDAYZONE,  -HOUR(1) },	/* French Summer */
  	{ "eet",	tZONE,     -HOUR(2) },	/* Eastern Europe, USSR Zone 1 */
! 	{ "bt",		tZONE,     -HOUR(3) },	/* Baghdad, USSR Zone 2 */
  #if 0
! 	{ "it",		tZONE,     -HOUR(3.5) },/* Iran */
  #endif
  	{ "zp4",	tZONE,     -HOUR(4) },	/* USSR Zone 3 */
  	{ "zp5",	tZONE,     -HOUR(5) },	/* USSR Zone 4 */
***************
*** 442,448 ****
  	{ "wast",	tZONE,     -HOUR(7) },	/* West Australian Standard */
  	{ "wadt",	tDAYZONE,  -HOUR(7) },	/* West Australian Daylight */
  #if 0
! 	{ "jt",	tZONE,     -HOUR(7.5) },/* Java (3pm in Cronusland!) */
  #endif
  	{ "cct",	tZONE,     -HOUR(8) },	/* China Coast, USSR Zone 7 */
  	{ "jst",	tZONE,     -HOUR(9) },	/* Japan Standard, USSR Zone 8 */
--- 438,444 ----
  	{ "wast",	tZONE,     -HOUR(7) },	/* West Australian Standard */
  	{ "wadt",	tDAYZONE,  -HOUR(7) },	/* West Australian Daylight */
  #if 0
! 	{ "jt",		tZONE,     -HOUR(7.5) },/* Java (3pm in Cronusland!) */
  #endif
  	{ "cct",	tZONE,     -HOUR(8) },	/* China Coast, USSR Zone 7 */
  	{ "jst",	tZONE,     -HOUR(9) },	/* Japan Standard, USSR Zone 8 */