time.c: move parser of time syscall to print_time.c

* time.c (current_time_t_is_int32): Remove.
(sys_time): Move ...
* print_time.c: ... here.  Mpersify time_t.

diff --git a/print_time.c b/print_time.c
index bd183cc8de8def3c83972191f0718d55c0e92024..15f6a95387b94a23ab183c59b483243349b9eb56 100644 (file)
--- a/print_time.c
+++ b/print_time.c
@@ -1,5 +1,6 @@
 #include "defs.h"
 
+#include DEF_MPERS_TYPE(time_t)
 #include DEF_MPERS_TYPE(timespec_t)
 #include DEF_MPERS_TYPE(timeval_t)
 
@@ -65,3 +66,15 @@ MPERS_PRINTER_DECL(void, print_timeval_pair)(struct tcb *tcp, const long addr)
        print_timeval_t(&t[1]);
        tprints("]");
 }
+
+SYS_FUNC(time)
+{
+       if (exiting(tcp)) {
+               time_t t;
+
+               if (!umove_or_printaddr(tcp, tcp->u_arg[0], &t))
+                       tprintf("[%jd]", (intmax_t) t);
+       }
+
+       return 0;
+}

diff --git a/time.c b/time.c
index 48b7e19bc4b90912e35381290692f158d9064b92..ce355e95887057738e0135dfcb554b8ab956e525 100644 (file)
--- a/time.c
+++ b/time.c
@@ -45,10 +45,8 @@
 # else
 #  define current_time_t_is_compat (current_wordsize == 4)
 # endif
-# define current_time_t_is_int32 current_time_t_is_compat
 #else
 # define current_time_t_is_compat 0
-# define current_time_t_is_int32 (sizeof(time_t) == 4)
 #endif
 
 struct timeval32
@@ -158,17 +156,6 @@ sprint_timespec(char *buf, struct tcb *tcp, long addr)
        }
 }
 
-SYS_FUNC(time)
-{
-       if (exiting(tcp)) {
-               if (current_time_t_is_int32)
-                       printnum_int(tcp, tcp->u_arg[0], "%d");
-               else
-                       printnum_int64(tcp, tcp->u_arg[0], "%" PRId64);
-       }
-       return 0;
-}
-
 SYS_FUNC(gettimeofday)
 {
        if (exiting(tcp)) {