116 lines
3.5 KiB
C
Raw Normal View History

/*
* Copyright (c) 2017 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.
*/
#include "defs.h"
#include "print_fields.h"
#include "statx.h"
#include <sys/stat.h>
#include "xlat/statx_masks.h"
#include "xlat/statx_attrs.h"
#include "xlat/at_statx_sync_types.h"
SYS_FUNC(statx)
{
if (entering(tcp)) {
print_dirfd(tcp, tcp->u_arg[0]);
printpath(tcp, tcp->u_arg[1]);
tprints(", ");
unsigned int flags = tcp->u_arg[2];
printflags(at_statx_sync_types, flags & AT_STATX_SYNC_TYPE,
NULL);
flags &= ~AT_STATX_SYNC_TYPE;
if (flags) {
tprints("|");
printflags(at_flags, flags, NULL);
}
tprints(", ");
printflags(statx_masks, tcp->u_arg[3], "STATX_???");
tprints(", ");
} else {
#define PRINT_FIELD_TIME(field) \
do { \
Always print raw values of time data fields Refactor sprinttime: implement sprinttime_nsec and sprinttime_usec that handle nanoseconds and microseconds, respectively. Always print raw values of time data fields, format string representations of time as comments. * defs.h (sprinttime): Change argument type from time_t to long long. (sprinttime_nsec, sprinttime_usec): New prototypes. * util.c (sprinttime_ex, sprinttime_nsec, sprinttime_usec): New functions. (sprinttime): Turn into a thin wrapper around sprinttime_ex. * stat.h (struct strace_stat): Add has_nsec field. * fetch_struct_stat.c (HAVE_NSEC): New macro. (fetch_struct_stat): Initialize has_nsec field with HAVE_NSEC. * fetch_struct_stat64.c (HAVE_NSEC): New macro. (fetch_struct_stat64): Initialize has_nsec field with HAVE_NSEC. * print_struct_stat.c (print_struct_stat) <PRINT_ST_TIME>: Print raw values of time fields, use sprinttime_nsec to format a string representation of time, use tprints_comment to print it as a comment. * statx.c (SYS_FUNC(statx)) <PRINT_FIELD_TIME>: Likewise. * utime.c (SYS_FUNC(utime)): Print raw values of struct utimbuf.actime and struct utimbuf.modtime fields, use sprinttime to format a string representation of time, use tprints_comment to print it as a comment. * tests/tests.h (print_time_t_nsec): Add int argument. * tests/print_time.c (print_time_t_ex): New function. (print_time_t_nsec): Add int argument, turn into a thin wrapper around print_time_t_ex. * tests/utime.c (main): Update expected output. * tests/xstatx.c [!IS_STATX] (HAVE_NSEC): New macro. [!IS_STATX] (PRINT_ST_TIME), [IS_STATX] (PRINT_FIELD_TIME): Update expected output. * NEWS: Mention this timestamps representation improvement. Co-authored-by: Dmitry V. Levin <ldv@altlinux.org>
2017-04-21 05:16:12 +02:00
tprintf(", " #field "={tv_sec=%" PRId64 \
", tv_nsec=%" PRIu32 "}", \
stx.field.sec, stx.field.nsec); \
tprints_comment(sprinttime_nsec(stx.field.sec, \
zero_extend_signed_to_ull(stx.field.nsec))); \
} while (0)
struct_statx stx;
if (umove_or_printaddr(tcp, tcp->u_arg[4], &stx))
return 0;
tprints("{stx_mask=");
printflags(statx_masks, stx.stx_mask, "STATX_???");
if (!abbrev(tcp))
PRINT_FIELD_U(", ", stx, stx_blksize);
tprints(", stx_attributes=");
printflags(statx_attrs, stx.stx_attributes, "STATX_ATTR_???");
if (!abbrev(tcp)) {
PRINT_FIELD_U(", ", stx, stx_nlink);
Decode UID/GID in -y mode * defs.h (RVAL_UID, RVAL_GID): New macro constants. (printgid): New function declaration. * ipc_msgctl.c (print_msqid_ds, print_msqid_ds): Use printgid for printing GID. * ipc_shmctl.c (print_shmid_ds, print_shmid_ds): Likewise. * keyctl.c (keyctl_chown_key): Likewise. * nlattr.c (decode_nla_gid): Likewise. * linux/dummy.h (sys_getgid, sys_getgid16, sys_getresgid, sys_getresgid16, sys_setfsgid, sys_setfsgid16, sys_setgid, sys_setgid16, sys_setregid, sys_setregid16, sys_setresgid, sys_setresgid16): Remove macros. (sys_getegid): Define to sys_getgid instead of sys_getuid. (sys_getegid16): Define to sys_getgid16 instead of sys_geteuid16. * linux/syscall.h (getresgid16, getgid16, setfsgid16, setresgid16, setregid16, setgid16): New external SYS_FUNC declarations. * msghdr.c (print_scm_creds); Use PRINT_FIELD_GID for printing GID. * net.c (print_get_ucred): Likewise. * netlink_inet_diag.c (decode_inet_diag_msg): Likewise. * netlink_smc_diag.c (decode_smc_diag_msg): Likewise. * print_fields.h (PRINT_FIELD_UID); Use printuid for printing UID. (PRINT_FIELD_GID): New macro. * print_struct_stat.c (print_struct_stat): Use printuid for printing UID, printgid for printing GID. * printsiginfo.c (printsigsource): Use printuid for printing UID. * resource.c (print_priority_who): New function. (SYS_FUNC(getpriority), SYS_FUNC(setpriority)): Use print_priority_who for printing the second argument. * statx.c (SYS_FUNC(statx)): Use PRINT_FIELD_UID for printing UID, PRINT_FIELD_GID for printing GID. * syscall.c (syscall_exiting_trace): Handle RVAL_UID and RVAL_GID. * tests/overflowuid.c: Include stdio.h. (printuid): New function. * tests/setfsugid.c (printugid): Rename from printuid, update call sites. * tests/setgroups.c: Likewise. * tests/setugid.c: Likewise. * tests/tests.h (printuid): New declaration. * uid.c (printgid, sys_getresgid, sys_getgid, sys_setfsgid, sys_setresgid, sys_setregid, sys_setgid): Add SIZEIFY wrappers. (gid_t, gid_t_, gid_t__): Define similarly to uid_t, uid_t_, uid_t__. Include grp.h, pwd.h, sys/types.h. (enum id_type): New enumeration. (SYS_FUNC(getuid), SYS_FUNC(setfsuid), ): Return RVAL_UID flag. (SYS_FUNC(getgid), SYS_FUNC(setfsgid), SYS_FUNC(setgid), SYS_FUNC(getresgid), SYS_FUNC(setregid), SYS_FUNC(setresgid)): New functions. (get_print_id): Rename from get_print_uid, add idt argument, call printuid or printgid depending on it. Update call sites. (SYS_FUNC(chown), SYS_FUNC(fchown), print_gid): Use printgid for printing GID. (ID_CACHE_SIZE): New macro constant. (print_id): New function. (printuid): Implement using print_id. (printgid): New function. * xlat/priorities.in: Provide fallback values.
2018-10-26 02:18:41 +02:00
PRINT_FIELD_UID(", ", stx, stx_uid);
PRINT_FIELD_GID(", ", stx, stx_gid);
}
tprints(", stx_mode=");
print_symbolic_mode_t(stx.stx_mode);
if (!abbrev(tcp))
PRINT_FIELD_U(", ", stx, stx_ino);
PRINT_FIELD_U(", ", stx, stx_size);
if (!abbrev(tcp)) {
PRINT_FIELD_U(", ", stx, stx_blocks);
tprints(", stx_attributes_mask=");
printflags(statx_attrs, stx.stx_attributes_mask,
"STATX_ATTR_???");
PRINT_FIELD_TIME(stx_atime);
PRINT_FIELD_TIME(stx_btime);
PRINT_FIELD_TIME(stx_ctime);
PRINT_FIELD_TIME(stx_mtime);
PRINT_FIELD_U(", ", stx, stx_rdev_major);
PRINT_FIELD_U(", ", stx, stx_rdev_minor);
PRINT_FIELD_U(", ", stx, stx_dev_major);
PRINT_FIELD_U(", ", stx, stx_dev_minor);
} else {
tprints(", ...");
}
tprints("}");
}
return 0;
}