Changeset 308

Timestamp:

Feb 17, 2006, 1:32:04 AM (20 years ago)

Author:

pr

Message:

Remove redundant writes/backups to CONFIG.SYS - bug 269

Location:

trunk

Files:

• include/cppbase/bs_config_impl.h (modified) (2 diffs)
• src/cppbase/bs_config.cpp (modified) (6 diffs)

trunk/include/cppbase/bs_config_impl.h

@@ -222 +222 @@
      *@@changed V0.9.0 (99-11-06) [umoeller]: renamed from ConfigSys
      *@@changed V0.9.6 (2000-10-27) [umoeller]: added _fDirty
+     *@@changed WarpIN V1.0.9 (2006-02-16) [pr]: added _pszContentOld
      */
 
@@ -231 +232 @@
         protected:
             char        *_pszContent;
+            char        *_pszContentOld;
             BOOL        _fDirty;                 // TRUE if _pszContent has changed
 

trunk/src/cppbase/bs_config.cpp

@@ -617 +617 @@
  *
  *@@changed V0.9.7 (2001-01-15) [umoeller]: now using csysLoadConfigSys
+ *@@changed WarpIN V1.0.9 (2006-02-16) [pr]: added _pszContentOld
  */
 
 BSConfigSys::BSConfigSys() : BSRoot(tBSConfigSys)
 {
-    _pszContent = NULL;
+    _pszContent = _pszContentOld = NULL;
 
     /* sprintf(_szFilename, "%c:\\config.sys", doshQueryBootDrive());
@@ -632 +633 @@
     if (arc != NO_ERROR)
         throw BSConfigExcpt(CFGEXCPT_OPEN, arc);
+    else
+        _pszContentOld = strhdup(_pszContent, NULL);
 
     _fDirty = FALSE;
@@ -642 +645 @@
  *      This does _not_ write the file. Use BSConfigSys::Flush()
  *      before deleting an instance of this.
+ *
+ *@@changed WarpIN V1.0.9 (2006-02-16) [pr]: added _pszContentOld
  */
 
@@ -648 +653 @@
     if (_pszContent)
         free(_pszContent);
+
+    if (_pszContentOld)
+        free(_pszContentOld);
 }
 
@@ -766 +774 @@
  *@@changed V0.9.3 (2000-05-12) [umoeller]: added pszBackup
  *@@changed V0.9.6 (2000-10-27) [umoeller]: added check if contents are dirty
+ *@@changed WarpIN V1.0.9 (2006-02-16) [pr]: added _pszContentOld
  */
 
@@ -774 +783 @@
     int irc = 0;
 
-    if (_fDirty)
+    // WarpIN V1.0.9 (2006-02-16) [pr]: Check for content modification @@fixes 269
+    if (   _fDirty
+        && strhcmp (_pszContent, _pszContentOld)
+       )
     {
         PSZ pszBackup = NULL;