Update copyright headers

[strace] / xattr.c

diff --git a/xattr.c b/xattr.c
index fd34fc58cf56dccbe083f3a063b560a44c11455e..9e88a8326678bd2dcb4a0b599afa50e2d641c90e 100644 (file)
--- a/xattr.c
+++ b/xattr.c
@@ -1,3 +1,12 @@
+/*
+ * Copyright (c) 2002-2005 Roland McGrath <roland@redhat.com>
+ * Copyright (c) 2004 Ulrich Drepper <drepper@redhat.com>
+ * Copyright (c) 2005-2018 Dmitry V. Levin <ldv@altlinux.org>
+ * All rights reserved.
+ *
+ * SPDX-License-Identifier: LGPL-2.1-or-later
+ */
+
 #include "defs.h"
 
 #ifdef HAVE_SYS_XATTR_H
@@ -6,75 +15,45 @@
 
 #include "xlat/xattrflags.h"
 
+#ifndef XATTR_SIZE_MAX
+# define XATTR_SIZE_MAX 65536
+#endif
+
 static void
-print_xattr_val(struct tcb *tcp, int failed,
-               unsigned long arg,
-               unsigned long insize,
-               unsigned long size)
+print_xattr_val(struct tcb *const tcp,
+               const kernel_ulong_t addr,
+               const kernel_ulong_t insize,
+               const kernel_ulong_t size)
 {
-       char *buf;
-       unsigned int len;
-
-       if (insize == 0)
-               goto failed;
-
-       len = size;
-       if (size != (unsigned long) len)
-               goto failed;
-
-       if (!len) {
-               tprintf(", \"\", %ld", insize);
-               return;
-       }
-
-       buf = malloc(len);
-       if (!buf)
-               goto failed;
-
-       if (umoven(tcp, arg, len, buf) < 0) {
-               free(buf);
-               goto failed;
-       }
-
-       /* Don't print terminating NUL if there is one. */
-       if (buf[len - 1] == '\0')
-               --len;
-
        tprints(", ");
-       print_quoted_string(buf, len, 0);
-       tprintf(", %ld", insize);
-
-       free(buf);
-       return;
 
-failed:
-       tprintf(", 0x%lx, %ld", arg, insize);
+       if (size > XATTR_SIZE_MAX)
+               printaddr(addr);
+       else
+               printstr_ex(tcp, addr, size, QUOTE_OMIT_TRAILING_0);
+       tprintf(", %" PRI_klu, insize);
 }
 
 SYS_FUNC(setxattr)
 {
-       if (entering(tcp)) {
-               printpath(tcp, tcp->u_arg[0]);
-               tprints(", ");
-               printstr(tcp, tcp->u_arg[1], -1);
-               print_xattr_val(tcp, 0, tcp->u_arg[2], tcp->u_arg[3], tcp->u_arg[3]);
-               tprints(", ");
-               printflags(xattrflags, tcp->u_arg[4], "XATTR_???");
-       }
-       return 0;
+       printpath(tcp, tcp->u_arg[0]);
+       tprints(", ");
+       printstr(tcp, tcp->u_arg[1]);
+       print_xattr_val(tcp, tcp->u_arg[2], tcp->u_arg[3], tcp->u_arg[3]);
+       tprints(", ");
+       printflags(xattrflags, tcp->u_arg[4], "XATTR_???");
+       return RVAL_DECODED;
 }
 
 SYS_FUNC(fsetxattr)
 {
-       if (entering(tcp)) {
-               printfd(tcp, tcp->u_arg[0]);
-               tprints(", ");
-               printstr(tcp, tcp->u_arg[1], -1);
-               print_xattr_val(tcp, 0, tcp->u_arg[2], tcp->u_arg[3], tcp->u_arg[3]);
-               tprints(", ");
-               printflags(xattrflags, tcp->u_arg[4], "XATTR_???");
-       }
-       return 0;
+       printfd(tcp, tcp->u_arg[0]);
+       tprints(", ");
+       printstr(tcp, tcp->u_arg[1]);
+       print_xattr_val(tcp, tcp->u_arg[2], tcp->u_arg[3], tcp->u_arg[3]);
+       tprints(", ");
+       printflags(xattrflags, tcp->u_arg[4], "XATTR_???");
+       return RVAL_DECODED;
 }
 
 SYS_FUNC(getxattr)
@@ -82,10 +61,9 @@ SYS_FUNC(getxattr)
        if (entering(tcp)) {
                printpath(tcp, tcp->u_arg[0]);
                tprints(", ");
-               printstr(tcp, tcp->u_arg[1], -1);
+               printstr(tcp, tcp->u_arg[1]);
        } else {
-               print_xattr_val(tcp, syserror(tcp), tcp->u_arg[2], tcp->u_arg[3],
-                               tcp->u_rval);
+               print_xattr_val(tcp, tcp->u_arg[2], tcp->u_arg[3], tcp->u_rval);
        }
        return 0;
 }
@@ -95,26 +73,23 @@ SYS_FUNC(fgetxattr)
        if (entering(tcp)) {
                printfd(tcp, tcp->u_arg[0]);
                tprints(", ");
-               printstr(tcp, tcp->u_arg[1], -1);
+               printstr(tcp, tcp->u_arg[1]);
        } else {
-               print_xattr_val(tcp, syserror(tcp), tcp->u_arg[2], tcp->u_arg[3],
-                               tcp->u_rval);
+               print_xattr_val(tcp, tcp->u_arg[2], tcp->u_arg[3], tcp->u_rval);
        }
        return 0;
 }
 
 static void
-print_xattr_list(struct tcb *tcp, unsigned long addr, unsigned long size)
+print_xattr_list(struct tcb *const tcp, const kernel_ulong_t addr,
+                const kernel_ulong_t size)
 {
-       if (syserror(tcp)) {
-               tprintf("%#lx", addr);
+       if (!size || syserror(tcp)) {
+               printaddr(addr);
        } else {
-               unsigned long len =
-                       (size < (unsigned long) tcp->u_rval) ?
-                               size : (unsigned long) tcp->u_rval;
-               printstr(tcp, addr, len);
+               printstrn(tcp, addr, tcp->u_rval);
        }
-       tprintf(", %lu", size);
+       tprintf(", %" PRI_klu, size);
 }
 
 SYS_FUNC(listxattr)
@@ -141,20 +116,16 @@ SYS_FUNC(flistxattr)
 
 SYS_FUNC(removexattr)
 {
-       if (entering(tcp)) {
-               printpath(tcp, tcp->u_arg[0]);
-               tprints(", ");
-               printstr(tcp, tcp->u_arg[1], -1);
-       }
-       return 0;
+       printpath(tcp, tcp->u_arg[0]);
+       tprints(", ");
+       printstr(tcp, tcp->u_arg[1]);
+       return RVAL_DECODED;
 }
 
 SYS_FUNC(fremovexattr)
 {
-       if (entering(tcp)) {
-               printfd(tcp, tcp->u_arg[0]);
-               tprints(", ");
-               printstr(tcp, tcp->u_arg[1], -1);
-       }
-       return 0;
+       printfd(tcp, tcp->u_arg[0]);
+       tprints(", ");
+       printstr(tcp, tcp->u_arg[1]);
+       return RVAL_DECODED;
 }