Модификация библиотеки conffiles

[stg.git] / projects / stargazer / plugins / store / files / file_store.h

diff --git a/projects/stargazer/plugins/store/files/file_store.h b/projects/stargazer/plugins/store/files/file_store.h
index cb3abdb375c0152a9fa2e551e737ec9ecde440ab..2e55b6e3d8ef0d2561e4ba96bae191008875f00f 100644 (file)
--- a/projects/stargazer/plugins/store/files/file_store.h
+++ b/projects/stargazer/plugins/store/files/file_store.h
@@ -28,9 +28,10 @@
 #ifndef FILE_STORE_H
 #define FILE_STORE_H
 
 #ifndef FILE_STORE_H
 #define FILE_STORE_H
 

-#include <string>

 #include <sys/types.h>
 
 #include <sys/types.h>
 

+#include <string>
+

 #include "base_settings.h"
 #include "base_store.h"
 #include "conffiles.h"
 #include "base_settings.h"
 #include "base_store.h"
 #include "conffiles.h"


@@ -80,6 +81,7 @@ private:
     int     ParseGroup(const vector<PARAM_VALUE> & moduleParams, const string & group, uid_t * uid);
     int     ParseMode(const vector<PARAM_VALUE> & moduleParams, const string & modeStr, mode_t * mode);
     int     ParseYesNo(const string & value, bool * val);
     int     ParseGroup(const vector<PARAM_VALUE> & moduleParams, const string & group, uid_t * uid);
     int     ParseMode(const vector<PARAM_VALUE> & moduleParams, const string & modeStr, mode_t * mode);
     int     ParseYesNo(const string & value, bool * val);

+

     string  errorStr;
 
     string  workDir;
     string  errorStr;
 
     string  workDir;


@@ -181,8 +183,8 @@ public:
     virtual int DelService(const string &) const {return 0;};
 
     //virtual BASE_SETTINGS * GetStoreSettings();
     virtual int DelService(const string &) const {return 0;};
 
     //virtual BASE_SETTINGS * GetStoreSettings();

-    virtual void            SetSettings(const MODULE_SETTINGS & s);
-    virtual int             ParseSettings();
+    virtual void SetSettings(const MODULE_SETTINGS & s);
+    virtual int ParseSettings();

     virtual const string &  GetVersion() const;
 
 private:
     virtual const string &  GetVersion() const;
 
 private:


@@ -191,12 +193,14 @@ private:
 
     virtual int WriteLogString(const string & str, const string & login) const;
     virtual int WriteLog2String(const string & str, const string & login) const;
 
     virtual int WriteLogString(const string & str, const string & login) const;
     virtual int WriteLog2String(const string & str, const string & login) const;

-    int     RemoveDir(const char * path) const;
-    int     GetFilesList(vector<string> * filesList, const string & directory, mode_t mode, const string & ext) const;
-    mutable string          errorStr;
-    string                  version;
-    FILES_STORE_SETTINGS    storeSettings;
-    MODULE_SETTINGS         settings;
+    int RemoveDir(const char * path) const;
+    int GetFilesList(vector<string> * filesList, const string & directory, mode_t mode, const string & ext) const;
+    int Touch(const std::string & path) const;
+
+    mutable string errorStr;
+    string version;
+    FILES_STORE_SETTINGS storeSettings;
+    MODULE_SETTINGS settings;

     mutable pthread_mutex_t mutex;
 };
 //-----------------------------------------------------------------------------
     mutable pthread_mutex_t mutex;
 };
 //-----------------------------------------------------------------------------