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

cosmetics

Browse source 
git-svn-id: https://svn.code.sf.net/p/nsis/code/NSIS/trunk@4358 212acab6-be3b-0410-9dea-997c60f758d6
This commit is contained in:
kichik 2005-10-22 14:46:01 +00:00
parent a2177c9b8b
commit 17fa7db2df
2 changed files with 60 additions and 58 deletions
Download patch file Download diff file Expand all files Collapse all files

8
Source/Plugins.cpp
View file

@ -27,10 +27,10 @@ void Plugins::FindCommands(const string &path, bool displayInfo)
boost::scoped_ptr<dir_reader> dr( new_dir_reader() ); boost::scoped_ptr<dir_reader> dr( new_dir_reader() );
dr->read(path); dr->read(path);
dir_reader::iterator files_itr = dr->files().begin(); for (dir_reader::iterator files_itr = dr->files().begin();
dir_reader::iterator files_end = dr->files().end(); files_itr != dr->files().end();
files_itr++)
for (; files_itr != files_end; files_itr++) { {
if (!dir_reader::matches(*files_itr, "*.dll")) if (!dir_reader::matches(*files_itr, "*.dll"))
continue; continue;

42
Source/script.cpp
View file

@ -2765,10 +2765,10 @@ int CEXEBuild::doCommand(int which_token, LineParser &line)
boost::scoped_ptr<dir_reader> dr( new_dir_reader() ); boost::scoped_ptr<dir_reader> dr( new_dir_reader() );
dr->read(dir); dr->read(dir);
dir_reader::iterator files_itr = dr->files().begin(); for (dir_reader::iterator files_itr = dr->files().begin();
dir_reader::iterator files_end = dr->files().end(); files_itr != dr->files().end();
files_itr++)
for (; files_itr != files_end; files_itr++) { {
if (!dir_reader::matches(*files_itr, spec)) if (!dir_reader::matches(*files_itr, spec))
continue; continue;
@ -2794,14 +2794,14 @@ int CEXEBuild::doCommand(int which_token, LineParser &line)
boost::scoped_ptr<dir_reader> dr( new_dir_reader() ); boost::scoped_ptr<dir_reader> dr( new_dir_reader() );
dr->read(curincdir); dr->read(curincdir);
files_itr = dr->files().begin(); for (dir_reader::iterator incdir_itr = dr->files().begin();
files_end = dr->files().end(); incdir_itr != dr->files().end();
incdir_itr++)
for (; files_itr != files_end; files_itr++) { {
if (!dir_reader::matches(*files_itr, spec)) if (!dir_reader::matches(*incdir_itr, spec))
continue; continue;
string incfile = string(incdir) + PLATFORM_PATH_SEPARATOR_STR + basedir + *files_itr; string incfile = string(incdir) + PLATFORM_PATH_SEPARATOR_STR + basedir + *incdir_itr;
if (includeScript((char *) incfile.c_str()) != PS_OK) { if (includeScript((char *) incfile.c_str()) != PS_OK) {
return PS_ERROR; return PS_ERROR;
@ -5719,11 +5719,11 @@ int CEXEBuild::do_add_file(const char *lgss, int attrib, int recurse, int *total
dr->exclude(excluded); dr->exclude(excluded);
dr->read(dir); dr->read(dir);
dir_reader::iterator files_itr = dr->files().begin();
dir_reader::iterator files_end = dr->files().end();
// add files in the current directory // add files in the current directory
for (; files_itr != files_end; files_itr++) { for (dir_reader::iterator files_itr = dr->files().begin();
files_itr != dr->files().end();
files_itr++)
{
if (!dir_reader::matches(*files_itr, spec)) if (!dir_reader::matches(*files_itr, spec))
continue; continue;
@ -5744,12 +5744,15 @@ int CEXEBuild::do_add_file(const char *lgss, int attrib, int recurse, int *total
(*total_files)++; (*total_files)++;
} }
// recurse into directories if (!recurse) {
if (recurse) { return PS_OK;
dir_reader::iterator dirs_itr = dr->dirs().begin(); }
dir_reader::iterator dirs_end = dr->dirs().end();
for (; dirs_itr != dirs_end; dirs_itr++) { // recurse into directories
for (dir_reader::iterator dirs_itr = dr->dirs().begin();
dirs_itr != dr->dirs().end();
dirs_itr++)
{
string new_dir; string new_dir;
bool created = false; bool created = false;
@ -5791,7 +5794,6 @@ int CEXEBuild::do_add_file(const char *lgss, int attrib, int recurse, int *total
return PS_ERROR; return PS_ERROR;
} }
} }
}
return PS_OK; return PS_OK;
} }