X-Git-Url: https://git.openssl.org/gitweb/?p=openssl.git;a=blobdiff_plain;f=e_os.h;h=77efc6e35b2bc88086bb5c6f8dbec6eb880e96de;hp=69068bd684a4bf37ebec16101e169853ba4a8eb7;hb=c69c47b9fed34d518c54083abf0c9d904b59d91e;hpb=c1e744b9125a883450c2239ec55ea606c618a5c0 diff --git a/e_os.h b/e_os.h index 69068bd684..77efc6e35b 100644 --- a/e_os.h +++ b/e_os.h @@ -84,10 +84,16 @@ extern "C" { #if defined(__MWERKS__) && defined(macintosh) # if macintosh==1 -# define MAC_OS_pre_X -# define NO_SYS_TYPES_H +# ifndef MAC_OS_GUSI_SOURCE +# define MAC_OS_pre_X +# define NO_SYS_TYPES_H + typedef long ssize_t; +# endif +# define NO_SYS_PARAM_H # define NO_CHMOD # define NO_SYSLOG +# undef DEVRANDOM +# define GETPID_IS_MEANINGLESS # endif #endif @@ -102,7 +108,11 @@ extern "C" { # define MS_STATIC #endif -#if defined(WIN32) || defined(WIN16) +#if defined(_WIN32) && !defined(WIN32) && !defined(__CYGWIN32__) +# define WIN32 +#endif + +#if (defined(WIN32) || defined(WIN16)) && !defined(__CYGWIN32__) # ifndef WINDOWS # define WINDOWS # endif @@ -111,6 +121,10 @@ extern "C" { # endif #endif +#if defined(MSDOS) && !defined(GETPID_IS_MEANINGLESS) +# define GETPID_IS_MEANINGLESS +#endif + #ifdef WIN32 #define get_last_sys_error() GetLastError() #define clear_sys_error() SetLastError(0) @@ -122,13 +136,13 @@ extern "C" { #define clear_sys_error() errno=0 #endif -#ifdef WINDOWS +#if defined(WINDOWS) && !defined(__CYGWIN32__) #define get_last_socket_error() WSAGetLastError() #define clear_socket_error() WSASetLastError(0) #define readsocket(s,b,n) recv((s),(b),(n),0) #define writesocket(s,b,n) send((s),(b),(n),0) #define EADDRINUSE WSAEADDRINUSE -#elif MAC_OS_pre_X +#elif defined(MAC_OS_pre_X) #define get_last_socket_error() errno #define clear_socket_error() errno=0 #define closesocket(s) MacSocket_close(s) @@ -156,21 +170,20 @@ extern "C" { # define NO_FP_API #endif -#if defined(WINDOWS) || defined(MSDOS) - -#ifndef S_IFDIR -#define S_IFDIR _S_IFDIR -#endif +#if (defined(WINDOWS) || defined(MSDOS)) && !defined(__CYGWIN32__) -#ifndef S_IFMT -#define S_IFMT _S_IFMT +# ifndef S_IFDIR +# define S_IFDIR _S_IFDIR +# endif -#if !defined(WINNT) -#define NO_SYSLOG -#endif -#define NO_DIRENT +# ifndef S_IFMT +# define S_IFMT _S_IFMT +# endif -#endif +# if !defined(WINNT) +# define NO_SYSLOG +# endif +# define NO_DIRENT # ifdef WINDOWS # include @@ -182,29 +195,31 @@ extern "C" { # include # include -#if defined (__BORLANDC__) -#define _setmode setmode -#define _O_TEXT O_TEXT -#define _O_BINARY O_BINARY -#define _int64 __int64 -#define _kbhit kbhit -#endif +# define ssize_t long -#if defined(WIN16) && !defined(MONOLITH) && defined(SSLEAY) && defined(_WINEXITNOPERSIST) -# define EXIT(n) { if (n == 0) _wsetexit(_WINEXITNOPERSIST); return(n); } -#else -# define EXIT(n) return(n); -#endif +# if defined (__BORLANDC__) +# define _setmode setmode +# define _O_TEXT O_TEXT +# define _O_BINARY O_BINARY +# define _int64 __int64 +# define _kbhit kbhit +# endif + +# if defined(WIN16) && !defined(MONOLITH) && defined(SSLEAY) && defined(_WINEXITNOPERSIST) +# define EXIT(n) { if (n == 0) _wsetexit(_WINEXITNOPERSIST); return(n); } +# else +# define EXIT(n) return(n); +# endif # define LIST_SEPARATOR_CHAR ';' -#ifndef X_OK -# define X_OK 0 -#endif -#ifndef W_OK -# define W_OK 2 -#endif -#ifndef R_OK -# define R_OK 4 -#endif +# ifndef X_OK +# define X_OK 0 +# endif +# ifndef W_OK +# define W_OK 2 +# endif +# ifndef R_OK +# define R_OK 4 +# endif # define OPENSSL_CONF "openssl.cnf" # define SSLEAY_CONF OPENSSL_CONF # define NUL_DEV "nul" @@ -230,23 +245,54 @@ extern "C" { # define RFILE ".rnd" # define LIST_SEPARATOR_CHAR ',' # define NUL_DEV "NLA0:" - /* We need to do this, because DEC C converts exit code 0 to 1, but not 1 - to 0. We will convert 1 to 3! Also, add the inhibit message bit... */ -# ifndef MONOLITH + /* We need to do this since VMS has the following coding on status codes: + + Bits 0-2: status type: 0 = warning, 1 = success, 2 = error, 3 = info ... + The important thing to know is that odd numbers are considered + good, while even ones are considered errors. + Bits 3-15: actual status number + Bits 16-27: facility number. 0 is considered "unknown" + Bits 28-31: control bits. If bit 28 is set, the shell won't try to + output the message (which, for random codes, just looks ugly) + + So, what we do here is to change 0 to 1 to get the default success status, + and everything else is shifted up to fit into the status number field, and + the status is tagged as an error, which I believe is what is wanted here. + -- Richard Levitte + */ +# if !defined(MONOLITH) || defined(OPENSSL_C) # define EXIT(n) do { int __VMS_EXIT = n; \ - if (__VMS_EXIT == 1) __VMS_EXIT = 3; \ + if (__VMS_EXIT == 0) \ + __VMS_EXIT = 1; \ + else \ + __VMS_EXIT = (n << 3) | 2; \ __VMS_EXIT |= 0x10000000; \ - exit(n); return(n); } while(0) + exit(__VMS_EXIT); \ + return(__VMS_EXIT); } while(0) # else -# define EXIT(n) do { int __VMS_EXIT = n; \ - if (__VMS_EXIT == 1) __VMS_EXIT = 3; \ - __VMS_EXIT |= 0x10000000; \ - return(n); } while(0) +# define EXIT(n) return(n) # endif +# define NO_SYS_PARAM_H # else /* !defined VMS */ -# include OPENSSL_UNISTD -# include +# ifdef OPENSSL_UNISTD +# include OPENSSL_UNISTD +# else +# include +# endif +# ifndef NO_SYS_TYPES_H +# include +# endif +# if defined(NeXT) || defined(NEWS4) +# define pid_t int /* pid_t is missing on NEXTSTEP/OPENSTEP + * (unless when compiling with -D_POSIX_SOURCE, + * which doesn't work for us) */ +# define ssize_t int /* ditto */ +# endif +# ifdef NEWS4 /* setvbuf is missing on mips-sony-bsd */ +# define setvbuf(a, b, c, d) setbuffer((a), (b), (d)) + typedef unsigned long clock_t; +# endif # define OPENSSL_CONF "openssl.cnf" # define SSLEAY_CONF OPENSSL_CONF @@ -295,7 +341,7 @@ extern HINSTANCE _hInstance; # else -# ifndef VMS +# ifndef NO_SYS_PARAM_H # include # endif # include /* Needed under linux for FD_XXX */ @@ -321,6 +367,10 @@ extern HINSTANCE _hInstance; # include # endif +# ifdef __QNX__ +# include +# endif + # if defined(sun) # include # else @@ -349,12 +399,27 @@ extern HINSTANCE _hInstance; # endif #endif +#if defined(__ultrix) +# ifndef ssize_t +# define ssize_t int +# endif +#endif + #if defined(THREADS) || defined(sun) #ifndef _REENTRANT #define _REENTRANT #endif #endif +#if defined(sun) && !defined(__svr4__) && !defined(__SVR4) + /* bcopy can handle overlapping moves according to SunOS 4.1.4 manpage */ +# define memmove(s1,s2,n) bcopy((s2),(s1),(n)) +# define strtoul(s,e,b) ((unsigned long int)strtol((s),(e),(b))) +extern char *sys_errlist[]; extern int sys_nerr; +# define strerror(errnum) \ + (((errnum)<0 || (errnum)>=sys_nerr) ? NULL : sys_errlist[errnum]) +#endif + /***********************************************/ /* do we need to do this for getenv.