merge with 1.9.2a

diff --git a/lib/getdate.y b/lib/getdate.y
index 09340da8b8580e8d378a29ec7fcacb3dd3a66421..35d064f48a9e917a4bb09ff494c5cb603be98268 100644 (file)
--- 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 360c72bd3c6d45bd5e2d83887abd5dc312e83e7a..2fe309eae3e96c0b9b9f1ad17b30330e8784f964 100644 (file)
--- 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 8723a82ef003e6ee188b6c3f24c6a6c2f24eba1d..d91584072243711d5a129e1a2c309cdeb5975d3e 100644 (file)
--- 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.  */