From c2d8cf50dae3e352053db2d75060ae8e6a026ab6 Mon Sep 17 00:00:00 2001
From: Boris Kolpackov <boris@codesynthesis.com>
Date: Mon, 12 Aug 2019 16:36:38 +0200
Subject: Apply previous fix to fdstream::open()

---
 libbutl/fdstream.cxx | 44 ++++++++++++++++++++++++--------------------
 1 file changed, 24 insertions(+), 20 deletions(-)

(limited to 'libbutl/fdstream.cxx')

diff --git a/libbutl/fdstream.cxx b/libbutl/fdstream.cxx
index 7d1e755..50056a2 100644
--- a/libbutl/fdstream.cxx
+++ b/libbutl/fdstream.cxx
@@ -791,15 +791,14 @@ namespace butl
 
   ifdstream::
   ifdstream (const char* f, fdopen_mode m, iostate e)
-      : ifdstream (
-          fdopen (f,
-                  // If fdopen_mode::in is not specified, then emulate the
-                  // ios::in semantics.
-                  //
-                  (m & fdopen_mode::in) == fdopen_mode::in
-                  ? m
-                  : m | translate_mode (in)),
-          e)
+      : ifdstream (fdopen (f,
+                           // If fdopen_mode::in is not specified, then
+                           // emulate the ios::in semantics.
+                           //
+                           (m & fdopen_mode::in) == fdopen_mode::in
+                           ? m
+                           : m | translate_mode (in)),
+                   e)
   {
   }
 
@@ -841,7 +840,10 @@ namespace butl
   void ifdstream::
   open (const char* f, fdopen_mode m)
   {
-    open (fdopen (f, m | fdopen_mode::in));
+    open (fdopen (f,
+                  (m & fdopen_mode::in) == fdopen_mode::in
+                  ? m
+                  : m | translate_mode (in)));
   }
 
   void ifdstream::
@@ -900,15 +902,14 @@ namespace butl
 
   ofdstream::
   ofdstream (const char* f, fdopen_mode m, iostate e)
-      : ofdstream (
-          fdopen (f,
-                  // If fdopen_mode::out is not specified, then emulate the
-                  // ios::out semantics.
-                  //
-                  (m & fdopen_mode::out) == fdopen_mode::out
-                  ? m
-                  : m | translate_mode (out)),
-          e)
+      : ofdstream (fdopen (f,
+                           // If fdopen_mode::out is not specified, then
+                           // emulate the ios::out semantics.
+                           //
+                           (m & fdopen_mode::out) == fdopen_mode::out
+                           ? m
+                           : m | translate_mode (out)),
+                   e)
   {
   }
 
@@ -939,7 +940,10 @@ namespace butl
   void ofdstream::
   open (const char* f, fdopen_mode m)
   {
-    open (fdopen (f, m | fdopen_mode::out));
+    open (fdopen (f,
+                  (m & fdopen_mode::out) == fdopen_mode::out
+                  ? m
+                  : m | translate_mode (out)));
   }
 
   // fd*() functions
-- 
cgit v1.1