From f46714c2f9eb13c12c8218f1b7c045182041fdc9 Mon Sep 17 00:00:00 2001 From: Daniel Kolesa Date: Wed, 26 Oct 2022 00:30:00 +0200 Subject: add initial clang support Co-Authored-By: jvoisin --- include/string.h | 33 +++++++++++++++++++++------------ 1 file changed, 21 insertions(+), 12 deletions(-) (limited to 'include/string.h') diff --git a/include/string.h b/include/string.h index f9f6701..9fc1cd4 100644 --- a/include/string.h +++ b/include/string.h @@ -1,5 +1,6 @@ /* * Copyright (C) 2015-2016 Dimitris Papastamos + * Copyright (C) 2022 q66 * * Permission to use, copy, modify, and/or distribute this software for any * purpose with or without fee is hereby granted. @@ -36,7 +37,8 @@ extern "C" { #undef strncat #undef strncpy -_FORTIFY_FN(memcpy) void *memcpy(void *__od, const void *__os, size_t __n) +_FORTIFY_FN(memcpy) void *memcpy(void * _FORTIFY_POS0 __od, + const void * _FORTIFY_POS0 __os, size_t __n) { size_t __bd = __bos(__od, 0); size_t __bs = __bos(__os, 0); @@ -53,7 +55,8 @@ _FORTIFY_FN(memcpy) void *memcpy(void *__od, const void *__os, size_t __n) return __builtin_memcpy(__od, __os, __n); } -_FORTIFY_FN(memmove) void *memmove(void *__d, const void *__s, size_t __n) +_FORTIFY_FN(memmove) void *memmove(void * _FORTIFY_POS0 __d, + const void * _FORTIFY_POS0 __s, size_t __n) { size_t __bd = __bos(__d, 0); size_t __bs = __bos(__s, 0); @@ -63,7 +66,7 @@ _FORTIFY_FN(memmove) void *memmove(void *__d, const void *__s, size_t __n) return __orig_memmove(__d, __s, __n); } -_FORTIFY_FN(memset) void *memset(void *__d, int __c, size_t __n) +_FORTIFY_FN(memset) void *memset(void * _FORTIFY_POS0 __d, int __c, size_t __n) { size_t __b = __bos(__d, 0); @@ -76,7 +79,7 @@ _FORTIFY_FN(memset) void *memset(void *__d, int __c, size_t __n) || defined(_XOPEN_SOURCE) || defined(_GNU_SOURCE) \ || defined(_BSD_SOURCE) #undef stpcpy -_FORTIFY_FN(stpcpy) char *stpcpy(char *__d, const char *__s) +_FORTIFY_FN(stpcpy) char *stpcpy(char * _FORTIFY_POS0 __d, const char *__s) { size_t __b = __bos(__d, 0); @@ -86,7 +89,8 @@ _FORTIFY_FN(stpcpy) char *stpcpy(char *__d, const char *__s) } #undef stpncpy -_FORTIFY_FN(stpncpy) char *stpncpy(char *__d, const char *__s, size_t __n) +_FORTIFY_FN(stpncpy) char *stpncpy(char * _FORTIFY_POS0 __d, const char *__s, + size_t __n) { size_t __b = __bos(__d, 0); @@ -96,7 +100,7 @@ _FORTIFY_FN(stpncpy) char *stpncpy(char *__d, const char *__s, size_t __n) } #endif -_FORTIFY_FN(strcat) char *strcat(char *__d, const char *__s) +_FORTIFY_FN(strcat) char *strcat(char * _FORTIFY_POS0 __d, const char *__s) { size_t __b = __bos(__d, 0); @@ -105,7 +109,7 @@ _FORTIFY_FN(strcat) char *strcat(char *__d, const char *__s) return __orig_strcat(__d, __s); } -_FORTIFY_FN(strcpy) char *strcpy(char *__d, const char *__s) +_FORTIFY_FN(strcpy) char *strcpy(char * _FORTIFY_POS0 __d, const char *__s) { size_t __b = __bos(__d, 0); @@ -114,7 +118,8 @@ _FORTIFY_FN(strcpy) char *strcpy(char *__d, const char *__s) return __orig_strcpy(__d, __s); } -_FORTIFY_FN(strncat) char *strncat(char *__d, const char *__s, size_t __n) +_FORTIFY_FN(strncat) char *strncat(char * _FORTIFY_POS0 __d, const char *__s, + size_t __n) { size_t __b = __bos(__d, 0); size_t __sl, __dl; @@ -130,7 +135,8 @@ _FORTIFY_FN(strncat) char *strncat(char *__d, const char *__s, size_t __n) return __orig_strncat(__d, __s, __n); } -_FORTIFY_FN(strncpy) char *strncpy(char *__d, const char *__s, size_t __n) +_FORTIFY_FN(strncpy) char *strncpy(char * _FORTIFY_POS0 __d, + const char *__s, size_t __n) { size_t __b = __bos(__d, 0); @@ -141,7 +147,8 @@ _FORTIFY_FN(strncpy) char *strncpy(char *__d, const char *__s, size_t __n) #ifdef _GNU_SOURCE #undef mempcpy -_FORTIFY_FN(mempcpy) void *mempcpy(void *__d, const void *__s, size_t __n) +_FORTIFY_FN(mempcpy) void *mempcpy(void * _FORTIFY_POS0 __d, + const void * _FORTIFY_POS0 __s, size_t __n) { size_t __bd = __bos(__d, 0); size_t __bs = __bos(__s, 0); @@ -155,7 +162,8 @@ _FORTIFY_FN(mempcpy) void *mempcpy(void *__d, const void *__s, size_t __n) #if defined(_GNU_SOURCE) || defined(_BSD_SOURCE) #undef strlcat #undef strlcpy -_FORTIFY_FN(strlcat) size_t strlcat(char *__d, const char *__s, size_t __n) +_FORTIFY_FN(strlcat) size_t strlcat(char * _FORTIFY_POS0 __d, + const char *__s, size_t __n) { size_t __b = __bos(__d, 0); @@ -164,7 +172,8 @@ _FORTIFY_FN(strlcat) size_t strlcat(char *__d, const char *__s, size_t __n) return __orig_strlcat(__d, __s, __n); } -_FORTIFY_FN(strlcpy) size_t strlcpy(char *__d, const char *__s, size_t __n) +_FORTIFY_FN(strlcpy) size_t strlcpy(char * _FORTIFY_POS0 __d, + const char *__s, size_t __n) { size_t __b = __bos(__d, 0); -- cgit v1.3