Skip to content

Fix log move to appdata #40

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
christywear wants to merge 11 commits into
base: dev
Choose a base branch
from
Open

Fix log move to appdata #40

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
a63aa58
fix for globals missing
Dec 16, 2019
fd16d31
raws and graws
Dec 18, 2019
0fbc205
added abjure fix
Dec 18, 2019
d0fec5d
added abjure fix
Dec 18, 2019
a8e91ae
abjure_ref__raw_fix__globals_fix
Dec 18, 2019
ec704ab
abjure/raw/globals_fix
Dec 18, 2019
01c5199
abjure fix for reflect, updated, with rawr, globals.json missing but …
Dec 22, 2019
71581d1
I give abjure failed
Dec 22, 2019
4adfbcf
abjure opposit day fix!
Dec 22, 2019
bc008ab
modified: AgentSvc/AgentSvc.h
Jan 27, 2020
abd317c
first attempt moving logs to user appdata underlight
Jan 27, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Empty file modified AgentSvc/AgentSvc.h
100755 → 100644
View file
Open in desktop
Empty file.
40 changes: 29 additions & 11 deletions Underlight/cOutput.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,10 @@
#include "Utils.h"
#include "resource.h"
#include <time.h>
#include <shlwapi.h>
#pragma comment(lib,"shlwapi.lib")
#include "shlobj.h"
#include "tchar.h"

// define the following to enable buffering on debug output
#define BUFFER_DEBUG_OUT
Expand All @@ -23,15 +27,21 @@ extern HINSTANCE hInstance;

cOutput::cOutput(TCHAR *fn, bool append_to_file, bool fForceFlush /*= false */)
{

append = append_to_file;
m_fForceFlush = fForceFlush;
_tcscpy(filename, fn);
_tcscat(filename, _T(".out"));

if (SUCCEEDED(SHGetFolderPath(NULL, CSIDL_APPDATA, NULL, 0, szPath)))
{
PathAppend(szPath, _T("\\Underlight\\"));
CreateDirectory(szPath, NULL);
PathAppend(szPath, filename);
}
// check file size; rename if necessary
HANDLE hFile;
BY_HANDLE_FILE_INFORMATION info;
hFile = CreateFile(filename, GENERIC_READ, FILE_SHARE_WRITE, NULL, OPEN_ALWAYS, FILE_ATTRIBUTE_NORMAL, NULL);
hFile = CreateFile(szPath, GENERIC_READ , FILE_SHARE_WRITE, NULL, OPEN_ALWAYS, FILE_ATTRIBUTE_NORMAL, NULL);

if (INVALID_HANDLE_VALUE == hFile)
{
Expand All @@ -48,12 +58,20 @@ cOutput::cOutput(TCHAR *fn, bool append_to_file, bool fForceFlush /*= false */)
SYSTEMTIME dsttime;
GetDSTTime(&dsttime);
TCHAR backup_filename[_MAX_DIR];

if (SUCCEEDED(SHGetFolderPath(NULL, CSIDL_APPDATA, NULL, 0, szPath_backup)))
{
PathAppend(szPath, _T("\\Underlight\\"));
CreateDirectory(szPath, NULL);
PathAppend(szPath, backup_filename);
}
LoadString(hInstance, IDS_BACKUP_LOG, message, sizeof(message));
_stprintf(backup_filename, message, fn, dsttime.wMonth, dsttime.wDay, dsttime.wYear);
int result = rename(filename, backup_filename);
_stprintf(szPath_backup, message, fn, dsttime.wMonth, dsttime.wDay, dsttime.wYear);
int result = rename(szPath, szPath_backup);
int qqq=0;
}



// insure a directory component exists. if not, create it
// mket 11/02/01
TCHAR dir[_MAX_DIR];
Expand All @@ -74,14 +92,14 @@ cOutput::cOutput(TCHAR *fn, bool append_to_file, bool fForceFlush /*= false */)

if (append)
if (fForceFlush)
fh =_tfopen(filename,_T("a+c"));
fh =_tfopen(szPath,_T("a+c"));
else
fh =_tfopen(filename,_T("a+"));
fh =_tfopen(szPath,_T("a+"));
else
if (fForceFlush)
fh =_tfopen(filename,_T("wc"));
fh =_tfopen(szPath,_T("wc"));
else
fh =_tfopen(filename,_T("w"));
fh =_tfopen(szPath,_T("w"));

if (fh == NULL )
{
Expand Down Expand Up @@ -139,9 +157,9 @@ void cOutput::ReInit(void)
fclose(fh);

if (append)
fh =_tfopen(filename,_T("a+"));
fh =_tfopen(szPath,_T("a+"));
else
fh =_tfopen(filename,_T("w"));
fh =_tfopen(szPath,_T("w"));

if (fh == NULL )
{
Expand Down
15 changes: 9 additions & 6 deletions Underlight/cOutput.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,20 +19,23 @@
class cOutput
{

public:
public:

private:
FILE *fh;
FILE* fh;
TCHAR filename[DEFAULT_MESSAGE_SIZE];
TCHAR szPath[MAX_PATH];
TCHAR szPath_backup[MAX_PATH];;
bool append;
bool m_fForceFlush; // true = flush after each write. Use with care.

public:
cOutput(TCHAR *fn, bool append_to_file, bool fForceFlush = false);
cOutput(TCHAR* fn, bool append_to_file, bool fForceFlush = false);
void ReInit(void); // close & reopen
void Write(TCHAR *data, bool long_date = false);
void Write(TCHAR* data, bool long_date = false);
void WriteStamp(bool long_date = false);
~cOutput(void);
~cOutput(void);


inline FILE *FileHandle(void) { return fh; };

Expand Down