public inbox for newlib-cvs@sourceware.org
help / color / mirror / Atom feed
From: Corinna Vinschen <corinna@sourceware.org>
To: newlib-cvs@sourceware.org
Subject: [newlib-cygwin/main] strptime: fix am/pm converting to 24-hour system
Date: Wed, 21 Feb 2024 14:52:56 +0000 (GMT)	[thread overview]
Message-ID: <20240221145256.C0BBC3858D34@sourceware.org> (raw)

https://sourceware.org/git/gitweb.cgi?p=newlib-cygwin.git;h=acf176104fc5410bfec0635ed2c5a21971b9c938

commit acf176104fc5410bfec0635ed2c5a21971b9c938
Author:     Alexey Lapshin <alexey.lapshin@espressif.com>
AuthorDate: Tue Feb 20 18:51:04 2024 +0000
Commit:     Corinna Vinschen <corinna@vinschen.de>
CommitDate: Wed Feb 21 15:52:14 2024 +0100

    strptime: fix am/pm converting to 24-hour system
    
    Fix the issue of parsing 08:00AM, which currently gives a 20:00 representation.

Diff:
---
 newlib/libc/time/strptime.c | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

diff --git a/newlib/libc/time/strptime.c b/newlib/libc/time/strptime.c
index 6220ff73ad27..188218059a36 100644
--- a/newlib/libc/time/strptime.c
+++ b/newlib/libc/time/strptime.c
@@ -292,11 +292,12 @@ strptime_l (const char *buf, const char *format, struct tm *timeptr,
 		ret = match_string (&buf, _ctloc (am_pm), locale);
 		if (ret < 0)
 		    return NULL;
-		if (timeptr->tm_hour == 0) {
-		    if (ret == 1)
-			timeptr->tm_hour = 12;
-		} else
-		    timeptr->tm_hour += 12;
+		if (timeptr->tm_hour > 12)
+		    return NULL;
+		else if (timeptr->tm_hour == 12)
+		    timeptr->tm_hour = ret * 12;
+		else
+		    timeptr->tm_hour += ret * 12;
 		break;
 	    case 'q' :		/* quarter year - GNU extension */
 		ret = strtol_l (buf, &s, 10, locale);

                 reply	other threads:[~2024-02-21 14:52 UTC|newest]

Thread overview: [no followups] expand[flat|nested]  mbox.gz  Atom feed

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=20240221145256.C0BBC3858D34@sourceware.org \
    --to=corinna@sourceware.org \
    --cc=newlib-cvs@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).