From 8f153c6128dd15fb132d8ddb1752e793bd6a5985 Mon Sep 17 00:00:00 2001 From: Stefan Metzmacher Date: Mon, 18 Sep 2006 22:49:20 +0000 Subject: r18644: bring in libreplace in lib/replace metze (This used to be commit 596cbe73dd268742acf456fccd8a234376fb0c97) --- source3/lib/replace/replace.h | 367 ++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 367 insertions(+) create mode 100644 source3/lib/replace/replace.h (limited to 'source3/lib/replace/replace.h') diff --git a/source3/lib/replace/replace.h b/source3/lib/replace/replace.h new file mode 100644 index 0000000000..7cdaaae689 --- /dev/null +++ b/source3/lib/replace/replace.h @@ -0,0 +1,367 @@ +/* + Unix SMB/CIFS implementation. + + macros to go along with the lib/replace/ portability layer code + + Copyright (C) Andrew Tridgell 2005 + Copyright (C) Jelmer Vernooij 2006 + + ** NOTE! The following LGPL license applies to the replace + ** library. This does NOT imply that all of Samba is released + ** under the LGPL + + This library is free software; you can redistribute it and/or + modify it under the terms of the GNU Lesser General Public + License as published by the Free Software Foundation; either + version 2 of the License, or (at your option) any later version. + + This library is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + Lesser General Public License for more details. + + You should have received a copy of the GNU Lesser General Public + License along with this library; if not, write to the Free Software + Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +*/ + +#ifndef _LIBREPLACE_REPLACE_H +#define _LIBREPLACE_REPLACE_H + +#include "config.h" + +#ifdef HAVE_STANDARDS_H +#include +#endif + +#include +#include +#include +#include + +#if defined(_MSC_VER) || defined(__MINGW32__) +#include "win32_replace.h" +#endif + +#ifdef __COMPAR_FN_T +#define QSORT_CAST (__compar_fn_t) +#endif + +#ifndef QSORT_CAST +#define QSORT_CAST (int (*)(const void *, const void *)) +#endif + +#ifdef HAVE_STDINT_H +#include +/* force off HAVE_INTTYPES_H so that roken doesn't try to include both, + which causes a warning storm on irix */ +#undef HAVE_INTTYPES_H +#elif HAVE_INTTYPES_H +#include +#endif + +#ifdef HAVE_STRING_H +#include +#endif + +#ifdef HAVE_STRINGS_H +#include +#endif + +#ifdef HAVE_SYS_TYPES_H +#include +#endif + +#if STDC_HEADERS +#include +#include +#endif + +#ifndef HAVE_STRERROR +extern char *sys_errlist[]; +#define strerror(i) sys_errlist[i] +#endif + +#ifndef HAVE_ERRNO_DECL +extern int errno; +#endif + +#ifndef HAVE_STRDUP +#define strdup rep_strdup +char *rep_strdup(const char *s); +#endif + +#ifndef HAVE_MEMMOVE +#define memmove rep_memmove +void *rep_memmove(void *dest,const void *src,int size); +#endif + +#if !defined(HAVE_MKTIME) || !defined(HAVE_TIMEGM) +#include "system/time.h" +#endif + +#ifndef HAVE_MKTIME +#define mktime rep_mktime +time_t rep_mktime(struct tm *t); +#endif + +#ifndef HAVE_TIMEGM +struct tm; +#define timegm rep_timegm +time_t rep_timegm(struct tm *tm); +#endif + +#ifndef HAVE_STRLCPY +#define strlcpy rep_strlcpy +size_t rep_strlcpy(char *d, const char *s, size_t bufsize); +#endif + +#ifndef HAVE_STRLCAT +#define strlcat rep_strlcat +size_t rep_strlcat(char *d, const char *s, size_t bufsize); +#endif + +#ifndef HAVE_STRNDUP +#define strndup rep_strndup +char *rep_strndup(const char *s, size_t n); +#endif + +#ifndef HAVE_STRNLEN +#define strnlen rep_strnlen +size_t rep_strnlen(const char *s, size_t n); +#endif + +#ifndef HAVE_SETENV +#define setenv rep_setenv +int rep_setenv(const char *name, const char *value, int overwrite); +#endif + +#ifndef HAVE_SETEUID +#define seteuid rep_seteuid +int rep_seteuid(uid_t); +#endif + +#ifndef HAVE_SETEGID +#define setegid rep_setegid +int rep_setegid(gid_t); +#endif + +#ifndef HAVE_SETLINEBUF +#define setlinebuf rep_setlinebuf +void rep_setlinebuf(FILE *); +#endif + +#ifndef HAVE_STRCASESTR +#define strcasestr rep_strcasestr +char *rep_strcasestr(const char *haystack, const char *needle); +#endif + +#ifndef HAVE_STRTOK_R +#define strtok_r rep_strtok_r +char *rep_strtok_r(char *s, const char *delim, char **save_ptr); +#endif + +#ifndef HAVE_STRTOLL +#define strtoll rep_strtoll +long long int rep_strtoll(const char *str, char **endptr, int base); +#endif + +#ifndef HAVE_STRTOULL +#define strtoull rep_strtoull +unsigned long long int rep_strtoull(const char *str, char **endptr, int base); +#endif + +#ifndef HAVE_FTRUNCATE +#define ftruncate rep_ftruncate +int rep_ftruncate(int,off_t); +#endif + +#ifndef HAVE_INITGROUPS +#define ftruncate rep_ftruncate +int rep_initgroups(char *name, gid_t id); +#endif + +#if !defined(HAVE_BZERO) && defined(HAVE_MEMSET) +#define bzero(a,b) memset((a),'\0',(b)) +#endif + +#ifndef HAVE_DLERROR +#define dlerror rep_dlerror +char *rep_dlerror(void); +#endif + +#ifndef HAVE_DLOPEN +#define dlopen rep_dlopen +void *rep_dlopen(const char *name, int flags); +#endif + +#ifndef HAVE_DLSYM +#define dlsym rep_dlsym +void *rep_dlsym(void *handle, const char *symbol); +#endif + +#ifndef HAVE_DLCLOSE +#define dlclose rep_dlclose +int rep_dlclose(void *handle); +#endif + + +#ifndef PRINTF_ATTRIBUTE +#if __GNUC__ >= 3 +/** Use gcc attribute to check printf fns. a1 is the 1-based index of + * the parameter containing the format, and a2 the index of the first + * argument. Note that some gcc 2.x versions don't handle this + * properly **/ +#define PRINTF_ATTRIBUTE(a1, a2) __attribute__ ((format (__printf__, a1, a2))) +#else +#define PRINTF_ATTRIBUTE(a1, a2) +#endif +#endif + +#ifndef HAVE_VASPRINTF +#define vasprintf rep_vasprintf +int rep_vasprintf(char **ptr, const char *format, va_list ap); +#endif + +#if !defined(HAVE_SNPRINTF) || !defined(HAVE_C99_VSNPRINTF) +#define snprintf rep_snprintf +int rep_snprintf(char *,size_t ,const char *, ...) PRINTF_ATTRIBUTE(3,4); +#endif + +#if !defined(HAVE_VSNPRINTF) || !defined(HAVE_C99_VSNPRINTF) +#define vsnprintf rep_vsnprintf +int rep_vsnprintf(char *,size_t ,const char *, va_list ap); +#endif + +#ifndef HAVE_ASPRINTF +#define asprintf rep_asprintf +int rep_asprintf(char **,const char *, ...) PRINTF_ATTRIBUTE(2,3); +#endif + + +/* we used to use these fns, but now we have good replacements + for snprintf and vsnprintf */ +#define slprintf snprintf + + +#ifndef HAVE_VA_COPY +#undef va_copy +#ifdef HAVE___VA_COPY +#define va_copy(dest, src) __va_copy(dest, src) +#else +#define va_copy(dest, src) (dest) = (src) +#endif +#endif + +#ifndef HAVE_VOLATILE +#define volatile +#endif + +#ifndef HAVE_COMPARISON_FN_T +typedef int (*comparison_fn_t)(const void *, const void *); +#endif + +/* Load header file for dynamic linking stuff */ +#ifdef HAVE_DLFCN_H +#include +#endif + +#ifndef RTLD_LAZY +#define RTLD_LAZY 0 +#endif + +#ifndef HAVE_SECURE_MKSTEMP +#define mkstemp(path) rep_mkstemp(path) +int rep_mkstemp(char *temp); +#endif + +#ifndef HAVE_MKDTEMP +#define mkdtemp rep_mkdtemp +char *rep_mkdtemp(char *template); +#endif + +#ifdef HAVE_LIMITS_H +#include +#endif + +/* The extra casts work around common compiler bugs. */ +#define _TYPE_SIGNED(t) (! ((t) 0 < (t) -1)) +/* The outer cast is needed to work around a bug in Cray C 5.0.3.0. + It is necessary at least when t == time_t. */ +#define _TYPE_MINIMUM(t) ((t) (_TYPE_SIGNED (t) \ + ? ~ (t) 0 << (sizeof (t) * CHAR_BIT - 1) : (t) 0)) +#define _TYPE_MAXIMUM(t) ((t) (~ (t) 0 - _TYPE_MINIMUM (t))) + +#ifndef HOST_NAME_MAX +#define HOST_NAME_MAX 64 +#endif + +#ifndef UINT16_MAX +#define UINT16_MAX 65535 +#endif + +#ifndef UINT32_MAX +#define UINT32_MAX (4294967295U) +#endif + +#ifndef UINT64_MAX +#define UINT64_MAX ((uint64_t)-1) +#endif + +#ifndef CHAR_BIT +#define CHAR_BIT 8 +#endif + +#ifndef INT32_MAX +#define INT32_MAX _TYPE_MAXIMUM(int32_t) +#endif + +#ifdef HAVE_STDBOOL_H +#include +#endif + +#if !defined(HAVE_BOOL) +#ifdef HAVE__Bool +#define bool _Bool +#else +#define __bool_true_false_are_defined +typedef int bool; +#endif +#endif + +#ifndef true +#define true (1) +#endif +#ifndef false +#define false (0) +#endif + +#ifndef HAVE_FUNCTION_MACRO +#ifdef HAVE_func_MACRO +#define __FUNCTION__ __func__ +#else +#define __FUNCTION__ ("") +#endif +#endif + +#ifdef HAVE_SYS_PARAM_H +#include +#endif + +#ifndef MIN +#define MIN(a,b) ((a)<(b)?(a):(b)) +#endif + +#ifndef MAX +#define MAX(a,b) ((a)>(b)?(a):(b)) +#endif + +#ifndef __STRING +#define __STRING(x) #x +#endif + +#if MMAP_BLACKLIST +#undef HAVE_MMAP +#endif + +#endif /* _LIBREPLACE_REPLACE_H */ -- cgit From 19cee7d0564265d14723007db6e02ff44351aa50 Mon Sep 17 00:00:00 2001 From: Stefan Metzmacher Date: Mon, 18 Sep 2006 23:26:14 +0000 Subject: r18649: the PRINTF_ATTRIUTE() macro is provided by libreplace metze (This used to be commit dd76f4f5f374ec4822abbf1a09d26287926b92ce) --- source3/lib/replace/replace.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'source3/lib/replace/replace.h') diff --git a/source3/lib/replace/replace.h b/source3/lib/replace/replace.h index 7cdaaae689..688f08a51d 100644 --- a/source3/lib/replace/replace.h +++ b/source3/lib/replace/replace.h @@ -207,7 +207,7 @@ int rep_dlclose(void *handle); #ifndef PRINTF_ATTRIBUTE -#if __GNUC__ >= 3 +#if (__GNUC__ >= 3) && (__GNUC_MINOR__ >= 1 ) /** Use gcc attribute to check printf fns. a1 is the 1-based index of * the parameter containing the format, and a2 the index of the first * argument. Note that some gcc 2.x versions don't handle this -- cgit From 8383eb53f49aaa5026cc9431a7eec3b086870d5c Mon Sep 17 00:00:00 2001 From: Stefan Metzmacher Date: Tue, 19 Sep 2006 03:04:57 +0000 Subject: r18671: try to fix the build on solaris 10 and maybe some other hosts we need to define 'BOOL_DEFINED' to make sure it didn't get redefined by metze (This used to be commit 5a589bb16c2bb3da75874bd190384eabd39eb972) --- source3/lib/replace/replace.h | 1 + 1 file changed, 1 insertion(+) (limited to 'source3/lib/replace/replace.h') diff --git a/source3/lib/replace/replace.h b/source3/lib/replace/replace.h index 688f08a51d..e6ba68f9ad 100644 --- a/source3/lib/replace/replace.h +++ b/source3/lib/replace/replace.h @@ -325,6 +325,7 @@ char *rep_mkdtemp(char *template); #define bool _Bool #else #define __bool_true_false_are_defined +#define BOOL_DEFINED /* needed for not doing a redefine */ typedef int bool; #endif #endif -- cgit From 70407961081d6bdef12bd5ddb9f6633bfac617ef Mon Sep 17 00:00:00 2001 From: Stefan Metzmacher Date: Tue, 19 Sep 2006 03:29:44 +0000 Subject: r18672: fix the build on Tru64 metze (This used to be commit 6c101d206812fe24233409e0757cad52638e685a) --- source3/lib/replace/replace.h | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) (limited to 'source3/lib/replace/replace.h') diff --git a/source3/lib/replace/replace.h b/source3/lib/replace/replace.h index e6ba68f9ad..eabff67cd4 100644 --- a/source3/lib/replace/replace.h +++ b/source3/lib/replace/replace.h @@ -325,7 +325,14 @@ char *rep_mkdtemp(char *template); #define bool _Bool #else #define __bool_true_false_are_defined -#define BOOL_DEFINED /* needed for not doing a redefine */ +/* + * to prevent from doing a redefine of 'bool' + * + * IRIX, HPUX, MacOS 10 and Solaris need BOOL_DEFINED + * Tru64 needs _BOOL_EXISTS + */ +#define BOOL_DEFINED +#define _BOOL_EXISTS typedef int bool; #endif #endif -- cgit From bc6295c3ec1a83a14764f82ee3d8f0e9e098a0ad Mon Sep 17 00:00:00 2001 From: Stefan Metzmacher Date: Tue, 19 Sep 2006 03:38:35 +0000 Subject: r18673: define the macros even if we don't define bool ourself metze (This used to be commit 65013a8d9e678c44cecae07967b7a001b796faf1) --- source3/lib/replace/replace.h | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) (limited to 'source3/lib/replace/replace.h') diff --git a/source3/lib/replace/replace.h b/source3/lib/replace/replace.h index eabff67cd4..61adb999d9 100644 --- a/source3/lib/replace/replace.h +++ b/source3/lib/replace/replace.h @@ -324,17 +324,25 @@ char *rep_mkdtemp(char *template); #ifdef HAVE__Bool #define bool _Bool #else -#define __bool_true_false_are_defined +typedef int bool; +#endif +#endif + /* * to prevent from doing a redefine of 'bool' * * IRIX, HPUX, MacOS 10 and Solaris need BOOL_DEFINED * Tru64 needs _BOOL_EXISTS */ +#ifndef BOOL_DEFINED #define BOOL_DEFINED +#endif +#ifndef _BOOL_EXISTS #define _BOOL_EXISTS -typedef int bool; #endif + +#ifndef __bool_true_false_are_defined +#define __bool_true_false_are_defined #endif #ifndef true -- cgit From beecb90440af7cb59e31ffc708fdb7ad53932b6b Mon Sep 17 00:00:00 2001 From: Stefan Metzmacher Date: Thu, 21 Sep 2006 08:48:18 +0000 Subject: r18784: hopefully fix the BOOL bug on AIX metze (This used to be commit 454d9590de6ff94a1edd7321e26af0f0978a356a) --- source3/lib/replace/replace.h | 11 +++++++++++ 1 file changed, 11 insertions(+) (limited to 'source3/lib/replace/replace.h') diff --git a/source3/lib/replace/replace.h b/source3/lib/replace/replace.h index 61adb999d9..edcdebe6bd 100644 --- a/source3/lib/replace/replace.h +++ b/source3/lib/replace/replace.h @@ -333,6 +333,7 @@ typedef int bool; * * IRIX, HPUX, MacOS 10 and Solaris need BOOL_DEFINED * Tru64 needs _BOOL_EXISTS + * AIX needs _BOOL,_TRUE,_FALSE */ #ifndef BOOL_DEFINED #define BOOL_DEFINED @@ -340,6 +341,9 @@ typedef int bool; #ifndef _BOOL_EXISTS #define _BOOL_EXISTS #endif +#ifndef _BOOL +#define _BOOL +#endif #ifndef __bool_true_false_are_defined #define __bool_true_false_are_defined @@ -352,6 +356,13 @@ typedef int bool; #define false (0) #endif +#ifndef _TRUE +#define _TRUE +#endif +#ifndef _FALSE +#define _FALSE +#endif + #ifndef HAVE_FUNCTION_MACRO #ifdef HAVE_func_MACRO #define __FUNCTION__ __func__ -- cgit From 64d4ff5dcc24d8dfd104b340816d2c89b7735a85 Mon Sep 17 00:00:00 2001 From: Andrew Tridgell Date: Sun, 24 Sep 2006 02:29:12 +0000 Subject: r18864: merge lib/replace changes from samba4 (This used to be commit 6d5f507136be327558e98214b64eca225ca23d66) --- source3/lib/replace/replace.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'source3/lib/replace/replace.h') diff --git a/source3/lib/replace/replace.h b/source3/lib/replace/replace.h index edcdebe6bd..01f626390c 100644 --- a/source3/lib/replace/replace.h +++ b/source3/lib/replace/replace.h @@ -357,10 +357,10 @@ typedef int bool; #endif #ifndef _TRUE -#define _TRUE +#define _TRUE true #endif #ifndef _FALSE -#define _FALSE +#define _FALSE false #endif #ifndef HAVE_FUNCTION_MACRO -- cgit From f9d077cfb33f989ca34e02d79f7f284ceb1295c8 Mon Sep 17 00:00:00 2001 From: Volker Lendecke Date: Fri, 29 Sep 2006 09:12:55 +0000 Subject: r18991: Fix bug 4133 -- Thanks to Olaf Flebbe (This used to be commit 00f09d851c734cb6450feac2d6efc71a540be11f) --- source3/lib/replace/replace.h | 7 +++++++ 1 file changed, 7 insertions(+) (limited to 'source3/lib/replace/replace.h') diff --git a/source3/lib/replace/replace.h b/source3/lib/replace/replace.h index 01f626390c..7a4b903351 100644 --- a/source3/lib/replace/replace.h +++ b/source3/lib/replace/replace.h @@ -151,6 +151,13 @@ int rep_setegid(gid_t); void rep_setlinebuf(FILE *); #endif +#ifndef HAVE_VSYSLOG +#ifdef HAVE_SYSLOG +#define vsyslog rep_vsyslog +void rep_vsyslog (int facility_priority, char *format, va_list arglist); +#endif +#endif + #ifndef HAVE_STRCASESTR #define strcasestr rep_strcasestr char *rep_strcasestr(const char *haystack, const char *needle); -- cgit From ce11194ce0fc668008fab1084990bdcca1c120b4 Mon Sep 17 00:00:00 2001 From: Stefan Metzmacher Date: Fri, 29 Sep 2006 12:30:14 +0000 Subject: r18998: - make more usage of PRINTF_ATTRIBUTE() - vsyslog takes a 'const char *format' metze (This used to be commit 8899bc45f908a15fb496f5c0a29692e7494a56cc) --- source3/lib/replace/replace.h | 17 ++++++++--------- 1 file changed, 8 insertions(+), 9 deletions(-) (limited to 'source3/lib/replace/replace.h') diff --git a/source3/lib/replace/replace.h b/source3/lib/replace/replace.h index 7a4b903351..c2a72751d9 100644 --- a/source3/lib/replace/replace.h +++ b/source3/lib/replace/replace.h @@ -151,13 +151,6 @@ int rep_setegid(gid_t); void rep_setlinebuf(FILE *); #endif -#ifndef HAVE_VSYSLOG -#ifdef HAVE_SYSLOG -#define vsyslog rep_vsyslog -void rep_vsyslog (int facility_priority, char *format, va_list arglist); -#endif -#endif - #ifndef HAVE_STRCASESTR #define strcasestr rep_strcasestr char *rep_strcasestr(const char *haystack, const char *needle); @@ -227,7 +220,7 @@ int rep_dlclose(void *handle); #ifndef HAVE_VASPRINTF #define vasprintf rep_vasprintf -int rep_vasprintf(char **ptr, const char *format, va_list ap); +int rep_vasprintf(char **ptr, const char *format, va_list ap) PRINTF_ATTRIBUTE(2,0); #endif #if !defined(HAVE_SNPRINTF) || !defined(HAVE_C99_VSNPRINTF) @@ -237,7 +230,7 @@ int rep_snprintf(char *,size_t ,const char *, ...) PRINTF_ATTRIBUTE(3,4); #if !defined(HAVE_VSNPRINTF) || !defined(HAVE_C99_VSNPRINTF) #define vsnprintf rep_vsnprintf -int rep_vsnprintf(char *,size_t ,const char *, va_list ap); +int rep_vsnprintf(char *,size_t ,const char *, va_list ap) PRINTF_ATTRIBUTE(3,0); #endif #ifndef HAVE_ASPRINTF @@ -245,6 +238,12 @@ int rep_vsnprintf(char *,size_t ,const char *, va_list ap); int rep_asprintf(char **,const char *, ...) PRINTF_ATTRIBUTE(2,3); #endif +#ifndef HAVE_VSYSLOG +#ifdef HAVE_SYSLOG +#define vsyslog rep_vsyslog +void rep_vsyslog (int facility_priority, const char *format, va_list arglist) PRINTF_ATTRIBUTE(2,0); +#endif +#endif /* we used to use these fns, but now we have good replacements for snprintf and vsnprintf */ -- cgit From a831353be45db24528fc65b2fdc7510cded62d57 Mon Sep 17 00:00:00 2001 From: Stefan Metzmacher Date: Mon, 2 Oct 2006 09:20:18 +0000 Subject: r19030: merge missing stuff from samba4: - strnlen() and strndup() are broken on AIX - we need some extra CFLAGS on HPUX 11.11 metze (This used to be commit 61aa60c60ffddcbad433b26d7f3a836e4fcd8732) --- source3/lib/replace/replace.h | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) (limited to 'source3/lib/replace/replace.h') diff --git a/source3/lib/replace/replace.h b/source3/lib/replace/replace.h index c2a72751d9..8943c7d637 100644 --- a/source3/lib/replace/replace.h +++ b/source3/lib/replace/replace.h @@ -121,12 +121,14 @@ size_t rep_strlcpy(char *d, const char *s, size_t bufsize); size_t rep_strlcat(char *d, const char *s, size_t bufsize); #endif -#ifndef HAVE_STRNDUP +#if (defined(BROKEN_STRNDUP) || !defined(HAVE_STRNDUP)) +#undef HAVE_STRNDUP #define strndup rep_strndup char *rep_strndup(const char *s, size_t n); #endif -#ifndef HAVE_STRNLEN +#if (defined(BROKEN_STRNLEN) || !defined(HAVE_STRNLEN)) +#undef HAVE_STRNLEN #define strnlen rep_strnlen size_t rep_strnlen(const char *s, size_t n); #endif -- cgit From 9830fc431babfe251ab079087b58ea55120a515d Mon Sep 17 00:00:00 2001 From: Stefan Metzmacher Date: Wed, 11 Oct 2006 11:38:40 +0000 Subject: r19240: move the NO_CONFIG_H check to libreplace this fixes the quota detection configure and maybe more configure tests metze (This used to be commit a3a082c42ccb21cb16d2e53991808ef3224efc6c) --- source3/lib/replace/replace.h | 2 ++ 1 file changed, 2 insertions(+) (limited to 'source3/lib/replace/replace.h') diff --git a/source3/lib/replace/replace.h b/source3/lib/replace/replace.h index 8943c7d637..7a79f335e2 100644 --- a/source3/lib/replace/replace.h +++ b/source3/lib/replace/replace.h @@ -28,7 +28,9 @@ #ifndef _LIBREPLACE_REPLACE_H #define _LIBREPLACE_REPLACE_H +#ifndef NO_CONFIG_H #include "config.h" +#endif #ifdef HAVE_STANDARDS_H #include -- cgit From 2f66beb8adf679ed1e2e36f9c808c43f095e23cf Mon Sep 17 00:00:00 2001 From: Stefan Metzmacher Date: Mon, 15 Jan 2007 19:10:54 +0000 Subject: r20817: sync lib/replace with samba4 metze (This used to be commit 352ee730308bbc151a742938818c9b8b3a6e8014) --- source3/lib/replace/replace.h | 4 ++++ 1 file changed, 4 insertions(+) (limited to 'source3/lib/replace/replace.h') diff --git a/source3/lib/replace/replace.h b/source3/lib/replace/replace.h index 7a79f335e2..d75394aa1f 100644 --- a/source3/lib/replace/replace.h +++ b/source3/lib/replace/replace.h @@ -209,6 +209,10 @@ void *rep_dlsym(void *handle, const char *symbol); int rep_dlclose(void *handle); #endif +#ifndef HAVE_SOCKETPAIR +#define socketpair rep_socketpair +int rep_socketpair(int d, int type, int protocol, int sv[2]); +#endif #ifndef PRINTF_ATTRIBUTE #if (__GNUC__ >= 3) && (__GNUC_MINOR__ >= 1 ) -- cgit From 2f1aafa2a7e36298cc1e0e593b30fac1ab278596 Mon Sep 17 00:00:00 2001 From: Stefan Metzmacher Date: Sun, 15 Apr 2007 20:12:09 +0000 Subject: r22221: merge from samba4: - libreplace unsetenv() and strptime() replacements metze (This used to be commit 057c1c04d09b48c713ebc0b334cabcefc02561e9) --- source3/lib/replace/replace.h | 13 ++++++++++++- 1 file changed, 12 insertions(+), 1 deletion(-) (limited to 'source3/lib/replace/replace.h') diff --git a/source3/lib/replace/replace.h b/source3/lib/replace/replace.h index d75394aa1f..7d6dcec7f1 100644 --- a/source3/lib/replace/replace.h +++ b/source3/lib/replace/replace.h @@ -140,6 +140,11 @@ size_t rep_strnlen(const char *s, size_t n); int rep_setenv(const char *name, const char *value, int overwrite); #endif +#ifndef HAVE_UNSETENV +#define unsetenv rep_unsetenv +int rep_unsetenv(const char *name); +#endif + #ifndef HAVE_SETEUID #define seteuid rep_seteuid int rep_seteuid(uid_t); @@ -181,7 +186,7 @@ int rep_ftruncate(int,off_t); #endif #ifndef HAVE_INITGROUPS -#define ftruncate rep_ftruncate +#define initgroups rep_initgroups int rep_initgroups(char *name, gid_t id); #endif @@ -275,6 +280,12 @@ void rep_vsyslog (int facility_priority, const char *format, va_list arglist) PR typedef int (*comparison_fn_t)(const void *, const void *); #endif +#ifdef REPLACE_STRPTIME +#define strptime rep_strptime +struct tm; +char *rep_strptime(const char *buf, const char *format, struct tm *tm); +#endif + /* Load header file for dynamic linking stuff */ #ifdef HAVE_DLFCN_H #include -- cgit From f5b7197625ed235fa454ff0f4a2ba930f55e174e Mon Sep 17 00:00:00 2001 From: Stefan Metzmacher Date: Sun, 15 Apr 2007 21:13:48 +0000 Subject: r22227: merge from samba4: move discard_const macros to librelace metze (This used to be commit 8f4a39127f7b560a7a609e74423ccb88f53e545e) --- source3/lib/replace/replace.h | 23 +++++++++++++++++++++++ 1 file changed, 23 insertions(+) (limited to 'source3/lib/replace/replace.h') diff --git a/source3/lib/replace/replace.h b/source3/lib/replace/replace.h index 7d6dcec7f1..959d44b33e 100644 --- a/source3/lib/replace/replace.h +++ b/source3/lib/replace/replace.h @@ -79,6 +79,29 @@ #include #endif +/** + this is a warning hack. The idea is to use this everywhere that we + get the "discarding const" warning from gcc. That doesn't actually + fix the problem of course, but it means that when we do get to + cleaning them up we can do it by searching the code for + discard_const. + + It also means that other error types aren't as swamped by the noise + of hundreds of const warnings, so we are more likely to notice when + we get new errors. + + Please only add more uses of this macro when you find it + _really_ hard to fix const warnings. Our aim is to eventually use + this function in only a very few places. + + Also, please call this via the discard_const_p() macro interface, as that + makes the return type safe. +*/ +#define discard_const(ptr) ((void *)((intptr_t)(ptr))) + +/** Type-safe version of discard_const */ +#define discard_const_p(type, ptr) ((type *)discard_const(ptr)) + #ifndef HAVE_STRERROR extern char *sys_errlist[]; #define strerror(i) sys_errlist[i] -- cgit From cd8f2e5c57e7917c7bd3dbd1d9a895c7c9b18556 Mon Sep 17 00:00:00 2001 From: Stefan Metzmacher Date: Mon, 16 Apr 2007 09:20:52 +0000 Subject: r22252: merge from samba4: add prototype of setenv metze (This used to be commit 42ccfaf5e58d92e04ba490f726e5d6972039bdc4) --- source3/lib/replace/replace.h | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) (limited to 'source3/lib/replace/replace.h') diff --git a/source3/lib/replace/replace.h b/source3/lib/replace/replace.h index 959d44b33e..3b09216257 100644 --- a/source3/lib/replace/replace.h +++ b/source3/lib/replace/replace.h @@ -160,7 +160,11 @@ size_t rep_strnlen(const char *s, size_t n); #ifndef HAVE_SETENV #define setenv rep_setenv -int rep_setenv(const char *name, const char *value, int overwrite); +int rep_setenv(const char *name, const char *value, int overwrite); +#else +#ifndef HAVE_DECL_SETENV +int setenv(const char *name, const char *value, int overwrite); +#endif #endif #ifndef HAVE_UNSETENV -- cgit From 4341be45935487a50ff7cde28387f47fe74b13ac Mon Sep 17 00:00:00 2001 From: Stefan Metzmacher Date: Mon, 16 Apr 2007 12:43:54 +0000 Subject: r22264: merge from samba4: use AC_HAVE_DECL() because AC_CHECK_DECLS() defines to 1 or 0 and #ifndef doesn't work. metze (This used to be commit 66b0a6cc51a3987c489cc71a17c0da632bf6a6bc) --- source3/lib/replace/replace.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'source3/lib/replace/replace.h') diff --git a/source3/lib/replace/replace.h b/source3/lib/replace/replace.h index 3b09216257..a5455be2b6 100644 --- a/source3/lib/replace/replace.h +++ b/source3/lib/replace/replace.h @@ -162,7 +162,7 @@ size_t rep_strnlen(const char *s, size_t n); #define setenv rep_setenv int rep_setenv(const char *name, const char *value, int overwrite); #else -#ifndef HAVE_DECL_SETENV +#ifndef HAVE_SETENV_DECL int setenv(const char *name, const char *value, int overwrite); #endif #endif -- cgit From 48e29ff642282a6c240114d8d6285548f81098a6 Mon Sep 17 00:00:00 2001 From: Stefan Metzmacher Date: Mon, 16 Apr 2007 19:23:00 +0000 Subject: r22271: merge from samba4: provide __location__ in replace.h and see how the build-farm likes this simpler version metze (This used to be commit 3f87165771ecbbcd70e870235e324d25b21a04d4) --- source3/lib/replace/replace.h | 4 ++++ 1 file changed, 4 insertions(+) (limited to 'source3/lib/replace/replace.h') diff --git a/source3/lib/replace/replace.h b/source3/lib/replace/replace.h index a5455be2b6..0d462b613d 100644 --- a/source3/lib/replace/replace.h +++ b/source3/lib/replace/replace.h @@ -439,6 +439,10 @@ typedef int bool; #define __STRING(x) #x #endif +#ifndef __location__ +#define __location__ __FILE__ ":" __STRING(__LINE__) +#endif + #if MMAP_BLACKLIST #undef HAVE_MMAP #endif -- cgit From 004860e1cc2b911939966b8841edf8e5223d6db3 Mon Sep 17 00:00:00 2001 From: Stefan Metzmacher Date: Mon, 16 Apr 2007 19:46:06 +0000 Subject: r22274: merge from samba4: - provide __LINESTR__ macro - add __STRINGSTRING() macro to really create a string of __LINE__ - fix __location__ macro metze (This used to be commit 5ca18546444e3e65491c2104cf8eeb1022bb5591) --- source3/lib/replace/replace.h | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) (limited to 'source3/lib/replace/replace.h') diff --git a/source3/lib/replace/replace.h b/source3/lib/replace/replace.h index 0d462b613d..840b448d24 100644 --- a/source3/lib/replace/replace.h +++ b/source3/lib/replace/replace.h @@ -439,8 +439,16 @@ typedef int bool; #define __STRING(x) #x #endif +#ifndef _STRINGSTRING +#define __STRINGSTRING(x) __STRING(x) +#endif + +#ifndef __LINESTR__ +#define __LINESTR__ __STRINGSTRING(__LINE__) +#endif + #ifndef __location__ -#define __location__ __FILE__ ":" __STRING(__LINE__) +#define __location__ __FILE__ ":" __LINESTR__ #endif #if MMAP_BLACKLIST -- cgit From a8c62502741fe287091cc9001b69fbd7496e3562 Mon Sep 17 00:00:00 2001 From: Stefan Metzmacher Date: Tue, 17 Apr 2007 08:03:29 +0000 Subject: r22298: move ZERO_*, ARRAY_SIZE and PTR_DIFF macros into libreplace metze (This used to be commit 8a7d2e633b98aa9c73cf1f7d1369015b294cf2e1) --- source3/lib/replace/replace.h | 29 +++++++++++++++++++++++++++++ 1 file changed, 29 insertions(+) (limited to 'source3/lib/replace/replace.h') diff --git a/source3/lib/replace/replace.h b/source3/lib/replace/replace.h index 840b448d24..b96356ac46 100644 --- a/source3/lib/replace/replace.h +++ b/source3/lib/replace/replace.h @@ -451,6 +451,35 @@ typedef int bool; #define __location__ __FILE__ ":" __LINESTR__ #endif +/** + * zero a structure + */ +#define ZERO_STRUCT(x) memset((char *)&(x), 0, sizeof(x)) + +/** + * zero a structure given a pointer to the structure + */ +#define ZERO_STRUCTP(x) do { if ((x) != NULL) memset((char *)(x), 0, sizeof(*(x))); } while(0) + +/** + * zero a structure given a pointer to the structure - no zero check + */ +#define ZERO_STRUCTPN(x) memset((char *)(x), 0, sizeof(*(x))) + +/* zero an array - note that sizeof(array) must work - ie. it must not be a + pointer */ +#define ZERO_ARRAY(x) memset((char *)(x), 0, sizeof(x)) + +/** + * work out how many elements there are in a static array + */ +#define ARRAY_SIZE(a) (sizeof(a)/sizeof(a[0])) + +/** + * pointer difference macro + */ +#define PTR_DIFF(p1,p2) ((ptrdiff_t)(((const char *)(p1)) - (const char *)(p2))) + #if MMAP_BLACKLIST #undef HAVE_MMAP #endif -- cgit From 1b55cf43849543babe0210ea0260752212a53f22 Mon Sep 17 00:00:00 2001 From: Derrell Lipman Date: Thu, 10 May 2007 01:27:18 +0000 Subject: r22772: - Still working on the fact that readahead() is not declared (on at least one OS) but is available for linking. Instead of running configure tests with -Werror-implicit-function-declaration in developer mode (which may lead to different library functions being used in developer mode than when not in developer mode), add tests for whether readahead is declared. If not, provide a replacement declaration in lib/replace. (This used to be commit 7d05fa8b32b5b33e95fd9d552d2a45013b4803ec) --- source3/lib/replace/replace.h | 5 +++++ 1 file changed, 5 insertions(+) (limited to 'source3/lib/replace/replace.h') diff --git a/source3/lib/replace/replace.h b/source3/lib/replace/replace.h index b96356ac46..916d5a55e6 100644 --- a/source3/lib/replace/replace.h +++ b/source3/lib/replace/replace.h @@ -111,6 +111,11 @@ extern char *sys_errlist[]; extern int errno; #endif +#if defined(HAVE_LINUX_READAHEAD) && ! defined(HAVE_READAHEAD_DECL) +ssize_t readahead(int fd, off64_t offset, size_t count); +#endif + + #ifndef HAVE_STRDUP #define strdup rep_strdup char *rep_strdup(const char *s); -- cgit From 5aec9e21bd3a8c3bd4adc41e9ae2afa79d5861b5 Mon Sep 17 00:00:00 2001 From: Michael Adam Date: Thu, 24 May 2007 07:15:36 +0000 Subject: r23108: Add defines of RTLD_NOW and RTLD_GLOBAL to replace.h. Fixing build of ldb for instance on some systems without dlfcn.h. (This used to be commit 5a06726e6873accd255d584e2c18e62dfcac108d) --- source3/lib/replace/replace.h | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) (limited to 'source3/lib/replace/replace.h') diff --git a/source3/lib/replace/replace.h b/source3/lib/replace/replace.h index 916d5a55e6..3cb3c95b69 100644 --- a/source3/lib/replace/replace.h +++ b/source3/lib/replace/replace.h @@ -111,11 +111,6 @@ extern char *sys_errlist[]; extern int errno; #endif -#if defined(HAVE_LINUX_READAHEAD) && ! defined(HAVE_READAHEAD_DECL) -ssize_t readahead(int fd, off64_t offset, size_t count); -#endif - - #ifndef HAVE_STRDUP #define strdup rep_strdup char *rep_strdup(const char *s); @@ -326,6 +321,12 @@ char *rep_strptime(const char *buf, const char *format, struct tm *tm); #ifndef RTLD_LAZY #define RTLD_LAZY 0 #endif +#ifndef RTLD_NOW +#define RTLD_NOW 0 +#endif +#ifndef RTLD_GLOBAL +#define RTLD_GLOBAL 0 +#endif #ifndef HAVE_SECURE_MKSTEMP #define mkstemp(path) rep_mkstemp(path) -- cgit From c3c7e1b4230e086ec91fe51b96509ef90980358b Mon Sep 17 00:00:00 2001 From: Michael Adam Date: Thu, 24 May 2007 09:06:15 +0000 Subject: r23109: Redo the change from r22772 I accidentially undid in r23108. Michael (This used to be commit 18a7e739ea5d19b2e220641e19662e2c263d281a) --- source3/lib/replace/replace.h | 4 ++++ 1 file changed, 4 insertions(+) (limited to 'source3/lib/replace/replace.h') diff --git a/source3/lib/replace/replace.h b/source3/lib/replace/replace.h index 3cb3c95b69..2bda0eab52 100644 --- a/source3/lib/replace/replace.h +++ b/source3/lib/replace/replace.h @@ -111,6 +111,10 @@ extern char *sys_errlist[]; extern int errno; #endif +#if defined(HAVE_LINUX_READAHEAD) && ! defined(HAVE_READAHEAD_DECL) +ssize_t readahead(int fd, off64_t offset, size_t count); +#endif + #ifndef HAVE_STRDUP #define strdup rep_strdup char *rep_strdup(const char *s); -- cgit From b25bebb960eee796d5c5b1483f20250ed286894b Mon Sep 17 00:00:00 2001 From: Stefan Metzmacher Date: Sat, 2 Jun 2007 08:30:42 +0000 Subject: r23307: move readahead stuff out of libreplace and make it samba3 specific as we can't replace this function in libreplace and we do the some stuff for other function in the same way. metze (This used to be commit 5e9b84326b4c65799e6fa6550de870d9a7ebba85) --- source3/lib/replace/replace.h | 4 ---- 1 file changed, 4 deletions(-) (limited to 'source3/lib/replace/replace.h') diff --git a/source3/lib/replace/replace.h b/source3/lib/replace/replace.h index 2bda0eab52..3cb3c95b69 100644 --- a/source3/lib/replace/replace.h +++ b/source3/lib/replace/replace.h @@ -111,10 +111,6 @@ extern char *sys_errlist[]; extern int errno; #endif -#if defined(HAVE_LINUX_READAHEAD) && ! defined(HAVE_READAHEAD_DECL) -ssize_t readahead(int fd, off64_t offset, size_t count); -#endif - #ifndef HAVE_STRDUP #define strdup rep_strdup char *rep_strdup(const char *s); -- cgit From e893d7f021d149803aa85e347e0a8acefde210ac Mon Sep 17 00:00:00 2001 From: Stefan Metzmacher Date: Sat, 2 Jun 2007 09:10:08 +0000 Subject: r23309: sync lib/replace with SAMBA_4_0 metze (This used to be commit 20965d800fcac0c55853fb12cdd36b5836fc7e56) --- source3/lib/replace/replace.h | 12 ++++++++++++ 1 file changed, 12 insertions(+) (limited to 'source3/lib/replace/replace.h') diff --git a/source3/lib/replace/replace.h b/source3/lib/replace/replace.h index 3cb3c95b69..f584cd42fa 100644 --- a/source3/lib/replace/replace.h +++ b/source3/lib/replace/replace.h @@ -228,8 +228,12 @@ char *rep_dlerror(void); #ifndef HAVE_DLOPEN #define dlopen rep_dlopen +#ifdef DLOPEN_TAKES_UNSIGNED_FLAGS +void *rep_dlopen(const char *name, unsigned int flags); +#else void *rep_dlopen(const char *name, int flags); #endif +#endif #ifndef HAVE_DLSYM #define dlsym rep_dlsym @@ -258,6 +262,14 @@ int rep_socketpair(int d, int type, int protocol, int sv[2]); #endif #endif +#ifndef _DEPRECATED_ +#if (__GNUC__ >= 3) && (__GNUC_MINOR__ >= 1 ) +#define _DEPRECATED_ __attribute__ ((deprecated)) +#else +#define _DEPRECATED_ +#endif +#endif + #ifndef HAVE_VASPRINTF #define vasprintf rep_vasprintf int rep_vasprintf(char **ptr, const char *format, va_list ap) PRINTF_ATTRIBUTE(2,0); -- cgit From c9e21d8770a6bff73cbb2554b4192cbe0a289893 Mon Sep 17 00:00:00 2001 From: Michael Adam Date: Wed, 6 Jun 2007 09:27:43 +0000 Subject: r23363: Activate rep_pread and rep_pwrite in lib/replace/replace.h. This fixes the build on a SuSE 6.1. :-) I guess this had been merely forgotten. But beware: The implementations of rep_pread and rep_pwrite are not thread safe. Michael (This used to be commit 5f5b93149216eb57872e4291336685b96948681e) --- source3/lib/replace/replace.h | 10 ++++++++++ 1 file changed, 10 insertions(+) (limited to 'source3/lib/replace/replace.h') diff --git a/source3/lib/replace/replace.h b/source3/lib/replace/replace.h index f584cd42fa..62d480e20e 100644 --- a/source3/lib/replace/replace.h +++ b/source3/lib/replace/replace.h @@ -350,6 +350,16 @@ int rep_mkstemp(char *temp); char *rep_mkdtemp(char *template); #endif +#ifndef HAVE_PREAD +#define pread rep_pread +ssize_t rep_pread(int __fd, void *__buf, size_t __nbytes, off_t __offset); +#endif + +#ifndef HAVE_PWRITE +#define pwrite rep_pwrite +ssize_t rep_pwrite(int __fd, const void *__buf, size_t __nbytes, off_t __offset); +#endif + #ifdef HAVE_LIMITS_H #include #endif -- cgit From 2c09988e46d4e917b1c53c9bda3f81a48bba4952 Mon Sep 17 00:00:00 2001 From: Andrew Tridgell Date: Tue, 10 Jul 2007 01:44:42 +0000 Subject: r23790: LGPLv3+ conversion for our LGPLv2+ library code (This used to be commit 1b78cace504f60c0f525765fbf59d9cc6506cd4d) --- source3/lib/replace/replace.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'source3/lib/replace/replace.h') diff --git a/source3/lib/replace/replace.h b/source3/lib/replace/replace.h index 62d480e20e..ce41fc4e26 100644 --- a/source3/lib/replace/replace.h +++ b/source3/lib/replace/replace.h @@ -13,7 +13,7 @@ This library is free software; you can redistribute it and/or modify it under the terms of the GNU Lesser General Public License as published by the Free Software Foundation; either - version 2 of the License, or (at your option) any later version. + version 3 of the License, or (at your option) any later version. This library is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of -- cgit From 9fa1c63578733077c0aaaeeb2fc97c3b191089cc Mon Sep 17 00:00:00 2001 From: Andrew Tridgell Date: Tue, 10 Jul 2007 03:42:26 +0000 Subject: r23798: updated old Temple Place FSF addresses to new URL (This used to be commit c676a971142d7176fd5dbf21405fca14515a0a76) --- source3/lib/replace/replace.h | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) (limited to 'source3/lib/replace/replace.h') diff --git a/source3/lib/replace/replace.h b/source3/lib/replace/replace.h index ce41fc4e26..06173bd84b 100644 --- a/source3/lib/replace/replace.h +++ b/source3/lib/replace/replace.h @@ -21,8 +21,7 @@ Lesser General Public License for more details. You should have received a copy of the GNU Lesser General Public - License along with this library; if not, write to the Free Software - Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + License along with this library; if not, see . */ #ifndef _LIBREPLACE_REPLACE_H -- cgit From db2666759d90610648c32a8c861529004d0624f1 Mon Sep 17 00:00:00 2001 From: Jelmer Vernooij Date: Sun, 12 Aug 2007 01:06:02 +0000 Subject: r24341: Make libreplace provide offsetof. (This used to be commit 4a5fa715a6af281282092644817599f79806981d) --- source3/lib/replace/replace.h | 4 ++++ 1 file changed, 4 insertions(+) (limited to 'source3/lib/replace/replace.h') diff --git a/source3/lib/replace/replace.h b/source3/lib/replace/replace.h index 06173bd84b..e827719951 100644 --- a/source3/lib/replace/replace.h +++ b/source3/lib/replace/replace.h @@ -52,6 +52,10 @@ #define QSORT_CAST (int (*)(const void *, const void *)) #endif +#ifndef offsetof +#define offsetof(t,f) ((unsigned int)&((t *)0)->f) +#endif + #ifdef HAVE_STDINT_H #include /* force off HAVE_INTTYPES_H so that roken doesn't try to include both, -- cgit From b01978f2a9edd7cf1fa89d3d6db1244c48c37fe1 Mon Sep 17 00:00:00 2001 From: Volker Lendecke Date: Sun, 12 Aug 2007 21:23:06 +0000 Subject: r24354: Remove offsetof macro Samba4 seems not to suffer from it (This used to be commit d93b5d50a00286586c931a5876f5933a520b6ce7) --- source3/lib/replace/replace.h | 4 ---- 1 file changed, 4 deletions(-) (limited to 'source3/lib/replace/replace.h') diff --git a/source3/lib/replace/replace.h b/source3/lib/replace/replace.h index e827719951..06173bd84b 100644 --- a/source3/lib/replace/replace.h +++ b/source3/lib/replace/replace.h @@ -52,10 +52,6 @@ #define QSORT_CAST (int (*)(const void *, const void *)) #endif -#ifndef offsetof -#define offsetof(t,f) ((unsigned int)&((t *)0)->f) -#endif - #ifdef HAVE_STDINT_H #include /* force off HAVE_INTTYPES_H so that roken doesn't try to include both, -- cgit From 68edc3a5c5a3cfeed222a95bbe75dadd41dbb5ea Mon Sep 17 00:00:00 2001 From: Stefan Metzmacher Date: Wed, 19 Sep 2007 14:57:20 +0000 Subject: r25232: sync lib/replace with SAMBA_4_0 metze (This used to be commit 828d2ca0610ab5ee3b96d187b3432b9b4fea72f8) --- source3/lib/replace/replace.h | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) (limited to 'source3/lib/replace/replace.h') diff --git a/source3/lib/replace/replace.h b/source3/lib/replace/replace.h index 06173bd84b..90d65931e7 100644 --- a/source3/lib/replace/replace.h +++ b/source3/lib/replace/replace.h @@ -375,6 +375,14 @@ ssize_t rep_pwrite(int __fd, const void *__buf, size_t __nbytes, off_t __offset) #define HOST_NAME_MAX 64 #endif +/* + * Some older systems seem not to have MAXHOSTNAMELEN + * defined. + */ +#ifndef MAXHOSTNAMELEN +#define MAXHOSTNAMELEN HOST_NAME_MAX +#endif + #ifndef UINT16_MAX #define UINT16_MAX 65535 #endif @@ -466,7 +474,7 @@ typedef int bool; #define __STRING(x) #x #endif -#ifndef _STRINGSTRING +#ifndef __STRINGSTRING #define __STRINGSTRING(x) __STRING(x) #endif -- cgit From cdf90682694507387d9f78c2b46ddf0d890d9253 Mon Sep 17 00:00:00 2001 From: Stefan Metzmacher Date: Thu, 20 Sep 2007 09:12:18 +0000 Subject: r25252: move macro defines to the end of replace.h and move the include location sys/param.h before we redefine missing macros metze (This used to be commit 862046028c3c61adf6da2effac91abf3c763635d) --- source3/lib/replace/replace.h | 67 ++++++++++++++++++++++--------------------- 1 file changed, 35 insertions(+), 32 deletions(-) (limited to 'source3/lib/replace/replace.h') diff --git a/source3/lib/replace/replace.h b/source3/lib/replace/replace.h index 90d65931e7..af05516e8c 100644 --- a/source3/lib/replace/replace.h +++ b/source3/lib/replace/replace.h @@ -44,13 +44,6 @@ #include "win32_replace.h" #endif -#ifdef __COMPAR_FN_T -#define QSORT_CAST (__compar_fn_t) -#endif - -#ifndef QSORT_CAST -#define QSORT_CAST (int (*)(const void *, const void *)) -#endif #ifdef HAVE_STDINT_H #include @@ -78,28 +71,6 @@ #include #endif -/** - this is a warning hack. The idea is to use this everywhere that we - get the "discarding const" warning from gcc. That doesn't actually - fix the problem of course, but it means that when we do get to - cleaning them up we can do it by searching the code for - discard_const. - - It also means that other error types aren't as swamped by the noise - of hundreds of const warnings, so we are more likely to notice when - we get new errors. - - Please only add more uses of this macro when you find it - _really_ hard to fix const warnings. Our aim is to eventually use - this function in only a very few places. - - Also, please call this via the discard_const_p() macro interface, as that - makes the return type safe. -*/ -#define discard_const(ptr) ((void *)((intptr_t)(ptr))) - -/** Type-safe version of discard_const */ -#define discard_const_p(type, ptr) ((type *)discard_const(ptr)) #ifndef HAVE_STRERROR extern char *sys_errlist[]; @@ -363,6 +334,10 @@ ssize_t rep_pwrite(int __fd, const void *__buf, size_t __nbytes, off_t __offset) #include #endif +#ifdef HAVE_SYS_PARAM_H +#include +#endif + /* The extra casts work around common compiler bugs. */ #define _TYPE_SIGNED(t) (! ((t) 0 < (t) -1)) /* The outer cast is needed to work around a bug in Cray C 5.0.3.0. @@ -458,9 +433,6 @@ typedef int bool; #endif #endif -#ifdef HAVE_SYS_PARAM_H -#include -#endif #ifndef MIN #define MIN(a,b) ((a)<(b)?(a):(b)) @@ -470,6 +442,29 @@ typedef int bool; #define MAX(a,b) ((a)>(b)?(a):(b)) #endif +/** + this is a warning hack. The idea is to use this everywhere that we + get the "discarding const" warning from gcc. That doesn't actually + fix the problem of course, but it means that when we do get to + cleaning them up we can do it by searching the code for + discard_const. + + It also means that other error types aren't as swamped by the noise + of hundreds of const warnings, so we are more likely to notice when + we get new errors. + + Please only add more uses of this macro when you find it + _really_ hard to fix const warnings. Our aim is to eventually use + this function in only a very few places. + + Also, please call this via the discard_const_p() macro interface, as that + makes the return type safe. +*/ +#define discard_const(ptr) ((void *)((intptr_t)(ptr))) + +/** Type-safe version of discard_const */ +#define discard_const_p(type, ptr) ((type *)discard_const(ptr)) + #ifndef __STRING #define __STRING(x) #x #endif @@ -519,4 +514,12 @@ typedef int bool; #undef HAVE_MMAP #endif +#ifdef __COMPAR_FN_T +#define QSORT_CAST (__compar_fn_t) +#endif + +#ifndef QSORT_CAST +#define QSORT_CAST (int (*)(const void *, const void *)) +#endif + #endif /* _LIBREPLACE_REPLACE_H */ -- cgit From a2bbf608d21ff8de129aae726a426eac5d65a67f Mon Sep 17 00:00:00 2001 From: Jeremy Allison Date: Mon, 1 Oct 2007 23:18:26 +0000 Subject: r25455: Ensure we have inet_ntop and inet_pton available in lib/replace. Jeremy. (This used to be commit 1f719905440d4c87c526c56532f47d894cfec5f0) --- source3/lib/replace/replace.h | 20 +++++++++++++++++--- 1 file changed, 17 insertions(+), 3 deletions(-) (limited to 'source3/lib/replace/replace.h') diff --git a/source3/lib/replace/replace.h b/source3/lib/replace/replace.h index af05516e8c..907d9b0086 100644 --- a/source3/lib/replace/replace.h +++ b/source3/lib/replace/replace.h @@ -1,15 +1,16 @@ -/* +/* Unix SMB/CIFS implementation. macros to go along with the lib/replace/ portability layer code Copyright (C) Andrew Tridgell 2005 Copyright (C) Jelmer Vernooij 2006 + Copyright (C) Jeremy Allison 2007. ** NOTE! The following LGPL license applies to the replace ** library. This does NOT imply that all of Samba is released ** under the LGPL - + This library is free software; you can redistribute it and/or modify it under the terms of the GNU Lesser General Public License as published by the Free Software Foundation; either @@ -71,7 +72,6 @@ #include #endif - #ifndef HAVE_STRERROR extern char *sys_errlist[]; #define strerror(i) sys_errlist[i] @@ -330,6 +330,20 @@ ssize_t rep_pread(int __fd, void *__buf, size_t __nbytes, off_t __offset); ssize_t rep_pwrite(int __fd, const void *__buf, size_t __nbytes, off_t __offset); #endif +#ifndef HAVE_INET_PTON +#define inet_pton rep_inet_pton +int rep_inet_pton(int af, const char *src, void *dst); +#endif + +#ifndef HAVE_INET_NTOP +#define inet_ntop rep_inet_ntop +const char *rep_inet_ntop(int af, const void *src, char *dst, socklen_t size); +#endif + +#ifndef EAFNOSUPPORT +#define EAFNOSUPPORT EINVAL +#endif + #ifdef HAVE_LIMITS_H #include #endif -- cgit From 3fbd1ae54ced2eb889a8fe0a6ea32dfd8175f941 Mon Sep 17 00:00:00 2001 From: Jeremy Allison Date: Tue, 2 Oct 2007 19:27:25 +0000 Subject: r25472: Fix the interfaces code to detect IPv6 interfaces, using the new standard getifaddrs() and freeifaddrs() interfaces. Currently we only return IPv4 af_families. Needs fixing for binds to IPv6 but this has to be careful work. Jeremy. (This used to be commit 327875182c9219aeba687e10aaea93546d9a70ea) --- source3/lib/replace/replace.h | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) (limited to 'source3/lib/replace/replace.h') diff --git a/source3/lib/replace/replace.h b/source3/lib/replace/replace.h index 907d9b0086..27265e35c4 100644 --- a/source3/lib/replace/replace.h +++ b/source3/lib/replace/replace.h @@ -330,18 +330,18 @@ ssize_t rep_pread(int __fd, void *__buf, size_t __nbytes, off_t __offset); ssize_t rep_pwrite(int __fd, const void *__buf, size_t __nbytes, off_t __offset); #endif +#if !defined(HAVE_INET_PTON) || !defined(HAVE_INET_NTOP) +#include "system/network.h" +#endif + #ifndef HAVE_INET_PTON -#define inet_pton rep_inet_pton int rep_inet_pton(int af, const char *src, void *dst); +#define inet_pton rep_inet_pton #endif #ifndef HAVE_INET_NTOP -#define inet_ntop rep_inet_ntop const char *rep_inet_ntop(int af, const void *src, char *dst, socklen_t size); -#endif - -#ifndef EAFNOSUPPORT -#define EAFNOSUPPORT EINVAL +#define inet_ntop rep_inet_ntop #endif #ifdef HAVE_LIMITS_H -- cgit From 941544a9514aaae89268bc9d689705ad0724119e Mon Sep 17 00:00:00 2001 From: Jeremy Allison Date: Thu, 4 Oct 2007 17:20:49 +0000 Subject: r25505: Add a replacement (IPv4 only) implementation of getaddrinfo/freeaddrinfo under the 2 clause *BSD license for future use in IPv6 code. Original code was from PostgreSQL and I've maintained their license even though I've rewritten large parts of it (I probably should donate this back to them). Jeremy. (This used to be commit 760d993340a966269d71acfb7a6b5e4d3776ac5d) --- source3/lib/replace/replace.h | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) (limited to 'source3/lib/replace/replace.h') diff --git a/source3/lib/replace/replace.h b/source3/lib/replace/replace.h index 27265e35c4..ca4becaa70 100644 --- a/source3/lib/replace/replace.h +++ b/source3/lib/replace/replace.h @@ -139,7 +139,7 @@ int setenv(const char *name, const char *value, int overwrite); #ifndef HAVE_UNSETENV #define unsetenv rep_unsetenv -int rep_unsetenv(const char *name); +int rep_unsetenv(const char *name); #endif #ifndef HAVE_SETEUID @@ -163,7 +163,7 @@ char *rep_strcasestr(const char *haystack, const char *needle); #endif #ifndef HAVE_STRTOK_R -#define strtok_r rep_strtok_r +#define strtok_r rep_strtok_r char *rep_strtok_r(char *s, const char *delim, char **save_ptr); #endif @@ -330,9 +330,7 @@ ssize_t rep_pread(int __fd, void *__buf, size_t __nbytes, off_t __offset); ssize_t rep_pwrite(int __fd, const void *__buf, size_t __nbytes, off_t __offset); #endif -#if !defined(HAVE_INET_PTON) || !defined(HAVE_INET_NTOP) #include "system/network.h" -#endif #ifndef HAVE_INET_PTON int rep_inet_pton(int af, const char *src, void *dst); @@ -344,6 +342,10 @@ const char *rep_inet_ntop(int af, const void *src, char *dst, socklen_t size); #define inet_ntop rep_inet_ntop #endif +#if !defined(HAVE_GETADDRINFO) +#include "system/getaddrinfo.h" +#endif + #ifdef HAVE_LIMITS_H #include #endif -- cgit From d154a0d74b23b4a1fbd921f17dec3e0e3506eeab Mon Sep 17 00:00:00 2001 From: Jelmer Vernooij Date: Sat, 6 Oct 2007 23:07:33 +0000 Subject: r25557: merge libreplace fixes from samba4 (This used to be commit 8c1669997c53f0f7bfb9a794083afd01b131f676) --- source3/lib/replace/replace.h | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) (limited to 'source3/lib/replace/replace.h') diff --git a/source3/lib/replace/replace.h b/source3/lib/replace/replace.h index ca4becaa70..26e39ac603 100644 --- a/source3/lib/replace/replace.h +++ b/source3/lib/replace/replace.h @@ -330,22 +330,17 @@ ssize_t rep_pread(int __fd, void *__buf, size_t __nbytes, off_t __offset); ssize_t rep_pwrite(int __fd, const void *__buf, size_t __nbytes, off_t __offset); #endif -#include "system/network.h" - #ifndef HAVE_INET_PTON int rep_inet_pton(int af, const char *src, void *dst); #define inet_pton rep_inet_pton #endif #ifndef HAVE_INET_NTOP +#include "system/network.h" const char *rep_inet_ntop(int af, const void *src, char *dst, socklen_t size); #define inet_ntop rep_inet_ntop #endif -#if !defined(HAVE_GETADDRINFO) -#include "system/getaddrinfo.h" -#endif - #ifdef HAVE_LIMITS_H #include #endif -- cgit From 81a70d4ac5c3143ff036d8f73979da70132e071e Mon Sep 17 00:00:00 2001 From: Jeremy Allison Date: Wed, 10 Oct 2007 17:56:19 -0700 Subject: Merge from metze of libreplace header changes (This used to be commit d39ce8e37ed81f4a34a148f975874989d8d187a1) --- source3/lib/replace/replace.h | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) (limited to 'source3/lib/replace/replace.h') diff --git a/source3/lib/replace/replace.h b/source3/lib/replace/replace.h index 26e39ac603..3dc10db59f 100644 --- a/source3/lib/replace/replace.h +++ b/source3/lib/replace/replace.h @@ -91,19 +91,15 @@ char *rep_strdup(const char *s); void *rep_memmove(void *dest,const void *src,int size); #endif -#if !defined(HAVE_MKTIME) || !defined(HAVE_TIMEGM) -#include "system/time.h" -#endif - #ifndef HAVE_MKTIME #define mktime rep_mktime -time_t rep_mktime(struct tm *t); +/* prototype is in "system/time.h" */ #endif #ifndef HAVE_TIMEGM struct tm; #define timegm rep_timegm -time_t rep_timegm(struct tm *tm); +/* prototype is in "system/time.h" */ #endif #ifndef HAVE_STRLCPY -- cgit From 804396dce9112361c0e19ad2e15b9bb8dd23c378 Mon Sep 17 00:00:00 2001 From: metze Date: Wed, 10 Oct 2007 12:09:06 +0000 Subject: don't imply "system/network.h" within replace.h, as this brings in the socket_wrapper.h in unexpected code and we endup with a missing 'swrap_close' while linking metze git-svn-id: svn+ssh://svn.samba.org/data/svn/samba/branches/SAMBA_4_0@25602 0c0555d6-39d7-0310-84fc-f1cc0bd64818 (This used to be commit ec8e3f7f92522c65ec472058321db8a7ac30ec4c) --- source3/lib/replace/replace.h | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) (limited to 'source3/lib/replace/replace.h') diff --git a/source3/lib/replace/replace.h b/source3/lib/replace/replace.h index 3dc10db59f..45902657a2 100644 --- a/source3/lib/replace/replace.h +++ b/source3/lib/replace/replace.h @@ -326,15 +326,19 @@ ssize_t rep_pread(int __fd, void *__buf, size_t __nbytes, off_t __offset); ssize_t rep_pwrite(int __fd, const void *__buf, size_t __nbytes, off_t __offset); #endif +#ifdef REPLACE_INET_NTOA +#define inet_ntoa rep_inet_ntoa +/* prototype is in "system/network.h" */ +#endif + #ifndef HAVE_INET_PTON -int rep_inet_pton(int af, const char *src, void *dst); #define inet_pton rep_inet_pton +/* prototype is in "system/network.h" */ #endif #ifndef HAVE_INET_NTOP -#include "system/network.h" -const char *rep_inet_ntop(int af, const void *src, char *dst, socklen_t size); #define inet_ntop rep_inet_ntop +/* prototype is in "system/network.h" */ #endif #ifdef HAVE_LIMITS_H -- cgit From 2ecbed36b22e7147462018d9bcbe8e45d85a45c2 Mon Sep 17 00:00:00 2001 From: Stefan Metzmacher Date: Mon, 15 Oct 2007 10:59:50 +0200 Subject: missing stuff from samba4's libreplace metze (This used to be commit 0177158d85797e0d22c81d88175a77d4ad5ed711) --- source3/lib/replace/replace.h | 1 - 1 file changed, 1 deletion(-) (limited to 'source3/lib/replace/replace.h') diff --git a/source3/lib/replace/replace.h b/source3/lib/replace/replace.h index 45902657a2..e42d5ff168 100644 --- a/source3/lib/replace/replace.h +++ b/source3/lib/replace/replace.h @@ -97,7 +97,6 @@ void *rep_memmove(void *dest,const void *src,int size); #endif #ifndef HAVE_TIMEGM -struct tm; #define timegm rep_timegm /* prototype is in "system/time.h" */ #endif -- cgit From d8f3c9d0786ff637241d2a9409e1c7c253715ba5 Mon Sep 17 00:00:00 2001 From: Jeremy Allison Date: Tue, 6 Nov 2007 21:47:57 -0800 Subject: Fix bug where tdb lock call interrupted with an alarm sig would not terminate and could lead to runaway smbd processes. Thanks to Dave Daugherty @ Centrify for pointing this out to us. Jeremy. (This used to be commit ef8da1698371c95495add53df81a978df709c88d) --- source3/lib/replace/replace.h | 4 ++++ 1 file changed, 4 insertions(+) (limited to 'source3/lib/replace/replace.h') diff --git a/source3/lib/replace/replace.h b/source3/lib/replace/replace.h index e42d5ff168..55ed2e9570 100644 --- a/source3/lib/replace/replace.h +++ b/source3/lib/replace/replace.h @@ -452,6 +452,10 @@ typedef int bool; #define MAX(a,b) ((a)>(b)?(a):(b)) #endif +#if !defined(HAVE_VOLATILE) +#define volatile +#endif + /** this is a warning hack. The idea is to use this everywhere that we get the "discarding const" warning from gcc. That doesn't actually -- cgit From d40e47db4b5da41c8604a2058f3a0b0a82164f08 Mon Sep 17 00:00:00 2001 From: Jeremy Allison Date: Thu, 8 Nov 2007 17:25:45 -0800 Subject: Remove more fstring/pstring bad useage. Go talloc ! Jeremy. (This used to be commit 2a0173743d2cf615d52278f3dd87cc804abe2d16) --- source3/lib/replace/replace.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'source3/lib/replace/replace.h') diff --git a/source3/lib/replace/replace.h b/source3/lib/replace/replace.h index 55ed2e9570..973c68ee14 100644 --- a/source3/lib/replace/replace.h +++ b/source3/lib/replace/replace.h @@ -357,7 +357,7 @@ ssize_t rep_pwrite(int __fd, const void *__buf, size_t __nbytes, off_t __offset) #define _TYPE_MAXIMUM(t) ((t) (~ (t) 0 - _TYPE_MINIMUM (t))) #ifndef HOST_NAME_MAX -#define HOST_NAME_MAX 64 +#define HOST_NAME_MAX 255 #endif /* -- cgit From 2b3c44e4fb980335c22abcc07a88f32b13e5918f Mon Sep 17 00:00:00 2001 From: Jeremy Allison Date: Sat, 10 Nov 2007 22:31:34 -0800 Subject: Always define PATH_MAX. Makes code simpler (removes a bunch of #defines). Remove pstring from msdfs.c. Jeremy. (This used to be commit e203ba22275320808bc11b17361ad1f2d5b0b897) --- source3/lib/replace/replace.h | 4 ++++ 1 file changed, 4 insertions(+) (limited to 'source3/lib/replace/replace.h') diff --git a/source3/lib/replace/replace.h b/source3/lib/replace/replace.h index 973c68ee14..36a355f0a9 100644 --- a/source3/lib/replace/replace.h +++ b/source3/lib/replace/replace.h @@ -536,4 +536,8 @@ typedef int bool; #define QSORT_CAST (int (*)(const void *, const void *)) #endif +#ifndef PATH_MAX +#define PATH_MAX 1024 +#endif + #endif /* _LIBREPLACE_REPLACE_H */ -- cgit From acb829ecc3b9af3f141425ecac032a7c722a1815 Mon Sep 17 00:00:00 2001 From: Jeremy Allison Date: Thu, 15 Nov 2007 18:27:26 -0800 Subject: Add MAX_DNS_NAME_LENGTH, remove more pstrings. Jeremy. (This used to be commit a1725f4ff7ed375808c78ac661b539557748d0a5) --- source3/lib/replace/replace.h | 4 ++++ 1 file changed, 4 insertions(+) (limited to 'source3/lib/replace/replace.h') diff --git a/source3/lib/replace/replace.h b/source3/lib/replace/replace.h index 36a355f0a9..1d1cbc2cd2 100644 --- a/source3/lib/replace/replace.h +++ b/source3/lib/replace/replace.h @@ -540,4 +540,8 @@ typedef int bool; #define PATH_MAX 1024 #endif +#ifndef MAX_DNS_NAME_LENGTH +#define MAX_DNS_NAME_LENGTH 256 /* Actually 255 but +1 for terminating null. */ +#endif + #endif /* _LIBREPLACE_REPLACE_H */ -- cgit From 1caa9cbd9dd1449c00fa431e129e1d070f4aac80 Mon Sep 17 00:00:00 2001 From: Jelmer Vernooij Date: Mon, 17 Dec 2007 07:45:05 +0100 Subject: r26495: Add defines for getifaddrs/freeifaddrs. (cherry picked from commit c9e5a3078f7baa83743658d5648f0eefdeb05d2f) (This used to be commit f2f552106820d1a8f07bccc1a3ad9b45582c8b30) --- source3/lib/replace/replace.h | 10 ++++++++++ 1 file changed, 10 insertions(+) (limited to 'source3/lib/replace/replace.h') diff --git a/source3/lib/replace/replace.h b/source3/lib/replace/replace.h index 1d1cbc2cd2..3f91544e97 100644 --- a/source3/lib/replace/replace.h +++ b/source3/lib/replace/replace.h @@ -340,6 +340,16 @@ ssize_t rep_pwrite(int __fd, const void *__buf, size_t __nbytes, off_t __offset) /* prototype is in "system/network.h" */ #endif +#ifndef HAVE_GETIFADDRS +#define getifaddrs rep_getifaddrs +/* prototype is in "system/network.h" */ +#endif + +#ifndef HAVE_FREEIFADDRS +#define freeifaddrs rep_freeifaddrs +/* prototype is in "system/network.h" */ +#endif + #ifdef HAVE_LIMITS_H #include #endif -- cgit From 7bdd648477c49dc7e23f832b2438bef673398fbf Mon Sep 17 00:00:00 2001 From: Michael Adam Date: Tue, 26 Feb 2008 13:24:54 +0100 Subject: libreplace: Add tests for connect and gethostbyname. Provide dummy replacements when a function isnt found. The functions are also searched for in certain libraries, and variables SOCKET_LIBS and NSL_LIBS are set accordingly. One purpose of this is to fix the getifaddrs tests on systems where e.g. the socket calls require special libs for linking. Michael (This used to be commit c19f7a0e1004213f95e0bf8db5cd1f6697c7a47b) --- source3/lib/replace/replace.h | 10 ++++++++++ 1 file changed, 10 insertions(+) (limited to 'source3/lib/replace/replace.h') diff --git a/source3/lib/replace/replace.h b/source3/lib/replace/replace.h index 3f91544e97..0d16f4ffd0 100644 --- a/source3/lib/replace/replace.h +++ b/source3/lib/replace/replace.h @@ -340,6 +340,16 @@ ssize_t rep_pwrite(int __fd, const void *__buf, size_t __nbytes, off_t __offset) /* prototype is in "system/network.h" */ #endif +#ifndef HAVE_CONNECT +#define connect rep_connect +/* prototype is in "system/network.h" */ +#endif + +#ifndef HAVE_GETHOSTBYNAME +#define gethostbyname rep_gethostbyname +/* prototype is in "system/network.h" */ +#endif + #ifndef HAVE_GETIFADDRS #define getifaddrs rep_getifaddrs /* prototype is in "system/network.h" */ -- cgit From 27517ea5bbd0cb7fb0f1a1d88d8282380f14e717 Mon Sep 17 00:00:00 2001 From: Michael Adam Date: Fri, 14 Mar 2008 08:49:34 +0100 Subject: libreplace: add an inet_aton() function that calls inet_pton(). inet_aton() is even needed inside libreplace, in the implementation of rep_getaddrinfo(). Michael (cherry picked from commit bcb2f3a880f8da8f9bedb7a8e61d7d7b533f1919) (This used to be commit 83baff78ce752a9129554a456cc24d043d419cd1) --- source3/lib/replace/replace.h | 5 +++++ 1 file changed, 5 insertions(+) (limited to 'source3/lib/replace/replace.h') diff --git a/source3/lib/replace/replace.h b/source3/lib/replace/replace.h index 0d16f4ffd0..00c8230e6b 100644 --- a/source3/lib/replace/replace.h +++ b/source3/lib/replace/replace.h @@ -340,6 +340,11 @@ ssize_t rep_pwrite(int __fd, const void *__buf, size_t __nbytes, off_t __offset) /* prototype is in "system/network.h" */ #endif +#ifndef HAVE_INET_ATON +#define inet_aton rep_inet_aton +/* prototype is in "system/network.h" */ +#endif + #ifndef HAVE_CONNECT #define connect rep_connect /* prototype is in "system/network.h" */ -- cgit From 5c73dabd49bfca840c062e8c49d8765dc0e4531e Mon Sep 17 00:00:00 2001 From: Michael Adam Date: Tue, 18 Mar 2008 12:16:47 +0100 Subject: libreplace: replace inet_ntoa() when it is missing ...not only replace it when it is broken. This moves the defintion of rep_inet_ntoa from replace.c to inet_ntoa.c and adds configure checks for existence of inet_ntoa(). Checks are moved to an include file of its own. NOTE: The original rep_inet_ntoa in replace.c was wrapped into a "#ifndef WITH_PTHREADS" but the prototype in replace.h and the define in system/network.h were not. I removed that ifndef since the inet_ntoa() function is usually not thread safe anyways, since it returns a pointer to a static buffer. So whoever calls inet_ntoa() should be aware that it is not thread safe anyways. Michael (cherry picked from commit 974c0c45ad42644348e0b55454715b12158f1028) (This used to be commit edcf2712bcdedabbfdd9ee8b9a18f46126930636) --- source3/lib/replace/replace.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'source3/lib/replace/replace.h') diff --git a/source3/lib/replace/replace.h b/source3/lib/replace/replace.h index 00c8230e6b..383536da65 100644 --- a/source3/lib/replace/replace.h +++ b/source3/lib/replace/replace.h @@ -325,7 +325,7 @@ ssize_t rep_pread(int __fd, void *__buf, size_t __nbytes, off_t __offset); ssize_t rep_pwrite(int __fd, const void *__buf, size_t __nbytes, off_t __offset); #endif -#ifdef REPLACE_INET_NTOA +#if !defined(HAVE_INET_NTOA) || defined(REPLACE_INET_NTOA) #define inet_ntoa rep_inet_ntoa /* prototype is in "system/network.h" */ #endif -- cgit From b57d67c406311d4c859ee1d409a03669f1a1a8b3 Mon Sep 17 00:00:00 2001 From: Michael Adam Date: Tue, 18 Mar 2008 17:20:47 +0100 Subject: libreplace: move rep_socketpair() to its own module. Prototype is now in system/network.h, implementation in socketpair.c, and check in socketpair.m4. Now the last networking function has vanished from replace.c. Michael (cherry picked from commit 94ac8a25be15b55f66eff96fdddc2fdc71a43b1e) (This used to be commit 6c53753246b8108fe1277b34958e122bd800c4e7) --- source3/lib/replace/replace.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'source3/lib/replace/replace.h') diff --git a/source3/lib/replace/replace.h b/source3/lib/replace/replace.h index 383536da65..5fe79394eb 100644 --- a/source3/lib/replace/replace.h +++ b/source3/lib/replace/replace.h @@ -212,7 +212,7 @@ int rep_dlclose(void *handle); #ifndef HAVE_SOCKETPAIR #define socketpair rep_socketpair -int rep_socketpair(int d, int type, int protocol, int sv[2]); +/* prototype is in system/network.h */ #endif #ifndef PRINTF_ATTRIBUTE -- cgit From e90b4061c134486fd3958ea11a28af9801bcc6a2 Mon Sep 17 00:00:00 2001 From: Jeremy Allison Date: Fri, 18 Apr 2008 00:30:50 -0700 Subject: Janitor for tridge. Keep lib/replace in sync with the gcc4 changes. Jeremy. (This used to be commit b496f133228b74bf613dab81167a5b9670511c51) --- source3/lib/replace/replace.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'source3/lib/replace/replace.h') diff --git a/source3/lib/replace/replace.h b/source3/lib/replace/replace.h index 5fe79394eb..bf95169352 100644 --- a/source3/lib/replace/replace.h +++ b/source3/lib/replace/replace.h @@ -499,7 +499,7 @@ typedef int bool; Also, please call this via the discard_const_p() macro interface, as that makes the return type safe. */ -#define discard_const(ptr) ((void *)((intptr_t)(ptr))) +#define discard_const(ptr) ((void *)((uintptr_t)(ptr))) /** Type-safe version of discard_const */ #define discard_const_p(type, ptr) ((type *)discard_const(ptr)) -- cgit From db4ab7aae3b44b22b70013f13da370b74d429553 Mon Sep 17 00:00:00 2001 From: Stefan Metzmacher Date: Wed, 7 May 2008 13:10:31 +0200 Subject: libreplace: always provide utime() and utimes() I'd like to also provide futimes(), but it seems that some systems doesn't support a it at kernel level. If someone knows how to write a portable replacement for futimes() please tell me... metze (cherry picked from commit a9604fe4a323dccb537cf02ea7594437b4995803) (This used to be commit 8a241cf150fba787c82cbcb03730083ced442fbb) --- source3/lib/replace/replace.h | 10 ++++++++++ 1 file changed, 10 insertions(+) (limited to 'source3/lib/replace/replace.h') diff --git a/source3/lib/replace/replace.h b/source3/lib/replace/replace.h index bf95169352..c69ea6cdac 100644 --- a/source3/lib/replace/replace.h +++ b/source3/lib/replace/replace.h @@ -101,6 +101,16 @@ void *rep_memmove(void *dest,const void *src,int size); /* prototype is in "system/time.h" */ #endif +#ifndef HAVE_UTIME +#define utime rep_utime +/* prototype is in "system/time.h" */ +#endif + +#ifndef HAVE_UTIMES +#define utimes rep_utimes +/* prototype is in "system/time.h" */ +#endif + #ifndef HAVE_STRLCPY #define strlcpy rep_strlcpy size_t rep_strlcpy(char *d, const char *s, size_t bufsize); -- cgit