Исправлена старая ошибка с "перепутыванием" полей userdata

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

diff --git a/projects/stargazer/plugins/store/files/file_store.cpp b/projects/stargazer/plugins/store/files/file_store.cpp
index b926eb6a1ad64208c3a054bb71e6a7bcc1b28f08..c147935dca519308d240ae3040c89cbc236a0693 100644 (file)
--- a/projects/stargazer/plugins/store/files/file_store.cpp
+++ b/projects/stargazer/plugins/store/files/file_store.cpp
@@ -30,7 +30,6 @@
 
 #include <pwd.h>
 #include <grp.h>
 
 #include <pwd.h>
 #include <grp.h>

-#include <sys/types.h>

 #include <sys/stat.h>
 #include <unistd.h>
 #include <sys/time.h>
 #include <sys/stat.h>
 #include <unistd.h>
 #include <sys/time.h>


@@ -60,6 +59,8 @@
 
 using namespace std;
 
 
 using namespace std;
 

+int GetFileList(vector<string> * fileList, const string & directory, mode_t mode, const string & ext);
+

 const int pt_mega = 1024 * 1024;
 //-----------------------------------------------------------------------------
 class BAK_FILE
 const int pt_mega = 1024 * 1024;
 //-----------------------------------------------------------------------------
 class BAK_FILE


@@ -504,79 +505,69 @@ const string & FILES_STORE::GetVersion() const
 return version;
 }
 //-----------------------------------------------------------------------------
 return version;
 }
 //-----------------------------------------------------------------------------

-int FILES_STORE::GetFilesList(vector<string> * filesList, const string & directory, mode_t mode, const string & ext) const
+int FILES_STORE::GetUsersList(vector<string> * userList) const

 {
 {

-// æÕÎËÃÉÑ ÐÒÏÓÍÁÔÒÉ×ÁÅÔ ÓÏÄÅÒÖÉÍÏÅ ÄÉÒÅËÔÏÒÉÉ
-DIR * d;
-string str;
-struct stat st;
-dirent * dir;
+vector<string> files;

 
 

-filesList->clear();
-
-d = opendir(directory.c_str());
-
-if (!d)
+if (GetFileList(&files, storeSettings.GetUsersDir(), S_IFDIR, ""))

     {
     STG_LOCKER lock(&mutex, __FILE__, __LINE__);
     {
     STG_LOCKER lock(&mutex, __FILE__, __LINE__);

-    errorStr = "Directory \'" + directory + "\' cannot be opened.";
-    //printfd(__FILE__, "%s\n", errorStr.c_str());
+    errorStr = "Failed to open '" + storeSettings.GetUsersDir() + "': " + string(strerror(errno));

     return -1;
     }
 
     return -1;
     }
 

-int d_nameLen;
-int extLen = ext.size() ;
-while ((dir = readdir(d)))
-    {
-    if (strcmp(dir->d_name, ".") && strcmp(dir->d_name, ".."))
-        {
-        str = directory + "/" + string(dir->d_name);
-        if (!stat(str.c_str(), &st))
-            {
-            if (st.st_mode & mode) // ïÔÓÅ× ÆÁÊÌÏ× or directories
-                {
-                d_nameLen = strlen(dir->d_name);
-                if (d_nameLen > extLen)
-                    {
-                    if (strcmp(dir->d_name + (d_nameLen - extLen), ext.c_str()) == 0)
-                        {
-                        dir->d_name[d_nameLen - extLen] = 0;
-                        filesList->push_back(dir->d_name);
-                        }
-                    }
-                }
-            }
-        }
-    }
+STG_LOCKER lock(&mutex, __FILE__, __LINE__);
+
+userList->swap(files);

 
 

-closedir(d);

 return 0;
 }
 //-----------------------------------------------------------------------------
 return 0;
 }
 //-----------------------------------------------------------------------------

-int FILES_STORE::GetUsersList(vector<string> * usersList) const
+int FILES_STORE::GetAdminsList(vector<string> * adminList) const

 {
 {

-return GetFilesList(usersList, storeSettings.GetUsersDir(), S_IFDIR, "");
-}
-//-----------------------------------------------------------------------------
-int FILES_STORE::GetAdminsList(vector<string> * adminsList) const
-{
-return GetFilesList(adminsList, storeSettings.GetAdminsDir(), S_IFREG, ".adm");
+vector<string> files;
+
+if (GetFileList(&files, storeSettings.GetAdminsDir(), S_IFREG, ".adm"))
+    {
+    STG_LOCKER lock(&mutex, __FILE__, __LINE__);
+    errorStr = "Failed to open '" + storeSettings.GetAdminsDir() + "': " + string(strerror(errno));
+    return -1;
+    }
+
+STG_LOCKER lock(&mutex, __FILE__, __LINE__);
+
+adminList->swap(files);
+
+return 0;

 }
 //-----------------------------------------------------------------------------
 }
 //-----------------------------------------------------------------------------

