From 33ca528b935235488d47aa6e7ed3fdbc46eb16c2 Mon Sep 17 00:00:00 2001
From: Jim Meyering <jim@meyering.net>
Date: Thu, 23 Dec 1993 00:38:42 +0000
Subject: [PATCH] merge with 1.9.2a

---
 lib/getdate.y  | 45 +++++++++++++++------------------------------
 lib/strftime.c |  1 +
 lib/strtod.c   |  2 +-
 3 files changed, 17 insertions(+), 31 deletions(-)

diff --git a/lib/getdate.y b/lib/getdate.y
index 09340da8b8..35d064f48a 100644
--- a/lib/getdate.y
+++ b/lib/getdate.y
@@ -35,20 +35,6 @@
    solely to allow compilation by non GNU-C compilers of the C parser
    produced from this file by old versions of bison.  Newer versions of
    bison include a block similar to this one in bison.simple.  */
-   
-#ifdef __GNUC__
-#define alloca __builtin_alloca
-#else
-#ifdef HAVE_ALLOCA_H
-#include <alloca.h>
-#else
-#ifdef _AIX
- #pragma alloca
-#else
-void *alloca ();
-#endif
-#endif
-#endif
 
 #ifdef __GNUC__
 #undef alloca
@@ -382,25 +368,24 @@ number	: tUNUMBER {
 		yyYear = $1;
 	    else {
 		if($1>10000) {
-		    time_t date_part;
-
-		    date_part= $1/10000;
 		    yyHaveDate++;
-		    yyDay= (date_part)%100;
-		    yyMonth= (date_part/100)%100;
-		    yyYear = date_part/10000;
-		} 
-	        yyHaveTime++;
-		if ($1 < 100) {
-		    yyHour = $1;
-		    yyMinutes = 0;
+		    yyDay= ($1)%100;
+		    yyMonth= ($1/100)%100;
+		    yyYear = $1/10000;
 		}
 		else {
-		    yyHour = $1 / 100;
-		    yyMinutes = $1 % 100;
-		}
-		yySeconds = 0;
-		yyMeridian = MER24;
+		    yyHaveTime++;
+		    if ($1 < 100) {
+			yyHour = $1;
+			yyMinutes = 0;
+		    }
+		    else {
+		    	yyHour = $1 / 100;
+		    	yyMinutes = $1 % 100;
+		    }
+		    yySeconds = 0;
+		    yyMeridian = MER24;
+	        }
 	    }
 	}
 	;
diff --git a/lib/strftime.c b/lib/strftime.c
index 360c72bd3c..2fe309eae3 100644
--- a/lib/strftime.c
+++ b/lib/strftime.c
@@ -36,6 +36,7 @@
    Numeric modifiers (a nonstandard extension):
    -	do not pad the field
    _	pad the field with spaces
+   %s   time in seconds since 00:00:00, Jan 1, 1970
 
    Time fields:
    %H	hour (00..23)
diff --git a/lib/strtod.c b/lib/strtod.c
index 8723a82ef0..d915840722 100644
--- a/lib/strtod.c
+++ b/lib/strtod.c
@@ -44,10 +44,10 @@ Cambridge, MA 02139, USA.  */
 #else
 #define NULL 0
 extern int errno;
-#endif
 #ifndef HUGE_VAL
 #define HUGE_VAL HUGE
 #endif
+#endif
 
 /* Convert NPTR to a double.  If ENDPTR is not NULL, a pointer to the
    character after the last one used in the number is put in *ENDPTR.  */
-- 
2.30.2