X-Git-Url: http://wien.tomnetworks.com/gitweb/?a=blobdiff_plain;f=support%2Fmph.h;h=2fbae6a27cddd04bcbc592ac70a1a501256ce27e;hb=ef7a4c06206976de7ef2e974267407347ddb75a4;hp=56f83e52b16e6c832bab0b8ec843fd640c2b3abb;hpb=af90548a08ef5effc93b083b7eec44daa178b141;p=mono.git diff --git a/support/mph.h b/support/mph.h index 56f83e52b16..2fbae6a27cd 100644 --- a/support/mph.h +++ b/support/mph.h @@ -27,15 +27,59 @@ #include +#include /* offsetof */ #include /* LONG_MAX, ULONG_MAX */ #include /* for ERANGE */ #include /* for g* types, etc. */ +#ifdef HAVE_SYS_STAT_H +#include +#endif + #ifdef HAVE_STDINT_H #include /* for SIZE_MAX */ #endif -#if __APPLE__ || __BSD__ || __FreeBSD__ +#ifdef ANDROID_UNIFIED_HEADERS +#ifdef HAVE_STDIO_H +#include +#endif + +#undef st_atime_nsec +#undef st_mtime_nsec +#undef st_ctime_nsec + +#ifndef L_cuserid +#define L_cuserid 9 /* size for cuserid(); UT_NAMESIZE + 1 */ +#endif + +/* NDK unified headers will define fpos_t to be 64-bit if large files support is + * enabled (which is the case with Mono) so we need to make sure the offsets here + * are actually 32-bit for Android APIs before API24 which did NOT have the 64-bit + * versions. + */ +#if !defined(fgetpos) && __ANDROID_API__ < 24 +int fgetpos(FILE*, fpos_t*); +#endif + +#if !defined(fsetpos) && __ANDROID_API__ < 24 +int fsetpos(FILE*, const fpos_t*); +#endif + +#ifdef HAVE_PWD_H +#include +#endif +/* Unified headers define 'pw_gecos' to be an alias for 'pw_passwd` on 32-bit Android which + * results in two fields named 'pw_passwd' in map.h's 'struct passwd' + */ +#if !defined(__LP64__) && defined(pw_gecos) +#undef pw_gecos +#undef HAVE_STRUCT_PASSWD_PW_GECOS +#endif + +#endif + +#if __APPLE__ || __BSD__ || __FreeBSD__ || __OpenBSD__ #define MPH_ON_BSD #endif @@ -45,15 +89,17 @@ #define MPH_INTERNAL #endif -#if defined (PLATFORM_WIN32) && !defined (EOVERFLOW) -#define EOVERFLOW 75 -#endif /* def PLATFORM_WIN32 && ndef EOVERFLOW */ - -#if !defined (PLATFORM_WIN32) +#if !defined(EOVERFLOW) +# if defined(HOST_WIN32) +# define EOVERFLOW 75 +# elif defined(__OpenBSD__) +# define EOVERFLOW 87 +# endif +#endif /* !defined(EOVERFLOW) */ /* - * Solaris doesn't define these BSD values, and if they're not present then - * map.c:Mono_Posix_FromSeekFlags() breaks badly; see: + * Solaris/Windows don't define these BSD values, and if they're not present + * then map.c:Mono_Posix_FromSeekFlags() breaks badly; see: * http://bugzilla.gnome.org/show_bug.cgi?id=370081 */ @@ -69,6 +115,18 @@ #define L_XTND SEEK_END #endif /* ndef L_XTND */ +#if !defined (HOST_WIN32) + +/* + * OS X doesn't define MAP_ANONYMOUS, but it does define MAP_ANON. + * Alias them to fix: https://bugzilla.xamarin.com/show_bug.cgi?id=3419 + */ +#ifdef HOST_DARWIN +#ifndef MAP_ANONYMOUS +#define MAP_ANONYMOUS MAP_ANON +#endif /* ndef MAP_ANONYMOUS */ +#endif /* ndef HOST_DARWIN */ + /* * XATTR_AUTO is a synonym for 0 within XattrFlags, but most systems don't * define it. map.c doesn't know that, though, so we ensure that it's defined @@ -79,7 +137,7 @@ #define XATTR_AUTO 0 #endif /* ndef XATTR_AUTO */ -#endif /* ndef PLATFORM_WIN32 */ +#endif /* ndef HOST_WIN32 */ typedef gint64 mph_blkcnt_t; typedef gint64 mph_blksize_t; @@ -134,6 +192,13 @@ typedef gint64 suseconds_t; return ret; \ }}G_STMT_END +#define mph_have_uint_overflow(var) ((var) < 0 || (var) > UINT_MAX) + +#define mph_return_val_if_uint_overflow(var, ret) \ + _mph_return_val_if_cb_(var, ret, mph_have_uint_overflow) + +#define mph_return_if_uint_overflow(var) mph_return_val_if_uint_overflow(var, -1) + #define mph_have_long_overflow(var) ((var) > LONG_MAX || (var) < LONG_MIN) #define mph_return_val_if_long_overflow(var, ret) \ @@ -141,14 +206,14 @@ typedef gint64 suseconds_t; #define mph_return_if_long_overflow(var) mph_return_val_if_long_overflow(var, -1) -#define mph_have_ulong_overflow(var) ((var) > ULONG_MAX) +#define mph_have_ulong_overflow(var) (var) < 0 || ((var) > ULONG_MAX) #define mph_return_val_if_ulong_overflow(var, ret) \ _mph_return_val_if_cb_(var, ret, mph_have_ulong_overflow) #define mph_return_if_ulong_overflow(var) mph_return_val_if_ulong_overflow(var, -1) -#define mph_have_size_t_overflow(var) ((var) > MPH_SIZE_T_MAX) +#define mph_have_size_t_overflow(var) ((var) < 0 || (var) > MPH_SIZE_T_MAX) #define mph_return_val_if_size_t_overflow(var, ret) \ _mph_return_val_if_cb_(var, ret, mph_have_size_t_overflow) @@ -170,6 +235,15 @@ typedef gint64 suseconds_t; #define mph_return_if_time_t_overflow(var) mph_return_if_long_overflow(var) +#define mph_return_if_socklen_t_overflow(var) mph_return_if_uint_overflow(var) + +#define mph_return_if_val_in_list5(var,a,b,c,d,e) \ + do { \ + int v = (var); \ + if (v == a || v == b || v == c || v == d || v == e) \ + return -1; \ + } while (0) + /* * Helper function for functions which use ERANGE (such as getpwnam_r and * getgrnam_r). These functions accept buffers which are dynamically @@ -191,10 +265,20 @@ recheck_range (int ret) return 0; } +typedef unsigned int mph_string_offset_t; + +enum { + MPH_STRING_OFFSET_PTR = 0x0, + MPH_STRING_OFFSET_ARRAY = 0x1, + MPH_STRING_OFFSET_MASK = 0x1 +}; + +#define MPH_STRING_OFFSET(type,member,kind) ((offsetof(type,member) << 1) | kind) + MPH_INTERNAL char* _mph_copy_structure_strings ( - void *to, const size_t *to_offsets, - const void *from, const size_t *from_offsets, + void *to, const mph_string_offset_t *to_offsets, + const void *from, const mph_string_offset_t *from_offsets, size_t num_strings); #endif /* ndef INC_mph_H */