kvm: avoid bogus vcpu_info assignment in vcpu_register

Also reformat code a bit to make nesting a bit clearer.

Reported by Clang.

* kvm.c (vcpu_register): Do not assign vcpu_alloc result to vcpu_info
as this value is not used afterwards in the function.

.gitattributes

@@ -1,2 +0,0 @@
-/* export-ignore
-/README-github_gitlab-autogenerated-archives.txt -export-ignore

.gitignore

@@ -12,8 +12,6 @@
 /.version
 /CREDITS
 /ChangeLog
-/INSTALL
-/README
 /aclocal.m4
 /autom4te.cache
 /bpf_attr_check.c
@@ -55,14 +53,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

COPYING

@@ -7,14 +7,24 @@ Copyright (c) 1998-2001 Wichert Akkerman <wakkerma@deephackmode.org>
 Copyright (c) 2001-2018 The strace developers.
 All rights reserved.
 
-strace is free software; you can redistribute it and/or modify it
-under the terms of the GNU Lesser General Public License as published
-by the Free Software Foundation; either version 2.1 of the License,
-or (at your option) any later version.
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions
+are met:
+1. Redistributions of source code must retain the above copyright
+   notice, this list of conditions and the following disclaimer.
+2. Redistributions in binary form must reproduce the above copyright
+   notice, this list of conditions and the following disclaimer in the
+   documentation and/or other materials provided with the distribution.
+3. The name of the author may not be used to endorse or promote products
+   derived from this software without specific prior written permission.
 
-strace is distributed in the hope that it will be useful, but
-WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
-or FITNESS FOR A PARTICULAR PURPOSE.  See LGPL-2.1-or-later for more details.
-
-strace test suite is provided under the terms of the GNU General Public License
-version 2 or later, see tests/COPYING for more details.
+THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
+IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
+OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
+IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
+INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
+NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
+THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.

INSTALL

@@ -15,10 +15,10 @@ Basic Installation
 Briefly, the shell command './configure && make && make install' should
 configure, build, and install this package.  The following more-detailed
 instructions are generic; see the 'README' file for instructions
-specific to this package.  Some packages provide this 'README-configure'
-file but do not implement all of the features documented below.  The
-lack of an optional feature in a given package is not necessarily a bug.
-More recommendations for GNU packages can be found in *note Makefile
+specific to this package.  Some packages provide this 'INSTALL' file but
+do not implement all of the features documented below.  The lack of an
+optional feature in a given package is not necessarily a bug.  More
+recommendations for GNU packages can be found in *note Makefile
 Conventions: (standards)Makefile Conventions.
 
    The 'configure' shell script attempts to guess correct values for

INSTALL-git.md

@@ -5,5 +5,5 @@ that are needed to build strace.  Some of these files are generated by tools
 from the GNU Autoconf and GNU Automake packages.
 
 Note: rather than running `autoreconf` directly, please invoke `./bootstrap`
-script and follow the instructions given in [INSTALL](README-configure) file for further
+script and follow the instructions given in [INSTALL](INSTALL) file for further
 building and installation.

LGPL-2.1-or-later

@@ -1,501 +0,0 @@
-GNU LESSER GENERAL PUBLIC LICENSE
-
-Version 2.1, February 1999
-
-Copyright (C) 1991, 1999 Free Software Foundation, Inc.
-
-51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
-
-Everyone is permitted to copy and distribute verbatim copies of this
-license document, but changing it is not allowed.
-
-[This is the first released version of the Lesser GPL. It also counts
-as the successor of the GNU Library Public License, version 2, hence
-the version number 2.1.]
-
-Preamble
-
-The licenses for most software are designed to take away your freedom
-to share and change it. By contrast, the GNU General Public Licenses are
-intended to guarantee your freedom to share and change free software--to
-make sure the software is free for all its users.
-
-This license, the Lesser General Public License, applies to some specially
-designated software packages--typically libraries--of the Free Software
-Foundation and other authors who decide to use it. You can use it too,
-but we suggest you first think carefully about whether this license or
-the ordinary General Public License is the better strategy to use in
-any particular case, based on the explanations below.
-
-When we speak of free software, we are referring to freedom of use,
-not price. Our General Public Licenses are designed to make sure that
-you have the freedom to distribute copies of free software (and charge
-for this service if you wish); that you receive source code or can get it
-if you want it; that you can change the software and use pieces of it in
-new free programs; and that you are informed that you can do these things.
-
-To protect your rights, we need to make restrictions that forbid
-distributors to deny you these rights or to ask you to surrender these
-rights. These restrictions translate to certain responsibilities for
-you if you distribute copies of the library or if you modify it.
-
-For example, if you distribute copies of the library, whether gratis
-or for a fee, you must give the recipients all the rights that we gave
-you. You must make sure that they, too, receive or can get the source
-code. If you link other code with the library, you must provide complete
-object files to the recipients, so that they can relink them with the
-library after making changes to the library and recompiling it. And you
-must show them these terms so they know their rights.
-
-We protect your rights with a two-step method: (1) we copyright the
-library, and (2) we offer you this license, which gives you legal
-permission to copy, distribute and/or modify the library.
-
-To protect each distributor, we want to make it very clear that there
-is no warranty for the free library. Also, if the library is modified
-by someone else and passed on, the recipients should know that what they
-have is not the original version, so that the original author's reputation
-will not be affected by problems that might be introduced by others.
-
-Finally, software patents pose a constant threat to the existence of
-any free program. We wish to make sure that a company cannot effectively
-restrict the users of a free program by obtaining a restrictive license
-from a patent holder. Therefore, we insist that any patent license
-obtained for a version of the library must be consistent with the full
-freedom of use specified in this license.
-
-Most GNU software, including some libraries, is covered by the ordinary
-GNU General Public License. This license, the GNU Lesser General
-Public License, applies to certain designated libraries, and is quite
-different from the ordinary General Public License. We use this license
-for certain libraries in order to permit linking those libraries into
-non-free programs.
-
-When a program is linked with a library, whether statically or using a
-shared library, the combination of the two is legally speaking a combined
-work, a derivative of the original library. The ordinary General Public
-License therefore permits such linking only if the entire combination
-fits its criteria of freedom. The Lesser General Public License permits
-more lax criteria for linking other code with the library.
-
-We call this license the "Lesser" General Public License because it
-does Less to protect the user's freedom than the ordinary General
-Public License. It also provides other free software developers Less
-of an advantage over competing non-free programs. These disadvantages
-are the reason we use the ordinary General Public License for many
-libraries. However, the Lesser license provides advantages in certain
-special circumstances.
-
-For example, on rare occasions, there may be a special need to encourage
-the widest possible use of a certain library, so that it becomes a
-de-facto standard. To achieve this, non-free programs must be allowed
-to use the library. A more frequent case is that a free library does
-the same job as widely used non-free libraries. In this case, there
-is little to gain by limiting the free library to free software only,
-so we use the Lesser General Public License.
-
-In other cases, permission to use a particular library in non-free
-programs enables a greater number of people to use a large body of free
-software. For example, permission to use the GNU C Library in non-free
-programs enables many more people to use the whole GNU operating system,
-as well as its variant, the GNU/Linux operating system.
-
-Although the Lesser General Public License is Less protective of the
-users' freedom, it does ensure that the user of a program that is linked
-with the Library has the freedom and the wherewithal to run that program
-using a modified version of the Library.
-
-The precise terms and conditions for copying, distribution and
-modification follow. Pay close attention to the difference between a
-"work based on the library" and a "work that uses the library". The
-former contains code derived from the library, whereas the latter must
-be combined with the library in order to run.
-
-TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION
-
-   0. This License Agreement applies to any software library or other
-   program which contains a notice placed by the copyright holder or
-   other authorized party saying it may be distributed under the terms of
-   this Lesser General Public License (also called "this License"). Each
-   licensee is addressed as "you".
-
-   A "library" means a collection of software functions and/or data
-   prepared so as to be conveniently linked with application programs
-   (which use some of those functions and data) to form executables.
-
-   The "Library", below, refers to any such software library or work
-   which has been distributed under these terms. A "work based on
-   the Library" means either the Library or any derivative work under
-   copyright law: that is to say, a work containing the Library or a
-   portion of it, either verbatim or with modifications and/or translated
-   straightforwardly into another language. (Hereinafter, translation
-   is included without limitation in the term "modification".)
-
-   "Source code" for a work means the preferred form of the work for
-   making modifications to it. For a library, complete source code
-   means all the source code for all modules it contains, plus any
-   associated interface definition files, plus the scripts used to
-   control compilation and installation of the library.
-
-   Activities other than copying, distribution and modification are not
-   covered by this License; they are outside its scope. The act of running
-   a program using the Library is not restricted, and output from such
-   a program is covered only if its contents constitute a work based
-   on the Library (independent of the use of the Library in a tool for
-   writing it). Whether that is true depends on what the Library does
-   and what the program that uses the Library does.
-
-   1. You may copy and distribute verbatim copies of the Library's
-   complete source code as you receive it, in any medium, provided
-   that you conspicuously and appropriately publish on each copy an
-   appropriate copyright notice and disclaimer of warranty; keep intact
-   all the notices that refer to this License and to the absence of any
-   warranty; and distribute a copy of this License along with the Library.
-
-   You may charge a fee for the physical act of transferring a copy, and
-   you may at your option offer warranty protection in exchange for a fee.
-
-   2. You may modify your copy or copies of the Library or any portion of
-   it, thus forming a work based on the Library, and copy and distribute
-   such modifications or work under the terms of Section 1 above,
-   provided that you also meet all of these conditions:
-
-      a) The modified work must itself be a software library.
-
-      b) You must cause the files modified to carry prominent notices
-      stating that you changed the files and the date of any change.
-
-      c) You must cause the whole of the work to be licensed at no charge
-      to all third parties under the terms of this License.
-
-      d) If a facility in the modified Library refers to a function or a
-      table of data to be supplied by an application program that uses
-      the facility, other than as an argument passed when the facility
-      is invoked, then you must make a good faith effort to ensure that,
-      in the event an application does not supply such function or table,
-      the facility still operates, and performs whatever part of its
-      purpose remains meaningful.
-
-   (For example, a function in a library to compute square roots
-   has a purpose that is entirely well-defined independent of
-   the application. Therefore, Subsection 2d requires that any
-   application-supplied function or table used by this function must
-   be optional: if the application does not supply it, the square root
-   function must still compute square roots.)
-
-   These requirements apply to the modified work as a whole. If
-   identifiable sections of that work are not derived from the Library,
-   and can be reasonably considered independent and separate works in
-   themselves, then this License, and its terms, do not apply to those
-   sections when you distribute them as separate works. But when you
-   distribute the same sections as part of a whole which is a work
-   based on the Library, the distribution of the whole must be on the
-   terms of this License, whose permissions for other licensees extend
-   to the entire whole, and thus to each and every part regardless of
-   who wrote it.
-
-   Thus, it is not the intent of this section to claim rights or contest
-   your rights to work written entirely by you; rather, the intent is
-   to exercise the right to control the distribution of derivative or
-   collective works based on the Library.
-
-   In addition, mere aggregation of another work not based on the Library
-   with the Library (or with a work based on the Library) on a volume
-   of a storage or distribution medium does not bring the other work
-   under the scope of this License.
-
-   3. You may opt to apply the terms of the ordinary GNU General Public
-   License instead of this License to a given copy of the Library. To
-   do this, you must alter all the notices that refer to this License,
-   so that they refer to the ordinary GNU General Public License,
-   version 2, instead of to this License. (If a newer version than
-   version 2 of the ordinary GNU General Public License has appeared,
-   then you can specify that version instead if you wish.) Do not make
-   any other change in these notices.
-
-   Once this change is made in a given copy, it is irreversible for
-   that copy, so the ordinary GNU General Public License applies to all
-   subsequent copies and derivative works made from that copy.
-
-   This option is useful when you wish to copy part of the code of the
-   Library into a program that is not a library.
-
-   4. You may copy and distribute the Library (or a portion or derivative
-   of it, under Section 2) in object code or executable form under the
-   terms of Sections 1 and 2 above provided that you accompany it with
-   the complete corresponding machine-readable source code, which must
-   be distributed under the terms of Sections 1 and 2 above on a medium
-   customarily used for software interchange.
-
-   If distribution of object code is made by offering access to copy from
-   a designated place, then offering equivalent access to copy the source
-   code from the same place satisfies the requirement to distribute the
-   source code, even though third parties are not compelled to copy the
-   source along with the object code.
-
-   5. A program that contains no derivative of any portion of the Library,
-   but is designed to work with the Library by being compiled or linked
-   with it, is called a "work that uses the Library". Such a work, in
-   isolation, is not a derivative work of the Library, and therefore
-   falls outside the scope of this License.
-
-   However, linking a "work that uses the Library" with the Library
-   creates an executable that is a derivative of the Library (because it
-   contains portions of the Library), rather than a "work that uses the
-   library". The executable is therefore covered by this License. Section
-   6 states terms for distribution of such executables.
-
-   When a "work that uses the Library" uses material from a header
-   file that is part of the Library, the object code for the work may
-   be a derivative work of the Library even though the source code is
-   not. Whether this is true is especially significant if the work can
-   be linked without the Library, or if the work is itself a library. The
-   threshold for this to be true is not precisely defined by law.
-
-   If such an object file uses only numerical parameters, data structure
-   layouts and accessors, and small macros and small inline functions
-   (ten lines or less in length), then the use of the object file
-   is unrestricted, regardless of whether it is legally a derivative
-   work. (Executables containing this object code plus portions of the
-   Library will still fall under Section 6.)
-
-   Otherwise, if the work is a derivative of the Library, you may
-   distribute the object code for the work under the terms of Section
-   6. Any executables containing that work also fall under Section 6,
-   whether or not they are linked directly with the Library itself.
-
-   6. As an exception to the Sections above, you may also combine or link
-   a "work that uses the Library" with the Library to produce a work
-   containing portions of the Library, and distribute that work under
-   terms of your choice, provided that the terms permit modification
-   of the work for the customer's own use and reverse engineering for
-   debugging such modifications.
-
-   You must give prominent notice with each copy of the work that the
-   Library is used in it and that the Library and its use are covered
-   by this License. You must supply a copy of this License. If the work
-   during execution displays copyright notices, you must include the
-   copyright notice for the Library among them, as well as a reference
-   directing the user to the copy of this License. Also, you must do
-   one of these things:
-
-      a) Accompany the work with the complete corresponding
-      machine-readable source code for the Library including whatever
-      changes were used in the work (which must be distributed under
-      Sections 1 and 2 above); and, if the work is an executable linked
-      with the Library, with the complete machine-readable "work that
-      uses the Library", as object code and/or source code, so that the
-      user can modify the Library and then relink to produce a modified
-      executable containing the modified Library. (It is understood
-      that the user who changes the contents of definitions files in the
-      Library will not necessarily be able to recompile the application
-      to use the modified definitions.)
-
-      b) Use a suitable shared library mechanism for linking with the
-      Library. A suitable mechanism is one that (1) uses at run time a
-      copy of the library already present on the user's computer system,
-      rather than copying library functions into the executable, and
-      (2) will operate properly with a modified version of the library,
-      if the user installs one, as long as the modified version is
-      interface-compatible with the version that the work was made with.
-
-      c) Accompany the work with a written offer, valid for at least three
-      years, to give the same user the materials specified in Subsection
-      6a, above, for a charge no more than the cost of performing this
-      distribution.
-
-      d) If distribution of the work is made by offering access to copy
-      from a designated place, offer equivalent access to copy the above
-      specified materials from the same place.
-
-      e) Verify that the user has already received a copy of these
-      materials or that you have already sent this user a copy.
-
-   For an executable, the required form of the "work that uses the
-   Library" must include any data and utility programs needed for
-   reproducing the executable from it. However, as a special exception,
-   the materials to be distributed need not include anything that is
-   normally distributed (in either source or binary form) with the major
-   components (compiler, kernel, and so on) of the operating system on
-   which the executable runs, unless that component itself accompanies
-   the executable.
-
-   It may happen that this requirement contradicts the license
-   restrictions of other proprietary libraries that do not normally
-   accompany the operating system. Such a contradiction means you
-   cannot use both them and the Library together in an executable that
-   you distribute.
-
-   7. You may place library facilities that are a work based on the
-   Library side-by-side in a single library together with other library
-   facilities not covered by this License, and distribute such a combined
-   library, provided that the separate distribution of the work based on
-   the Library and of the other library facilities is otherwise permitted,
-   and provided that you do these two things:
-
-      a) Accompany the combined library with a copy of the same work based
-      on the Library, uncombined with any other library facilities. This
-      must be distributed under the terms of the Sections above.
-
-      b) Give prominent notice with the combined library of the fact
-      that part of it is a work based on the Library, and explaining
-      where to find the accompanying uncombined form of the same work.
-
-   8. You may not copy, modify, sublicense, link with, or distribute the
-   Library except as expressly provided under this License. Any attempt
-   otherwise to copy, modify, sublicense, link with, or distribute the
-   Library is void, and will automatically terminate your rights under
-   this License. However, parties who have received copies, or rights,
-   from you under this License will not have their licenses terminated
-   so long as such parties remain in full compliance.
-
-   9. You are not required to accept this License, since you have not
-   signed it. However, nothing else grants you permission to modify
-   or distribute the Library or its derivative works. These actions
-   are prohibited by law if you do not accept this License. Therefore,
-   by modifying or distributing the Library (or any work based on the
-   Library), you indicate your acceptance of this License to do so, and
-   all its terms and conditions for copying, distributing or modifying
-   the Library or works based on it.
-
-   10. Each time you redistribute the Library (or any work based on
-   the Library), the recipient automatically receives a license from
-   the original licensor to copy, distribute, link with or modify the
-   Library subject to these terms and conditions. You may not impose
-   any further restrictions on the recipients' exercise of the rights
-   granted herein. You are not responsible for enforcing compliance by
-   third parties with this License.
-
-   11. If, as a consequence of a court judgment or allegation of patent
-   infringement or for any other reason (not limited to patent issues),
-   conditions are imposed on you (whether by court order, agreement
-   or otherwise) that contradict the conditions of this License, they
-   do not excuse you from the conditions of this License. If you cannot
-   distribute so as to satisfy simultaneously your obligations under this
-   License and any other pertinent obligations, then as a consequence
-   you may not distribute the Library at all. For example, if a patent
-   license would not permit royalty-free redistribution of the Library
-   by all those who receive copies directly or indirectly through you,
-   then the only way you could satisfy both it and this License would
-   be to refrain entirely from distribution of the Library.
-
-   If any portion of this section is held invalid or unenforceable under
-   any particular circumstance, the balance of the section is intended
-   to apply, and the section as a whole is intended to apply in other
-   circumstances.
-
-   It is not the purpose of this section to induce you to infringe any
-   patents or other property right claims or to contest validity of
-   any such claims; this section has the sole purpose of protecting
-   the integrity of the free software distribution system which
-   is implemented by public license practices. Many people have made
-   generous contributions to the wide range of software distributed
-   through that system in reliance on consistent application of that
-   system; it is up to the author/donor to decide if he or she is willing
-   to distribute software through any other system and a licensee cannot
-   impose that choice.
-
-   This section is intended to make thoroughly clear what is believed
-   to be a consequence of the rest of this License.
-
-   12. If the distribution and/or use of the Library is restricted in
-   certain countries either by patents or by copyrighted interfaces, the
-   original copyright holder who places the Library under this License
-   may add an explicit geographical distribution limitation excluding
-   those countries, so that distribution is permitted only in or among
-   countries not thus excluded. In such case, this License incorporates
-   the limitation as if written in the body of this License.
-
-   13. The Free Software Foundation may publish revised and/or new
-   versions of the Lesser General Public License from time to time. Such
-   new versions will be similar in spirit to the present version, but
-   may differ in detail to address new problems or concerns.
-
-   Each version is given a distinguishing version number. If the Library
-   specifies a version number of this License which applies to it and
-   "any later version", you have the option of following the terms and
-   conditions either of that version or of any later version published
-   by the Free Software Foundation. If the Library does not specify a
-   license version number, you may choose any version ever published by
-   the Free Software Foundation.
-
-   14. If you wish to incorporate parts of the Library into other free
-   programs whose distribution conditions are incompatible with these,
-   write to the author to ask for permission. For software which is
-   copyrighted by the Free Software Foundation, write to the Free Software
-   Foundation; we sometimes make exceptions for this. Our decision will
-   be guided by the two goals of preserving the free status of all
-   derivatives of our free software and of promoting the sharing and
-   reuse of software generally.
-
-   NO WARRANTY
-
-   15. BECAUSE THE LIBRARY IS LICENSED FREE OF CHARGE, THERE IS NO
-   WARRANTY FOR THE LIBRARY, TO THE EXTENT PERMITTED BY APPLICABLE
-   LAW. EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS
-   AND/OR OTHER PARTIES PROVIDE THE LIBRARY "AS IS" WITHOUT WARRANTY OF
-   ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO,
-   THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
-   PURPOSE. THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE
-   LIBRARY IS WITH YOU. SHOULD THE LIBRARY PROVE DEFECTIVE, YOU ASSUME
-   THE COST OF ALL NECESSARY SERVICING, REPAIR OR CORRECTION.
-
-   16. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO
-   IN WRITING WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY
-   MODIFY AND/OR REDISTRIBUTE THE LIBRARY AS PERMITTED ABOVE, BE LIABLE
-   TO YOU FOR DAMAGES, INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR
-   CONSEQUENTIAL DAMAGES ARISING OUT OF THE USE OR INABILITY TO USE
-   THE LIBRARY (INCLUDING BUT NOT LIMITED TO LOSS OF DATA OR DATA BEING
-   RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD PARTIES OR
-   A FAILURE OF THE LIBRARY TO OPERATE WITH ANY OTHER SOFTWARE), EVEN
-   IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF
-   SUCH DAMAGES. END OF TERMS AND CONDITIONS
-
-How to Apply These Terms to Your New Libraries
-
-If you develop a new library, and you want it to be of the greatest
-possible use to the public, we recommend making it free software that
-everyone can redistribute and change. You can do so by permitting
-redistribution under these terms (or, alternatively, under the terms of
-the ordinary General Public License).
-
-To apply these terms, attach the following notices to the library. It is
-safest to attach them to the start of each source file to most effectively
-convey the exclusion of warranty; and each file should have at least the
-"copyright" line and a pointer to where the full notice is found.
-
-<one line to give the library's name and an idea of what it does.>
-
-Copyright (C) <year> <name of author>
-
-This library is free software; you can redistribute it and/or modify it
-under the terms of the GNU Lesser General Public License as published
-by the Free Software Foundation; either version 2.1 of the License, or
-(at your option) any later version.
-
-This library is distributed in the hope that it will be useful, but
-WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
-or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public
-License for more details.
-
-You should have received a copy of the GNU Lesser General Public License
-along with this library; if not, write to the Free Software Foundation,
-Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
-
-Also add information on how to contact you by electronic and paper mail.
-
-You should also get your employer (if you work as a programmer) or
-your school, if any, to sign a "copyright disclaimer" for the library,
-if necessary. Here is a sample; alter the names:
-
-Yoyodyne, Inc., hereby disclaims all copyright interest in
-
-the library `Frob' (a library for tweaking knobs) written
-
-by James Random Hacker.
-
-< signature of Ty Coon > , 1 April 1990
-
-Ty Coon, President of Vice
-
-That's all there is to it!

Makefile.am

@@ -7,7 +7,27 @@
 # Copyright (c) 2002-2018 The strace developers.
 # All rights reserved.
 #
-# SPDX-License-Identifier: LGPL-2.1-or-later
+# Redistribution and use in source and binary forms, with or without
+# modification, are permitted provided that the following conditions
+# are met:
+# 1. Redistributions of source code must retain the above copyright
+#    notice, this list of conditions and the following disclaimer.
+# 2. Redistributions in binary form must reproduce the above copyright
+#    notice, this list of conditions and the following disclaimer in the
+#    documentation and/or other materials provided with the distribution.
+# 3. The name of the author may not be used to endorse or promote products
+#    derived from this software without specific prior written permission.
+#
+# THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
+# IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
+# OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
+# IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
+# INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
+# NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+# DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+# THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
+# THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 if HAVE_M32_RUNTIME
 TESTS_M32 = tests-m32
@@ -41,8 +61,9 @@ AM_CPPFLAGS_FOR_BUILD = $(AM_CPPFLAGS)
 
 include xlat/Makemodule.am
 
-strace_CPPFLAGS = $(AM_CPPFLAGS)
-strace_CFLAGS = $(AM_CFLAGS)
+strace_CPPFLAGS = $(AM_CPPFLAGS) -DHAVE_DEFS_H
+strace_CFLAGS = $(AM_CFLAGS) -DMPERS_WORDSIZE=PERSONALITY0_WORDSIZE \
+			     -DMPERS_KLONGSIZE=PERSONALITY0_KLONGSIZE
 strace_LDFLAGS =
 strace_LDADD = libstrace.a $(clock_LIBS) $(timer_LIBS)
 noinst_LIBRARIES = libstrace.a
@@ -127,15 +148,13 @@ 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	\
 	futex.c		\
 	gcc_compat.h	\
-	get_personality.c \
-	get_personality.h \
 	get_robust_list.c \
 	getcpu.c	\
 	getcwd.c	\
@@ -160,7 +179,6 @@ strace_SOURCES =	\
 	kexec.c		\
 	keyctl.c	\
 	keyctl_kdf_params.h \
-	kill_save_errno.h \
 	kvm.c		\
 	largefile_wrappers.h \
 	ldt.c		\
@@ -168,7 +186,6 @@ strace_SOURCES =	\
 	linux/asm_stat.h \
 	linux/x32/asm_stat.h \
 	linux/x86_64/asm_stat.h \
-	list.h		\
 	listen.c	\
 	lookup_dcookie.c \
 	loop.c		\
@@ -188,15 +205,15 @@ strace_SOURCES =	\
 	msghdr.h	\
 	mtd.c		\
 	native_defs.h	\
-	nbd_ioctl.c	\
 	negated_errno.h	\
 	net.c		\
 	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 \
@@ -205,7 +222,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	\
@@ -228,11 +244,9 @@ 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 \
 	print_mac.c	\
 	print_mq_attr.c	\
 	print_msgbuf.c	\
@@ -251,11 +265,9 @@ strace_SOURCES =	\
 	process.c	\
 	process_vm.c	\
 	ptp.c		\
+	ptp_clock.h	\
 	ptrace.h	\
-	ptrace_syscall_info.c \
-	ptrace_syscall_info.h \
 	quota.c		\
-	random_ioctl.c	\
 	readahead.c	\
 	readlink.c	\
 	reboot.c	\
@@ -270,6 +282,7 @@ strace_SOURCES =	\
 	rtc.c		\
 	rtnl_addr.c	\
 	rtnl_addrlabel.c \
+	rtnl_cachereport.c \
 	rtnl_dcb.c	\
 	rtnl_link.c	\
 	rtnl_mdb.c	\
@@ -279,6 +292,7 @@ strace_SOURCES =	\
 	rtnl_nsid.c	\
 	rtnl_route.c	\
 	rtnl_rule.c	\
+	rtnl_stats.c	\
 	rtnl_tc.c	\
 	rtnl_tc_action.c \
 	s390.c		\
@@ -308,14 +322,15 @@ 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	\
 	sysent.h	\
 	sysent_shorthand_defs.h \
 	sysent_shorthand_undefs.h \
+	sysfs.c		\
 	sysinfo.c	\
 	syslog.c	\
 	sysmips.c	\
@@ -349,7 +364,10 @@ strace_SOURCES =	\
 	$(strace_SOURCES_check) \
 	# end of strace_SOURCES
 
-strace_SOURCES_check = bpf_attr_check.c
+strace_SOURCES_check = \
+	bpf_attr_check.c	\
+	ptp_clock_check.c	\
+	# end of strace_SOURCES_check
 
 if ENABLE_STACKTRACE
 strace_SOURCES += unwind.c unwind.h
@@ -392,8 +410,6 @@ EXTRA_DIST =				\
 	CREDITS				\
 	ChangeLog			\
 	ChangeLog-CVS			\
-	LGPL-2.1-or-later		\
-	README-configure		\
 	README-linux-ptrace		\
 	debian/changelog		\
 	debian/compat			\
@@ -410,6 +426,7 @@ EXTRA_DIST =				\
 	debian/strace64.manpages	\
 	debian/watch			\
 	gen_bpf_attr_check.sh		\
+	gen_ptp_clock_check.sh		\
 	generate_sen.sh			\
 	ioctl_iocdef.c			\
 	ioctlsort.c			\
@@ -421,8 +438,9 @@ EXTRA_DIST =				\
 	linux/64/ioctls_inc.h		\
 	linux/64/syscallent.h		\
 	linux/aarch64/arch_defs_.h	\
-	linux/aarch64/arch_get_personality.c \
 	linux/aarch64/arch_regs.c	\
+	linux/aarch64/arch_regs.h	\
+	linux/aarch64/arch_rt_sigframe.c	\
 	linux/aarch64/arch_sigreturn.c	\
 	linux/aarch64/get_error.c	\
 	linux/aarch64/get_scno.c	\
@@ -441,6 +459,8 @@ EXTRA_DIST =				\
 	linux/alpha/arch_defs_.h	\
 	linux/alpha/arch_getrval2.c	\
 	linux/alpha/arch_regs.c		\
+	linux/alpha/arch_regs.h		\
+	linux/alpha/arch_rt_sigframe.c	\
 	linux/alpha/arch_sigreturn.c	\
 	linux/alpha/errnoent.h		\
 	linux/alpha/get_error.c		\
@@ -456,6 +476,8 @@ EXTRA_DIST =				\
 	linux/alpha/syscallent.h	\
 	linux/alpha/userent.h		\
 	linux/arc/arch_regs.c		\
+	linux/arc/arch_regs.h		\
+	linux/arc/arch_rt_sigframe.c	\
 	linux/arc/get_error.c		\
 	linux/arc/get_scno.c		\
 	linux/arc/get_syscall_args.c	\
@@ -468,10 +490,11 @@ EXTRA_DIST =				\
 	linux/arch_defs_.h		\
 	linux/arch_kvm.c		\
 	linux/arch_regs.h		\
-	linux/arch_rt_sigframe.c	\
 	linux/arch_sigreturn.c		\
 	linux/arm/arch_defs_.h		\
 	linux/arm/arch_regs.c		\
+	linux/arm/arch_regs.h		\
+	linux/arm/arch_rt_sigframe.c	\
 	linux/arm/arch_sigreturn.c	\
 	linux/arm/get_error.c		\
 	linux/arm/get_scno.c		\
@@ -486,6 +509,8 @@ EXTRA_DIST =				\
 	linux/arm/syscallent.h		\
 	linux/arm/userent.h		\
 	linux/avr32/arch_regs.c		\
+	linux/avr32/arch_regs.h		\
+	linux/avr32/arch_rt_sigframe.c	\
 	linux/avr32/get_error.c		\
 	linux/avr32/get_scno.c		\
 	linux/avr32/get_syscall_args.c	\
@@ -498,6 +523,7 @@ EXTRA_DIST =				\
 	linux/avr32/userent.h		\
 	linux/bfin/arch_defs_.h		\
 	linux/bfin/arch_regs.c		\
+	linux/bfin/arch_rt_sigframe.c	\
 	linux/bfin/get_error.c		\
 	linux/bfin/get_scno.c		\
 	linux/bfin/get_syscall_args.c	\
@@ -510,12 +536,12 @@ EXTRA_DIST =				\
 	linux/bfin/set_scno.c		\
 	linux/bfin/syscallent.h		\
 	linux/bfin/userent.h		\
-	linux/check_scno.c		\
 	linux/dummy.h			\
 	linux/errnoent.h		\
 	linux/getregs_old.h		\
 	linux/hppa/arch_defs_.h		\
 	linux/hppa/arch_regs.c		\
+	linux/hppa/arch_regs.h		\
 	linux/hppa/arch_rt_sigframe.c	\
 	linux/hppa/errnoent.h		\
 	linux/hppa/get_error.c		\
@@ -530,9 +556,10 @@ EXTRA_DIST =				\
 	linux/hppa/set_scno.c		\
 	linux/hppa/signalent.h		\
 	linux/hppa/syscallent.h		\
-	linux/i386/arch_defs_.h		\
 	linux/i386/arch_kvm.c		\
+	linux/i386/arch_defs_.h		\
 	linux/i386/arch_regs.c		\
+	linux/i386/arch_regs.h		\
 	linux/i386/arch_rt_sigframe.c	\
 	linux/i386/arch_sigreturn.c	\
 	linux/i386/get_error.c		\
@@ -561,11 +588,13 @@ EXTRA_DIST =				\
 	linux/ia64/rt_sigframe.h	\
 	linux/ia64/set_error.c		\
 	linux/ia64/set_scno.c		\
+	linux/ia64/shuffle_scno.c	\
 	linux/ia64/syscallent.h		\
 	linux/ia64/userent.h		\
 	linux/inet_diag.h		\
 	linux/m68k/arch_defs_.h		\
 	linux/m68k/arch_regs.c		\
+	linux/m68k/arch_regs.h		\
 	linux/m68k/arch_rt_sigframe.c	\
 	linux/m68k/arch_sigreturn.c	\
 	linux/m68k/get_error.c		\
@@ -580,6 +609,7 @@ EXTRA_DIST =				\
 	linux/m68k/syscallent.h		\
 	linux/m68k/userent.h		\
 	linux/metag/arch_regs.c		\
+	linux/metag/arch_regs.h		\
 	linux/metag/arch_rt_sigframe.c	\
 	linux/metag/get_error.c		\
 	linux/metag/get_scno.c		\
@@ -592,6 +622,7 @@ EXTRA_DIST =				\
 	linux/metag/syscallent.h	\
 	linux/microblaze/arch_defs_.h	\
 	linux/microblaze/arch_regs.c	\
+	linux/microblaze/arch_rt_sigframe.c	\
 	linux/microblaze/arch_sigreturn.c	\
 	linux/microblaze/get_error.c	\
 	linux/microblaze/get_scno.c	\
@@ -607,6 +638,8 @@ EXTRA_DIST =				\
 	linux/mips/arch_defs_.h		\
 	linux/mips/arch_getrval2.c	\
 	linux/mips/arch_regs.c		\
+	linux/mips/arch_regs.h		\
+	linux/mips/arch_rt_sigframe.c	\
 	linux/mips/arch_sigreturn.c	\
 	linux/mips/errnoent.h		\
 	linux/mips/genstub.sh		\
@@ -629,6 +662,8 @@ EXTRA_DIST =				\
 	linux/netlink_diag.h		\
 	linux/nios2/arch_defs_.h	\
 	linux/nios2/arch_regs.c		\
+	linux/nios2/arch_regs.h		\
+	linux/nios2/arch_rt_sigframe.c	\
 	linux/nios2/get_error.c		\
 	linux/nios2/get_scno.c		\
 	linux/nios2/get_syscall_args.c	\
@@ -640,6 +675,8 @@ EXTRA_DIST =				\
 	linux/nios2/syscallent.h	\
 	linux/nr_prefix.c		\
 	linux/or1k/arch_regs.c		\
+	linux/or1k/arch_regs.h		\
+	linux/or1k/arch_rt_sigframe.c	\
 	linux/or1k/get_error.c		\
 	linux/or1k/get_scno.c		\
 	linux/or1k/get_syscall_args.c	\
@@ -653,6 +690,7 @@ EXTRA_DIST =				\
 	linux/packet_diag.h		\
 	linux/powerpc/arch_defs_.h	\
 	linux/powerpc/arch_regs.c	\
+	linux/powerpc/arch_regs.h	\
 	linux/powerpc/arch_rt_sigframe.c	\
 	linux/powerpc/arch_sigreturn.c	\
 	linux/powerpc/errnoent.h	\
@@ -669,8 +707,8 @@ EXTRA_DIST =				\
 	linux/powerpc/syscallent.h	\
 	linux/powerpc/userent.h		\
 	linux/powerpc64/arch_defs_.h	\
-	linux/powerpc64/arch_get_personality.c \
 	linux/powerpc64/arch_regs.c	\
+	linux/powerpc64/arch_regs.h	\
 	linux/powerpc64/arch_rt_sigframe.c	\
 	linux/powerpc64/arch_sigreturn.c	\
 	linux/powerpc64/errnoent.h	\
@@ -690,11 +728,11 @@ EXTRA_DIST =				\
 	linux/powerpc64/syscallent.h	\
 	linux/powerpc64/syscallent1.h	\
 	linux/powerpc64/userent.h	\
-	linux/ptrace_pokeuser.c		\
 	linux/raw_syscall.h		\
 	linux/riscv/arch_defs_.h	\
-	linux/riscv/arch_get_personality.c \
 	linux/riscv/arch_regs.c		\
+	linux/riscv/arch_regs.h		\
+	linux/riscv/arch_rt_sigframe.c	\
 	linux/riscv/get_error.c		\
 	linux/riscv/get_scno.c		\
 	linux/riscv/get_syscall_args.c	\
@@ -710,6 +748,8 @@ EXTRA_DIST =				\
 	linux/rt_sigframe.h		\
 	linux/s390/arch_defs_.h		\
 	linux/s390/arch_regs.c		\
+	linux/s390/arch_regs.h		\
+	linux/s390/arch_rt_sigframe.c	\
 	linux/s390/arch_sigreturn.c	\
 	linux/s390/get_error.c		\
 	linux/s390/get_scno.c		\
@@ -725,8 +765,9 @@ EXTRA_DIST =				\
 	linux/s390/userent0.h		\
 	linux/s390/userent1.h		\
 	linux/s390x/arch_defs_.h	\
-	linux/s390x/arch_get_personality.c \
 	linux/s390x/arch_regs.c		\
+	linux/s390x/arch_regs.h		\
+	linux/s390x/arch_rt_sigframe.c	\
 	linux/s390x/arch_sigreturn.c	\
 	linux/s390x/get_error.c		\
 	linux/s390x/get_scno.c		\
@@ -745,6 +786,7 @@ EXTRA_DIST =				\
 	linux/sh/arch_defs_.h		\
 	linux/sh/arch_getrval2.c	\
 	linux/sh/arch_regs.c		\
+	linux/sh/arch_rt_sigframe.c	\
 	linux/sh/get_error.c		\
 	linux/sh/get_scno.c		\
 	linux/sh/get_syscall_args.c	\
@@ -760,6 +802,7 @@ EXTRA_DIST =				\
 	linux/sh64/arch_defs_.h		\
 	linux/sh64/arch_regs.c		\
 	linux/sh64/arch_regs.h		\
+	linux/sh64/arch_rt_sigframe.c	\
 	linux/sh64/get_error.c		\
 	linux/sh64/get_scno.c		\
 	linux/sh64/get_syscall_args.c	\
@@ -780,6 +823,8 @@ EXTRA_DIST =				\
 	linux/sparc/arch_defs_.h	\
 	linux/sparc/arch_getrval2.c	\
 	linux/sparc/arch_regs.c		\
+	linux/sparc/arch_regs.h		\
+	linux/sparc/arch_rt_sigframe.c	\
 	linux/sparc/arch_sigreturn.c	\
 	linux/sparc/errnoent.h		\
 	linux/sparc/get_error.c		\
@@ -795,9 +840,9 @@ EXTRA_DIST =				\
 	linux/sparc/syscallent.h	\
 	linux/sparc/userent.h		\
 	linux/sparc64/arch_defs_.h	\
-	linux/sparc64/arch_get_personality.c \
 	linux/sparc64/arch_getrval2.c	\
 	linux/sparc64/arch_regs.c	\
+	linux/sparc64/arch_regs.h	\
 	linux/sparc64/arch_rt_sigframe.c	\
 	linux/sparc64/arch_sigreturn.c	\
 	linux/sparc64/errnoent.h	\
@@ -819,8 +864,9 @@ EXTRA_DIST =				\
 	linux/subcall.h			\
 	linux/syscall.h			\
 	linux/tile/arch_defs_.h		\
-	linux/tile/arch_get_personality.c \
 	linux/tile/arch_regs.c		\
+	linux/tile/arch_regs.h		\
+	linux/tile/arch_rt_sigframe.c	\
 	linux/tile/arch_sigreturn.c	\
 	linux/tile/get_error.c		\
 	linux/tile/get_scno.c		\
@@ -840,13 +886,11 @@ EXTRA_DIST =				\
 	linux/userent.h			\
 	linux/userent0.h		\
 	linux/x32/arch_defs_.h		\
-	linux/x32/arch_get_personality.c \
 	linux/x32/arch_kvm.c		\
 	linux/x32/arch_regs.c		\
 	linux/x32/arch_regs.h		\
 	linux/x32/arch_rt_sigframe.c	\
 	linux/x32/arch_sigreturn.c	\
-	linux/x32/check_scno.c		\
 	linux/x32/get_error.c		\
 	linux/x32/get_scno.c		\
 	linux/x32/get_syscall_args.c	\
@@ -854,7 +898,6 @@ EXTRA_DIST =				\
 	linux/x32/ioctls_arch1.h	\
 	linux/x32/ioctls_inc0.h		\
 	linux/x32/ioctls_inc1.h		\
-	linux/x32/ptrace_pokeuser.c	\
 	linux/x32/raw_syscall.h		\
 	linux/x32/rt_sigframe.h		\
 	linux/x32/set_error.c		\
@@ -864,7 +907,6 @@ EXTRA_DIST =				\
 	linux/x32/syscallent1.h		\
 	linux/x32/userent.h		\
 	linux/x86_64/arch_defs_.h	\
-	linux/x86_64/arch_get_personality.c \
 	linux/x86_64/arch_kvm.c		\
 	linux/x86_64/arch_regs.c	\
 	linux/x86_64/arch_regs.h	\
@@ -891,6 +933,7 @@ EXTRA_DIST =				\
 	linux/x86_64/syscallent2.h	\
 	linux/x86_64/userent.h		\
 	linux/xtensa/arch_regs.c	\
+	linux/xtensa/arch_rt_sigframe.c	\
 	linux/xtensa/get_error.c	\
 	linux/xtensa/get_scno.c		\
 	linux/xtensa/get_syscall_args.c	\
@@ -928,6 +971,9 @@ $(srcdir)/.version:
 bpf_attr_check.c: $(srcdir)/bpf_attr.h $(srcdir)/gen_bpf_attr_check.sh
 	$(srcdir)/gen_bpf_attr_check.sh $< > $@-t && mv $@-t $@
 
+ptp_clock_check.c: $(srcdir)/ptp_clock.h $(srcdir)/gen_ptp_clock_check.sh
+	$(srcdir)/gen_ptp_clock_check.sh $< > $@-t && mv $@-t $@
+
 strace_SOURCES_c = \
 	$(filter %.c,$(strace_SOURCES)) $(filter %.c,$(libstrace_a_SOURCES))
 
@@ -1007,11 +1053,11 @@ ioctls_all%.h: $(srcdir)/$(OS)/$(ARCH)/ioctls_inc%.h $(srcdir)/$(OS)/$(ARCH)/ioc
 
 BUILT_SOURCES = $(ioctl_redefs_h) $(ioctlent_h) \
 		bpf_attr_check.c native_printer_decls.h native_printer_defs.h \
-		printers.h sen.h sys_func.h .version
+		printers.h ptp_clock_check.c sen.h sys_func.h .version
 CLEANFILES    = $(ioctl_redefs_h) $(ioctlent_h) $(mpers_preproc_files) \
 		ioctl_iocdef.h ioctl_iocdef.i \
 		bpf_attr_check.c native_printer_decls.h native_printer_defs.h \
-		printers.h sen.h sys_func.h
+		printers.h ptp_clock_check.c sen.h sys_func.h
 DISTCLEANFILES = gnu/stubs-32.h gnu/stubs-x32.h linux/linux/signal.h
 
 include scno.am
@@ -1041,7 +1087,7 @@ mpers-m%.stamp: $(srcdir_mpers_source_files) | printers.h
 		CFLAGS="$(mpers_sh_opts) -DMPERS_IS_$(mpers_NAME)" \
 		CPP="$(CPP)" \
 		CPPFLAGS="$(mpers_sh_opts) -DIN_MPERS -DMPERS_IS_$(mpers_NAME)" \
-		$(srcdir)/mpers.sh $(mpers_NAME) $(mpers_CC_FLAGS) $$f || exit; \
+		$(srcdir)/mpers.sh "$(mpers_NAME)" "$(mpers_CC_FLAGS)" "$$f" || exit; \
 	done
 	> $@
 
@@ -1112,7 +1158,9 @@ BUILT_SOURCES += $(mpers_m32_targets)
 CLEANFILES    += $(mpers_m32_targets)
 
 $(mpers_m32_targets): mpers_NAME = m32
-$(mpers_m32_targets): mpers_CC_FLAGS = @cc_flags_m32@
+$(mpers_m32_targets): mpers_CC_FLAGS = @cc_flags_m32@ \
+				       -DMPERS_WORDSIZE=PERSONALITY1_WORDSIZE \
+				       -DMPERS_KLONGSIZE=PERSONALITY1_KLONGSIZE
 
 endif # HAVE_M32_MPERS
 
@@ -1129,7 +1177,9 @@ BUILT_SOURCES += $(mpers_mx32_targets)
 CLEANFILES    += $(mpers_mx32_targets)
 
 $(mpers_mx32_targets): mpers_NAME = mx32
-$(mpers_mx32_targets): mpers_CC_FLAGS = @cc_flags_mx32@
+$(mpers_mx32_targets): mpers_CC_FLAGS = @cc_flags_mx32@ \
+					-DMPERS_WORDSIZE=PERSONALITY2_WORDSIZE \
+					-DMPERS_KLONGSIZE=PERSONALITY2_KLONGSIZE
 
 endif # HAVE_MX32_MPERS
 

NEWS

@@ -1,75 +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.
-  * All the rest of strace is now provided under the terms of
-    the GNU Lesser General Public License version 2.1 or later.
-
-* Changes in behavior
-  * If strace is interrupted by a signal it handles (currently
-    one of HUP, INT, QUIT, PIPE, or TERM), strace terminates
-    itself with this signal.
-
-* Improvements
-  * Implemented obtainment of system call information using
-    PTRACE_GET_SYSCALL_INFO ptrace API.
-  * Implemented decoding of PTRACE_GET_SYSCALL_INFO ptrace request.
-  * Implemented decoding of BLKGETZONESZ, BLKGETNRZONES, and RND* ioctl
-    commands.
-  * Enhanced xlat styles support configured by -X option.
-  * Enhanced internet address formatting in structureless contexts.
-  * 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
-  * Fixed "xlat_idx: Unexpected xlat value 0" warnings.
-  * Fixed sthyi output format on s390.
-  * Documented -X option in strace -h output.
-
-Noteworthy changes in release 4.25 (2018-10-30)
-===============================================
-
-* Improvements
-  * Implemented decoding of KVM_CHECK_EXTENSION and NBD_* ioctl commands.
-  * Implemented decoding of SOL_XDP socket option names.
-  * Implemented decoding of AF_PACKET protocols in socket syscall.
-  * Implemented decoding of AF_AX25 and AF_X25 addresses, protocols,
-    and options.
-  * Implemented stack trace printing on receiving signals.
-  * Enhanced xlat styles support configured by -X option.
-  * Enhanced decoding of IFLA_*, NETCONFA_*, and SMC_DIAG_* netlink attributes.
-  * Wired up io_pgetevents syscall on arm, sparc, and sparc64.
-  * Updated lists of AF_*, AUDIT_*, BPF_*, IFLA_*, IN_*, IPSTATS_*,
-    IPV4_DEVCONF_*, NT_*, SCTP_*, SO_*, SOCK_*, SOL_*, and V4L2_* constants.
-  * Updated lists of ioctl commands from Linux 4.19.
-
-* Bug fixes
-  * Fixed decoding of bit sets in evdev ioctl commands.
-  * Fixed decoding of EVIOCGBIT(0, ...) ioctl commands.
-  * Fixed test suite for the case when mlockall and unimplemented syscalls
-    are explicitly disabled by a seccomp filter.
-
 Noteworthy changes in release 4.24 (2018-08-14)
 ===============================================
 

README-github_gitlab-autogenerated-archives.txt

@@ -1,11 +0,0 @@
-github/gitlab autogenerated archives are not supported
-======================================================
-
-This information applies to bundles automatically generated
-by github and gitlab.
-
-strace's program version is maintained using git-version-gen script, therefore,
-building strace depends on "git describe" (a full git clone is needed for this)
-or, alternatively, a .tarball-version file.  Neither github nor gitlab can
-provide the latter, they also do not allow to inject a .tarball-version file
-during export archiving.

README.md

@@ -3,8 +3,7 @@ strace - the linux syscall tracer
 
 This is [strace](https://strace.io) -- a diagnostic, debugging and instructional userspace utility with a traditional command-line interface for Linux.  It is used to monitor and tamper with interactions between processes and the Linux kernel, which include system calls, signal deliveries, and changes of process state.  The operation of strace is made possible by the kernel feature known as [ptrace](http://man7.org/linux/man-pages/man2/ptrace.2.html).
 
-strace is released under the terms of [the GNU Lesser General Public License version 2.1 or later](LGPL-2.1-or-later); see the file [COPYING](COPYING) for details.
-strace test suite is released under the terms of [the GNU General Public License version 2 or later](tests/GPL-2.0-or-later); see the file [tests/COPYING](tests/COPYING) for details.
+strace is released under a Berkeley-style license at the request of Paul Kranenburg; see the file [COPYING](COPYING) for details.
 
 See the file [NEWS](NEWS) for information on what has changed in recent versions.
 

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>

affinity.c

@@ -1,9 +1,29 @@
 /*
  * 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
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in the
+ *    documentation and/or other materials provided with the distribution.
+ * 3. The name of the author may not be used to endorse or promote products
+ *    derived from this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
+ * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
+ * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
+ * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
+ * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
+ * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+ * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+ * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
+ * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
 #include "defs.h"

aio.c

@@ -6,7 +6,27 @@
  * Copyright (c) 1999-2018 The strace developers.
  * All rights reserved.
  *
- * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in the
+ *    documentation and/or other materials provided with the distribution.
+ * 3. The name of the author may not be used to endorse or promote products
+ *    derived from this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
+ * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
+ * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
+ * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
+ * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
+ * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+ * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+ * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
+ * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
 #include "defs.h"
@@ -14,6 +34,13 @@
 #include <linux/aio_abi.h>
 
 #include "xlat/aio_cmds.h"
+#include "xlat/aio_iocb_flags.h"
+
+#ifdef HAVE_STRUCT_IOCB_AIO_RW_FLAGS
+# define AIO_RW_FLAGS_FIELD aio_rw_flags
+#else
+# define AIO_RW_FLAGS_FIELD aio_reserved1
+#endif
 
 SYS_FUNC(io_setup)
 {
@@ -32,7 +59,7 @@ SYS_FUNC(io_destroy)
 }
 
 enum iocb_sub {
-	SUB_NONE, SUB_COMMON, SUB_VECTOR
+	SUB_NONE, SUB_COMMON, SUB_VECTOR, SUB_POLL
 };
 
 static enum iocb_sub
@@ -44,14 +71,13 @@ tprint_lio_opcode(unsigned int cmd)
 		[IOCB_CMD_FSYNC]	= SUB_NONE,
 		[IOCB_CMD_FDSYNC]	= SUB_NONE,
 		[IOCB_CMD_PREADX]	= SUB_NONE,
-		[IOCB_CMD_POLL]		= SUB_NONE,
+		[IOCB_CMD_POLL]		= SUB_POLL,
 		[IOCB_CMD_NOOP]		= SUB_NONE,
 		[IOCB_CMD_PREADV]	= SUB_VECTOR,
 		[IOCB_CMD_PWRITEV]	= SUB_VECTOR,
 	};
 
-	printxval_indexn_ex(ARRSZ_PAIR(aio_cmds) - 1, cmd, "IOCB_CMD_???",
-			    XLAT_STYLE_FMT_U);
+	printxval_ex(aio_cmds, cmd, "IOCB_CMD_???", XLAT_STYLE_FMT_U);
 
 	return cmd < ARRAY_SIZE(subs) ? subs[cmd] : SUB_NONE;
 }
@@ -59,14 +85,14 @@ tprint_lio_opcode(unsigned int cmd)
 static void
 print_common_flags(struct tcb *tcp, const struct iocb *cb)
 {
-/* IOCB_FLAG_RESFD is available since v2.6.22-rc1~47 */
-#ifdef IOCB_FLAG_RESFD
+	if (cb->aio_flags)
+		PRINT_FIELD_FLAGS(", ", *cb, aio_flags, aio_iocb_flags,
+				  "IOCB_FLAG_???");
+
 	if (cb->aio_flags & IOCB_FLAG_RESFD)
 		PRINT_FIELD_FD(", ", *cb, aio_resfd, tcp);
