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

set error flag for invalid directories passed to myDelete (fixes bug #1227553)

Browse source 
git-svn-id: https://svn.code.sf.net/p/nsis/code/NSIS/trunk@4150 212acab6-be3b-0410-9dea-997c60f758d6
This commit is contained in:
kichik 2005-06-30 20:47:27 +00:00
parent 27a8770159
commit dbb7153d65
1 changed files with 24 additions and 14 deletions
Download patch file Download diff file Expand all files Collapse all files

38
Source/exehead/util.c
View file

@ -180,28 +180,38 @@ void NSISCALL myDelete(char *buf, int flags)
}
#ifdef NSIS_SUPPORT_RMDIR
if (valid_dir && (flags & DEL_DIR) && file_exists(buf))
if ((flags & DEL_DIR))
{
addtrailingslash(buf);
log_printf2("RMDir: RemoveDirectory(\"%s\")",buf);
if (!RemoveDirectory(buf))
if (!valid_dir)
{
#ifdef NSIS_SUPPORT_MOVEONREBOOT
if (flags & DEL_REBOOT)
log_printf2("RMDir: RemoveDirectory invalid input(\"%s\")",buf);
g_exec_flags.exec_error++;
}
else if (file_exists(buf))
{
addtrailingslash(buf);
log_printf2("RMDir: RemoveDirectory(\"%s\")",buf);
if (!RemoveDirectory(buf))
{
log_printf2("RMDir: RemoveDirectory on Reboot(\"%s\")",buf);
update_status_text(LANG_DELETEONREBOOT,buf);
MoveFileOnReboot(buf,NULL);
#ifdef NSIS_SUPPORT_MOVEONREBOOT
if (flags & DEL_REBOOT)
{
log_printf2("RMDir: RemoveDirectory on Reboot(\"%s\")",buf);
update_status_text(LANG_DELETEONREBOOT,buf);
MoveFileOnReboot(buf,NULL);
}
else
#endif//NSIS_SUPPORT_MOVEONREBOOT
{
log_printf2("RMDir: RemoveDirectory failed(\"%s\")",buf);
g_exec_flags.exec_error++;
}
}
else
#endif//NSIS_SUPPORT_MOVEONREBOOT
{
log_printf2("RMDir: RemoveDirectory failed(\"%s\")",buf);
g_exec_flags.exec_error++;
update_status_text(LANG_REMOVEDIR,buf);
}
}
else
update_status_text(LANG_REMOVEDIR,buf);
}
#endif//NSIS_SUPPORT_RMDIR
}