[v2 PATCH 2/2] msvcrt: Implement %e format for strftime
Vijay Kiran Kamuju
infyquest at gmail.com
Wed Oct 2 04:49:53 CDT 2019
Signed-off-by: Vijay Kiran Kamuju <infyquest at gmail.com>
---
dlls/msvcrt/tests/time.c | 5 +++++
dlls/msvcrt/time.c | 6 ++++++
dlls/ucrtbase/tests/misc.c | 8 ++++++++
3 files changed, 19 insertions(+)
diff --git a/dlls/msvcrt/tests/time.c b/dlls/msvcrt/tests/time.c
index 86799c900f7..9795c92baf8 100644
--- a/dlls/msvcrt/tests/time.c
+++ b/dlls/msvcrt/tests/time.c
@@ -618,6 +618,11 @@ static void test_strftime(void)
ok(retA == 0, "expected 0, got %ld\n", retA);
ok(errno==EINVAL || broken(errno==0xdeadbeef), "errno = %d\n", errno);
+ errno = 0xdeadbeef;
+ retA = p_strftime(bufA, 256, "%e", gmt_tm);
+ ok(retA == 0, "expected 0, got %ld\n", retA);
+ ok(errno==EINVAL || broken(errno==0xdeadbeef), "errno = %d\n", errno);
+
errno = 0xdeadbeef;
retA = p_strftime(bufA, 256, "%F", gmt_tm);
ok(retA == 0, "expected 0, got %ld\n", retA);
diff --git a/dlls/msvcrt/time.c b/dlls/msvcrt/time.c
index b9fcde79789..ea06e23b806 100644
--- a/dlls/msvcrt/time.c
+++ b/dlls/msvcrt/time.c
@@ -1177,6 +1177,12 @@ static MSVCRT_size_t strftime_helper(char *str, MSVCRT_size_t max, const char *f
if(!strftime_int(str, &ret, max, mstm->tm_year%100, alternate ? 0 : 2, 0, 99))
return 0;
break;
+ case 'e':
+ if(!strftime_int(str, &ret, max, mstm->tm_mday, alternate ? 0 : 2, 0, 31))
+ return 0;
+ if(str[ret-2] == '0')
+ str[ret-2] = ' ';
+ break;
case 'F':
tmp = 1900+mstm->tm_year;
if(!strftime_int(str, &ret, max, tmp, alternate ? 0 : 4, 0, 9999))
diff --git a/dlls/ucrtbase/tests/misc.c b/dlls/ucrtbase/tests/misc.c
index 1ba4280a546..aecbc9dca52 100644
--- a/dlls/ucrtbase/tests/misc.c
+++ b/dlls/ucrtbase/tests/misc.c
@@ -907,6 +907,14 @@ static void test_strftime(void)
ok(retA == 6, "expected 6, got %d\n", (int)retA);
ok(!strcmp(bufA, "1/1/70"), "got %s\n", bufA);
+ retA = p_strftime(bufA, sizeof(bufA), "%e", &epoch);
+ ok(retA == 2, "expected 2, got %d\n", (int)retA);
+ ok(!strcmp(bufA, " 1"), "got %s\n", bufA);
+
+ retA = p_strftime(bufA, sizeof(bufA), "%#e", &epoch);
+ ok(retA == 1, "expected 1, got %d\n", (int)retA);
+ ok(!strcmp(bufA, "1"), "got %s\n", bufA);
+
retA = p_strftime(bufA, sizeof(bufA), "%F", &epoch);
ok(retA == 10, "expected 10, got %d\n", (int)retA);
ok(!strcmp(bufA, "1970-01-01"), "got %s\n", bufA);
--
2.21.0
More information about the wine-devel
mailing list