-/* dtimep.lex exceeds the default table capacities for some old versions
+/* dtimep.l -- parse dates and times.
+ *
+ * This exceeds the default table capacities for some old versions
* of lex (and the minimum defaults as specified by POSIX). The following
* choices meet or exceed the lex defaults for older SunOS4.x, Solaris,
* HPUX, and AIX.
%a5000
%{
#include <h/nmh.h>
+#include <h/mh.h>
+#include <h/utils.h>
#include <h/tws.h>
/* Since we're looking at a string at a time, don't worry about
* wrapping to the next buffer.
*/
+#if YY_FLEX_MAJOR_VERSION == 2 && \
+ YY_FLEX_MINOR_VERSION == 6 && \
+ YY_FLEX_SUBMINOR_VERSION == 3
+/* https://github.com/westes/flex/issues/162 */
+#undef yywrap
+#endif
#define yywrap() 1
#define YY_SKIP_YYWRAP
*/
#define YY_DECL struct tws *dparsetime(char *lexstr)
- /* yyerminate() is called after the input string is matched to
+ /* yyterminate() is called after the input string is matched to
* completion (actually, when the lexer reaches an EOF). The only
* thing that really needs to be in this macro function is the
* return call, which must be substituted inline into dparsetime.
#define yyterminate() (void)yy_delete_buffer(lexhandle); \
if(!(tw.tw_flags & TW_SUCC)) { \
- return (struct tws *)NULL; \
+ return NULL; \
} \
if(tw.tw_year < 1970) \
tw.tw_year += 1900; \
if(tw.tw_year < 1970) \
tw.tw_year += 100; \
- return(&tw)
-
-/*
- * Patchable flag that says how to interpret NN/NN/NN dates. When
- * true, we do it European style: DD/MM/YY. When false, we do it
- * American style: MM/DD/YY. Of course, these are all non-RFC822
- * compliant.
- */
-int europeandate = 0;
+ return &tw
/*
* Table to convert month names to numeric month. We use the
tw.tw_flags &= ~TW_SDAY; tw.tw_flags |= TW_SEXP; \
SKIPA(); }
#define SETMON() { cp++; \
- tw.tw_mon = month_map[(cp[0] + cp[1]) & 0x1f]; \
+ tw.tw_mon = month_map[(((unsigned char) cp[0]) + ((unsigned char) cp[1])) & 0x1f]; \
SKIPA(); }
#define SETMON_NUM() { tw.tw_mon = atoi(cp)-1; \
SKIPD(); }
#define SETYEAR() { tw.tw_year = atoi(cp); \
SKIPD(); }
#define SETDAY() { tw.tw_mday = atoi(cp); \
- tw.tw_flags |= TW_YES; \
+ tw.tw_flags |= TW_SUCC; \
SKIPD(); }
#define SETTIME() { tw.tw_hour = atoi(cp); \
cp += 2; \
tw.tw_flags |= TW_SZEXP; \
SKIPD(); }
#define SETDST() { tw.tw_flags |= TW_DST; }
-#define SKIPD() { while ( isdigit(*cp++) ) ; \
+#define SKIPD() { while ( isdigit((unsigned char) *cp++) ) ; \
--cp; }
-#define SKIPTOD() { while ( !isdigit(*cp++) ) ; \
+#define SKIPTOD() { while ( !isdigit((unsigned char) *cp++) ) ; \
--cp; }
-#define SKIPA() { while ( isalpha(*cp++) ) ; \
+#define SKIPA() { while ( isalpha((unsigned char) *cp++) ) ; \
--cp; }
-#define SKIPTOA() { while ( !isalpha(*cp++) ) ; \
+#define SKIPTOA() { while ( !isalpha((unsigned char) *cp++) ) ; \
--cp; }
-#define SKIPSP() { while ( isspace(*cp++) ) ; \
+#define SKIPSP() { while ( isspace((unsigned char) *cp++) ) ; \
--cp; }
-#define SKIPTOSP() { while ( !isspace(*cp++) ) ; \
+#define SKIPTOSP() { while ( !isspace((unsigned char) *cp++) ) ; \
--cp; }
-#ifdef ADJUST_NUMERIC_ONLY_TZ_OFFSETS_WRT_DST
# ifdef HAVE_SYS_TIME_H
# include <sys/time.h>
# endif
static void
zonehack (struct tws *tw)
{
- register struct tm *tm;
+ struct tm *tm;
if (dmktime (tw) == (time_t) -1)
return;
tw->tw_zone -= 60;
}
}
-#endif /* ADJUST_NUMERIC_ONLY_TZ_OFFSETS_WRT_DST */
%}
-sun ([Ss]un(day)?)
-mon ([Mm]on(day)?)
-tue ([Tt]ue(sday)?)
-wed ([Ww]ed(nesday)?)
-thu ([Tt]hu(rsday)?)
-fri ([Ff]ri(day)?)
-sat ([Ss]at(urday)?)
-
-DAY ({sun}|{mon}|{tue}|{wed}|{thu}|{fri}|{sat})
-
-jan ([Jj]an(uary)?)
-feb ([Ff]eb(ruary)?)
-mar ([Mm]ar(ch)?)
-apr ([Aa]pr(il)?)
-may ([Mm]ay)
-jun ([Jj]un(e)?)
-jul ([Jj]ul(y)?)
-aug ([Aa]ug(ust)?)
-sep ([Ss]ep(tember)?)
-oct ([Oo]ct(ober)?)
-nov ([Nn]ov(ember)?)
-dec ([Dd]ec(ember)?)
-
-MONTH ({jan}|{feb}|{mar}|{apr}|{may}|{jun}|{jul}|{aug}|{sep}|{oct}|{nov}|{dec})
-
-TIME ({D}:{d}{d}(:{d}{d})?)
+sun [Ss]un(day)?
+mon [Mm]on(day)?
+tue [Tt]ue(sday)?
+wed [Ww]ed(nesday)?
+thu [Tt]hu(rsday)?
+fri [Ff]ri(day)?
+sat [Ss]at(urday)?
+
+DAY {sun}|{mon}|{tue}|{wed}|{thu}|{fri}|{sat}
+
+jan [Jj]an(uary)?
+feb [Ff]eb(ruary)?
+mar [Mm]ar(ch)?
+apr [Aa]pr(il)?
+may [Mm]ay
+jun [Jj]une?
+jul [Jj]uly?
+aug [Aa]ug(ust)?
+sep [Ss]ep(tember)?
+oct [Oo]ct(ober)?
+nov [Nn]ov(ember)?
+dec [Dd]ec(ember)?
+
+MONTH {jan}|{feb}|{mar}|{apr}|{may}|{jun}|{jul}|{aug}|{sep}|{oct}|{nov}|{dec}
+
+TIME {D}:{d}{d}(:{d}{d})?
/* The year can either be 2 digits, or 4. However, after
Y2K, we found that some MUA were reporting the year 100, hence
issues with 2-digit years.
*/
-YEAR (({d}{d})|(1{d}{d})|({d}{4}))
+YEAR ({d}{d})|(1{d}{d})|({d}{4})
-w ([ \t]*)
-W ([ \t]+)
-D ([0-9]?[0-9])
+w [ \t]*
+W [ \t]+
+D [0-9]?[0-9]
d [0-9]
nl [ \t\n()]
YY_BUFFER_STATE lexhandle;
- register unsigned char *cp;
+ char *cp;
static struct tws tw;
- memset(&tw,0,sizeof(struct tws));
+ ZERO(&tw);
lexhandle = yy_scan_string(lexstr);
%}
}
{D}("-"|"/"){D}("-"|"/"){YEAR}{W}{TIME} {
INIT();
- if(europeandate) {
- /* DD/MM/YY */
- SETDAY();
- SKIPTOD();
- SETMON_NUM();
- } else {
- /* MM/DD/YY */
+ /* MM/DD/YY */
SETMON_NUM();
SKIPTOD();
SETDAY();
- }
SKIPTOD();
SETYEAR();
SKIPTOD();
}
{D}("-"|"/"){D}("-"|"/"){YEAR} {
INIT();
- if(europeandate) {
- /* DD/MM/YY */
- SETDAY();
- SKIPTOD();
- SETMON_NUM();
- } else {
- /* MM/DD/YY */
+ /* MM/DD/YY */
SETMON_NUM();
SKIPTOD();
SETDAY();
- }
SKIPTOD();
SETYEAR();
}
INIT();
SKIPTOD();
SETZONE(atoi(cp));
-#ifdef ADJUST_NUMERIC_ONLY_TZ_OFFSETS_WRT_DST
zonehack (&tw);
-#endif /* ADJUST_NUMERIC_ONLY_TZ_OFFSETS_WRT_DST */
yyterminate();
}
"-"{D}{d}{d} {
INIT();
SKIPTOD();
SETZONE(-atoi(cp));
-#ifdef ADJUST_NUMERIC_ONLY_TZ_OFFSETS_WRT_DST
zonehack (&tw);
-#endif /* ADJUST_NUMERIC_ONLY_TZ_OFFSETS_WRT_DST */
yyterminate();
}
{
unput(c);
}
-
projects / nmh / blobdiff