projects
/
openssl.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Remove Netware and OS/2
[openssl.git]
/
crypto
/
bio
/
bss_file.c
diff --git
a/crypto/bio/bss_file.c
b/crypto/bio/bss_file.c
index 7692ee293ce9fac9221a735e587f188ddbbc80e9..d53d52bd142838e122ac0bfd7df4a828b4adf951 100644
(file)
--- a/
crypto/bio/bss_file.c
+++ b/
crypto/bio/bss_file.c
@@
-1,4
+1,3
@@
-/* crypto/bio/bss_file.c */
/* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com)
* All rights reserved.
*
/* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com)
* All rights reserved.
*
@@
-85,14
+84,9
@@
# include <stdio.h>
# include <errno.h>
# include <stdio.h>
# include <errno.h>
-# include "internal/cryptlib.h"
# include "bio_lcl.h"
# include <openssl/err.h>
# include "bio_lcl.h"
# include <openssl/err.h>
-# if defined(OPENSSL_SYS_NETWARE) && defined(NETWARE_CLIB)
-# include <nwfileio.h>
-# endif
-
# if !defined(OPENSSL_NO_STDIO)
static int file_write(BIO *h, const char *buf, int num);
# if !defined(OPENSSL_NO_STDIO)
static int file_write(BIO *h, const char *buf, int num);
@@
-198,8
+192,8
@@
BIO *BIO_new_fp(FILE *stream, int close_flag)
if ((ret = BIO_new(BIO_s_file())) == NULL)
return (NULL);
if ((ret = BIO_new(BIO_s_file())) == NULL)
return (NULL);
- BIO_set_flags(ret, BIO_FLAGS_UPLINK); /* redundant, left for
- * documentation puposes */
+ /* redundant flag, left for documentation purposes */
+ BIO_set_flags(ret, BIO_FLAGS_UPLINK);
BIO_set_fp(ret, stream, close_flag);
return (ret);
}
BIO_set_fp(ret, stream, close_flag);
return (ret);
}
@@
-333,13
+327,6
@@
static long file_ctrl(BIO *b, int cmd, long num, void *ptr)
_setmode(fd, _O_TEXT);
else
_setmode(fd, _O_BINARY);
_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 */
# elif defined(OPENSSL_SYS_MSDOS)
int fd = fileno((FILE *)ptr);
/* Set correct text/binary mode */
@@
-353,7
+340,7
@@
static long file_ctrl(BIO *b, int cmd, long num, void *ptr)
} else
_setmode(fd, _O_BINARY);
}
} else
_setmode(fd, _O_BINARY);
}
-# elif defined(OPENSSL_SYS_
OS2) || defined(OPENSSL_SYS_
WIN32_CYGWIN)
+# elif defined(OPENSSL_SYS_WIN32_CYGWIN)
int fd = fileno((FILE *)ptr);
if (num & BIO_FP_TEXT)
setmode(fd, O_TEXT);
int fd = fileno((FILE *)ptr);
if (num & BIO_FP_TEXT)
setmode(fd, O_TEXT);
@@
-367,27
+354,21
@@
static long file_ctrl(BIO *b, int cmd, long num, void *ptr)
b->shutdown = (int)num & BIO_CLOSE;
if (num & BIO_FP_APPEND) {
if (num & BIO_FP_READ)
b->shutdown = (int)num & BIO_CLOSE;
if (num & BIO_FP_APPEND) {
if (num & BIO_FP_READ)
-
BUF
_strlcpy(p, "a+", sizeof p);
+
OPENSSL
_strlcpy(p, "a+", sizeof p);
else
else
-
BUF
_strlcpy(p, "a", sizeof p);
+
OPENSSL
_strlcpy(p, "a", sizeof p);
} else if ((num & BIO_FP_READ) && (num & BIO_FP_WRITE))
} else if ((num & BIO_FP_READ) && (num & BIO_FP_WRITE))
-
BUF
_strlcpy(p, "r+", sizeof p);
+
OPENSSL
_strlcpy(p, "r+", sizeof p);
else if (num & BIO_FP_WRITE)
else if (num & BIO_FP_WRITE)
-
BUF
_strlcpy(p, "w", sizeof p);
+
OPENSSL
_strlcpy(p, "w", sizeof p);
else if (num & BIO_FP_READ)
else if (num & BIO_FP_READ)
-
BUF
_strlcpy(p, "r", sizeof p);
+
OPENSSL
_strlcpy(p, "r", sizeof p);
else {
BIOerr(BIO_F_FILE_CTRL, BIO_R_BAD_FOPEN_MODE);
ret = 0;
break;
}
else {
BIOerr(BIO_F_FILE_CTRL, BIO_R_BAD_FOPEN_MODE);
ret = 0;
break;
}
-# if defined(OPENSSL_SYS_MSDOS) || defined(OPENSSL_SYS_WINDOWS) || defined(OPENSSL_SYS_OS2) || defined(OPENSSL_SYS_WIN32_CYGWIN)
- 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_WIN32_CYGWIN)
if (!(num & BIO_FP_TEXT))
strcat(p, "b");
else
if (!(num & BIO_FP_TEXT))
strcat(p, "b");
else