/*
* 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-2016 Dmitry V. Levin <ldv@altlinux.org>
* All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
#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_???");
{
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_???");
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);
}
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);
}
}
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)
{
printpath(tcp, tcp->u_arg[0]);
tprints(", ");
- printstr(tcp, tcp->u_arg[1], -1);
+ printstr(tcp, tcp->u_arg[1]);
return RVAL_DECODED;
}
{
printfd(tcp, tcp->u_arg[0]);
tprints(", ");
- printstr(tcp, tcp->u_arg[1], -1);
+ printstr(tcp, tcp->u_arg[1]);
return RVAL_DECODED;
}