From patchwork Mon Oct 19 19:13:04 2020
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
X-Patchwork-Submitter: Adhemerval Zanella <adhemerval.zanella@linaro.org>
X-Patchwork-Id: 40757
Return-Path: <libc-alpha-bounces@sourceware.org>
X-Original-To: patchwork@sourceware.org
Delivered-To: patchwork@sourceware.org
Received: from server2.sourceware.org (localhost [IPv6:::1])
	by sourceware.org (Postfix) with ESMTP id 72F14388EC31;
	Mon, 19 Oct 2020 19:13:15 +0000 (GMT)
DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 72F14388EC31
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sourceware.org;
	s=default; t=1603134795;
	bh=/G7LNG1Ejonmwtdeq+/AhfxioLMTVJY1KfXuoW/9L5o=;
	h=To:Subject:Date:In-Reply-To:References:List-Id:List-Unsubscribe:
	 List-Archive:List-Post:List-Help:List-Subscribe:From:Reply-To:Cc:
	 From;
	b=nlRmedp9qLYE+FMSUBm07RounvrBpNO2nwaJdzrE0UWQKWYK0NSJyQMcYssBuxbdJ
	 +NDJGZSp3UJGNhtMarr8hxEdKwk6SJZGhtxw4Z6tXGbfWbLzNphpDiGliMWFcXFweX
	 rN8Fnmdg5gYecknwjwD+/pSYfoz4KI/dM7z19Aj4=
X-Original-To: libc-alpha@sourceware.org
Delivered-To: libc-alpha@sourceware.org
Received: from mail-qt1-x829.google.com (mail-qt1-x829.google.com
 [IPv6:2607:f8b0:4864:20::829])
 by sourceware.org (Postfix) with ESMTPS id 194FB388EC23
 for <libc-alpha@sourceware.org>; Mon, 19 Oct 2020 19:13:12 +0000 (GMT)
DMARC-Filter: OpenDMARC Filter v1.3.2 sourceware.org 194FB388EC23
Received: by mail-qt1-x829.google.com with SMTP id c5so624428qtw.3
 for <libc-alpha@sourceware.org>; Mon, 19 Oct 2020 12:13:12 -0700 (PDT)
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=/G7LNG1Ejonmwtdeq+/AhfxioLMTVJY1KfXuoW/9L5o=;
 b=iX8UWAsohG1flv1W60QLKcwvFdn5sBzLoMNsIy3AdtQogRYZyh+EAdap2GdC+UlLM4
 wDjkP0zKvsmXFoxrBiNOaXyF9fKX/TXhjVDnKizyZmbSpBVXBveQHsT1xsVJYVYvrpY1
 TWlFc7GrynGfoOLzFmNyfvGmGjz02FgrTrZvmC7sysuOfNaVwiXs3Nb37iLcP8bMZCXT
 0EH+Hk0ifMw16x1pQAsjlMSRY2pe5qpc3tLdgLOfH77LpskPM8RZGv7tMauA92F48eit
 BLXiNZKN2WiyNh0SU+STQahd6sGg664L8Tc8/Oq0YvHVjBmwgLp6TvwTpNS2RKgKFV8U
 zhww==
X-Gm-Message-State: AOAM533jKjUlTaBDkqpmP5SOjvyjZIxzgQ4hPh7OQoxQNvVo4tfnGj74
 n/6f/6b+R2zAMx9qphuSLEgHCkRSq3EFdQ==
X-Google-Smtp-Source: 
 ABdhPJyWC2eNrMHruOolUsHbRlChmxzMccq3VrEMsQ59Ynkvxzw/sWyVKwkTm0DNmAroqlSMuJKNAQ==
X-Received: by 2002:aed:2c47:: with SMTP id f65mr937390qtd.328.1603134791423;
 Mon, 19 Oct 2020 12:13:11 -0700 (PDT)
Received: from localhost.localdomain ([177.194.48.209])
 by smtp.googlemail.com with ESMTPSA id a20sm343404qtk.67.2020.10.19.12.13.10
 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256);
 Mon, 19 Oct 2020 12:13:10 -0700 (PDT)
