This is the mail archive of the
libc-alpha@sourceware.org
mailing list for the glibc project.
[PATCH][BZ #4772] Allow strptime read outputs from strftime.
- From: OndÅej BÃlka <neleai at seznam dot cz>
- To: libc-alpha at sourceware dot org
- Date: Wed, 16 Oct 2013 10:42:38 +0200
- Subject: [PATCH][BZ #4772] Allow strptime read outputs from strftime.
- Authentication-results: sourceware.org; auth=none
Another simple bug that was left for five years. A problem is that a
strptime does not parse modifiers. It contain a simple patch to fix that
issue.
In meantime a identical functionality was added for recursive calls so
this patch just enables this uncoditionally.
OK to commit?
* time/strptime_l.c: Allow modifiers in strptime.
diff --git a/time/strptime_l.c b/time/strptime_l.c
index 00fc1ef..395532d 100644
--- a/time/strptime_l.c
+++ b/time/strptime_l.c
@@ -320,17 +320,14 @@ __strptime_internal (rp, fmt, tmp, statep LOCALE_PARAM)
}
++fmt;
- if (statep != NULL)
- {
- /* In recursive calls silently discard strftime modifiers. */
- while (*fmt == '-' || *fmt == '_' || *fmt == '0'
- || *fmt == '^' || *fmt == '#')
- ++fmt;
-
- /* And field width. */
- while (*fmt >= '0' && *fmt <= '9')
- ++fmt;
- }
+ /* We discard strftime modifiers. */
+ while (*fmt == '-' || *fmt == '_' || *fmt == '0'
+ || *fmt == '^' || *fmt == '#')
+ ++fmt;
+
+ /* And field width. */
+ while (*fmt >= '0' && *fmt <= '9')
+ ++fmt;
#ifndef _NL_CURRENT
/* We need this for handling the `E' modifier. */