summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorOri Bernstein <ori@eigenstate.org>2020-09-22 19:24:01 -0700
committerOri Bernstein <ori@eigenstate.org>2020-09-22 19:24:01 -0700
commit9f8d62ab644553b11286dbcd283db56c83d6ebdd (patch)
tree5913f9e51391674e51786f74ae962eee63543fee
parent77c3cb50fb529740c57908cc5f0655fba0257c91 (diff)
downloadplan9front-9f8d62ab644553b11286dbcd283db56c83d6ebdd.tar.xz
libc: ignore '?' in date format strings
Ignoring '?' when formatting date strings allows the format strings to be reused for parsing. This is convenient, since we don't need to duplicate the format strings.
-rw-r--r--sys/man/2/tmdate7
-rw-r--r--sys/src/libc/port/date.c3
2 files changed, 7 insertions, 3 deletions
diff --git a/sys/man/2/tmdate b/sys/man/2/tmdate
index e4123c3e1..ba5c4441a 100644
--- a/sys/man/2/tmdate
+++ b/sys/man/2/tmdate
@@ -134,8 +134,7 @@ For example,
will format to a width of 3. When parsing, this acts as whitespace.
.TP
.B ?
-When parsing, this makes the following argument match fuzzily.
-Fuzzy matching means that all formats are tried, from most to least specific.
+When parsing, all formats of the following argument are tried from most to least specific.
For example,
.I ?M
will match
@@ -144,7 +143,9 @@ will match
.IR 01 ,
and
.IR 1 ,
-in that order of preference.
+in that order. When formatting,
+.B ?
+is ignored.
.TP
.B ~
When parsing a date, this slackens range enforcement, accepting
diff --git a/sys/src/libc/port/date.c b/sys/src/libc/port/date.c
index 1c90a7985..7be6cb52f 100644
--- a/sys/src/libc/port/date.c
+++ b/sys/src/libc/port/date.c
@@ -428,6 +428,9 @@ static int
switch(c0){
case 0:
break;
+ /* Ignore '?' so we can share parse and format strings */
+ case '?':
+ continue;
case 'Y':
switch(w){
case 1: n += fmtprint(f, "%*d", pad, tm->year + 1900); break;