tests: extend printstr test

[strace] / ldt.c

diff --git a/ldt.c b/ldt.c
index dbe49d92ff5d804451411b510006cdf0d73da08d..81bc8ae39abd2e7f536632d7c75e9fd7232652f4 100644 (file)
--- a/ldt.c
+++ b/ldt.c
@@ -1,23 +1,50 @@
+/*
+ * 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) 2002-2004 Roland McGrath <roland@redhat.com>
+ * Copyright (c) 2010 Andreas Schwab <schwab@linux-m68k.org>
+ * Copyright (c) 2014-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"
 
-#if defined I386 || defined X86_64 || defined X32
+#ifdef HAVE_STRUCT_USER_DESC
 
 # include <asm/ldt.h>
 
 void
-print_user_desc(struct tcb *tcp, long addr)
+print_user_desc(struct tcb *const tcp, const kernel_ulong_t addr)
 {
        struct user_desc desc;
 
-       if (umove(tcp, addr, &desc) < 0) {
-               tprintf("%lx", addr);
-               return;
-       }
-
-       if (!verbose(tcp)) {
-               tprintf("{entry_number:%d, ...}", desc.entry_number);
+       if (umove_or_printaddr(tcp, addr, &desc))
                return;
-       }
 
        tprintf("{entry_number:%d, "
                "base_addr:%#08x, "
@@ -41,17 +68,14 @@ print_user_desc(struct tcb *tcp, long addr)
 
 SYS_FUNC(modify_ldt)
 {
-       if (entering(tcp)) {
-               tprintf("%ld, ", tcp->u_arg[0]);
-               if (tcp->u_arg[1] == 0
-                   || tcp->u_arg[2] != sizeof(struct user_desc)) {
-                       tprintf("%lx", tcp->u_arg[1]);
-               } else {
-                       print_user_desc(tcp, tcp->u_arg[1]);
-               }
-               tprintf(", %lu", tcp->u_arg[2]);
-       }
-       return 0;
+       tprintf("%" PRI_kld ", ", tcp->u_arg[0]);
+       if (tcp->u_arg[2] != sizeof(struct user_desc))
+               printaddr(tcp->u_arg[1]);
+       else
+               print_user_desc(tcp, tcp->u_arg[1]);
+       tprintf(", %" PRI_klu, tcp->u_arg[2]);
+
+       return RVAL_DECODED;
 }
 
 SYS_FUNC(set_thread_area)
@@ -61,7 +85,8 @@ SYS_FUNC(set_thread_area)
        } else {
                struct user_desc desc;
 
-               if (syserror(tcp) || umove(tcp, tcp->u_arg[0], &desc) < 0) {
+               if (!verbose(tcp) || syserror(tcp) ||
+                   umove(tcp, tcp->u_arg[0], &desc) < 0) {
                        /* returned entry_number is not available */
                } else {
                        static char outstr[32];
@@ -76,23 +101,19 @@ SYS_FUNC(set_thread_area)
 
 SYS_FUNC(get_thread_area)
 {
-       if (exiting(tcp)) {
-               if (syserror(tcp))
-                       tprintf("%lx", tcp->u_arg[0]);
-               else
-                       print_user_desc(tcp, tcp->u_arg[0]);
-       }
+       if (exiting(tcp))
+               print_user_desc(tcp, tcp->u_arg[0]);
        return 0;
 }
 
-#endif /* I386 || X86_64 || X32 */
+#endif /* HAVE_STRUCT_USER_DESC */
 
 #if defined(M68K) || defined(MIPS)
 SYS_FUNC(set_thread_area)
 {
-       if (entering(tcp))
-               tprintf("%#lx", tcp->u_arg[0]);
-       return 0;
+       printaddr(tcp->u_arg[0]);
+
+       return RVAL_DECODED;
 
 }
 #endif
@@ -100,6 +121,6 @@ SYS_FUNC(set_thread_area)
 #if defined(M68K)
 SYS_FUNC(get_thread_area)
 {
-       return RVAL_HEX;
+       return RVAL_DECODED | RVAL_HEX;
 }
 #endif