Rename binmode into textmode and use it correctly

Reviewed-by: Rich Salz <rsalz@openssl.org>
This commit is contained in:
Richard Levitte 2016-01-14 14:07:57 +01:00
parent 9b56815d5f
commit 1cd5cc368f

View File

@ -2796,7 +2796,7 @@ BIO *bio_open_owner(const char *filename, int format, int private)
{
FILE *fp = NULL;
BIO *b = NULL;
int fd = -1, bflags, mode, binmode;
int fd = -1, bflags, mode, textmode;
if (!private || filename == NULL || strcmp(filename, "-") == 0)
return bio_open_default(filename, 'w', format);
@ -2808,8 +2808,8 @@ BIO *bio_open_owner(const char *filename, int format, int private)
#ifdef O_TRUNC
mode |= O_TRUNC;
#endif
binmode = istext(format);
if (binmode) {
textmode = istext(format);
if (!textmode) {
#ifdef O_BINARY
mode |= O_BINARY;
#elif defined(_O_BINARY)
@ -2824,7 +2824,7 @@ BIO *bio_open_owner(const char *filename, int format, int private)
if (fp == NULL)
goto err;
bflags = BIO_CLOSE;
if (!binmode)
if (textmode)
bflags |= BIO_FP_TEXT;
b = BIO_new_fp(fp, bflags);
if (b)