time: Add 64-bit time_t support for ftime

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>

diff --git a/include/bits/types/struct_timeb.h b/include/bits/types/struct_timeb.h
new file mode 100644 (file)
index 0000000..fef74d2
--- /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 (file)
index 0000000..14704a9
--- /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 9f4509c35e972208ef36d29b7553a33938b95c3b..2b01dafea7178fc288e06a469fb71da12b3adbc2 100644 (file)
--- 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 a4fb13d6a35209768650d84383d74fd8c22139a0..26aa83516681303d5eb0c6c3b64dcf48ec355018 100644 (file)
--- 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 (file)
index 0000000..1fe60c7
--- /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 70a2590c1794ea09d35597a756fcfdfc9c704a60..91ba100503d26fb0df19d786c133ff24d082f733 100644 (file)
--- a/time/ftime.c
+++ b/time/ftime.c
@@ -18,13 +18,13 @@
 
 #include <features.h>
 #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;
@@ -32,3 +32,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 d6cdf29111fdaf0239b32a2511222153e824b5df..bbad4eb8c0c3651c291fd2c7b465903b7b03497e 100644 (file)
--- a/time/sys/timeb.h
+++ b/time/sys/timeb.h
@@ -20,19 +20,9 @@
 
 #include <features.h>
 
-#include <bits/types/time_t.h>
-
 __BEGIN_DECLS
 
-/* 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.  */