term: improve decoding of termios and termio structures

tests: add struct termios-related ioctl command test
2018-12-24 20:11:43 +00:00 · 2018-12-24 20:11:43 +00:00
1197 changed files with 3876 additions and 6965 deletions
--- a/.gitignore
+++ b/.gitignore
@ -12,8 +12,6 @@
 /.version
 /CREDITS
 /ChangeLog
-/INSTALL
-/README
 /aclocal.m4
 /autom4te.cache
 /bpf_attr_check.c
@ -27,6 +25,7 @@
 /configure
 /depcomp
 /gnu
+/INSTALL
 /install-sh
 /ioctl_iocdef.[ih]
 /ioctl_redefs[12].h
@ -55,14 +54,15 @@
 /native_printer_decls.h
 /native_printer_defs.h
 /printers.h
+/README
 /scno.h
 /sen.h
 /stamp-h1
 /strace
 /strace-*.tar.gz
 /strace-*.tar.xz
-/strace-log-merge.1
 /strace.1
+/strace-log-merge.1
 /strace.dsc
 /strace.spec
 /sys_func.h
--- a/Makefile.am
+++ b/Makefile.am
@ -127,8 +127,8 @@ strace_SOURCES =	\
 	fetch_struct_xfs_quotastat.c \
 	file_handle.c	\
 	file_ioctl.c	\
-	filter.h	\
 	filter_qualify.c \
+	filter.h	\
 	flock.c		\
 	flock.h		\
 	fs_x_ioctl.c	\
@ -193,9 +193,10 @@ strace_SOURCES =	\
 	netlink.c       \
 	netlink.h	\
 	netlink_crypto.c \
-	netlink_inet_diag.c \
 	netlink_kobject_uevent.c \
 	netlink_kobject_uevent.h \
+	netlink_sock_diag.h \
+	netlink_inet_diag.c \
 	netlink_netfilter.c \
 	netlink_netlink_diag.c \
 	netlink_packet_diag.c \
@ -204,7 +205,6 @@ strace_SOURCES =	\
 	netlink_selinux.c \
 	netlink_smc_diag.c \
 	netlink_sock_diag.c \
-	netlink_sock_diag.h \
 	netlink_unix_diag.c \
 	nlattr.c	\
 	nlattr.h	\
@ -227,8 +227,8 @@ strace_SOURCES =	\
 	prctl.c		\
 	print_aio_sigset.c \
 	print_dev_t.c	\
-	print_fields.h	\
 	print_group_req.c \
+	print_fields.h	\
 	print_ifindex.c	\
 	print_instruction_pointer.c \
 	print_kernel_version.c \
@ -307,8 +307,8 @@ strace_SOURCES =	\
 	statx.c		\
 	statx.h		\
 	strace.c	\
-	string_to_uint.c \
 	string_to_uint.h \
+	string_to_uint.c \
 	swapon.c	\
 	syscall.c	\
 	sysctl.c	\
--- a/17
+++ b/17
@ -1,20 +1,6 @@
 Noteworthy changes in release ?.?? (????-??-??)
 ===============================================

-* Improvements
-  * Enhanced xlat styles support configured by -X option.
-  * Updated lists of BPF_*, BTRFS_*, FAN_*, IFLA_*, KERN_*, KVM_CAP_*, NDA_*,
-    NETNSA_*, NT_*, PR_*, REL_*, SECCOMP_*, SCTP_*, UDP_*, V4L2_*, and *_MAGIC
-    constants.
-
-* Bug fixes
-  * Fixed strace-k test on alpha.
-  * Fixed build on mips o32.
-  * Fixed build on NOMMU architectures.
-
-Noteworthy changes in release 4.26 (2018-12-26)
-===============================================
-
 * License
  * The test suite is now provided under the terms of
    the GNU General Public License version 2 or later.
@ -37,9 +23,6 @@ Noteworthy changes in release 4.26 (2018-12-26)
  * Enhanced decoding of getsockopt SO_ERROR option.
  * Enhanced error diagnostics when the first exec fails.
  * Added %net as a short form of %network in syscall specifications.
-  * Updated lists of ABS_*, BPF_*, FAN_*, IFA_*, IFLA_*, KVM_CAP_*, NETLINK_*,
-    NTF_*, PR_SPEC_*, REL_*, SOL_*, TCA_*, and V4L2_* constants.
-  * Updated lists of ioctl commands from Linux 4.20.
  * Enhanced manual page.

 * Bug fixes
--- a/access.c
+++ b/access.c
@ -1,10 +1,3 @@
-/*
- * Copyright (c) 2014-2018 The strace developers.
- * All rights reserved.
- *
- * SPDX-License-Identifier: LGPL-2.1-or-later
- */
-
 #include "defs.h"

 #include <fcntl.h>
--- a/affinity.c
+++ b/affinity.c
@ -1,6 +1,6 @@
 /*
 * Copyright (c) 2002-2004 Roland McGrath <roland@redhat.com>
- * Copyright (c) 2009-2018 Dmitry V. Levin <ldv@altlinux.org>
+ * Copyright (c) 2009-2016 Dmitry V. Levin <ldv@altlinux.org>
 * All rights reserved.
 *
 * SPDX-License-Identifier: LGPL-2.1-or-later
--- a/arch_defs.h
+++ b/arch_defs.h
@ -1,15 +1,8 @@
-/*
- * Copyright (c) 2018 Dmitry V. Levin <ldv@altlinux.org>
- * All rights reserved.
- *
- * SPDX-License-Identifier: LGPL-2.1-or-later
- */
-
 /* Architecture-specific definitions.  */
 #ifndef STRACE_ARCH_DEFS_H
-# define STRACE_ARCH_DEFS_H
+#define STRACE_ARCH_DEFS_H

-# include "arch_defs_.h"
-# include "linux/arch_defs_.h"
+#include "arch_defs_.h"
+#include "linux/arch_defs_.h"

 #endif /* !STRACE_ARCH_DEFS_H */
--- a/bind.c
+++ b/bind.c
@ -3,7 +3,7 @@
 * Copyright (c) 1993 Branko Lankester <branko@hacktic.nl>
 * Copyright (c) 1993, 1994, 1995, 1996 Rick Sladkey <jrs@world.std.com>
 * Copyright (c) 1996-2000 Wichert Akkerman <wichert@cistron.nl>
- * Copyright (c) 1999-2018 The strace developers.
+ * Copyright (c) 1999-2017 The strace developers.
 * All rights reserved.
 *
 * SPDX-License-Identifier: LGPL-2.1-or-later
--- a/bjm.c
+++ b/bjm.c
@ -3,7 +3,7 @@
 * 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) 1999-2018 The strace developers.
+ * Copyright (c) 1999-2017 The strace developers.
 * All rights reserved.
 *
 * SPDX-License-Identifier: LGPL-2.1-or-later
