From: Corinna Vinschen <vinschen@redhat.com>
To: newlib@sourceware.org
Cc: Brian.Inglis@SystematicSw.ab.ca
Subject: Re: Cygwin strptime() is missing "%s" which strftime() has
Date: Tue, 25 Jul 2017 09:16:00 -0000 [thread overview]
Message-ID: <20170725091613.GB14419@calimero.vinschen.de> (raw)
In-Reply-To: <851e9a02-f7c2-25c4-f37d-64d17d5c6d54@SystematicSw.ab.ca>
[-- Attachment #1: Type: text/plain, Size: 2965 bytes --]
Hi Brian,
On Jul 24 14:41, Brian Inglis wrote:
> On Mon, 24 Jul 2017 02:32:14 -0700, Corinna Vinschen wrote:> On Jul 23 22:07,
> > In this case I have a nit, but this should be discussed on the right
> > mailing list so all affected parties can chime in. Hint: strtoimax is
> > not available on all platforms yet (patches still in limbo)...
>
> Figured there would need to be some tweaks for newlib platforms, compilers, and
> style, so made some changes, attached another diff for discussion, before
> submitting a patch.
> Let me know if you want conditionals or declarations changed, hoisted to
> function start, case braces removed, other issues?
See below.
> diff --git a/newlib/libc/time/strptime.c b/newlib/libc/time/strptime.c
> index c0861eb87..112227e40 100644
> --- a/newlib/libc/time/strptime.c
> +++ b/newlib/libc/time/strptime.c
> @@ -38,6 +38,8 @@
> #include <strings.h>
> #include <ctype.h>
> #include <stdlib.h>
> +#include <inttypes.h>
> +#include <limits.h>
> #include "../locale/setlocale.h"
>
> #define _ctloc(x) (_CurrentTimeLocale->x)
> @@ -230,6 +232,13 @@ strptime_l (const char *buf, const char *format, struct tm *timeptr,
> buf = s;
> ymd |= SET_MDAY;
> break;
> + case 'F' : /* %Y-%m-%d */
> + s = strptime_l (buf, "%Y-%m-%d", timeptr, locale);
> + if (s == NULL)
> + return NULL;
> + buf = s;
> + ymd |= SET_YMD;
> + break;
> case 'H' :
> case 'k' :
> ret = strtol_l (buf, &s, 10, locale);
> @@ -300,6 +309,31 @@ strptime_l (const char *buf, const char *format, struct tm *timeptr,
> return NULL;
> buf = s;
> break;
> + case 's' : {
> +#if defined(INTMAX_MAX)
> +# define BIG_T intmax_t
> +# define STRTOBIG strtoimax
> +#elif defined(LLONG_MAX)
> +# define BIG_T long long
> +# define STRTOBIG strtoll
> +#else
> +# define BIG_T long
> +# define STRTOBIG strtol
> +#endif
I don't think we need to use intmax_t at all here. Checking for
LLONG_MAX should be sufficient. However, this is strptime_l. so you
should use strtoll_l/strtol_l, just like the rest of the function.
On second thought, do we have to do this at all? Our time_t is always
long anyway so using just strtol_l and checking for ERANGE should be
sufficient:
int old_errno = _REENT->_errno;
sec = strtol_l (buf, &s, 10);
int new_errno = _REENT->_errno;
_REENT->_errno = old_errno;
if (s == buf || new_errno == ERANGE || etc...
> + BIG_T sec;
> + time_t t;
> +
> + sec = STRTOBIG (buf, &s, 10);
> + t = (time_t)sec;
> + if (s == buf
> + || (BIG_T)t != sec
> + || localtime_r (&t, timeptr) != timeptr)
Shouldn't this be gmtime_r?
%s The number of seconds since the Epoch, 1970-01-01 00:00:00 +0000
(UTC). Leap seconds are not counted unless leap second support
is available.
Thanks,
Corinna
--
Corinna Vinschen
Cygwin Maintainer
Red Hat
[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 819 bytes --]
next prev parent reply other threads:[~2017-07-25 9:16 UTC|newest]
Thread overview: 25+ messages / expand[flat|nested] mbox.gz Atom feed top
[not found] <BY1PR09MB0343663DE41D927E67CF0CCEA5BB0@BY1PR09MB0343.namprd09.prod.outlook.com>
[not found] ` <acc19ec5-055b-1bd4-997d-a247755163bf@SystematicSw.ab.ca>
2017-07-24 20:42 ` Brian Inglis
2017-07-24 21:36 ` Craig Howland
2017-07-24 23:04 ` Brian Inglis
2017-07-25 9:19 ` Corinna Vinschen
2017-07-25 9:16 ` Corinna Vinschen [this message]
2017-07-25 16:47 ` Brian Inglis
2017-07-25 17:38 ` Craig Howland
2017-07-25 18:52 ` Corinna Vinschen
2017-07-25 20:13 ` Brian Inglis
2017-07-26 10:49 ` Corinna Vinschen
2017-07-26 17:27 ` Brian Inglis
2017-07-26 19:34 ` Corinna Vinschen
2017-07-28 20:50 ` Brian Inglis
2017-07-31 9:55 ` Corinna Vinschen
2017-08-18 18:53 ` Corinna Vinschen
2017-08-18 19:38 ` Brian Inglis
2017-08-18 19:38 ` Brian Inglis
2017-08-18 20:01 ` Brian Inglis
2017-08-19 14:01 ` Brian Inglis
2017-08-21 3:09 ` Brian Inglis
2017-08-21 9:10 ` Corinna Vinschen
2017-08-24 2:14 ` [PATCH] newlib/libc/time/strptime.c(strptime_l) add strptime %F %s Brian Inglis
2017-08-24 8:50 ` Corinna Vinschen
2017-08-25 5:30 ` Brian Inglis
2017-08-25 12:06 ` Corinna Vinschen
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20170725091613.GB14419@calimero.vinschen.de \
--to=vinschen@redhat.com \
--cc=Brian.Inglis@SystematicSw.ab.ca \
--cc=newlib@sourceware.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).