-int FILES_STORE::GetTariffsList(vector<string> * tariffsList) const
+int FILES_STORE::GetTariffsList(vector<string> * tariffList) const

 {
 {

-return GetFilesList(tariffsList, storeSettings.GetTariffsDir(), S_IFREG, ".tf");
+vector<string> files;
+
+if (GetFileList(&files, storeSettings.GetTariffsDir(), S_IFREG, ".tf"))
+    {
+    STG_LOCKER lock(&mutex, __FILE__, __LINE__);
+    errorStr = "Failed to open '" + storeSettings.GetTariffsDir() + "': " + string(strerror(errno));
+    return -1;
+    }
+
+STG_LOCKER lock(&mutex, __FILE__, __LINE__);
+
+tariffList->swap(files);
+
+return 0;

 }
 //-----------------------------------------------------------------------------
 int FILES_STORE::RemoveDir(const char * path) const
 {
 }
 //-----------------------------------------------------------------------------
 int FILES_STORE::RemoveDir(const char * path) const
 {

-vector<string> filesList;
+vector<string> fileList;

 
 

-GetFilesList(&filesList, path, S_IFREG, "");
+GetFileList(&fileList, path, S_IFREG, "");

 
 

-for (unsigned i = 0; i < filesList.size(); i++)
+for (unsigned i = 0; i < fileList.size(); i++)

     {
     {

-    string file = path + string("/") + filesList[i];
+    string file = path + string("/") + fileList[i];

     if (unlink(file.c_str()))
         {
         STG_LOCKER lock(&mutex, __FILE__, __LINE__);
     if (unlink(file.c_str()))
         {
         STG_LOCKER lock(&mutex, __FILE__, __LINE__);


@@ -588,11 +579,12 @@ for (unsigned i = 0; i < filesList.size(); i++)
         }
     }
 
         }
     }
 

-GetFilesList(&filesList, path, S_IFDIR, "");
+fileList.clear();
+GetFileList(&fileList, path, S_IFDIR, "");

 
 

-for (unsigned i = 0; i < filesList.size(); i++)
+for (unsigned i = 0; i < fileList.size(); i++)

     {
     {

-    string dir = string(path) + "/" + filesList[i];
+    string dir = string(path) + "/" + fileList[i];

     RemoveDir(dir.c_str());
     }
 
     RemoveDir(dir.c_str());
     }
 


@@ -1985,6 +1977,7 @@ if (!res)
     STG_LOCKER lock(&mutex, __FILE__, __LINE__);
     errorStr = string("fprintf failed. Message: '") + strerror(errno) + "'";
     printfd(__FILE__, "FILES_STORE::EditMessage - fprintf failed. Message: '%s'\n", strerror(errno));
     STG_LOCKER lock(&mutex, __FILE__, __LINE__);
     errorStr = string("fprintf failed. Message: '") + strerror(errno) + "'";
     printfd(__FILE__, "FILES_STORE::EditMessage - fprintf failed. Message: '%s'\n", strerror(errno));

+    fclose(msgFile);

     return -1;
     }
 
     return -1;
     }
 


@@ -2021,13 +2014,18 @@ return unlink(fn.c_str());
 //-----------------------------------------------------------------------------
 int FILES_STORE::GetMessageHdrs(vector<STG_MSG_HDR> * hdrsList, const string & login) const
 {
 //-----------------------------------------------------------------------------
 int FILES_STORE::GetMessageHdrs(vector<STG_MSG_HDR> * hdrsList, const string & login) const
 {

-vector<string> messages;
-string dn;
-dn = storeSettings.GetUsersDir() + "/" + login + "/messages/";
-GetFilesList(&messages, dn, S_IFREG, "");
+string dn(storeSettings.GetUsersDir() + "/" + login + "/messages/");

 
 //hdrsList->resize(messages.size());
 
 
 //hdrsList->resize(messages.size());
 

+if (access(dn.c_str(), F_OK) != 0)
+    {
+    return 0;
+    }
+
+vector<string> messages;
+GetFileList(&messages, dn, S_IFREG, "");
+

 for (unsigned i = 0; i < messages.size(); i++)
     {
     unsigned long long id = 0;
 for (unsigned i = 0; i < messages.size(); i++)
     {
     unsigned long long id = 0;


@@ -2169,3 +2167,54 @@ if (f)
 return -1;
 }
 //-----------------------------------------------------------------------------
 return -1;
 }
 //-----------------------------------------------------------------------------

+int GetFileList(vector<string> * fileList, const string & directory, mode_t mode, const string & ext)
+{
+// æÕÎËÃÉÑ ÐÒÏÓÍÁÔÒÉ×ÁÅÔ ÓÏÄÅÒÖÉÍÏÅ ÄÉÒÅËÔÏÒÉÉ
+
+DIR * d = opendir(directory.c_str());
+
+if (!d)
+    {
+    printfd(__FILE__, "GetFileList - Failed to open dir '%s': '%s'\n", directory.c_str(), strerror(errno));
+    return -1;
+    }
+
+dirent * entry;
+while ((entry = readdir(d)))
+    {
+    if (!(strcmp(entry->d_name, ".") && strcmp(entry->d_name, "..")))
+        continue;
+
+    string str = directory + "/" + string(entry->d_name);
+
+    struct stat st;
+    if (stat(str.c_str(), &st))
+        continue;
+
+    if (!(st.st_mode & mode)) // Filter by mode
+        continue;
+
+    if (!ext.empty())
+        {
+        // Check extension
+        size_t d_nameLen = strlen(entry->d_name);
+        if (d_nameLen <= ext.size())
+            continue;
+
+        if (ext == entry->d_name + (d_nameLen - ext.size()))
+            {
+            entry->d_name[d_nameLen - ext.size()] = 0;
+            fileList->push_back(entry->d_name);
+            }
+        }
+    else
+        {
+        fileList->push_back(entry->d_name);
+        }
+    }
+
+closedir(d);
+
+return 0;
+}
+//-----------------------------------------------------------------------------