Add a enum for decoding to tprint_iov() and tprint_iov_upto()

[strace] / utimes.c

diff --git a/utimes.c b/utimes.c
index e3a93392f4df25ccff22d0be7dc431a1de7d22ef..2908529b3f259f43c5b8d6602646d08345d6e3e2 100644 (file)
--- a/utimes.c
+++ b/utimes.c
@@ -1,27 +1,43 @@
-#include "defs.h"
+/*
+ * Copyright (c) 1991, 1992 Paul Kranenburg <pk@cs.few.eur.nl>
+ * Copyright (c) 1993 Branko Lankester <branko@hacktic.nl>
+ * Copyright (c) 1993-1996 Rick Sladkey <jrs@world.std.com>
+ * Copyright (c) 1996-1999 Wichert Akkerman <wichert@cistron.nl>
+ * Copyright (c) 2006-2007 Ulrich Drepper <drepper@redhat.com>
+ * Copyright (c) 2006 Bernhard Kaindl <bk@suse.de>
+ * Copyright (c) 2006-2015 Dmitry V. Levin <ldv@altlinux.org>
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in the
+ *    documentation and/or other materials provided with the distribution.
+ * 3. The name of the author may not be used to endorse or promote products
+ *    derived from this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
+ * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
+ * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
+ * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
+ * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
+ * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+ * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+ * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
+ * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
 
-static void
-decode_utimes(struct tcb *tcp, int offset, int special)
-{
-       printpath(tcp, tcp->u_arg[offset]);
-       tprints(", ");
-       if (tcp->u_arg[offset + 1] == 0)
-               tprints("NULL");
-       else {
-               tprints("[");
-               printtv_bitness(tcp, tcp->u_arg[offset + 1],
-                               BITNESS_CURRENT, special);
-               tprints(", ");
-               printtv_bitness(tcp, tcp->u_arg[offset + 1]
-                               + sizeof(struct timeval),
-                               BITNESS_CURRENT, special);
-               tprints("]");
-       }
-}
+#include "defs.h"
 
 SYS_FUNC(utimes)
 {
-       decode_utimes(tcp, 0, 0);
+       printpath(tcp, tcp->u_arg[0]);
+       tprints(", ");
+       print_timeval_pair(tcp, tcp->u_arg[1]);
 
        return RVAL_DECODED;
 }
@@ -29,7 +45,9 @@ SYS_FUNC(utimes)
 SYS_FUNC(futimesat)
 {
        print_dirfd(tcp, tcp->u_arg[0]);
-       decode_utimes(tcp, 1, 0);
+       printpath(tcp, tcp->u_arg[1]);
+       tprints(", ");
+       print_timeval_pair(tcp, tcp->u_arg[2]);
 
        return RVAL_DECODED;
 }
@@ -37,7 +55,9 @@ SYS_FUNC(futimesat)
 SYS_FUNC(utimensat)
 {
        print_dirfd(tcp, tcp->u_arg[0]);
-       decode_utimes(tcp, 1, 1);
+       printpath(tcp, tcp->u_arg[1]);
+       tprints(", ");
+       print_timespec_utime_pair(tcp, tcp->u_arg[2]);
        tprints(", ");
        printflags(at_flags, tcp->u_arg[3], "AT_???");
 
@@ -49,7 +69,7 @@ SYS_FUNC(osf_utimes)
 {
        printpath(tcp, tcp->u_arg[0]);
        tprints(", ");
-       printtv_bitness(tcp, tcp->u_arg[1], BITNESS_32,  0);
+       print_timeval32_pair(tcp, tcp->u_arg[1]);
 
        return RVAL_DECODED;
 }