tests: enhance test coverage of printstrn and umoven

[strace] / utimes.c

diff --git a/utimes.c b/utimes.c
index 40f9566f588ae8222f40ab07bfb0047161ebcf81..311ca2d50122387916a2fcfc59026374b54005fb 100644 (file)
--- a/utimes.c
+++ b/utimes.c
@@ -1,62 +1,77 @@
+/*
+ * 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>
+ * Copyright (c) 2014-2017 The strace developers.
+ * 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.
+ */
+
 #include "defs.h"
 
-static int
-decode_utimes(struct tcb *tcp, int offset, int special)
+SYS_FUNC(utimes)
 {
-       if (entering(tcp)) {
-               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("}");
-               }
-       }
-       return 0;
-}
+       printpath(tcp, tcp->u_arg[0]);
+       tprints(", ");
+       print_timeval_utimes(tcp, tcp->u_arg[1]);
 
-int
-sys_utimes(struct tcb *tcp)
-{
-       return decode_utimes(tcp, 0, 0);
+       return RVAL_DECODED;
 }
 
-int
-sys_futimesat(struct tcb *tcp)
+SYS_FUNC(futimesat)
 {
-       if (entering(tcp))
-               print_dirfd(tcp, tcp->u_arg[0]);
-       return decode_utimes(tcp, 1, 0);
+       print_dirfd(tcp, tcp->u_arg[0]);
+       printpath(tcp, tcp->u_arg[1]);
+       tprints(", ");
+       print_timeval_utimes(tcp, tcp->u_arg[2]);
+
+       return RVAL_DECODED;
 }
 
-int
-sys_utimensat(struct tcb *tcp)
+SYS_FUNC(utimensat)
 {
-       if (entering(tcp)) {
-               print_dirfd(tcp, tcp->u_arg[0]);
-               decode_utimes(tcp, 1, 1);
-               tprints(", ");
-               printflags(at_flags, tcp->u_arg[3], "AT_???");
-       }
-       return 0;
+       print_dirfd(tcp, tcp->u_arg[0]);
+       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_???");
+
+       return RVAL_DECODED;
 }
 
 #ifdef ALPHA
-int
-sys_osf_utimes(struct tcb *tcp)
+SYS_FUNC(osf_utimes)
 {
-       if (entering(tcp)) {
-               printpath(tcp, tcp->u_arg[0]);
-               tprints(", ");
-               printtv_bitness(tcp, tcp->u_arg[1], BITNESS_32,  0);
-       }
-       return 0;
+       printpath(tcp, tcp->u_arg[0]);
+       tprints(", ");
+       print_timeval32_utimes(tcp, tcp->u_arg[1]);
+
+       return RVAL_DECODED;
 }
 #endif /* ALPHA */