strace: terminate itself if interrupted by a signal

[strace] / tests / xchownx.c

diff --git a/tests/xchownx.c b/tests/xchownx.c
index fe5828351d5b65e2a856a2b9ede123c724afa597..a78459bd862e355aa74a72dae570b597646cbc96 100644 (file)
--- a/tests/xchownx.c
+++ b/tests/xchownx.c
@@ -2,29 +2,10 @@
  * Check decoding of chown/chown32/lchown/lchown32/fchown/fchown32 syscalls.
  *
  * Copyright (c) 2016 Dmitry V. Levin <ldv@altlinux.org>
+ * 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 <fcntl.h>
@@ -45,10 +26,17 @@
 # define CHECK_OVERFLOWGID(arg)
 #endif
 
-#define UNLINK_SAMPLE \
-       if (unlink(sample)) perror_msg_and_fail("unlink")
-#define CLOSE_SAMPLE \
-       if (close(fd)) perror_msg_and_fail("close")
+#define UNLINK_SAMPLE                                  \
+       do {                                            \
+               if (unlink(sample))                     \
+                       perror_msg_and_fail("unlink");  \
+       } while (0)
+
+#define CLOSE_SAMPLE                                   \
+       do {                                            \
+               if (close(fd))                          \
+                       perror_msg_and_fail("close");   \
+       } while (0)
 
 #ifdef ACCESS_BY_DESCRIPTOR
 # define SYSCALL_ARG1 fd