* Copyright (c) 1993-1996 Rick Sladkey <jrs@world.std.com>
* Copyright (c) 1996-1999 Wichert Akkerman <wichert@cistron.nl>
* Copyright (c) 2003-2016 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
# error invalid STRACE_UID_SIZE
# endif
-# define SIZEIFY(x) SIZEIFY_(x,STRACE_UID_SIZE)
-# define SIZEIFY_(x,size) SIZEIFY__(x,size)
-# define SIZEIFY__(x,size) x ## size
+# define SIZEIFY(x) SIZEIFY_(x, STRACE_UID_SIZE)
+# define SIZEIFY_(x, size) SIZEIFY__(x, size)
+# define SIZEIFY__(x, size) x ## size
# define printuid SIZEIFY(printuid)
# define sys_chown SIZEIFY(sys_chown)
#include "defs.h"
#ifdef STRACE_UID_SIZE
-# if !NEED_UID16_PARSERS
+# if !HAVE_ARCH_UID16_SYSCALLS
# undef STRACE_UID_SIZE
# endif
#else
SYS_FUNC(getuid)
{
- return RVAL_UDECIMAL | RVAL_DECODED;
+ return RVAL_DECODED;
}
SYS_FUNC(setfsuid)
{
printuid("", tcp->u_arg[0]);
- return RVAL_UDECIMAL | RVAL_DECODED;
+ return RVAL_DECODED;
}
SYS_FUNC(setuid)
}
static void
-get_print_uid(struct tcb *tcp, const char *prefix, const long addr)
+get_print_uid(struct tcb *const tcp, const char *const prefix,
+ const kernel_ulong_t addr)
{
uid_t uid;
static bool
print_gid(struct tcb *tcp, void *elem_buf, size_t elem_size, void *data)
{
- printuid("", (* (uid_t *) elem_buf));
+ printuid("", (*(uid_t *) elem_buf));
return true;
}
static void
-print_groups(struct tcb *tcp, const unsigned int len, const unsigned long addr)
+print_groups(struct tcb *const tcp, const unsigned int len,
+ const kernel_ulong_t addr)
{
static unsigned long ngroups_max;
if (!ngroups_max)
uid_t gid;
print_array(tcp, addr, len, &gid, sizeof(gid),
- umoven_or_printaddr, print_gid, 0);
+ tfetch_mem, print_gid, 0);
}
SYS_FUNC(setgroups)
{
- const unsigned int len = tcp->u_arg[0];
+ const int len = tcp->u_arg[0];
- tprintf("%u, ", len);
+ tprintf("%d, ", len);
print_groups(tcp, len, tcp->u_arg[1]);
return RVAL_DECODED;
}
SYS_FUNC(getgroups)
{
if (entering(tcp))
- tprintf("%u, ", (unsigned int) tcp->u_arg[0]);
+ tprintf("%d, ", (int) tcp->u_arg[0]);
else
print_groups(tcp, tcp->u_rval, tcp->u_arg[1]);
return 0;