strace: terminate itself if interrupted by a signal

[strace] / tests / ioctl_block.c

diff --git a/tests/ioctl_block.c b/tests/ioctl_block.c
index 8e883d4b2440c364ca0240b12431e87817f601ab..48f6254fd4c12b6b6233ca90139ca935e4326d37 100644 (file)
--- a/tests/ioctl_block.c
+++ b/tests/ioctl_block.c
@@ -5,27 +5,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"
@@ -58,9 +38,11 @@ static struct xlat block_argless[] = {
 #endif
 };
 
-#define TEST_NULL_ARG(cmd) \
-       ioctl(-1, cmd, 0); \
-       printf("ioctl(-1, %s, NULL) = -1 EBADF (%m)\n", #cmd)
+#define TEST_NULL_ARG(cmd)                                             \
+       do {                                                            \
+               ioctl(-1, cmd, 0);                                      \
+               printf("ioctl(-1, %s, NULL) = -1 EBADF (%m)\n", #cmd);  \
+       } while (0)
 
 int
 main(void)
@@ -152,7 +134,7 @@ main(void)
        blkpg->data = (void *) (unsigned long) 0xcafef00dfffffeedULL;
 
        ioctl(-1, BLKPG, blkpg);
-       printf("ioctl(-1, BLKPG, {%s, flags=%d, datalen=%d"
+       printf("ioctl(-1, BLKPG, {op=%s, flags=%d, datalen=%d"
               ", data=%#lx}) = -1 EBADF (%m)\n",
               "BLKPG_RESIZE_PARTITION", blkpg->flags, blkpg->datalen,
               (unsigned long) blkpg->data);
@@ -167,9 +149,9 @@ main(void)
        blkpg->data = bp;
 
        ioctl(-1, BLKPG, blkpg);
-       printf("ioctl(-1, BLKPG, {%s, flags=%d, datalen=%d"
+       printf("ioctl(-1, BLKPG, {op=%s, flags=%d, datalen=%d"
               ", data={start=%lld, length=%lld, pno=%d"
-              ", devname=\"%.*s\", volname=\"%.*s\"}})"
+              ", devname=\"%.*s\"..., volname=\"%.*s\"...}})"
               " = -1 EBADF (%m)\n",
               "BLKPG_ADD_PARTITION",
               blkpg->flags, blkpg->datalen,