Update copyright headers

[strace] / xattr.c

diff --git a/xattr.c b/xattr.c
index c47ebd6dd41909d597c41044da56cd2947ce4ef4..9e88a8326678bd2dcb4a0b599afa50e2d641c90e 100644 (file)
--- a/xattr.c
+++ b/xattr.c
@@ -1,30 +1,10 @@
 /*
  * Copyright (c) 2002-2005 Roland McGrath <roland@redhat.com>
  * Copyright (c) 2004 Ulrich Drepper <drepper@redhat.com>
- * Copyright (c) 2005-2015 Dmitry V. Levin <ldv@altlinux.org>
+ * Copyright (c) 2005-2018 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.
+ * SPDX-License-Identifier: LGPL-2.1-or-later
  */
 
 #include "defs.h"
@@ -35,61 +15,30 @@
 
 #include "xlat/xattrflags.h"
 
+#ifndef XATTR_SIZE_MAX
+# define XATTR_SIZE_MAX 65536
+#endif
+
 static void
-print_xattr_val(struct tcb *tcp,
-               unsigned long addr,
-               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 = NULL;
-       unsigned int len;
-
        tprints(", ");
 
-       if (insize == 0)
-               goto done;
-
-       len = size;
-       if (size != (unsigned long) len)
-               goto done;
-
-       if (!len) {
-               tprintf("\"\", %ld", insize);
-               return;
-       }
-
-       if (!verbose(tcp) || (exiting(tcp) && syserror(tcp)))
-               goto done;
-
-       buf = malloc(len);
-       if (!buf)
-               goto done;
-
-       if (umoven(tcp, addr, len, buf) < 0) {
-               free(buf);
-               buf = NULL;
-               goto done;
-       }
-
-       /* Don't print terminating NUL if there is one. */
-       if (buf[len - 1] == '\0')
-               --len;
-
-done:
-       if (buf) {
-               print_quoted_string(buf, len, 0);
-               free(buf);
-       } else {
+       if (size > XATTR_SIZE_MAX)
                printaddr(addr);
-       }
-       tprintf(", %ld", insize);
+       else
+               printstr_ex(tcp, addr, size, QUOTE_OMIT_TRAILING_0);
+       tprintf(", %" PRI_klu, insize);
 }
 
 SYS_FUNC(setxattr)
 {
        printpath(tcp, tcp->u_arg[0]);
        tprints(", ");
-       printstr(tcp, tcp->u_arg[1], -1);
+       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_???");
@@ -100,7 +49,7 @@ SYS_FUNC(fsetxattr)
 {
        printfd(tcp, tcp->u_arg[0]);
        tprints(", ");
-       printstr(tcp, tcp->u_arg[1], -1);
+       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_???");
@@ -112,7 +61,7 @@ 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, tcp->u_arg[2], tcp->u_arg[3], tcp->u_rval);
        }
@@ -124,7 +73,7 @@ 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, tcp->u_arg[2], tcp->u_arg[3], tcp->u_rval);
        }
@@ -132,17 +81,15 @@ SYS_FUNC(fgetxattr)
 }
 
 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)) {
+       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)
@@ -171,7 +118,7 @@ SYS_FUNC(removexattr)
 {
        printpath(tcp, tcp->u_arg[0]);
        tprints(", ");
-       printstr(tcp, tcp->u_arg[1], -1);
+       printstr(tcp, tcp->u_arg[1]);
        return RVAL_DECODED;
 }
 
@@ -179,6 +126,6 @@ SYS_FUNC(fremovexattr)
 {
        printfd(tcp, tcp->u_arg[0]);
        tprints(", ");
-       printstr(tcp, tcp->u_arg[1], -1);
+       printstr(tcp, tcp->u_arg[1]);
        return RVAL_DECODED;
 }