From: Richard Levitte <levitte@openssl.org>
Date: Thu, 14 Jan 2016 13:07:57 +0000 (+0100)
Subject: Rename binmode into textmode and use it correctly
X-Git-Tag: OpenSSL_1_1_0-pre2~3
X-Git-Url: https://git.openssl.org/gitweb/?p=openssl.git;a=commitdiff_plain;h=1cd5cc368f9c907b2d184b4643ddcac2a156f628;ds=sidebyside

Rename binmode into textmode and use it correctly

Reviewed-by: Rich Salz <rsalz@openssl.org>
---

diff --git a/apps/apps.c b/apps/apps.c
index 685536a434..43a51f63ae 100644
--- a/apps/apps.c
+++ b/apps/apps.c
@@ -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)