netlink_sock_diag: print inet_diag_sockid.idiag_if as an interface index

[strace] / time.c

diff --git a/time.c b/time.c
index 209cb8763568a551d9403eaf014bda256886b8e8..31f44fc65ebb524d308687e0e5116eff312208c2 100644 (file)
--- a/time.c
+++ b/time.c
@@ -2,6 +2,7 @@
  * Copyright (c) 1991, 1992 Paul Kranenburg <pk@cs.few.eur.nl>
  * Copyright (c) 1993 Branko Lankester <branko@hacktic.nl>
  * Copyright (c) 1993, 1994, 1995, 1996 Rick Sladkey <jrs@world.std.com>
+ * Copyright (c) 1996-2017 The strace developers.
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -32,112 +33,8 @@
 #include <signal.h>
 #include <sys/timex.h>
 
-#ifndef UTIME_NOW
-#define UTIME_NOW ((1l << 30) - 1l)
-#endif
-#ifndef UTIME_OMIT
-#define UTIME_OMIT ((1l << 30) - 2l)
-#endif
-
-#if SUPPORTED_PERSONALITIES > 1
-# if defined X86_64 || defined X32
-#  define current_time_t_is_compat (current_personality == 1)
-# else
-#  define current_time_t_is_compat (current_wordsize == 4)
-# endif
-#else
-# define current_time_t_is_compat 0
-#endif
-
-struct timeval32
-{
-       u_int32_t tv_sec, tv_usec;
-};
-
-void
-printtv_bitness(struct tcb *tcp, long addr, enum bitness_t bitness, int special)
-{
-       char buf[TIMEVAL_TEXT_BUFSIZE];
-       sprinttv(buf, tcp, addr, bitness, special);
-       tprints(buf);
-}
-
-static char *
-do_sprinttv(char *buf, const uintmax_t sec, const uintmax_t usec,
-           const int special)
-{
-       if (special) {
-               switch (usec) {
-                       case UTIME_NOW:
-                               return stpcpy(buf, "UTIME_NOW");
-                       case UTIME_OMIT:
-                               return stpcpy(buf, "UTIME_OMIT");
-               }
-       }
-       return buf + sprintf(buf, "{%ju, %ju}", sec, usec);
-}
-
-char *
-sprinttv(char *buf, struct tcb *tcp, long addr, enum bitness_t bitness, int special)
-{
-       if (addr == 0)
-               return stpcpy(buf, "NULL");
-
-       if (!verbose(tcp) || (exiting(tcp) && syserror(tcp)))
-               return buf + sprintf(buf, "%#lx", addr);
-
-       if (bitness == BITNESS_32 || current_time_t_is_compat)
-       {
-               struct timeval32 tv;
-
-               if (umove(tcp, addr, &tv) >= 0)
-                       return do_sprinttv(buf, tv.tv_sec, tv.tv_usec, special);
-       } else {
-               struct timeval tv;
-
-               if (umove(tcp, addr, &tv) >= 0)
-                       return do_sprinttv(buf, tv.tv_sec, tv.tv_usec, special);
-       }
-
-       return buf + sprintf(buf, "%#lx", addr);
-}
-
-void
-sprint_timespec(char *buf, struct tcb *tcp, long addr)
-{
-       if (addr == 0)
-               strcpy(buf, "NULL");
-       else if (!verbose(tcp))
-               sprintf(buf, "%#lx", addr);
-       else {
-               int rc;
-
-#if SUPPORTED_PERSONALITIES > 1
-               if (current_time_t_is_compat) {
-                       struct timeval32 tv;
-
-                       rc = umove(tcp, addr, &tv);
-                       if (rc >= 0)
-                               sprintf(buf, "{%u, %u}",
-                                       tv.tv_sec, tv.tv_usec);
-               } else
-#endif
-               {
-                       struct timespec ts;
-
-                       rc = umove(tcp, addr, &ts);
-                       if (rc >= 0)
-                               sprintf(buf, "{%ju, %ju}",
-                                       (uintmax_t) ts.tv_sec,
-                                       (uintmax_t) ts.tv_nsec);
-               }
-               if (rc < 0)
-                       strcpy(buf, "{...}");
-       }
-}
-
 static void
-print_timezone(struct tcb *tcp, const long addr)
+print_timezone(struct tcb *const tcp, const kernel_ulong_t addr)
 {
        struct timezone tz;
 
@@ -271,11 +168,11 @@ SYS_FUNC(osf_setitimer)
 #include "xlat/adjtimex_state.h"
 
 static int
-do_adjtimex(struct tcb *tcp, long addr)
+do_adjtimex(struct tcb *const tcp, const kernel_ulong_t addr)
 {
        if (print_timex(tcp, addr))
                return 0;
-       tcp->auxstr = xlookup(adjtimex_state, tcp->u_rval);
+       tcp->auxstr = xlookup(adjtimex_state, (kernel_ulong_t) tcp->u_rval);
        if (tcp->auxstr)
                return RVAL_STR;
        return 0;
@@ -301,15 +198,14 @@ printclockname(int clockid)
                if ((clockid & CLOCKFD_MASK) == CLOCKFD)
                        tprintf("FD_TO_CLOCKID(%d)", CLOCKID_TO_FD(clockid));
                else {
-                       if(CPUCLOCK_PERTHREAD(clockid))
+                       if (CPUCLOCK_PERTHREAD(clockid))
                                tprintf("MAKE_THREAD_CPUCLOCK(%d,", CPUCLOCK_PID(clockid));
                        else
                                tprintf("MAKE_PROCESS_CPUCLOCK(%d,", CPUCLOCK_PID(clockid));
                        printxval(cpuclocknames, clockid & CLOCKFD_MASK, "CPUCLOCK_???");
                        tprints(")");
                }
-       }
-       else
+       } else
 #endif
                printxval(clocknames, clockid, "CLOCK_???");
 }
@@ -407,18 +303,6 @@ SYS_FUNC(timer_gettime)
 
 #include "xlat/timerfdflags.h"
 
-SYS_FUNC(timerfd)
-{
-       tprintf("%ld, ", tcp->u_arg[0]);
-       printclockname(tcp->u_arg[0]);
-       tprints(", ");
-       printflags(timerfdflags, tcp->u_arg[2], "TFD_???");
-       tprints(", ");
-       print_itimerspec(tcp, tcp->u_arg[3]);
-
-       return RVAL_DECODED | RVAL_FD;
-}
-
 SYS_FUNC(timerfd_create)
 {
        printclockname(tcp->u_arg[0]);
@@ -430,15 +314,17 @@ SYS_FUNC(timerfd_create)
 
 SYS_FUNC(timerfd_settime)
 {
-       printfd(tcp, tcp->u_arg[0]);
-       tprints(", ");
-       printflags(timerfdflags, tcp->u_arg[1], "TFD_???");
-       tprints(", ");
-       print_itimerspec(tcp, tcp->u_arg[2]);
-       tprints(", ");
-       print_itimerspec(tcp, tcp->u_arg[3]);
-
-       return RVAL_DECODED;
+       if (entering(tcp)) {
+               printfd(tcp, tcp->u_arg[0]);
+               tprints(", ");
+               printflags(timerfdflags, tcp->u_arg[1], "TFD_???");
+               tprints(", ");
+               print_itimerspec(tcp, tcp->u_arg[2]);
+               tprints(", ");
+       } else {
+               print_itimerspec(tcp, tcp->u_arg[3]);
+       }
+       return 0;
 }
 
 SYS_FUNC(timerfd_gettime)