dragonleo/NSIS
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

don't try to delete a directory after reboot if it's not even valid

Browse source 
git-svn-id: https://svn.code.sf.net/p/nsis/code/NSIS/trunk@3659 212acab6-be3b-0410-9dea-997c60f758d6
This commit is contained in:
kichik 2004-09-24 11:26:35 +00:00
parent 64c1b0f05e
commit d7ca86c446
1 changed files with 3 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

5
Source/exehead/util.c
View file

@ -101,9 +101,10 @@ void NSISCALL myDelete(char *buf, int flags)
HANDLE h; HANDLE h;
WIN32_FIND_DATA fd; WIN32_FIND_DATA fd;
char *fn; char *fn;
int valid_dir=is_valid_instpath(buf);
#ifdef NSIS_SUPPORT_RMDIR #ifdef NSIS_SUPPORT_RMDIR
if (!(flags & DEL_DIR) || (is_valid_instpath(buf) && (flags & DEL_RECURSE))) if (!(flags & DEL_DIR) || (valid_dir && (flags & DEL_RECURSE)))
#endif//NSIS_SUPPORT_RMDIR #endif//NSIS_SUPPORT_RMDIR
{ {
mystrcpy(lbuf,buf); mystrcpy(lbuf,buf);
@ -173,7 +174,7 @@ void NSISCALL myDelete(char *buf, int flags)
} }
#ifdef NSIS_SUPPORT_RMDIR #ifdef NSIS_SUPPORT_RMDIR
if (flags & DEL_DIR) if (valid_dir && (flags & DEL_DIR))
{ {
addtrailingslash(buf); addtrailingslash(buf);
log_printf2("RMDir: RemoveDirectory(\"%s\")",buf); log_printf2("RMDir: RemoveDirectory(\"%s\")",buf);