-
-	if (cb->aio_flags & ~IOCB_FLAG_RESFD)
-		PRINT_FIELD_X(", ", *cb, aio_flags);
-#endif
+	else if (cb->aio_resfd)
+		PRINT_FIELD_X(", ", *cb, aio_resfd);
 }
 
 static bool
@@ -82,20 +108,25 @@ print_iocb_header(struct tcb *tcp, const struct iocb *cb)
 {
 	enum iocb_sub sub;
 
-	if (cb->aio_data){
-		PRINT_FIELD_X("", *cb, aio_data);
-		tprints(", ");
+	PRINT_FIELD_X("", *cb, aio_data);
+
+	if (cb->aio_key)
+		PRINT_FIELD_U(", ", *cb, aio_key);
+
+	if (cb->AIO_RW_FLAGS_FIELD) {
+		tprints(", aio_rw_flags=");
+		printflags(rwf_flags, cb->AIO_RW_FLAGS_FIELD, "RWF_???");
 	}
 
-	if (cb->aio_key) {
-		PRINT_FIELD_U("", *cb, aio_key);
-		tprints(", ");
-	}
-
-	tprints("aio_lio_opcode=");
+	tprints(", aio_lio_opcode=");
 	sub = tprint_lio_opcode(cb->aio_lio_opcode);
-	if (cb->aio_reqprio)
+
+	if (cb->aio_flags & IOCB_FLAG_IOPRIO) {
+		tprints(", aio_reqprio=");
+		print_ioprio(zero_extend_signed_to_ull(cb->aio_reqprio));
+	} else if (cb->aio_reqprio) {
 		PRINT_FIELD_D(", ", *cb, aio_reqprio);
+	}
 
 	PRINT_FIELD_FD(", ", *cb, aio_fildes, tcp);
 
@@ -135,6 +166,10 @@ print_iocb(struct tcb *tcp, const struct iocb *cb)
 		PRINT_FIELD_D(", ", *cb, aio_offset);
 		print_common_flags(tcp, cb);
 		break;
+	case SUB_POLL:
+		PRINT_FIELD_FLAGS(", ", *cb, aio_buf, pollflags, "POLL???");
+		print_common_flags(tcp, cb);
+		break;
 	case SUB_NONE:
 		break;
 	}
@@ -235,7 +270,7 @@ print_io_getevents(struct tcb *tcp, bool has_usig)
 		 * whether the syscall has failed or not.
 		 */
 		temporarily_clear_syserror(tcp);
-		print_timespec(tcp, tcp->u_arg[4]);
+		print_timespec(tcp, tcp->u_arg[4], false);
 		if (has_usig) {
 			tprints(", ");
 			print_aio_sigset(tcp, tcp->u_arg[5]);

alpha.c

@@ -3,7 +3,27 @@
  * Copyright (c) 2016-2018 The strace developers.
  * All rights reserved.
  *
- * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in the
+ *    documentation and/or other materials provided with the distribution.
+ * 3. The name of the author may not be used to endorse or promote products
+ *    derived from this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
+ * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
+ * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
+ * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
+ * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
+ * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+ * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+ * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
+ * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
 #include "defs.h"

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 */

basic_filters.c

@@ -3,7 +3,27 @@
  * Copyright (c) 2016-2018 The strace developers.
  * All rights reserved.
  *
- * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in the
+ *    documentation and/or other materials provided with the distribution.
+ * 3. The name of the author may not be used to endorse or promote products
+ *    derived from this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
+ * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
+ * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
+ * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
+ * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
+ * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+ * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+ * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
+ * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
 #include "defs.h"

bind.c

@@ -3,10 +3,30 @@
  * 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
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in the
+ *    documentation and/or other materials provided with the distribution.
+ * 3. The name of the author may not be used to endorse or promote products
+ *    derived from this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
+ * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
+ * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
+ * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
+ * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
+ * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+ * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+ * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
+ * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
 #include "defs.h"

bjm.c

@@ -3,10 +3,30 @@
  * 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
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in the
+ *    documentation and/or other materials provided with the distribution.
+ * 3. The name of the author may not be used to endorse or promote products
+ *    derived from this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
+ * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
+ * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
+ * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
+ * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
+ * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+ * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+ * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
+ * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
 #include "defs.h"

block.c

@@ -4,7 +4,27 @@
  * Copyright (c) 2011-2018 The strace developers.
  * All rights reserved.
  *
- * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in the
+ *    documentation and/or other materials provided with the distribution.
+ * 3. The name of the author may not be used to endorse or promote products
+ *    derived from this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
+ * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
+ * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
+ * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
+ * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
+ * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+ * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+ * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
+ * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
 #include "defs.h"
@@ -47,7 +67,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
@@ -116,8 +136,6 @@ MPERS_PRINTER_DECL(int, block_ioctl, struct tcb *const tcp,
 	case BLKIOMIN:
 	case BLKIOOPT:
 	case BLKDISCARDZEROES:
-	case BLKGETZONESZ:
-	case BLKGETNRZONES:
 		if (entering(tcp))
 			return 0;
 		tprints(", ");

bootstrap

@@ -1,11 +1,9 @@
 #!/bin/sh -eu
-#
-# Copyright (c) 2014-2018 The strace developers.
-# All rights reserved.
-#
-# SPDX-License-Identifier: LGPL-2.1-or-later
+
+export LANG=C
 
 ./m4/gen_bpf_attr_m4.sh
+./m4/gen_ptp_clock_m4.sh
 ./generate_mpers_am.sh
 ./xlat/gen.sh
 ./tests/gen_pure_executables.sh
@@ -31,7 +29,7 @@ for m in m32 mx32; do
 	done
 done
 
-for f in README INSTALL; do
+for f in README; do
 	cp "dist/$f" .
 done
 

bpf.c

@@ -4,7 +4,27 @@
  * Copyright (c) 2015-2018 The strace developers.
  * All rights reserved.
  *
- * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in the
+ *    documentation and/or other materials provided with the distribution.
+ * 3. The name of the author may not be used to endorse or promote products
+ *    derived from this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
+ * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
+ * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
+ * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
+ * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
+ * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+ * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+ * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
+ * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
 #include "defs.h"
@@ -130,9 +150,9 @@ print_ebpf_insn(struct tcb * const tcp, void * const elem_buf,
 
 	/* We can't use PRINT_FIELD_XVAL on bit fields */
 	tprints(", dst_reg=");
-	printxval_index(ebpf_regs, insn->dst_reg, "BPF_REG_???");
+	printxval(ebpf_regs, insn->dst_reg, "BPF_REG_???");
 	tprints(", src_reg=");
-	printxval_index(ebpf_regs, insn->src_reg, "BPF_REG_???");
+	printxval(ebpf_regs, insn->src_reg, "BPF_REG_???");
 
 	PRINT_FIELD_D(", ", *insn, off);
 	PRINT_FIELD_X(", ", *insn, imm);
@@ -158,8 +178,8 @@ print_ebpf_prog(struct tcb *const tcp, const uint64_t addr, const uint32_t len)
 
 BEGIN_BPF_CMD_DECODER(BPF_MAP_CREATE)
 {
-	PRINT_FIELD_XVAL_INDEX("{", attr, map_type, bpf_map_types,
-			       "BPF_MAP_TYPE_???");
+	PRINT_FIELD_XVAL("{", attr, map_type, bpf_map_types,
+			 "BPF_MAP_TYPE_???");
 	PRINT_FIELD_U(", ", attr, key_size);
 	PRINT_FIELD_U(", ", attr, value_size);
 	PRINT_FIELD_U(", ", attr, max_entries);
@@ -228,8 +248,8 @@ BEGIN_BPF_CMD_DECODER(BPF_MAP_UPDATE_ELEM)
 	PRINT_FIELD_FD("{", attr, map_fd, tcp);
 	PRINT_FIELD_ADDR64(", ", attr, key);
 	PRINT_FIELD_ADDR64(", ", attr, value);
-	PRINT_FIELD_XVAL_INDEX(", ", attr, flags, bpf_map_update_elem_flags,
-			       "BPF_???");
+	PRINT_FIELD_XVAL(", ", attr, flags, bpf_map_update_elem_flags,
+			 "BPF_???");
 }
 END_BPF_CMD_DECODER(RVAL_DECODED)
 
@@ -250,8 +270,8 @@ END_BPF_CMD_DECODER(RVAL_DECODED)
 
 BEGIN_BPF_CMD_DECODER(BPF_PROG_LOAD)
 {
-	PRINT_FIELD_XVAL_INDEX("{", attr, prog_type, bpf_prog_types,
-			       "BPF_PROG_TYPE_???");
+	PRINT_FIELD_XVAL("{", attr, prog_type, bpf_prog_types,
+			 "BPF_PROG_TYPE_???");
 	PRINT_FIELD_U(", ", attr, insn_cnt);
 	tprints(", insns=");
 	print_ebpf_prog(tcp, attr.insns, attr.insn_cnt);
@@ -272,8 +292,11 @@ BEGIN_BPF_CMD_DECODER(BPF_PROG_LOAD)
 	/* kern_version field was added in Linux commit v4.1-rc1~84^2~50.  */
 	if (len <= offsetof(struct BPF_PROG_LOAD_struct, kern_version))
 		break;
-	tprints(", kern_version=");
-	print_kernel_version(attr.kern_version);
+	tprintf(", kern_version=KERNEL_VERSION(%u, %u, %u)",
+		attr.kern_version >> 16,
+		(attr.kern_version >> 8) & 0xFF,
+		attr.kern_version & 0xFF);
+
 	/* prog_flags field was added in Linux commit v4.12-rc2~34^2~29^2~2.  */
 	if (len <= offsetof(struct BPF_PROG_LOAD_struct, prog_flags))
 		break;
@@ -329,8 +352,7 @@ BEGIN_BPF_CMD_DECODER(BPF_PROG_ATTACH)
 {
 	PRINT_FIELD_FD("{", attr, target_fd, tcp);
 	PRINT_FIELD_FD(", ", attr, attach_bpf_fd, tcp);
-	PRINT_FIELD_XVAL_INDEX(", ", attr, attach_type, bpf_attach_type,
-			       "BPF_???");
+	PRINT_FIELD_XVAL(", ", attr, attach_type, bpf_attach_type, "BPF_???");
 	PRINT_FIELD_FLAGS(", ", attr, attach_flags, bpf_attach_flags,
 			  "BPF_F_???");
 }
@@ -339,8 +361,7 @@ END_BPF_CMD_DECODER(RVAL_DECODED)
 BEGIN_BPF_CMD_DECODER(BPF_PROG_DETACH)
 {
 	PRINT_FIELD_FD("{", attr, target_fd, tcp);
-	PRINT_FIELD_XVAL_INDEX(", ", attr, attach_type, bpf_attach_type,
-			       "BPF_???");
+	PRINT_FIELD_XVAL(", ", attr, attach_type, bpf_attach_type, "BPF_???");
 }
 END_BPF_CMD_DECODER(RVAL_DECODED)
 
@@ -642,8 +663,8 @@ BEGIN_BPF_CMD_DECODER(BPF_PROG_QUERY)
 
 	if (entering(tcp)) {
 		PRINT_FIELD_FD("{query={", attr, target_fd, tcp);
-		PRINT_FIELD_XVAL_INDEX(", ", attr, attach_type, bpf_attach_type,
-				       "BPF_???");
+		PRINT_FIELD_XVAL(", ", attr, attach_type, bpf_attach_type,
+				 "BPF_???");
 		PRINT_FIELD_FLAGS(", ", attr, query_flags, bpf_query_flags,
 				  "BPF_F_QUERY_???");
 		PRINT_FIELD_FLAGS(", ", attr, attach_flags, bpf_attach_flags,
@@ -713,7 +734,7 @@ SYS_FUNC(bpf)
 	int rc = RVAL_DECODED;
 
 	if (entering(tcp)) {
-		printxval_index(bpf_commands, cmd, "BPF_???");
+		printxval(bpf_commands, cmd, "BPF_???");
 		tprints(", ");
 	}
 

bpf_attr.h

@@ -2,11 +2,31 @@
  * Copyright (c) 2015-2018 Dmitry V. Levin <ldv@altlinux.org>
  * All rights reserved.
  *
- * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in the
+ *    documentation and/or other materials provided with the distribution.
+ * 3. The name of the author may not be used to endorse or promote products
+ *    derived from this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
+ * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
+ * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
+ * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
+ * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
+ * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+ * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+ * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
+ * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
 #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 +39,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 +67,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 +77,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 +88,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 +107,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 +126,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 +136,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 +150,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 +160,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 +175,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 +185,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 +198,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 +208,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 +218,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 +231,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 +261,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 +287,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 */

bpf_filter.c

@@ -5,7 +5,27 @@
  * Copyright (c) 2017-2018 The strace developers.
  * All rights reserved.
  *
- * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in the
+ *    documentation and/or other materials provided with the distribution.
+ * 3. The name of the author may not be used to endorse or promote products
+ *    derived from this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
+ * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
+ * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
+ * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
+ * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
+ * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+ * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+ * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
+ * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
 #include "defs.h"
@@ -36,10 +56,8 @@ print_bpf_filter_code(const uint16_t code, bool extended)
 	const struct xlat *mode = extended ? ebpf_mode : bpf_mode;
 	uint16_t i = code & ~BPF_CLASS(code);
 
-	if (extended)
-		printxval_index(ebpf_class, BPF_CLASS(code), "BPF_???");
-	else
-		printxval_index(bpf_class, BPF_CLASS(code), "BPF_???");
+	printxval(extended ? ebpf_class : bpf_class, BPF_CLASS(code),
+		  "BPF_???");
 	switch (BPF_CLASS(code)) {
 	case BPF_ST:
 	case BPF_STX:

bpf_filter.h

@@ -1,14 +1,34 @@
 /*
  * 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
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in the
+ *    documentation and/or other materials provided with the distribution.
+ * 3. The name of the author may not be used to endorse or promote products
+ *    derived from this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
+ * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
+ * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
+ * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
+ * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
+ * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+ * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+ * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
+ * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
 #ifndef STRACE_BPF_FILTER_H
-# define STRACE_BPF_FILTER_H
+#define STRACE_BPF_FILTER_H
 
 struct bpf_filter_block {
 	uint16_t code;

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;

bpf_seccomp_filter.c

@@ -1,10 +1,30 @@
 /*
  * 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
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in the
+ *    documentation and/or other materials provided with the distribution.
+ * 3. The name of the author may not be used to endorse or promote products
+ *    derived from this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
+ * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
+ * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
+ * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
+ * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
+ * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+ * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+ * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
+ * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
 #include "defs.h"

bpf_sock_filter.c

@@ -5,7 +5,27 @@
  * Copyright (c) 2017-2018 The strace developers.
  * All rights reserved.
  *
- * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in the
+ *    documentation and/or other materials provided with the distribution.
+ * 3. The name of the author may not be used to endorse or promote products
+ *    derived from this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
+ * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
+ * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
+ * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
+ * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
+ * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+ * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+ * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
+ * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
 #include "defs.h"

btrfs.c

@@ -3,17 +3,37 @@
  * Copyright (c) 2016-2018 The strace developers.
  * All rights reserved.
  *
- * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in the
+ *    documentation and/or other materials provided with the distribution.
+ * 3. The name of the author may not be used to endorse or promote products
+ *    derived from this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
+ * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
+ * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
+ * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
+ * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
+ * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+ * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+ * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
+ * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
 #include "defs.h"
 
 #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 +52,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 +61,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 +78,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 +117,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 +155,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 +242,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 +738,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 +749,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 +912,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 +1282,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

cacheflush.c

@@ -4,10 +4,30 @@
  * 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
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in the
+ *    documentation and/or other materials provided with the distribution.
+ * 3. The name of the author may not be used to endorse or promote products
+ *    derived from this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
+ * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
+ * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
+ * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
+ * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
+ * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+ * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+ * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
+ * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
 #include "defs.h"
@@ -20,15 +40,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 +92,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
 };
 

capability.c

@@ -2,10 +2,30 @@
  * 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
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in the
+ *    documentation and/or other materials provided with the distribution.
+ * 3. The name of the author may not be used to endorse or promote products
+ *    derived from this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
+ * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
+ * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
+ * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
+ * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
+ * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+ * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+ * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
+ * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
 #include "defs.h"

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,

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,

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)

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

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'

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

clone.c

@@ -7,7 +7,27 @@
  * Copyright (c) 2014-2018 The strace developers.
  * All rights reserved.
  *
- * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in the
+ *    documentation and/or other materials provided with the distribution.
+ * 3. The name of the author may not be used to endorse or promote products
+ *    derived from this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
+ * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
+ * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
+ * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
+ * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
+ * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+ * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+ * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
+ * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
 #include "defs.h"

configure.ac

@@ -8,7 +8,27 @@
 # Copyright (c) 2002-2018 The strace developers.
 # All rights reserved.
 #
-# SPDX-License-Identifier: LGPL-2.1-or-later
+# Redistribution and use in source and binary forms, with or without
+# modification, are permitted provided that the following conditions
+# are met:
+# 1. Redistributions of source code must retain the above copyright
+#    notice, this list of conditions and the following disclaimer.
+# 2. Redistributions in binary form must reproduce the above copyright
+#    notice, this list of conditions and the following disclaimer in the
+#    documentation and/or other materials provided with the distribution.
+# 3. The name of the author may not be used to endorse or promote products
+#    derived from this software without specific prior written permission.
+#
+# THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
+# IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
+# OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
+# IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
+# INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
+# NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+# DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+# THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
+# THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 AC_PREREQ(2.57)
 AC_INIT([strace],
@@ -335,7 +355,8 @@ AC_CHECK_MEMBERS([struct utsname.domainname],,, [#include <sys/utsname.h>])
 AC_CHECK_MEMBERS(m4_normalize([
 	siginfo_t.si_syscall,
 	siginfo_t.si_timerid,
-	siginfo_t.si_overrun
+	siginfo_t.si_overrun,
+	siginfo_t.si_trapno
 ]),,, [#include <signal.h>])
 
 AC_CHECK_MEMBERS(m4_normalize([
@@ -456,6 +477,10 @@ AC_CHECK_HEADERS([linux/bpf.h], [
 	st_BPF_ATTR
 ])
 
+AC_CHECK_HEADERS([linux/ptp_clock.h], [
+	st_PTP_CLOCK
+])
+
 AC_CHECK_HEADERS([bluetooth/bluetooth.h], [
 	AC_CHECK_MEMBERS([struct sockaddr_l2.l2_bdaddr_type],,,
 			 [#include <bluetooth/bluetooth.h>
@@ -473,6 +498,7 @@ AC_CHECK_MEMBERS(m4_normalize([
 
 AC_CHECK_TYPES([struct dcbmsg],,, [#include <linux/dcbnl.h>])
 AC_CHECK_TYPES([struct ifaddrlblmsg],,, [#include <linux/if_addrlabel.h>])
+AC_CHECK_TYPES([struct if_stats_msg],,, [#include <linux/if_link.h>])
 AC_CHECK_TYPES([struct netconfmsg],,, [#include <linux/netconf.h>])
 
 AC_CHECK_TYPES(m4_normalize([
@@ -550,11 +576,10 @@ AC_CHECK_TYPES([struct blk_user_trace_setup],,, [#include <linux/blktrace_api.h>
 
 AC_CHECK_TYPES([struct mtd_write_req],,, [#include <mtd/mtd-abi.h>])
 
-AC_CHECK_MEMBERS([struct ubi_attach_req.max_beb_per1024],,, [#include <mtd/ubi-user.h>])
-
-AC_CHECK_TYPES(m4_normalize([
-	struct ptp_sys_offset
-]),,, [#include <linux/ptp_clock.h>])
+AC_CHECK_MEMBERS(m4_normalize([
+	struct ubi_attach_req.max_beb_per1024
+	struct ubi_mkvol_req.flags
+]),,, [#include <mtd/ubi-user.h>])
 
 AC_CHECK_TYPES(m4_normalize([
 	struct kvm_cpuid2,
@@ -580,6 +605,8 @@ fi
 
 AC_CHECK_TYPES([struct __aio_sigset],,, [#include <linux/aio_abi.h>])
 
+AC_CHECK_MEMBERS([struct iocb.aio_rw_flags],,, [#include <linux/aio_abi.h>])
+
 CPPFLAGS="$saved_CPPFLAGS"
 
 AC_CHECK_HEADERS([linux/btrfs.h], [
@@ -645,8 +672,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,
@@ -910,8 +935,16 @@ AC_ARG_ENABLE([mpers],
 	 esac],
 	[enable_mpers=yes])
 
-st_MPERS([m32], [aarch64|powerpc64|riscv|s390x|sparc64|tile|x32|x86_64])
-st_MPERS([mx32], [x86_64])
+AC_COMPILE_IFELSE(
+	[AC_LANG_PROGRAM(, [[#include "linux/]]$arch[[/arch_defs_.h"
+			     #include "linux/arch_defs_.h"
+			     int i[SUPPORTED_PERSONALITIES > 1 ? 1 : -1];]])],
+	[st_MPERS([m32], ["$arch"])])
+AC_COMPILE_IFELSE(
+	[AC_LANG_PROGRAM(, [[#include "linux/]]$arch[[/arch_defs_.h"
+			     #include "linux/arch_defs_.h"
+			     int i[SUPPORTED_PERSONALITIES > 2 ? 1 : -1];]])],
+	[st_MPERS([mx32], ["$arch"])])
 
 AX_VALGRIND_DFLT([sgcheck], [off])
 AX_VALGRIND_CHECK

copy_file_range.c

@@ -1,8 +1,28 @@
 /*
- * 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
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in the
+ *    documentation and/or other materials provided with the distribution.
+ * 3. The name of the author may not be used to endorse or promote products
+ *    derived from this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
+ * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
+ * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
+ * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
+ * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
+ * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+ * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+ * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
+ * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
 #include "defs.h"

copyright-year-gen

@@ -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}
@@ -19,7 +14,7 @@ year=
 [ -f "${YEAR_FILE}" ] && year="$(cat "${YEAR_FILE}")"
 
 [ -n "${year}" ] ||
-	year="$(date -u +%Y -d "$(git show -s --format=format:%cD)")"
+	year="$(date -u +%Y -d "$(git show --format=format:%cD --no-patch)")"
 
 [ -n "${year}" ] ||
 	year="${DEFAULT_YEAR}"

count.c

@@ -11,160 +11,466 @@
  * Copyright (c) 2006-2018 The strace developers.
  * All rights reserved.
  *
- * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in the
+ *    documentation and/or other materials provided with the distribution.
+ * 3. The name of the author may not be used to endorse or promote products
+ *    derived from this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
+ * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
+ * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
+ * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
+ * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
+ * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+ * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+ * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
+ * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
 #include "defs.h"
 
+#include <stdarg.h>
+
 /* Per-syscall stats structure */
 struct call_counts {
 	/* time may be total latency or system time */
 	struct timespec time;
+	struct timespec time_min;
+	struct timespec time_max;
+	double time_avg;
 	unsigned int calls, errors;
 };
 
 static struct call_counts *countv[SUPPORTED_PERSONALITIES];
 #define counts (countv[current_personality])
 
+static const struct timespec zero_ts;
+static const struct timespec max_ts = {
+	(time_t) (long long) (zero_extend_signed_to_ull(~(((time_t) 0))) >> 1),
+	LONG_MAX };
+
 static struct timespec overhead;
 
+
+enum count_summary_columns {
+	CSC_NONE,
+	CSC_TIME_100S,
+	CSC_TIME_TOTAL,
+	CSC_TIME_MIN,
+	CSC_TIME_MAX,
+	CSC_TIME_AVG,
+	CSC_CALLS,
+	CSC_ERRORS,
+	CSC_SC_NAME,
+
+	CSC_MAX,
+};
+
+#define DEF_COLUMNS		\
+	_(CSC_TIME_100S),	\
+	_(CSC_TIME_TOTAL),	\
+	_(CSC_TIME_AVG),	\
+	_(CSC_CALLS),		\
+	_(CSC_ERRORS),		\
+	_(CSC_SC_NAME),		\
+	/* End of DEF_COLUMNS definition */
+
+#define _(x) x
+static uint8_t columns[CSC_MAX] = { DEF_COLUMNS };
+#undef _
+#define _(x) [x] = 1
+static uint8_t visible[CSC_MAX] = { DEF_COLUMNS };
+#undef _
+
 void
 count_syscall(struct tcb *tcp, const struct timespec *syscall_exiting_ts)
 {
 	if (!scno_in_range(tcp->scno))
 		return;
 
-	if (!counts)
+	if (!counts) {
 		counts = xcalloc(nsyscalls, sizeof(*counts));
+
+		for (size_t i = 0; i < nsyscalls; i++)
+			counts[i].time_min = max_ts;
+	}
 	struct call_counts *cc = &counts[tcp->scno];
 
 	cc->calls++;
 	if (syserror(tcp))
 		cc->errors++;
 
+	struct timespec wts;
 	if (count_wallclock) {
 		/* wall clock time spent while in syscall */
-		struct timespec wts;
 		ts_sub(&wts, syscall_exiting_ts, &tcp->etime);
-
-		ts_add(&cc->time, &cc->time, &wts);
 	} else {
 		/* system CPU time spent while in syscall */
-		ts_add(&cc->time, &cc->time, &tcp->dtime);
+		ts_sub(&wts, &tcp->stime, &tcp->ltime);
 	}
+
+	ts_sub(&wts, &wts, &overhead);
+	ts_max(&wts, &wts, &zero_ts);
+
+	if (ts_cmp(&wts, &cc->time_min) < 0)
+		cc->time_min = wts;
+	if (ts_cmp(&wts, &cc->time_max) > 0)
+		cc->time_max = wts;
+
+	ts_add(&cc->time, &cc->time, &wts);
 }
 
 static int
-time_cmp(void *a, void *b)
+time_cmp(const void *a, const void *b)
 {
-	return -ts_cmp(&counts[*((int *) a)].time,
-		       &counts[*((int *) b)].time);
+	return -ts_cmp(&counts[*((unsigned int *) a)].time,
+		       &counts[*((unsigned int *) b)].time);
 }
 
 static int
-syscall_cmp(void *a, void *b)
+min_time_cmp(const void *a, const void *b)
 {
-	const char *a_name = sysent[*((int *) a)].sys_name;
-	const char *b_name = sysent[*((int *) b)].sys_name;
-	return strcmp(a_name ? a_name : "", b_name ? b_name : "");
+	return -ts_cmp(&counts[*((unsigned int *) a)].time_min,
+		       &counts[*((unsigned int *) b)].time_min);
 }
 
 static int
-count_cmp(void *a, void *b)
+max_time_cmp(const void *a, const void *b)
 {
-	int     m = counts[*((int *) a)].calls;
-	int     n = counts[*((int *) b)].calls;
+	return -ts_cmp(&counts[*((unsigned int *) a)].time_max,
+		       &counts[*((unsigned int *) b)].time_max);
+}
+
+static int
+avg_time_cmp(const void *a, const void *b)
+{
+	double m = counts[*((unsigned int *) a)].time_avg;
+	double n = counts[*((unsigned int *) b)].time_avg;
 
 	return (m < n) ? 1 : (m > n) ? -1 : 0;
 }
 
-static int (*sortfun)();
+static int
+syscall_cmp(const void *a, const void *b)
+{
+	const char *a_name = sysent[*((unsigned int *) a)].sys_name;
+	const char *b_name = sysent[*((unsigned int *) b)].sys_name;
+	return strcmp(a_name ? a_name : "", b_name ? b_name : "");
+}
+
+static int
+count_cmp(const void *a, const void *b)
+{
+	unsigned int m = counts[*((unsigned int *) a)].calls;
+	unsigned int n = counts[*((unsigned int *) b)].calls;
+
+	return (m < n) ? 1 : (m > n) ? -1 : 0;
+}
+
+static int
+error_cmp(const void *a, const void *b)
+{
+	unsigned int m = counts[*((unsigned int *) a)].errors;
+	unsigned int n = counts[*((unsigned int *) b)].errors;
+
+	return (m < n) ? 1 : (m > n) ? -1 : 0;
+}
+
+static int (*sortfun)(const void *a, const void *b);
 
 void
 set_sortby(const char *sortby)
 {
-	if (strcmp(sortby, "time") == 0)
-		sortfun = time_cmp;
-	else if (strcmp(sortby, "calls") == 0)
-		sortfun = count_cmp;
-	else if (strcmp(sortby, "name") == 0)
-		sortfun = syscall_cmp;
-	else if (strcmp(sortby, "nothing") == 0)
-		sortfun = NULL;
-	else {
-		error_msg_and_help("invalid sortby: '%s'", sortby);
+	static const struct {
+		int (*fn)(const void *a, const void *b);
+		const char *name;
+	} sort_fns[] = {
+		{ time_cmp,	"time" },
+		{ time_cmp,	"time_total" },
+		{ time_cmp,	"total_time" },
+		{ min_time_cmp,	"min_time" },
+		{ min_time_cmp,	"time_min" },
+		{ max_time_cmp,	"max_time" },
+		{ max_time_cmp,	"time_max" },
+		{ avg_time_cmp,	"avg_time" },
+		{ avg_time_cmp,	"time_avg" },
+		{ count_cmp,	"count" },
+		{ count_cmp,	"calls" },
+		{ error_cmp,	"errors" },
+		{ error_cmp,	"error" },
+		{ syscall_cmp,	"name" },
+		{ syscall_cmp,	"syscall_name" },
+		{ syscall_cmp,	"syscall" },
+		{ NULL,		"nothing" },
+		{ NULL,		"none" },
+	};
+
+	for (size_t i = 0; i < ARRAY_SIZE(sort_fns); i++) {
+		if (strcmp(sort_fns[i].name, sortby))
+			continue;
+
+		sortfun = sort_fns[i].fn;
+		return;
 	}
+
+	error_msg_and_help("invalid sortby: '%s'", sortby);
 }
 
-void set_overhead(int n)
+void
+set_count_summary_columns(const char *s)
 {
-	overhead.tv_sec = n / 1000000;
-	overhead.tv_nsec = n % 1000000 * 1000;
+	static const char *cnames[] = {
+		[CSC_TIME_100S]  = "time_percent",
+		[CSC_TIME_TOTAL] = "total_time",
+		[CSC_TIME_MIN]   = "min_time",
+		[CSC_TIME_MAX]   = "max_time",
+		[CSC_TIME_AVG]   = "avg_time",
+		[CSC_CALLS]      = "calls",
+		[CSC_ERRORS]     = "errors",
+		[CSC_SC_NAME]    = "syscall",
+	};
+
+	const char *pos = s;
+	const char *prev = s;
+	size_t cur = 0;
+
+	memset(columns, 0, sizeof(columns));
+	memset(visible, 0, sizeof(visible));
+
+	do {
+		bool found = false;
+
+		pos = strchr(prev, ',');
+
+		for (size_t i = 0; i < ARRAY_SIZE(cnames); i++) {
+			if (!cnames[i] || (pos
+			    ? ((size_t) (pos - prev) != strlen(cnames[i]))
+			      || strncmp(prev, cnames[i], pos - prev)
+			    : strcmp(prev, cnames[i]))) {
+				continue;
+			}
+
+			if (visible[i])
+				error_msg_and_help("call summary column "
+						   "has been provided more "
+						   "than once: '%s' (-U option "
+						   "residual: '%s')",
+						   cnames[i], prev);
+
+			columns[cur++] = i;
+			visible[i] = 1;
+			found = true;
+
+			break;
+		}
+
+		if (!found)
+			error_msg_and_help("unknown column name: '%.*s'",
+					   (int) (pos ? pos - prev : INT_MAX),
+					   prev);
+
+		prev = pos + 1;
+	} while (pos);
+}
+
+void
+set_overhead(const char *str)
+{
+	if (parse_ts(str, &overhead) < 0)
+		error_msg_and_help("invalid -O argument: '%s'", str);
+}
+
+static size_t ATTRIBUTE_FORMAT((printf, 1, 2))
+num_chars(const char *fmt, ...)
+{
+	va_list ap;
+
+	va_start(ap, fmt);
+	int ret = vsnprintf(NULL, 0, fmt, ap);
+	va_end(ap);
+
+	return (unsigned int) MAX(ret, 0);
 }
 
 static void
 call_summary_pers(FILE *outf)
 {
-	static const char dashes[]  = "----------------";
-	static const char header[]  = "%6.6s %11.11s %11.11s %9.9s %9.9s %s\n";
-	static const char data[]    = "%6.2f %11.6f %11lu %9u %9.u %s\n";
-	static const char summary[] = "%6.6s %11.6f %11.11s %9u %9.u %s\n";
+	enum column_flags {
+		CF_L = 1 << 0, /* Left-aligned column */
+	};
+	static const struct {
+		const char *s;
+		size_t sz;
+		const char *fmt;
+		uint32_t flags;
+	} cdesc[] = {
+		[CSC_TIME_100S]  = { ARRSZ_PAIR("% time"),     "%*.2f" },
+		[CSC_TIME_TOTAL] = { ARRSZ_PAIR("seconds"),    "%*.6f" },
+		[CSC_TIME_MIN]   = { ARRSZ_PAIR("shortest"),   "%*.6f" },
+		[CSC_TIME_MAX]   = { ARRSZ_PAIR("longest"),    "%*.6f" },
+		[CSC_TIME_AVG]   = { ARRSZ_PAIR("usecs/call"), "%*lu"  },
+		[CSC_CALLS]      = { ARRSZ_PAIR("calls"),      "%*" PRIu64 },
+		[CSC_ERRORS]     = { ARRSZ_PAIR("errors"),     "%*" PRIu64 },
+		[CSC_SC_NAME]    = { ARRSZ_PAIR("syscall"),    "%-*s", CF_L },
+	};
 
-	unsigned int i;
-	unsigned int call_cum, error_cum;
-	struct timespec tv_cum, dtv;
-	double  float_tv_cum;
-	double  percent;
-	unsigned int *sorted_count;
+	unsigned int *indices;
 
-	fprintf(outf, header,
-		"% time", "seconds", "usecs/call",
-		"calls", "errors", "syscall");
-	fprintf(outf, header, dashes, dashes, dashes, dashes, dashes, dashes);
+	struct timespec tv_cum = zero_ts;
+	struct timespec tv_min = max_ts;
+	struct timespec tv_max = zero_ts;
+	uint64_t call_cum = 0;
+	uint64_t error_cum = 0;
 
-	sorted_count = xcalloc(sizeof(sorted_count[0]), nsyscalls);
-	call_cum = error_cum = tv_cum.tv_sec = tv_cum.tv_nsec = 0;
-	for (i = 0; i < nsyscalls; i++) {
-		sorted_count[i] = i;
-		if (counts == NULL || counts[i].calls == 0)
+	double float_tv_cum;
+	double percent;
+
+	double ts_avg_max = 0;
+	size_t sc_name_max = 0;
+
+
+	/* sort, calculate statistics */
+	indices = xcalloc(sizeof(indices[0]), nsyscalls);
+	for (size_t i = 0; i < nsyscalls; i++) {
+		struct timespec dtv;
+
+		indices[i] = i;
+		if (counts[i].calls == 0)
 			continue;
-		ts_mul(&dtv, &overhead, counts[i].calls);
-		ts_sub(&counts[i].time, &counts[i].time, &dtv);
-		if (counts[i].time.tv_sec < 0 || counts[i].time.tv_nsec < 0)
-			counts[i].time.tv_sec = counts[i].time.tv_nsec = 0;
+
+		ts_add(&tv_cum, &tv_cum, &counts[i].time);
+		ts_min(&tv_min, &tv_min, &counts[i].time_min);
+		ts_max(&tv_max, &tv_max, &counts[i].time_max);
 		call_cum += counts[i].calls;
 		error_cum += counts[i].errors;
-		ts_add(&tv_cum, &tv_cum, &counts[i].time);
+
+		ts_div(&dtv, &counts[i].time, counts[i].calls);
+		counts[i].time_avg = ts_float(&dtv);
+
+		ts_avg_max = MAX(ts_avg_max, counts[i].time_avg);
+		sc_name_max = MAX(sc_name_max, strlen(sysent[i].sys_name));
 	}
 	float_tv_cum = ts_float(&tv_cum);
-	if (counts) {
-		if (sortfun)
-			qsort((void *) sorted_count, nsyscalls,
-			      sizeof(sorted_count[0]), sortfun);
-		for (i = 0; i < nsyscalls; i++) {
-			double float_syscall_time;
-			unsigned int idx = sorted_count[i];
-			struct call_counts *cc = &counts[idx];
-			if (cc->calls == 0)
-				continue;
-			ts_div(&dtv, &cc->time, cc->calls);
-			float_syscall_time = ts_float(&cc->time);
-			percent = (100.0 * float_syscall_time);
-			if (percent != 0.0)
-				   percent /= float_tv_cum;
-			/* else: float_tv_cum can be 0.0 too and we get 0/0 = NAN */
-			fprintf(outf, data,
-				percent, float_syscall_time,
-				(long) (1000000 * dtv.tv_sec + dtv.tv_nsec / 1000),
-				cc->calls, cc->errors, sysent[idx].sys_name);
+
+	if (sortfun)
+		qsort((void *) indices, nsyscalls, sizeof(indices[0]), sortfun);
+
+	/* calculate column widths */
+#define W_(c_, v_) [c_] = MAX((cdesc[c_].sz - 1), (v_))
+	unsigned int cwidths[CSC_MAX] = {
+		W_(CSC_TIME_100S,  sizeof("100.00") - 1),
+		W_(CSC_TIME_TOTAL, num_chars("%.6f", float_tv_cum)),
+		W_(CSC_TIME_MIN,   num_chars("%ld.000000", tv_min.tv_sec)),
+		W_(CSC_TIME_MAX,   num_chars("%ld.000000", tv_max.tv_sec)),
+		W_(CSC_TIME_AVG,   num_chars("%lu", (unsigned long)
+						    (ts_avg_max * 1e6))),
+		W_(CSC_CALLS,      num_chars("%" PRIu64, call_cum)),
+		W_(CSC_ERRORS,     num_chars("%" PRIu64, error_cum)),
+		W_(CSC_SC_NAME,    sc_name_max + 1),
+	};
+#undef W_
+
+	/* header */
+	for (size_t i = 0; columns[i] && i < ARRAY_SIZE(columns); i++) {
+		const char *fmt = cdesc[columns[i]].flags & CF_L
+				  ? "%s%-*s" : "%s%*s";
+		fprintf(outf, fmt, i ? " " : "", cwidths[columns[i]],
+			cdesc[columns[i]].s);
+	}
+	fputc('\n', outf);
+
+	for (size_t i = 0; columns[i] && i < ARRAY_SIZE(columns); i++) {
+		if (i)
+			fputc(' ', outf);
+
+		for (size_t j = 0; j < cwidths[columns[i]]; j++)
+			fputc('-', outf);
+	}
+	fputc('\n', outf);
+
+	/* data output */
+	for (size_t i = 0; i < nsyscalls; i++) {
+		unsigned int idx = indices[i];
+		struct call_counts *cc = &counts[idx];
+		double float_syscall_time;
+
+		if (cc->calls == 0)
+			continue;
+
+		float_syscall_time = ts_float(&cc->time);
+		percent = (100.0 * float_syscall_time);
+		/* else: float_tv_cum can be 0.0 too and we get 0/0 = NAN */
+		if (percent != 0.0)
+			   percent /= float_tv_cum;
+
+		for (size_t i = 0; columns[i] && i < ARRAY_SIZE(columns); i++) {
+			const size_t c = columns[i];
+			if (i)
+				fputc(' ', outf);
+
+#define PC_(c_, val_) \
+	case (c_): fprintf(outf, cdesc[c].fmt, cwidths[c], (val_)); break;
+
+			switch (c) {
+			PC_(CSC_TIME_100S,  percent)
+			PC_(CSC_TIME_TOTAL, float_syscall_time)
+			PC_(CSC_TIME_MIN,   ts_float(&cc->time_min))
+			PC_(CSC_TIME_MAX,   ts_float(&cc->time_max))
+			PC_(CSC_TIME_AVG,   (long) (cc->time_avg * 1e6))
+			PC_(CSC_CALLS,      cc->calls)
+			case CSC_ERRORS:
+				if (cc->errors)
+					fprintf(outf, cdesc[c].fmt,
+						cwidths[c], cc->errors);
+				else
+					fprintf(outf, "%*s", cwidths[c], "");
+				break;
+			PC_(CSC_SC_NAME,    sysent[idx].sys_name)
+			}
+		}
+		fputc('\n', outf);
+	}
+
+	free(indices);
+
+	/* footer */
+	for (size_t i = 0; columns[i] && i < ARRAY_SIZE(columns); i++) {
+		if (i)
+			fputc(' ', outf);
+
+		for (size_t j = 0; j < cwidths[columns[i]]; j++)
+			fputc('-', outf);
+	}
+	fputc('\n', outf);
+
+	/* totals */
+	for (size_t i = 0; columns[i] && i < ARRAY_SIZE(columns); i++) {
+		const size_t c = columns[i];
+		if (i)
+			fputc(' ', outf);
+
+		switch (c) {
+		PC_(CSC_TIME_100S, 100.0)
+		PC_(CSC_TIME_TOTAL, float_tv_cum)
+		PC_(CSC_TIME_MIN, ts_float(&tv_min))
+		PC_(CSC_TIME_MAX, ts_float(&tv_max))
+		PC_(CSC_TIME_AVG,
+		    (unsigned long) (float_tv_cum / call_cum * 1e6))
+		PC_(CSC_CALLS, call_cum)
+		PC_(CSC_ERRORS, error_cum)
+		PC_(CSC_SC_NAME, "total")
 		}
 	}
-	free(sorted_count);
+	fputc('\n', outf);
 
-	fprintf(outf, header, dashes, dashes, dashes, dashes, dashes, dashes);
-	fprintf(outf, summary,
-		"100.00", float_tv_cum, "",
-		call_cum, error_cum, "total");
+#undef PC_
 }
 
 void

debian/changelog.in

@@ -4,18 +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.
-
- -- Dmitry V. Levin <ldv@altlinux.org>  Tue, 30 Oct 2018 08:09:10 +0000
-
 strace (4.24-1) unstable; urgency=medium
 
   * New upstream version.

debian/copyright

@@ -14,14 +14,24 @@ Copyright (c) 1998-2001 Wichert Akkerman <wakkerma@deephackmode.org>
 Copyright (c) 2001-2018 The strace developers.
 All rights reserved.
 
-strace is free software; you can redistribute it and/or modify it
-under the terms of the GNU Lesser General Public License as published
-by the Free Software Foundation; either version 2.1 of the License,
-or (at your option) any later version.
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions
+are met:
+1. Redistributions of source code must retain the above copyright
+   notice, this list of conditions and the following disclaimer.
+2. Redistributions in binary form must reproduce the above copyright
+   notice, this list of conditions and the following disclaimer in the
+   documentation and/or other materials provided with the distribution.
+3. The name of the author may not be used to endorse or promote products
+   derived from this software without specific prior written permission.
 
-strace is distributed in the hope that it will be useful, but
-WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
-or FITNESS FOR A PARTICULAR PURPOSE.  See LGPL-2.1-or-later for more details.
-
-strace test suite is provided under the terms of the GNU General Public License
-version 2 or later, see tests/COPYING for more details.
+THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
+IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
+OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
+IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
+INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
+NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
+THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.

delay.c

@@ -2,7 +2,27 @@
  * Copyright (c) 2018 The strace developers.
  * All rights reserved.
  *
- * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in the
+ *    documentation and/or other materials provided with the distribution.
+ * 3. The name of the author may not be used to endorse or promote products
+ *    derived from this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
+ * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
+ * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
+ * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
+ * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
+ * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+ * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+ * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
+ * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
 #include "defs.h"
@@ -46,7 +66,7 @@ alloc_delay_data(void)
 }
 
 void
-fill_delay_data(uint16_t delay_idx, int intval, bool isenter)
+fill_delay_data(uint16_t delay_idx, struct timespec *val, bool isenter)
 {
 	if (delay_idx >= delay_data_vec_size)
 		error_func_msg_and_die("delay_idx >= delay_data_vec_size");
@@ -57,8 +77,7 @@ fill_delay_data(uint16_t delay_idx, int intval, bool isenter)
 	else
 		ts = &(delay_data_vec[delay_idx].ts_exit);
 
-	ts->tv_sec = intval / 1000000;
-	ts->tv_nsec = intval % 1000000 * 1000;
+	*ts = *val;
 }
 
 static bool

delay.h

@@ -2,14 +2,34 @@
  * Copyright (c) 2018 The strace developers.
  * All rights reserved.
  *
- * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in the
+ *    documentation and/or other materials provided with the distribution.
+ * 3. The name of the author may not be used to endorse or promote products
+ *    derived from this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
+ * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
+ * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
+ * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
+ * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
+ * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+ * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+ * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
+ * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
 #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);
+void fill_delay_data(uint16_t delay_idx, struct timespec *val, bool isenter);
 bool is_delay_timer_armed(void);
 void delay_timer_expired(void);
 void arm_delay_timer(const struct tcb *);

desc.c

@@ -6,7 +6,27 @@
  * Copyright (c) 1999-2018 The strace developers.
  * All rights reserved.
  *
- * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in the
+ *    documentation and/or other materials provided with the distribution.
+ * 3. The name of the author may not be used to endorse or promote products
+ *    derived from this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
+ * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
+ * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
+ * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
+ * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
+ * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+ * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+ * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
+ * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
 #include "defs.h"
@@ -16,6 +36,9 @@ SYS_FUNC(close)
 {
 	printfd(tcp, tcp->u_arg[0]);
 
+	uint64_t inode = getfdinode(tcp, tcp->u_arg[0]);
+	invalidate_netlink_family_cache_entry(inode);
+
 	return RVAL_DECODED;
 }
 
@@ -52,7 +75,7 @@ SYS_FUNC(dup3)
 
 static int
 decode_select(struct tcb *const tcp, const kernel_ulong_t *const args,
-	      void (*const print_tv_ts) (struct tcb *, kernel_ulong_t),
+	      void (*const print_tv_ts) (struct tcb *, kernel_ulong_t, bool),
 	      const char * (*const sprint_tv_ts) (struct tcb *, kernel_ulong_t))
 {
 	int i, j;
@@ -105,7 +128,7 @@ decode_select(struct tcb *const tcp, const kernel_ulong_t *const args,
 		}
 		free(fds);
 		tprints(", ");
-		print_tv_ts(tcp, args[4]);
+		print_tv_ts(tcp, args[4], false);
 	} else {
 		static char outstr[1024];
 		char *outptr;

dirent.c

@@ -4,10 +4,30 @@
  * 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
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in the
+ *    documentation and/or other materials provided with the distribution.
+ * 3. The name of the author may not be used to endorse or promote products
+ *    derived from this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
+ * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
+ * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
+ * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
+ * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
+ * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+ * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+ * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
+ * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
 #include "defs.h"

dirent64.c

@@ -4,10 +4,30 @@
  * 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
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in the
+ *    documentation and/or other materials provided with the distribution.
+ * 3. The name of the author may not be used to endorse or promote products
+ *    derived from this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
+ * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
+ * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
+ * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
+ * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
+ * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+ * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+ * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
+ * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
 #include "defs.h"

dist/INSTALL

@@ -1,134 +0,0 @@
-0. BUILD REQUIREMENTS
-
- - Sane POSIX shell.
- - gcc-like compiler that supports C99 and some GNU extensions (namely, empty
-   structures, empty definitions, zero length arrays, ranged designated
-   initialisers).
- - libc. GNU libc and musl are supported.
- - Linux UAPI headers.
- - GNU Make.
- - GNU coreutils.
- - For running test suite: gawk, grep, sed, runtime environment for all
-   personalities.
- - Requirements for optional features are documented in their description.
-
-1. CONFIGURATION AND OPTIONAL FEATURES
-
-Configuration is done using GNU Autoconf-generated configure script.
-Please refer to the README-configure file for generic information regarding
-configure usage.
-
-In addition to standard configure options, strace's configure file provides
-the following options:
-
-1.1. Additional build and testing hardening
-
-  --enable-gcc-Werror     turn on gcc's -Werror option
-  --enable-code-coverage  Whether to enable code coverage support
-  --with-gcov=GCOV        use given GCOV for coverage (GCOV=gcov).
-  --enable-valgrind       Whether to enable Valgrind on the unit tests
-  --disable-valgrind-memcheck
-                          Whether to skip memcheck during the Valgrind tests
-  --disable-valgrind-helgrind
-                          Whether to skip helgrind during the Valgrind tests
-  --disable-valgrind-drd  Whether to skip drd during the Valgrind tests
-  --enable-valgrind-sgcheck
-                          Whether to use sgcheck during the Valgrind tests
-
-1.2. Optional features
-
-1.2.1. Multiple personalities support
-
-  --enable-mpers=yes|no|check|m32|mx32
-                          whether to enable multiple personalities support
-                          required for proper decoding of structures used by
-                          tracees with personalities that differ from the
-                          personality of strace, default is yes.
-
-Personality is a way system call is performed (in terms of ABI). For example,
-Linux kernel on multiple 64-bit architectures that evolve from their 32-bit
-counterparts have support for running 32-bit binaries with 32-bit system call
-ABI, and that system call ABI constitutes a separate personality in strace's
-terms. Another example is 32-on-64 bit ABI; while exploiting the same way for
-performing system calls as native 64-bit system calls, this ABI has different
-type sizes and, as a result, also constitutes a separate personality; the only
-such ABI that is currently supported by strace is x32 on x86_64. This is
-important as different ABIs use different alignments and type sizes, as a
-result, fields in structures in unions have different offsets on different
-ABIs. In order to be able to correctly parse all the structures used in various
-system calls and ioctl commands, strace compiles these structure definitions
-for these different ABI and then parses DWARF of these compiled definitions in
-order to generate proper structure definitions that compiled with decoder code.
-Taking the aforementioned into account, there are the following requirements:
-
- - gawk (at least version 3)
- - Ability to compile for m32 personality (on architectures where it is supported)
-  - On x86_64, x32, powerpc64, sparc64, riscv64, tile64: gcc -m32
-  - s390x: gcc -m31
-  - AArch64: a separate compiler for armv7 EABI
-   - See information about configuration in "1.3.2. AArch64: AArch32 support"
- - Ability to compile for mx32 personality (on architectures where it is supported)
-  - On x86_64: gcc -mx32
- - For tests: runtime support (linker, libc, and loader)
-
-1.2.2. Stack unwinding (-k option)
-
-  --with-libunwind        use libunwind to implement stack tracing support
-  --with-libiberty        use libiberty to demangle symbols in stack trace
-
-1.3. Architecture-specific features
-
-1.3.1. ARMv7: OABI support
-
-  --enable-arm-oabi       enable OABI support on ARM EABI
-
-1.3.2. AArch64: AArch32 support
-
-  CC_FOR_M32
-  CPP_FOR_M32
-  CFLAGS_FOR_M32
-  CPPFLAGS_FOR_M32
-
-1.4. Miscellanea
-
-1.4.1. Static build configuration
-
-For static linking, provide LDFLAGS='-static -pthread'.
-
-1.4.2. Cross-compilation configuration
-
-2. BUILDING
-
-make
-make V=1
-
-3. TESTING
-
-make check
-
-TESTS='list of tests'
-VALGRIND_FLAGS
-TIMEOUT_DURATION
-
-BTRFS_MOUNTPOINT
-
-4. ADDITIONAL TARGETS
-
-  make code-coverage-capture
-  make code-coverage-capture CODE_COVERAGE_BRANCH_COVERAGE=
-
-5. INSTALLATION
-
-make install
-
-6. PACKAGING
-
-6.1. Distribution tarball
-
-./make-dist
-
-Requires git
-
-6.2. dpkg package
-
-6.3. RPM package

dist/README

@@ -4,10 +4,8 @@ and tamper with interactions between processes and the Linux kernel, which
 include system calls, signal deliveries, and changes of process state.
 The operation of strace is made possible by the kernel feature known as ptrace.
 
-strace is released under the terms of the GNU Lesser General Public License
-version 2.1 or later; see the file COPYING for details.
-strace test suite is released under the terms of the GNU General Public License
-version 2 or later; see the file tests/COPYING for details.
+strace is released under a Berkeley-style license at the request
+of Paul Kranenburg; see the file COPYING for details.
 
 See the file CREDITS for a list of authors and other contributors.
 See the file INSTALL for compilation and installation instructions.

dm.c

@@ -8,7 +8,27 @@
  * Copyright (c) 2016-2018 The strace developers.
  * All rights reserved.
  *
- * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in the
+ *    documentation and/or other materials provided with the distribution.
+ * 3. The name of the author may not be used to endorse or promote products
+ *    derived from this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
+ * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
+ * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
+ * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
+ * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
+ * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+ * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+ * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
+ * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
 #include "defs.h"
@@ -98,7 +118,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)

dyxlat.c

@@ -1,32 +1,47 @@
 /*
- * Copyright (c) 2017-2018 The strace developers.
+ * Copyright (c) 2017 The strace developers.
  *
- * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in the
+ *    documentation and/or other materials provided with the distribution.
+ * 3. The name of the author may not be used to endorse or promote products
+ *    derived from this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
+ * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
+ * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
+ * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
+ * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
+ * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+ * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+ * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
+ * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
 #include "defs.h"
 
 struct dyxlat {
-	size_t used;
 	size_t allocated;
-	struct xlat *xlat;
+	struct xlat xlat;
+	struct xlat_data *data;
 };
 
-#define MARK_END(xlat)				\
-	do {					\
-		(xlat).val = 0;			\
-		(xlat).str = 0;			\
-	} while (0)
-
 struct dyxlat *
 dyxlat_alloc(const size_t nmemb)
 {
 	struct dyxlat *const dyxlat = xmalloc(sizeof(*dyxlat));
 
-	dyxlat->used = 1;
+	dyxlat->xlat.type = XT_NORMAL;
+	dyxlat->xlat.size = 0;
 	dyxlat->allocated = nmemb;
-	dyxlat->xlat = xgrowarray(NULL, &dyxlat->allocated, sizeof(struct xlat));
-	MARK_END(dyxlat->xlat[0]);
+	dyxlat->xlat.data = dyxlat->data = xgrowarray(NULL, &dyxlat->allocated,
+						      sizeof(struct xlat_data));
 
 	return dyxlat;
 }
@@ -36,20 +51,20 @@ dyxlat_free(struct dyxlat *const dyxlat)
 {
 	size_t i;
 
-	for (i = 0; i < dyxlat->used - 1; ++i) {
-		free((void *) dyxlat->xlat[i].str);
-		dyxlat->xlat[i].str = NULL;
+	for (i = 0; i < dyxlat->xlat.size; ++i) {
+		free((void *) dyxlat->data[i].str);
+		dyxlat->data[i].str = NULL;
 	}
 
-	free(dyxlat->xlat);
-	dyxlat->xlat = NULL;
+	free(dyxlat->data);
+	dyxlat->xlat.data = NULL;
 	free(dyxlat);
 }
 
 const struct xlat *
 dyxlat_get(const struct dyxlat *const dyxlat)
 {
-	return dyxlat->xlat;
+	return &dyxlat->xlat;
 }
 
 void
@@ -58,24 +73,24 @@ dyxlat_add_pair(struct dyxlat *const dyxlat, const uint64_t val,
 {
 	size_t i;
 
-	for (i = 0; i < dyxlat->used - 1; ++i) {
-		if (dyxlat->xlat[i].val == val) {
-			if (strncmp(dyxlat->xlat[i].str, str, len) == 0
-			    && dyxlat->xlat[i].str[len] == '\0')
+	for (i = 0; i < dyxlat->xlat.size; ++i) {
+		if (dyxlat->data[i].val == val) {
+			if (strncmp(dyxlat->data[i].str, str, len) == 0
+			    && dyxlat->data[i].str[len] == '\0')
 				return;
 
-			free((void *) dyxlat->xlat[i].str);
-			dyxlat->xlat[i].str = xstrndup(str, len);
+			free((void *) dyxlat->data[i].str);
+			dyxlat->data[i].str = xstrndup(str, len);
 			return;
 		}
 	}
 
-	if (dyxlat->used >= dyxlat->allocated)
-		dyxlat->xlat = xgrowarray(dyxlat->xlat, &dyxlat->allocated,
-					  sizeof(struct xlat));
+	if (dyxlat->xlat.size >= dyxlat->allocated)
+		dyxlat->xlat.data = dyxlat->data =
+			xgrowarray(dyxlat->data, &dyxlat->allocated,
+				   sizeof(struct xlat_data));
 
-	dyxlat->xlat[dyxlat->used - 1].val = val;
-	dyxlat->xlat[dyxlat->used - 1].str = xstrndup(str, len);
-	MARK_END(dyxlat->xlat[dyxlat->used]);
-	dyxlat->used++;
+	dyxlat->data[dyxlat->xlat.size].val = val;
+	dyxlat->data[dyxlat->xlat.size].str = xstrndup(str, len);
+	dyxlat->xlat.size++;
 }

epoll.c

@@ -5,7 +5,27 @@
  * Copyright (c) 2015-2018 The strace developers.
  * All rights reserved.
  *
- * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in the
+ *    documentation and/or other materials provided with the distribution.
+ * 3. The name of the author may not be used to endorse or promote products
+ *    derived from this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
+ * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
+ * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
+ * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
+ * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
+ * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+ * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+ * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
+ * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
 #include "defs.h"

error_prints.c

@@ -2,10 +2,32 @@
  * Copyright (c) 1999-2018 The strace developers.
  * All rights reserved.
  *
- * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in the
+ *    documentation and/or other materials provided with the distribution.
+ * 3. The name of the author may not be used to endorse or promote products
+ *    derived from this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
+ * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
+ * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
+ * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
+ * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
+ * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+ * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+ * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
+ * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-#ifdef HAVE_CONFIG_H
+#if defined(HAVE_DEFS_H)
+# include "defs.h"
+#elif defined(HAVE_CONFIG_H)
 # include "config.h"
 #endif
 
@@ -26,6 +48,7 @@ verror_msg(int err_no, const char *fmt, va_list p)
 {
 	char *msg;
 
+	finish_line();
 	fflush(NULL);
 
 	/* We want to print entire message with single fprintf to ensure

error_prints.h

@@ -4,22 +4,47 @@
  * 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
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in the
+ *    documentation and/or other materials provided with the distribution.
+ * 3. The name of the author may not be used to endorse or promote products
+ *    derived from this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
+ * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
+ * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
+ * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
+ * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
+ * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+ * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+ * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
+ * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
 #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;
 
 void die(void) ATTRIBUTE_NORETURN;
+#ifdef HAVE_FINISH_LINE
+extern void finish_line(void);
+#else
+static inline void finish_line(void) {}
+#endif
 
 void error_msg(const char *fmt, ...) ATTRIBUTE_FORMAT((printf, 1, 2));
 void perror_msg(const char *fmt, ...) ATTRIBUTE_FORMAT((printf, 1, 2));
@@ -31,29 +56,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 */

evdev.c

@@ -4,7 +4,27 @@
  * Copyright (c) 2015-2018 The strace developers.
  * All rights reserved.
  *
- * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in the
+ *    documentation and/or other materials provided with the distribution.
+ * 3. The name of the author may not be used to endorse or promote products
+ *    derived from this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
+ * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
+ * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
+ * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
+ * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
+ * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+ * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+ * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
+ * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
 #include "defs.h"
@@ -33,8 +53,6 @@
 #  define SYN_MAX 0xf
 # endif
 
-const size_t evdev_abs_size = ARRAY_SIZE(evdev_abs) - 1;
-
 static int
 abs_ioctl(struct tcb *const tcp, const kernel_ulong_t arg)
 {
@@ -78,7 +96,7 @@ keycode_ioctl(struct tcb *const tcp, const kernel_ulong_t arg)
 
 	if (!umove_or_printaddr(tcp, arg, &keycode)) {
 		tprintf("[%u, ", keycode[0]);
-		printxval_index(evdev_keycode, keycode[1], "KEY_???");
+		printxval(evdev_keycode, keycode[1], "KEY_???");
 		tprints("]");
 	}
 
@@ -105,7 +123,7 @@ keycode_V2_ioctl(struct tcb *const tcp, const kernel_ulong_t arg)
 		unsigned int i;
 
 		tprintf("index=%" PRIu16 ", keycode=", ike.index);
-		printxval_index(evdev_keycode, ike.keycode, "KEY_???");
+		printxval(evdev_keycode, ike.keycode, "KEY_???");
 		tprints(", scancode=[");
 		for (i = 0; i < ARRAY_SIZE(ike.scancode); i++) {
 			if (i > 0)
@@ -144,9 +162,9 @@ getid_ioctl(struct tcb *const tcp, const kernel_ulong_t arg)
 }
 
 static int
-decode_bitset_(struct tcb *const tcp, const kernel_ulong_t arg,
-	       const struct xlat decode_nr[], const unsigned int max_nr,
-	       const char *const dflt, size_t decode_nr_size, enum xlat_type xt)
+decode_bitset(struct tcb *const tcp, const kernel_ulong_t arg,
+	      const struct xlat *decode_nr, const unsigned int max_nr,
+	      const char *const dflt)
 {
 	tprints(", ");
 
@@ -167,7 +185,7 @@ decode_bitset_(struct tcb *const tcp, const kernel_ulong_t arg,
 	if (i < 0) {
 		tprints(" 0 ");
 	} else {
-		printxval_dispatch(decode_nr, decode_nr_size, i, dflt, xt);
+		printxval(decode_nr, i, dflt);
 
 		while ((i = next_set_bit(decoded_arg, i + 1, size)) > 0) {
 			if (abbrev(tcp) && bit_displayed >= 3) {
@@ -175,8 +193,7 @@ decode_bitset_(struct tcb *const tcp, const kernel_ulong_t arg,
 				break;
 			}
 			tprints(", ");
-			printxval_dispatch(decode_nr, decode_nr_size, i, dflt,
-					   xt);
+			printxval(decode_nr, i, dflt);
 			bit_displayed++;
 		}
 	}
@@ -186,10 +203,6 @@ 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_) \
-	decode_bitset_((tcp_), (arg_), (decode_nr_), (max_nr_), \
-		       (dflt_), ARRAY_SIZE(decode_nr_) - 1, (xt_))
-
 # ifdef EVIOCGMTSLOTS
 static int
 mtslots_ioctl(struct tcb *const tcp, const unsigned int code,
@@ -240,42 +253,41 @@ bit_ioctl(struct tcb *const tcp, const unsigned int ev_nr,
 	switch (ev_nr) {
 		case 0:
 			return decode_bitset(tcp, arg, evdev_ev,
-					     EV_MAX, "EV_???", XT_SORTED);
+					     EV_MAX, "EV_???");
 		case EV_KEY:
 			return decode_bitset(tcp, arg, evdev_keycode,
-					     KEY_MAX, "KEY_???", XT_INDEXED);
+					     KEY_MAX, "KEY_???");
 		case EV_REL:
 			return decode_bitset(tcp, arg, evdev_relative_axes,
-					     REL_MAX, "REL_???", XT_INDEXED);
+					     REL_MAX, "REL_???");
 		case EV_ABS:
 			return decode_bitset(tcp, arg, evdev_abs,
-					     ABS_MAX, "ABS_???", XT_INDEXED);
+					     ABS_MAX, "ABS_???");
 		case EV_MSC:
 			return decode_bitset(tcp, arg, evdev_misc,
-					     MSC_MAX, "MSC_???", XT_INDEXED);
+					     MSC_MAX, "MSC_???");
 		case EV_SW:
 			return decode_bitset(tcp, arg, evdev_switch,
-					     SW_MAX, "SW_???", XT_INDEXED);
+					     SW_MAX, "SW_???");
 		case EV_LED:
 			return decode_bitset(tcp, arg, evdev_leds,
-					     LED_MAX, "LED_???", XT_INDEXED);
+					     LED_MAX, "LED_???");
 		case EV_SND:
 			return decode_bitset(tcp, arg, evdev_snd,
-					     SND_MAX, "SND_???", XT_INDEXED);
+					     SND_MAX, "SND_???");
 		case EV_REP:
 			return decode_bitset(tcp, arg, evdev_autorepeat,
-					     REP_MAX, "REP_???", XT_INDEXED);
+					     REP_MAX, "REP_???");
 		case EV_FF:
 			return decode_bitset(tcp, arg, evdev_ff_types,
-					     FF_MAX, "FF_???", XT_SORTED);
+					     FF_MAX, "FF_???");
 		case EV_PWR:
 			tprints(", ");
 			printnum_int(tcp, arg, "%d");
 			return RVAL_IOCTL_DECODED;
 		case EV_FF_STATUS:
 			return decode_bitset(tcp, arg, evdev_ff_status,
-					     FF_STATUS_MAX, "FF_STATUS_???",
-					     XT_INDEXED);
+					     FF_STATUS_MAX, "FF_STATUS_???");
 		default:
 			tprints(", ");
 			printaddr(arg);
@@ -329,23 +341,22 @@ evdev_read_ioctl(struct tcb *const tcp, const unsigned int code,
 # ifdef EVIOCGPROP
 		case _IOC_NR(EVIOCGPROP(0)):
 			return decode_bitset(tcp, arg, evdev_prop,
-					     INPUT_PROP_MAX, "PROP_???",
-					     XT_INDEXED);
+					     INPUT_PROP_MAX, "PROP_???");
 # endif
 		case _IOC_NR(EVIOCGSND(0)):
 			return decode_bitset(tcp, arg, evdev_snd,
-					     SND_MAX, "SND_???", XT_INDEXED);
+					     SND_MAX, "SND_???");
 # ifdef EVIOCGSW
 		case _IOC_NR(EVIOCGSW(0)):
 			return decode_bitset(tcp, arg, evdev_switch,
-					     SW_MAX, "SW_???", XT_INDEXED);
+					     SW_MAX, "SW_???");
 # endif
 		case _IOC_NR(EVIOCGKEY(0)):
 			return decode_bitset(tcp, arg, evdev_keycode,
-					     KEY_MAX, "KEY_???", XT_INDEXED);
+					     KEY_MAX, "KEY_???");
 		case _IOC_NR(EVIOCGLED(0)):
 			return decode_bitset(tcp, arg, evdev_leds,
-					     LED_MAX, "LED_???", XT_INDEXED);
+					     LED_MAX, "LED_???");
 	}
 
 	/* multi-number fixed-length commands */

evdev_mpers.c

@@ -4,14 +4,34 @@
  * Copyright (c) 2015-2018 The strace developers.
  * All rights reserved.
  *
- * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in the
+ *    documentation and/or other materials provided with the distribution.
+ * 3. The name of the author may not be used to endorse or promote products
+ *    derived from this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
+ * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
+ * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
+ * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
+ * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
+ * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+ * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+ * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
+ * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
 #include "defs.h"
 
 #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>

eventfd.c

@@ -1,9 +1,29 @@
 /*
  * 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
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in the
+ *    documentation and/or other materials provided with the distribution.
+ * 3. The name of the author may not be used to endorse or promote products
+ *    derived from this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
+ * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
+ * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
+ * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
+ * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
+ * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+ * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+ * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
+ * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
 #include "defs.h"

execve.c

@@ -9,7 +9,27 @@
  * Copyright (c) 2014-2018 The strace developers.
  * All rights reserved.
  *
- * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in the
+ *    documentation and/or other materials provided with the distribution.
+ * 3. The name of the author may not be used to endorse or promote products
+ *    derived from this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
+ * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
+ * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
+ * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
+ * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
+ * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+ * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+ * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
+ * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
 #include "defs.h"

f_owner_ex.h

@@ -2,20 +2,40 @@
  * Copyright (c) 2018 Dmitry V. Levin <ldv@altlinux.org>
  * All rights reserved.
  *
- * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in the
+ *    documentation and/or other materials provided with the distribution.
+ * 3. The name of the author may not be used to endorse or promote products
+ *    derived from this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
+ * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
+ * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
+ * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
+ * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
+ * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+ * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+ * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
+ * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
 #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 */

fadvise.c

@@ -5,10 +5,30 @@
  * 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
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in the
+ *    documentation and/or other materials provided with the distribution.
+ * 3. The name of the author may not be used to endorse or promote products
+ *    derived from this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
+ * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
+ * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
+ * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
+ * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
+ * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+ * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+ * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
+ * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
 #include "defs.h"

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

fanotify.c

@@ -3,10 +3,31 @@
  * Copyright (c) 2014-2018 The strace developers.
  * All rights reserved.
  *
- * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in the
+ *    documentation and/or other materials provided with the distribution.
+ * 3. The name of the author may not be used to endorse or promote products
+ *    derived from this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
+ * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
+ * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
+ * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
+ * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
+ * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+ * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+ * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
+ * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
 #include "defs.h"
+#include "print_fields.h"
 
 #include "xlat/fan_classes.h"
 #include "xlat/fan_init_flags.h"
@@ -17,6 +38,236 @@
 #ifndef FAN_NOFD
 # define FAN_NOFD -1
 #endif
+#ifndef FAN_AUDIT
+# define FAN_AUDIT 0x10
+#endif
+
+#include "xlat/fan_mark_flags.h"
+#include "xlat/fan_event_flags.h"
+#include "xlat/fan_responses.h"
+
+static void
+print_fanfd(struct tcb *tcp, int fd)
+{
+	if (fd == FAN_NOFD)
+		print_xlat_d(FAN_NOFD);
+	else
+		printfd(tcp, fd);
+}
+
+#define PRINT_FIELD_FANFD(prefix_, where_, field_, tcp_)		\
+	do {								\
+		STRACE_PRINTF("%s%s=", (prefix_), #field_);		\
+		print_fanfd((tcp_), (where_).field_);			\
+	} while (0)
+
+bool
+decode_fanotify_read(struct tcb *tcp, int fd, const char *fdpath,
+		     enum fileops op, kernel_ulong_t addr,
+		     kernel_ulong_t addrlen)
+{
+	struct fev_hdr {
+		uint32_t event_len;
+		union {
+			struct {
+				uint8_t  vers;
+				uint8_t  reserved;
+				uint16_t metadata_len;
+			};
+			uint32_t vers_v2;
+		};
+	} fev_hdr;
+	uint32_t fev_ver = 0;
+
+	union fev_md {
+		struct fev_md_v2 {
+			uint64_t ATTRIBUTE_ALIGNED(8) mask;
+			int32_t  fd;
+			int32_t  pid;
+		} v2;
+		struct fev_md_v1 {
+			int32_t  fd;
+			uint64_t ATTRIBUTE_ALIGNED(8) mask;
+			int64_t  pid;
+		} ATTRIBUTE_PACKED v1;
+	} fev_md;
+
+	enum {
+		FEV_V1_SIZE = sizeof(struct fev_hdr) + sizeof(struct fev_md_v1),
+		FEV_V2_SIZE = sizeof(struct fev_hdr) + sizeof(struct fev_md_v2),
+		FEV_MIN_SIZE = MIN(FEV_V1_SIZE, FEV_V2_SIZE),
+	};
+
+	kernel_ulong_t pos = 0;
+
+	if (addrlen < sizeof(fev_hdr))
+		return false;
+
+	tprints("[");
+
+	do {
+		if (pos)
+			tprints(", ");
+
+		if (umove(tcp, addr + pos, &fev_hdr)) {
+			printaddr_comment(addr + pos);
+			break;
+		}
+
+		PRINT_FIELD_U("{", fev_hdr, event_len);
+
+		if (fev_hdr.event_len < FEV_MIN_SIZE) {
+			tprints(", ... /* invalid event_len */}");
+
+			if (!fev_hdr.event_len)
+				goto end_decoded;
+
+			goto end_fev_decoded;
+		}
+
+		switch (fev_hdr.vers) {
+		case 0: case 1: case 2:
+			switch (fev_hdr.vers_v2) {
+			case 1: case 2:
+				PRINT_FIELD_U(", ", fev_hdr, vers_v2);
+				fev_ver = fev_hdr.vers;
+				break;
+
+			default:
+				tprints("}");
+				pos += offsetof(struct fev_hdr, vers_v2);
+				goto end_decoded;
+			}
+			break;
+
+		case 3: default:
+			PRINT_FIELD_U(", ", fev_hdr, vers);
+			fev_ver = fev_hdr.vers;
+			if (fev_hdr.reserved)
+				PRINT_FIELD_U(", ", fev_hdr, reserved);
+			PRINT_FIELD_U(", ", fev_hdr, metadata_len);
+
+			if (fev_hdr.metadata_len < FEV_V2_SIZE) {
+				tprints(", ... /* invalid metadata_len */}");
+				goto end_fev_decoded;
+			}
+		}
+
+		if (fev_ver < 1 || fev_ver > 3) {
+			tprints(", ... /* invalid vers */}");
+			goto end_fev_decoded;
+		}
+
+		switch (fev_ver) {
+		case 1:
+			if (umove(tcp, addr + pos + sizeof(fev_hdr),
+				  &fev_md.v1)) {
+				printf(", ...}");
+				pos += sizeof(fev_hdr);
+				goto end_decoded;
+			}
+
+			PRINT_FIELD_FANFD(", ", fev_md.v1, fd, tcp);
+			PRINT_FIELD_FLAGS(", ", fev_md.v1, mask,
+					  fan_event_flags, "FAN_???");
+			PRINT_FIELD_D(", ", fev_md.v1, pid);
+
+			if (FEV_V1_SIZE < fev_hdr.event_len) {
+				tprints(", ");
+				printstrn(tcp, addr + pos,
+					  fev_hdr.event_len - FEV_V1_SIZE);
+			}
+
+			break;
+
+		case 2: case 3:
+			if (umove(tcp, addr + pos + sizeof(fev_hdr),
+				  &fev_md.v2)) {
+				printf(", ...}");
+				pos += sizeof(fev_hdr);
+				goto end_decoded;
+			}
+
+			PRINT_FIELD_FLAGS(", ", fev_md.v2, mask,
+					  fan_event_flags, "FAN_???");
+			PRINT_FIELD_FANFD(", ", fev_md.v2, fd, tcp);
+			PRINT_FIELD_D(", ", fev_md.v2, pid);
+
+			if (FEV_V2_SIZE < fev_hdr.event_len) {
+				tprints(", ");
+				printstrn(tcp, addr + pos,
+					  fev_hdr.event_len - FEV_V2_SIZE);
+			}
+		}
+
+		tprints("}");
+
+end_fev_decoded:
+		pos += fev_hdr.event_len;
+	} while (pos <= addrlen - sizeof(fev_hdr));
+
+end_decoded:
+	if (pos < addrlen) {
+		if (pos)
+			tprints(", ");
+
+		printstrn(tcp, addr + pos, addrlen - pos);
+	}
+
+	tprints("]");
+
+	return true;
+}
+
+bool
+decode_fanotify_write(struct tcb *tcp, int fd, const char *fdpath,
+		      enum fileops op, kernel_ulong_t addr,
+		      kernel_ulong_t addrlen)
+{
+	struct fresp {
+		int32_t fd;
+		uint32_t response;
+	} fresp;
+	kernel_ulong_t pos = 0;
+
+	if (addrlen < sizeof(fresp))
+		return false;
+
+	tprints("[");
+
+	do {
+		if (pos)
+			tprints(", ");
+
+		if (umove(tcp, addr + pos, &fresp)) {
+			printaddr_comment(addr + pos);
+			break;
+		}
+
+		PRINT_FIELD_FD("{", fresp, fd, tcp);
+
+		tprints(", response=");
+		if (fresp.response | FAN_AUDIT) {
+			print_xlat(FAN_AUDIT);
+			tprints("|");
+		}
+		printxval(fan_responses, fresp.response, "FAN_???");
+		tprints("}");
+
+		pos += sizeof(fresp);
+	} while (pos <= addrlen - sizeof(fresp));
+
+	if (pos < addrlen) {
+		if (pos)
+			tprints(", ");
+
+		printstrn(tcp, addr + pos, addrlen - pos);
+	}
+
+	tprints("]");
+
+	return true;
+}
 
 SYS_FUNC(fanotify_init)
 {
@@ -34,9 +285,6 @@ SYS_FUNC(fanotify_init)
 	return RVAL_DECODED | RVAL_FD;
 }
 
-#include "xlat/fan_mark_flags.h"
-#include "xlat/fan_event_flags.h"
-
 SYS_FUNC(fanotify_mark)
 {
 	printfd(tcp, tcp->u_arg[0]);

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)

fcntl.c

@@ -6,7 +6,27 @@
  * Copyright (c) 1999-2018 The strace developers.
  * All rights reserved.
  *
- * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in the
+ *    documentation and/or other materials provided with the distribution.
+ * 3. The name of the author may not be used to endorse or promote products
+ *    derived from this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
+ * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
+ * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
+ * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
+ * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
+ * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+ * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+ * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
+ * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
 #include "defs.h"
@@ -14,6 +34,7 @@
 
 #include "xlat/f_owner_types.h"
 #include "xlat/f_seals.h"
+#include "xlat/fcntl_rw_hints.h"
 #include "xlat/fcntlcmds.h"
 #include "xlat/fdflags.h"
 #include "xlat/lockfcmds.h"
@@ -64,6 +85,32 @@ print_f_owner_ex(struct tcb *const tcp, const kernel_ulong_t addr)
 	tprintf(", pid=%d}", owner.pid);
 }
 
+static void
+print_rwhint(struct tcb *const tcp, const kernel_ulong_t addr)
+{
+	uint64_t hint;
+
+	if (umove_or_printaddr(tcp, addr, &hint))
+		return;
+
+	tprints("[");
+	printxval(fcntl_rw_hints, hint, "RWH_WRITE_LIFE_???");
+	tprints("]");
+}
+
+static void
+print_owner_uids(struct tcb *const tcp, const kernel_ulong_t addr)
+{
+	uint32_t uids[2];
+
+	if (umove_or_printaddr(tcp, addr, uids))
+		return;
+
+	printuid("[", uids[0]); /* Real */
+	printuid(", ", uids[1]); /* Effective */
+	tprints("]");
+}
+
 static int
 print_fcntl(struct tcb *tcp)
 {
@@ -116,6 +163,11 @@ print_fcntl(struct tcb *tcp)
 		tprints(", ");
 		printsignal(tcp->u_arg[2]);
 		break;
+	case F_SET_RW_HINT:
+	case F_SET_FILE_RW_HINT:
+		tprints(", ");
+		print_rwhint(tcp, tcp->u_arg[2]);
+		break;
 	case F_GETOWN:
 	case F_GETPIPE_SZ:
 		break;
@@ -159,11 +211,26 @@ print_fcntl(struct tcb *tcp)
 		tcp->auxstr = sprintflags("seals ", f_seals,
 					  (kernel_ulong_t) tcp->u_rval);
 		return RVAL_HEX | RVAL_STR;
+	case F_GET_RW_HINT:
+	case F_GET_FILE_RW_HINT:
+		if (entering(tcp)) {
+			tprints(", ");
+			return 0;
+		}
+		print_rwhint(tcp, tcp->u_arg[2]);
+		break;
 	case F_GETSIG:
 		if (entering(tcp) || syserror(tcp) || tcp->u_rval == 0)
 			return 0;
 		tcp->auxstr = signame(tcp->u_rval);
 		return RVAL_STR;
+	case F_GETOWNER_UIDS:
+		if (entering(tcp)) {
+			tprints(", ");
+			return 0;
+		}
+		print_owner_uids(tcp, tcp->u_arg[2]);
+		break;
 	default:
 		tprintf(", %#" PRI_klx, tcp->u_arg[2]);
 		break;

fetch_bpf_fprog.c

@@ -1,8 +1,28 @@
 /*
- * 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
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in the
+ *    documentation and/or other materials provided with the distribution.
+ * 3. The name of the author may not be used to endorse or promote products
+ *    derived from this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
+ * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
+ * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
+ * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
+ * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
+ * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+ * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+ * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
+ * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
 #include "defs.h"

fetch_indirect_syscall_args.c

@@ -2,7 +2,27 @@
  * Copyright (c) 2018 The strace developers.
  * All rights reserved.
  *
- * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in the
+ *    documentation and/or other materials provided with the distribution.
+ * 3. The name of the author may not be used to endorse or promote products
+ *    derived from this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
+ * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
+ * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
+ * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
+ * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
+ * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+ * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+ * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
+ * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
 #include "defs.h"

fetch_struct_flock.c

@@ -1,9 +1,29 @@
 /*
  * 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
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in the
+ *    documentation and/or other materials provided with the distribution.
+ * 3. The name of the author may not be used to endorse or promote products
+ *    derived from this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
+ * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
+ * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
+ * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
+ * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
+ * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+ * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+ * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
+ * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
 #include "defs.h"

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)

fetch_struct_mmsghdr.c

@@ -1,8 +1,28 @@
 /*
- * 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
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in the
+ *    documentation and/or other materials provided with the distribution.
+ * 3. The name of the author may not be used to endorse or promote products
+ *    derived from this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
+ * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
+ * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
+ * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
+ * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
+ * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+ * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+ * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
+ * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
 #include "defs.h"

fetch_struct_msghdr.c

@@ -1,8 +1,28 @@
 /*
- * 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
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in the
+ *    documentation and/or other materials provided with the distribution.
+ * 3. The name of the author may not be used to endorse or promote products
+ *    derived from this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
+ * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
+ * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
+ * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
+ * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
+ * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+ * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+ * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
+ * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
 #include "defs.h"

fetch_struct_stat.c

@@ -1,9 +1,29 @@
 /*
  * 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
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in the
+ *    documentation and/or other materials provided with the distribution.
+ * 3. The name of the author may not be used to endorse or promote products
+ *    derived from this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
+ * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
+ * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
+ * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
+ * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
+ * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+ * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+ * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
+ * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
 #include "defs.h"

fetch_struct_stat64.c

@@ -1,9 +1,29 @@
 /*
  * 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
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in the
+ *    documentation and/or other materials provided with the distribution.
+ * 3. The name of the author may not be used to endorse or promote products
+ *    derived from this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
+ * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
+ * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
+ * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
+ * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
+ * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+ * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+ * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
+ * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
 #include "defs.h"

fetch_struct_statfs.c

@@ -1,9 +1,29 @@
 /*
  * 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
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in the
+ *    documentation and/or other materials provided with the distribution.
+ * 3. The name of the author may not be used to endorse or promote products
+ *    derived from this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
+ * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
+ * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
+ * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
+ * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
+ * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+ * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+ * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
+ * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
 #include "defs.h"

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)

file-date-gen

@@ -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
@@ -27,7 +22,7 @@ date=
 [ -f "${DATE_FILE}" ] && date="$(cat "${DATE_FILE}")"
 
 [ -n "${date}" ] ||
-	date="$(git log -s -n 1 --format=format:%cD "${FILE}")"
+	date="$(git log -n 1 --format=format:%cD --no-patch "${FILE}")"
 
 [ -n "${date}" ] ||
 	date="${DEFAULT_DATE}"

file_handle.c

@@ -1,9 +1,29 @@
 /*
  * 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
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in the
+ *    documentation and/or other materials provided with the distribution.
+ * 3. The name of the author may not be used to endorse or promote products
+ *    derived from this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
+ * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
+ * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
+ * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
+ * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
+ * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+ * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+ * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
+ * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
 #include "defs.h"

file_ioctl.c

@@ -3,7 +3,27 @@
  * Copyright (c) 2016-2018 The strace developers.
  * All rights reserved.
  *
- * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in the
+ *    documentation and/or other materials provided with the distribution.
+ * 3. The name of the author may not be used to endorse or promote products
+ *    derived from this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
+ * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
+ * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
+ * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
+ * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
+ * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+ * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+ * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
+ * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
 #include "defs.h"

filter.h

@@ -3,11 +3,31 @@
  * Copyright (c) 2017-2018 The strace developers.
  * All rights reserved.
  *
- * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in the
+ *    documentation and/or other materials provided with the distribution.
+ * 3. The name of the author may not be used to endorse or promote products
+ *    derived from this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
+ * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
+ * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
+ * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
+ * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
+ * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+ * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+ * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
+ * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
 #ifndef STRACE_FILTER_H
-# define STRACE_FILTER_H
+#define STRACE_FILTER_H
 
 struct number_set;
 typedef int (*string_to_uint_func)(const char *);

filter_qualify.c

@@ -3,7 +3,27 @@
  * Copyright (c) 2016-2018 The strace developers.
  * All rights reserved.
  *
- * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in the
+ *    documentation and/or other materials provided with the distribution.
+ * 3. The name of the author may not be used to endorse or promote products
+ *    derived from this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
+ * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
+ * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
+ * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
+ * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
+ * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+ * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+ * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
+ * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
 #include "defs.h"
@@ -28,30 +48,55 @@ struct inject_personality_data {
 	uint16_t scno;
 };
 
+struct alt_name {
+	const char *syn;
+	const char *orig;
+};
+
+#define _(a_, b_) { (a_), (b_) }
+static const struct alt_name alt_signames[] = {
+	#include "linux/alt_signalent.h"
+};
+
+static const struct alt_name alt_errnames[] = {
+	#include "linux/alt_signalent.h"
+};
+#undef _
+
+static bool
+signame_eq(const char *needle, const char *straw)
+{
+	if (strncasecmp(straw, "SIG", 3) != 0)
+		return false;
+
+	straw += 3;
+
+	if (strncasecmp(needle, "SIG", 3) == 0)
+		needle += 3;
+
+	return (strcasecmp(needle, straw) == 0);
+}
+
 static int
 sigstr_to_uint(const char *s)
 {
+	for (size_t i = 0; i < ARRAY_SIZE(alt_signames); i++) {
+		if (!signame_eq(s, alt_signames[i].syn)) {
+			error_msg("Signal name \"%s\" is selected instead of "
+				  "synonymous \"%s\"",
+				  alt_signames[i].orig, s);
+			s = alt_signames[i].orig;
+			break;
+		}
+	}
+
 	if (*s >= '0' && *s <= '9')
-		return string_to_uint_upto(s, 255);
+		return string_to_uint_upto(s, nsig);
 
-	if (strncasecmp(s, "SIG", 3) == 0)
-		s += 3;
 
-	for (int i = 1; i <= 255; ++i) {
-		const char *name = signame(i);
-
-		if (!name)
-			continue;
-
-		if (strncasecmp(name, "SIG", 3) != 0)
-			continue;
-
-		name += 3;
-
-		if (strcasecmp(name, s) != 0)
-			continue;
-
-		return i;
+	for (size_t i = 1; i <= nsig; i++) {
+		if (signame_eq(s, signame(i)))
+			return i;
 	}
 
 	return -1;
@@ -60,6 +105,16 @@ sigstr_to_uint(const char *s)
 static int
 find_errno_by_name(const char *name)
 {
+	for (unsigned int i = 0; i < ARRAY_SIZE(alt_errnames); ++i) {
+		if (!strcasecmp(name, alt_errnames[i].syn)) {
+			error_msg("Error name \"%s\" is selected instead of "
+				  "synonymous \"%s\"",
+				  alt_errnames[i].orig, name);
+			name = alt_errnames[i].orig;
+			break;
+		}
+	}
+
 	for (unsigned int i = 1; i < nerrnos; ++i) {
 		if (errnoent[i] && (strcasecmp(name, errnoent[i]) == 0))
 			return i;
@@ -75,14 +130,15 @@ parse_delay_token(const char *input, struct inject_opts *fopts, bool isenter)
 
        if (fopts->data.flags & flag) /* duplicate */
                return false;
-       long long intval = string_to_ulonglong(input);
-       if (intval < 0) /* couldn't parse */
+       struct timespec tsval;
+
+       if (parse_ts(input, &tsval) < 0) /* couldn't parse */
                return false;
 
        if (fopts->data.delay_idx == (uint16_t) -1)
                fopts->data.delay_idx = alloc_delay_data();
        /* populate .ts_enter or .ts_exit */
-       fill_delay_data(fopts->data.delay_idx, intval, isenter);
+       fill_delay_data(fopts->data.delay_idx, &tsval, isenter);
        fopts->data.flags |= flag;
 
        return true;

flock.c

@@ -3,10 +3,30 @@
  * 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
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in the
+ *    documentation and/or other materials provided with the distribution.
+ * 3. The name of the author may not be used to endorse or promote products
+ *    derived from this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
+ * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
+ * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
+ * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
+ * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
+ * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+ * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+ * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
+ * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
 #include "defs.h"

flock.h

@@ -1,30 +1,50 @@
 /*
  * 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
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in the
+ *    documentation and/or other materials provided with the distribution.
+ * 3. The name of the author may not be used to endorse or promote products
+ *    derived from this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
+ * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
+ * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
+ * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
+ * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
+ * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+ * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+ * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
+ * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
 #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 */

fs_x_ioctl.c

@@ -1,10 +1,30 @@
 /*
  * 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
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in the
+ *    documentation and/or other materials provided with the distribution.
+ * 3. The name of the author may not be used to endorse or promote products
+ *    derived from this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
+ * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
+ * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
+ * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
+ * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
+ * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+ * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+ * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
+ * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
 #include "defs.h"

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)

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)

futex.c

@@ -6,7 +6,27 @@
  * Copyright (c) 2014-2018 The strace developers.
  * All rights reserved.
  *
- * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in the
+ *    documentation and/or other materials provided with the distribution.
+ * 3. The name of the author may not be used to endorse or promote products
+ *    derived from this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
+ * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
+ * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
+ * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
+ * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
+ * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+ * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+ * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
+ * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
 #include "defs.h"
@@ -20,17 +40,45 @@
 #ifndef FUTEX_OP_OPARG_SHIFT
 # define FUTEX_OP_OPARG_SHIFT 8
 #endif
+#ifndef FUTEX_TID_MASK
+# define FUTEX_TID_MASK 0x3fffffffU
+#endif
 
 #include "xlat/futexbitset.h"
 #include "xlat/futexops.h"
+#include "xlat/futexpiflags.h"
 #include "xlat/futexwakeops.h"
 #include "xlat/futexwakecmps.h"
 
+static void
+printaddrnum(struct tcb *tcp, kernel_ulong_t addr)
+{
+	printnum_int_ex(tcp, addr, true, "%#x");
+}
+
+static void
+printaddrpival(struct tcb *tcp, kernel_ulong_t addr)
+{
+	uint32_t tid;
+
+	if (umove_or_printaddr(tcp, addr, &tid))
+		return;
+
+	tprints("[");
+	if (tid & ~FUTEX_TID_MASK) {
+	printflags(futexpiflags, tid & ~FUTEX_TID_MASK, NULL);
+		tprints("|");
+	}
+	tprintf("%u]", tid & FUTEX_TID_MASK);
+	printaddr_comment(addr);
+}
+
 SYS_FUNC(futex)
 {
 	const kernel_ulong_t uaddr = tcp->u_arg[0];
 	const int op = tcp->u_arg[1];
 	const int cmd = op & 127;
+	const bool is_rt = op & FUTEX_CLOCK_REALTIME;
 	const kernel_ulong_t timeout = tcp->u_arg[3];
 	const kernel_ulong_t uaddr2 = tcp->u_arg[4];
 	const unsigned int val = tcp->u_arg[2];
@@ -38,23 +86,33 @@ SYS_FUNC(futex)
 	const unsigned int val3 = tcp->u_arg[5];
 	const char *comment;
 
-	printaddr(uaddr);
+	switch (cmd) {
+	case FUTEX_LOCK_PI:
+	case FUTEX_UNLOCK_PI:
+	case FUTEX_TRYLOCK_PI:
+		printaddrpival(tcp, uaddr);
+		break;
+	default:
+		printaddrnum(tcp, uaddr);
+	}
+
 	tprints(", ");
 	printxval(futexops, op, "FUTEX_???");
 	switch (cmd) {
 	case FUTEX_WAIT:
 		tprintf(", %u", val);
 		tprints(", ");
-		print_timespec(tcp, timeout);
+		/* timeout in FUTEX_WAIT is relative, contrary to other ops */
+		print_timespec(tcp, timeout, false);
 		break;
 	case FUTEX_LOCK_PI:
 		tprints(", ");
-		print_timespec(tcp, timeout);
+		print_timespec(tcp, timeout, true);
 		break;
 	case FUTEX_WAIT_BITSET:
 		tprintf(", %u", val);
 		tprints(", ");
-		print_timespec(tcp, timeout);
+		print_timespec(tcp, timeout, is_rt);
 		tprints(", ");
 		printxval(futexbitset, val3, NULL);
 		break;
@@ -66,19 +124,20 @@ SYS_FUNC(futex)
 	case FUTEX_REQUEUE:
 		tprintf(", %u", val);
 		tprintf(", %u, ", val2);
-		printaddr(uaddr2);
+		printaddrnum(tcp, uaddr2);
 		break;
 	case FUTEX_CMP_REQUEUE:
 	case FUTEX_CMP_REQUEUE_PI:
 		tprintf(", %u", val);
 		tprintf(", %u, ", val2);
-		printaddr(uaddr2);
+		(cmd == FUTEX_CMP_REQUEUE ? printaddrnum
+					  : printaddrpival)(tcp, uaddr2);
 		tprintf(", %u", val3);
 		break;
 	case FUTEX_WAKE_OP:
 		tprintf(", %u", val);
 		tprintf(", %u, ", val2);
-		printaddr(uaddr2);
+		printaddrnum(tcp, uaddr2);
 		tprints(", ");
 		if ((val3 >> 28) & FUTEX_OP_OPARG_SHIFT) {
 			print_xlat(FUTEX_OP_OPARG_SHIFT);
@@ -98,11 +157,13 @@ SYS_FUNC(futex)
 	case FUTEX_WAIT_REQUEUE_PI:
 		tprintf(", %u", val);
 		tprints(", ");
-		print_timespec(tcp, timeout);
+		print_timespec(tcp, timeout, is_rt);
 		tprints(", ");
-		printaddr(uaddr2);
+		printaddrpival(tcp, uaddr2);
 		break;
 	case FUTEX_FD:
+		tprintf(", %u", val);
+		return RVAL_DECODED | RVAL_FD;
 	case FUTEX_WAKE:
 		tprintf(", %u", val);
 		break;

gcc_compat.h

@@ -3,118 +3,119 @@
  * Copyright (c) 2015-2018 The strace developers.
  * All rights reserved.
  *
- * SPDX-License-Identifier: LGPL-2.1-or-later
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in the
+ *    documentation and/or other materials provided with the distribution.
+ * 3. The name of the author may not be used to endorse or promote products
+ *    derived from this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
+ * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
+ * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
+ * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
+ * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
+ * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+ * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+ * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
+ * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
 #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 __attribute__(x)	/* empty */
+# define GNUC_PREREQ(maj, min)	0
+#endif
 
-# 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
+#if GNUC_PREREQ(2, 5)
+# define ATTRIBUTE_NORETURN	__attribute__((__noreturn__))
+#else
+# define ATTRIBUTE_NORETURN	/* empty */
+#endif
 
-# if !(GNUC_PREREQ(2, 0) || CLANG_PREREQ(1, 0))
-#  define __attribute__(x)	/* 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, 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(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, 1)
+# define CMPXCHG(val_, old_, new_) \
+	__sync_bool_compare_and_swap((val_), (old_), (new_))
+#else
+# define CMPXCHG(val_, old_, new_) \
+	((val_) == (old_) ? (val_) = (new_), true : false)
+#endif
 
-# if GNUC_PREREQ(7, 0)
-#  define ATTRIBUTE_FALLTHROUGH	__attribute__((__fallthrough__))
-# else
-#  define ATTRIBUTE_FALLTHROUGH	((void) 0)
-# endif
+#if GNUC_PREREQ(4, 3)
+# define ATTRIBUTE_ALLOC_SIZE(args)	__attribute__((__alloc_size__ args))
+#else
+# define ATTRIBUTE_ALLOC_SIZE(args)	/* empty */
+#endif
 
-# 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					\
-	_Pragma("clang diagnostic pop");
-# 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					\
-	_Pragma("GCC diagnostic pop");
-# else
-#  define DIAG_PUSH_IGNORE_OVERRIDE_INIT	/* empty */
-#  define DIAG_POP_IGNORE_OVERRIDE_INIT	/* empty */
-# endif
+#if GNUC_PREREQ(7, 0)
+# define ATTRIBUTE_FALLTHROUGH	__attribute__((__fallthrough__))
+#else
+# define ATTRIBUTE_FALLTHROUGH	((void) 0)
+#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 */

gen_bpf_attr_check.sh

@@ -2,7 +2,27 @@
 # Copyright (c) 2018 Dmitry V. Levin <ldv@altlinux.org>
 # All rights reserved.
 #
-# SPDX-License-Identifier: LGPL-2.1-or-later
+# Redistribution and use in source and binary forms, with or without
+# modification, are permitted provided that the following conditions
+# are met:
+# 1. Redistributions of source code must retain the above copyright
+#    notice, this list of conditions and the following disclaimer.
+# 2. Redistributions in binary form must reproduce the above copyright
+#    notice, this list of conditions and the following disclaimer in the
+#    documentation and/or other materials provided with the distribution.
+# 3. The name of the author may not be used to endorse or promote products
+#    derived from this software without specific prior written permission.
+#
+# THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
+# IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
+# OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
+# IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
+# INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
+# NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+# DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+# THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
+# THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 input="$1"
 shift

gen_ptp_clock_check.sh

@@ -0,0 +1,82 @@
+#!/bin/sh -efu
+# Copyright (c) 2018 Dmitry V. Levin <ldv@altlinux.org>
+# All rights reserved.
+#
+# Redistribution and use in source and binary forms, with or without
+# modification, are permitted provided that the following conditions
+# are met:
+# 1. Redistributions of source code must retain the above copyright
+#    notice, this list of conditions and the following disclaimer.
+# 2. Redistributions in binary form must reproduce the above copyright
+#    notice, this list of conditions and the following disclaimer in the
+#    documentation and/or other materials provided with the distribution.
+# 3. The name of the author may not be used to endorse or promote products
+#    derived from this software without specific prior written permission.
+#
+# THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
+# IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
+# OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
+# IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
+# INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
+# NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+# DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+# THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
+# THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+input="$1"
+shift
+
+cat <<EOF
+/* Generated by $0 from $input; do not edit. */
+#include "defs.h"
+#ifdef HAVE_LINUX_PTP_CLOCK_H
+# include <linux/ptp_clock.h>
+# include "ptp_clock.h"
+# include "static_assert.h"
+
+# define SoM(type_, member_) (sizeof(((type_ *)0)->member_))
+EOF
+
+for struct in $(sed -n 's/^struct \(strace_ptp_[^[:space:]]\+\) .*/\1/p' < "$input"); do
+	type_name="struct ${struct#strace_}"
+	TYPE_NAME="$(printf %s "$type_name" |tr '[:lower:] ' '[:upper:]_')"
+
+	sed -n '/^'"struct $struct"' [^{]*{$/,/^};$/p' < "$input" |
+	sed -n 's/^[[:space:]]\+[^][;]*[[:space:]]\([^][[:space:];]\+\)\(\[[^;]*\]\)\?;$/\1/p' |
+	while read field; do
+		FIELD="$(printf %s "$field" |tr '[:lower:]' '[:upper:]')"
+
+		if [ "rsv" = "$field" ]; then
+			cat <<EOF
+
+# ifdef HAVE_${TYPE_NAME}_$FIELD
+	static_assert(SoM(struct $struct, $field) <= SoM($type_name, $field),
+		      "$struct.$field is bigger than in system headers");
+# endif /* HAVE_${TYPE_NAME}_$FIELD */
+EOF
+			continue;
+		fi
+
+		cat <<EOF
+
+# ifdef HAVE_${TYPE_NAME}_$FIELD
+	static_assert(SoM(struct $struct, $field) == SoM($type_name, $field),
+		      "$struct.$field size mismatch");
+	static_assert(offsetof(struct $struct, $field) == offsetof($type_name, $field),
+		      "$struct.$field offset mismatch");
+# endif /* HAVE_${TYPE_NAME}_$FIELD */
+EOF
+	done
+		cat <<EOF
+
+static_assert(${struct}_size == expected_${struct}_size,
+	      "${struct}_size mismatch");
+EOF
+
+done
+
+cat <<'EOF'
+
+#endif /* HAVE_LINUX_BPF_H */
+EOF

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' |

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,'

get_personality.c

@@ -1,14 +0,0 @@
-/*
- * Copyright (c) 2018 Dmitry V. Levin <ldv@altlinux.org>
- * All rights reserved.
- *
- * SPDX-License-Identifier: LGPL-2.1-or-later
- */
-
-#include "defs.h"
-
-#if SUPPORTED_PERSONALITIES > 1
-# include "get_personality.h"
-# include <linux/audit.h>
-# include "arch_get_personality.c"
-#endif

get_personality.h

@@ -1,16 +0,0 @@
-/*
- * Copyright (c) 2018 Dmitry V. Levin <ldv@altlinux.org>
- * All rights reserved.
- *
- * SPDX-License-Identifier: LGPL-2.1-or-later
- */
-
-#ifndef STRACE_GET_PERSONALITY_H
-# define STRACE_GET_PERSONALITY_H
-
-# include "ptrace.h"
-
-extern int
-get_personality_from_syscall_info(const struct ptrace_syscall_info *);
-
-#endif /* !STRACE_GET_PERSONALITY_H */

get_robust_list.c

@@ -1,18 +1,89 @@
 /*
- * 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
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions
+ * are met:
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer.
+ * 2. Redistributions in binary form must reproduce the above copyright
+ *    notice, this list of conditions and the following disclaimer in the
+ *    documentation and/or other materials provided with the distribution.
+ * 3. The name of the author may not be used to endorse or promote products
+ *    derived from this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
+ * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
+ * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
+ * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
+ * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
+ * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+ * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+ * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
+ * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
 #include "defs.h"
 
+#include DEF_MPERS_TYPE(struct_robust_list_head)
+
+#include <linux/futex.h>
+
+typedef struct robust_list_head struct_robust_list_head;
+
+#include MPERS_DEFS
+
+#include "print_fields.h"
+
+static void
+decode_robust_list(struct tcb *tcp, kernel_ulong_t addr, kernel_ulong_t len)
+{
+	struct_robust_list_head rl;
+
+	if (len < sizeof(rl)) {
+		printaddr(addr);
+		return;
+	}
+	if (umove_or_printaddr(tcp, addr, &rl))
+		return;
+
+	PRINT_FIELD_PTR("{list={", rl.list, next);
+	PRINT_FIELD_D("}, ", rl, futex_offset);
+	PRINT_FIELD_PTR(", ", rl, list_op_pending);
+
+	if (len > sizeof(rl))
+		tprints(", /* ??? */");
+
+	tprints("}");
+
+	printaddr_comment(addr);
+}
+
+SYS_FUNC(set_robust_list)
+{
+	decode_robust_list(tcp, tcp->u_arg[0], tcp->u_arg[1]);
+	tprintf(", %lu", (unsigned long) tcp->u_arg[1]);
+
+	return RVAL_DECODED;
+}
+
 SYS_FUNC(get_robust_list)
 {
 	if (entering(tcp)) {
 		tprintf("%d, ", (int) tcp->u_arg[0]);
 	} else {
-		printnum_ptr(tcp, tcp->u_arg[1]);
+		mpers_ptr_t rl_ptr;
+		mpers_ptr_t len = 0;
+		if (!umove_or_printaddr(tcp, tcp->u_arg[1], &rl_ptr)) {
+			tprints("[");
+			if (!umove(tcp, tcp->u_arg[2], &len))
+				decode_robust_list(tcp, rl_ptr, len);
+			else
+				printaddr(tcp->u_arg[1]);
+			tprints("]");
+		}
 		tprints(", ");
 		printnum_ulong(tcp, tcp->u_arg[2]);
 	}

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)

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)

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)

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"
 

glibc_compat.h

@@ -0,0 +1,23 @@
+#ifndef STRACE_GLIBC_COMPAT_H
+#define STRACE_GLIBC_COMPAT_H
+
+#if defined __GLIBC__
+# ifndef __GLIBC_MINOR__
+#  warning "__GLIBC__ is defined, but __GLIBC_MINOR__ isn't"
+#  define __GLIBC_MINOR__ 0
+# endif /* __GLIBC_MINOR__ */
+
+# ifdef __GLIBC_PREREQ
+#  define GLIBC_PREREQ __GLIBC_PREREQ
+# else
+#  define GLIBC_PREREQ(maj, min) \
+	((((__GLIBC__) << 16) + (__GLIBC_MINOR__)) >= (((maj) << 16) + (min)))
+# endif /* __GLIBC_PREREQ */
+
+# define GLIBC_OLDER(maj, min) (!GLIBC_PREREQ((maj), (min)))
+#else /* !__GLIBC__ */
+# define GLIBC_PREREQ(maj, min)	0
+# define GLIBC_OLDER(maj, min)	0
+#endif
+
+#endif /* STRACE_GLIBC_COMPAT_H */