В класс CONFIGFILE добавлена поддержка отказа от записи

diff --git a/stglibs/conffiles.lib/conffiles.cpp b/stglibs/conffiles.lib/conffiles.cpp
index cf7dffee4371c0ee39a88822a46e4628da9fcd6b..6b462ee05b4731e57672c0e38d451c83bfe780d5 100644 (file)
--- a/stglibs/conffiles.lib/conffiles.cpp
+++ b/stglibs/conffiles.lib/conffiles.cpp
@@ -53,7 +53,8 @@ return (strcasecmp(str1.c_str(), str2.c_str()) < 0);
 CONFIGFILE::CONFIGFILE(const string & fn, bool nook)
     : param_val(StringCaseCmp),
       fileName(fn),
-      error(0)
+      error(0),
+      changed(false)
 {
 ifstream f(fileName.c_str());
 
@@ -141,6 +142,7 @@ return -1;
 void CONFIGFILE::WriteString(const string & param, const string &val)
 {
 param_val[param] = val;
+changed = true;
 }
 //---------------------------------------------------------------------------
 int CONFIGFILE::ReadTime(const string & param, time_t * val, time_t defaultVal) const
@@ -344,6 +346,7 @@ void CONFIGFILE::WriteInt(const string & param, int64_t val)
 string s;
 x2str(val, s);
 param_val[param] = s;
+changed = true;
 }
 //---------------------------------------------------------------------------
 int CONFIGFILE::ReadDouble(const string & param, double * val, double defaultVal) const
@@ -373,6 +376,7 @@ void CONFIGFILE::WriteDouble(const string & param, double val)
 char s[30];
 snprintf(s, 30, "%f", val);
 param_val[param] = s;
+changed = true;
 }
 //---------------------------------------------------------------------------
 int CONFIGFILE::Flush(const std::string & path) const
@@ -397,6 +401,9 @@ return 0;
 //---------------------------------------------------------------------------
 int CONFIGFILE::Flush() const
 {
+if (!changed)
+    return 0;
+
 std::string pid;
 x2str(getpid(), pid);
 
@@ -406,6 +413,8 @@ if (Flush(fileName + "." + pid))
 if (rename((fileName + "." + pid).c_str(), fileName.c_str()))
     return -1;
 
+changed = false;
+
 return 0;
 }
 //---------------------------------------------------------------------------

diff --git a/stglibs/conffiles.lib/conffiles.h b/stglibs/conffiles.lib/conffiles.h
index 77a696d02d8d66e9f47f9317ddc5f1e1ad271132..ae2c8fd023d29eb61d535c1460c9cbe101f65d1a 100644 (file)
--- a/stglibs/conffiles.lib/conffiles.h
+++ b/stglibs/conffiles.lib/conffiles.h
@@ -76,6 +76,7 @@ private:
     map<string, string, StringCaseCmp_t> param_val;
     string fileName;
     mutable int error;
+    mutable bool changed;
 
     int Flush(const std::string & path) const;
 };