pkgsrc-WIP-changes archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
compiler-rt-netbsd: Preprocess local patches with git-clang-format
Module Name: pkgsrc-wip
Committed By: Kamil Rytarowski <n54%gmx.com@localhost>
Pushed By: kamil
Date: Thu Jun 7 12:40:36 2018 +0200
Changeset: 5efa36cab4c8785fb76d602472482154d039b9a7
Modified Files:
compiler-rt-netbsd/distinfo
compiler-rt-netbsd/patches/patch-lib_sanitizer__common_sanitizer__common__interceptors.inc
Log Message:
compiler-rt-netbsd: Preprocess local patches with git-clang-format
This is required for execution of tests.
Sponsored by <The NetBSD Foundation>
To see a diff of this commit:
https://wip.pkgsrc.org/cgi-bin/gitweb.cgi?p=pkgsrc-wip.git;a=commitdiff;h=5efa36cab4c8785fb76d602472482154d039b9a7
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
diffstat:
compiler-rt-netbsd/distinfo | 2 +-
...zer__common_sanitizer__common__interceptors.inc | 253 +++++++++++----------
2 files changed, 134 insertions(+), 121 deletions(-)
diffs:
diff --git a/compiler-rt-netbsd/distinfo b/compiler-rt-netbsd/distinfo
index 31bdbff3b3..1af176216e 100644
--- a/compiler-rt-netbsd/distinfo
+++ b/compiler-rt-netbsd/distinfo
@@ -9,7 +9,7 @@ SHA1 (patch-lib_fuzzer_tests_CMakeLists.txt) = e2e0e397eaf148df329f2c25ca9185f57
SHA1 (patch-lib_interception_interception.h) = a7f97b191769c846be27e17430bbe39435976642
SHA1 (patch-lib_msan_msan__interceptors.cc) = b8d6a174a0b302a87d3f1489a439f186b034313d
SHA1 (patch-lib_msan_msan__linux.cc) = 6fd2ada4a84d1e1cc47ec8f4e1f0608861c73c1a
-SHA1 (patch-lib_sanitizer__common_sanitizer__common__interceptors.inc) = 29c7d1fe89a358098d5a68f83a2940f46c77ccc6
+SHA1 (patch-lib_sanitizer__common_sanitizer__common__interceptors.inc) = 3746d47670557d072a2a57763af6c68b0bdc519d
SHA1 (patch-lib_sanitizer__common_sanitizer__internal__defs.h) = 9ffcb3ae5ccfcb99d842efe55f6d698cd2e02846
SHA1 (patch-lib_sanitizer__common_sanitizer__linux.cc) = 83636321cef6a17281a27e2ed3dd1b71e5429a6a
SHA1 (patch-lib_sanitizer__common_sanitizer__linux__libcdep.cc) = c1ce6657580cc0865808dd713d1f28afc3baaaa7
diff --git a/compiler-rt-netbsd/patches/patch-lib_sanitizer__common_sanitizer__common__interceptors.inc b/compiler-rt-netbsd/patches/patch-lib_sanitizer__common_sanitizer__common__interceptors.inc
index c4c5edac4a..74f7e34aaf 100644
--- a/compiler-rt-netbsd/patches/patch-lib_sanitizer__common_sanitizer__common__interceptors.inc
+++ b/compiler-rt-netbsd/patches/patch-lib_sanitizer__common_sanitizer__common__interceptors.inc
@@ -39,7 +39,7 @@ $NetBSD$
StrtolFixAndCheck(ctx, nptr, endptr, real_endptr, base);
return res;
}
-@@ -7190,6 +7196,1085 @@ INTERCEPTOR(struct __sanitizer_netent *,
+@@ -7190,6 +7196,1098 @@ INTERCEPTOR(struct __sanitizer_netent *,
#define INIT_NETENT
#endif
@@ -83,8 +83,8 @@ $NetBSD$
+}
+
+INTERCEPTOR(int, sysctlgetmibinfo, char *sname, int *name,
-+ unsigned int *namelenp,
-+ char *cname, SIZE_T *csz, void **rnode, int v) {
++ unsigned int *namelenp, char *cname, SIZE_T *csz, void **rnode,
++ int v) {
+ void *ctx;
+ int res;
+ COMMON_INTERCEPTOR_ENTER(ctx, sysctlgetmibinfo, sname, name, namelenp, cname,
@@ -151,12 +151,12 @@ $NetBSD$
+ COMMON_INTERCEPTOR_WRITE_RANGE(ctx, res, *len);
+ return res;
+}
-+#define INIT_SYSCTL \
-+ COMMON_INTERCEPT_FUNCTION(sysctl); \
-+ COMMON_INTERCEPT_FUNCTION(sysctlbyname); \
-+ COMMON_INTERCEPT_FUNCTION(sysctlgetmibinfo); \
-+ COMMON_INTERCEPT_FUNCTION(sysctlnametomib); \
-+ COMMON_INTERCEPT_FUNCTION(asysctl); \
++#define INIT_SYSCTL \
++ COMMON_INTERCEPT_FUNCTION(sysctl); \
++ COMMON_INTERCEPT_FUNCTION(sysctlbyname); \
++ COMMON_INTERCEPT_FUNCTION(sysctlgetmibinfo); \
++ COMMON_INTERCEPT_FUNCTION(sysctlnametomib); \
++ COMMON_INTERCEPT_FUNCTION(asysctl); \
+ COMMON_INTERCEPT_FUNCTION(asysctlbyname);
+#else
+#define INIT_SYSCTL
@@ -177,17 +177,17 @@ $NetBSD$
+#endif
+
+#if SANITIZER_INTERCEPT_FTS
-+INTERCEPTOR(void *, fts_open, char * const *path_argv, int options,
++INTERCEPTOR(void *, fts_open, char *const *path_argv, int options,
+ int (*compar)(void **, void **)) {
+ void *ctx;
+ void *fts;
+ COMMON_INTERCEPTOR_ENTER(ctx, fts_open, path_argv, options, compar);
+ if (path_argv) {
-+ char * const *pa = path_argv;
++ char *const *pa = path_argv;
+ while (*pa) {
-+ COMMON_INTERCEPTOR_READ_RANGE(ctx, pa, sizeof(char **));
-+ COMMON_INTERCEPTOR_READ_RANGE(ctx, *pa, REAL(strlen)(*pa) + 1);
-+ pa++;
++ COMMON_INTERCEPTOR_READ_RANGE(ctx, pa, sizeof(char **));
++ COMMON_INTERCEPTOR_READ_RANGE(ctx, *pa, REAL(strlen)(*pa) + 1);
++ pa++;
+ }
+ COMMON_INTERCEPTOR_READ_RANGE(ctx, pa, sizeof(char **));
+ }
@@ -233,11 +233,11 @@ $NetBSD$
+ COMMON_INTERCEPTOR_READ_RANGE(ctx, ftsp, struct_FTS_sz);
+ return REAL(fts_close)(ftsp);
+}
-+#define INIT_FTS \
-+ COMMON_INTERCEPT_FUNCTION(fts_open); \
-+ COMMON_INTERCEPT_FUNCTION(fts_read); \
-+ COMMON_INTERCEPT_FUNCTION(fts_children); \
-+ COMMON_INTERCEPT_FUNCTION(fts_set); \
++#define INIT_FTS \
++ COMMON_INTERCEPT_FUNCTION(fts_open); \
++ COMMON_INTERCEPT_FUNCTION(fts_read); \
++ COMMON_INTERCEPT_FUNCTION(fts_children); \
++ COMMON_INTERCEPT_FUNCTION(fts_set); \
+ COMMON_INTERCEPT_FUNCTION(fts_close);
+#else
+#define INIT_FTS
@@ -329,20 +329,20 @@ $NetBSD$
+ }
+ return res;
+}
-+#define INIT_REGEX \
-+ COMMON_INTERCEPT_FUNCTION(regcomp); \
-+ COMMON_INTERCEPT_FUNCTION(regexec); \
-+ COMMON_INTERCEPT_FUNCTION(regerror); \
-+ COMMON_INTERCEPT_FUNCTION(regfree); \
-+ COMMON_INTERCEPT_FUNCTION(regnsub); \
++#define INIT_REGEX \
++ COMMON_INTERCEPT_FUNCTION(regcomp); \
++ COMMON_INTERCEPT_FUNCTION(regexec); \
++ COMMON_INTERCEPT_FUNCTION(regerror); \
++ COMMON_INTERCEPT_FUNCTION(regfree); \
++ COMMON_INTERCEPT_FUNCTION(regnsub); \
+ COMMON_INTERCEPT_FUNCTION(regasub);
+#else
+#define INIT_REGEX
+#endif
+
+#if SANITIZER_INTERCEPT_STRTONUM
-+INTERCEPTOR(long long, strtonum, const char * nptr, long long minval,
-+ long long maxval, const char **errstr) {
++INTERCEPTOR(long long, strtonum, const char *nptr, long long minval,
++ long long maxval, const char **errstr) {
+ void *ctx;
+ COMMON_INTERCEPTOR_ENTER(ctx, strtonum, nptr, minval, maxval, errstr);
+
@@ -357,7 +357,7 @@ $NetBSD$
+ return ret;
+}
+
-+INTERCEPTOR(INTMAX_T, strtoi, const char * nptr, char ** endptr, int base,
++INTERCEPTOR(INTMAX_T, strtoi, const char *nptr, char **endptr, int base,
+ INTMAX_T low, INTMAX_T high, int *rstatus) {
+ void *ctx;
+ COMMON_INTERCEPTOR_ENTER(ctx, strtoi, nptr, endptr, base, low, high, rstatus);
@@ -375,7 +375,7 @@ $NetBSD$
+ return ret;
+}
+
-+INTERCEPTOR(UINTMAX_T, strtou, const char * nptr, char ** endptr, int base,
++INTERCEPTOR(UINTMAX_T, strtou, const char *nptr, char **endptr, int base,
+ UINTMAX_T low, UINTMAX_T high, int *rstatus) {
+ void *ctx;
+ COMMON_INTERCEPTOR_ENTER(ctx, strtou, nptr, endptr, base, low, high, rstatus);
@@ -393,9 +393,9 @@ $NetBSD$
+ return ret;
+}
+
-+#define INIT_STRTONUM \
-+ COMMON_INTERCEPT_FUNCTION(strtonum); \
-+ COMMON_INTERCEPT_FUNCTION(strtoi); \
++#define INIT_STRTONUM \
++ COMMON_INTERCEPT_FUNCTION(strtonum); \
++ COMMON_INTERCEPT_FUNCTION(strtoi); \
+ COMMON_INTERCEPT_FUNCTION(strtou)
+
+#else
@@ -421,9 +421,8 @@ $NetBSD$
+ char *end = REAL(nvis)(dst, dlen, c, flag, nextc);
+ // nvis cannot make sure the dst is NULL terminated
+ if (dst && end)
-+ COMMON_INTERCEPTOR_WRITE_RANGE(ctx, dst,
-+ (SIZE_T)(end - dst + 1) < dlen ?
-+ end - dst + 1 : dlen);
++ COMMON_INTERCEPTOR_WRITE_RANGE(
++ ctx, dst, (SIZE_T)(end - dst + 1) < dlen ? end - dst + 1 : dlen);
+ return end;
+}
+
@@ -460,7 +459,8 @@ $NetBSD$
+ int len = REAL(strnvis)(dst, dlen, src, flag);
+ // The interface will be valid even if there is no space for NULL char
+ if (dst && len >= 0)
-+ COMMON_INTERCEPTOR_WRITE_RANGE(ctx, dst, (SIZE_T)len + 1 < dlen ? len + 1 : dlen);
++ COMMON_INTERCEPTOR_WRITE_RANGE(ctx, dst,
++ (SIZE_T)len + 1 < dlen ? len + 1 : dlen);
+ return len;
+}
+
@@ -475,19 +475,21 @@ $NetBSD$
+ return ret;
+}
+
-+INTERCEPTOR(int, strnvisx, char *dst, SIZE_T dlen, const char *src, SIZE_T len, int flag) {
++INTERCEPTOR(int, strnvisx, char *dst, SIZE_T dlen, const char *src, SIZE_T len,
++ int flag) {
+ void *ctx;
+ COMMON_INTERCEPTOR_ENTER(ctx, strnvisx, dst, dlen, src, len, flag);
+ if (src)
+ COMMON_INTERCEPTOR_READ_RANGE(ctx, src, len);
+ int ret = REAL(strnvisx)(dst, dlen, src, len, flag);
+ if (dst && ret >= 0)
-+ COMMON_INTERCEPTOR_WRITE_RANGE(ctx, dst, (SIZE_T)ret + 1 < dlen ? ret + 1 : dlen);
++ COMMON_INTERCEPTOR_WRITE_RANGE(ctx, dst,
++ (SIZE_T)ret + 1 < dlen ? ret + 1 : dlen);
+ return ret;
+}
+
-+INTERCEPTOR(int, strenvisx, char *dst, SIZE_T dlen, const char *src, SIZE_T len, int flag,
-+ int *cerr_ptr) {
++INTERCEPTOR(int, strenvisx, char *dst, SIZE_T dlen, const char *src, SIZE_T len,
++ int flag, int *cerr_ptr) {
+ void *ctx;
+ COMMON_INTERCEPTOR_ENTER(ctx, strenvisx, dst, dlen, src, len, flag, cerr_ptr);
+ if (src)
@@ -498,13 +500,15 @@ $NetBSD$
+ COMMON_INTERCEPTOR_READ_RANGE(ctx, cerr_ptr, sizeof(int));
+ int ret = REAL(strenvisx)(dst, dlen, src, len, flag, cerr_ptr);
+ if (dst && ret >= 0)
-+ COMMON_INTERCEPTOR_WRITE_RANGE(ctx, dst, (SIZE_T)ret + 1 < dlen ? ret + 1 : dlen);
++ COMMON_INTERCEPTOR_WRITE_RANGE(ctx, dst,
++ (SIZE_T)ret + 1 < dlen ? ret + 1 : dlen);
+ if (cerr_ptr)
+ COMMON_INTERCEPTOR_WRITE_RANGE(ctx, cerr_ptr, sizeof(int));
+ return ret;
+}
+
-+INTERCEPTOR(char *, svis, char *dst, int c, int flag, int nextc, const char *extra) {
++INTERCEPTOR(char *, svis, char *dst, int c, int flag, int nextc,
++ const char *extra) {
+ void *ctx;
+ COMMON_INTERCEPTOR_ENTER(ctx, svis, dst, c, flag, nextc, extra);
+ if (extra)
@@ -516,19 +520,20 @@ $NetBSD$
+}
+
+INTERCEPTOR(char *, snvis, char *dst, SIZE_T dlen, int c, int flag, int nextc,
-+ const char *extra) {
++ const char *extra) {
+ void *ctx;
+ COMMON_INTERCEPTOR_ENTER(ctx, snvis, dst, dlen, c, flag, nextc, extra);
+ if (extra)
+ COMMON_INTERCEPTOR_READ_RANGE(ctx, extra, REAL(strlen)(extra) + 1);
+ char *end = REAL(snvis)(dst, dlen, c, flag, nextc, extra);
+ if (dst && end)
-+ COMMON_INTERCEPTOR_WRITE_RANGE(ctx, dst,
-+ (SIZE_T)(end - dst + 1) < dlen ? end - dst + 1 : dlen);
++ COMMON_INTERCEPTOR_WRITE_RANGE(
++ ctx, dst, (SIZE_T)(end - dst + 1) < dlen ? end - dst + 1 : dlen);
+ return end;
+}
+
-+INTERCEPTOR(int, strsvis, char *dst, const char *src, int flag, const char *extra) {
++INTERCEPTOR(int, strsvis, char *dst, const char *src, int flag,
++ const char *extra) {
+ void *ctx;
+ COMMON_INTERCEPTOR_ENTER(ctx, strsvis, dst, src, flag, extra);
+ if (src)
@@ -542,7 +547,7 @@ $NetBSD$
+}
+
+INTERCEPTOR(int, strsnvis, char *dst, SIZE_T dlen, const char *src, int flag,
-+ const char *extra) {
++ const char *extra) {
+ void *ctx;
+ COMMON_INTERCEPTOR_ENTER(ctx, strsnvis, dst, dlen, src, flag, extra);
+ if (src)
@@ -552,12 +557,13 @@ $NetBSD$
+ int len = REAL(strsnvis)(dst, dlen, src, flag, extra);
+ // The interface will be valid even if there is no space for NULL char
+ if (dst && len >= 0)
-+ COMMON_INTERCEPTOR_WRITE_RANGE(ctx, dst, (SIZE_T)len + 1 < dlen ? len + 1 : dlen);
++ COMMON_INTERCEPTOR_WRITE_RANGE(ctx, dst,
++ (SIZE_T)len + 1 < dlen ? len + 1 : dlen);
+ return len;
+}
+
+INTERCEPTOR(int, strsvisx, char *dst, const char *src, SIZE_T len, int flag,
-+ const char *extra) {
++ const char *extra) {
+ void *ctx;
+ COMMON_INTERCEPTOR_ENTER(ctx, strsvisx, dst, src, len, flag, extra);
+ if (src)
@@ -570,8 +576,8 @@ $NetBSD$
+ return ret;
+}
+
-+INTERCEPTOR(int, strsnvisx, char *dst, SIZE_T dlen, const char *src, SIZE_T len, int flag,
-+ const char *extra) {
++INTERCEPTOR(int, strsnvisx, char *dst, SIZE_T dlen, const char *src, SIZE_T len,
++ int flag, const char *extra) {
+ void *ctx;
+ COMMON_INTERCEPTOR_ENTER(ctx, strsnvisx, dst, dlen, src, len, flag, extra);
+ if (src)
@@ -580,14 +586,16 @@ $NetBSD$
+ COMMON_INTERCEPTOR_READ_RANGE(ctx, extra, REAL(strlen)(extra) + 1);
+ int ret = REAL(strsnvisx)(dst, dlen, src, len, flag, extra);
+ if (dst && ret >= 0)
-+ COMMON_INTERCEPTOR_WRITE_RANGE(ctx, dst, (SIZE_T)ret + 1 < dlen ? ret + 1 : dlen);
++ COMMON_INTERCEPTOR_WRITE_RANGE(ctx, dst,
++ (SIZE_T)ret + 1 < dlen ? ret + 1 : dlen);
+ return ret;
+}
+
-+INTERCEPTOR(int, strsenvisx, char *dst, SIZE_T dlen, const char *src, SIZE_T len, int flag,
-+ const char *extra, int *cerr_ptr) {
++INTERCEPTOR(int, strsenvisx, char *dst, SIZE_T dlen, const char *src,
++ SIZE_T len, int flag, const char *extra, int *cerr_ptr) {
+ void *ctx;
-+ COMMON_INTERCEPTOR_ENTER(ctx, strsenvisx, dst, dlen, src, len, flag, extra, cerr_ptr);
++ COMMON_INTERCEPTOR_ENTER(ctx, strsenvisx, dst, dlen, src, len, flag, extra,
++ cerr_ptr);
+ if (src)
+ COMMON_INTERCEPTOR_READ_RANGE(ctx, src, len);
+ if (extra)
@@ -598,7 +606,8 @@ $NetBSD$
+ COMMON_INTERCEPTOR_READ_RANGE(ctx, cerr_ptr, sizeof(int));
+ int ret = REAL(strsenvisx)(dst, dlen, src, len, flag, extra, cerr_ptr);
+ if (dst && ret >= 0)
-+ COMMON_INTERCEPTOR_WRITE_RANGE(ctx, dst, (SIZE_T)ret + 1 < dlen ? ret + 1 : dlen);
++ COMMON_INTERCEPTOR_WRITE_RANGE(ctx, dst,
++ (SIZE_T)ret + 1 < dlen ? ret + 1 : dlen);
+ if (cerr_ptr)
+ COMMON_INTERCEPTOR_WRITE_RANGE(ctx, cerr_ptr, sizeof(int));
+ return ret;
@@ -610,8 +619,7 @@ $NetBSD$
+ if (astate)
+ COMMON_INTERCEPTOR_READ_RANGE(ctx, astate, sizeof(*astate));
+ int ret = REAL(unvis)(cp, c, astate, flag);
-+ if (ret == unvis_valid ||
-+ ret == unvis_validpush) {
++ if (ret == unvis_valid || ret == unvis_validpush) {
+ COMMON_INTERCEPTOR_WRITE_RANGE(ctx, cp, sizeof(*cp));
+ }
+ return ret;
@@ -635,7 +643,8 @@ $NetBSD$
+ COMMON_INTERCEPTOR_READ_RANGE(ctx, src, REAL(strlen)(src) + 1);
+ int ret = REAL(strnunvis)(dst, dlen, src);
+ if (ret != -1)
-+ COMMON_INTERCEPTOR_WRITE_RANGE(ctx, dst, (SIZE_T)ret + 1 < dlen ? ret + 1 : dlen);
++ COMMON_INTERCEPTOR_WRITE_RANGE(ctx, dst,
++ (SIZE_T)ret + 1 < dlen ? ret + 1 : dlen);
+ return ret;
+}
+
@@ -650,37 +659,39 @@ $NetBSD$
+ return ret;
+}
+
-+INTERCEPTOR(int, strnunvisx, char *dst, SIZE_T dlen, const char *src, int flag) {
++INTERCEPTOR(int, strnunvisx, char *dst, SIZE_T dlen, const char *src,
++ int flag) {
+ void *ctx;
+ COMMON_INTERCEPTOR_ENTER(ctx, strnunvisx, dst, dlen, src, flag);
+ if (src)
+ COMMON_INTERCEPTOR_READ_RANGE(ctx, src, REAL(strlen)(src) + 1);
+ int ret = REAL(strnunvisx)(dst, dlen, src, flag);
+ if (ret != -1)
-+ COMMON_INTERCEPTOR_WRITE_RANGE(ctx, dst, (SIZE_T)ret + 1 < dlen ? ret + 1 : dlen);
++ COMMON_INTERCEPTOR_WRITE_RANGE(ctx, dst,
++ (SIZE_T)ret + 1 < dlen ? ret + 1 : dlen);
+ return ret;
+}
+
-+#define INIT_VIS \
-+ COMMON_INTERCEPT_FUNCTION(vis); \
-+ COMMON_INTERCEPT_FUNCTION(nvis); \
-+ COMMON_INTERCEPT_FUNCTION(strvis); \
-+ COMMON_INTERCEPT_FUNCTION(stravis); \
-+ COMMON_INTERCEPT_FUNCTION(strnvis); \
-+ COMMON_INTERCEPT_FUNCTION(strvisx); \
-+ COMMON_INTERCEPT_FUNCTION(strnvisx); \
-+ COMMON_INTERCEPT_FUNCTION(strenvisx); \
-+ COMMON_INTERCEPT_FUNCTION(svis); \
-+ COMMON_INTERCEPT_FUNCTION(snvis); \
-+ COMMON_INTERCEPT_FUNCTION(strsvis); \
-+ COMMON_INTERCEPT_FUNCTION(strsnvis); \
-+ COMMON_INTERCEPT_FUNCTION(strsvisx); \
-+ COMMON_INTERCEPT_FUNCTION(strsnvisx); \
-+ COMMON_INTERCEPT_FUNCTION(strsenvisx); \
-+ COMMON_INTERCEPT_FUNCTION(unvis); \
-+ COMMON_INTERCEPT_FUNCTION(strunvis); \
-+ COMMON_INTERCEPT_FUNCTION(strnunvis); \
-+ COMMON_INTERCEPT_FUNCTION(strunvisx); \
++#define INIT_VIS \
++ COMMON_INTERCEPT_FUNCTION(vis); \
++ COMMON_INTERCEPT_FUNCTION(nvis); \
++ COMMON_INTERCEPT_FUNCTION(strvis); \
++ COMMON_INTERCEPT_FUNCTION(stravis); \
++ COMMON_INTERCEPT_FUNCTION(strnvis); \
++ COMMON_INTERCEPT_FUNCTION(strvisx); \
++ COMMON_INTERCEPT_FUNCTION(strnvisx); \
++ COMMON_INTERCEPT_FUNCTION(strenvisx); \
++ COMMON_INTERCEPT_FUNCTION(svis); \
++ COMMON_INTERCEPT_FUNCTION(snvis); \
++ COMMON_INTERCEPT_FUNCTION(strsvis); \
++ COMMON_INTERCEPT_FUNCTION(strsnvis); \
++ COMMON_INTERCEPT_FUNCTION(strsvisx); \
++ COMMON_INTERCEPT_FUNCTION(strsnvisx); \
++ COMMON_INTERCEPT_FUNCTION(strsenvisx); \
++ COMMON_INTERCEPT_FUNCTION(unvis); \
++ COMMON_INTERCEPT_FUNCTION(strunvis); \
++ COMMON_INTERCEPT_FUNCTION(strnunvis); \
++ COMMON_INTERCEPT_FUNCTION(strunvisx); \
+ COMMON_INTERCEPT_FUNCTION(strnunvisx)
+#else
+#define INIT_VIS
@@ -694,8 +705,7 @@ $NetBSD$
+ if (cnt > 0 && mntbufp) {
+ COMMON_INTERCEPTOR_WRITE_RANGE(ctx, mntbufp, sizeof(void *));
+ if (*mntbufp)
-+ COMMON_INTERCEPTOR_WRITE_RANGE(ctx, *mntbufp,
-+ cnt * struct_statvfs_sz);
++ COMMON_INTERCEPTOR_WRITE_RANGE(ctx, *mntbufp, cnt * struct_statvfs_sz);
+ }
+ return cnt;
+}
@@ -722,9 +732,9 @@ $NetBSD$
+ int ret = REAL(fputs)(str, stream);
+ return ret;
+}
-+#define INIT_PUTS \
-+ COMMON_INTERCEPT_FUNCTION(puts); \
-+ COMMON_INTERCEPT_FUNCTION(fputs)
++#define INIT_PUTS \
++ COMMON_INTERCEPT_FUNCTION(puts); \
++ COMMON_INTERCEPT_FUNCTION(fputs)
+#else
+#define INIT_PUTS
+#endif
@@ -738,7 +748,7 @@ $NetBSD$
+ COMMON_INTERCEPTOR_WRITE_RANGE(ctx, context, SHA1_CTX_sz);
+}
+
-+INTERCEPTOR(void, SHA1Update, void *context, const u8 * data, unsigned len) {
++INTERCEPTOR(void, SHA1Update, void *context, const u8 *data, unsigned len) {
+ void *ctx;
+ COMMON_INTERCEPTOR_ENTER(ctx, SHA1Update, context, data, len);
+ if (data)
@@ -799,13 +809,13 @@ $NetBSD$
+ return ret;
+}
+
-+#define INIT_SHA1 \
-+ COMMON_INTERCEPT_FUNCTION(SHA1Init); \
-+ COMMON_INTERCEPT_FUNCTION(SHA1Update); \
-+ COMMON_INTERCEPT_FUNCTION(SHA1Final); \
-+ COMMON_INTERCEPT_FUNCTION(SHA1Transform); \
-+ COMMON_INTERCEPT_FUNCTION(SHA1End); \
-+ COMMON_INTERCEPT_FUNCTION(SHA1File); \
++#define INIT_SHA1 \
++ COMMON_INTERCEPT_FUNCTION(SHA1Init); \
++ COMMON_INTERCEPT_FUNCTION(SHA1Update); \
++ COMMON_INTERCEPT_FUNCTION(SHA1Final); \
++ COMMON_INTERCEPT_FUNCTION(SHA1Transform); \
++ COMMON_INTERCEPT_FUNCTION(SHA1End); \
++ COMMON_INTERCEPT_FUNCTION(SHA1File); \
+ COMMON_INTERCEPT_FUNCTION(SHA1Data)
+#else
+#define INIT_SHA1
@@ -861,7 +871,8 @@ $NetBSD$
+ return ret;
+}
+
-+INTERCEPTOR(char *, MD2Data, const unsigned char *data, unsigned int len, char *buf) {
++INTERCEPTOR(char *, MD2Data, const unsigned char *data, unsigned int len,
++ char *buf) {
+ void *ctx;
+ COMMON_INTERCEPTOR_ENTER(ctx, MD2Data, data, len, buf);
+ if (data)
@@ -872,12 +883,12 @@ $NetBSD$
+ return ret;
+}
+
-+#define INIT_MD2 \
-+ COMMON_INTERCEPT_FUNCTION(MD2Init); \
-+ COMMON_INTERCEPT_FUNCTION(MD2Update); \
-+ COMMON_INTERCEPT_FUNCTION(MD2Final); \
-+ COMMON_INTERCEPT_FUNCTION(MD2End); \
-+ COMMON_INTERCEPT_FUNCTION(MD2File); \
++#define INIT_MD2 \
++ COMMON_INTERCEPT_FUNCTION(MD2Init); \
++ COMMON_INTERCEPT_FUNCTION(MD2Update); \
++ COMMON_INTERCEPT_FUNCTION(MD2Final); \
++ COMMON_INTERCEPT_FUNCTION(MD2End); \
++ COMMON_INTERCEPT_FUNCTION(MD2File); \
+ COMMON_INTERCEPT_FUNCTION(MD2Data)
+#else
+#define INIT_MD2
@@ -933,7 +944,8 @@ $NetBSD$
+ return ret;
+}
+
-+INTERCEPTOR(char *, MD4Data, const unsigned char *data, unsigned int len, char *buf) {
++INTERCEPTOR(char *, MD4Data, const unsigned char *data, unsigned int len,
++ char *buf) {
+ void *ctx;
+ COMMON_INTERCEPTOR_ENTER(ctx, MD4Data, data, len, buf);
+ if (data)
@@ -944,12 +956,12 @@ $NetBSD$
+ return ret;
+}
+
-+#define INIT_MD4 \
-+ COMMON_INTERCEPT_FUNCTION(MD4Init); \
-+ COMMON_INTERCEPT_FUNCTION(MD4Update); \
-+ COMMON_INTERCEPT_FUNCTION(MD4Final); \
-+ COMMON_INTERCEPT_FUNCTION(MD4End); \
-+ COMMON_INTERCEPT_FUNCTION(MD4File); \
++#define INIT_MD4 \
++ COMMON_INTERCEPT_FUNCTION(MD4Init); \
++ COMMON_INTERCEPT_FUNCTION(MD4Update); \
++ COMMON_INTERCEPT_FUNCTION(MD4Final); \
++ COMMON_INTERCEPT_FUNCTION(MD4End); \
++ COMMON_INTERCEPT_FUNCTION(MD4File); \
+ COMMON_INTERCEPT_FUNCTION(MD4Data)
+#else
+#define INIT_MD4
@@ -1005,7 +1017,8 @@ $NetBSD$
+ return ret;
+}
+
-+INTERCEPTOR(char *, MD5Data, const unsigned char *data, unsigned int len, char *buf) {
++INTERCEPTOR(char *, MD5Data, const unsigned char *data, unsigned int len,
++ char *buf) {
+ void *ctx;
+ COMMON_INTERCEPTOR_ENTER(ctx, MD5Data, data, len, buf);
+ if (data)
@@ -1016,12 +1029,12 @@ $NetBSD$
+ return ret;
+}
+
-+#define INIT_MD5 \
-+ COMMON_INTERCEPT_FUNCTION(MD5Init); \
-+ COMMON_INTERCEPT_FUNCTION(MD5Update); \
-+ COMMON_INTERCEPT_FUNCTION(MD5Final); \
-+ COMMON_INTERCEPT_FUNCTION(MD5End); \
-+ COMMON_INTERCEPT_FUNCTION(MD5File); \
++#define INIT_MD5 \
++ COMMON_INTERCEPT_FUNCTION(MD5Init); \
++ COMMON_INTERCEPT_FUNCTION(MD5Update); \
++ COMMON_INTERCEPT_FUNCTION(MD5Final); \
++ COMMON_INTERCEPT_FUNCTION(MD5End); \
++ COMMON_INTERCEPT_FUNCTION(MD5File); \
+ COMMON_INTERCEPT_FUNCTION(MD5Data)
+#else
+#define INIT_MD5
@@ -1056,8 +1069,8 @@ $NetBSD$
+#endif
+
+#if SANITIZER_INTERCEPT_FPARSELN
-+INTERCEPTOR(char *, fparseln, __sanitizer_FILE *stream, SIZE_T *len, SIZE_T *lineno,
-+ const char delim[3], int flags) {
++INTERCEPTOR(char *, fparseln, __sanitizer_FILE *stream, SIZE_T *len,
++ SIZE_T *lineno, const char delim[3], int flags) {
+ void *ctx;
+ COMMON_INTERCEPTOR_ENTER(ctx, fparseln, stream, len, lineno, delim, flags);
+ if (len)
@@ -1108,8 +1121,8 @@ $NetBSD$
+ }
+ ret = REAL(modctl)(operation, argp);
+ if (iov)
-+ COMMON_INTERCEPTOR_WRITE_RANGE(ctx, iov->iov_base,
-+ iov_len < iov->iov_len ? iov_len : iov->iov_len);
++ COMMON_INTERCEPTOR_WRITE_RANGE(
++ ctx, iov->iov_base, iov_len < iov->iov_len ? iov_len : iov->iov_len);
+ } else if (operation == modctl_exists)
+ ret = REAL(modctl)(operation, argp);
+ else
@@ -1125,7 +1138,7 @@ $NetBSD$
static void InitializeCommonInterceptors() {
static u64 metadata_mem[sizeof(MetadataHashMap) / sizeof(u64) + 1];
interceptor_metadata_map = new((void *)&metadata_mem) MetadataHashMap();
-@@ -7436,6 +8521,22 @@ static void InitializeCommonInterceptors
+@@ -7436,6 +8534,22 @@ static void InitializeCommonInterceptors
INIT_TTYENT;
INIT_PROTOENT;
INIT_NETENT;
Home |
Main Index |
Thread Index |
Old Index