strace: terminate itself if interrupted by a signal

[strace] / tests / tests.h

diff --git a/tests/tests.h b/tests/tests.h
index 258b3a430fec7cf31e42aeeac270b3d4e47f611c..3c2ec378bee373a10fccbed3b0e0d2dfa514d8ee 100644 (file)
--- a/tests/tests.h
+++ b/tests/tests.h
@@ -3,27 +3,7 @@
  * Copyright (c) 2016-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
  */
 
 #ifndef STRACE_TESTS_H
@@ -33,6 +13,16 @@
 # include "config.h"
 #endif
 
+#ifdef TESTS_SIZEOF_KERNEL_LONG_T
+# undef SIZEOF_KERNEL_LONG_T
+# define SIZEOF_KERNEL_LONG_T TESTS_SIZEOF_KERNEL_LONG_T
+#endif
+
+#ifdef TESTS_SIZEOF_LONG
+# undef SIZEOF_LONG
+# define SIZEOF_LONG TESTS_SIZEOF_LONG
+#endif
+
 #include <stdbool.h>
 #include <sys/types.h>
 #include "kernel_types.h"
@@ -52,6 +42,14 @@
 # define VERBOSE 0
 #endif
 
+/* xlat verbosity defaults */
+#ifndef XLAT_RAW
+# define XLAT_RAW 0
+#endif
+#ifndef XLAT_VERBOSE
+# define XLAT_VERBOSE 0
+#endif
+
 #ifndef DEFAULT_STRLEN
 /* Default maximum # of bytes printed in printstr et al. */
 # define DEFAULT_STRLEN 32
@@ -99,6 +97,9 @@ void *tail_alloc(const size_t)
 void *tail_memdup(const void *, const size_t)
        ATTRIBUTE_MALLOC ATTRIBUTE_ALLOC_SIZE((2));
 
+#define midtail_alloc(after_, before_) \
+       ((void *) ((char *) tail_alloc(((before_) + (after_))) + (before_)))
+
 /*
  * Allocate an object of the specified type at the end
  * of a mapped memory region.
@@ -153,6 +154,12 @@ void print_quoted_string(const char *);
  */
 void print_quoted_cstring(const char *str, size_t size);
 
+/*
+ * Print a NUL-terminated string `str' of length up to `size'
+ * in a quoted form.
+ */
+void print_quoted_stringn(const char *str, size_t size);
+
 /* Print memory in a quoted form with optional escape characters. */
 void print_quoted_memory_ex(const void *, size_t, bool quote,
                            const char *escape_chars);
@@ -267,7 +274,6 @@ f8ill_ptr_to_kulong(const void *const ptr)
 #endif
 #define LL_VAL_TO_PAIR(llval) LL_PAIR((long) ((llval) >> 32), (long) (llval))
 
-#define _STR(_arg) #_arg
 #define ARG_STR(_arg) (_arg), #_arg
 #define ARG_ULL_STR(_arg) _arg##ULL, #_arg