Changeset 1639

Timestamp:

2000-11-01T08:58:25+13:00 (23 years ago)

Author:

cs025

Message:

Further fixes to get around bloopers in Visual C++; it wasn't resetting the
status flags for a stream on the reopening of a file, also had forgotten to read
the old log file when doing an additional installation.

Location:

trunk/gsinstaller

Files:

• gsinstall.cpp (modified) (1 diff)
• unInstall.cpp (modified) (5 diffs)
• unInstall.h (modified) (1 diff)

trunk/gsinstaller/gsinstall.cpp

@@ -353 +353 @@
   FilePath *logPath = new FilePath(this->destinationPath->pathString(), "install.log");
   this->setLogFile(logPath->pathString());
-  delete logPath;}
+  this->readLog();
+  delete logPath;
+}
 
 bool GSInstall::setUninstall()

trunk/gsinstaller/unInstall.cpp

@@ -5 +5 @@
 #include "File.h"
 
-bool installManager::ensureLog()
+bool installManager::logExists()
 {
     HANDLE fHandle;
@@ -13 +13 @@
                          FILE_ATTRIBUTE_NORMAL, NULL);
     if (fHandle == INVALID_HANDLE_VALUE)
-    {
-        fHandle = CreateFile(this->logfileName.c_str(), GENERIC_READ | GENERIC_WRITE,
+    {   return false;
+    }
+    CloseHandle(fHandle);
+    return true;
+}
+
+bool installManager::ensureLog()
+{
+    if (this->logExists() == false)
+    {   HANDLE fHandle;
+
+        fHandle = CreateFile(this->logfileName.c_str(), GENERIC_READ | GENERIC_WRITE,
                          FILE_SHARE_WRITE, NULL, CREATE_NEW,
                              FILE_ATTRIBUTE_NORMAL, NULL);
@@ -24 +34 @@
         return false;
     }
-    else
-    {   CloseHandle(fHandle);
-    }
     return true;
 }
@@ -40 +47 @@
     stringArray params;
 
-  // open the log file 
+    // don't try to open an non-existing log; this has serious
+    // repercussions with bad old VC++
+    if (!this->logExists())
+    {   this->setModule("default");
+        this->changed = false;
+        return true;
+    }
+
+    // open the log file 
     this->logfile.open(this->logfileName.c_str(), ios::in);
-
-    // Get the commands into this object from the existing log file
-    while ((command = this->readCommand(params)) != "")
-    {   if (command[0] == '[' && command[command.length()-1] == ']')
-        { this->setModule(command.substr(1, command.length() - 2));
+    if (this->logfile.is_open())
+    {
+        // Get the commands into this object from the existing log file
+        while ((command = this->readCommand(params)) != "")
+        {   if (command[0] == '[' && command[command.length()-1] == ']')
+            { this->setModule(command.substr(1, command.length() - 2));
+            }
+            else
+            {   unInstallCommand action(command, params);
+                this->storeCommand(action);
+            }
         }
-        else
-        {   unInstallCommand action(command, params);
-            this->storeCommand(action);
-        }
+
+        // close the logfile
+        this->logfile.close();
+
+        // and clear the status bits, 'cos VC++ doesn't clear them when
+        // we reopen the file later.
+        this->logfile.clear();
     }
     this->changed = false;
-
-    // close the logfile
-    this->logfile.close();
   
   // set to the default module
@@ -216 +237 @@
     this->ensureLog();
     this->logfile.open(this->logfileName.c_str(), ios::out);
-    
+    if (!this->logfile.is_open())
+    {   MessageBox(0, "Unable to open log file", "Test", MB_OK);
+    }
+
     unInstallCommandMap::iterator here = this->modules.begin();
     unInstallCommandMap::iterator end  = this->modules.end();

trunk/gsinstaller/unInstall.h

@@ -65 +65 @@
 public:
   installManager() { this->changed = false; }
+  bool logExists();
   bool setLogFile(string filename);
   bool ensureLog();