/*
* Copyright (c) 2014-2015 Dmitry V. Levin <ldv@altlinux.org>
+ * Copyright (c) 2014-2017 The strace developers.
* All rights reserved.
*
* Redistribution and use in source and binary forms, with or without
SYS_FUNC(add_key)
{
/* type */
- printstr(tcp, tcp->u_arg[0], -1);
+ printstr(tcp, tcp->u_arg[0]);
/* description */
tprints(", ");
- printstr(tcp, tcp->u_arg[1], -1);
+ printstr(tcp, tcp->u_arg[1]);
/* payload */
tprints(", ");
- printstr(tcp, tcp->u_arg[2], tcp->u_arg[3]);
+ printstrn(tcp, tcp->u_arg[2], tcp->u_arg[3]);
/* payload length */
- tprintf(", %lu, ", tcp->u_arg[3]);
+ tprintf(", %" PRI_klu ", ", tcp->u_arg[3]);
/* keyring serial number */
print_keyring_serial_number(tcp->u_arg[4]);
SYS_FUNC(request_key)
{
/* type */
- printstr(tcp, tcp->u_arg[0], -1);
+ printstr(tcp, tcp->u_arg[0]);
/* description */
tprints(", ");
- printstr(tcp, tcp->u_arg[1], -1);
+ printstr(tcp, tcp->u_arg[1]);
/* callout_info */
tprints(", ");
- printstr(tcp, tcp->u_arg[2], -1);
+ printstr(tcp, tcp->u_arg[2]);
/* keyring serial number */
tprints(", ");
print_keyring_serial_number(tcp->u_arg[3]);
{
print_keyring_serial_number(id);
tprints(", ");
- printstr(tcp, addr, len);
+ printstrn(tcp, addr, len);
tprintf(", %llu", zero_extend_signed_to_ull(len));
}
{
print_keyring_serial_number(id1);
tprints(", ");
- printstr(tcp, addr1, -1);
+ printstr(tcp, addr1);
tprints(", ");
- printstr(tcp, addr2, -1);
+ printstr(tcp, addr2);
tprints(", ");
print_keyring_serial_number(id2);
}
{
print_keyring_serial_number(id1);
tprints(", ");
- printstr(tcp, addr, len);
+ printstrn(tcp, addr, len);
tprintf(", %llu, ", zero_extend_signed_to_ull(len));
print_keyring_serial_number(id2);
}
kernel_ulong_t rval = (tcp->u_rval >= 0) &&
((kernel_ulong_t) tcp->u_rval > len) ? len :
(kernel_ulong_t) tcp->u_rval;
- printstr(tcp, buf, rval);
+ printstrn(tcp, buf, rval);
}
tprintf(", %llu", zero_extend_signed_to_ull(len));
}
SYS_FUNC(keyctl)
{
int cmd = tcp->u_arg[0];
- unsigned long long arg2 = getarg_ull(tcp, 1);
- unsigned long long arg3 = getarg_ull(tcp, 2);
- unsigned long long arg4 = getarg_ull(tcp, 3);
- unsigned long long arg5 = getarg_ull(tcp, 4);
+ kernel_ulong_t arg2 = tcp->u_arg[1];
+ kernel_ulong_t arg3 = tcp->u_arg[2];
+ kernel_ulong_t arg4 = tcp->u_arg[3];
+ kernel_ulong_t arg5 = tcp->u_arg[4];
if (entering(tcp)) {
printxval(keyctl_commands, cmd, "KEYCTL_???");
break;
case KEYCTL_JOIN_SESSION_KEYRING:
- printstr(tcp, arg2, -1);
+ printstr(tcp, arg2);
break;
case KEYCTL_UPDATE:
return 0;
default:
- tprintf("%#llx, %#llx, %#llx, %#llx", arg2, arg3, arg4, arg5);
+ tprintf("%#" PRI_klx ", %#" PRI_klx
+ ", %#" PRI_klx ", %#" PRI_klx,
+ arg2, arg3, arg4, arg5);
break;
}