strace: terminate itself if interrupted by a signal

[strace] / tests / ioctl_uffdio.c

diff --git a/tests/ioctl_uffdio.c b/tests/ioctl_uffdio.c
index 24c642a710533647f0eb934efc5a9fb7363363ee..cdfe74ab24cb088b129a535fdcaa9d1982c47061 100644 (file)
--- a/tests/ioctl_uffdio.c
+++ b/tests/ioctl_uffdio.c
@@ -4,27 +4,7 @@
  * Copyright (c) 2016-2017 The strace developers.
  * All rights reserved.
  *
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions
- * are met:
- * 1. Redistributions of source code must retain the above copyright
- *    notice, this list of conditions and the following disclaimer.
- * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 3. The name of the author may not be used to endorse or promote products
- *    derived from this software without specific prior written permission.
- *
- * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
- * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
- * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
- * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
- * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
- * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
- * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
- * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
- * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ * SPDX-License-Identifier: GPL-2.0-or-later
  */
 
 #include "tests.h"
@@ -44,6 +24,9 @@
 # include <linux/ioctl.h>
 # include <linux/userfaultfd.h>
 
+#include "xlat.h"
+#include "xlat/uffd_api_features.h"
+
 int
 main(void)
 {
@@ -71,9 +54,11 @@ main(void)
        api_struct->features = 0;
        rc = ioctl(fd, UFFDIO_API, api_struct);
        printf("ioctl(%d, UFFDIO_API, {api=0xaa, features=0", fd);
-       if (api_struct->features)
-               printf(" => features=%#" PRIx64,
-                      (uint64_t) api_struct->features);
+       if (api_struct->features) {
+               printf(" => features=");
+               printflags(uffd_api_features, api_struct->features,
+                          "UFFD_FEATURE_???");
+       }
        printf(", ioctls=1<<_UFFDIO_REGISTER|"
               "1<<_UFFDIO_UNREGISTER|1<<_UFFDIO_API");
        api_struct->ioctls &= ~(1ull<<_UFFDIO_REGISTER|