* Copyright (c) 1993, 1994, 1995, 1996 Rick Sladkey <jrs@world.std.com>
* Copyright (c) 1996-1999 Wichert Akkerman <wichert@cistron.nl>
* Copyright (c) 2005-2015 Dmitry V. Levin <ldv@altlinux.org>
+ * Copyright (c) 2014-2018 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.
+ * SPDX-License-Identifier: LGPL-2.1-or-later
*/
#include "defs.h"
#include DEF_MPERS_TYPE(kernel_dirent)
-#include "kernel_types.h"
-
#include MPERS_DEFS
#define D_NAME_LEN_MAX 256
static void
-print_old_dirent(struct tcb *tcp, long addr)
+print_old_dirent(struct tcb *const tcp, const kernel_ulong_t addr)
{
kernel_dirent d;
print_old_dirent(tcp, tcp->u_arg[1]);
/* Not much point in printing this out, it is always 1. */
if (tcp->u_arg[2] != 1)
- tprintf(", %lu", tcp->u_arg[2]);
+ tprintf(", %" PRI_klu, tcp->u_arg[2]);
}
return 0;
}
if (entering(tcp)) {
printfd(tcp, tcp->u_arg[0]);
- tprints(", ");
return 0;
}
const unsigned int count = tcp->u_arg[2];
if (syserror(tcp) || !verbose(tcp)) {
+ tprints(", ");
printaddr(tcp->u_arg[1]);
tprintf(", %u", count);
return 0;
if (len) {
buf = malloc(len);
if (!buf || umoven(tcp, tcp->u_arg[1], len, buf) < 0) {
+ tprints(", ");
printaddr(tcp->u_arg[1]);
tprintf(", %u", count);
free(buf);
buf = NULL;
}
+ tprints(",");
if (!abbrev(tcp))
- tprints("[");
+ tprints(" [");
for (i = 0; len && i <= len - sizeof(kernel_dirent); ) {
kernel_dirent *d = (kernel_dirent *) &buf[i];
zero_extend_signed_to_ull(d->d_off),
d->d_reclen);
- if (print_quoted_string(d->d_name, d_name_len,
- QUOTE_0_TERMINATED) > 0) {
- tprints("...");
- }
+ print_quoted_cstring(d->d_name, d_name_len);
tprints(", d_type=");
if (oob)
}
dents++;
if (d->d_reclen < sizeof(kernel_dirent)) {
- tprints("/* d_reclen < sizeof(struct dirent) */");
+ tprints_comment("d_reclen < sizeof(struct dirent)");
break;
}
i += d->d_reclen;
if (!abbrev(tcp))
tprints("]");
else
- tprintf("/* %u entries */", dents);
+ tprintf_comment("%u entries", dents);
tprintf(", %u", count);
free(buf);
return 0;