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

- extended maximum binary data for WriteRegBin to 3 * NSIS_MAX_STRLEN

Browse source 
- fixed FileRead setting the error flag when a null character is the first character it reads
- made File /nonfatal always produce a warning if the file can't be found
- some size optimizations


git-svn-id: https://svn.code.sf.net/p/nsis/code/NSIS/trunk@3577 212acab6-be3b-0410-9dea-997c60f758d6
This commit is contained in:
kichik 2004-06-25 19:53:05 +00:00
parent d1f241e6c8
commit 5d8517c328
3 changed files with 107 additions and 80 deletions
Download patch file Download diff file Expand all files Collapse all files

26
Source/build.cpp
View file

@ -3045,10 +3045,14 @@ extern FILE *g_output;
void CEXEBuild::warning(const char *s, ...)
{
char buf[NSIS_MAX_STRLEN*4];
char buf[NSIS_MAX_STRLEN*10];
va_list val;
va_start(val,s);
#ifdef _WIN32
vsprintf(buf,s,val);
#else
vsnprintf(buf,NSIS_MAX_STRLEN*10,s,val);
#endif
va_end(val);
m_warnings.add(buf,0);
notify(MAKENSIS_NOTIFY_WARNING,buf);
@ -3061,10 +3065,14 @@ void CEXEBuild::warning(const char *s, ...)
void CEXEBuild::warning_fl(const char *s, ...)
{
char buf[NSIS_MAX_STRLEN*4];
char buf[NSIS_MAX_STRLEN*10];
va_list val;
va_start(val,s);
#ifdef _WIN32
vsprintf(buf,s,val);
#else
vsnprintf(buf,NSIS_MAX_STRLEN*10,s,val);
#endif
va_end(val);
sprintf(buf+strlen(buf)," (%s:%d)",curfilename,linecnt);
m_warnings.add(buf,0);
@ -3084,10 +3092,14 @@ void CEXEBuild::ERROR_MSG(const char *s, ...)
if (display_errors)
#endif
{
char buf[NSIS_MAX_STRLEN*4];
char buf[NSIS_MAX_STRLEN*10];
va_list val;
va_start(val,s);
#ifdef _WIN32
vsprintf(buf,s,val);
#else
vsnprintf(buf,NSIS_MAX_STRLEN*10,s,val);
#endif
va_end(val);
notify(MAKENSIS_NOTIFY_ERROR,buf);
if (display_errors)
@ -3102,12 +3114,10 @@ void CEXEBuild::SCRIPT_MSG(const char *s, ...)
{
if (display_script)
{
char buf[NSIS_MAX_STRLEN*4];
va_list val;
va_start(val,s);
vsprintf(buf,s,val);
vfprintf(g_output,s,val);
va_end(val);
fprintf(g_output,"%s",buf);
fflush(g_output);
}
}
@ -3116,12 +3126,10 @@ void CEXEBuild::INFO_MSG(const char *s, ...)
{
if (display_info)
{
char buf[NSIS_MAX_STRLEN*4];
va_list val;
va_start(val,s);
vsprintf(buf,s,val);
vfprintf(g_output,s,val);
va_end(val);
fprintf(g_output,"%s",buf);
fflush(g_output);
}
}