From: Johannes Schindelin <Johannes.Schindelin@gmx.de>
To: Doan Tran Cong Danh <congdanhqx@gmail.com>
Cc: git@vger.kernel.org, Johannes Sixt <j6t@kdbg.org>
Subject: Re: [PATCH 5/5] mingw: use {gm,local}time_s as backend for {gm,local}time_r
Date: Wed, 27 Nov 2019 20:39:27 +0100 (CET) [thread overview]
Message-ID: <nycvar.QRO.7.76.6.1911272038430.31080@tvgsbejvaqbjf.bet> (raw)
In-Reply-To: <2c39f9a04f98fc3d365c80ce57e8edce305846fb.1574867409.git.congdanhqx@gmail.com>
Hi Danh,
On Wed, 27 Nov 2019, Doan Tran Cong Danh wrote:
> diff --git a/compat/mingw.c b/compat/mingw.c
> index fe609239dd..7b21f4eee5 100644
> --- a/compat/mingw.c
> +++ b/compat/mingw.c
> @@ -1,6 +1,7 @@
> #include "../git-compat-util.h"
> #include "win32.h"
> #include <conio.h>
> +#include <errno.h>
I actually overlooked this. Please drop this hunk, it should not be needed
(and might break things in the MSVC build).
Thanks,
Dscho
> #include <wchar.h>
> #include "../strbuf.h"
> #include "../run-command.h"
> @@ -986,16 +987,16 @@ int pipe(int filedes[2])
>
> struct tm *gmtime_r(const time_t *timep, struct tm *result)
> {
> - /* gmtime() in MSVCRT.DLL is thread-safe, but not reentrant */
> - memcpy(result, gmtime(timep), sizeof(struct tm));
> - return result;
> + if (gmtime_s(result, timep) == 0)
> + return result;
> + return NULL;
> }
>
> struct tm *localtime_r(const time_t *timep, struct tm *result)
> {
> - /* localtime() in MSVCRT.DLL is thread-safe, but not reentrant */
> - memcpy(result, localtime(timep), sizeof(struct tm));
> - return result;
> + if (localtime_s(result, timep) == 0)
> + return result;
> + return NULL;
> }
>
> char *mingw_getcwd(char *pointer, int len)
> --
> 2.24.0.158.gd77a74f4dd.dirty
>
>
next prev parent reply other threads:[~2019-11-27 19:39 UTC|newest]
Thread overview: 15+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-11-27 15:13 [PATCH 0/5] drop non-reentrant time usage Doan Tran Cong Danh
2019-11-27 15:13 ` [PATCH 1/5] date.c::datestamp: switch to reentrant localtime_r Doan Tran Cong Danh
2019-11-27 15:13 ` [PATCH 2/5] date.c::time_to_tm_local: use reentrant localtime_r(3) Doan Tran Cong Danh
2019-11-27 15:13 ` [PATCH 3/5] date.c::time_to_tm: use reentrant gmtime_r(3) Doan Tran Cong Danh
2019-11-27 15:13 ` [PATCH 4/5] archive-zip: use reentrant localtime_r(3) Doan Tran Cong Danh
2019-11-27 15:13 ` [PATCH 5/5] mingw: use {gm,local}time_s as backend for {gm,local}time_r Doan Tran Cong Danh
2019-11-27 19:35 ` Johannes Schindelin
2019-11-27 19:39 ` Johannes Schindelin [this message]
2019-11-28 12:05 ` Danh Doan
2019-11-27 16:29 ` [PATCH 0/5] drop non-reentrant time usage Jeff King
2019-11-28 12:16 ` Danh Doan
2019-11-28 12:25 ` [PATCH v2 0/3] Phase out non-reentrant time functions Doan Tran Cong Danh
2019-11-28 12:25 ` [PATCH v2 1/3] date.c: switch to reentrant {gm,local}time_r Doan Tran Cong Danh
2019-11-28 12:25 ` [PATCH v2 2/3] archive-zip.c: switch to reentrant localtime_r Doan Tran Cong Danh
2019-11-28 12:25 ` [PATCH v2 3/3] mingw: use {gm,local}time_s as backend for {gm,local}time_r Doan Tran Cong Danh
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
List information: http://vger.kernel.org/majordomo-info.html
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=nycvar.QRO.7.76.6.1911272038430.31080@tvgsbejvaqbjf.bet \
--to=johannes.schindelin@gmx.de \
--cc=congdanhqx@gmail.com \
--cc=git@vger.kernel.org \
--cc=j6t@kdbg.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.
Code repositories for project(s) associated with this public inbox
https://80x24.org/mirrors/git.git
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).