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

tabs to spaces

Browse source 
git-svn-id: https://svn.code.sf.net/p/nsis/code/NSIS/trunk@3716 212acab6-be3b-0410-9dea-997c60f758d6
This commit is contained in:
kichik 2004-10-12 19:57:18 +00:00
parent df2695bba1
commit 184e058e74
2 changed files with 27 additions and 27 deletions
Download patch file Download diff file Expand all files Collapse all files

44
Source/script.cpp
View file

@ -486,7 +486,7 @@ void CEXEBuild::ps_addtoline(const char *str, GrowBuf &linedata, StringList &his
else if (in[0] == '{') else if (in[0] == '{')
{ {
char *s=strdup(in+1); char *s=strdup(in+1);
ResourceManager<char*, __free_with_free> sManager(s); ResourceManager<char*, __free_with_free> sManager(s);
char *t=s; char *t=s;
unsigned int bn = 0; unsigned int bn = 0;
while (*t) while (*t)
@ -524,7 +524,7 @@ void CEXEBuild::ps_addtoline(const char *str, GrowBuf &linedata, StringList &his
else if (in[0] == '%') else if (in[0] == '%')
{ {
char *s=strdup(in+1); char *s=strdup(in+1);
ResourceManager<char*, __free_with_free> sManager(s); ResourceManager<char*, __free_with_free> sManager(s);
char *t=s; char *t=s;
while (*t) while (*t)
{ {
@ -559,7 +559,7 @@ void CEXEBuild::ps_addtoline(const char *str, GrowBuf &linedata, StringList &his
if (in[1] == '{') // Found $$ before - Don't replace this define if (in[1] == '{') // Found $$ before - Don't replace this define
{ {
char *s=strdup(in+2); char *s=strdup(in+2);
ResourceManager<char*, __free_with_free> sManager(s); ResourceManager<char*, __free_with_free> sManager(s);
char *t=s; char *t=s;
unsigned int bn = 0; unsigned int bn = 0;
while (*t) while (*t)
@ -1346,7 +1346,7 @@ int CEXEBuild::doCommand(int which_token, LineParser &line)
ERROR_MSG("LicenseLangString: open failed \"%s\"\n",file); ERROR_MSG("LicenseLangString: open failed \"%s\"\n",file);
PRINTHELP() PRINTHELP()
} }
ResourceManager<FILE*, __free_with_fclose> fpManager(fp); ResourceManager<FILE*, __free_with_fclose> fpManager(fp);
fseek(fp,0,SEEK_END); fseek(fp,0,SEEK_END);
datalen=ftell(fp); datalen=ftell(fp);
if (!datalen) if (!datalen)
@ -1361,7 +1361,7 @@ int CEXEBuild::doCommand(int which_token, LineParser &line)
ERROR_MSG("Internal compiler error #12345: LicenseData malloc(%d) failed.\n", datalen+2); ERROR_MSG("Internal compiler error #12345: LicenseData malloc(%d) failed.\n", datalen+2);
return PS_ERROR; return PS_ERROR;
} }
ResourceManager<char*, __free_with_free> dataManager(data); ResourceManager<char*, __free_with_free> dataManager(data);
char *ldata=data+1; char *ldata=data+1;
if (fread(ldata,1,datalen,fp) != datalen) if (fread(ldata,1,datalen,fp) != datalen)
{ {
@ -1634,7 +1634,7 @@ int CEXEBuild::doCommand(int which_token, LineParser &line)
if (file[0] == '$' && file[1] == '(') if (file[0] == '$' && file[1] == '(')
{ {
char *cp = strdup(file+2); char *cp = strdup(file+2);
ResourceManager<char*, __free_with_free> cpManager(cp); ResourceManager<char*, __free_with_free> cpManager(cp);
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;
@ -1652,7 +1652,7 @@ int CEXEBuild::doCommand(int which_token, LineParser &line)
ERROR_MSG("LicenseData: open failed \"%s\"\n",file); ERROR_MSG("LicenseData: open failed \"%s\"\n",file);
PRINTHELP() PRINTHELP()
} }
ResourceManager<FILE*, __free_with_fclose> fpManager(fp); ResourceManager<FILE*, __free_with_fclose> fpManager(fp);
fseek(fp,0,SEEK_END); fseek(fp,0,SEEK_END);
datalen=ftell(fp); datalen=ftell(fp);
if (!datalen) if (!datalen)
@ -1667,11 +1667,11 @@ int CEXEBuild::doCommand(int which_token, LineParser &line)
ERROR_MSG("Internal compiler error #12345: LicenseData malloc(%d) failed.\n", datalen+2); ERROR_MSG("Internal compiler error #12345: LicenseData malloc(%d) failed.\n", datalen+2);
return PS_ERROR; return PS_ERROR;
} }
//ResourceManager<char*, __free_with_free> dataManager(data); //ResourceManager<char*, __free_with_free> dataManager(data);
char *ldata=data+1; char *ldata=data+1;
if (fread(ldata,1,datalen,fp) != datalen) { if (fread(ldata,1,datalen,fp) != datalen) {
ERROR_MSG("LicenseData: can't read file.\n"); ERROR_MSG("LicenseData: can't read file.\n");
free(data); // TODO: fix later (orip) free(data); // TODO: fix later (orip)
return PS_ERROR; return PS_ERROR;
} }
ldata[datalen]=0; ldata[datalen]=0;
@ -1694,7 +1694,7 @@ int CEXEBuild::doCommand(int which_token, LineParser &line)
cur_page->parms[1] = add_string(data, 0); cur_page->parms[1] = add_string(data, 0);
} }
if (!idx) free(data); // TODO: fix later (orip) if (!idx) free(data); // TODO: fix later (orip)
SCRIPT_MSG("LicenseData: \"%s\"\n",file); SCRIPT_MSG("LicenseData: \"%s\"\n",file);
} }
@ -2202,7 +2202,7 @@ int CEXEBuild::doCommand(int which_token, LineParser &line)
ERROR_MSG("Error: Can't open \"%s\"!\n", line.gettoken_str(2)); ERROR_MSG("Error: Can't open \"%s\"!\n", line.gettoken_str(2));
return PS_ERROR; return PS_ERROR;
} }
ResourceManager<FILE*, __free_with_fclose> fuiManager(fui); ResourceManager<FILE*, __free_with_fclose> fuiManager(fui);
fseek(fui, 0, SEEK_END); fseek(fui, 0, SEEK_END);
unsigned int len = ftell(fui); unsigned int len = ftell(fui);
@ -2212,7 +2212,7 @@ int CEXEBuild::doCommand(int which_token, LineParser &line)
ERROR_MSG("Internal compiler error #12345: malloc(%d) failed\n", len); ERROR_MSG("Internal compiler error #12345: malloc(%d) failed\n", len);
extern void quit(); quit(); extern void quit(); quit();
} }
ResourceManager<LPBYTE, __free_with_free> uiManager(ui); ResourceManager<LPBYTE, __free_with_free> uiManager(ui);
if (fread(ui, 1, len, fui) != len) { if (fread(ui, 1, len, fui) != len) {
ERROR_MSG("Error: Can't read \"%s\"!\n", line.gettoken_str(2)); ERROR_MSG("Error: Can't read \"%s\"!\n", line.gettoken_str(2));
return PS_ERROR; return PS_ERROR;
@ -2627,8 +2627,8 @@ int CEXEBuild::doCommand(int which_token, LineParser &line)
#else #else
unsigned int malloced = strlen(f) + 100; unsigned int malloced = strlen(f) + 100;
char *incfile = (char *) malloc(malloced); char *incfile = (char *) malloc(malloced);
assert(incfile != 0); assert(incfile != 0);
ResourceManager<char*, __free_with_free> incfileManager(incfile); ResourceManager<char*, __free_with_free> incfileManager(incfile);
strcpy(incfile, f); strcpy(incfile, f);
glob_t globbuf; glob_t globbuf;
if (!GLOB(incfile, GLOB_NOSORT, NULL, &globbuf)) if (!GLOB(incfile, GLOB_NOSORT, NULL, &globbuf))
@ -4379,7 +4379,7 @@ int CEXEBuild::doCommand(int which_token, LineParser &line)
ERROR_MSG("Error: Can't open \"%s\"!\n", line.gettoken_str(1)); ERROR_MSG("Error: Can't open \"%s\"!\n", line.gettoken_str(1));
return PS_ERROR; return PS_ERROR;
} }
ResourceManager<FILE*, __free_with_fclose> fdllManager(fdll); ResourceManager<FILE*, __free_with_fclose> fdllManager(fdll);
fseek(fdll, 0, SEEK_END); fseek(fdll, 0, SEEK_END);
unsigned int len = ftell(fdll); unsigned int len = ftell(fdll);
@ -4389,7 +4389,7 @@ int CEXEBuild::doCommand(int which_token, LineParser &line)
ERROR_MSG("Internal compiler error #12345: malloc(%d) failed\n", dll); ERROR_MSG("Internal compiler error #12345: malloc(%d) failed\n", dll);
extern void quit(); quit(); extern void quit(); quit();
} }
ResourceManager<LPBYTE, __free_with_free> dllManager(dll); ResourceManager<LPBYTE, __free_with_free> dllManager(dll);
if (fread(dll, 1, len, fdll) != len) { if (fread(dll, 1, len, fdll) != len) {
ERROR_MSG("Error: Can't read \"%s\"!\n", line.gettoken_str(1)); ERROR_MSG("Error: Can't read \"%s\"!\n", line.gettoken_str(1));
return PS_ERROR; return PS_ERROR;
@ -5359,8 +5359,8 @@ int CEXEBuild::doCommand(int which_token, LineParser &line)
{ {
int ret, data_handle; int ret, data_handle;
char* command = strdup(line.gettoken_str(0)); char* command = strdup(line.gettoken_str(0));
assert(command != 0); assert(command != 0);
ResourceManager<char*, __free_with_free> commandManager(command); ResourceManager<char*, __free_with_free> commandManager(command);
char* dllPath = m_plugins.GetPluginDll(uninstall_mode, &command, &data_handle); char* dllPath = m_plugins.GetPluginDll(uninstall_mode, &command, &data_handle);
if (dllPath) if (dllPath)
@ -5610,8 +5610,8 @@ int CEXEBuild::do_add_file(const char *lgss, int attrib, int recurse, int linecn
return PS_ERROR; return PS_ERROR;
} }
// Will auto-CloseHandle hFile // Will auto-CloseHandle hFile
ResourceManager<HANDLE, __free_with_CloseHandle> hFileManager(fd); ResourceManager<HANDLE, __free_with_CloseHandle> hFileManager(fd);
len = GetFileSize(hFile, NULL); len = GetFileSize(hFile, NULL);
if (len && !mmap.setfile(hFile, len)) if (len && !mmap.setfile(hFile, len))
@ -5632,8 +5632,8 @@ int CEXEBuild::do_add_file(const char *lgss, int attrib, int recurse, int linecn
return PS_ERROR; return PS_ERROR;
} }
// Will auto-close(2) fd // Will auto-close(2) fd
ResourceManager<int, __free_with_close> fdManager(fd); ResourceManager<int, __free_with_close> fdManager(fd);
if (len && !mmap.setfile(fd, len)) if (len && !mmap.setfile(fd, len))
{ {

10
Source/util.h
View file

@ -95,14 +95,14 @@ inline T align_to_512(const T x) {
template <typename _RESOURCE, typename _FREE_RESOURCE> template <typename _RESOURCE, typename _FREE_RESOURCE>
class ResourceManager { class ResourceManager {
public: public:
ResourceManager(_RESOURCE& resource) : m_resource(resource) {} ResourceManager(_RESOURCE& resource) : m_resource(resource) {}
~ResourceManager() { m_free_resource(m_resource); }; ~ResourceManager() { m_free_resource(m_resource); };
private: // members private: // members
_RESOURCE& m_resource; _RESOURCE& m_resource;
_FREE_RESOURCE m_free_resource; _FREE_RESOURCE m_free_resource;
private: // don't copy instances private: // don't copy instances
ResourceManager(const ResourceManager&); ResourceManager(const ResourceManager&);
void operator=(const ResourceManager&); void operator=(const ResourceManager&);
}; };
#define DEFINE_FREEFUNC(freefunc) \ #define DEFINE_FREEFUNC(freefunc) \