AMajor/SoftEtherVPN
1
0
Fork 0
mirror of https://github.com/SoftEtherVPN/SoftEtherVPN.git synced 2025-07-07 00:04:57 +03:00
Code Releases Activity

separte log directory and database(config) directory

Browse Source 
@ was an alias for exedir. To separate log directory and
database(config) directory, @ is now an alias for logdir and $ is an
alias for dbdir.
This commit is contained in:
Koichiro IWAO
2019-09-11 13:34:09 +09:00
parent 01abdedc45
commit c64674479d
10 changed files with 37 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/Mayaqua/Cfg.c
View File

@ -33,12 +33,12 @@ void BackupCfgWEx(CFG_RW *rw, FOLDER *f, wchar_t *original, UINT revision_number
}
// Determine the directory name
UniFormat(dirname, sizeof(dirname), L"@backup.%s", original[0] == L'@' ? original + 1 : original);
UniFormat(dirname, sizeof(dirname), L"$backup.%s", original[0] == L'$' ? original + 1 : original);
// Determine the file name
LocalTime(&st);
UniFormat(datestr, sizeof(datestr), L"%04u%02u%02u%02u_%s",
st.wYear, st.wMonth, st.wDay, st.wHour, original[0] == L'@' ? original + 1 : original);
st.wYear, st.wMonth, st.wDay, st.wHour, original[0] == L'$' ? original + 1 : original);
if (revision_number == INFINITE)
{
@ -47,7 +47,7 @@ void BackupCfgWEx(CFG_RW *rw, FOLDER *f, wchar_t *original, UINT revision_number
else
{
UniFormat(filename, sizeof(filename), L"%08u_%s",
revision_number, original[0] == L'@' ? original + 1 : original);
revision_number, original[0] == L'$' ? original + 1 : original);
}
// Don't save if the date and time has not been changed

2
src/Mayaqua/Cfg.h
View File

@ -11,7 +11,7 @@
// Macro
//#define CHECK_CFG_NAME_EXISTS // Check duplication of the existing name
#define SAVE_BINARY_FILE_NAME_SWITCH L"@save_binary"
#define SAVE_BINARY_FILE_NAME_SWITCH L"$save_binary"
// Constants
#define TAG_DECLARE "declare"

16
src/Mayaqua/FileIO.c
View File

@ -2122,15 +2122,21 @@ void InnerFilePathW(wchar_t *dst, UINT size, wchar_t *src)
return;
}
if (src[0] != L'@')
if (src[0] == L'@')
{
NormalizePathW(dst, size, src);
wchar_t dir[MAX_SIZE];
GetLogDirW(dir, sizeof(dir));
ConbinePathW(dst, size, dir, &src[1]);
}
else if (src[0] == L'$')
{
wchar_t dir[MAX_SIZE];
GetDbDirW(dir, sizeof(dir));
ConbinePathW(dst, size, dir, &src[1]);
}
else
{
wchar_t dir[MAX_SIZE];
GetExeDirW(dir, sizeof(dir));
ConbinePathW(dst, size, dir, &src[1]);
NormalizePathW(dst, size, src);
}
}
void InnerFilePath(char *dst, UINT size, char *src)

2
src/Mayaqua/Network.h
View File

@ -54,7 +54,7 @@ struct DYN_VALUE
#define SSL_LOGGING_DIRNAME "@ssl_log"
// Private IP list file
#define PRIVATE_IP_TXT_FILENAME "@private_ip.txt"
#define PRIVATE_IP_TXT_FILENAME "$private_ip.txt"
// Start range of the random UDP port
#define RAND_UDP_PORT_START 5000

2
src/Mayaqua/Table.h
View File

@ -13,7 +13,7 @@
#define LANGLIST_FILENAME "|languages.txt"
#define LANGLIST_FILENAME_WINE "|languages_wine.txt"
#define LANG_CONFIG_FILENAME L"@lang.config"
#define LANG_CONFIG_FILENAME L"$lang.config"
#define LANG_CONFIG_TEMPLETE "|lang.config"
// Language constant