Dmitry V. Levin
8d3743868e
Print numeric umode_t type using %#03ho format. Print return value of umask syscall using %#03lo format. When printing symbolic mode_t type, always print lower 9 bits, and print the numeric part using %#03o format. * defs.h (sprintmode): Remove. (print_symbolic_mode_t, print_numeric_umode_t, print_numeric_long_umask): New prototypes. * printmode.c (sprintmode): Remove. (print_symbolic_mode_t, print_numeric_umode_t, print_numeric_long_umask): New functions. * chmod.c (decode_chmod): Use print_numeric_umode_t. * ipc_msg.c (SYS_FUNC(msgget)): Likewise. * ipc_msgctl.c (print_msqid_ds): Likewise. * ipc_sem.c (SYS_FUNC(semget)): Likewise. * ipc_shm.c (SYS_FUNC(shmget)): Likewise. * ipc_shmctl.c (print_shmid_ds): Likewise. * mq.c (SYS_FUNC(mq_open)): Likewise. * open.c (decode_open, SYS_FUNC(creat)): Likewise. * umask.c (SYS_FUNC(umask)): Likewise. * mknod.c (decode_mknod): Use print_symbolic_mode_t. * printstat.h (DO_PRINTSTAT): Likewise. * syscall.c (trace_syscall_exiting): Use print_numeric_long_umask. * tests/umode_t.c: New file. * tests/Makefile.am (EXTRA_DIST): Add it. * tests/creat.c: Rewrite as a thin wrapper around umode_t.c * tests/mkdir.c: Likewise. * tests/mkdirat.c: Likewise. * tests/mknod.c: Extend test coverage of mknod syscall. * tests/mknodat.c: Extend test coverage of mknodat syscall. * tests/umask.c: Extend test coverage of umask syscall. * tests/creat.test: Update the value specified for strace -a parameter. * tests/mkdir.test: Likewise. * tests/mkdirat.test: Likewise. * tests/mknodat.test: Likewise.
153 lines
4.0 KiB
C
153 lines
4.0 KiB
C
/*
|
|
* Copyright (c) 1991, 1992 Paul Kranenburg <pk@cs.few.eur.nl>
|
|
* Copyright (c) 1993 Branko Lankester <branko@hacktic.nl>
|
|
* Copyright (c) 1993, 1994, 1995, 1996 Rick Sladkey <jrs@world.std.com>
|
|
* Copyright (c) 1996-1999 Wichert Akkerman <wichert@cistron.nl>
|
|
* Copyright (c) 2005-2007 Roland McGrath <roland@redhat.com>
|
|
* Copyright (c) 2006-2007 Ulrich Drepper <drepper@redhat.com>
|
|
* Copyright (c) 2009-2013 Denys Vlasenko <dvlasenk@redhat.com>
|
|
* Copyright (c) 2005-2015 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.
|
|
*/
|
|
|
|
#include "defs.h"
|
|
|
|
#include <fcntl.h>
|
|
|
|
#ifdef O_LARGEFILE
|
|
# if O_LARGEFILE == 0 /* biarch platforms in 64-bit mode */
|
|
# undef O_LARGEFILE
|
|
# ifdef SPARC64
|
|
# define O_LARGEFILE 0x40000
|
|
# elif defined X86_64 || defined S390X
|
|
# define O_LARGEFILE 0100000
|
|
# endif
|
|
# endif
|
|
#endif
|
|
|
|
#include "xlat/open_access_modes.h"
|
|
#include "xlat/open_mode_flags.h"
|
|
|
|
#ifndef AT_FDCWD
|
|
# define AT_FDCWD -100
|
|
#endif
|
|
|
|
/* The fd is an "int", so when decoding x86 on x86_64, we need to force sign
|
|
* extension to get the right value. We do this by declaring fd as int here.
|
|
*/
|
|
void
|
|
print_dirfd(struct tcb *tcp, int fd)
|
|
{
|
|
if (fd == AT_FDCWD)
|
|
tprints("AT_FDCWD, ");
|
|
else {
|
|
printfd(tcp, fd);
|
|
tprints(", ");
|
|
}
|
|
}
|
|
|
|
/*
|
|
* low bits of the open(2) flags define access mode,
|
|
* other bits are real flags.
|
|
*/
|
|
const char *
|
|
sprint_open_modes(unsigned int flags)
|
|
{
|
|
static char outstr[(1 + ARRAY_SIZE(open_mode_flags)) * sizeof("O_LARGEFILE")];
|
|
char *p;
|
|
char sep;
|
|
const char *str;
|
|
const struct xlat *x;
|
|
|
|
sep = ' ';
|
|
p = stpcpy(outstr, "flags");
|
|
str = xlookup(open_access_modes, flags & 3);
|
|
if (str) {
|
|
*p++ = sep;
|
|
p = stpcpy(p, str);
|
|
flags &= ~3;
|
|
if (!flags)
|
|
return outstr;
|
|
sep = '|';
|
|
}
|
|
|
|
for (x = open_mode_flags; x->str; x++) {
|
|
if ((flags & x->val) == x->val) {
|
|
*p++ = sep;
|
|
p = stpcpy(p, x->str);
|
|
flags &= ~x->val;
|
|
if (!flags)
|
|
return outstr;
|
|
sep = '|';
|
|
}
|
|
}
|
|
/* flags is still nonzero */
|
|
*p++ = sep;
|
|
sprintf(p, "%#x", flags);
|
|
return outstr;
|
|
}
|
|
|
|
void
|
|
tprint_open_modes(unsigned int flags)
|
|
{
|
|
tprints(sprint_open_modes(flags) + sizeof("flags"));
|
|
}
|
|
|
|
static int
|
|
decode_open(struct tcb *tcp, int offset)
|
|
{
|
|
printpath(tcp, tcp->u_arg[offset]);
|
|
tprints(", ");
|
|
/* flags */
|
|
tprint_open_modes(tcp->u_arg[offset + 1]);
|
|
if (tcp->u_arg[offset + 1] & O_CREAT) {
|
|
/* mode */
|
|
tprints(", ");
|
|
print_numeric_umode_t(tcp->u_arg[offset + 2]);
|
|
}
|
|
|
|
return RVAL_DECODED | RVAL_FD;
|
|
}
|
|
|
|
SYS_FUNC(open)
|
|
{
|
|
return decode_open(tcp, 0);
|
|
}
|
|
|
|
SYS_FUNC(openat)
|
|
{
|
|
print_dirfd(tcp, tcp->u_arg[0]);
|
|
return decode_open(tcp, 1);
|
|
}
|
|
|
|
SYS_FUNC(creat)
|
|
{
|
|
printpath(tcp, tcp->u_arg[0]);
|
|
tprints(", ");
|
|
print_numeric_umode_t(tcp->u_arg[1]);
|
|
|
|
return RVAL_DECODED | RVAL_FD;
|
|
}
|