dtcm: Resolve CID 87822

[oweals/cde.git] / cde / programs / dtcm / libDtCmP / getdate.y

diff --git a/cde/programs/dtcm/libDtCmP/getdate.y b/cde/programs/dtcm/libDtCmP/getdate.y
index 1faecc7a8da04a88f09df19c5642f665d8077d37..188b7b7fdd5798d51b7ef4e277cec8485ded6320 100644 (file)
--- a/cde/programs/dtcm/libDtCmP/getdate.y
+++ b/cde/programs/dtcm/libDtCmP/getdate.y
@@ -41,6 +41,7 @@ static  char sccsid[] = "@(#)getdate.y 1.10 94/11/07 Copyr 1993 Sun Microsystems
 
 #include <EUSCompat.h>
 #include <ctype.h>
+#include <string.h>
 #include <time.h>
 #include "getdate.h"
 #ifdef SVR4
@@ -65,7 +66,9 @@ static  char sccsid[] = "@(#)getdate.y 1.10 94/11/07 Copyr 1993 Sun Microsystems
 #define STANDARD 2
 #define MAYBE    3
 
+#ifdef SVR4
 extern long timezone;
+#endif
 
 %}
 
@@ -73,76 +76,76 @@ extern long timezone;
 timedate:              /* empty */
        | timedate item;
 
-item:  tspec =
+item:  tspec
                {timeflag++;}
-       | zone =
+       | zone
                {zoneflag++;}
-       | dtspec =
+       | dtspec
                {dateflag++;}
-       | dyspec =
+       | dyspec
                {dayflag++;}
-       | rspec =
+       | rspec
                {relflag++;}
        | nspec;
 
-nspec: NUMBER =
+nspec: NUMBER
                {if (timeflag && dateflag && !relflag) year = $1;
                else {timeflag++;hh = $1/100;mm = $1%100;ss = 0;merid = 24;}};
 
-tspec: NUMBER MERIDIAN =
+tspec: NUMBER MERIDIAN
                {hh = $1; mm = 0; ss = 0; merid = $2;}
-       | NUMBER ':' NUMBER =
+       | NUMBER ':' NUMBER
                {hh = $1; mm = $3; merid = 24;}
-       | NUMBER ':' NUMBER MERIDIAN =
+       | NUMBER ':' NUMBER MERIDIAN
                {hh = $1; mm = $3; merid = $4;}
-       | NUMBER ':' NUMBER ':' NUMBER =
+       | NUMBER ':' NUMBER ':' NUMBER
                {hh = $1; mm = $3; ss = $5; merid = 24;}
-       | NUMBER ':' NUMBER ':' NUMBER MERIDIAN =
+       | NUMBER ':' NUMBER ':' NUMBER MERIDIAN
                {hh = $1; mm = $3; ss = $5; merid = $6;};
 
-zone:  ZONE =
+zone:  ZONE
                {ourzone = $1; daylightsavings = STANDARD;}
-       | DAYZONE =
+       | DAYZONE
                {ourzone = $1; daylightsavings = DAYLIGHT;};
 
-dyspec:        DAY =
+dyspec:        DAY
                {dayord = 1; dayreq = $1;}
-       | DAY ',' =
+       | DAY ','
                {dayord = 1; dayreq = $1;}
-       | NUMBER DAY =
+       | NUMBER DAY
                {dayord = $1; dayreq = $2;};
 
-dtspec:        NUMBER '/' NUMBER =
+dtspec:        NUMBER '/' NUMBER
                {month = $1; day = $3; noyear = 1;}
-       | NUMBER '/' NUMBER '/' NUMBER =
+       | NUMBER '/' NUMBER '/' NUMBER
                {month = $1; day = $3; year = $5;}
-       | NUMBER '-' NUMBER =
+       | NUMBER '-' NUMBER
                {month = $1; day = $3; noyear = 1;}
-       | NUMBER '-' NUMBER '-' NUMBER =
+       | NUMBER '-' NUMBER '-' NUMBER
                {month = $1; day = $3; year = $5;}
-       | MONTH NUMBER =
+       | MONTH NUMBER
                {month = $1; day = $2; noyear = 1;}
-       | MONTH NUMBER ',' NUMBER =
+       | MONTH NUMBER ',' NUMBER
                {month = $1; day = $2; year = $4;}
-       | NUMBER MONTH =
+       | NUMBER MONTH
                {month = $2; day = $1; noyear = 1;}
-       | NUMBER MONTH NUMBER =
+       | NUMBER MONTH NUMBER
                {month = $2; day = $1; year = $3;};
 
 
-rspec: NUMBER UNIT =
+rspec: NUMBER UNIT
                {relsec +=  60L * $1 * $2;}
-       | NUMBER MUNIT =
+       | NUMBER MUNIT
                {relmonth += $1 * $2;}
-       | NUMBER SUNIT =
+       | NUMBER SUNIT
                {relsec += $1;}
-       | UNIT =
+       | UNIT
                {relsec +=  60L * $1;}
-       | MUNIT =
+       | MUNIT
                {relmonth += $1;}
-       | SUNIT =
+       | SUNIT
                {relsec++;}
-       | rspec AGO =
+       | rspec AGO
                {relsec = -relsec; relmonth = -relmonth;};
 %%
 
@@ -526,11 +529,15 @@ time_t cm_getdate(char *p, struct timeb *now)
        lptr = p;
        if (now == ((struct timeb *) NULL)) {
                now = &ftz;
-#ifdef SVR4
+#if defined(SVR4) || defined(__OpenBSD__)
                tod = time(0);
                lt = localtime(&tod);
                now->time = lt->tm_sec;
+#ifdef __OpenBSD__
+               now->timezone = lt->tm_gmtoff / 60;
+#else
                now->timezone = timezone/60;
+#endif
 #else
                ftime(&ftz);
 #endif /* SVR4 */
@@ -590,5 +597,7 @@ time_t cm_getdate(char *p, struct timeb *now)
        return sdate;
 }
 
-yyerror(s) char *s;
-{}
+void
+yyerror(char *s)
+{
+}