--- a/block.c
+++ b/block.c
@ -47,7 +47,7 @@ typedef struct blk_user_trace_setup {

 /* Provide fall-back definitions for BLK* ioctls */
 #define XLAT_MACROS_ONLY
-#include "xlat/block_ioctl_cmds.h"
+# include "xlat/block_ioctl_cmds.h"
 #undef XLAT_MACROS_ONLY

 #include MPERS_DEFS
--- a/5
+++ b/5
@ -1,9 +1,4 @@
 #!/bin/sh -eu
-#
-# Copyright (c) 2014-2018 The strace developers.
-# All rights reserved.
-#
-# SPDX-License-Identifier: LGPL-2.1-or-later

 ./m4/gen_bpf_attr_m4.sh
 ./generate_mpers_am.sh
--- a/bpf_attr.h
+++ b/bpf_attr.h
@ -6,7 +6,7 @@
 */

 #ifndef STRACE_BPF_ATTR_H
-# define STRACE_BPF_ATTR_H
+#define STRACE_BPF_ATTR_H

 /*
 * The policy is that all fields of type uint64_t in this header file
@ -19,21 +19,21 @@
 * v4.16-rc1~123^2~109^2~5^2~4.
 */

-# ifndef BPF_OBJ_NAME_LEN
-#  define BPF_OBJ_NAME_LEN 16U
-# else
-#  if BPF_OBJ_NAME_LEN != 16U
-#   error "Unexpected value of BPF_OBJ_NAME_LEN"
-#  endif
+#ifndef BPF_OBJ_NAME_LEN
+# define BPF_OBJ_NAME_LEN 16U
+#else
+# if BPF_OBJ_NAME_LEN != 16U
+#  error "Unexpected value of BPF_OBJ_NAME_LEN"
 # endif
+#endif

-# ifndef BPF_TAG_SIZE
-#  define BPF_TAG_SIZE 8
-# else
-#  if BPF_TAG_SIZE != 8
-#   error "Unexpected value of BPF_TAG_SIZE"
-#  endif
+#ifndef BPF_TAG_SIZE
+# define BPF_TAG_SIZE 8
+#else
+# if BPF_TAG_SIZE != 8
+#  error "Unexpected value of BPF_TAG_SIZE"
 # endif
+#endif

 struct BPF_MAP_CREATE_struct {
 	uint32_t map_type;
@ -47,9 +47,9 @@ struct BPF_MAP_CREATE_struct {
 	uint32_t map_ifindex;
 };

-# define BPF_MAP_CREATE_struct_size \
+#define BPF_MAP_CREATE_struct_size \
 	sizeof(struct BPF_MAP_CREATE_struct)
-# define expected_BPF_MAP_CREATE_struct_size 48
+#define expected_BPF_MAP_CREATE_struct_size 48

 struct BPF_MAP_LOOKUP_ELEM_struct {
 	uint32_t map_fd;
@ -57,9 +57,9 @@ struct BPF_MAP_LOOKUP_ELEM_struct {
 	uint64_t ATTRIBUTE_ALIGNED(8) value;
 };

-# define BPF_MAP_LOOKUP_ELEM_struct_size \
+#define BPF_MAP_LOOKUP_ELEM_struct_size \
 	sizeof(struct BPF_MAP_LOOKUP_ELEM_struct)
-# define expected_BPF_MAP_LOOKUP_ELEM_struct_size 24
+#define expected_BPF_MAP_LOOKUP_ELEM_struct_size 24

 struct BPF_MAP_UPDATE_ELEM_struct {
 	uint32_t map_fd;
@ -68,18 +68,18 @@ struct BPF_MAP_UPDATE_ELEM_struct {
 	uint64_t ATTRIBUTE_ALIGNED(8) flags;
 };

-# define BPF_MAP_UPDATE_ELEM_struct_size \
+#define BPF_MAP_UPDATE_ELEM_struct_size \
 	sizeof(struct BPF_MAP_UPDATE_ELEM_struct)
-# define expected_BPF_MAP_UPDATE_ELEM_struct_size 32
+#define expected_BPF_MAP_UPDATE_ELEM_struct_size 32

 struct BPF_MAP_DELETE_ELEM_struct {
 	uint32_t map_fd;
 	uint64_t ATTRIBUTE_ALIGNED(8) key;
 };

-# define BPF_MAP_DELETE_ELEM_struct_size \
+#define BPF_MAP_DELETE_ELEM_struct_size \
 	sizeof(struct BPF_MAP_DELETE_ELEM_struct)
-# define expected_BPF_MAP_DELETE_ELEM_struct_size 16
+#define expected_BPF_MAP_DELETE_ELEM_struct_size 16

 struct BPF_MAP_GET_NEXT_KEY_struct {
 	uint32_t map_fd;
@ -87,9 +87,9 @@ struct BPF_MAP_GET_NEXT_KEY_struct {
 	uint64_t ATTRIBUTE_ALIGNED(8) next_key;
 };

-# define BPF_MAP_GET_NEXT_KEY_struct_size \
+#define BPF_MAP_GET_NEXT_KEY_struct_size \
 	sizeof(struct BPF_MAP_GET_NEXT_KEY_struct)
-# define expected_BPF_MAP_GET_NEXT_KEY_struct_size 24
+#define expected_BPF_MAP_GET_NEXT_KEY_struct_size 24

 struct BPF_PROG_LOAD_struct {
 	uint32_t prog_type;
@ -106,9 +106,9 @@ struct BPF_PROG_LOAD_struct {
 	uint32_t expected_attach_type;
 };

-# define BPF_PROG_LOAD_struct_size \
+#define BPF_PROG_LOAD_struct_size \
 	offsetofend(struct BPF_PROG_LOAD_struct, expected_attach_type)
-# define expected_BPF_PROG_LOAD_struct_size 72
+#define expected_BPF_PROG_LOAD_struct_size 72

 struct BPF_OBJ_PIN_struct {
 	uint64_t ATTRIBUTE_ALIGNED(8) pathname;
@ -116,12 +116,12 @@ struct BPF_OBJ_PIN_struct {
 	uint32_t file_flags;
 };

-# define BPF_OBJ_PIN_struct_size \
+#define BPF_OBJ_PIN_struct_size \
 	sizeof(struct BPF_OBJ_PIN_struct)
-# define expected_BPF_OBJ_PIN_struct_size 16
+#define expected_BPF_OBJ_PIN_struct_size 16

-# define BPF_OBJ_GET_struct BPF_OBJ_PIN_struct
-# define BPF_OBJ_GET_struct_size BPF_OBJ_PIN_struct_size
+#define BPF_OBJ_GET_struct BPF_OBJ_PIN_struct
+#define BPF_OBJ_GET_struct_size BPF_OBJ_PIN_struct_size

 struct BPF_PROG_ATTACH_struct {
 	uint32_t target_fd;
@ -130,9 +130,9 @@ struct BPF_PROG_ATTACH_struct {
 	uint32_t attach_flags;
 };

-# define BPF_PROG_ATTACH_struct_size \
+#define BPF_PROG_ATTACH_struct_size \
 	sizeof(struct BPF_PROG_ATTACH_struct)
-# define expected_BPF_PROG_ATTACH_struct_size 16
+#define expected_BPF_PROG_ATTACH_struct_size 16

 struct BPF_PROG_DETACH_struct {
 	uint32_t target_fd;
@ -140,9 +140,9 @@ struct BPF_PROG_DETACH_struct {
 	uint32_t attach_type;
 };

-# define BPF_PROG_DETACH_struct_size \
+#define BPF_PROG_DETACH_struct_size \
 	sizeof(struct BPF_PROG_DETACH_struct)
-# define expected_BPF_PROG_DETACH_struct_size 12
+#define expected_BPF_PROG_DETACH_struct_size 12

 struct BPF_PROG_TEST_RUN_struct /* test */ {
 	uint32_t prog_fd;
@ -155,9 +155,9 @@ struct BPF_PROG_TEST_RUN_struct /* test */ {
 	uint32_t duration;
 };

-# define BPF_PROG_TEST_RUN_struct_size \
+#define BPF_PROG_TEST_RUN_struct_size \
 	sizeof(struct BPF_PROG_TEST_RUN_struct)
-# define expected_BPF_PROG_TEST_RUN_struct_size 40
+#define expected_BPF_PROG_TEST_RUN_struct_size 40

 struct BPF_PROG_GET_NEXT_ID_struct {
 	uint32_t start_id;
@ -165,12 +165,12 @@ struct BPF_PROG_GET_NEXT_ID_struct {
 	uint32_t open_flags;
 };

-# define BPF_PROG_GET_NEXT_ID_struct_size \
+#define BPF_PROG_GET_NEXT_ID_struct_size \
 	sizeof(struct BPF_PROG_GET_NEXT_ID_struct)
-# define expected_BPF_PROG_GET_NEXT_ID_struct_size 12
+#define expected_BPF_PROG_GET_NEXT_ID_struct_size 12

-# define BPF_MAP_GET_NEXT_ID_struct BPF_PROG_GET_NEXT_ID_struct
-# define BPF_MAP_GET_NEXT_ID_struct_size BPF_PROG_GET_NEXT_ID_struct_size
+#define BPF_MAP_GET_NEXT_ID_struct BPF_PROG_GET_NEXT_ID_struct
+#define BPF_MAP_GET_NEXT_ID_struct_size BPF_PROG_GET_NEXT_ID_struct_size

 struct BPF_PROG_GET_FD_BY_ID_struct {
 	uint32_t prog_id;
@ -178,9 +178,9 @@ struct BPF_PROG_GET_FD_BY_ID_struct {
 	uint32_t open_flags;
 };

-# define BPF_PROG_GET_FD_BY_ID_struct_size \
+#define BPF_PROG_GET_FD_BY_ID_struct_size \
 	sizeof(struct BPF_PROG_GET_FD_BY_ID_struct)
-# define expected_BPF_PROG_GET_FD_BY_ID_struct_size 12
+#define expected_BPF_PROG_GET_FD_BY_ID_struct_size 12

 struct BPF_MAP_GET_FD_BY_ID_struct {
 	uint32_t map_id;
@ -188,9 +188,9 @@ struct BPF_MAP_GET_FD_BY_ID_struct {
 	uint32_t open_flags;
 };

-# define BPF_MAP_GET_FD_BY_ID_struct_size \
+#define BPF_MAP_GET_FD_BY_ID_struct_size \
 	sizeof(struct BPF_MAP_GET_FD_BY_ID_struct)
-# define expected_BPF_MAP_GET_FD_BY_ID_struct_size 12
+#define expected_BPF_MAP_GET_FD_BY_ID_struct_size 12

 struct BPF_OBJ_GET_INFO_BY_FD_struct /* info */ {
 	uint32_t bpf_fd;
@ -198,9 +198,9 @@ struct BPF_OBJ_GET_INFO_BY_FD_struct /* info */ {
 	uint64_t ATTRIBUTE_ALIGNED(8) info;
 };

-# define BPF_OBJ_GET_INFO_BY_FD_struct_size \
+#define BPF_OBJ_GET_INFO_BY_FD_struct_size \
 	sizeof(struct BPF_OBJ_GET_INFO_BY_FD_struct)
-# define expected_BPF_OBJ_GET_INFO_BY_FD_struct_size 16
+#define expected_BPF_OBJ_GET_INFO_BY_FD_struct_size 16

 struct BPF_PROG_QUERY_struct /* query */ {
 	uint32_t target_fd;
@ -211,18 +211,18 @@ struct BPF_PROG_QUERY_struct /* query */ {
 	uint32_t prog_cnt;
 };

-# define BPF_PROG_QUERY_struct_size \
+#define BPF_PROG_QUERY_struct_size \
 	offsetofend(struct BPF_PROG_QUERY_struct, prog_cnt)
-# define expected_BPF_PROG_QUERY_struct_size 28
+#define expected_BPF_PROG_QUERY_struct_size 28

 struct BPF_RAW_TRACEPOINT_OPEN_struct /* raw_tracepoint */ {
 	uint64_t ATTRIBUTE_ALIGNED(8) name;
 	uint32_t prog_fd;
 };

-# define BPF_RAW_TRACEPOINT_OPEN_struct_size \
+#define BPF_RAW_TRACEPOINT_OPEN_struct_size \
 	offsetofend(struct BPF_RAW_TRACEPOINT_OPEN_struct, prog_fd)
-# define expected_BPF_RAW_TRACEPOINT_OPEN_struct_size 12
+#define expected_BPF_RAW_TRACEPOINT_OPEN_struct_size 12

 struct bpf_map_info_struct {
 	uint32_t type;
@ -241,9 +241,9 @@ struct bpf_map_info_struct {
 	uint64_t ATTRIBUTE_ALIGNED(8) netns_ino; /* skip check */
 };

-# define bpf_map_info_struct_size \
+#define bpf_map_info_struct_size \
 	sizeof(struct bpf_map_info_struct)
-# define expected_bpf_map_info_struct_size 64
+#define expected_bpf_map_info_struct_size 64

 struct bpf_prog_info_struct {
 	uint32_t type;
@ -267,8 +267,8 @@ struct bpf_prog_info_struct {
 	uint64_t ATTRIBUTE_ALIGNED(8) netns_ino; /* skip check */
 };

-# define bpf_prog_info_struct_size \
+#define bpf_prog_info_struct_size \
 	sizeof(struct bpf_prog_info_struct)
-# define expected_bpf_prog_info_struct_size 104
+#define expected_bpf_prog_info_struct_size 104

 #endif /* !STRACE_BPF_ATTR_H */
--- a/bpf_filter.h
+++ b/bpf_filter.h
@ -1,14 +1,14 @@
 /*
 * Classic BPF filter block.
 *
- * Copyright (c) 2015-2018 Dmitry V. Levin <ldv@altlinux.org>
+ * Copyright (c) 2015-2017 Dmitry V. Levin <ldv@altlinux.org>
 * All rights reserved.
 *
 * SPDX-License-Identifier: LGPL-2.1-or-later
 */

 #ifndef STRACE_BPF_FILTER_H
-# define STRACE_BPF_FILTER_H
+#define STRACE_BPF_FILTER_H

 struct bpf_filter_block {
 	uint16_t code;
--- a/bpf_fprog.h
+++ b/bpf_fprog.h
@ -1,12 +1,5 @@
-/*
- * Copyright (c) 2017-2018 Dmitry V. Levin <ldv@altlinux.org>
- * All rights reserved.
- *
- * SPDX-License-Identifier: LGPL-2.1-or-later
- */
-
 #ifndef STRACE_BPF_FPROG_H
-# define STRACE_BPF_FPROG_H
+#define STRACE_BPF_FPROG_H

 struct bpf_fprog {
 	unsigned short len;
--- a/bpf_seccomp_filter.c
+++ b/bpf_seccomp_filter.c
@ -1,7 +1,7 @@
 /*
 * Decoder of seccomp filter programs.
 *
- * Copyright (c) 2015-2018 Dmitry V. Levin <ldv@altlinux.org>
+ * Copyright (c) 2015-2017 Dmitry V. Levin <ldv@altlinux.org>
 * All rights reserved.
 *
 * SPDX-License-Identifier: LGPL-2.1-or-later
--- a/btrfs.c
+++ b/btrfs.c
@ -10,10 +10,10 @@

 #ifdef HAVE_LINUX_BTRFS_H

-# include DEF_MPERS_TYPE(struct_btrfs_ioctl_dev_replace_args)
-# include DEF_MPERS_TYPE(struct_btrfs_ioctl_send_args)
-# include DEF_MPERS_TYPE(struct_btrfs_ioctl_received_subvol_args)
-# include DEF_MPERS_TYPE(struct_btrfs_ioctl_vol_args_v2)
+#include DEF_MPERS_TYPE(struct_btrfs_ioctl_dev_replace_args)
+#include DEF_MPERS_TYPE(struct_btrfs_ioctl_send_args)
+#include DEF_MPERS_TYPE(struct_btrfs_ioctl_received_subvol_args)
+#include DEF_MPERS_TYPE(struct_btrfs_ioctl_vol_args_v2)

 # include <linux/btrfs.h>

@ -32,8 +32,8 @@ typedef struct btrfs_ioctl_vol_args_v2

 #ifdef HAVE_LINUX_BTRFS_H

-# include "print_fields.h"
-# include <linux/fs.h>
+#include "print_fields.h"
+#include <linux/fs.h>

 /*
 * Prior to Linux 3.12, the BTRFS_IOC_DEFAULT_SUBVOL used u64 in
@ -41,15 +41,15 @@ typedef struct btrfs_ioctl_vol_args_v2
 */
 typedef __u64 u64;

-# ifndef HAVE_STRUCT_BTRFS_IOCTL_FEATURE_FLAGS_COMPAT_FLAGS
+#ifndef HAVE_STRUCT_BTRFS_IOCTL_FEATURE_FLAGS_COMPAT_FLAGS
 struct btrfs_ioctl_feature_flags {
 	uint64_t compat_flags;
 	uint64_t compat_ro_flags;
 	uint64_t incompat_flags;
 };
-# endif
+#endif

-# ifndef HAVE_STRUCT_BTRFS_IOCTL_DEFRAG_RANGE_ARGS_START
+#ifndef HAVE_STRUCT_BTRFS_IOCTL_DEFRAG_RANGE_ARGS_START
 struct btrfs_ioctl_defrag_range_args {
 	uint64_t start;
 	uint64_t len;
@ -58,37 +58,37 @@ struct btrfs_ioctl_defrag_range_args {
 	uint32_t compress_type;
 	uint32_t unused[4];
 };
-# endif
+#endif

-# ifndef BTRFS_LABEL_SIZE
-#  define BTRFS_LABEL_SIZE 256
-# endif
+#ifndef BTRFS_LABEL_SIZE
+# define BTRFS_LABEL_SIZE 256
+#endif

-# ifndef BTRFS_IOC_QUOTA_RESCAN
+#ifndef BTRFS_IOC_QUOTA_RESCAN
 struct btrfs_ioctl_quota_rescan_args {
 	uint64_t flags, progress, reserved[6];
 };
-#  define BTRFS_IOC_QUOTA_RESCAN _IOW(BTRFS_IOCTL_MAGIC, 44, \
+# define BTRFS_IOC_QUOTA_RESCAN _IOW(BTRFS_IOCTL_MAGIC, 44, \
 					struct btrfs_ioctl_quota_rescan_args)
-#  define BTRFS_IOC_QUOTA_RESCAN_STATUS _IOR(BTRFS_IOCTL_MAGIC, 45, \
+# define BTRFS_IOC_QUOTA_RESCAN_STATUS _IOR(BTRFS_IOCTL_MAGIC, 45, \
 					struct btrfs_ioctl_quota_rescan_args)
-# endif
+#endif

-# ifndef BTRFS_IOC_QUOTA_RESCAN_WAIT
-#  define BTRFS_IOC_QUOTA_RESCAN_WAIT _IO(BTRFS_IOCTL_MAGIC, 46)
-# endif
+#ifndef BTRFS_IOC_QUOTA_RESCAN_WAIT
+# define BTRFS_IOC_QUOTA_RESCAN_WAIT _IO(BTRFS_IOCTL_MAGIC, 46)
+#endif

-# ifndef BTRFS_IOC_GET_FEATURES
-#  define BTRFS_IOC_GET_FEATURES _IOR(BTRFS_IOCTL_MAGIC, 57, \
+#ifndef BTRFS_IOC_GET_FEATURES
+# define BTRFS_IOC_GET_FEATURES _IOR(BTRFS_IOCTL_MAGIC, 57, \
 					struct btrfs_ioctl_feature_flags)
-#  define BTRFS_IOC_SET_FEATURES _IOW(BTRFS_IOCTL_MAGIC, 57, \
+# define BTRFS_IOC_SET_FEATURES _IOW(BTRFS_IOCTL_MAGIC, 57, \
 					struct btrfs_ioctl_feature_flags[2])
-#  define BTRFS_IOC_GET_SUPPORTED_FEATURES _IOR(BTRFS_IOCTL_MAGIC, 57, \
+# define BTRFS_IOC_GET_SUPPORTED_FEATURES _IOR(BTRFS_IOCTL_MAGIC, 57, \
 					struct btrfs_ioctl_feature_flags[3])
-# endif
+#endif

-# ifndef BTRFS_IOC_TREE_SEARCH_V2
-#  define BTRFS_IOC_TREE_SEARCH_V2 _IOWR(BTRFS_IOCTL_MAGIC, 17, \
+#ifndef BTRFS_IOC_TREE_SEARCH_V2
+# define BTRFS_IOC_TREE_SEARCH_V2 _IOWR(BTRFS_IOCTL_MAGIC, 17, \
 					struct btrfs_ioctl_search_args_v2)
 struct btrfs_ioctl_search_args_v2 {
 	struct btrfs_ioctl_search_key key; /* in/out - search parameters */
@ -97,34 +97,34 @@ struct btrfs_ioctl_search_args_v2 {
 					    *       to store item */
 	uint64_t buf[0];		   /* out - found items */
 };
-# endif
+#endif

-# include "xlat/btrfs_balance_args.h"
-# include "xlat/btrfs_balance_ctl_cmds.h"
-# include "xlat/btrfs_balance_flags.h"
-# include "xlat/btrfs_balance_state.h"
-# include "xlat/btrfs_compress_types.h"
-# include "xlat/btrfs_cont_reading_from_srcdev_mode.h"
-# include "xlat/btrfs_defrag_flags.h"
-# include "xlat/btrfs_dev_replace_cmds.h"
-# include "xlat/btrfs_dev_replace_results.h"
-# include "xlat/btrfs_dev_replace_state.h"
-# include "xlat/btrfs_dev_stats_flags.h"
-# include "xlat/btrfs_dev_stats_values.h"
-# include "xlat/btrfs_features_compat.h"
-# include "xlat/btrfs_features_compat_ro.h"
-# include "xlat/btrfs_features_incompat.h"
-# include "xlat/btrfs_key_types.h"
-# include "xlat/btrfs_logical_ino_args_flags.h"
-# include "xlat/btrfs_qgroup_ctl_cmds.h"
-# include "xlat/btrfs_qgroup_inherit_flags.h"
-# include "xlat/btrfs_qgroup_limit_flags.h"
-# include "xlat/btrfs_qgroup_status_flags.h"
-# include "xlat/btrfs_scrub_flags.h"
-# include "xlat/btrfs_send_flags.h"
-# include "xlat/btrfs_snap_flags_v2.h"
-# include "xlat/btrfs_space_info_flags.h"
-# include "xlat/btrfs_tree_objectids.h"
+#include "xlat/btrfs_balance_args.h"
+#include "xlat/btrfs_balance_ctl_cmds.h"
+#include "xlat/btrfs_balance_flags.h"
+#include "xlat/btrfs_balance_state.h"
+#include "xlat/btrfs_compress_types.h"
+#include "xlat/btrfs_cont_reading_from_srcdev_mode.h"
+#include "xlat/btrfs_defrag_flags.h"
+#include "xlat/btrfs_dev_replace_cmds.h"
+#include "xlat/btrfs_dev_replace_results.h"
+#include "xlat/btrfs_dev_replace_state.h"
+#include "xlat/btrfs_dev_stats_flags.h"
+#include "xlat/btrfs_dev_stats_values.h"
+#include "xlat/btrfs_features_compat.h"
+#include "xlat/btrfs_features_compat_ro.h"
+#include "xlat/btrfs_features_incompat.h"
+#include "xlat/btrfs_key_types.h"
+#include "xlat/btrfs_logical_ino_args_flags.h"
+#include "xlat/btrfs_qgroup_ctl_cmds.h"
+#include "xlat/btrfs_qgroup_inherit_flags.h"
+#include "xlat/btrfs_qgroup_limit_flags.h"
+#include "xlat/btrfs_qgroup_status_flags.h"
+#include "xlat/btrfs_scrub_flags.h"
+#include "xlat/btrfs_send_flags.h"
+#include "xlat/btrfs_snap_flags_v2.h"
+#include "xlat/btrfs_space_info_flags.h"
+#include "xlat/btrfs_tree_objectids.h"

 static inline char
 prnibble(char v)
@ -135,7 +135,7 @@ prnibble(char v)
 }

 /* 8-4-4-4-12 = 36 characters */
-# define UUID_STRING_SIZE 36
+#define UUID_STRING_SIZE 36

 /* Formats uuid, returns 0 if it's all zeroes */
 static int
@ -222,9 +222,9 @@ btrfs_print_qgroup_limit(const struct btrfs_qgroup_limit *lim)
 	tprints("}");
 }

-# define btrfs_print_key_type(prefix_, where_, field_) \
+#define btrfs_print_key_type(prefix_, where_, field_) \
 	PRINT_FIELD_XVAL_U((prefix_), (where_), field_, btrfs_key_types, NULL)
-# define btrfs_print_objectid(prefix_, where_, field_) \
+#define btrfs_print_objectid(prefix_, where_, field_) \
 	PRINT_FIELD_XVAL_U((prefix_), (where_), field_, btrfs_tree_objectids, \
 			   NULL)

@ -718,9 +718,9 @@ MPERS_PRINTER_DECL(int, btrfs_ioctl,
 		struct btrfs_ioctl_fs_info_args args;
 		char uuid[UUID_STRING_SIZE+1];
 		uint32_t nodesize, sectorsize, clone_alignment;
-# ifndef HAVE_STRUCT_BTRFS_IOCTL_FS_INFO_ARGS_NODESIZE
+#ifndef HAVE_STRUCT_BTRFS_IOCTL_FS_INFO_ARGS_NODESIZE
 		uint32_t *reserved32;
-# endif
+#endif

 		if (entering(tcp))
 			return 0;
@ -729,16 +729,16 @@ MPERS_PRINTER_DECL(int, btrfs_ioctl,
 		if (umove_or_printaddr(tcp, arg, &args))
 			break;

-# ifdef HAVE_STRUCT_BTRFS_IOCTL_FS_INFO_ARGS_NODESIZE
+#ifdef HAVE_STRUCT_BTRFS_IOCTL_FS_INFO_ARGS_NODESIZE
 		nodesize = args.nodesize,
 		sectorsize = args.sectorsize,
 		clone_alignment = args.clone_alignment;
-# else
+#else
 		reserved32 = (void *) args.reserved;
 		nodesize = reserved32[0];
 		sectorsize = reserved32[1];
 		clone_alignment = reserved32[2];
-# endif
+#endif
 		btrfs_unparse_uuid(args.fsid, uuid);

 		PRINT_FIELD_U("{", args, max_id);
@ -892,11 +892,11 @@ MPERS_PRINTER_DECL(int, btrfs_ioctl,

 			tprintf(", flags=");
 			printflags64(btrfs_logical_ino_args_flags,
-# ifdef HAVE_STRUCT_BTRFS_IOCTL_LOGICAL_INO_ARGS_FLAGS
+#ifdef HAVE_STRUCT_BTRFS_IOCTL_LOGICAL_INO_ARGS_FLAGS
 				     args.flags
-# else
+#else
 				     args.reserved[3]
-# endif
+#endif
 				     , "BTRFS_LOGICAL_INO_ARGS_???");
 			PRINT_FIELD_ADDR64(", ", args, inodes);
 			tprints("}");
@ -1262,9 +1262,9 @@ MPERS_PRINTER_DECL(int, btrfs_ioctl,

 	case BTRFS_IOC_CLONE:			/* FICLONE */
 	case BTRFS_IOC_CLONE_RANGE:		/* FICLONERANGE */
-# ifdef BTRFS_IOC_FILE_EXTENT_SAME
+#ifdef BTRFS_IOC_FILE_EXTENT_SAME
 	case BTRFS_IOC_FILE_EXTENT_SAME:	/* FIDEDUPERANGE */
-# endif
+#endif
 		/*
 		 * FICLONE, FICLONERANGE, and FIDEDUPERANGE started out as
 		 * btrfs ioctls and the code was kept for the generic
--- a/cacheflush.c
+++ b/cacheflush.c
@ -4,7 +4,7 @@
 * Copyright (c) 2010 Carmelo Amoroso <carmelo.amoroso@st.com>
 * Copyright (c) 2015 Ezequiel Garcia <ezequiel@vanguardiasur.com.ar>
 * Copyright (c) 2014-2015 Dmitry V. Levin <ldv@altlinux.org>
- * Copyright (c) 2014-2018 The strace developers.
+ * Copyright (c) 2014-2017 The strace developers.
 * All rights reserved.
 *
 * SPDX-License-Identifier: LGPL-2.1-or-later
@ -20,15 +20,15 @@
 # include "xlat/cacheflush_scope.h"

 static const struct xlat cacheflush_flags[] = {
-# ifdef FLUSH_CACHE_BOTH
+#ifdef FLUSH_CACHE_BOTH
 	XLAT(FLUSH_CACHE_BOTH),
-# endif
-# ifdef FLUSH_CACHE_DATA
+#endif
+#ifdef FLUSH_CACHE_DATA
 	XLAT(FLUSH_CACHE_DATA),
-# endif
-# ifdef FLUSH_CACHE_INSN
+#endif
+#ifdef FLUSH_CACHE_INSN
 	XLAT(FLUSH_CACHE_INSN),
-# endif
+#endif
 	XLAT_END
 };

@ -72,18 +72,18 @@ SYS_FUNC(cacheflush)

 #ifdef SH
 static const struct xlat cacheflush_flags[] = {
-# ifdef CACHEFLUSH_D_INVAL
+#ifdef CACHEFLUSH_D_INVAL
 	XLAT(CACHEFLUSH_D_INVAL),
-# endif
-# ifdef CACHEFLUSH_D_WB
+#endif
+#ifdef CACHEFLUSH_D_WB
 	XLAT(CACHEFLUSH_D_WB),
-# endif
-# ifdef CACHEFLUSH_D_PURGE
+#endif
+#ifdef CACHEFLUSH_D_PURGE
 	XLAT(CACHEFLUSH_D_PURGE),
-# endif
-# ifdef CACHEFLUSH_I
+#endif
+#ifdef CACHEFLUSH_I
 	XLAT(CACHEFLUSH_I),
-# endif
+#endif
 	XLAT_END
 };

--- a/capability.c
+++ b/capability.c
@ -2,7 +2,7 @@
 * Copyright (c) 2000 Wichert Akkerman <wakkerma@debian.org>
 * Copyright (c) 2011 Denys Vlasenko <dvlasenk@redhat.com>
 * Copyright (c) 2005-2015 Dmitry V. Levin <ldv@altlinux.org>
- * Copyright (c) 2014-2018 The strace developers.
+ * Copyright (c) 2014-2017 The strace developers.
 * All rights reserved.
 *
 * SPDX-License-Identifier: LGPL-2.1-or-later
--- a/caps0.h
+++ b/caps0.h
@ -1,10 +1,3 @@
-/*
- * Copyright (c) 2015-2018 Dmitry V. Levin <ldv@altlinux.org>
- * All rights reserved.
- *
- * SPDX-License-Identifier: LGPL-2.1-or-later
- */
-
 CAP_CHOWN,
 CAP_DAC_OVERRIDE,
 CAP_DAC_READ_SEARCH,
--- a/caps1.h
+++ b/caps1.h
@ -1,10 +1,3 @@
-/*
- * Copyright (c) 2015-2018 Dmitry V. Levin <ldv@altlinux.org>
- * All rights reserved.
- *
- * SPDX-License-Identifier: LGPL-2.1-or-later
- */
-
 CAP_MAC_OVERRIDE,
 CAP_MAC_ADMIN,
 CAP_SYSLOG,
--- a/chdir.c
+++ b/chdir.c
@ -1,10 +1,3 @@
-/*
- * Copyright (c) 2014-2018 The strace developers.
- * All rights reserved.
- *
- * SPDX-License-Identifier: LGPL-2.1-or-later
- */
-
 #include "defs.h"

 SYS_FUNC(chdir)
--- a/chmod.c
+++ b/chmod.c
@ -1,10 +1,3 @@
-/*
- * Copyright (c) 2014-2018 The strace developers.
- * All rights reserved.
- *
- * SPDX-License-Identifier: LGPL-2.1-or-later
- */
-
 #include "defs.h"

 static void
--- a/ci/install-dependencies.sh
+++ b/ci/install-dependencies.sh
@ -1,9 +1,4 @@
 #!/bin/sh -ex
-#
-# Copyright (c) 2018 The strace developers.
-# All rights reserved.
-#
-# SPDX-License-Identifier: GPL-2.0-or-later

 type sudo >/dev/null 2>&1 && sudo=sudo || sudo=
 common_packages='autoconf automake faketime file gawk gcc-multilib git gzip libbluetooth-dev make xz-utils'
--- a/ci/run-build-and-tests.sh
+++ b/ci/run-build-and-tests.sh
@ -1,9 +1,4 @@
 #!/bin/sh -ex
-#
-# Copyright (c) 2018 The strace developers.
-# All rights reserved.
-#
-# SPDX-License-Identifier: GPL-2.0-or-later

 DISTCHECK_CONFIGURE_FLAGS='--disable-dependency-tracking'
 export DISTCHECK_CONFIGURE_FLAGS
--- a/configure.ac
+++ b/configure.ac
@ -283,6 +283,12 @@ AC_CHECK_TYPES([struct stat64, struct __old_kernel_stat],,,
 [#include <sys/types.h>
 #include <asm/stat.h>])

+AC_CHECK_TYPES([struct termios2],,,
+[#include <linux/termios.h>])
+
+AC_CHECK_MEMBERS([struct termios.c_ispeed, struct termios.c_ospeed],,,
+[#include <linux/termios.h>])
+
 AC_CHECK_TYPES([struct user_desc],
 	       [AC_CHECK_MEMBERS([struct user_desc.lm],,,
 				 [#include <asm/ldt.h>])],,
@ -645,8 +651,6 @@ AC_CHECK_DECLS(m4_normalize([
 	KERN_MAX_LOCK_DEPTH,
 	KERN_NMI_WATCHDOG,
 	KERN_PANIC_ON_NMI,
-	KERN_PANIC_ON_WARN,
-	KERN_PANIC_PRINT,
 	NET_LLC,
 	NET_NETFILTER,
 	NET_DCCP,
--- a/copy_file_range.c
+++ b/copy_file_range.c
@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2016-2018 Dmitry V. Levin <ldv@altlinux.org>
+ * Copyright (c) 2016 Dmitry V. Levin <ldv@altlinux.org>
 * All rights reserved.
 *
 * SPDX-License-Identifier: LGPL-2.1-or-later
--- a/7
+++ b/7
@ -1,9 +1,4 @@
-#!/bin/sh
-#
-# Copyright (c) 2017-2018 The strace developers.
-# All rights reserved.
-#
-# SPDX-License-Identifier: LGPL-2.1-or-later
+#! /bin/sh

 : ${YEAR_FILE:=$1}
 : ${DEFAULT_YEAR:=$2}
--- a/debian/changelog.in
+++ b/debian/changelog.in
@ -4,12 +4,6 @@ strace (@PACKAGE_VERSION@-1) experimental; urgency=low

 -- Strace <@PACKAGE_BUGREPORT@>  @DEB_CHANGELOGTIME@

-strace (4.26-1) unstable; urgency=medium
-
-  * New upstream version.
-
- -- Dmitry V. Levin <ldv@altlinux.org>  Wed, 26 Dec 2018 18:25:10 +0000
-
 strace (4.25-1) unstable; urgency=medium

  * New upstream version.
--- a/defs.h
+++ b/defs.h
@ -9,67 +9,67 @@
 */

 #ifndef STRACE_DEFS_H
-# define STRACE_DEFS_H
+#define STRACE_DEFS_H

-# ifdef HAVE_CONFIG_H
-#  include "config.h"
-# endif
+#ifdef HAVE_CONFIG_H
+# include "config.h"
+#endif

-# include <features.h>
-# include <stdbool.h>
-# include <stdint.h>
-# include <inttypes.h>
-# include <sys/types.h>
-# include <stddef.h>
-# include <unistd.h>
-# include <stdlib.h>
-# include <stdio.h>
+#include <features.h>
+#include <stdbool.h>
+#include <stdint.h>
+#include <inttypes.h>
+#include <sys/types.h>
+#include <stddef.h>
+#include <unistd.h>
+#include <stdlib.h>
+#include <stdio.h>
 /* Open-coding isprint(ch) et al proved more efficient than calling
 * generalized libc interface. We don't *want* to do non-ASCII anyway.
 */
 /* #include <ctype.h> */
-# include <string.h>
-# include <errno.h>
-# include <time.h>
-# include <sys/time.h>
+#include <string.h>
+#include <errno.h>
+#include <time.h>
+#include <sys/time.h>

-# include "arch_defs.h"
-# include "error_prints.h"
-# include "gcc_compat.h"
-# include "kernel_types.h"
-# include "macros.h"
-# include "mpers_type.h"
-# include "string_to_uint.h"
-# include "sysent.h"
-# include "xmalloc.h"
+#include "arch_defs.h"
+#include "error_prints.h"
+#include "gcc_compat.h"
+#include "kernel_types.h"
+#include "macros.h"
+#include "mpers_type.h"
+#include "string_to_uint.h"
+#include "sysent.h"
+#include "xmalloc.h"

-# ifndef HAVE_STRERROR
+#ifndef HAVE_STRERROR
 const char *strerror(int);
-# endif
-# ifndef HAVE_STPCPY
+#endif
+#ifndef HAVE_STPCPY
 /* Some libc have stpcpy, some don't. Sigh...
 * Roll our private implementation...
 */
-#  undef stpcpy
-#  define stpcpy strace_stpcpy
+#undef stpcpy
+#define stpcpy strace_stpcpy
 extern char *stpcpy(char *dst, const char *src);
-# endif
+#endif

 /* Glibc has an efficient macro for sigemptyset
 * (it just does one or two assignments of 0 to internal vector of longs).
 */
-# if defined(__GLIBC__) && defined(__sigemptyset) && !defined(sigemptyset)
-#  define sigemptyset __sigemptyset
-# endif
+#if defined(__GLIBC__) && defined(__sigemptyset) && !defined(sigemptyset)
+# define sigemptyset __sigemptyset
+#endif

 /* Configuration section */
-# ifndef DEFAULT_STRLEN
+#ifndef DEFAULT_STRLEN
 /* default maximum # of bytes printed in `printstr', change with -s switch */
-#  define DEFAULT_STRLEN	32
-# endif
-# ifndef DEFAULT_ACOLUMN
-#  define DEFAULT_ACOLUMN	40	/* default alignment column for results */
-# endif
+# define DEFAULT_STRLEN	32
+#endif
+#ifndef DEFAULT_ACOLUMN
+# define DEFAULT_ACOLUMN	40	/* default alignment column for results */
+#endif
 /*
 * Maximum number of args to a syscall.
 *
@ -77,94 +77,94 @@ extern char *stpcpy(char *dst, const char *src);
 * linux/<ARCH>/syscallent*.h:
 *	all have nargs <= 6 except mips o32 which has nargs <= 7.
 */
-# ifndef MAX_ARGS
-#  ifdef LINUX_MIPSO32
-#   define MAX_ARGS	7
-#  else
-#   define MAX_ARGS	6
-#  endif
+#ifndef MAX_ARGS
+# ifdef LINUX_MIPSO32
+#  define MAX_ARGS	7
+# else
+#  define MAX_ARGS	6
 # endif
+#endif
 /* default sorting method for call profiling */
-# ifndef DEFAULT_SORTBY
-#  define DEFAULT_SORTBY "time"
-# endif
+#ifndef DEFAULT_SORTBY
+# define DEFAULT_SORTBY "time"
+#endif

 /* To force NOMMU build, set to 1 */
-# define NOMMU_SYSTEM 0
+#define NOMMU_SYSTEM 0

-# ifndef ERESTARTSYS
-#  define ERESTARTSYS    512
-# endif
-# ifndef ERESTARTNOINTR
-#  define ERESTARTNOINTR 513
-# endif
-# ifndef ERESTARTNOHAND
-#  define ERESTARTNOHAND 514
-# endif
-# ifndef ERESTART_RESTARTBLOCK
-#  define ERESTART_RESTARTBLOCK 516
-# endif
+#ifndef ERESTARTSYS
+# define ERESTARTSYS    512
+#endif
+#ifndef ERESTARTNOINTR
+# define ERESTARTNOINTR 513
+#endif
+#ifndef ERESTARTNOHAND
+# define ERESTARTNOHAND 514
+#endif
+#ifndef ERESTART_RESTARTBLOCK
+# define ERESTART_RESTARTBLOCK 516
+#endif

-# define PERSONALITY0_WORDSIZE  SIZEOF_LONG
-# define PERSONALITY0_KLONGSIZE SIZEOF_KERNEL_LONG_T
-# define PERSONALITY0_INCLUDE_PRINTERS_DECLS "native_printer_decls.h"
-# define PERSONALITY0_INCLUDE_PRINTERS_DEFS "native_printer_defs.h"
+#define PERSONALITY0_WORDSIZE  SIZEOF_LONG
+#define PERSONALITY0_KLONGSIZE SIZEOF_KERNEL_LONG_T
+#define PERSONALITY0_INCLUDE_PRINTERS_DECLS "native_printer_decls.h"
+#define PERSONALITY0_INCLUDE_PRINTERS_DEFS "native_printer_defs.h"

-# if SUPPORTED_PERSONALITIES > 1
-#  define PERSONALITY1_WORDSIZE  4
-#  define PERSONALITY1_KLONGSIZE PERSONALITY1_WORDSIZE
-# endif
+#if SUPPORTED_PERSONALITIES > 1
+# define PERSONALITY1_WORDSIZE  4
+# define PERSONALITY1_KLONGSIZE PERSONALITY1_WORDSIZE
+#endif

-# if SUPPORTED_PERSONALITIES > 2
-#  define PERSONALITY2_WORDSIZE  4
-#  define PERSONALITY2_KLONGSIZE PERSONALITY0_KLONGSIZE
-# endif
+#if SUPPORTED_PERSONALITIES > 2
+# define PERSONALITY2_WORDSIZE  4
+# define PERSONALITY2_KLONGSIZE PERSONALITY0_KLONGSIZE
+#endif

-# if SUPPORTED_PERSONALITIES > 1 && defined HAVE_M32_MPERS
-#  define PERSONALITY1_INCLUDE_PRINTERS_DECLS "m32_printer_decls.h"
-#  define PERSONALITY1_INCLUDE_PRINTERS_DEFS "m32_printer_defs.h"
-#  define PERSONALITY1_INCLUDE_FUNCS "m32_funcs.h"
-#  define MPERS_m32_IOCTL_MACROS "ioctl_redefs1.h"
-#  define HAVE_PERSONALITY_1_MPERS 1
-# else
-#  define PERSONALITY1_INCLUDE_PRINTERS_DECLS "native_printer_decls.h"
-#  define PERSONALITY1_INCLUDE_PRINTERS_DEFS "native_printer_defs.h"
-#  define PERSONALITY1_INCLUDE_FUNCS "empty.h"
-#  define HAVE_PERSONALITY_1_MPERS 0
-# endif
+#if SUPPORTED_PERSONALITIES > 1 && defined HAVE_M32_MPERS
+# define PERSONALITY1_INCLUDE_PRINTERS_DECLS "m32_printer_decls.h"
+# define PERSONALITY1_INCLUDE_PRINTERS_DEFS "m32_printer_defs.h"
+# define PERSONALITY1_INCLUDE_FUNCS "m32_funcs.h"
+# define MPERS_m32_IOCTL_MACROS "ioctl_redefs1.h"
+# define HAVE_PERSONALITY_1_MPERS 1
+#else
+# define PERSONALITY1_INCLUDE_PRINTERS_DECLS "native_printer_decls.h"
+# define PERSONALITY1_INCLUDE_PRINTERS_DEFS "native_printer_defs.h"
+# define PERSONALITY1_INCLUDE_FUNCS "empty.h"
+# define HAVE_PERSONALITY_1_MPERS 0
+#endif

-# if SUPPORTED_PERSONALITIES > 2 && defined HAVE_MX32_MPERS
-#  define PERSONALITY2_INCLUDE_FUNCS "mx32_funcs.h"
-#  define PERSONALITY2_INCLUDE_PRINTERS_DECLS "mx32_printer_decls.h"
-#  define PERSONALITY2_INCLUDE_PRINTERS_DEFS "mx32_printer_defs.h"
-#  define MPERS_mx32_IOCTL_MACROS "ioctl_redefs2.h"
-#  define HAVE_PERSONALITY_2_MPERS 1
-# else
-#  define PERSONALITY2_INCLUDE_PRINTERS_DECLS "native_printer_decls.h"
-#  define PERSONALITY2_INCLUDE_PRINTERS_DEFS "native_printer_defs.h"
-#  define PERSONALITY2_INCLUDE_FUNCS "empty.h"
-#  define HAVE_PERSONALITY_2_MPERS 0
-# endif
+#if SUPPORTED_PERSONALITIES > 2 && defined HAVE_MX32_MPERS
+# define PERSONALITY2_INCLUDE_FUNCS "mx32_funcs.h"
+# define PERSONALITY2_INCLUDE_PRINTERS_DECLS "mx32_printer_decls.h"
+# define PERSONALITY2_INCLUDE_PRINTERS_DEFS "mx32_printer_defs.h"
+# define MPERS_mx32_IOCTL_MACROS "ioctl_redefs2.h"
+# define HAVE_PERSONALITY_2_MPERS 1
+#else
+# define PERSONALITY2_INCLUDE_PRINTERS_DECLS "native_printer_decls.h"
+# define PERSONALITY2_INCLUDE_PRINTERS_DEFS "native_printer_defs.h"
+# define PERSONALITY2_INCLUDE_FUNCS "empty.h"
+# define HAVE_PERSONALITY_2_MPERS 0
+#endif

-# ifdef WORDS_BIGENDIAN
-#  define is_bigendian true
-# else
-#  define is_bigendian false
-# endif
+#ifdef WORDS_BIGENDIAN
+# define is_bigendian true
+#else
+# define is_bigendian false
+#endif

 typedef struct ioctlent {
 	const char *symbol;
 	unsigned int code;
 } struct_ioctlent;

-# define INJECT_F_SIGNAL		0x01
-# define INJECT_F_ERROR		0x02
-# define INJECT_F_RETVAL		0x04
-# define INJECT_F_DELAY_ENTER	0x08
-# define INJECT_F_DELAY_EXIT	0x10
-# define INJECT_F_SYSCALL	0x20
+#define INJECT_F_SIGNAL		0x01
+#define INJECT_F_ERROR		0x02
+#define INJECT_F_RETVAL		0x04
+#define INJECT_F_DELAY_ENTER	0x08
+#define INJECT_F_DELAY_EXIT	0x10
+#define INJECT_F_SYSCALL	0x20

-# define INJECT_ACTION_FLAGS	\
+#define INJECT_ACTION_FLAGS	\
 	(INJECT_F_SIGNAL	\
 	|INJECT_F_ERROR		\
 	|INJECT_F_RETVAL	\
@ -186,7 +186,7 @@ struct inject_opts {
 	struct inject_data data;
 };

-# define MAX_ERRNO_VALUE			4095
+#define MAX_ERRNO_VALUE			4095

 /* Trace Control Block */
 struct tcb {
@ -197,9 +197,9 @@ struct tcb {
 	kernel_ulong_t scno;	/* System call number */
 	kernel_ulong_t u_arg[MAX_ARGS];	/* System call arguments */
 	kernel_long_t u_rval;	/* Return value */
-# if SUPPORTED_PERSONALITIES > 1
+#if SUPPORTED_PERSONALITIES > 1
 	unsigned int currpers;	/* Personality at the time of scno update */
-# endif
+#endif
 	int sys_func_rval;	/* Syscall entry parser's return value */
 	int curcol;		/* Output column for this process */
 	FILE *outf;		/* Output file for this process */
@ -216,20 +216,20 @@ struct tcb {

 	struct mmap_cache_t *mmap_cache;

-# ifdef HAVE_LINUX_KVM_H
+#ifdef HAVE_LINUX_KVM_H
 	struct vcpu_info *vcpu_info_list;
-# endif
+#endif

-# ifdef ENABLE_STACKTRACE
+#ifdef ENABLE_STACKTRACE
 	void *unwind_ctx;
 	struct unwind_queue_t *unwind_queue;
-# endif
+#endif
 };

 /* TCB flags */
 /* We have attached to this process, but did not see it stopping yet */
-# define TCB_STARTUP		0x01
-# define TCB_IGNORE_ONE_SIGSTOP	0x02	/* Next SIGSTOP is to be ignored */
+#define TCB_STARTUP		0x01
+#define TCB_IGNORE_ONE_SIGSTOP	0x02	/* Next SIGSTOP is to be ignored */
 /*
 * Are we in system call entry or in syscall exit?
 *
@ -241,51 +241,51 @@ struct tcb {
 * Use entering(tcp) / exiting(tcp) to check this bit to make code more
 * readable.
 */
-# define TCB_INSYSCALL	0x04
-# define TCB_ATTACHED	0x08	/* We attached to it already */
-# define TCB_REPRINT	0x10	/* We should reprint this syscall on exit */
-# define TCB_FILTERED	0x20	/* This system call has been filtered out */
-# define TCB_TAMPERED	0x40	/* A syscall has been tampered with */
-# define TCB_HIDE_LOG	0x80	/* We should hide everything (until execve) */
-# define TCB_CHECK_EXEC_SYSCALL	0x100	/* Check whether this execve syscall succeeded */
-# define TCB_SKIP_DETACH_ON_FIRST_EXEC	0x200	/* -b execve should skip detach on first execve */
-# define TCB_GRABBED	0x400	/* We grab the process and can catch it
+#define TCB_INSYSCALL	0x04
+#define TCB_ATTACHED	0x08	/* We attached to it already */
+#define TCB_REPRINT	0x10	/* We should reprint this syscall on exit */
+#define TCB_FILTERED	0x20	/* This system call has been filtered out */
+#define TCB_TAMPERED	0x40	/* A syscall has been tampered with */
+#define TCB_HIDE_LOG	0x80	/* We should hide everything (until execve) */
+#define TCB_CHECK_EXEC_SYSCALL	0x100	/* Check whether this execve syscall succeeded */
+#define TCB_SKIP_DETACH_ON_FIRST_EXEC	0x200	/* -b execve should skip detach on first execve */
+#define TCB_GRABBED	0x400	/* We grab the process and can catch it
 				 * in the middle of a syscall */
-# define TCB_RECOVERING	0x800	/* We try to recover after detecting incorrect
+#define TCB_RECOVERING	0x800	/* We try to recover after detecting incorrect
 				 * syscall entering/exiting state */
-# define TCB_INJECT_DELAY_EXIT	0x1000	/* Current syscall needs to be delayed
+#define TCB_INJECT_DELAY_EXIT	0x1000	/* Current syscall needs to be delayed
 					   on exit */
-# define TCB_DELAYED	0x2000	/* Current syscall has been delayed */
-# define TCB_TAMPERED_NO_FAIL 0x4000	/* We tamper tcb with syscall
+#define TCB_DELAYED	0x2000	/* Current syscall has been delayed */
+#define TCB_TAMPERED_NO_FAIL 0x4000	/* We tamper tcb with syscall
 					   that should not fail. */

 /* qualifier flags */
-# define QUAL_TRACE	0x001	/* this system call should be traced */
-# define QUAL_ABBREV	0x002	/* abbreviate the structures of this syscall */
-# define QUAL_VERBOSE	0x004	/* decode the structures of this syscall */
-# define QUAL_RAW	0x008	/* print all args in hex for this syscall */
-# define QUAL_INJECT	0x010	/* tamper with this system call on purpose */
+#define QUAL_TRACE	0x001	/* this system call should be traced */
+#define QUAL_ABBREV	0x002	/* abbreviate the structures of this syscall */
+#define QUAL_VERBOSE	0x004	/* decode the structures of this syscall */
+#define QUAL_RAW	0x008	/* print all args in hex for this syscall */
+#define QUAL_INJECT	0x010	/* tamper with this system call on purpose */

-# define DEFAULT_QUAL_FLAGS (QUAL_TRACE | QUAL_ABBREV | QUAL_VERBOSE)
+#define DEFAULT_QUAL_FLAGS (QUAL_TRACE | QUAL_ABBREV | QUAL_VERBOSE)

-# define entering(tcp)	(!((tcp)->flags & TCB_INSYSCALL))
-# define exiting(tcp)	((tcp)->flags & TCB_INSYSCALL)
-# define syserror(tcp)	((tcp)->u_error != 0)
-# define traced(tcp)	((tcp)->qual_flg & QUAL_TRACE)
-# define verbose(tcp)	((tcp)->qual_flg & QUAL_VERBOSE)
-# define abbrev(tcp)	((tcp)->qual_flg & QUAL_ABBREV)
-# define raw(tcp)	((tcp)->qual_flg & QUAL_RAW)
-# define inject(tcp)	((tcp)->qual_flg & QUAL_INJECT)
-# define filtered(tcp)	((tcp)->flags & TCB_FILTERED)
-# define hide_log(tcp)	((tcp)->flags & TCB_HIDE_LOG)
-# define check_exec_syscall(tcp)	((tcp)->flags & TCB_CHECK_EXEC_SYSCALL)
-# define syscall_tampered(tcp)	((tcp)->flags & TCB_TAMPERED)
-# define recovering(tcp)	((tcp)->flags & TCB_RECOVERING)
-# define inject_delay_exit(tcp)	((tcp)->flags & TCB_INJECT_DELAY_EXIT)
-# define syscall_delayed(tcp)	((tcp)->flags & TCB_DELAYED)
-# define syscall_tampered_nofail(tcp) ((tcp)->flags & TCB_TAMPERED_NO_FAIL)
+#define entering(tcp)	(!((tcp)->flags & TCB_INSYSCALL))
+#define exiting(tcp)	((tcp)->flags & TCB_INSYSCALL)
+#define syserror(tcp)	((tcp)->u_error != 0)
+#define traced(tcp)	((tcp)->qual_flg & QUAL_TRACE)
+#define verbose(tcp)	((tcp)->qual_flg & QUAL_VERBOSE)
+#define abbrev(tcp)	((tcp)->qual_flg & QUAL_ABBREV)
+#define raw(tcp)	((tcp)->qual_flg & QUAL_RAW)
+#define inject(tcp)	((tcp)->qual_flg & QUAL_INJECT)
+#define filtered(tcp)	((tcp)->flags & TCB_FILTERED)
+#define hide_log(tcp)	((tcp)->flags & TCB_HIDE_LOG)
+#define check_exec_syscall(tcp)	((tcp)->flags & TCB_CHECK_EXEC_SYSCALL)
+#define syscall_tampered(tcp)	((tcp)->flags & TCB_TAMPERED)
+#define recovering(tcp)	((tcp)->flags & TCB_RECOVERING)
+#define inject_delay_exit(tcp)	((tcp)->flags & TCB_INJECT_DELAY_EXIT)
+#define syscall_delayed(tcp)	((tcp)->flags & TCB_DELAYED)
+#define syscall_tampered_nofail(tcp) ((tcp)->flags & TCB_TAMPERED_NO_FAIL)

-# include "xlat.h"
+#include "xlat.h"

 extern const struct xlat addrfams[];

@ -338,24 +338,24 @@ extern const struct xlat tcp_states[];
 extern const struct xlat whence_codes[];

 /* Format of syscall return values */
-# define RVAL_UDECIMAL	000	/* unsigned decimal format */
-# define RVAL_HEX	001	/* hex format */
-# define RVAL_OCTAL	002	/* octal format */
-# define RVAL_FD		010	/* file descriptor */
-# define RVAL_MASK	013	/* mask for these values */
+#define RVAL_UDECIMAL	000	/* unsigned decimal format */
+#define RVAL_HEX	001	/* hex format */
+#define RVAL_OCTAL	002	/* octal format */
+#define RVAL_FD		010	/* file descriptor */
+#define RVAL_MASK	013	/* mask for these values */

-# define RVAL_STR	020	/* Print `auxstr' field after return val */
-# define RVAL_NONE	040	/* Print nothing */
+#define RVAL_STR	020	/* Print `auxstr' field after return val */
+#define RVAL_NONE	040	/* Print nothing */

-# define RVAL_DECODED	0100	/* syscall decoding finished */
-# define RVAL_IOCTL_DECODED 0200	/* ioctl sub-parser successfully decoded
+#define RVAL_DECODED	0100	/* syscall decoding finished */
+#define RVAL_IOCTL_DECODED 0200	/* ioctl sub-parser successfully decoded
 				   the argument */

-# define IOCTL_NUMBER_UNKNOWN 0
-# define IOCTL_NUMBER_HANDLED 1
-# define IOCTL_NUMBER_STOP_LOOKUP 010
+#define IOCTL_NUMBER_UNKNOWN 0
+#define IOCTL_NUMBER_HANDLED 1
+#define IOCTL_NUMBER_STOP_LOOKUP 010

-# define indirect_ipccall(tcp) (tcp->s_ent->sys_flags & TRACE_INDIRECT_SUBCALL)
+#define indirect_ipccall(tcp) (tcp->s_ent->sys_flags & TRACE_INDIRECT_SUBCALL)

 enum sock_proto {
 	SOCK_PROTO_UNKNOWN,
@ -405,18 +405,18 @@ extern struct path_set {
 	size_t num_selected;
 	size_t size;
 } global_path_set;
-# define tracing_paths (global_path_set.num_selected != 0)
+#define tracing_paths (global_path_set.num_selected != 0)
 extern unsigned xflag;
 extern unsigned followfork;
-# ifdef ENABLE_STACKTRACE
+#ifdef ENABLE_STACKTRACE
 /* if this is true do the stack trace for every system call */
 extern bool stack_trace_enabled;
-# endif
+#endif
 extern unsigned ptrace_setoptions;
 extern unsigned max_strlen;
 extern unsigned os_release;
-# undef KERNEL_VERSION
-# define KERNEL_VERSION(a, b, c) (((a) << 16) + ((b) << 8) + (c))
+#undef KERNEL_VERSION
+#define KERNEL_VERSION(a, b, c) (((a) << 16) + ((b) << 8) + (c))

 extern int read_int_from_file(struct tcb *, const char *, int *);

@ -495,7 +495,7 @@ static inline int set_tcb_priv_ulong(struct tcb *tcp, unsigned long val)
 */
 extern int
 umoven(struct tcb *, kernel_ulong_t addr, unsigned int len, void *laddr);
-# define umove(pid, addr, objp)	\
+#define umove(pid, addr, objp)	\
 	umoven((pid), (addr), sizeof(*(objp)), (void *) (objp))

 /**
@ -510,7 +510,7 @@ tfetch_mem(struct tcb *tcp, const kernel_ulong_t addr,
 {
 	return tfetch_mem64(tcp, addr, len, laddr);
 }
-# define tfetch_obj(pid, addr, objp)	\
+#define tfetch_obj(pid, addr, objp)	\
 	tfetch_mem((pid), (addr), sizeof(*(objp)), (void *) (objp))

 /**
@ -533,7 +533,7 @@ tfetch_mem_ignore_syserror(struct tcb *tcp, const kernel_ulong_t addr,
 extern int
 umoven_or_printaddr64(struct tcb *, uint64_t addr,
 		      unsigned int len, void *laddr);
-# define umove_or_printaddr64(pid, addr, objp)	\
+#define umove_or_printaddr64(pid, addr, objp)	\
 	umoven_or_printaddr64((pid), (addr), sizeof(*(objp)), (void *) (objp))

 static inline int
@ -542,7 +542,7 @@ umoven_or_printaddr(struct tcb *tcp, const kernel_ulong_t addr,
 {
 	return umoven_or_printaddr64(tcp, addr, len, laddr);
 }
-# define umove_or_printaddr(pid, addr, objp)	\
+#define umove_or_printaddr(pid, addr, objp)	\
 	umoven_or_printaddr((pid), (addr), sizeof(*(objp)), (void *) (objp))

 /**
@ -551,7 +551,7 @@ umoven_or_printaddr(struct tcb *tcp, const kernel_ulong_t addr,
 extern int
 umoven_or_printaddr64_ignore_syserror(struct tcb *, uint64_t addr,
 				      unsigned int len, void *laddr);
-# define umove_or_printaddr64_ignore_syserror(pid, addr, objp)	\
+#define umove_or_printaddr64_ignore_syserror(pid, addr, objp)	\
 	umoven_or_printaddr64_ignore_syserror((pid), (addr), sizeof(*(objp)), \
 					      (void *) (objp))

@ -561,7 +561,7 @@ umoven_or_printaddr_ignore_syserror(struct tcb *tcp, const kernel_ulong_t addr,
 {
 	return umoven_or_printaddr64_ignore_syserror(tcp, addr, len, laddr);
 }
-# define umove_or_printaddr_ignore_syserror(pid, addr, objp)	\
+#define umove_or_printaddr_ignore_syserror(pid, addr, objp)	\
 	umoven_or_printaddr_ignore_syserror((pid), (addr), sizeof(*(objp)), \
 					    (void *) (objp))

@ -574,9 +574,9 @@ umovestr(struct tcb *, kernel_ulong_t addr, unsigned int len, char *laddr);
 extern int upeek(struct tcb *tcp, unsigned long, kernel_ulong_t *);
 extern int upoke(struct tcb *tcp, unsigned long, kernel_ulong_t);

-# if HAVE_ARCH_GETRVAL2
+#if HAVE_ARCH_GETRVAL2
 extern long getrval2(struct tcb *);
-# endif
+#endif

 extern const char *signame(const int);
 extern const char *sprintsigname(const int);
@ -625,14 +625,14 @@ str_strip_prefix_len(const char *str, const char *prefix, size_t prefix_len)
 	return strncmp(str, prefix, prefix_len) ? str : str + prefix_len;
 }

-# define STR_STRIP_PREFIX(str, prefix)	\
+#define STR_STRIP_PREFIX(str, prefix)	\
 	str_strip_prefix_len((str), (prefix), sizeof(prefix) - 1)

-# define QUOTE_0_TERMINATED			0x01
-# define QUOTE_OMIT_LEADING_TRAILING_QUOTES	0x02
-# define QUOTE_OMIT_TRAILING_0			0x08
-# define QUOTE_FORCE_HEX				0x10
-# define QUOTE_EMIT_COMMENT			0x20
+#define QUOTE_0_TERMINATED			0x01
+#define QUOTE_OMIT_LEADING_TRAILING_QUOTES	0x02
+#define QUOTE_OMIT_TRAILING_0			0x08
+#define QUOTE_FORCE_HEX				0x10
+#define QUOTE_EMIT_COMMENT			0x20

 extern int string_quote(const char *, char *, unsigned int, unsigned int,
 			const char *escape_chars);
@ -644,13 +644,13 @@ extern int print_quoted_cstring(const char *, unsigned int);
 /* a refers to the lower numbered u_arg,
 * b refers to the higher numbered u_arg
 */
-# ifdef WORDS_BIGENDIAN
-#  define ULONG_LONG(a, b) \
+#ifdef WORDS_BIGENDIAN
+# define ULONG_LONG(a, b) \
 	((unsigned long long)(unsigned)(b) | ((unsigned long long)(a)<<32))
-# else
-#  define ULONG_LONG(a, b) \
+#else
+# define ULONG_LONG(a, b) \
 	((unsigned long long)(unsigned)(a) | ((unsigned long long)(b)<<32))
-# endif
+#endif
 extern int getllval(struct tcb *, unsigned long long *, int);
 extern int printllval(struct tcb *, const char *, int)
 	ATTRIBUTE_FORMAT((printf, 2, 0));
@ -663,15 +663,15 @@ printaddr(const kernel_ulong_t addr)
 	printaddr64(addr);
 }

-# define xlat_verbose(style_) ((style_) & XLAT_STYLE_VERBOSITY_MASK)
-# define xlat_format(style_)  ((style_) & XLAT_STYLE_FORMAT_MASK)
+#define xlat_verbose(style_) ((style_) & XLAT_STYLE_VERBOSITY_MASK)
+#define xlat_format(style_)  ((style_) & XLAT_STYLE_FORMAT_MASK)

 extern enum xlat_style xlat_verbosity;

 extern int printxvals_ex(uint64_t val, const char *dflt,
 			 enum xlat_style, const struct xlat *, ...)
 	ATTRIBUTE_SENTINEL;
-# define printxvals(val_, dflt_, ...) \
+#define printxvals(val_, dflt_, ...) \
 	printxvals_ex((val_), (dflt_), XLAT_STYLE_DEFAULT, __VA_ARGS__)

 extern int printxval_searchn_ex(const struct xlat *, size_t xlat_size,
@ -691,9 +691,9 @@ printxval_searchn(const struct xlat *xlat, size_t xlat_size, uint64_t val,
 * as the array size, as all arrays are XLAT_END-terminated and
 * printxval_searchn expects a size without the terminating record.
 */
-# define printxval_search(xlat__, val__, dflt__) \
+#define printxval_search(xlat__, val__, dflt__) \
 	printxval_searchn(xlat__, ARRAY_SIZE(xlat__) - 1, val__, dflt__)
-# define printxval_search_ex(xlat__, val__, dflt__, style__) \
+#define printxval_search_ex(xlat__, val__, dflt__, style__) \
 	printxval_searchn_ex((xlat__), ARRAY_SIZE(xlat__) - 1, (val__), \
 			     (dflt__), (style__))

@ -708,9 +708,9 @@ printxval_indexn(const struct xlat *xlat, size_t xlat_size, uint64_t val,
 				   XLAT_STYLE_DEFAULT);
 }

-# define printxval_index(xlat__, val__, dflt__) \
+#define printxval_index(xlat__, val__, dflt__) \
 	printxval_indexn(xlat__, ARRAY_SIZE(xlat__) - 1, val__, dflt__)
-# define printxval_index_ex(xlat__, val__, dflt__) \
+#define printxval_index_ex(xlat__, val__, dflt__) \
 	printxval_indexn_ex((xlat__), ARRAY_SIZE(xlat__) - 1, (val__), \
 			    (dflt__), XLAT_STYLE_DEFAULT)

@ -745,7 +745,7 @@ enum xlat_style_private_flag_bits {
 	PXF_DEFAULT_STR_BIT,
 };

-# define FLAG_(name_) name_ = 1 << name_##_BIT
+#define FLAG_(name_) name_ = 1 << name_##_BIT

 enum xlat_style_private_flags {
 	/* print_array */
@ -757,17 +757,17 @@ enum xlat_style_private_flags {
 	FLAG_(PXF_DEFAULT_STR),
 };

-# undef FLAG_
+#undef FLAG_

 /** Print a value in accordance with xlat formatting settings. */
 extern void print_xlat_ex(uint64_t val, const char *str, enum xlat_style style);
-# define print_xlat(val_) \
+#define print_xlat(val_) \
 	print_xlat_ex((val_), #val_, XLAT_STYLE_DEFAULT)
-# define print_xlat32(val_) \
+#define print_xlat32(val_) \
 	print_xlat_ex((uint32_t) (val_), #val_, XLAT_STYLE_DEFAULT)
-# define print_xlat_u(val_) \
+#define print_xlat_u(val_) \
 	print_xlat_ex((val_), #val_, XLAT_STYLE_FMT_U)
-# define print_xlat_d(val_) \
+#define print_xlat_d(val_) \
 	print_xlat_ex((val_), #val_, XLAT_STYLE_FMT_D)

 extern int printargs(struct tcb *);
@ -870,7 +870,7 @@ printpathn(struct tcb *, kernel_ulong_t addr, unsigned int n);
 extern int
 printpath(struct tcb *, kernel_ulong_t addr);

-# define TIMESPEC_TEXT_BUFSIZE \
+#define TIMESPEC_TEXT_BUFSIZE \
 		(sizeof(long long) * 3 * 2 + sizeof("{tv_sec=-, tv_nsec=}"))
 extern void printfd(struct tcb *, int);
 extern void print_sockaddr(const void *sa, int len);
@ -896,7 +896,7 @@ extern void
 print_sigset_addr(struct tcb *, kernel_ulong_t addr);

 extern const char *sprintsigmask_n(const char *, const void *, unsigned int);
-# define tprintsigmask_addr(prefix, mask) \
+#define tprintsigmask_addr(prefix, mask) \
 	tprints(sprintsigmask_n((prefix), (mask), sizeof(mask)))
 extern void printsignal(int);

@ -947,7 +947,7 @@ extern void print_bpf_filter_code(const uint16_t code, bool extended);
 extern void qualify(const char *);
 extern unsigned int qual_flags(const unsigned int);

-# define DECL_IOCTL(name)						\
+#define DECL_IOCTL(name)						\
 extern int								\
 name ## _ioctl(struct tcb *, unsigned int request, kernel_ulong_t arg)	\
 /* End of DECL_IOCTL definition. */
@ -966,7 +966,7 @@ DECL_IOCTL(scsi);
 DECL_IOCTL(term);
 DECL_IOCTL(ubi);
 DECL_IOCTL(uffdio);
-# undef DECL_IOCTL
+#undef DECL_IOCTL

 extern int decode_sg_io_v4(struct tcb *, const kernel_ulong_t arg);
 extern void print_evdev_ff_type(const kernel_ulong_t val);
@ -976,7 +976,7 @@ struct nlmsghdr;
 typedef bool (*netlink_decoder_t)(struct tcb *, const struct nlmsghdr *,
 				  kernel_ulong_t addr, unsigned int len);

-# define DECL_NETLINK(name)						\
+#define DECL_NETLINK(name)						\
 extern bool								\
 decode_netlink_ ## name(struct tcb *, const struct nlmsghdr *,		\
 			kernel_ulong_t addr, unsigned int len)		\
@ -1000,18 +1000,18 @@ extern void ts_sub(struct timespec *, const struct timespec *, const struct time
 extern void ts_mul(struct timespec *, const struct timespec *, int);
 extern void ts_div(struct timespec *, const struct timespec *, int);

-# ifdef ENABLE_STACKTRACE
+#ifdef ENABLE_STACKTRACE
 extern void unwind_init(void);
 extern void unwind_tcb_init(struct tcb *);
 extern void unwind_tcb_fin(struct tcb *);
 extern void unwind_tcb_print(struct tcb *);
 extern void unwind_tcb_capture(struct tcb *);
-# endif
+#endif

-# ifdef HAVE_LINUX_KVM_H
+#ifdef HAVE_LINUX_KVM_H
 extern void kvm_run_structure_decoder_init(void);
 extern void kvm_vcpu_info_free(struct tcb *);
-# endif
+#endif

 static inline int
 printstrn(struct tcb *tcp, kernel_ulong_t addr, kernel_ulong_t len)
@ -1080,7 +1080,7 @@ tprint_iov(struct tcb *tcp, kernel_ulong_t len, kernel_ulong_t addr,
 	tprint_iov_upto(tcp, len, addr, decode_iov, -1);
 }

-# ifdef ALPHA
+#ifdef ALPHA
 typedef struct {
 	int tv_sec, tv_usec;
 } timeval32_t;
@ -1091,9 +1091,9 @@ extern const char *sprint_timeval32(struct tcb *, kernel_ulong_t addr);
 extern void print_timeval32(struct tcb *, kernel_ulong_t addr);
 extern void print_timeval32_utimes(struct tcb *, kernel_ulong_t addr);
 extern void print_itimerval32(struct tcb *, kernel_ulong_t addr);
-# endif
+#endif

-# ifdef HAVE_STRUCT_USER_DESC
+#ifdef HAVE_STRUCT_USER_DESC
 /**
 * Filter what to print from the point of view of the get_thread_area syscall.
 * Kernel copies only entry_number field at first and then tries to write the
@ -1109,7 +1109,7 @@ enum user_desc_print_filter {

 extern void print_user_desc(struct tcb *, kernel_ulong_t addr,
 			    enum user_desc_print_filter filter);
-# endif
+#endif

 /* Strace log generation machinery.
 *
@ -1150,32 +1150,32 @@ print_mac_addr(const char *prefix, const uint8_t addr[], size_t size)
 	tprints(sprint_mac_addr(addr, size));
 }

-# if SUPPORTED_PERSONALITIES > 1
+#if SUPPORTED_PERSONALITIES > 1
 extern void set_personality(unsigned int personality);
 extern unsigned current_personality;
-# else
-#  define set_personality(personality) ((void)0)
-#  define current_personality 0
-# endif
+#else
+# define set_personality(personality) ((void)0)
+# define current_personality 0
+#endif

-# if SUPPORTED_PERSONALITIES == 1
+#if SUPPORTED_PERSONALITIES == 1
+# define current_wordsize PERSONALITY0_WORDSIZE
+# define current_klongsize PERSONALITY0_KLONGSIZE
+#else
+# if SUPPORTED_PERSONALITIES == 2 && PERSONALITY0_WORDSIZE == PERSONALITY1_WORDSIZE
 #  define current_wordsize PERSONALITY0_WORDSIZE
+# else
+extern unsigned current_wordsize;
+# endif
+# if SUPPORTED_PERSONALITIES == 2 && PERSONALITY0_KLONGSIZE == PERSONALITY1_KLONGSIZE
 #  define current_klongsize PERSONALITY0_KLONGSIZE
 # else
-#  if SUPPORTED_PERSONALITIES == 2 && PERSONALITY0_WORDSIZE == PERSONALITY1_WORDSIZE
-#   define current_wordsize PERSONALITY0_WORDSIZE
-#  else
-extern unsigned current_wordsize;
-#  endif
-#  if SUPPORTED_PERSONALITIES == 2 && PERSONALITY0_KLONGSIZE == PERSONALITY1_KLONGSIZE
-#   define current_klongsize PERSONALITY0_KLONGSIZE
-#  else
 extern unsigned current_klongsize;
-#  endif
 # endif
+#endif

-# define max_addr() (~0ULL >> ((8 - current_wordsize) * 8))
-# define max_kaddr() (~0ULL >> ((8 - current_klongsize) * 8))
+#define max_addr() (~0ULL >> ((8 - current_wordsize) * 8))
+#define max_kaddr() (~0ULL >> ((8 - current_klongsize) * 8))

 /*
 * When u64 is interpreted by the kernel as an address, there is a difference
@ -1184,7 +1184,7 @@ extern unsigned current_klongsize;
 * to a valid address).  Since 32-bit strace cannot figure out what kind of
 * kernel the tracee is running on, it has to account for both possibilities.
 */
-# if CAN_ARCH_BE_COMPAT_ON_64BIT_KERNEL
+#if CAN_ARCH_BE_COMPAT_ON_64BIT_KERNEL

 /**
 * Print raw 64-bit value as an address if it's too big to fit in strace's
@ -1198,18 +1198,18 @@ print_big_u64_addr(const uint64_t addr)
 		tprints(" or ");
 	}
 }
-# else /* !CAN_ARCH_BE_COMPAT_ON_64BIT_KERNEL */
-#  define print_big_u64_addr(addr_) ((void) 0)
-# endif /* CAN_ARCH_BE_COMPAT_ON_64BIT_KERNEL */
+#else /* !CAN_ARCH_BE_COMPAT_ON_64BIT_KERNEL */
+# define print_big_u64_addr(addr_) ((void) 0)
+#endif /* CAN_ARCH_BE_COMPAT_ON_64BIT_KERNEL */

-# if SIZEOF_KERNEL_LONG_T > 4		\
+#if SIZEOF_KERNEL_LONG_T > 4		\
 && (SIZEOF_LONG < SIZEOF_KERNEL_LONG_T || !defined(current_wordsize))
-#  define ANY_WORDSIZE_LESS_THAN_KERNEL_LONG	1
-# else
-#  define ANY_WORDSIZE_LESS_THAN_KERNEL_LONG	0
-# endif
+# define ANY_WORDSIZE_LESS_THAN_KERNEL_LONG	1
+#else
+# define ANY_WORDSIZE_LESS_THAN_KERNEL_LONG	0
+#endif

-# define DECL_PRINTNUM(name)						\
+#define DECL_PRINTNUM(name)						\
 extern bool								\
 printnum_ ## name(struct tcb *, kernel_ulong_t addr, const char *fmt)	\
 	ATTRIBUTE_FORMAT((printf, 3, 0))				\
@ -1218,18 +1218,18 @@ printnum_ ## name(struct tcb *, kernel_ulong_t addr, const char *fmt)	\
 DECL_PRINTNUM(short);
 DECL_PRINTNUM(int);
 DECL_PRINTNUM(int64);
-# undef DECL_PRINTNUM
+#undef DECL_PRINTNUM

-# define DECL_PRINTNUM_ADDR(name)					\
+#define DECL_PRINTNUM_ADDR(name)					\
 extern bool								\
 printnum_addr_ ## name(struct tcb *, kernel_ulong_t addr)		\
 /* End of DECL_PRINTNUM_ADDR definition. */

 DECL_PRINTNUM_ADDR(int);
 DECL_PRINTNUM_ADDR(int64);
-# undef DECL_PRINTNUM_ADDR
+#undef DECL_PRINTNUM_ADDR

-# ifndef current_wordsize
+#ifndef current_wordsize
 extern bool
 printnum_long_int(struct tcb *, kernel_ulong_t addr,
 		  const char *fmt_long, const char *fmt_int)
@ -1256,7 +1256,7 @@ printnum_ptr(struct tcb *tcp, kernel_ulong_t addr)
 	return printnum_addr_long_int(tcp, addr);
 }

-# elif current_wordsize > 4
+#elif current_wordsize > 4

 static inline bool
 printnum_slong(struct tcb *tcp, kernel_ulong_t addr)
@ -1276,7 +1276,7 @@ printnum_ptr(struct tcb *tcp, kernel_ulong_t addr)
 	return printnum_addr_int64(tcp, addr);
 }

-# else /* current_wordsize == 4 */
+#else /* current_wordsize == 4 */

 static inline bool
 printnum_slong(struct tcb *tcp, kernel_ulong_t addr)
@ -1296,9 +1296,9 @@ printnum_ptr(struct tcb *tcp, kernel_ulong_t addr)
 	return printnum_addr_int(tcp, addr);
 }

-# endif
+#endif

-# ifndef current_klongsize
+#ifndef current_klongsize
 extern bool printnum_addr_klong_int(struct tcb *, kernel_ulong_t addr);

 static inline bool
@ -1307,7 +1307,7 @@ printnum_kptr(struct tcb *tcp, kernel_ulong_t addr)
 	return printnum_addr_klong_int(tcp, addr);
 }

-# elif current_klongsize > 4
+#elif current_klongsize > 4

 static inline bool
 printnum_kptr(struct tcb *tcp, kernel_ulong_t addr)
@ -1315,7 +1315,7 @@ printnum_kptr(struct tcb *tcp, kernel_ulong_t addr)
 	return printnum_addr_int64(tcp, addr);
 }

-# else /* current_klongsize == 4 */
+#else /* current_klongsize == 4 */

 static inline bool
 printnum_kptr(struct tcb *tcp, kernel_ulong_t addr)
@ -1323,9 +1323,9 @@ printnum_kptr(struct tcb *tcp, kernel_ulong_t addr)
 	return printnum_addr_int(tcp, addr);
 }

-# endif
+#endif

-# define DECL_PRINTPAIR(name)						\
+#define DECL_PRINTPAIR(name)						\
 extern bool								\
 printpair_ ## name(struct tcb *, kernel_ulong_t addr, const char *fmt)	\
 	ATTRIBUTE_FORMAT((printf, 3, 0))				\
@ -1333,16 +1333,16 @@ printpair_ ## name(struct tcb *, kernel_ulong_t addr, const char *fmt)	\

 DECL_PRINTPAIR(int);
 DECL_PRINTPAIR(int64);
-# undef DECL_PRINTPAIR
+#undef DECL_PRINTPAIR

 static inline kernel_long_t
 truncate_klong_to_current_wordsize(const kernel_long_t v)
 {
-# if ANY_WORDSIZE_LESS_THAN_KERNEL_LONG
+#if ANY_WORDSIZE_LESS_THAN_KERNEL_LONG
 	if (current_wordsize < sizeof(v)) {
 		return (int) v;
 	} else
-# endif
+#endif
 	{
 		return v;
 	}
@ -1351,11 +1351,11 @@ truncate_klong_to_current_wordsize(const kernel_long_t v)
 static inline kernel_ulong_t
 truncate_kulong_to_current_wordsize(const kernel_ulong_t v)
 {
-# if ANY_WORDSIZE_LESS_THAN_KERNEL_LONG
+#if ANY_WORDSIZE_LESS_THAN_KERNEL_LONG
 	if (current_wordsize < sizeof(v)) {
 		return (unsigned int) v;
 	} else
-# endif
+#endif
 	{
 		return v;
 	}
@ -1364,12 +1364,12 @@ truncate_kulong_to_current_wordsize(const kernel_ulong_t v)
 /*
 * Cast a pointer or a pointer-sized integer to kernel_ulong_t.
 */
-# define ptr_to_kulong(v) ((kernel_ulong_t) (unsigned long) (v))
+#define ptr_to_kulong(v) ((kernel_ulong_t) (unsigned long) (v))

 /*
 * Zero-extend a signed integer type to unsigned long long.
 */
-# define zero_extend_signed_to_ull(v) \
+#define zero_extend_signed_to_ull(v) \
 	(sizeof(v) == sizeof(char) ? (unsigned long long) (unsigned char) (v) : \
 	 sizeof(v) == sizeof(short) ? (unsigned long long) (unsigned short) (v) : \
 	 sizeof(v) == sizeof(int) ? (unsigned long long) (unsigned int) (v) : \
@ -1379,7 +1379,7 @@ truncate_kulong_to_current_wordsize(const kernel_ulong_t v)
 /*
 * Sign-extend an unsigned integer type to long long.
 */
-# define sign_extend_unsigned_to_ll(v) \
+#define sign_extend_unsigned_to_ll(v) \
 	(sizeof(v) == sizeof(char) ? (long long) (char) (v) : \
 	 sizeof(v) == sizeof(short) ? (long long) (short) (v) : \
 	 sizeof(v) == sizeof(int) ? (long long) (int) (v) : \
@ -1398,13 +1398,13 @@ extern const char *const personality_names[];
 /* Personality designators to be used for specifying personality */
 extern const char *const personality_designators[];

-# if SUPPORTED_PERSONALITIES > 1
+#if SUPPORTED_PERSONALITIES > 1
 extern const struct_sysent *sysent;
 extern const struct_ioctlent *ioctlent;
-# else
-#  define sysent     sysent0
-#  define ioctlent   ioctlent0
-# endif
+#else
+# define sysent     sysent0
+# define ioctlent   ioctlent0
+#endif

 extern unsigned nsyscalls;
 extern unsigned nioctlents;
@ -1413,17 +1413,17 @@ extern const unsigned int nsyscall_vec[SUPPORTED_PERSONALITIES];
 extern const struct_sysent *const sysent_vec[SUPPORTED_PERSONALITIES];
 extern struct inject_opts *inject_vec[SUPPORTED_PERSONALITIES];

-# ifdef IN_MPERS_BOOTSTRAP
+#ifdef IN_MPERS_BOOTSTRAP
 /* Transform multi-line MPERS_PRINTER_DECL statements to one-liners.  */
-#  define MPERS_PRINTER_DECL(type, name, ...) MPERS_PRINTER_DECL(type, name, __VA_ARGS__)
-# else /* !IN_MPERS_BOOTSTRAP */
-#  if SUPPORTED_PERSONALITIES > 1
-#   include "printers.h"
-#  else
-#   include "native_printer_decls.h"
-#  endif
-#  define MPERS_PRINTER_DECL(type, name, ...) type MPERS_FUNC_NAME(name)(__VA_ARGS__)
-# endif /* !IN_MPERS_BOOTSTRAP */
+# define MPERS_PRINTER_DECL(type, name, ...) MPERS_PRINTER_DECL(type, name, __VA_ARGS__)
+#else /* !IN_MPERS_BOOTSTRAP */
+# if SUPPORTED_PERSONALITIES > 1
+#  include "printers.h"
+# else
+#  include "native_printer_decls.h"
+# endif
+# define MPERS_PRINTER_DECL(type, name, ...) type MPERS_FUNC_NAME(name)(__VA_ARGS__)
+#endif /* !IN_MPERS_BOOTSTRAP */

 /* Checks that sysent[scno] is not out of range. */
 static inline bool
@ -1445,12 +1445,12 @@ scno_is_valid(kernel_ulong_t scno)
 	       && !(sysent[scno].sys_flags & TRACE_INDIRECT_SUBCALL);
 }

-# define MPERS_FUNC_NAME__(prefix, name) prefix ## name
-# define MPERS_FUNC_NAME_(prefix, name) MPERS_FUNC_NAME__(prefix, name)
-# define MPERS_FUNC_NAME(name) MPERS_FUNC_NAME_(MPERS_PREFIX, name)
+#define MPERS_FUNC_NAME__(prefix, name) prefix ## name
+#define MPERS_FUNC_NAME_(prefix, name) MPERS_FUNC_NAME__(prefix, name)
+#define MPERS_FUNC_NAME(name) MPERS_FUNC_NAME_(MPERS_PREFIX, name)

-# define SYS_FUNC_NAME(syscall_name) MPERS_FUNC_NAME(syscall_name)
+#define SYS_FUNC_NAME(syscall_name) MPERS_FUNC_NAME(syscall_name)

-# define SYS_FUNC(syscall_name) int SYS_FUNC_NAME(sys_ ## syscall_name)(struct tcb *tcp)
+#define SYS_FUNC(syscall_name) int SYS_FUNC_NAME(sys_ ## syscall_name)(struct tcb *tcp)

 #endif /* !STRACE_DEFS_H */
--- a/delay.h
+++ b/delay.h
@ -6,7 +6,7 @@
 */

 #ifndef STRACE_DELAY_H
-# define STRACE_DELAY_H
+#define STRACE_DELAY_H

 uint16_t alloc_delay_data(void);
 void fill_delay_data(uint16_t delay_idx, int intval, bool isenter);
--- a/dirent.c
+++ b/dirent.c
@ -4,7 +4,7 @@
 * 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.
+ * Copyright (c) 2014-2017 The strace developers.
 * All rights reserved.
 *
 * SPDX-License-Identifier: LGPL-2.1-or-later
--- a/dirent64.c
+++ b/dirent64.c
@ -4,7 +4,7 @@
 * 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) 2015-2018 The strace developers.
+ * Copyright (c) 2015-2017 The strace developers.
 * All rights reserved.
 *
 * SPDX-License-Identifier: LGPL-2.1-or-later
--- a/dm.c
+++ b/dm.c
@ -98,7 +98,7 @@ dm_decode_values(struct tcb *tcp, const unsigned int code,
 	}
 }

-#  include "xlat/dm_flags.h"
+#include "xlat/dm_flags.h"

 static void
 dm_decode_flags(const struct dm_ioctl *ioc)
--- a/dyxlat.c
+++ b/dyxlat.c
@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2017-2018 The strace developers.
+ * Copyright (c) 2017 The strace developers.
 *
 * SPDX-License-Identifier: LGPL-2.1-or-later
 */
--- a/error_prints.h
+++ b/error_prints.h
@ -4,18 +4,18 @@
 * package.  Variable 'program_invocation_name' and function 'die()'
 * have to be defined globally.
 *
- * Copyright (c) 2001-2018 The strace developers.
+ * Copyright (c) 2001-2017 The strace developers.
 * All rights reserved.
 *
 * SPDX-License-Identifier: LGPL-2.1-or-later
 */

 #ifndef STRACE_ERROR_PRINTS_H
-# define STRACE_ERROR_PRINTS_H
+#define STRACE_ERROR_PRINTS_H

-# include <stdbool.h>
+#include <stdbool.h>

-# include "gcc_compat.h"
+#include "gcc_compat.h"

 extern bool debug_flag;

@ -31,29 +31,29 @@ void error_msg_and_die(const char *fmt, ...)
 	ATTRIBUTE_FORMAT((printf, 1, 2)) ATTRIBUTE_NORETURN;

 /* Wrappers for if (debug_flag) error_msg(...) */
-# define debug_msg(...) \
+#define debug_msg(...) \
 	do { \
 		if (debug_flag) \
 			error_msg(__VA_ARGS__); \
 	} while (0)
-# define debug_perror_msg(...) \
+#define debug_perror_msg(...) \
 	do { \
 		if (debug_flag) \
 			perror_msg(__VA_ARGS__); \
 	} while (0)

 /* Simple wrappers for providing function name in error messages */
-# define error_func_msg(fmt_, ...) \
+#define error_func_msg(fmt_, ...) \
 	error_msg("%s: " fmt_,  __func__, ##__VA_ARGS__)
-# define perror_func_msg(fmt_, ...) \
+#define perror_func_msg(fmt_, ...) \
 	perror_msg("%s: " fmt_, __func__, ##__VA_ARGS__)
-# define debug_func_msg(fmt_, ...) \
+#define debug_func_msg(fmt_, ...) \
 	debug_msg("%s: " fmt_, __func__, ##__VA_ARGS__)
-# define debug_func_perror_msg(fmt_, ...) \
+#define debug_func_perror_msg(fmt_, ...) \
 	debug_perror_msg("%s: " fmt_, __func__, ##__VA_ARGS__)
-# define error_func_msg_and_die(fmt_, ...) \
+#define error_func_msg_and_die(fmt_, ...) \
 	error_msg_and_die("%s: " fmt_, __func__, ##__VA_ARGS__)
-# define perror_func_msg_and_die(fmt_, ...) \
+#define perror_func_msg_and_die(fmt_, ...) \
 	perror_msg_and_die("%s: " fmt_, __func__, ##__VA_ARGS__)

 #endif /* !STRACE_ERROR_PRINTS_H */
--- a/evdev.c
+++ b/evdev.c
@ -186,7 +186,7 @@ decode_bitset_(struct tcb *const tcp, const kernel_ulong_t arg,
 	return RVAL_IOCTL_DECODED;
 }

-# define decode_bitset(tcp_, arg_, decode_nr_, max_nr_, dflt_, xt_) \
+#define decode_bitset(tcp_, arg_, decode_nr_, max_nr_, dflt_, xt_) \
 	decode_bitset_((tcp_), (arg_), (decode_nr_), (max_nr_), \
 		       (dflt_), ARRAY_SIZE(decode_nr_) - 1, (xt_))

--- a/evdev_mpers.c
+++ b/evdev_mpers.c
@ -11,7 +11,7 @@

 #ifdef HAVE_LINUX_INPUT_H

-# include DEF_MPERS_TYPE(struct_ff_effect)
+#include DEF_MPERS_TYPE(struct_ff_effect)

 # include <linux/ioctl.h>
 # include <linux/input.h>
--- a/eventfd.c
+++ b/eventfd.c
@ -1,6 +1,6 @@
 /*
 * Copyright (c) 2007 Ulrich Drepper <drepper@redhat.com>
- * Copyright (c) 2008-2018 Dmitry V. Levin <ldv@altlinux.org>
+ * Copyright (c) 2008-2015 Dmitry V. Levin <ldv@altlinux.org>
 * All rights reserved.
 *
 * SPDX-License-Identifier: LGPL-2.1-or-later
--- a/f_owner_ex.h
+++ b/f_owner_ex.h
@ -6,16 +6,16 @@
 */

 #ifndef STRACE_F_OWNER_EX_H
-# define STRACE_F_OWNER_EX_H
+#define STRACE_F_OWNER_EX_H

-# include <linux/fcntl.h>
+#include <linux/fcntl.h>

-# if defined HAVE_STRUCT_F_OWNER_EX
+#if defined HAVE_STRUCT_F_OWNER_EX
 typedef struct f_owner_ex struct_kernel_f_owner_ex;
-# elif defined HAVE_STRUCT___KERNEL_F_OWNER_EX
+#elif defined HAVE_STRUCT___KERNEL_F_OWNER_EX
 typedef struct __kernel_f_owner_ex struct_kernel_f_owner_ex;
-# else
-#  error struct f_owner_ex definition not found in <linux/fcntl.h>
-# endif
+#else
+# error struct f_owner_ex definition not found in <linux/fcntl.h>
+#endif

 #endif /* !STRACE_F_OWNER_EX_H */
--- a/fadvise.c
+++ b/fadvise.c
@ -5,7 +5,7 @@
 * Copyright (c) 2009 Andreas Schwab <schwab@redhat.com>
 * Copyright (c) 2009 Kirill A. Shutemov <kirill@shutemov.name>
 * Copyright (c) 2011-2015 Dmitry V. Levin <ldv@altlinux.org>
- * Copyright (c) 2014-2018 The strace developers.
+ * Copyright (c) 2014-2017 The strace developers.
 * All rights reserved.
 *
 * SPDX-License-Identifier: LGPL-2.1-or-later
--- a/fallocate.c
+++ b/fallocate.c
@ -1,10 +1,3 @@
-/*
- * Copyright (c) 2014-2018 The strace developers.
- * All rights reserved.
- *
- * SPDX-License-Identifier: LGPL-2.1-or-later
- */
-
 #include "defs.h"

 #ifdef HAVE_LINUX_FALLOC_H
--- a/fchownat.c
+++ b/fchownat.c
@ -1,10 +1,3 @@
-/*
- * Copyright (c) 2014-2018 The strace developers.
- * All rights reserved.
- *
- * SPDX-License-Identifier: LGPL-2.1-or-later
- */
-
 #include "defs.h"

 SYS_FUNC(fchownat)
--- a/fetch_bpf_fprog.c
+++ b/fetch_bpf_fprog.c
@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2015-2018 Dmitry V. Levin <ldv@altlinux.org>
+ * Copyright (c) 2015-2017 Dmitry V. Levin <ldv@altlinux.org>
 * All rights reserved.
 *
 * SPDX-License-Identifier: LGPL-2.1-or-later
--- a/fetch_struct_flock.c
+++ b/fetch_struct_flock.c
@ -1,6 +1,6 @@
 /*
 * Copyright (c) 2015 Dmitry V. Levin <ldv@altlinux.org>
- * Copyright (c) 2015-2018 The strace developers.
+ * Copyright (c) 2015-2017 The strace developers.
 * All rights reserved.
 *
 * SPDX-License-Identifier: LGPL-2.1-or-later
--- a/fetch_struct_keyctl_kdf_params.c
+++ b/fetch_struct_keyctl_kdf_params.c
@ -1,10 +1,3 @@
-/*
- * Copyright (c) 2016-2018 Eugene Syromyatnikov <evgsyr@gmail.com>
- * All rights reserved.
- *
- * SPDX-License-Identifier: LGPL-2.1-or-later
- */
-
 #include "defs.h"

 #include DEF_MPERS_TYPE(struct_keyctl_kdf_params)
--- a/fetch_struct_mmsghdr.c
+++ b/fetch_struct_mmsghdr.c
@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2016-2018 Dmitry V. Levin <ldv@altlinux.org>
+ * Copyright (c) 2016 Dmitry V. Levin <ldv@altlinux.org>
 * All rights reserved.
 *
 * SPDX-License-Identifier: LGPL-2.1-or-later
--- a/fetch_struct_msghdr.c
+++ b/fetch_struct_msghdr.c
@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2016-2018 Dmitry V. Levin <ldv@altlinux.org>
+ * Copyright (c) 2016 Dmitry V. Levin <ldv@altlinux.org>
 * All rights reserved.
 *
 * SPDX-License-Identifier: LGPL-2.1-or-later
--- a/fetch_struct_stat.c
+++ b/fetch_struct_stat.c
@ -1,6 +1,6 @@
 /*
 * Copyright (c) 2014-2016 Dmitry V. Levin <ldv@altlinux.org>
- * Copyright (c) 2016-2018 The strace developers.
+ * Copyright (c) 2016-2017 The strace developers.
 * All rights reserved.
 *
 * SPDX-License-Identifier: LGPL-2.1-or-later
--- a/fetch_struct_stat64.c
+++ b/fetch_struct_stat64.c
@ -1,6 +1,6 @@
 /*
 * Copyright (c) 2014-2016 Dmitry V. Levin <ldv@altlinux.org>
- * Copyright (c) 2016-2018 The strace developers.
+ * Copyright (c) 2016-2017 The strace developers.
 * All rights reserved.
 *
 * SPDX-License-Identifier: LGPL-2.1-or-later
--- a/fetch_struct_statfs.c
+++ b/fetch_struct_statfs.c
@ -1,6 +1,6 @@
 /*
 * Copyright (c) 2014-2016 Dmitry V. Levin <ldv@altlinux.org>
- * Copyright (c) 2016-2018 The strace developers.
+ * Copyright (c) 2016-2017 The strace developers.
 * All rights reserved.
 *
 * SPDX-License-Identifier: LGPL-2.1-or-later
--- a/fetch_struct_xfs_quotastat.c
+++ b/fetch_struct_xfs_quotastat.c
@ -1,10 +1,3 @@
-/*
- * Copyright (c) 2018 The strace developers.
- * All rights reserved.
- *
- * SPDX-License-Identifier: LGPL-2.1-or-later
- */
-
 #include "defs.h"

 #include DEF_MPERS_TYPE(struct_xfs_dqstats)
--- a/7
+++ b/7
@ -1,9 +1,4 @@
-#!/bin/sh
-#
-# Copyright (c) 2017-2018 The strace developers.
-# All rights reserved.
-#
-# SPDX-License-Identifier: LGPL-2.1-or-later
+#! /bin/sh

 if [ "$1" = "-f" ]; then
 	shift
--- a/file_handle.c
+++ b/file_handle.c
@ -1,6 +1,6 @@
 /*
 * Copyright (c) 2015 Dmitry V. Levin <ldv@altlinux.org>
- * Copyright (c) 2015-2018 The strace developers.
+ * Copyright (c) 2015-2017 The strace developers.
 * All rights reserved.
 *
 * SPDX-License-Identifier: LGPL-2.1-or-later
--- a/filter.h
+++ b/filter.h
@ -7,7 +7,7 @@
 */

 #ifndef STRACE_FILTER_H
-# define STRACE_FILTER_H
+#define STRACE_FILTER_H

 struct number_set;
 typedef int (*string_to_uint_func)(const char *);
--- a/flock.c
+++ b/flock.c
@ -3,7 +3,7 @@
 * 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) 1999-2018 The strace developers.
+ * Copyright (c) 1999-2017 The strace developers.
 * All rights reserved.
 *
 * SPDX-License-Identifier: LGPL-2.1-or-later
--- a/flock.h
+++ b/flock.h
@ -1,30 +1,30 @@
 /*
 * Copyright (c) 2015 Dmitry V. Levin <ldv@altlinux.org>
- * Copyright (c) 2015-2018 The strace developers.
+ * Copyright (c) 2015-2017 The strace developers.
 * All rights reserved.
 *
 * SPDX-License-Identifier: LGPL-2.1-or-later
 */

 #ifndef STRACE_FLOCK_H
-# define STRACE_FLOCK_H
+#define STRACE_FLOCK_H

-# include <linux/fcntl.h>
+#include <linux/fcntl.h>

-# if defined HAVE_STRUCT_FLOCK
+#if defined HAVE_STRUCT_FLOCK
 typedef struct flock struct_kernel_flock;
-# elif defined HAVE_STRUCT___KERNEL_FLOCK
+#elif defined HAVE_STRUCT___KERNEL_FLOCK
 typedef struct __kernel_flock struct_kernel_flock;
-# else
-#  error struct flock definition not found in <linux/fcntl.h>
-# endif
+#else
+# error struct flock definition not found in <linux/fcntl.h>
+#endif

-# if defined HAVE_STRUCT_FLOCK64
+#if defined HAVE_STRUCT_FLOCK64
 typedef struct flock64 struct_kernel_flock64;
-# elif defined HAVE_STRUCT___KERNEL_FLOCK64
+#elif defined HAVE_STRUCT___KERNEL_FLOCK64
 typedef struct __kernel_flock64 struct_kernel_flock64;
-# else
-#  error struct flock64 definition not found in <linux/fcntl.h>
-# endif
+#else
+# error struct flock64 definition not found in <linux/fcntl.h>
+#endif

 #endif /* !STRACE_FLOCK_H */
--- a/fs_x_ioctl.c
+++ b/fs_x_ioctl.c
@ -1,7 +1,7 @@
 /*
 * Copyright (c) 2014 Mike Frysinger <vapier@gentoo.org>
 * Copyright (c) 2015-2016 Dmitry V. Levin <ldv@altlinux.org>
- * Copyright (c) 2016-2018 The strace developers.
+ * Copyright (c) 2016-2017 The strace developers.
 * All rights reserved.
 *
 * SPDX-License-Identifier: LGPL-2.1-or-later
--- a/fstatfs.c
+++ b/fstatfs.c
@ -1,10 +1,3 @@
-/*
- * Copyright (c) 2016-2018 The strace developers.
- * All rights reserved.
- *
- * SPDX-License-Identifier: LGPL-2.1-or-later
- */
-
 #include "defs.h"

 SYS_FUNC(fstatfs)
--- a/fstatfs64.c
+++ b/fstatfs64.c
@ -1,10 +1,3 @@
-/*
- * Copyright (c) 2016-2018 The strace developers.
- * All rights reserved.
- *
- * SPDX-License-Identifier: LGPL-2.1-or-later
- */
-
 #include "defs.h"

 SYS_FUNC(fstatfs64)
--- a/gcc_compat.h
+++ b/gcc_compat.h
@ -7,114 +7,114 @@
 */

 #ifndef STRACE_GCC_COMPAT_H
-# define STRACE_GCC_COMPAT_H
+#define STRACE_GCC_COMPAT_H

-# if defined __GNUC__ && defined __GNUC_MINOR__
-#  define GNUC_PREREQ(maj, min)	\
+#if defined __GNUC__ && defined __GNUC_MINOR__
+# define GNUC_PREREQ(maj, min)	\
 	((__GNUC__ << 16) + __GNUC_MINOR__ >= ((maj) << 16) + (min))
-# else
-#  define GNUC_PREREQ(maj, min)	0
-# endif
+#else
+# define GNUC_PREREQ(maj, min)	0
+#endif

-# if defined __clang__ && defined __clang_major__ && defined __clang_minor__
-#  define CLANG_PREREQ(maj, min)	\
+#if defined __clang__ && defined __clang_major__ && defined __clang_minor__
+# define CLANG_PREREQ(maj, min)	\
 	((__clang_major__ << 16) + __clang_minor__ >= ((maj) << 16) + (min))
-# else
-#  define CLANG_PREREQ(maj, min)	0
-# endif
+#else
+# define CLANG_PREREQ(maj, min)	0
+#endif

-# if !(GNUC_PREREQ(2, 0) || CLANG_PREREQ(1, 0))
-#  define __attribute__(x)	/* empty */
-# endif
+#if !(GNUC_PREREQ(2, 0) || CLANG_PREREQ(1, 0))
+# define __attribute__(x)	/* empty */
+#endif

-# if GNUC_PREREQ(2, 5)
-#  define ATTRIBUTE_NORETURN	__attribute__((__noreturn__))
-# else
-#  define ATTRIBUTE_NORETURN	/* empty */
-# endif
+#if GNUC_PREREQ(2, 5)
+# define ATTRIBUTE_NORETURN	__attribute__((__noreturn__))
+#else
+# define ATTRIBUTE_NORETURN	/* empty */
+#endif

-# if GNUC_PREREQ(2, 7)
-#  define ATTRIBUTE_FORMAT(args)	__attribute__((__format__ args))
-#  define ATTRIBUTE_ALIGNED(arg)	__attribute__((__aligned__(arg)))
-#  define ATTRIBUTE_PACKED	__attribute__((__packed__))
-# else
-#  define ATTRIBUTE_FORMAT(args)	/* empty */
-#  define ATTRIBUTE_ALIGNED(arg)	/* empty */
-#  define ATTRIBUTE_PACKED	/* empty */
-# endif
+#if GNUC_PREREQ(2, 7)
+# define ATTRIBUTE_FORMAT(args)	__attribute__((__format__ args))
+# define ATTRIBUTE_ALIGNED(arg)	__attribute__((__aligned__(arg)))
+# define ATTRIBUTE_PACKED	__attribute__((__packed__))
+#else
+# define ATTRIBUTE_FORMAT(args)	/* empty */
+# define ATTRIBUTE_ALIGNED(arg)	/* empty */
+# define ATTRIBUTE_PACKED	/* empty */
+#endif

-# if GNUC_PREREQ(3, 0)
-#  define SAME_TYPE(x, y)	__builtin_types_compatible_p(typeof(x), typeof(y))
-#  define FAIL_BUILD_ON_ZERO(expr) (sizeof(int[-1 + 2 * !!(expr)]) * 0)
+#if GNUC_PREREQ(3, 0)
+# define SAME_TYPE(x, y)	__builtin_types_compatible_p(typeof(x), typeof(y))
+# define FAIL_BUILD_ON_ZERO(expr) (sizeof(int[-1 + 2 * !!(expr)]) * 0)
 /* &(a)[0] is a pointer and not an array, shouldn't be treated as the same */
-#  define MUST_BE_ARRAY(a) FAIL_BUILD_ON_ZERO(!SAME_TYPE((a), &(a)[0]))
-# else
-#  define SAME_TYPE(x, y)	0
-#  define MUST_BE_ARRAY(a)	0
-# endif
+# define MUST_BE_ARRAY(a) FAIL_BUILD_ON_ZERO(!SAME_TYPE((a), &(a)[0]))
+#else
+# define SAME_TYPE(x, y)	0
+# define MUST_BE_ARRAY(a)	0
+#endif

-# if GNUC_PREREQ(3, 0)
-#  define ATTRIBUTE_MALLOC	__attribute__((__malloc__))
-# else
-#  define ATTRIBUTE_MALLOC	/* empty */
-# endif
+#if GNUC_PREREQ(3, 0)
+# define ATTRIBUTE_MALLOC	__attribute__((__malloc__))
+#else
+# define ATTRIBUTE_MALLOC	/* empty */
+#endif

-# if GNUC_PREREQ(3, 1)
-#  define ATTRIBUTE_NOINLINE	__attribute__((__noinline__))
-# else
-#  define ATTRIBUTE_NOINLINE	/* empty */
-# endif
+#if GNUC_PREREQ(3, 1)
+# define ATTRIBUTE_NOINLINE	__attribute__((__noinline__))
+#else
+# define ATTRIBUTE_NOINLINE	/* empty */
+#endif

-# if GNUC_PREREQ(4, 0)
-#  define ATTRIBUTE_SENTINEL	__attribute__((__sentinel__))
-# else
-#  define ATTRIBUTE_SENTINEL	/* empty */
-# endif
+#if GNUC_PREREQ(4, 0)
+# define ATTRIBUTE_SENTINEL	__attribute__((__sentinel__))
+#else
+# define ATTRIBUTE_SENTINEL	/* empty */
+#endif

-# if GNUC_PREREQ(4, 1)
-#  define ALIGNOF(t_)	__alignof__(t_)
-# else
-#  define ALIGNOF(t_)	(sizeof(struct { char x_; t_ y_; }) - sizeof(t_))
-# endif
+#if GNUC_PREREQ(4, 1)
+# define ALIGNOF(t_)	__alignof__(t_)
+#else
+# define ALIGNOF(t_)	(sizeof(struct { char x_; t_ y_; }) - sizeof(t_))
+#endif

-# if GNUC_PREREQ(4, 3)
-#  define ATTRIBUTE_ALLOC_SIZE(args)	__attribute__((__alloc_size__ args))
-# else
-#  define ATTRIBUTE_ALLOC_SIZE(args)	/* empty */
-# endif
+#if GNUC_PREREQ(4, 3)
+# define ATTRIBUTE_ALLOC_SIZE(args)	__attribute__((__alloc_size__ args))
+#else
+# define ATTRIBUTE_ALLOC_SIZE(args)	/* empty */
+#endif

-# if GNUC_PREREQ(7, 0)
-#  define ATTRIBUTE_FALLTHROUGH	__attribute__((__fallthrough__))
-# else
-#  define ATTRIBUTE_FALLTHROUGH	((void) 0)
-# endif
+#if GNUC_PREREQ(7, 0)
+# define ATTRIBUTE_FALLTHROUGH	__attribute__((__fallthrough__))
+#else
+# define ATTRIBUTE_FALLTHROUGH	((void) 0)
+#endif

-# if CLANG_PREREQ(2, 8)
-#  define DIAG_PUSH_IGNORE_OVERRIDE_INIT					\
+#if CLANG_PREREQ(2, 8)
+# define DIAG_PUSH_IGNORE_OVERRIDE_INIT					\
 	_Pragma("clang diagnostic push");				\
 	_Pragma("clang diagnostic ignored \"-Winitializer-overrides\"");
-#  define DIAG_POP_IGNORE_OVERRIDE_INIT					\
+# define DIAG_POP_IGNORE_OVERRIDE_INIT					\
 	_Pragma("clang diagnostic pop");
-# elif GNUC_PREREQ(4, 2)
-#  define DIAG_PUSH_IGNORE_OVERRIDE_INIT					\
+#elif GNUC_PREREQ(4, 2)
+# define DIAG_PUSH_IGNORE_OVERRIDE_INIT					\
 	_Pragma("GCC diagnostic push");					\
 	_Pragma("GCC diagnostic ignored \"-Woverride-init\"");
-#  define DIAG_POP_IGNORE_OVERRIDE_INIT					\
+# define DIAG_POP_IGNORE_OVERRIDE_INIT					\
 	_Pragma("GCC diagnostic pop");
-# else
-#  define DIAG_PUSH_IGNORE_OVERRIDE_INIT	/* empty */
-#  define DIAG_POP_IGNORE_OVERRIDE_INIT	/* empty */
-# endif
+#else
+# define DIAG_PUSH_IGNORE_OVERRIDE_INIT	/* empty */
+# define DIAG_POP_IGNORE_OVERRIDE_INIT	/* empty */
+#endif

-# if GNUC_PREREQ(6, 0)
-#  define DIAG_PUSH_IGNORE_TAUTOLOGICAL_COMPARE				\
+#if GNUC_PREREQ(6, 0)
+# define DIAG_PUSH_IGNORE_TAUTOLOGICAL_COMPARE				\
 	_Pragma("GCC diagnostic push");					\
 	_Pragma("GCC diagnostic ignored \"-Wtautological-compare\"");
-#  define DIAG_POP_IGNORE_TAUTOLOGICAL_COMPARE				\
+# define DIAG_POP_IGNORE_TAUTOLOGICAL_COMPARE				\
 	_Pragma("GCC diagnostic pop");
-# else
-#  define DIAG_PUSH_IGNORE_TAUTOLOGICAL_COMPARE	/* empty */
-#  define DIAG_POP_IGNORE_TAUTOLOGICAL_COMPARE	/* empty */
-# endif
+#else
+# define DIAG_PUSH_IGNORE_TAUTOLOGICAL_COMPARE	/* empty */
+# define DIAG_POP_IGNORE_TAUTOLOGICAL_COMPARE	/* empty */
+#endif

 #endif /* !STRACE_GCC_COMPAT_H */
--- a/generate_mpers_am.sh
+++ b/generate_mpers_am.sh
@ -1,9 +1,4 @@
 #!/bin/sh -e
-#
-# Copyright (c) 2015-2018 The strace developers.
-# All rights reserved.
-#
-# SPDX-License-Identifier: LGPL-2.1-or-later

 list="$(sed -r -n '/^strace_SOURCES[[:space:]]*=/,/^[[:space:]]*# end of strace_SOURCES/ s/^[[:space:]]*([[:alnum:]][^.]*\.c)[[:space:]]*\\$/\1/p' Makefile.am |
 	xargs -r grep -Elx '#[[:space:]]*include[[:space:]]+MPERS_DEFS' |
--- a/generate_sen.sh
+++ b/generate_sen.sh
@ -1,9 +1,4 @@
 #!/bin/sh -e
-#
-# Copyright (c) 2015-2018 The strace developers.
-# All rights reserved.
-#
-# SPDX-License-Identifier: LGPL-2.1-or-later

 echo 'enum {'
 echo 'SEN_printargs = 0,'
--- a/get_personality.h
+++ b/get_personality.h
@ -6,9 +6,9 @@
 */

 #ifndef STRACE_GET_PERSONALITY_H
-# define STRACE_GET_PERSONALITY_H
+#define STRACE_GET_PERSONALITY_H

-# include "ptrace.h"
+#include "ptrace.h"

 extern int
 get_personality_from_syscall_info(const struct ptrace_syscall_info *);
--- a/get_robust_list.c
+++ b/get_robust_list.c
@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2012-2018 Dmitry V. Levin <ldv@altlinux.org>
+ * Copyright (c) 2012-2015 Dmitry V. Levin <ldv@altlinux.org>
 * All rights reserved.
 *
 * SPDX-License-Identifier: LGPL-2.1-or-later
--- a/getcpu.c
+++ b/getcpu.c
@ -1,10 +1,3 @@
-/*
- * Copyright (c) 2014-2018 The strace developers.
- * All rights reserved.
- *
- * SPDX-License-Identifier: LGPL-2.1-or-later
- */
-
 #include "defs.h"

 SYS_FUNC(getcpu)
--- a/getcwd.c
+++ b/getcwd.c
@ -1,10 +1,3 @@
-/*
- * Copyright (c) 2014-2018 The strace developers.
- * All rights reserved.
- *
- * SPDX-License-Identifier: LGPL-2.1-or-later
- */
-
 #include "defs.h"

 SYS_FUNC(getcwd)
--- a/getpagesize.c
+++ b/getpagesize.c
@ -1,10 +1,3 @@
-/*
- * Copyright (c) 2018 The strace developers.
- * All rights reserved.
- *
- * SPDX-License-Identifier: LGPL-2.1-or-later
- */
-
 #include "defs.h"

 SYS_FUNC(getpagesize)
--- a/getrandom.c
+++ b/getrandom.c
@ -1,10 +1,3 @@
-/*
- * Copyright (c) 2015-2018 Dmitry V. Levin <ldv@altlinux.org>
- * All rights reserved.
- *
- * SPDX-License-Identifier: LGPL-2.1-or-later
- */
-
 #include "defs.h"
 #include "xlat/getrandom_flags.h"

--- a/hdio.c
+++ b/hdio.c
@ -1,7 +1,7 @@
 /*
 * Copyright (c) 2009, 2010 Jeff Mahoney <jeffm@suse.com>
 * Copyright (c) 2011-2016 Dmitry V. Levin <ldv@altlinux.org>
- * Copyright (c) 2016-2018 The strace developers.
+ * Copyright (c) 2016-2017 The strace developers.
 * All rights reserved.
 *
 * SPDX-License-Identifier: LGPL-2.1-or-later
--- a/hostname.c
+++ b/hostname.c
@ -1,10 +1,3 @@
-/*
- * Copyright (c) 2014-2018 The strace developers.
- * All rights reserved.
- *
- * SPDX-License-Identifier: LGPL-2.1-or-later
- */
-
 #include "defs.h"

 #ifdef HAVE_LINUX_UTSNAME_H
--- a/inotify.c
+++ b/inotify.c
@ -1,6 +1,6 @@
 /*
 * Copyright (c) 2006 Bernhard Kaindl <bk@suse.de>
- * Copyright (c) 2006-2018 Dmitry V. Levin <ldv@altlinux.org>
+ * Copyright (c) 2006-2015 Dmitry V. Levin <ldv@altlinux.org>
 * All rights reserved.
 *
 * SPDX-License-Identifier: LGPL-2.1-or-later
--- a/ioctl_iocdef.c
+++ b/ioctl_iocdef.c
@ -1,6 +1,5 @@
 /*
 * Copyright (c) 2017 Alexey Neyman <stilor@att.net>
- * Copyright (c) 2017-2018 The strace developers.
 * All rights reserved.
 *
 * SPDX-License-Identifier: LGPL-2.1-or-later
--- a/ioctlsort.c
+++ b/ioctlsort.c
@ -1,7 +1,7 @@
 /*
 * Copyright (c) 2001 Wichert Akkerman <wichert@cistron.nl>
 * Copyright (c) 2004-2015 Dmitry V. Levin <ldv@altlinux.org>
- * Copyright (c) 1999-2018 The strace developers.
+ * Copyright (c) 1999-2017 The strace developers.
 * All rights reserved.
 *
 * SPDX-License-Identifier: LGPL-2.1-or-later
--- a/ioperm.c
+++ b/ioperm.c
@ -1,10 +1,3 @@
-/*
- * Copyright (c) 2015-2018 Dmitry V. Levin <ldv@altlinux.org>
- * All rights reserved.
- *
- * SPDX-License-Identifier: LGPL-2.1-or-later
- */
-
 #include "defs.h"

 SYS_FUNC(ioperm)
--- a/iopl.c
+++ b/iopl.c
@ -1,10 +1,3 @@
-/*
- * Copyright (c) 2015-2018 Dmitry V. Levin <ldv@altlinux.org>
- * All rights reserved.
- *
- * SPDX-License-Identifier: LGPL-2.1-or-later
- */
-
 #include "defs.h"

 SYS_FUNC(iopl)
--- a/ipc_defs.h
+++ b/ipc_defs.h
@ -7,21 +7,21 @@
 */

 #ifndef STRACE_IPC_DEFS_H
-# define STRACE_IPC_DEFS_H
+#define STRACE_IPC_DEFS_H

-# ifdef HAVE_SYS_IPC_H
-#  include <sys/ipc.h>
-# elif defined HAVE_LINUX_IPC_H
-#  include <linux/ipc.h>
+#ifdef HAVE_SYS_IPC_H
+# include <sys/ipc.h>
+#elif defined HAVE_LINUX_IPC_H
+# include <linux/ipc.h>
 /* While glibc uses __key, the kernel uses key. */
-#  define __key key
-# endif
+# define __key key
+#endif

-# if !defined IPC_64
-#  define IPC_64 0x100
-# endif
+#if !defined IPC_64
+# define IPC_64 0x100
+#endif

-# define PRINTCTL(flagset, arg, dflt)				\
+#define PRINTCTL(flagset, arg, dflt)				\
 	do {							\
 		if ((arg) & IPC_64) {				\
 			print_xlat(IPC_64);			\
--- a/ipc_msgctl.c
+++ b/ipc_msgctl.c
@ -5,7 +5,7 @@
 * Copyright (c) 1996-1999 Wichert Akkerman <wichert@cistron.nl>
 * Copyright (c) 2003-2006 Roland McGrath <roland@redhat.com>
 * Copyright (c) 2006-2015 Dmitry V. Levin <ldv@altlinux.org>
- * Copyright (c) 2015-2018 The strace developers.
+ * Copyright (c) 2015-2017 The strace developers.
 * All rights reserved.
 *
 * SPDX-License-Identifier: LGPL-2.1-or-later
--- a/ipc_shmctl.c
+++ b/ipc_shmctl.c
@ -5,7 +5,7 @@
 * Copyright (c) 1996-1999 Wichert Akkerman <wichert@cistron.nl>
 * Copyright (c) 2003-2006 Roland McGrath <roland@redhat.com>
 * Copyright (c) 2006-2015 Dmitry V. Levin <ldv@altlinux.org>
- * Copyright (c) 2015-2018 The strace developers.
+ * Copyright (c) 2015-2017 The strace developers.
 * All rights reserved.
 *
 * SPDX-License-Identifier: LGPL-2.1-or-later
--- a/kcmp.c
+++ b/kcmp.c
@ -1,6 +1,6 @@
 /*
 * Copyright (c) 2015 Dmitry V. Levin <ldv@altlinux.org>
- * Copyright (c) 2015-2018 The strace developers.
+ * Copyright (c) 2015-2017 The strace developers.
 * All rights reserved.
 *
 * SPDX-License-Identifier: LGPL-2.1-or-later
--- a/kernel_types.h
+++ b/kernel_types.h
@ -1,17 +1,17 @@
 /*
 * Copyright (c) 2015 Dmitry V. Levin <ldv@altlinux.org>
- * Copyright (c) 2015-2018 The strace developers.
+ * Copyright (c) 2015-2017 The strace developers.
 * All rights reserved.
 *
 * SPDX-License-Identifier: LGPL-2.1-or-later
 */

 #ifndef STRACE_KERNEL_TYPES_H
-# define STRACE_KERNEL_TYPES_H
+#define STRACE_KERNEL_TYPES_H

 # if defined HAVE___KERNEL_LONG_T && defined HAVE___KERNEL_ULONG_T

-#  include <asm/posix_types.h>
+# include <asm/posix_types.h>

 typedef __kernel_long_t kernel_long_t;
 typedef __kernel_ulong_t kernel_ulong_t;
@ -35,15 +35,15 @@ typedef struct {
 	char		d_name[1];
 } kernel_dirent;

-# if SIZEOF_KERNEL_LONG_T > SIZEOF_LONG
-#  define PRI_kl "ll"
-# else
-#  define PRI_kl "l"
-# endif
+#if SIZEOF_KERNEL_LONG_T > SIZEOF_LONG
+# define PRI_kl "ll"
+#else
+# define PRI_kl "l"
+#endif

-# define PRI_kld PRI_kl"d"
-# define PRI_klu PRI_kl"u"
-# define PRI_klx PRI_kl"x"
+#define PRI_kld PRI_kl"d"
+#define PRI_klu PRI_kl"u"
+#define PRI_klx PRI_kl"x"

 /*
 * The kernel used to define 64-bit types on 64-bit systems on a per-arch
@ -54,17 +54,17 @@ typedef struct {
 * every printing of __u64 or __s64 to stdint types.
 * The exception is Android, where for MIPS64 unsigned long long is used.
 */
-# if SIZEOF_LONG == 4
-#  define PRI__64 "ll"
-# elif defined ALPHA || defined IA64 || defined __powerpc64__ \
+#if SIZEOF_LONG == 4
+# define PRI__64 "ll"
+#elif defined ALPHA || defined IA64 || defined __powerpc64__ \
      || (defined MIPS && !defined __ANDROID__)
-#  define PRI__64 "l"
-# else
-#  define PRI__64 "ll"
-# endif
+# define PRI__64 "l"
+#else
+# define PRI__64 "ll"
+#endif

-# define PRI__d64 PRI__64"d"
-# define PRI__u64 PRI__64"u"
-# define PRI__x64 PRI__64"x"
+#define PRI__d64 PRI__64"d"
+#define PRI__u64 PRI__64"u"
+#define PRI__x64 PRI__64"x"

 #endif /* !STRACE_KERNEL_TYPES_H */
--- a/keyctl_kdf_params.h
+++ b/keyctl_kdf_params.h
@ -1,21 +1,14 @@
-/*
- * Copyright (c) 2017-2018 Eugene Syromyatnikov <evgsyr@gmail.com>
- * All rights reserved.
- *
- * SPDX-License-Identifier: LGPL-2.1-or-later
- */
-
 #ifndef STRACE_KEYCTL_KDF_PARAMS_H
-# define STRACE_KEYCTL_KDF_PARAMS_H
+#define STRACE_KEYCTL_KDF_PARAMS_H

-# include <stdint.h>
-# include "kernel_types.h"
+#include <stdint.h>
+#include "kernel_types.h"

 /* from include/linux/crypto.h */
-# define CRYPTO_MAX_ALG_NAME		128
+#define CRYPTO_MAX_ALG_NAME		128

 /* from security/keys/internal.h */
-# define KEYCTL_KDF_MAX_OI_LEN		64      /* max length of otherinfo */
+#define KEYCTL_KDF_MAX_OI_LEN		64      /* max length of otherinfo */

 struct keyctl_kdf_params {
 	char *hashname;
--- a/kill_save_errno.h
+++ b/kill_save_errno.h
@ -6,11 +6,11 @@
 */

 #ifndef STRACE_KILL_SAVE_ERRNO_H
-# define STRACE_KILL_SAVE_ERRNO_H
+#define STRACE_KILL_SAVE_ERRNO_H

-# include <sys/types.h>
-# include <signal.h>
-# include <errno.h>
+#include <sys/types.h>
+#include <signal.h>
+#include <errno.h>

 static inline int
 kill_save_errno(pid_t pid, int sig)
--- a/kvm.c
+++ b/kvm.c
@ -107,7 +107,7 @@ map_len(struct mmap_cache_entry_t *map_info)
 		: 0;
 }

-# define VCPU_DENTRY_PREFIX "anon_inode:kvm-vcpu:"
+#define VCPU_DENTRY_PREFIX "anon_inode:kvm-vcpu:"

 static struct vcpu_info*
 vcpu_get_info(struct tcb *const tcp, int fd)
--- a/largefile_wrappers.h
+++ b/largefile_wrappers.h
@ -9,30 +9,30 @@
 */

 #ifndef STRACE_LARGEFILE_WRAPPERS_H
-# define STRACE_LARGEFILE_WRAPPERS_H
+#define STRACE_LARGEFILE_WRAPPERS_H

-# include "defs.h"
+#include "defs.h"

-# ifdef _LARGEFILE64_SOURCE
-#  ifdef HAVE_FOPEN64
-#   define fopen_stream fopen64
-#  else
-#   define fopen_stream fopen
-#  endif
-#  define struct_stat struct stat64
-#  define stat_file stat64
-#  define struct_dirent struct dirent64
-#  define read_dir readdir64
-#  define struct_rlimit struct rlimit64
-#  define set_rlimit setrlimit64
+#ifdef _LARGEFILE64_SOURCE
+# ifdef HAVE_FOPEN64
+#  define fopen_stream fopen64
 # else
 #  define fopen_stream fopen
-#  define struct_stat struct stat
-#  define stat_file stat
-#  define struct_dirent struct dirent
-#  define read_dir readdir
-#  define struct_rlimit struct rlimit
-#  define set_rlimit setrlimit
 # endif
+# define struct_stat struct stat64
+# define stat_file stat64
+# define struct_dirent struct dirent64
+# define read_dir readdir64
+# define struct_rlimit struct rlimit64
+# define set_rlimit setrlimit64
+#else
+# define fopen_stream fopen
+# define struct_stat struct stat
+# define stat_file stat
+# define struct_dirent struct dirent
+# define read_dir readdir
+# define struct_rlimit struct rlimit
+# define set_rlimit setrlimit
+#endif

 #endif /* STRACE_LARGEFILE_WRAPPERS_H */
--- a/link.c
+++ b/link.c
@ -5,7 +5,7 @@
 * Copyright (c) 1996-1999 Wichert Akkerman <wichert@cistron.nl>
 * Copyright (c) 2006 Ulrich Drepper <drepper@redhat.com>
 * Copyright (c) 2006 Bernhard Kaindl <bk@suse.de>
- * Copyright (c) 2006-2018 Dmitry V. Levin <ldv@altlinux.org>
+ * Copyright (c) 2006-2015 Dmitry V. Levin <ldv@altlinux.org>
 * All rights reserved.
 *
 * SPDX-License-Identifier: LGPL-2.1-or-later
--- a/linux/32/ioctls_inc.h
+++ b/linux/32/ioctls_inc.h
@ -1,10 +1,3 @@
-/*
- * Copyright (c) 2015-2018 The strace developers.
- * All rights reserved.
- *
- * SPDX-License-Identifier: LGPL-2.1-or-later
- */
-
 #if defined M68K
 # include "32/ioctls_inc_align16.h"
 #elif defined X86_64 || defined X32 \
--- a/linux/32/ioctls_inc_align16.h
+++ b/linux/32/ioctls_inc_align16.h
@ -34,7 +34,6 @@
 { "asm-generic/ioctls.h", "TIOCGETD", 0, 0x5424, 0 },
 { "asm-generic/ioctls.h", "TIOCGEXCL", _IOC_READ, 0x5440, 0x04 },
 { "asm-generic/ioctls.h", "TIOCGICOUNT", 0, 0x545D, 0 },
-{ "asm-generic/ioctls.h", "TIOCGISO7816", _IOC_READ, 0x5442, 0x28 },
 { "asm-generic/ioctls.h", "TIOCGLCKTRMIOS", 0, 0x5456, 0 },
 { "asm-generic/ioctls.h", "TIOCGPGRP", 0, 0x540F, 0 },
 { "asm-generic/ioctls.h", "TIOCGPKT", _IOC_READ, 0x5438, 0x04 },
@ -67,7 +66,6 @@
 { "asm-generic/ioctls.h", "TIOCSERSWILD", 0, 0x5455, 0 },
 { "asm-generic/ioctls.h", "TIOCSETD", 0, 0x5423, 0 },
 { "asm-generic/ioctls.h", "TIOCSIG", _IOC_WRITE, 0x5436, 0x04 },
-{ "asm-generic/ioctls.h", "TIOCSISO7816", _IOC_READ|_IOC_WRITE, 0x5443, 0x28 },
 { "asm-generic/ioctls.h", "TIOCSLCKTRMIOS", 0, 0x5457, 0 },
 { "asm-generic/ioctls.h", "TIOCSPGRP", 0, 0x5410, 0 },
 { "asm-generic/ioctls.h", "TIOCSPTLCK", _IOC_WRITE, 0x5431, 0x04 },
@ -499,7 +497,6 @@
 { "linux/android/binder.h", "BC_TRANSACTION", _IOC_WRITE, 0x6300, 0x40 },
 { "linux/android/binder.h", "BC_TRANSACTION_SG", _IOC_WRITE, 0x6311, 0x48 },
 { "linux/android/binder.h", "BINDER_GET_NODE_DEBUG_INFO", _IOC_READ|_IOC_WRITE, 0x620b, 0x18 },
-{ "linux/android/binder.h", "BINDER_GET_NODE_INFO_FOR_REF", _IOC_READ|_IOC_WRITE, 0x620c, 0x18 },
 { "linux/android/binder.h", "BINDER_SET_CONTEXT_MGR", _IOC_WRITE, 0x6207, 0x04 },
 { "linux/android/binder.h", "BINDER_SET_IDLE_PRIORITY", _IOC_WRITE, 0x6206, 0x04 },
 { "linux/android/binder.h", "BINDER_SET_IDLE_TIMEOUT", _IOC_WRITE, 0x6203, 0x08 },
@ -607,8 +604,6 @@
 { "linux/auto_fs.h", "AUTOFS_IOC_SETTIMEOUT", _IOC_READ|_IOC_WRITE, 0x9364, 0x04 },
 { "linux/auto_fs.h", "AUTOFS_IOC_SETTIMEOUT32", _IOC_READ|_IOC_WRITE, 0x9364, 0x04 },
 { "linux/blkpg.h", "BLKPG", _IOC_NONE, 0x1269, 0x00 },
-{ "linux/blkzoned.h", "BLKGETNRZONES", _IOC_READ, 0x1285, 0x04 },
-{ "linux/blkzoned.h", "BLKGETZONESZ", _IOC_READ, 0x1284, 0x04 },
 { "linux/blkzoned.h", "BLKREPORTZONE", _IOC_READ|_IOC_WRITE, 0x1282, 0x10 },
 { "linux/blkzoned.h", "BLKRESETZONE", _IOC_WRITE, 0x1283, 0x10 },
 { "linux/bt-bmc.h", "BT_BMC_IOCTL_SMS_ATN", _IOC_NONE, 0xb100, 0x00 },
@ -1336,7 +1331,6 @@
 { "linux/kfd_ioctl.h", "AMDKFD_IOC_GET_CLOCK_COUNTERS", _IOC_READ|_IOC_WRITE, 0x4b05, 0x28 },
 { "linux/kfd_ioctl.h", "AMDKFD_IOC_GET_PROCESS_APERTURES", _IOC_READ, 0x4b06, 0x190 },
 { "linux/kfd_ioctl.h", "AMDKFD_IOC_GET_PROCESS_APERTURES_NEW", _IOC_READ|_IOC_WRITE, 0x4b14, 0x10 },
-{ "linux/kfd_ioctl.h", "AMDKFD_IOC_GET_QUEUE_WAVE_STATE", _IOC_READ|_IOC_WRITE, 0x4b1b, 0x18 },
 { "linux/kfd_ioctl.h", "AMDKFD_IOC_GET_TILE_CONFIG", _IOC_READ|_IOC_WRITE, 0x4b12, 0x28 },
 { "linux/kfd_ioctl.h", "AMDKFD_IOC_GET_VERSION", _IOC_READ, 0x4b01, 0x08 },
 { "linux/kfd_ioctl.h", "AMDKFD_IOC_MAP_MEMORY_TO_GPU", _IOC_READ|_IOC_WRITE, 0x4b18, 0x18 },
@ -1410,10 +1404,7 @@
 { "linux/media.h", "MEDIA_IOC_ENUM_ENTITIES", _IOC_READ|_IOC_WRITE, 0x7c01, 0x100 },
 { "linux/media.h", "MEDIA_IOC_ENUM_LINKS", _IOC_READ|_IOC_WRITE, 0x7c02, 0x1c },
 { "linux/media.h", "MEDIA_IOC_G_TOPOLOGY", _IOC_READ|_IOC_WRITE, 0x7c04, 0x48 },
-{ "linux/media.h", "MEDIA_IOC_REQUEST_ALLOC", _IOC_READ, 0x7c05, 0x04 },
 { "linux/media.h", "MEDIA_IOC_SETUP_LINK", _IOC_READ|_IOC_WRITE, 0x7c03, 0x30 },
-{ "linux/media.h", "MEDIA_REQUEST_IOC_QUEUE", _IOC_NONE, 0x7c80, 0x00 },
-{ "linux/media.h", "MEDIA_REQUEST_IOC_REINIT", _IOC_NONE, 0x7c81, 0x00 },
 { "linux/mei.h", "IOCTL_MEI_CONNECT_CLIENT", _IOC_READ|_IOC_WRITE, 0x4801, 0x10 },
 { "linux/mei.h", "IOCTL_MEI_NOTIFY_GET", _IOC_READ, 0x4803, 0x04 },
 { "linux/mei.h", "IOCTL_MEI_NOTIFY_SET", _IOC_WRITE, 0x4802, 0x04 },
@ -2011,8 +2002,6 @@
 { "linux/udf_fs_i.h", "UDF_GETEASIZE", _IOC_READ, 0x6c40, 0x04 },
 { "linux/udf_fs_i.h", "UDF_GETVOLIDENT", _IOC_READ, 0x6c42, 0x04 },
 { "linux/udf_fs_i.h", "UDF_RELOCATE_BLOCKS", _IOC_READ|_IOC_WRITE, 0x6c43, 0x04 },
-{ "linux/udmabuf.h", "UDMABUF_CREATE", _IOC_WRITE, 0x7542, 0x18 },
-{ "linux/udmabuf.h", "UDMABUF_CREATE_LIST", _IOC_WRITE, 0x7543, 0x08 },
 { "linux/uinput.h", "UI_ABS_SETUP", _IOC_WRITE, 0x5504, 0x1a },
 { "linux/uinput.h", "UI_BEGIN_FF_ERASE", _IOC_READ|_IOC_WRITE, 0x55ca, 0x0c },
 { "linux/uinput.h", "UI_BEGIN_FF_UPLOAD", _IOC_READ|_IOC_WRITE, 0x55c8, 0x58 },
@ -2055,26 +2044,16 @@
 { "linux/usb/tmc.h", "USBTMC488_IOCTL_READ_STB", _IOC_READ, 0x5b12, 0x01 },
 { "linux/usb/tmc.h", "USBTMC488_IOCTL_REN_CONTROL", _IOC_WRITE, 0x5b13, 0x01 },
 { "linux/usb/tmc.h", "USBTMC488_IOCTL_TRIGGER", _IOC_NONE, 0x5b16, 0x00 },
-{ "linux/usb/tmc.h", "USBTMC488_IOCTL_WAIT_SRQ", _IOC_WRITE, 0x5b17, 0x04 },
 { "linux/usb/tmc.h", "USBTMC_IOCTL_ABORT_BULK_IN", _IOC_NONE, 0x5b04, 0x00 },
 { "linux/usb/tmc.h", "USBTMC_IOCTL_ABORT_BULK_OUT", _IOC_NONE, 0x5b03, 0x00 },
-{ "linux/usb/tmc.h", "USBTMC_IOCTL_API_VERSION", _IOC_READ, 0x5b10, 0x04 },
-{ "linux/usb/tmc.h", "USBTMC_IOCTL_AUTO_ABORT", _IOC_WRITE, 0x5b19, 0x01 },
-{ "linux/usb/tmc.h", "USBTMC_IOCTL_CANCEL_IO", _IOC_NONE, 0x5b23, 0x00 },
-{ "linux/usb/tmc.h", "USBTMC_IOCTL_CLEANUP_IO", _IOC_NONE, 0x5b24, 0x00 },
 { "linux/usb/tmc.h", "USBTMC_IOCTL_CLEAR", _IOC_NONE, 0x5b02, 0x00 },
 { "linux/usb/tmc.h", "USBTMC_IOCTL_CLEAR_IN_HALT", _IOC_NONE, 0x5b07, 0x00 },
 { "linux/usb/tmc.h", "USBTMC_IOCTL_CLEAR_OUT_HALT", _IOC_NONE, 0x5b06, 0x00 },
 { "linux/usb/tmc.h", "USBTMC_IOCTL_CONFIG_TERMCHAR", _IOC_WRITE, 0x5b0c, 0x02 },
-{ "linux/usb/tmc.h", "USBTMC_IOCTL_CTRL_REQUEST", _IOC_READ|_IOC_WRITE, 0x5b08, 0x0c },
 { "linux/usb/tmc.h", "USBTMC_IOCTL_EOM_ENABLE", _IOC_WRITE, 0x5b0b, 0x01 },
 { "linux/usb/tmc.h", "USBTMC_IOCTL_GET_TIMEOUT", _IOC_READ, 0x5b09, 0x04 },
 { "linux/usb/tmc.h", "USBTMC_IOCTL_INDICATOR_PULSE", _IOC_NONE, 0x5b01, 0x00 },
-{ "linux/usb/tmc.h", "USBTMC_IOCTL_MSG_IN_ATTR", _IOC_READ, 0x5b18, 0x01 },
-{ "linux/usb/tmc.h", "USBTMC_IOCTL_READ", _IOC_READ|_IOC_WRITE, 0x5b0e, 0x10 },
 { "linux/usb/tmc.h", "USBTMC_IOCTL_SET_TIMEOUT", _IOC_WRITE, 0x5b0a, 0x04 },
-{ "linux/usb/tmc.h", "USBTMC_IOCTL_WRITE", _IOC_READ|_IOC_WRITE, 0x5b0d, 0x10 },
-{ "linux/usb/tmc.h", "USBTMC_IOCTL_WRITE_RESULT", _IOC_READ|_IOC_WRITE, 0x5b0f, 0x04 },
 { "linux/usbdevice_fs.h", "USBDEVFS_ALLOC_STREAMS", _IOC_READ, 0x551c, 0x08 },
 { "linux/usbdevice_fs.h", "USBDEVFS_BULK", _IOC_READ|_IOC_WRITE, 0x5502, 0x10 },
 { "linux/usbdevice_fs.h", "USBDEVFS_BULK32", _IOC_READ|_IOC_WRITE, 0x5502, 0x10 },
--- a/linux/32/ioctls_inc_align32.h
+++ b/linux/32/ioctls_inc_align32.h
@ -34,7 +34,6 @@
 { "asm-generic/ioctls.h", "TIOCGETD", 0, 0x5424, 0 },
 { "asm-generic/ioctls.h", "TIOCGEXCL", _IOC_READ, 0x5440, 0x04 },
 { "asm-generic/ioctls.h", "TIOCGICOUNT", 0, 0x545D, 0 },
-{ "asm-generic/ioctls.h", "TIOCGISO7816", _IOC_READ, 0x5442, 0x28 },
 { "asm-generic/ioctls.h", "TIOCGLCKTRMIOS", 0, 0x5456, 0 },
 { "asm-generic/ioctls.h", "TIOCGPGRP", 0, 0x540F, 0 },
 { "asm-generic/ioctls.h", "TIOCGPKT", _IOC_READ, 0x5438, 0x04 },
@ -67,7 +66,6 @@
 { "asm-generic/ioctls.h", "TIOCSERSWILD", 0, 0x5455, 0 },
 { "asm-generic/ioctls.h", "TIOCSETD", 0, 0x5423, 0 },
 { "asm-generic/ioctls.h", "TIOCSIG", _IOC_WRITE, 0x5436, 0x04 },
-{ "asm-generic/ioctls.h", "TIOCSISO7816", _IOC_READ|_IOC_WRITE, 0x5443, 0x28 },
 { "asm-generic/ioctls.h", "TIOCSLCKTRMIOS", 0, 0x5457, 0 },
 { "asm-generic/ioctls.h", "TIOCSPGRP", 0, 0x5410, 0 },
 { "asm-generic/ioctls.h", "TIOCSPTLCK", _IOC_WRITE, 0x5431, 0x04 },
@ -499,7 +497,6 @@
 { "linux/android/binder.h", "BC_TRANSACTION", _IOC_WRITE, 0x6300, 0x40 },
 { "linux/android/binder.h", "BC_TRANSACTION_SG", _IOC_WRITE, 0x6311, 0x48 },
 { "linux/android/binder.h", "BINDER_GET_NODE_DEBUG_INFO", _IOC_READ|_IOC_WRITE, 0x620b, 0x18 },
-{ "linux/android/binder.h", "BINDER_GET_NODE_INFO_FOR_REF", _IOC_READ|_IOC_WRITE, 0x620c, 0x18 },
 { "linux/android/binder.h", "BINDER_SET_CONTEXT_MGR", _IOC_WRITE, 0x6207, 0x04 },
 { "linux/android/binder.h", "BINDER_SET_IDLE_PRIORITY", _IOC_WRITE, 0x6206, 0x04 },
 { "linux/android/binder.h", "BINDER_SET_IDLE_TIMEOUT", _IOC_WRITE, 0x6203, 0x08 },
@ -607,8 +604,6 @@
 { "linux/auto_fs.h", "AUTOFS_IOC_SETTIMEOUT", _IOC_READ|_IOC_WRITE, 0x9364, 0x04 },
 { "linux/auto_fs.h", "AUTOFS_IOC_SETTIMEOUT32", _IOC_READ|_IOC_WRITE, 0x9364, 0x04 },
 { "linux/blkpg.h", "BLKPG", _IOC_NONE, 0x1269, 0x00 },
-{ "linux/blkzoned.h", "BLKGETNRZONES", _IOC_READ, 0x1285, 0x04 },
-{ "linux/blkzoned.h", "BLKGETZONESZ", _IOC_READ, 0x1284, 0x04 },
 { "linux/blkzoned.h", "BLKREPORTZONE", _IOC_READ|_IOC_WRITE, 0x1282, 0x10 },
 { "linux/blkzoned.h", "BLKRESETZONE", _IOC_WRITE, 0x1283, 0x10 },
 { "linux/bt-bmc.h", "BT_BMC_IOCTL_SMS_ATN", _IOC_NONE, 0xb100, 0x00 },
@ -1336,7 +1331,6 @@
 { "linux/kfd_ioctl.h", "AMDKFD_IOC_GET_CLOCK_COUNTERS", _IOC_READ|_IOC_WRITE, 0x4b05, 0x28 },
 { "linux/kfd_ioctl.h", "AMDKFD_IOC_GET_PROCESS_APERTURES", _IOC_READ, 0x4b06, 0x190 },
 { "linux/kfd_ioctl.h", "AMDKFD_IOC_GET_PROCESS_APERTURES_NEW", _IOC_READ|_IOC_WRITE, 0x4b14, 0x10 },
-{ "linux/kfd_ioctl.h", "AMDKFD_IOC_GET_QUEUE_WAVE_STATE", _IOC_READ|_IOC_WRITE, 0x4b1b, 0x18 },
 { "linux/kfd_ioctl.h", "AMDKFD_IOC_GET_TILE_CONFIG", _IOC_READ|_IOC_WRITE, 0x4b12, 0x28 },
 { "linux/kfd_ioctl.h", "AMDKFD_IOC_GET_VERSION", _IOC_READ, 0x4b01, 0x08 },
 { "linux/kfd_ioctl.h", "AMDKFD_IOC_MAP_MEMORY_TO_GPU", _IOC_READ|_IOC_WRITE, 0x4b18, 0x18 },
@ -1410,10 +1404,7 @@
 { "linux/media.h", "MEDIA_IOC_ENUM_ENTITIES", _IOC_READ|_IOC_WRITE, 0x7c01, 0x100 },
 { "linux/media.h", "MEDIA_IOC_ENUM_LINKS", _IOC_READ|_IOC_WRITE, 0x7c02, 0x1c },
 { "linux/media.h", "MEDIA_IOC_G_TOPOLOGY", _IOC_READ|_IOC_WRITE, 0x7c04, 0x48 },
-{ "linux/media.h", "MEDIA_IOC_REQUEST_ALLOC", _IOC_READ, 0x7c05, 0x04 },
 { "linux/media.h", "MEDIA_IOC_SETUP_LINK", _IOC_READ|_IOC_WRITE, 0x7c03, 0x34 },
-{ "linux/media.h", "MEDIA_REQUEST_IOC_QUEUE", _IOC_NONE, 0x7c80, 0x00 },
-{ "linux/media.h", "MEDIA_REQUEST_IOC_REINIT", _IOC_NONE, 0x7c81, 0x00 },
 { "linux/mei.h", "IOCTL_MEI_CONNECT_CLIENT", _IOC_READ|_IOC_WRITE, 0x4801, 0x10 },
 { "linux/mei.h", "IOCTL_MEI_NOTIFY_GET", _IOC_READ, 0x4803, 0x04 },
 { "linux/mei.h", "IOCTL_MEI_NOTIFY_SET", _IOC_WRITE, 0x4802, 0x04 },
@ -2011,8 +2002,6 @@
 { "linux/udf_fs_i.h", "UDF_GETEASIZE", _IOC_READ, 0x6c40, 0x04 },
 { "linux/udf_fs_i.h", "UDF_GETVOLIDENT", _IOC_READ, 0x6c42, 0x04 },
 { "linux/udf_fs_i.h", "UDF_RELOCATE_BLOCKS", _IOC_READ|_IOC_WRITE, 0x6c43, 0x04 },
-{ "linux/udmabuf.h", "UDMABUF_CREATE", _IOC_WRITE, 0x7542, 0x18 },
-{ "linux/udmabuf.h", "UDMABUF_CREATE_LIST", _IOC_WRITE, 0x7543, 0x08 },
 { "linux/uinput.h", "UI_ABS_SETUP", _IOC_WRITE, 0x5504, 0x1c },
 { "linux/uinput.h", "UI_BEGIN_FF_ERASE", _IOC_READ|_IOC_WRITE, 0x55ca, 0x0c },
 { "linux/uinput.h", "UI_BEGIN_FF_UPLOAD", _IOC_READ|_IOC_WRITE, 0x55c8, 0x60 },
@ -2055,26 +2044,16 @@
 { "linux/usb/tmc.h", "USBTMC488_IOCTL_READ_STB", _IOC_READ, 0x5b12, 0x01 },
 { "linux/usb/tmc.h", "USBTMC488_IOCTL_REN_CONTROL", _IOC_WRITE, 0x5b13, 0x01 },
 { "linux/usb/tmc.h", "USBTMC488_IOCTL_TRIGGER", _IOC_NONE, 0x5b16, 0x00 },
-{ "linux/usb/tmc.h", "USBTMC488_IOCTL_WAIT_SRQ", _IOC_WRITE, 0x5b17, 0x04 },
 { "linux/usb/tmc.h", "USBTMC_IOCTL_ABORT_BULK_IN", _IOC_NONE, 0x5b04, 0x00 },
 { "linux/usb/tmc.h", "USBTMC_IOCTL_ABORT_BULK_OUT", _IOC_NONE, 0x5b03, 0x00 },
-{ "linux/usb/tmc.h", "USBTMC_IOCTL_API_VERSION", _IOC_READ, 0x5b10, 0x04 },
-{ "linux/usb/tmc.h", "USBTMC_IOCTL_AUTO_ABORT", _IOC_WRITE, 0x5b19, 0x01 },
-{ "linux/usb/tmc.h", "USBTMC_IOCTL_CANCEL_IO", _IOC_NONE, 0x5b23, 0x00 },
-{ "linux/usb/tmc.h", "USBTMC_IOCTL_CLEANUP_IO", _IOC_NONE, 0x5b24, 0x00 },
 { "linux/usb/tmc.h", "USBTMC_IOCTL_CLEAR", _IOC_NONE, 0x5b02, 0x00 },
 { "linux/usb/tmc.h", "USBTMC_IOCTL_CLEAR_IN_HALT", _IOC_NONE, 0x5b07, 0x00 },
 { "linux/usb/tmc.h", "USBTMC_IOCTL_CLEAR_OUT_HALT", _IOC_NONE, 0x5b06, 0x00 },
 { "linux/usb/tmc.h", "USBTMC_IOCTL_CONFIG_TERMCHAR", _IOC_WRITE, 0x5b0c, 0x02 },
-{ "linux/usb/tmc.h", "USBTMC_IOCTL_CTRL_REQUEST", _IOC_READ|_IOC_WRITE, 0x5b08, 0x0c },
 { "linux/usb/tmc.h", "USBTMC_IOCTL_EOM_ENABLE", _IOC_WRITE, 0x5b0b, 0x01 },
 { "linux/usb/tmc.h", "USBTMC_IOCTL_GET_TIMEOUT", _IOC_READ, 0x5b09, 0x04 },
 { "linux/usb/tmc.h", "USBTMC_IOCTL_INDICATOR_PULSE", _IOC_NONE, 0x5b01, 0x00 },
-{ "linux/usb/tmc.h", "USBTMC_IOCTL_MSG_IN_ATTR", _IOC_READ, 0x5b18, 0x01 },
-{ "linux/usb/tmc.h", "USBTMC_IOCTL_READ", _IOC_READ|_IOC_WRITE, 0x5b0e, 0x10 },
 { "linux/usb/tmc.h", "USBTMC_IOCTL_SET_TIMEOUT", _IOC_WRITE, 0x5b0a, 0x04 },
-{ "linux/usb/tmc.h", "USBTMC_IOCTL_WRITE", _IOC_READ|_IOC_WRITE, 0x5b0d, 0x10 },
-{ "linux/usb/tmc.h", "USBTMC_IOCTL_WRITE_RESULT", _IOC_READ|_IOC_WRITE, 0x5b0f, 0x04 },
 { "linux/usbdevice_fs.h", "USBDEVFS_ALLOC_STREAMS", _IOC_READ, 0x551c, 0x08 },
 { "linux/usbdevice_fs.h", "USBDEVFS_BULK", _IOC_READ|_IOC_WRITE, 0x5502, 0x10 },
 { "linux/usbdevice_fs.h", "USBDEVFS_BULK32", _IOC_READ|_IOC_WRITE, 0x5502, 0x10 },
--- a/linux/32/ioctls_inc_align64.h
+++ b/linux/32/ioctls_inc_align64.h
@ -34,7 +34,6 @@
 { "asm-generic/ioctls.h", "TIOCGETD", 0, 0x5424, 0 },
 { "asm-generic/ioctls.h", "TIOCGEXCL", _IOC_READ, 0x5440, 0x04 },
 { "asm-generic/ioctls.h", "TIOCGICOUNT", 0, 0x545D, 0 },
-{ "asm-generic/ioctls.h", "TIOCGISO7816", _IOC_READ, 0x5442, 0x28 },
 { "asm-generic/ioctls.h", "TIOCGLCKTRMIOS", 0, 0x5456, 0 },
 { "asm-generic/ioctls.h", "TIOCGPGRP", 0, 0x540F, 0 },
 { "asm-generic/ioctls.h", "TIOCGPKT", _IOC_READ, 0x5438, 0x04 },
@ -67,7 +66,6 @@
 { "asm-generic/ioctls.h", "TIOCSERSWILD", 0, 0x5455, 0 },
 { "asm-generic/ioctls.h", "TIOCSETD", 0, 0x5423, 0 },
 { "asm-generic/ioctls.h", "TIOCSIG", _IOC_WRITE, 0x5436, 0x04 },
-{ "asm-generic/ioctls.h", "TIOCSISO7816", _IOC_READ|_IOC_WRITE, 0x5443, 0x28 },
 { "asm-generic/ioctls.h", "TIOCSLCKTRMIOS", 0, 0x5457, 0 },
 { "asm-generic/ioctls.h", "TIOCSPGRP", 0, 0x5410, 0 },
 { "asm-generic/ioctls.h", "TIOCSPTLCK", _IOC_WRITE, 0x5431, 0x04 },
@ -499,7 +497,6 @@
 { "linux/android/binder.h", "BC_TRANSACTION", _IOC_WRITE, 0x6300, 0x40 },
 { "linux/android/binder.h", "BC_TRANSACTION_SG", _IOC_WRITE, 0x6311, 0x48 },
 { "linux/android/binder.h", "BINDER_GET_NODE_DEBUG_INFO", _IOC_READ|_IOC_WRITE, 0x620b, 0x18 },
-{ "linux/android/binder.h", "BINDER_GET_NODE_INFO_FOR_REF", _IOC_READ|_IOC_WRITE, 0x620c, 0x18 },
 { "linux/android/binder.h", "BINDER_SET_CONTEXT_MGR", _IOC_WRITE, 0x6207, 0x04 },
 { "linux/android/binder.h", "BINDER_SET_IDLE_PRIORITY", _IOC_WRITE, 0x6206, 0x04 },
 { "linux/android/binder.h", "BINDER_SET_IDLE_TIMEOUT", _IOC_WRITE, 0x6203, 0x08 },
@ -607,8 +604,6 @@
 { "linux/auto_fs.h", "AUTOFS_IOC_SETTIMEOUT", _IOC_READ|_IOC_WRITE, 0x9364, 0x04 },
 { "linux/auto_fs.h", "AUTOFS_IOC_SETTIMEOUT32", _IOC_READ|_IOC_WRITE, 0x9364, 0x04 },
 { "linux/blkpg.h", "BLKPG", _IOC_NONE, 0x1269, 0x00 },
-{ "linux/blkzoned.h", "BLKGETNRZONES", _IOC_READ, 0x1285, 0x04 },
-{ "linux/blkzoned.h", "BLKGETZONESZ", _IOC_READ, 0x1284, 0x04 },
 { "linux/blkzoned.h", "BLKREPORTZONE", _IOC_READ|_IOC_WRITE, 0x1282, 0x10 },
 { "linux/blkzoned.h", "BLKRESETZONE", _IOC_WRITE, 0x1283, 0x10 },
 { "linux/bt-bmc.h", "BT_BMC_IOCTL_SMS_ATN", _IOC_NONE, 0xb100, 0x00 },
@ -1336,7 +1331,6 @@
 { "linux/kfd_ioctl.h", "AMDKFD_IOC_GET_CLOCK_COUNTERS", _IOC_READ|_IOC_WRITE, 0x4b05, 0x28 },
 { "linux/kfd_ioctl.h", "AMDKFD_IOC_GET_PROCESS_APERTURES", _IOC_READ, 0x4b06, 0x190 },
 { "linux/kfd_ioctl.h", "AMDKFD_IOC_GET_PROCESS_APERTURES_NEW", _IOC_READ|_IOC_WRITE, 0x4b14, 0x10 },
-{ "linux/kfd_ioctl.h", "AMDKFD_IOC_GET_QUEUE_WAVE_STATE", _IOC_READ|_IOC_WRITE, 0x4b1b, 0x18 },
 { "linux/kfd_ioctl.h", "AMDKFD_IOC_GET_TILE_CONFIG", _IOC_READ|_IOC_WRITE, 0x4b12, 0x28 },
 { "linux/kfd_ioctl.h", "AMDKFD_IOC_GET_VERSION", _IOC_READ, 0x4b01, 0x08 },
 { "linux/kfd_ioctl.h", "AMDKFD_IOC_MAP_MEMORY_TO_GPU", _IOC_READ|_IOC_WRITE, 0x4b18, 0x18 },
@ -1410,10 +1404,7 @@
 { "linux/media.h", "MEDIA_IOC_ENUM_ENTITIES", _IOC_READ|_IOC_WRITE, 0x7c01, 0x100 },
 { "linux/media.h", "MEDIA_IOC_ENUM_LINKS", _IOC_READ|_IOC_WRITE, 0x7c02, 0x1c },
 { "linux/media.h", "MEDIA_IOC_G_TOPOLOGY", _IOC_READ|_IOC_WRITE, 0x7c04, 0x48 },
-{ "linux/media.h", "MEDIA_IOC_REQUEST_ALLOC", _IOC_READ, 0x7c05, 0x04 },
 { "linux/media.h", "MEDIA_IOC_SETUP_LINK", _IOC_READ|_IOC_WRITE, 0x7c03, 0x34 },
-{ "linux/media.h", "MEDIA_REQUEST_IOC_QUEUE", _IOC_NONE, 0x7c80, 0x00 },
-{ "linux/media.h", "MEDIA_REQUEST_IOC_REINIT", _IOC_NONE, 0x7c81, 0x00 },
 { "linux/mei.h", "IOCTL_MEI_CONNECT_CLIENT", _IOC_READ|_IOC_WRITE, 0x4801, 0x10 },
 { "linux/mei.h", "IOCTL_MEI_NOTIFY_GET", _IOC_READ, 0x4803, 0x04 },
 { "linux/mei.h", "IOCTL_MEI_NOTIFY_SET", _IOC_WRITE, 0x4802, 0x04 },
@ -2011,8 +2002,6 @@
 { "linux/udf_fs_i.h", "UDF_GETEASIZE", _IOC_READ, 0x6c40, 0x04 },
 { "linux/udf_fs_i.h", "UDF_GETVOLIDENT", _IOC_READ, 0x6c42, 0x04 },
 { "linux/udf_fs_i.h", "UDF_RELOCATE_BLOCKS", _IOC_READ|_IOC_WRITE, 0x6c43, 0x04 },
-{ "linux/udmabuf.h", "UDMABUF_CREATE", _IOC_WRITE, 0x7542, 0x18 },
-{ "linux/udmabuf.h", "UDMABUF_CREATE_LIST", _IOC_WRITE, 0x7543, 0x08 },
 { "linux/uinput.h", "UI_ABS_SETUP", _IOC_WRITE, 0x5504, 0x1c },
 { "linux/uinput.h", "UI_BEGIN_FF_ERASE", _IOC_READ|_IOC_WRITE, 0x55ca, 0x0c },
 { "linux/uinput.h", "UI_BEGIN_FF_UPLOAD", _IOC_READ|_IOC_WRITE, 0x55c8, 0x60 },
@ -2055,26 +2044,16 @@
 { "linux/usb/tmc.h", "USBTMC488_IOCTL_READ_STB", _IOC_READ, 0x5b12, 0x01 },
 { "linux/usb/tmc.h", "USBTMC488_IOCTL_REN_CONTROL", _IOC_WRITE, 0x5b13, 0x01 },
 { "linux/usb/tmc.h", "USBTMC488_IOCTL_TRIGGER", _IOC_NONE, 0x5b16, 0x00 },
-{ "linux/usb/tmc.h", "USBTMC488_IOCTL_WAIT_SRQ", _IOC_WRITE, 0x5b17, 0x04 },
 { "linux/usb/tmc.h", "USBTMC_IOCTL_ABORT_BULK_IN", _IOC_NONE, 0x5b04, 0x00 },
 { "linux/usb/tmc.h", "USBTMC_IOCTL_ABORT_BULK_OUT", _IOC_NONE, 0x5b03, 0x00 },
-{ "linux/usb/tmc.h", "USBTMC_IOCTL_API_VERSION", _IOC_READ, 0x5b10, 0x04 },
-{ "linux/usb/tmc.h", "USBTMC_IOCTL_AUTO_ABORT", _IOC_WRITE, 0x5b19, 0x01 },
-{ "linux/usb/tmc.h", "USBTMC_IOCTL_CANCEL_IO", _IOC_NONE, 0x5b23, 0x00 },
-{ "linux/usb/tmc.h", "USBTMC_IOCTL_CLEANUP_IO", _IOC_NONE, 0x5b24, 0x00 },
 { "linux/usb/tmc.h", "USBTMC_IOCTL_CLEAR", _IOC_NONE, 0x5b02, 0x00 },
 { "linux/usb/tmc.h", "USBTMC_IOCTL_CLEAR_IN_HALT", _IOC_NONE, 0x5b07, 0x00 },
 { "linux/usb/tmc.h", "USBTMC_IOCTL_CLEAR_OUT_HALT", _IOC_NONE, 0x5b06, 0x00 },
 { "linux/usb/tmc.h", "USBTMC_IOCTL_CONFIG_TERMCHAR", _IOC_WRITE, 0x5b0c, 0x02 },
-{ "linux/usb/tmc.h", "USBTMC_IOCTL_CTRL_REQUEST", _IOC_READ|_IOC_WRITE, 0x5b08, 0x0c },
 { "linux/usb/tmc.h", "USBTMC_IOCTL_EOM_ENABLE", _IOC_WRITE, 0x5b0b, 0x01 },
 { "linux/usb/tmc.h", "USBTMC_IOCTL_GET_TIMEOUT", _IOC_READ, 0x5b09, 0x04 },
 { "linux/usb/tmc.h", "USBTMC_IOCTL_INDICATOR_PULSE", _IOC_NONE, 0x5b01, 0x00 },
-{ "linux/usb/tmc.h", "USBTMC_IOCTL_MSG_IN_ATTR", _IOC_READ, 0x5b18, 0x01 },
-{ "linux/usb/tmc.h", "USBTMC_IOCTL_READ", _IOC_READ|_IOC_WRITE, 0x5b0e, 0x10 },
 { "linux/usb/tmc.h", "USBTMC_IOCTL_SET_TIMEOUT", _IOC_WRITE, 0x5b0a, 0x04 },
-{ "linux/usb/tmc.h", "USBTMC_IOCTL_WRITE", _IOC_READ|_IOC_WRITE, 0x5b0d, 0x10 },
-{ "linux/usb/tmc.h", "USBTMC_IOCTL_WRITE_RESULT", _IOC_READ|_IOC_WRITE, 0x5b0f, 0x04 },
 { "linux/usbdevice_fs.h", "USBDEVFS_ALLOC_STREAMS", _IOC_READ, 0x551c, 0x08 },
 { "linux/usbdevice_fs.h", "USBDEVFS_BULK", _IOC_READ|_IOC_WRITE, 0x5502, 0x10 },
 { "linux/usbdevice_fs.h", "USBDEVFS_BULK32", _IOC_READ|_IOC_WRITE, 0x5502, 0x10 },
--- a/linux/32/syscallent.h
+++ b/linux/32/syscallent.h
@ -1,10 +1,3 @@
-/*
- * Copyright (c) 2015-2018 The strace developers.
- * All rights reserved.
- *
- * SPDX-License-Identifier: LGPL-2.1-or-later
- */
-
 #ifndef sys_ARCH_mmap
 # define sys_ARCH_mmap sys_mmap
 #endif
--- a/linux/64/ioctls_inc.h
+++ b/linux/64/ioctls_inc.h
@ -34,7 +34,6 @@
 { "asm-generic/ioctls.h", "TIOCGETD", 0, 0x5424, 0 },
 { "asm-generic/ioctls.h", "TIOCGEXCL", _IOC_READ, 0x5440, 0x04 },
 { "asm-generic/ioctls.h", "TIOCGICOUNT", 0, 0x545D, 0 },
-{ "asm-generic/ioctls.h", "TIOCGISO7816", _IOC_READ, 0x5442, 0x28 },
 { "asm-generic/ioctls.h", "TIOCGLCKTRMIOS", 0, 0x5456, 0 },
 { "asm-generic/ioctls.h", "TIOCGPGRP", 0, 0x540F, 0 },
 { "asm-generic/ioctls.h", "TIOCGPKT", _IOC_READ, 0x5438, 0x04 },
@ -67,7 +66,6 @@
 { "asm-generic/ioctls.h", "TIOCSERSWILD", 0, 0x5455, 0 },
 { "asm-generic/ioctls.h", "TIOCSETD", 0, 0x5423, 0 },
 { "asm-generic/ioctls.h", "TIOCSIG", _IOC_WRITE, 0x5436, 0x04 },
-{ "asm-generic/ioctls.h", "TIOCSISO7816", _IOC_READ|_IOC_WRITE, 0x5443, 0x28 },
 { "asm-generic/ioctls.h", "TIOCSLCKTRMIOS", 0, 0x5457, 0 },
 { "asm-generic/ioctls.h", "TIOCSPGRP", 0, 0x5410, 0 },
 { "asm-generic/ioctls.h", "TIOCSPTLCK", _IOC_WRITE, 0x5431, 0x04 },
@ -499,7 +497,6 @@
 { "linux/android/binder.h", "BC_TRANSACTION", _IOC_WRITE, 0x6300, 0x40 },
 { "linux/android/binder.h", "BC_TRANSACTION_SG", _IOC_WRITE, 0x6311, 0x48 },
 { "linux/android/binder.h", "BINDER_GET_NODE_DEBUG_INFO", _IOC_READ|_IOC_WRITE, 0x620b, 0x18 },
-{ "linux/android/binder.h", "BINDER_GET_NODE_INFO_FOR_REF", _IOC_READ|_IOC_WRITE, 0x620c, 0x18 },
 { "linux/android/binder.h", "BINDER_SET_CONTEXT_MGR", _IOC_WRITE, 0x6207, 0x04 },
 { "linux/android/binder.h", "BINDER_SET_IDLE_PRIORITY", _IOC_WRITE, 0x6206, 0x04 },
 { "linux/android/binder.h", "BINDER_SET_IDLE_TIMEOUT", _IOC_WRITE, 0x6203, 0x08 },
@ -607,8 +604,6 @@
 { "linux/auto_fs.h", "AUTOFS_IOC_SETTIMEOUT", _IOC_READ|_IOC_WRITE, 0x9364, 0x08 },
 { "linux/auto_fs.h", "AUTOFS_IOC_SETTIMEOUT32", _IOC_READ|_IOC_WRITE, 0x9364, 0x04 },
 { "linux/blkpg.h", "BLKPG", _IOC_NONE, 0x1269, 0x00 },
-{ "linux/blkzoned.h", "BLKGETNRZONES", _IOC_READ, 0x1285, 0x04 },
-{ "linux/blkzoned.h", "BLKGETZONESZ", _IOC_READ, 0x1284, 0x04 },
 { "linux/blkzoned.h", "BLKREPORTZONE", _IOC_READ|_IOC_WRITE, 0x1282, 0x10 },
 { "linux/blkzoned.h", "BLKRESETZONE", _IOC_WRITE, 0x1283, 0x10 },
 { "linux/bt-bmc.h", "BT_BMC_IOCTL_SMS_ATN", _IOC_NONE, 0xb100, 0x00 },
@ -1336,7 +1331,6 @@
 { "linux/kfd_ioctl.h", "AMDKFD_IOC_GET_CLOCK_COUNTERS", _IOC_READ|_IOC_WRITE, 0x4b05, 0x28 },
 { "linux/kfd_ioctl.h", "AMDKFD_IOC_GET_PROCESS_APERTURES", _IOC_READ, 0x4b06, 0x190 },
 { "linux/kfd_ioctl.h", "AMDKFD_IOC_GET_PROCESS_APERTURES_NEW", _IOC_READ|_IOC_WRITE, 0x4b14, 0x10 },
-{ "linux/kfd_ioctl.h", "AMDKFD_IOC_GET_QUEUE_WAVE_STATE", _IOC_READ|_IOC_WRITE, 0x4b1b, 0x18 },
 { "linux/kfd_ioctl.h", "AMDKFD_IOC_GET_TILE_CONFIG", _IOC_READ|_IOC_WRITE, 0x4b12, 0x28 },
 { "linux/kfd_ioctl.h", "AMDKFD_IOC_GET_VERSION", _IOC_READ, 0x4b01, 0x08 },
 { "linux/kfd_ioctl.h", "AMDKFD_IOC_MAP_MEMORY_TO_GPU", _IOC_READ|_IOC_WRITE, 0x4b18, 0x18 },
@ -1410,10 +1404,7 @@
 { "linux/media.h", "MEDIA_IOC_ENUM_ENTITIES", _IOC_READ|_IOC_WRITE, 0x7c01, 0x100 },
 { "linux/media.h", "MEDIA_IOC_ENUM_LINKS", _IOC_READ|_IOC_WRITE, 0x7c02, 0x28 },
 { "linux/media.h", "MEDIA_IOC_G_TOPOLOGY", _IOC_READ|_IOC_WRITE, 0x7c04, 0x48 },
-{ "linux/media.h", "MEDIA_IOC_REQUEST_ALLOC", _IOC_READ, 0x7c05, 0x04 },
 { "linux/media.h", "MEDIA_IOC_SETUP_LINK", _IOC_READ|_IOC_WRITE, 0x7c03, 0x34 },
-{ "linux/media.h", "MEDIA_REQUEST_IOC_QUEUE", _IOC_NONE, 0x7c80, 0x00 },
-{ "linux/media.h", "MEDIA_REQUEST_IOC_REINIT", _IOC_NONE, 0x7c81, 0x00 },
 { "linux/mei.h", "IOCTL_MEI_CONNECT_CLIENT", _IOC_READ|_IOC_WRITE, 0x4801, 0x10 },
 { "linux/mei.h", "IOCTL_MEI_NOTIFY_GET", _IOC_READ, 0x4803, 0x04 },
 { "linux/mei.h", "IOCTL_MEI_NOTIFY_SET", _IOC_WRITE, 0x4802, 0x04 },
@ -2011,8 +2002,6 @@
 { "linux/udf_fs_i.h", "UDF_GETEASIZE", _IOC_READ, 0x6c40, 0x04 },
 { "linux/udf_fs_i.h", "UDF_GETVOLIDENT", _IOC_READ, 0x6c42, 0x08 },
 { "linux/udf_fs_i.h", "UDF_RELOCATE_BLOCKS", _IOC_READ|_IOC_WRITE, 0x6c43, 0x08 },
-{ "linux/udmabuf.h", "UDMABUF_CREATE", _IOC_WRITE, 0x7542, 0x18 },
-{ "linux/udmabuf.h", "UDMABUF_CREATE_LIST", _IOC_WRITE, 0x7543, 0x08 },
 { "linux/uinput.h", "UI_ABS_SETUP", _IOC_WRITE, 0x5504, 0x1c },
 { "linux/uinput.h", "UI_BEGIN_FF_ERASE", _IOC_READ|_IOC_WRITE, 0x55ca, 0x0c },
 { "linux/uinput.h", "UI_BEGIN_FF_UPLOAD", _IOC_READ|_IOC_WRITE, 0x55c8, 0x68 },
@ -2055,26 +2044,16 @@
 { "linux/usb/tmc.h", "USBTMC488_IOCTL_READ_STB", _IOC_READ, 0x5b12, 0x01 },
 { "linux/usb/tmc.h", "USBTMC488_IOCTL_REN_CONTROL", _IOC_WRITE, 0x5b13, 0x01 },
 { "linux/usb/tmc.h", "USBTMC488_IOCTL_TRIGGER", _IOC_NONE, 0x5b16, 0x00 },
-{ "linux/usb/tmc.h", "USBTMC488_IOCTL_WAIT_SRQ", _IOC_WRITE, 0x5b17, 0x04 },
 { "linux/usb/tmc.h", "USBTMC_IOCTL_ABORT_BULK_IN", _IOC_NONE, 0x5b04, 0x00 },
 { "linux/usb/tmc.h", "USBTMC_IOCTL_ABORT_BULK_OUT", _IOC_NONE, 0x5b03, 0x00 },
-{ "linux/usb/tmc.h", "USBTMC_IOCTL_API_VERSION", _IOC_READ, 0x5b10, 0x04 },
-{ "linux/usb/tmc.h", "USBTMC_IOCTL_AUTO_ABORT", _IOC_WRITE, 0x5b19, 0x01 },
-{ "linux/usb/tmc.h", "USBTMC_IOCTL_CANCEL_IO", _IOC_NONE, 0x5b23, 0x00 },
-{ "linux/usb/tmc.h", "USBTMC_IOCTL_CLEANUP_IO", _IOC_NONE, 0x5b24, 0x00 },
 { "linux/usb/tmc.h", "USBTMC_IOCTL_CLEAR", _IOC_NONE, 0x5b02, 0x00 },
 { "linux/usb/tmc.h", "USBTMC_IOCTL_CLEAR_IN_HALT", _IOC_NONE, 0x5b07, 0x00 },
 { "linux/usb/tmc.h", "USBTMC_IOCTL_CLEAR_OUT_HALT", _IOC_NONE, 0x5b06, 0x00 },
 { "linux/usb/tmc.h", "USBTMC_IOCTL_CONFIG_TERMCHAR", _IOC_WRITE, 0x5b0c, 0x02 },
-{ "linux/usb/tmc.h", "USBTMC_IOCTL_CTRL_REQUEST", _IOC_READ|_IOC_WRITE, 0x5b08, 0x10 },
 { "linux/usb/tmc.h", "USBTMC_IOCTL_EOM_ENABLE", _IOC_WRITE, 0x5b0b, 0x01 },
 { "linux/usb/tmc.h", "USBTMC_IOCTL_GET_TIMEOUT", _IOC_READ, 0x5b09, 0x04 },
 { "linux/usb/tmc.h", "USBTMC_IOCTL_INDICATOR_PULSE", _IOC_NONE, 0x5b01, 0x00 },
-{ "linux/usb/tmc.h", "USBTMC_IOCTL_MSG_IN_ATTR", _IOC_READ, 0x5b18, 0x01 },
-{ "linux/usb/tmc.h", "USBTMC_IOCTL_READ", _IOC_READ|_IOC_WRITE, 0x5b0e, 0x14 },
 { "linux/usb/tmc.h", "USBTMC_IOCTL_SET_TIMEOUT", _IOC_WRITE, 0x5b0a, 0x04 },
-{ "linux/usb/tmc.h", "USBTMC_IOCTL_WRITE", _IOC_READ|_IOC_WRITE, 0x5b0d, 0x14 },
-{ "linux/usb/tmc.h", "USBTMC_IOCTL_WRITE_RESULT", _IOC_READ|_IOC_WRITE, 0x5b0f, 0x04 },
 { "linux/usbdevice_fs.h", "USBDEVFS_ALLOC_STREAMS", _IOC_READ, 0x551c, 0x08 },
 { "linux/usbdevice_fs.h", "USBDEVFS_BULK", _IOC_READ|_IOC_WRITE, 0x5502, 0x18 },
 { "linux/usbdevice_fs.h", "USBDEVFS_BULK32", _IOC_READ|_IOC_WRITE, 0x5502, 0x10 },
--- a/linux/64/syscallent.h
+++ b/linux/64/syscallent.h
@ -1,10 +1,3 @@
-/*
- * Copyright (c) 2015-2018 The strace developers.
- * All rights reserved.
- *
- * SPDX-License-Identifier: LGPL-2.1-or-later
- */
-
 [  0] = { 2,	TM,		SEN(io_setup),			"io_setup"		},
 [  1] = { 1,	TM,		SEN(io_destroy),		"io_destroy"		},
 [  2] = { 3,	0,		SEN(io_submit),			"io_submit"		},
--- a/linux/aarch64/arch_defs_.h
+++ b/linux/aarch64/arch_defs_.h
@ -1,10 +1,3 @@
-/*
- * Copyright (c) 2018 The strace developers.
- * All rights reserved.
- *
- * SPDX-License-Identifier: LGPL-2.1-or-later
- */
-
 #define HAVE_ARCH_OLD_MMAP 1
 #define HAVE_ARCH_OLD_SELECT 1
 #define HAVE_ARCH_UID16_SYSCALLS 1
--- a/linux/aarch64/arch_regs.c
+++ b/linux/aarch64/arch_regs.c
@ -1,10 +1,3 @@
-/*
- * Copyright (c) 2015-2018 The strace developers.
- * All rights reserved.
- *
- * SPDX-License-Identifier: LGPL-2.1-or-later
- */
-
 struct arm_pt_regs {
 	uint32_t uregs[18];
 };
--- a/linux/aarch64/get_error.c
+++ b/linux/aarch64/get_error.c
@ -1,10 +1,3 @@
-/*
- * Copyright (c) 2015-2018 The strace developers.
- * All rights reserved.
- *
- * SPDX-License-Identifier: LGPL-2.1-or-later
- */
-
 #include "negated_errno.h"

 #define arch_get_error arm_get_error
--- a/linux/aarch64/get_scno.c
+++ b/linux/aarch64/get_scno.c
@ -1,10 +1,3 @@
-/*
- * Copyright (c) 2015-2018 The strace developers.
- * All rights reserved.
- *
- * SPDX-License-Identifier: LGPL-2.1-or-later
- */
-
 /* Return codes: 1 - ok, 0 - ignore, other - error. */
 static int
 arch_get_scno(struct tcb *tcp)
--- a/linux/aarch64/get_syscall_args.c
+++ b/linux/aarch64/get_syscall_args.c
@ -1,10 +1,3 @@
-/*
- * Copyright (c) 2015-2018 The strace developers.
- * All rights reserved.
- *
- * SPDX-License-Identifier: LGPL-2.1-or-later
- */
-
 #define arch_get_syscall_args arm_get_syscall_args
 #include "arm/get_syscall_args.c"
 #undef arch_get_syscall_args
--- a/linux/aarch64/raw_syscall.h
+++ b/linux/aarch64/raw_syscall.h
@ -8,7 +8,7 @@
 */

 #ifndef STRACE_RAW_SYSCALL_H
-# define STRACE_RAW_SYSCALL_H
+#define STRACE_RAW_SYSCALL_H

 # include "kernel_types.h"

--- a/linux/aarch64/set_error.c
+++ b/linux/aarch64/set_error.c
@ -1,10 +1,3 @@
-/*
- * Copyright (c) 2016-2018 The strace developers.
- * All rights reserved.
- *
- * SPDX-License-Identifier: LGPL-2.1-or-later
- */
-
 #define arch_set_error arm_set_error
 #define arch_set_success arm_set_success
 #include "arm/set_error.c"
--- a/linux/aarch64/set_scno.c
+++ b/linux/aarch64/set_scno.c
@ -1,10 +1,3 @@
-/*
- * Copyright (c) 2016-2018 The strace developers.
- * All rights reserved.
- *
- * SPDX-License-Identifier: LGPL-2.1-or-later
- */
-
 #ifndef NT_ARM_SYSTEM_CALL
 # define NT_ARM_SYSTEM_CALL 0x404
 #endif
--- a/linux/aarch64/shuffle_scno.c
+++ b/linux/aarch64/shuffle_scno.c
@ -1,10 +1,3 @@
-/*
- * Copyright (c) 2015-2018 The strace developers.
- * All rights reserved.
- *
- * SPDX-License-Identifier: LGPL-2.1-or-later
- */
-
 #define shuffle_scno arm_shuffle_scno
 #include "../arm/shuffle_scno.c"
 #undef shuffle_scno
--- a/Show More
+++ b/Show More
Author	SHA1	Message	Date
Eugene Syromyatnikov	c00a4ca7d8	term: improve decoding of termios and termio structures	2018-12-24 20:11:43 +00:00
Eugene Syromyatnikov	882957c7dd	tests: add struct termios-related ioctl command test	2018-12-24 20:11:43 +00:00