Just a little detail, so it doesn't create Watt-32 debug-files
unconditionally:
--- apps\s_socket.c.orig Sat Dec 27 16:00:40 2003
+++ apps\s_socket.c Sat Mar 27 12:56:50 2004
@@ -171,8 +171,11 @@
{
#ifdef WATT32
extern int _watt_do_exit;
- _watt_do_exit = 0;
+ char *env = getenv ("WATT32_OPTIONS");
+
+ if (env && strstr(env,"debug"))
dbug_init();
+ _watt_do_exit = 0;
if (sock_init())
return (0);
#elif defined(OPENSSL_SYS_WINDOWS)
---------------
The next patch fixes problems that's been reported many times the last
4 months; the missing 'fd' variable.
I also took the liberty to merge the #ifdef's for Windows, OS2 and
Netware into one. (OS2 has setmode == _setmode so it won't hurt).
So it looks a bit more compact:
--- c:crypto\bio\bss_file.c Wed Mar 24 12:00:10 2004
+++ crypto\bio\bss_file.c Fri Jan 2 15:29:32 2004
@@ -194,6 +194,7 @@
FILE *fp=(FILE *)b->ptr;
FILE **fpp;
char p[4];
+ int fd;
switch (cmd)
{
@@ -213,23 +214,15 @@
b->shutdown=(int)num&BIO_CLOSE;
b->ptr=(char *)ptr;
b->init=1;
- {
-#if defined(OPENSSL_SYS_WINDOWS)
- int fd = fileno((FILE*)ptr);
+ fd = fileno((FILE*)ptr);
+#if defined(OPENSSL_SYS_WINDOWS) || defined(OPENSSL_SYS_OS2) || \
+ (defined(OPENSSL_SYS_NETWARE) && defined(NETWARE_CLIB))
+ /* Under Netware's CLib there are differences in file modes */
if (num & BIO_FP_TEXT)
_setmode(fd,_O_TEXT);
else
_setmode(fd,_O_BINARY);
-#elif defined(OPENSSL_SYS_NETWARE) && defined(NETWARE_CLIB)
- int fd = fileno((FILE*)ptr);
- /* Under CLib there are differences in file modes
- */
- if (num & BIO_FP_TEXT)
- _setmode(fd,O_TEXT);
- else
- _setmode(fd,O_BINARY);
#elif defined(OPENSSL_SYS_MSDOS)
- int fd = fileno((FILE*)ptr);
/* Set correct text/binary mode */
if (num & BIO_FP_TEXT)
_setmode(fd,_O_TEXT);
@@ -244,14 +237,7 @@
else
_setmode(fd,_O_BINARY);
}
-#elif defined(OPENSSL_SYS_OS2)
- int fd = fileno((FILE*)ptr);
- if (num & BIO_FP_TEXT)
- setmode(fd, O_TEXT);
- else
- setmode(fd, O_BINARY);
#endif
- }
break;
case BIO_C_SET_FILENAME:
file_free(b);
@@ -274,13 +260,8 @@
ret=0;
break;
}
-#if defined(OPENSSL_SYS_MSDOS) || defined(OPENSSL_SYS_WINDOWS) ||
defined(OPENSSL_SYS_OS2)
- if (!(num & BIO_FP_TEXT))
- strcat(p,"b");
- else
- strcat(p,"t");
-#endif
-#if defined(OPENSSL_SYS_NETWARE)
+#if defined(OPENSSL_SYS_MSDOS) || defined(OPENSSL_SYS_WINDOWS) || \
+ defined(OPENSSL_SYS_OS2) || defined(OPENSSL_SYS_NETWARE)
if (!(num & BIO_FP_TEXT))
strcat(p,"b");
else
----------------------
Watch out for collapsed TABs.
Gisle V.
There are only 10 types of people in this world...
those who understand binary, and those who don't.
______________________________________________________________________
OpenSSL Project http://www.openssl.org
Development Mailing List [EMAIL PROTECTED]
Automated List Manager [EMAIL PROTECTED]