To: libc-alpha@sourceware.org
Subject: [PATCH 2/2] time: Add 64-bit time_t support for ftime
Date: Mon, 19 Oct 2020 16:13:04 -0300
Message-Id: <20201019191304.3471080-2-adhemerval.zanella@linaro.org>
X-Mailer: git-send-email 2.25.1
In-Reply-To: <20201019191304.3471080-1-adhemerval.zanella@linaro.org>
References: <20201019191304.3471080-1-adhemerval.zanella@linaro.org>
MIME-Version: 1.0
X-Spam-Status: No, score=-14.1 required=5.0 tests=BAYES_00, DKIM_SIGNED,
 DKIM_VALID, DKIM_VALID_AU, DKIM_VALID_EF, GIT_PATCH_0, RCVD_IN_DNSWL_NONE,
 SPF_HELO_NONE, SPF_PASS, TXREP autolearn=ham autolearn_force=no version=3.4.2
X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on
 server2.sourceware.org
X-BeenThere: libc-alpha@sourceware.org
X-Mailman-Version: 2.1.29
Precedence: list
List-Id: Libc-alpha mailing list <libc-alpha.sourceware.org>
List-Unsubscribe: <https://sourceware.org/mailman/options/libc-alpha>,
 <mailto:libc-alpha-request@sourceware.org?subject=unsubscribe>
List-Archive: <https://sourceware.org/pipermail/libc-alpha/>
List-Post: <mailto:libc-alpha@sourceware.org>
List-Help: <mailto:libc-alpha-request@sourceware.org?subject=help>
List-Subscribe: <https://sourceware.org/mailman/listinfo/libc-alpha>,
 <mailto:libc-alpha-request@sourceware.org?subject=subscribe>
X-Patchwork-Original-From: Adhemerval Zanella via Libc-alpha
 <libc-alpha@sourceware.org>
From: Adhemerval Zanella <adhemerval.zanella@linaro.org>
Reply-To: Adhemerval Zanella <adhemerval.zanella@linaro.org>
Cc: Florian Weimer <fweimer@redhat.com>
Errors-To: libc-alpha-bounces@sourceware.org
Sender: "Libc-alpha" <libc-alpha-bounces@sourceware.org>

It basically calls the 64-bit __clock_gettime64 and adds the overflow
check.

Checked on x86_64-linux-gnu and i686-linux-gnu.
Reviewed-by: Lukasz Majewski <lukma@denx.de>
---
 include/bits/types/struct_timeb.h |  1 +
 include/struct___timeb64.h        | 16 ++++++++++++++++
 include/sys/timeb.h               | 12 ++++++++++++
 time/Makefile                     |  2 +-
 time/bits/types/struct_timeb.h    | 15 +++++++++++++++
 time/ftime.c                      | 28 ++++++++++++++++++++++++----
 time/sys/timeb.h                  | 12 +-----------
 7 files changed, 70 insertions(+), 16 deletions(-)
 create mode 100644 include/bits/types/struct_timeb.h
 create mode 100644 include/struct___timeb64.h
 create mode 100644 time/bits/types/struct_timeb.h

diff --git a/include/bits/types/struct_timeb.h b/include/bits/types/struct_timeb.h
new file mode 100644
index 0000000000..fef74d2f44
--- /dev/null
+++ b/include/bits/types/struct_timeb.h
@@ -0,0 +1 @@
+#include <time/bits/types/struct_timeb.h>
diff --git a/include/struct___timeb64.h b/include/struct___timeb64.h
new file mode 100644
index 0000000000..14704a9e30
--- /dev/null
+++ b/include/struct___timeb64.h
@@ -0,0 +1,16 @@
+#ifndef _STRUCT_TIMEB64_H
+#define _STRUCT_TIMEB64_H
+
+#if __TIMESIZE == 64
+# define __timeb64 timeb
+#else
+struct __timeb64
+{
+  __time64_t time;
+  unsigned short int millitm;
+  short int timezone;
+  short int dstflag;
+};
+#endif
+
+#endif /* _STRUCT_TIMEB64_H  */
diff --git a/include/sys/timeb.h b/include/sys/timeb.h
index 9f4509c35e..2b01dafea7 100644
--- a/include/sys/timeb.h
+++ b/include/sys/timeb.h
@@ -1 +1,13 @@
 #include <time/sys/timeb.h>
