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

[strace] / capability.c

diff --git a/capability.c b/capability.c
index 26d9c66aaad55c0a71ca18b4e35bd2683ffe797d..421649d57c682c191881322c82341a00666dc406 100644 (file)
--- a/capability.c
+++ b/capability.c
@@ -1,3 +1,32 @@
+/*
+ * Copyright (c) 2000 Wichert Akkerman <wakkerma@debian.org>
+ * Copyright (c) 2011 Denys Vlasenko <dvlasenk@redhat.com>
+ * Copyright (c) 2005-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.
+ */
+
 #include "defs.h"
 
 /* these constants are the same as in <linux/capability.h> */
@@ -51,13 +80,8 @@ get_cap_header(struct tcb *tcp, unsigned long addr)
 static void
 print_cap_header(struct tcb *tcp, unsigned long addr, cap_user_header_t h)
 {
-       if (!addr) {
-               tprints("NULL");
-               return;
-       }
-
-       if (!h) {
-               tprintf("%#lx", addr);
+       if (!addr || !h) {
+               printaddr(addr);
                return;
        }
 
@@ -86,14 +110,8 @@ print_cap_data(struct tcb *tcp, unsigned long addr, const cap_user_header_t h)
        struct user_cap_data_struct data[2];
        unsigned int len;
 
-       if (!addr) {
-               tprints("NULL");
-               return;
-       }
-
-       if (!h || !verbose(tcp) ||
-           (exiting(tcp) && syserror(tcp))) {
-               tprintf("%#lx", addr);
+       if (!addr || !h) {
+               printaddr(addr);
                return;
        }
 
@@ -103,10 +121,8 @@ print_cap_data(struct tcb *tcp, unsigned long addr, const cap_user_header_t h)
        else
                len = 1;
 
-       if (umoven(tcp, addr, len * sizeof(data[0]), data) < 0) {
-               tprintf("%#lx", addr);
+       if (umoven_or_printaddr(tcp, addr, len * sizeof(data[0]), data))
                return;
-       }
 
        tprints("{");
        print_cap_bits(data[0].effective, len > 1 ? data[1].effective : 0);
@@ -117,8 +133,7 @@ print_cap_data(struct tcb *tcp, unsigned long addr, const cap_user_header_t h)
        tprints("}");
 }
 
-int
-sys_capget(struct tcb *tcp)
+SYS_FUNC(capget)
 {
        cap_user_header_t h;
 
@@ -133,14 +148,12 @@ sys_capget(struct tcb *tcp)
        return 0;
 }
 
-int
-sys_capset(struct tcb *tcp)
+SYS_FUNC(capset)
 {
-       if (entering(tcp)) {
-               cap_user_header_t h = get_cap_header(tcp, tcp->u_arg[0]);
-               print_cap_header(tcp, tcp->u_arg[0], h);
-               tprints(", ");
-               print_cap_data(tcp, tcp->u_arg[1], h);
-       }
-       return 0;
+       cap_user_header_t h = get_cap_header(tcp, tcp->u_arg[0]);
+       print_cap_header(tcp, tcp->u_arg[0], h);
+       tprints(", ");
+       print_cap_data(tcp, tcp->u_arg[1], h);
+
+       return RVAL_DECODED;
 }