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

Major POSIX overhaul

Browse source 
git-svn-id: https://svn.code.sf.net/p/nsis/code/NSIS/trunk@6416 212acab6-be3b-0410-9dea-997c60f758d6
This commit is contained in:
anders_k 2013-12-08 14:34:38 +00:00
parent 1e55e30ff4
commit be6c7e6a1d
35 changed files with 1718 additions and 1412 deletions
Download patch file Download diff file Expand all files Collapse all files

12
Source/tokens.cpp
View file

@ -315,13 +315,13 @@ void CEXEBuild::print_help(const TCHAR *commandname)
{
if (!commandname || !_tcsicmp(tokenlist[x].name,commandname))
{
ERROR_MSG(_T("%s%s %s\n"),commandname?_T("Usage: "):_T(""),tokenlist[x].name,tokenlist[x].usage_str);
ERROR_MSG(_T("%") NPRIs _T("%") NPRIs _T(" %") NPRIs _T("\n"),commandname?_T("Usage: "):_T(""),tokenlist[x].name,tokenlist[x].usage_str);
if (commandname) break;
}
}
if (x == TOK__LAST && commandname)
{
ERROR_MSG(_T("Invalid command \"%s\"\n"),commandname);
ERROR_MSG(_T("Invalid command \"%") NPRIs _T("\"\n"),commandname);
}
}
@ -381,17 +381,17 @@ int CEXEBuild::IsTokenPlacedRight(int pos, TCHAR *tok)
else {
TCHAR err[1024];
if (cp == TP_SEC) {
_tcscpy(err, _T("Error: command %s not valid in Section\n"));
_tcscpy(err, _T("Error: command %") NPRIs _T(" not valid in Section\n"));
}
else if (cp == TP_FUNC) {
_tcscpy(err, _T("Error: command %s not valid in Function\n"));
_tcscpy(err, _T("Error: command %") NPRIs _T(" not valid in Function\n"));
}
else if (cp == TP_PAGEEX) {
_tcscpy(err, _T("Error: command %s not valid in PageEx\n"));
_tcscpy(err, _T("Error: command %") NPRIs _T(" not valid in PageEx\n"));
}
else
{
_tcscpy(err, _T("Error: command %s not valid outside "));
_tcscpy(err, _T("Error: command %") NPRIs _T(" not valid outside "));
if (tp & TP_SEC)
_tcscat(err, _T("Section"));
if (tp & TP_FUNC)