From patchwork Thu Nov 28 12:25:03 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: =?utf-8?b?xJBvw6BuIFRy4bqnbiBDw7RuZyBEYW5o?= X-Patchwork-Id: 11265901 Return-Path: Received: from mail.kernel.org (pdx-korg-mail-1.web.codeaurora.org [172.30.200.123]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 1B3131393 for ; Thu, 28 Nov 2019 12:25:32 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id EDC232158A for ; Thu, 28 Nov 2019 12:25:31 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="Nnd1Mkf/" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726594AbfK1MZb (ORCPT ); Thu, 28 Nov 2019 07:25:31 -0500 Received: from mail-pg1-f194.google.com ([209.85.215.194]:45228 "EHLO mail-pg1-f194.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726227AbfK1MZa (ORCPT ); Thu, 28 Nov 2019 07:25:30 -0500 Received: by mail-pg1-f194.google.com with SMTP id k1so12816255pgg.12 for ; Thu, 28 Nov 2019 04:25:30 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=iH8ljWWJopy53yf42suTTw5wsATC0P7LThnOXE+SEVQ=; b=Nnd1Mkf/JRHpMAGZXSDNDRaGk2ohgxc36NnXQoEhNxyHLPM7RNqzy0u+VoQUyoWSfT Qx7b5zezdvWgoqr/wxUrdvx44Y6gFmJlxqis/7suPRl8ibBcZfIJj5mDnpZB0gLRPkgu GmZoKEcx10J/2i07zzbdALC8diNaxSIuCzlNsWawneo5g/KtT1lVCvBGGghjMJMlGWLo toJmLh1uJ3TOO/durGh+FaWYXayEKua0n2S3OsGV5VXC2XDY8V8gCp8awJA8G1WRAu/a Tm4s+By9jQdTdWvyF6Wy3bZ9cGwhOwcxOg2NmTmGcQZ3V+N8kd0Y7BKGD2MaJG0ZhteO Xn9Q== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=iH8ljWWJopy53yf42suTTw5wsATC0P7LThnOXE+SEVQ=; b=t2KHuzovA1+/ESi61w4h1swwgEy57k2HhMHaluFUE6llxzbZN+DfcC5rbTCN9s8HZA h6S/X33Y8ORQappexkRaJ/CPHSJknq8QNrbAYWQtQ1fjTxb4W0iDgH7PYOTF83g8manQ sEQLMxj+9A/fa4c3aB2RtevCeNn2RAbE8mzOso5sM0wL0DHp+X8OLvlMWMZZIKhVg0rq ZUy90T54DelQWaY7p8Bf6L0i+O+yv6AZfgMyoW5NQCFQD9GJ8HuE8jphqdLBN2XYJ1hI wKgfY+X56FAdkkAPkZ9C1z8ti+UdRaCBo4u2jRNcdbpLJmtlDRTTivW5gv2zU3h/kkhj TeVQ== X-Gm-Message-State: APjAAAUKOjjMkO5hIOgXteHUtw4lmJ7f7tSqX0WxUlbJp8hPosNeRSnD VvDwsC1/+cT6jl061N3CKDsY7LQI X-Google-Smtp-Source: APXvYqx6G5Y3bbABFeBhppr42E5EYxvwtPTxTTWImXXbxwBW6XkaEJn+B3NYruW0fMW7oznV3cA4Nw== X-Received: by 2002:a62:76c6:: with SMTP id r189mr53626803pfc.48.1574943930235; Thu, 28 Nov 2019 04:25:30 -0800 (PST) Received: from localhost.localdomain ([2402:800:6375:24ff:b05:3145:6413:309f]) by smtp.gmail.com with ESMTPSA id r28sm18849448pgk.75.2019.11.28.04.25.28 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 28 Nov 2019 04:25:29 -0800 (PST) From: Doan Tran Cong Danh To: git@vger.kernel.org Cc: peff@peff.net, Doan Tran Cong Danh Subject: [PATCH v2 1/3] date.c: switch to reentrant {gm,local}time_r Date: Thu, 28 Nov 2019 19:25:03 +0700 Message-Id: <71de738864d273c925ed8a9a93fe1a85fa8b81b6.1574943677.git.congdanhqx@gmail.com> X-Mailer: git-send-email 2.24.0.615.g37f5bfbdea In-Reply-To: References: MIME-Version: 1.0 Sender: git-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: git@vger.kernel.org Originally, git was intended to be single-thread executable. `gmtime(3)' and `localtime(3)' can be used in such codebase for cleaner code. Overtime, we're employing multithread in our code base. Let's phase out `gmtime(3)' and `localtime(3)' in favour of `gmtime_r(3)' and `localtime_r(3)'. Signed-off-by: Doan Tran Cong Danh --- date.c | 18 ++++++++++-------- 1 file changed, 10 insertions(+), 8 deletions(-) diff --git a/date.c b/date.c index 041db7db4e..b0d9a8421d 100644 --- a/date.c +++ b/date.c @@ -64,16 +64,16 @@ static time_t gm_time_t(timestamp_t time, int tz) * thing, which means that tz -0100 is passed in as the integer -100, * even though it means "sixty minutes off" */ -static struct tm *time_to_tm(timestamp_t time, int tz) +static struct tm *time_to_tm(timestamp_t time, int tz, struct tm *tm) { time_t t = gm_time_t(time, tz); - return gmtime(&t); + return gmtime_r(&t, tm); } -static struct tm *time_to_tm_local(timestamp_t time) +static struct tm *time_to_tm_local(timestamp_t time, struct tm *tm) { time_t t = time; - return localtime(&t); + return localtime_r(&t, tm); } /* @@ -283,6 +283,7 @@ static void show_date_normal(struct strbuf *buf, timestamp_t time, struct tm *tm const char *show_date(timestamp_t time, int tz, const struct date_mode *mode) { struct tm *tm; + struct tm tmbuf = { 0 }; struct tm human_tm = { 0 }; int human_tz = -1; static struct strbuf timebuf = STRBUF_INIT; @@ -318,11 +319,11 @@ const char *show_date(timestamp_t time, int tz, const struct date_mode *mode) } if (mode->local) - tm = time_to_tm_local(time); + tm = time_to_tm_local(time, &tmbuf); else - tm = time_to_tm(time, tz); + tm = time_to_tm(time, tz, &tmbuf); if (!tm) { - tm = time_to_tm(0, 0); + tm = time_to_tm(0, 0, &tmbuf); tz = 0; } @@ -959,10 +960,11 @@ void datestamp(struct strbuf *out) { time_t now; int offset; + struct tm tm = { 0 }; time(&now); - offset = tm_to_time_t(localtime(&now)) - now; + offset = tm_to_time_t(localtime_r(&now, &tm)) - now; offset /= 60; date_string(now, offset, out); From patchwork Thu Nov 28 12:25:04 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: =?utf-8?b?xJBvw6BuIFRy4bqnbiBDw7RuZyBEYW5o?= X-Patchwork-Id: 11265905 Return-Path: Received: from mail.kernel.org (pdx-korg-mail-1.web.codeaurora.org [172.30.200.123]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 9A4E7138C for ; Thu, 28 Nov 2019 12:25:46 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 78BBE2158A for ; Thu, 28 Nov 2019 12:25:46 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="uiwjGRCW" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726612AbfK1MZp (ORCPT ); Thu, 28 Nov 2019 07:25:45 -0500 Received: from mail-pf1-f196.google.com ([209.85.210.196]:44348 "EHLO mail-pf1-f196.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726227AbfK1MZp (ORCPT ); Thu, 28 Nov 2019 07:25:45 -0500 Received: by mail-pf1-f196.google.com with SMTP id d199so8436721pfd.11 for ; Thu, 28 Nov 2019 04:25:45 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=IqtF8ajq4HMwuHyAD1wbSIAYDlMLu+THm0CjjqMFL0A=; b=uiwjGRCW8I6ZtyyDWHqbM2pzMv7jL7eo7LVssSC7RO+Ud9OJ1m+AjQVp9SKL6WwNn3 qK+r19hLbKuyUgmZ8+IC5ZqoCoRr5cQRIF1UIrXHBMJsh/ocI3ctiMwsmMjYsjIiCFGI wzfHpO4RNnyH9TxMisVNAtjYfqvHSMfveegiHuA21vR2X2LJ1MhOpEkb7Z+DhPtCTylf o9PMsITCAilNUDGyY5XIIbsW88W8MFkei3CfwdXtyVou8PviIDYbATumGx1Rzo4WUGF/ MGDN3qQl45x64ax/1iZIazcmils2AtjzPW3DGA8PV1us9KtT439JjoLPYSDR2tgbETTr BnjA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=IqtF8ajq4HMwuHyAD1wbSIAYDlMLu+THm0CjjqMFL0A=; b=hyPk7R2JRK6wCiy0MEWvQd2z4okn/gq4q13i0h2BJqlTePqYJSStYIb1cDCW/axWec 8iLKqz72KkwQeRfKjwNFBVUWNhZvnMojHoG4ORi9kLmEMq/ltiFPj6I2MprEc2nnkHFQ 81WBO6cqkymDOYvsWYWq+xPPIUZo0NCm2ZSVACp2cYM/ulSp5Q8waepqAnY2mIq8qMAW QXvAdrrEPO4SLKdrPT90PzBNftnE8WdtPJ6t41aLqNKurNgEVyzM+u0N/AEFFEXfrnhz Dp4QN9JWq2uVp+3CAEZuoQ98cAOmlxGQCn1McgsHi9PCQni6dUFiFpe8gNDPPW/HR8W2 YCzg== X-Gm-Message-State: APjAAAWoUnAsgscIty9LAOANd2CZMvQO9ssNNjLeG54A/irORuAlz77d utMN35SMPKc4Xxa/ERLrJB7s+rfm X-Google-Smtp-Source: APXvYqweer6h6bY3/yPVI6j6SYsgBTA4AMBauuFUzN2Tm5inM31qyiLzuukewAA96fvTzVNGvqfoYg== X-Received: by 2002:a62:2a4c:: with SMTP id q73mr51697462pfq.94.1574943944725; Thu, 28 Nov 2019 04:25:44 -0800 (PST) Received: from localhost.localdomain ([2402:800:6375:24ff:b05:3145:6413:309f]) by smtp.gmail.com with ESMTPSA id r28sm18849448pgk.75.2019.11.28.04.25.43 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 28 Nov 2019 04:25:44 -0800 (PST) From: Doan Tran Cong Danh To: git@vger.kernel.org Cc: peff@peff.net, Doan Tran Cong Danh Subject: [PATCH v2 2/3] archive-zip.c: switch to reentrant localtime_r Date: Thu, 28 Nov 2019 19:25:04 +0700 Message-Id: <77798f17730b3c3ad739a9f4a73072e5bb6ac5d9.1574943677.git.congdanhqx@gmail.com> X-Mailer: git-send-email 2.24.0.615.g37f5bfbdea In-Reply-To: References: MIME-Version: 1.0 Sender: git-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: git@vger.kernel.org Originally, git was intended to be single-thread executable. `localtime(3)' can be used in such codebase for cleaner code. Overtime, we're employing multithread in our code base. Let's phase out `gmtime(3)' in favour of `localtime_r(3)'. Signed-off-by: Doan Tran Cong Danh --- archive-zip.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/archive-zip.c b/archive-zip.c index 4d66b5be6e..8bbd3e5884 100644 --- a/archive-zip.c +++ b/archive-zip.c @@ -603,18 +603,18 @@ static void write_zip_trailer(const struct object_id *oid) static void dos_time(timestamp_t *timestamp, int *dos_date, int *dos_time) { time_t time; - struct tm *t; + struct tm tm; if (date_overflows(*timestamp)) die(_("timestamp too large for this system: %"PRItime), *timestamp); time = (time_t)*timestamp; - t = localtime(&time); + localtime_r(&time, &tm); *timestamp = time; - *dos_date = t->tm_mday + (t->tm_mon + 1) * 32 + - (t->tm_year + 1900 - 1980) * 512; - *dos_time = t->tm_sec / 2 + t->tm_min * 32 + t->tm_hour * 2048; + *dos_date = tm.tm_mday + (tm.tm_mon + 1) * 32 + + (tm.tm_year + 1900 - 1980) * 512; + *dos_time = tm.tm_sec / 2 + tm.tm_min * 32 + tm.tm_hour * 2048; } static int archive_zip_config(const char *var, const char *value, void *data) From patchwork Thu Nov 28 12:25:05 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: =?utf-8?b?xJBvw6BuIFRy4bqnbiBDw7RuZyBEYW5o?= X-Patchwork-Id: 11265907 Return-Path: Received: from mail.kernel.org (pdx-korg-mail-1.web.codeaurora.org [172.30.200.123]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 93585138C for ; Thu, 28 Nov 2019 12:25:53 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 731BD2176D for ; Thu, 28 Nov 2019 12:25:53 +0000 (UTC) Authentication-Results: mail.kernel.org; dkim=pass (2048-bit key) header.d=gmail.com header.i=@gmail.com header.b="Bk1i0945" Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726648AbfK1MZw (ORCPT ); Thu, 28 Nov 2019 07:25:52 -0500 Received: from mail-pj1-f68.google.com ([209.85.216.68]:35263 "EHLO mail-pj1-f68.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726227AbfK1MZw (ORCPT ); Thu, 28 Nov 2019 07:25:52 -0500 Received: by mail-pj1-f68.google.com with SMTP id s8so11838551pji.2 for ; Thu, 28 Nov 2019 04:25:52 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-transfer-encoding; bh=7vWWjarTydkzhl4r+TfiSkqyRF95R0RwfGZH2g/SZ9I=; b=Bk1i0945LF7bE5XmNPozJFXHU0bd5teXfx5bKcErsxjjMzY7R7yW9Lq3314e0I3QYi r2oRhu1dN/+tU5Ff6IWMhDtOojj2sgvHJhV5LZ17pV53AVRfaoY0Vp99+yIWXGf4T+oc XsvHhHdtumoz7VvfHetI+hfCqkqFq9Hkya5WFDCoREEFaNKT8P7z/SmfV9X98W+TclX6 7VpsWLtYaj5RXWc+J7iTE49SqZ4AQsc32FngovY0WXptW37wQnzUDL89yRpDhJMSCS5n b8HCV39xn6scX1ix7K7rf/e8QXttqbem7rr5+br7hTq5eunxN5jyJZ/kcl1mAF0k2e6L NjjA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=7vWWjarTydkzhl4r+TfiSkqyRF95R0RwfGZH2g/SZ9I=; b=aRMYF6maLT0tj/Q3RMjC9QIgUd48KH8QV1l5mefsfVnEJTkr+kLQrY68qjV6BYRF5I BKexBqRm1AHAmumQl2rZY9EZUYWmkxTVP98atfyyXpMx/Rz7VXJVIEnJ07gUSqZ4z0AY GUypG+SjaJZQt9oQ+g4oi1Jf+rztTJSUaO1aL+dmA4bc5Vu9t6lZhD6o7yvXWd6rhAso AryqSv3/K3PpGYrlea7oio/SuXr8+v8KAlSMy7FPmJ8CuOLepSbH8YuCGKSyfaKERtrE S0dPKoNdXTX0+wBPFZGvZaJNiC+o67pvQ68aOOj6L+yrV3c+WAPNCIDO1H+iYJzVo23w KIwg== X-Gm-Message-State: APjAAAX4SujnqqYX/L7z+Xpi5YRJt7gGn2JefXwyPGAb/77o/G/1YUqe OuGv9DVrLYbkotPb2fqp6bGr1z3E6Qc= X-Google-Smtp-Source: APXvYqzkNL1kR8Bm9et+L3YNPiYPN41tjBcF+8EOy4M6l4vVKN6I+rgG9SHIcQrCrTfRZRkbN1/71g== X-Received: by 2002:a17:902:7084:: with SMTP id z4mr5953951plk.247.1574943951548; Thu, 28 Nov 2019 04:25:51 -0800 (PST) Received: from localhost.localdomain ([2402:800:6375:24ff:b05:3145:6413:309f]) by smtp.gmail.com with ESMTPSA id r28sm18849448pgk.75.2019.11.28.04.25.49 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 28 Nov 2019 04:25:51 -0800 (PST) From: Doan Tran Cong Danh To: git@vger.kernel.org Cc: peff@peff.net, Doan Tran Cong Danh , Johannes Sixt , Johannes Schindelin Subject: [PATCH v2 3/3] mingw: use {gm,local}time_s as backend for {gm,local}time_r Date: Thu, 28 Nov 2019 19:25:05 +0700 Message-Id: <33a67eb37702172a6ff29215a840d2cf925daab8.1574943677.git.congdanhqx@gmail.com> X-Mailer: git-send-email 2.24.0.615.g37f5bfbdea In-Reply-To: References: MIME-Version: 1.0 Sender: git-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: git@vger.kernel.org Since Windows doesn't provide gmtime_r(3) and localtime_r(3), we're providing a compat version by using non-reentrant gmtime(3) and localtime(3) as backend. Then, we copy the returned data into the buffer. By doing that, in case of failure, we will dereference a NULL pointer returned by gmtime(3), and localtime(3), and we always return a valid pointer instead of NULL. Drop the memcpy(3) by using gmtime_s, and localtime_s as backend on Windows, and make sure we will return NULL in case of failure. Cc: Johannes Sixt Cc: Johannes Schindelin Signed-off-by: Doan Tran Cong Danh --- compat/mingw.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/compat/mingw.c b/compat/mingw.c index fe609239dd..75695a24a3 100644 --- a/compat/mingw.c +++ b/compat/mingw.c @@ -986,16 +986,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)