Changeset 527 for CMT/HEAD/source/cmt_generators.cxx

Timestamp:

Nov 20, 2009, 10:45:54 AM (15 years ago)

Author:

rybkin

Message:

See C.L. 414

File:

• CMT/HEAD/source/cmt_generators.cxx (modified) (10 diffs)

CMT/HEAD/source/cmt_generators.cxx

@@ -10 +10 @@
 #include "cmt_symbol.h"
 #include "cmt_log.h"
+#include "cmt_error.h"
 #include <assert.h>
 
@@ -1324 +1325 @@
       terminate ();
     }
+  else
+    {
+      CmtError::set (CmtError::file_access_error, m_output_file_name);
+    }
 }
 
@@ -1557 +1562 @@
                   */
                   s.write (file);
-                  fclose (file);
+                  CmtSystem::close_ostream (file, backup);
+                  //  fclose (file);
 
                   need_makefile = true;
                 }
+              else
+                {
+                  CmtError::set (CmtError::file_access_error, backup);
+                }
             }
         }
@@ -1570 +1580 @@
       if (file != NULL)
         {
-          fprintf (file, "include $(CMTROOT)/src/Makefile.header\n");
-          fprintf (file, "\n");
-          fprintf (file, "include $(CMTROOT)/src/constituents.make\n");
-          fprintf (file, "\n");
-          fclose (file);
-        }
+          fprintf (file,
+                   "include $(CMTROOT)/src/Makefile.header\n"
+                   "\n"
+                   "include $(CMTROOT)/src/constituents.make\n"
+                   "\n");
+          CmtSystem::close_ostream (file, makefile);
+          //          fclose (file);
+        }
+      else
+        {
+          CmtError::set (CmtError::file_access_error, makefile);
+        }
     }
 
@@ -1594 +1610 @@
       if (file != NULL)
         {
-          fprintf (file, "!include $(CMTROOT)\\src\\NMakefile.header\n");
-          fprintf (file, "\n");
-          fprintf (file, "!include $(CMTROOT)\\src\\constituents.nmake\n");
-          fprintf (file, "\n");
-          fclose (file);
-        }
+          fprintf (file,
+                   "!include $(CMTROOT)\\src\\NMakefile.header\n"
+                   "\n"
+                   "!include $(CMTROOT)\\src\\constituents.nmake\n"
+                   "\n");
+          CmtSystem::close_ostream (file, makefile);
+          //          fclose (file);
+        }
+      else
+        {
+          CmtError::set (CmtError::file_access_error, makefile);
+        }
     }
 
@@ -1747 +1769 @@
       terminate ();
     }
+  else
+    {
+      CmtError::set (CmtError::file_access_error, m_output_file_name);
+    }
 
   m_output_file_name = msdevdir + "all.dspnew";
@@ -1755 +1781 @@
       dsp_all_fragment.wincopy (m_output_file, 1, &m_PACKAGE);
       terminate ();
+    }
+  else
+    {
+      CmtError::set (CmtError::file_access_error, m_output_file_name);
     }
 
@@ -2429 +2459 @@
       make_setup_fragment.copy (m_output_file, 1, &m_PACKAGE);
 
-      fclose (m_output_file);
+      CmtSystem::close_ostream (m_output_file, new_file_name);
+      //  fclose (m_output_file);
 
       //--- Complete the operation --------------
 
       commit (new_file_name);
+    }
+  else
+    {
+      CmtError::set (CmtError::file_access_error, new_file_name);
     }
 
@@ -2637 +2672 @@
       constituents_trailer_fragment.copy (m_output_file, 0);
 
-      fclose (m_output_file);
+      CmtSystem::close_ostream (m_output_file, new_file_name);
+      //  fclose (m_output_file);
 
       commit (new_file_name);
+    }
+  else
+    {
+      CmtError::set (CmtError::file_access_error, new_file_name);
     }
 }
@@ -2967 +3007 @@
   FILE* f = fopen (m_output_file_name.c_str (), "wb");
 
-  if (f == 0)
-    {
-      CmtMessage::error ("Cannot open " + m_output_file_name + " for write");
-      //      cerr << "Cannot open " << m_output_file_name << " for write" << endl;
+  if (f != 0)
+    {
+      dependencies.write (f);
+      CmtSystem::close_ostream (f, m_output_file_name);
+      //          fclose (f);
     }
   else
     {
-      dependencies.write (f);
-      fclose (f);
+      CmtError::set (CmtError::file_access_error, m_output_file_name);
+      //      CmtMessage::error ("Cannot open " + m_output_file_name + " for write");
     }