summaryrefslogtreecommitdiffabout
authorSergey Poznyakoff <gray@gnu.org.ua>2017-07-03 11:39:32 (GMT)
committer Sergey Poznyakoff <gray@gnu.org.ua>2017-07-03 11:42:48 (GMT)
commitdc2d8bacb8b5c4874b884771fb4f3e5d74e960c9 (patch) (side-by-side diff)
treedfcd66a4c75c6c51cb0d0bbae9a36219412dd046
parent0d0ad2f817ca89ad9135ab0497780c08d7671530 (diff)
downloadmailutils-dc2d8bacb8b5c4874b884771fb4f3e5d74e960c9.tar.gz
mailutils-dc2d8bacb8b5c4874b884771fb4f3e5d74e960c9.tar.bz2
Test mh format date functions
* mh/mh_format.c (builtin_sday, builtin_szone): Mark as not implemented (builtin_zone): Fix output (builtin_tzone): Fix output * mh/tests/fmtfunc.at: Test most date functions.
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--mh/mh_format.c101
-rw-r--r--mh/tests/fmtfunc.at149
2 files changed, 187 insertions, 63 deletions
diff --git a/mh/mh_format.c b/mh/mh_format.c
index 0f1d4b7..abbdc78 100644
--- a/mh/mh_format.c
+++ b/mh/mh_format.c
@@ -911,7 +911,7 @@ builtin_trim (struct mh_fvm *mach)
mu_rtrim_class (mach->str[R_REG].ptr, MU_CTYPE_SPACE);
}
-static int
+static void
_parse_date (struct mh_fvm *mach, struct tm *tm, struct mu_timezone *tz)
{
char const *date = mh_string_value (&mach->str[R_ARG]);
@@ -926,8 +926,6 @@ _parse_date (struct mh_fvm *mach, struct tm *tm, struct mu_timezone *tz)
*tm = *localtime (&t);
mu_datetime_tz_local (tz);
}
-
- return 0;
}
/* sec date integer seconds of the minute*/
@@ -937,9 +935,7 @@ builtin_sec (struct mh_fvm *mach)
struct tm tm;
struct mu_timezone tz;
- if (_parse_date (mach, &tm, &tz))
- return;
-
+ _parse_date (mach, &tm, &tz);
mach->num[R_REG] = tm.tm_sec;
}
@@ -950,8 +946,7 @@ builtin_min (struct mh_fvm *mach)
struct tm tm;
struct mu_timezone tz;
- if (_parse_date (mach, &tm, &tz))
- return;
+ _parse_date (mach, &tm, &tz);
mach->num[R_REG] = tm.tm_min;
}
@@ -963,8 +958,7 @@ builtin_hour (struct mh_fvm *mach)
struct tm tm;
struct mu_timezone tz;
- if (_parse_date (mach, &tm, &tz))
- return;
+ _parse_date (mach, &tm, &tz);
mach->num[R_REG] = tm.tm_hour;
}
@@ -976,8 +970,7 @@ builtin_wday (struct mh_fvm *mach)
struct tm tm;
struct mu_timezone tz;
- if (_parse_date (mach, &tm, &tz))
- return;
+ _parse_date (mach, &tm, &tz);
mach->num[R_REG] = tm.tm_wday;
}
@@ -990,8 +983,7 @@ builtin_day (struct mh_fvm *mach)
struct mu_timezone tz;
char buf[80];
- if (_parse_date (mach, &tm, &tz))
- return;
+ _parse_date (mach, &tm, &tz);
strftime (buf, sizeof buf, "%a", &tm);
mh_string_load (&mach->str[R_REG], buf);
@@ -1005,25 +997,20 @@ builtin_weekday (struct mh_fvm *mach)
struct mu_timezone tz;
char buf[80];
- if (_parse_date (mach, &tm, &tz))
- return;
+ _parse_date (mach, &tm, &tz);
+
strftime (buf, sizeof buf, "%A", &tm);
mh_string_load (&mach->str[R_REG], buf);
}
/* sday date integer day of the week known?
- (0=implicit,-1=unknown) */
+ (1=explicit,0=implicit,-1=unknown) */
static void
builtin_sday (struct mh_fvm *mach)
{
- struct tm tm;
- struct mu_timezone tz;
-
- /*FIXME: more elaborate check needed */
- if (_parse_date (mach, &tm, &tz))
- mach->num[R_REG] = -1;
- else
- mach->num[R_REG] = 1;
+ /* FIXME */
+ return builtin_not_implemented ("sday");
+ mach->num[R_REG] = -1;
}
/* mday date integer day of the month*/
@@ -1033,8 +1020,7 @@ builtin_mday (struct mh_fvm *mach)
struct tm tm;
struct mu_timezone tz;
- if (_parse_date (mach, &tm, &tz))
- return;
+ _parse_date (mach, &tm, &tz);
mach->num[R_REG] = tm.tm_mday;
}
@@ -1046,8 +1032,7 @@ builtin_yday (struct mh_fvm *mach)
struct tm tm;
struct mu_timezone tz;
- if (_parse_date (mach, &tm, &tz))
- return;
+ _parse_date (mach, &tm, &tz);
mach->num[R_REG] = tm.tm_yday;
}
@@ -1059,8 +1044,7 @@ builtin_mon (struct mh_fvm *mach)
struct tm tm;
struct mu_timezone tz;
- if (_parse_date (mach, &tm, &tz))
- return;
+ _parse_date (mach, &tm, &tz);
mach->num[R_REG] = tm.tm_mon + 1;
}
@@ -1073,8 +1057,7 @@ builtin_month (struct mh_fvm *mach)
struct mu_timezone tz;
char buf[80];
- if (_parse_date (mach, &tm, &tz))
- return;
+ _parse_date (mach, &tm, &tz);
strftime (buf, sizeof buf, "%b", &tm);
mh_string_load (&mach->str[R_REG], buf);
@@ -1088,8 +1071,7 @@ builtin_lmonth (struct mh_fvm *mach)
struct mu_timezone tz;
char buf[80];
- if (_parse_date (mach, &tm, &tz))
- return;
+ _parse_date (mach, &tm, &tz);
strftime (buf, sizeof buf, "%B", &tm);
mh_string_load (&mach->str[R_REG], buf);
@@ -1102,23 +1084,22 @@ builtin_year (struct mh_fvm *mach)
struct tm tm;
struct mu_timezone tz;
- if (_parse_date (mach, &tm, &tz))
- return;
+ _parse_date (mach, &tm, &tz);
mach->num[R_REG] = tm.tm_year + 1900;
}
-/* zone date integer timezone in hours*/
+/* zone date integer timezone in hours
+ FIXME: mh and nmh return the value as given, e.g. 0300 is returned as 300 */
static void
builtin_zone (struct mh_fvm *mach)
{
struct tm tm;
struct mu_timezone tz;
- if (_parse_date (mach, &tm, &tz))
- return;
+ _parse_date (mach, &tm, &tz);
- mach->num[R_REG] = tz.utc_offset;
+ mach->num[R_REG] = tz.utc_offset / 3600;
}
/* tzone date string timezone string */
@@ -1128,8 +1109,7 @@ builtin_tzone (struct mh_fvm *mach)
struct tm tm;
struct mu_timezone tz;
- if (_parse_date (mach, &tm, &tz))
- return;
+ _parse_date (mach, &tm, &tz);
if (tz.tz_name)
mh_string_load (&mach->str[R_REG], tz.tz_name);
@@ -1137,6 +1117,8 @@ builtin_tzone (struct mh_fvm *mach)
{
char buf[6];
int s;
+ unsigned hrs;
+
if (tz.utc_offset < 0)
{
s = '-';
@@ -1144,8 +1126,9 @@ builtin_tzone (struct mh_fvm *mach)
}
else
s = '+';
- snprintf (buf, sizeof buf, "%c%02d%02d", s,
- tz.utc_offset/3600, tz.utc_offset/60);
+ hrs = tz.utc_offset / 3600;
+ snprintf (buf, sizeof buf, "%c%02u%02u", s,
+ hrs, (tz.utc_offset - hrs * 3600) / 60);
mh_string_load (&mach->str[R_REG], buf);
}
}
@@ -1155,14 +1138,9 @@ builtin_tzone (struct mh_fvm *mach)
static void
builtin_szone (struct mh_fvm *mach)
{
- struct tm tm;
- struct mu_timezone tz;
-
- /*FIXME: more elaborate check needed */
- if (_parse_date (mach, &tm, &tz))
- mach->num[R_REG] = -1;
- else
- mach->num[R_REG] = 1;
+ /*FIXME:*/
+ builtin_not_implemented ("szone");
+ mach->num[R_REG] = -1;
}
static void
@@ -1191,12 +1169,12 @@ builtin_date2gmt (struct mh_fvm *mach)
static void
builtin_dst (struct mh_fvm *mach)
{
+#ifdef HAVE_STRUCT_TM_TM_ISDST
struct tm tm;
struct mu_timezone tz;
- if (_parse_date (mach, &tm, &tz))
- return;
-#ifdef HAVE_STRUCT_TM_TM_ISDST
+ _parse_date (mach, &tm, &tz);
+
mach->num[R_REG] = tm.tm_isdst;
#else
mach->num[R_REG] = 0;
@@ -1210,8 +1188,8 @@ builtin_clock (struct mh_fvm *mach)
struct tm tm;
struct mu_timezone tz;
- if (_parse_date (mach, &tm, &tz))
- return;
+ _parse_date (mach, &tm, &tz);
+
mach->num[R_REG] = mu_datetime_to_utc (&tm, &tz);
}
@@ -1223,8 +1201,8 @@ builtin_rclock (struct mh_fvm *mach)
struct mu_timezone tz;
time_t now = time (NULL);
- if (_parse_date (mach, &tm, &tz))
- return;
+ _parse_date (mach, &tm, &tz);
+
mach->num[R_REG] = now - mu_datetime_to_utc (&tm, &tz);
}
@@ -1252,8 +1230,7 @@ date_cvt (struct mh_fvm *mach, int pretty)
int i, len;
const char *tzname = NULL;
- if (_parse_date (mach, &tm, &tz))
- return;
+ _parse_date (mach, &tm, &tz);
if (pretty)
{
diff --git a/mh/tests/fmtfunc.at b/mh/tests/fmtfunc.at
index 2abda39..a1cf2ae 100644
--- a/mh/tests/fmtfunc.at
+++ b/mh/tests/fmtfunc.at
@@ -112,7 +112,6 @@ FMTFUNC([charleft],
])
# FIXME: timenow
-# FIXME: ne
# FIXME: myhost
# FIXME: myname
# FIXME: localmbox
@@ -411,4 +410,152 @@ data
[<root@example.com>,<gray@example.org>
])
+FMTFUNC([sec],
+[%(sec{Date})
+],
+[Date: Mon, 3 Jul 2017 13:17:58 +0300
+
+],
+[58
+])
+
+FMTFUNC([min],
+[%(min{Date})
+],
+[Date: Mon, 3 Jul 2017 13:17:58 +0300
+
+],
+[17
+])
+
+FMTFUNC([hour],
+[%(hour{Date})
+],
+[Date: Mon, 3 Jul 2017 13:17:58 +0300
+
+],
+[13
+])
+
+FMTFUNC([wday],
+[%(wday{Date})
+],
+[Date: Mon, 3 Jul 2017 13:17:58 +0300
+
+],
+[1
+])
+
+FMTFUNC([day],
+[%(day{Date})
+],
+[Date: Mon, 3 Jul 2017 13:17:58 +0300
+
+],
+[Mon
+])
+
+FMTFUNC([weekday],
+[%(weekday{Date})
+],
+[Date: Mon, 3 Jul 2017 13:17:58 +0300
+
+],
+[Monday
+])
+
+# FIXME: sday
+
+FMTFUNC([mday],
+[%(mday{Date})
+],
+[Date: Mon, 3 Jul 2017 13:17:58 +0300
+
+],
+[3
+])
+
+FMTFUNC([yday],
+[%(yday{Date})
+],
+[Date: Mon, 3 Jul 2017 13:17:58 +0300
+
+],
+[183
+])
+
+FMTFUNC([mon],
+[%(mon{Date})
+],
+[Date: Mon, 3 Jul 2017 13:17:58 +0300
+
+],
+[7
+])
+
+FMTFUNC([month],
+[%(month{Date})
+],
+[Date: Mon, 3 Jul 2017 13:17:58 +0300
+
+],
+[Jul
+])
+
+FMTFUNC([lmonth],
+[%(lmonth{Date})
+],
+[Date: Mon, 3 Jul 2017 13:17:58 +0300
+
+],
+[July
+])
+
+FMTFUNC([year],
+[%(year{Date})
+],
+[Date: Mon, 3 Jul 2017 13:17:58 +0300
+
+],
+[2017
+])
+
+# FIXME: zone
+
+FMTFUNC([tzone],
+[%(tzone{Date})
+],
+[Date: Mon, 3 Jul 2017 13:17:58 +0300
+
+],
+[+0300
+])
+
+# FIXME: szone
+
+# FIXME: date2local
+
+# FIXME: date2gmt
+
+# FIXME: dst
+# FMTFUNC([dst],
+# [%(dst{Date})
+# %(dst{X-Date})
+# ],
+# [Date: Mon, 3 Jul 2017 13:17:58 +0300
+# X-Date: Sun, 1 Jan 2017 10:11:00 +0200
+
+# ],
+# [1
+# 0
+# ])
+
+# FIXME: clock
+
+# FIXME: rclock
+
+# FIXME: tws
+
+# FIXME: pretty
+
m4_popdef([FMTFUNC]) \ No newline at end of file

Return to:

Send suggestions and report system problems to the System administrator.