Change all bare std::ofstream/ifstream to OIIO::ofstream/ifstream (#1188)

Because they are UTF-8 safe and work properly on MinGW.

Simplified a bit more as I went -- some reading idioms could be
replaced by a single call to Filesystem::read_text_file, some close()
calls were redundant because streams close upon destruction / scope
exit, some open flags unnecessary because the default write mode
already will truncate an existing file.

Signed-off-by: Larry Gritz <[email protected]>

Author: lgritz

src/liboslcomp/oslcomp.cpp

@@ -159,7 +159,7 @@ OSLCompilerImpl::preprocess_file (const std::string &filename,
                                   std::string &result)
 {
     // Read file contents into a string
-    std::ifstream instream;
+    OIIO::ifstream instream;
     OIIO::Filesystem::open(instream, filename);
     if (! instream.is_open()) {
         error (ustring(filename), 0, "Could not open \"%s\"\n", filename.c_str());
@@ -599,7 +599,7 @@ OSLCompilerImpl::compile (string_view filename,
             if (m_output_filename.size() == 0)
                 m_output_filename = default_output_filename ();
 
-            std::ofstream oso_output;
+            OIIO::ofstream oso_output;
             OIIO::Filesystem::open (oso_output, m_output_filename);
             if (! oso_output.good()) {
                 error (ustring(), 0, "Could not open \"%s\"",

src/liboslexec/llvm_instance.cpp

@@ -1224,8 +1224,9 @@ BackendLLVM::run ()
         if (safegroup.size() > 235)
             safegroup = Strutil::format ("TRUNC_%s_%d", safegroup.substr(safegroup.size()-235), group().id());
         std::string name = Strutil::format ("%s.ll", safegroup);
-        std::ofstream out (name, std::ios_base::out | std::ios_base::trunc);
-        if (out.good()) {
+        OIIO::ofstream out;
+        OIIO::Filesystem::open(out, name);
+        if (out) {
             out << ll.bitcode_string (ll.module());
         } else {
             shadingcontext()->error ("Could not write to '%s'", name);
@@ -1253,8 +1254,9 @@ BackendLLVM::run ()
         if (safegroup.size() > 235)
             safegroup = Strutil::format ("TRUNC_%s_%d", safegroup.substr(safegroup.size()-235), group().id());
         std::string name = Strutil::format ("%s_opt.ll", safegroup);
-        std::ofstream out (name, std::ios_base::out | std::ios_base::trunc);
-        if (out.good()) {
+        OIIO::ofstream out;
+        OIIO::Filesystem::open(out, name);
+        if (out) {
             out << ll.bitcode_string (ll.module());
         } else {
             shadingcontext()->error ("Could not write to '%s'", name);

src/liboslexec/shadingsys.cpp

@@ -3108,7 +3108,7 @@ ShadingSystemImpl::archive_shadergroup (ShaderGroup *group, string_view filename
 
     bool ok = true;
     std::string groupfilename = tmpdir + "/shadergroup";
-    std::ofstream groupfile;
+    OIIO::ofstream groupfile;
     OIIO::Filesystem::open(groupfile, groupfilename);
     if (groupfile.good()) {
         groupfile << group->serialize();

src/oslc/oslcmain.cpp

@@ -183,12 +183,11 @@ main (int argc, const char *argv[])
             ok = compiler.compile_buffer (sourcecode, osobuffer, args, "",
                                           shader_path);
         if (ok) {
-            std::ofstream file;
+            OIIO::ofstream file;
             OIIO::Filesystem::open (file, compiler.output_filename());
-            if (file.good()) {
+            if (file)
                 file << osobuffer;
-                file.close ();
-            }
+            ok = file.good();
         }
     } else {
         // Ordinary compile from file

src/osltoy/osltoyapp.cpp

@@ -731,12 +731,10 @@ OSLToyMainWindow::action_save ()
     }
     std::string text = texteditor->text_string();
 
-    std::ofstream out (filename, std::ios_base::out | std::ios_base::trunc);
-    if (out.good()) {
+    OIIO::ofstream out;
+    OIIO::Filesystem::open (out, filename);
+    if (out)
         out << text;
-        out.close ();
-    }
-
     if (out.fail()) {
         std::string msg = OIIO::Strutil::format ("Could not write %s", filename);
         QErrorMessage err (nullptr);

src/testshade/testshade.cpp

@@ -141,24 +141,6 @@ set_shadingsys_options ()
 
 
 
-/// Read the entire contents of the named file and place it in str,
-/// returning true on success, false on failure.
-inline bool
-read_text_file (string_view filename, std::string &str)
-{
-    std::ifstream in (filename.c_str(), std::ios::in | std::ios::binary);
-    if (in) {
-        std::ostringstream contents;
-        contents << in.rdbuf();
-        in.close ();
-        str = contents.str();
-        return true;
-    }
-    return false;
-}
-
-
-
 static void
 compile_buffer (const std::string &sourcecode,
                 const std::string &shadername)
@@ -190,7 +172,7 @@ shader_from_buffers (std::string shadername)
     if (! OIIO::Strutil::ends_with (oslfilename, ".osl"))
         oslfilename += ".osl";
     std::string sourcecode;
-    if (! read_text_file (oslfilename, sourcecode)) {
+    if (! OIIO::Filesystem::read_text_file (oslfilename, sourcecode)) {
         std::cerr << "Could not open \"" << oslfilename << "\"\n";
         exit (EXIT_FAILURE);
     }