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

Fixed LicesneData and language strings

Browse source 
git-svn-id: https://svn.code.sf.net/p/nsis/code/NSIS/trunk@2840 212acab6-be3b-0410-9dea-997c60f758d6
This commit is contained in:
kichik 2003-09-05 14:55:50 +00:00
parent 87602b35ec
commit 12e5291213
2 changed files with 1 additions and 19 deletions
Download patch file Download diff file Expand all files Collapse all files

2
Source/build.cpp
View file

@ -409,7 +409,7 @@ int CEXEBuild::add_string(const char *string, int process/*=1*/) // returns offs
{ {
if (!*string) return 0; if (!*string) return 0;
if (process && *string == '$' && *(string+1) == '(') { if (*string == '$' && *(string+1) == '(') {
int idx = 0; int idx = 0;
char *cp = strdup(string+2); char *cp = strdup(string+2);
char *p = strchr(cp, ')'); char *p = strchr(cp, ')');

18
Source/script.cpp
View file

@ -1449,12 +1449,6 @@ int CEXEBuild::doCommand(int which_token, LineParser &line)
} }
return make_sure_not_in_secorfunc(line.gettoken_str(0), 1); return make_sure_not_in_secorfunc(line.gettoken_str(0), 1);
case TOK_LICENSEDATA: case TOK_LICENSEDATA:
#ifdef NSIS_CONFIG_SILENT_SUPPORT
if (build_header.flags&(CH_FLAGS_SILENT|CH_FLAGS_SILENT_LOG))
{
warning_fl("LicenseData: SilentInstall enabled, wasting space");
}
#endif
{ {
int idx = 0; int idx = 0;
char *file = line.gettoken_str(1); char *file = line.gettoken_str(1);
@ -1466,18 +1460,6 @@ int CEXEBuild::doCommand(int which_token, LineParser &line)
char *p = strchr(cp, ')'); char *p = strchr(cp, ')');
if (p && p[1] == 0) { // if string is only a language str identifier if (p && p[1] == 0) { // if string is only a language str identifier
*p = 0; *p = 0;
if (!uninstall_mode && !strnicmp(cp,"un.",3))
{
ERROR_MSG("Installer language strings can't start with un. (%s)! (%s:%d)", cp, curfilename, linecnt);
free(cp);
return PS_ERROR;
}
else if (uninstall_mode && strnicmp(cp,"un.",3))
{
ERROR_MSG("Uninstaller language strings must start with un. (%s)! (%s:%d)", cp, curfilename, linecnt);
free(cp);
return PS_ERROR;
}
idx = DefineLangString(cp, 0); idx = DefineLangString(cp, 0);
} }
free(cp); free(cp);