strace: terminate itself if interrupted by a signal

[strace] / tests / ioctl_scsi.c

diff --git a/tests/ioctl_scsi.c b/tests/ioctl_scsi.c
index 0db94d8497fd019078e0ea5fda790f0c1afe05fb..b6347b62806860c77c9b180a555dee63a0ddedca 100644 (file)
--- a/tests/ioctl_scsi.c
+++ b/tests/ioctl_scsi.c
@@ -2,29 +2,10 @@
  * Check decoding of SCSI ioctl commands.
  *
  * Copyright (c) 2017 Dmitry V. Levin <ldv@altlinux.org>
+ * Copyright (c) 2017-2018 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"
@@ -69,7 +50,7 @@
 int
 main(void)
 {
-       int *const pint = tail_alloc(sizeof(*pint));
+       TAIL_ALLOC_OBJECT_CONST_PTR(int, pint);
        *pint = (int) 0xfacefeed;
 
        TEST_NO_ARG(SG_GET_TIMEOUT);
@@ -137,13 +118,14 @@ main(void)
               "SG_SCSI_RESET");
 
        ioctl(-1, 0x22ff, 0);
-       printf("ioctl(-1, _IOC(0, 0x22, 0xff, 0), 0) = -1 EBADF (%m)\n");
+       printf("ioctl(-1, _IOC(%s, 0x22, 0xff, 0), 0) = -1 EBADF (%m)\n",
+              _IOC_NONE ? "0" : "_IOC_NONE");
 
        static const unsigned long magic =
                (unsigned long) 0xdeadbeeffacefeedULL;
        ioctl(-1, 0x22ff, magic);
-       printf("ioctl(-1, _IOC(0, 0x22, 0xff, 0), %#lx) = -1 EBADF (%m)\n",
-              magic);
+       printf("ioctl(-1, _IOC(%s, 0x22, 0xff, 0), %#lx) = -1 EBADF (%m)\n",
+              _IOC_NONE ? "0" : "_IOC_NONE", magic);
 
        puts("+++ exited with 0 +++");
        return 0;