+
+#ifndef _ISOMAC
+# if __TIMESIZE == 64
+#  define __timeb64  timeb
+#  define __ftime64  ftime
+# else
+#  include <struct___timeb64.h>
+
+extern int __ftime64 (struct __timeb64 *) __nonnull ((1));
+libc_hidden_proto (__ftime64);
+# endif
+#endif
diff --git a/time/Makefile b/time/Makefile
index a4fb13d6a3..26aa835166 100644
--- a/time/Makefile
+++ b/time/Makefile
@@ -27,7 +27,7 @@ headers := time.h sys/time.h sys/timeb.h bits/time.h			\
 	   bits/types/struct_itimerspec.h				\
 	   bits/types/struct_timespec.h bits/types/struct_timeval.h	\
 	   bits/types/struct_tm.h bits/types/timer_t.h			\
-	   bits/types/time_t.h
+	   bits/types/time_t.h bits/types/struct_timeb.h
 
 routines := offtime asctime clock ctime ctime_r difftime \
 	    gmtime localtime mktime time		 \
diff --git a/time/bits/types/struct_timeb.h b/time/bits/types/struct_timeb.h
new file mode 100644
index 0000000000..1fe60c7131
--- /dev/null
+++ b/time/bits/types/struct_timeb.h
@@ -0,0 +1,15 @@
+#ifndef __timeb_defined
+#define __timeb_defined 1
+
+#include <bits/types/time_t.h>
+
+/* Structure returned by the 'ftime' function.  */
+struct timeb
+  {
+    time_t time;		/* Seconds since epoch, as from 'time'.  */
+    unsigned short int millitm;	/* Additional milliseconds.  */
+    short int timezone;		/* Minutes west of GMT.  */
+    short int dstflag;		/* Nonzero if Daylight Savings Time used.  */
+  };
+
+#endif
diff --git a/time/ftime.c b/time/ftime.c
index ec88d9963f..a99070d3e0 100644
--- a/time/ftime.c
+++ b/time/ftime.c
@@ -20,13 +20,13 @@
 #undef __GLIBC_USE_DEPRECATED_FTIME
 #define __GLIBC_USE_DEPRECATED_FTIME 1
 #include <sys/timeb.h>
-#include <time.h>
+#include <errno.h>
 
 int
-ftime (struct timeb *timebuf)
+__ftime64 (struct __timeb64 *timebuf)
 {
-  struct timespec ts;
-  __clock_gettime (CLOCK_REALTIME, &ts);
+  struct __timespec64 ts;
+  __clock_gettime64 (CLOCK_REALTIME, &ts);
 
   timebuf->time = ts.tv_sec;
   timebuf->millitm = ts.tv_nsec / 1000000;
@@ -34,3 +34,23 @@ ftime (struct timeb *timebuf)
   timebuf->dstflag = 0;
   return 0;
 }
+#if __TIMESIZE != 64
+libc_hidden_def (__ftime64)
+
+int
+ftime (struct timeb *timebuf)
+{
+  struct __timeb64 tb64;
+  __ftime64 (&tb64);
+  if (! in_time_t_range (tb64.time))
+    {
+      __set_errno (EOVERFLOW);
+      return -1;
+    }
+  timebuf->time = tb64.time;
+  timebuf->millitm = tb64.millitm;
+  timebuf->timezone = tb64.timezone;
+  timebuf->dstflag = tb64.dstflag;
+  return 0;
+}
+#endif
diff --git a/time/sys/timeb.h b/time/sys/timeb.h
index be7b46c178..3f44abe55e 100644
--- a/time/sys/timeb.h
+++ b/time/sys/timeb.h
@@ -20,21 +20,11 @@
 
 #include <features.h>
 
-#include <bits/types/time_t.h>
-
 __BEGIN_DECLS
 
 #if __GLIBC_USE (DEPRECATED_FTIME)
 
-/* Structure returned by the `ftime' function.  */
-
-struct timeb
-  {
-    time_t time;		/* Seconds since epoch, as from `time'.  */
-    unsigned short int millitm;	/* Additional milliseconds.  */
-    short int timezone;		/* Minutes west of GMT.  */
-    short int dstflag;		/* Nonzero if Daylight Savings Time used.  */
-  };
+# include <bits/types/struct_timeb.h>
 
 /* Fill in TIMEBUF with information about the current time.  */