Refactoring finished

Support datamodels, invokers and ioprocessors as plugins
Comply to HTTP1.1 by sending host header field
Started prolog datamodel

6 files changed, 689 insertions, 698 deletions

diff --git a/src/uscxml/plugins/Pluma/DLibrary.cpp b/src/uscxml/plugins/Pluma/DLibrary.cpp
index 9b617db..0cbf309 100755..100644
--- a/src/uscxml/plugins/Pluma/DLibrary.cpp
+++ b/src/uscxml/plugins/Pluma/DLibrary.cpp
@@ -31,75 +31,74 @@
 #include <string>

 

 

-namespace pluma{

+namespace pluma {

 

 ////////////////////////////////////////////////////////////

-DLibrary* DLibrary::load(const std::string& path){

-    if ( path.empty() ){

-        fprintf(stderr, "Failed to load library: Empty path\n");

-        return NULL;

-    }

-    void* handle = NULL;

+DLibrary* DLibrary::load(const std::string& path) {

+	if ( path.empty() ) {

+		fprintf(stderr, "Failed to load library: Empty path\n");

+		return NULL;

+	}

+	void* handle = NULL;

 

-    // load library - OS dependent operation

-    #ifdef PLUMA_SYS_WINDOWS

-        handle = ::LoadLibraryA(path.c_str());

-        if (!handle){

-            fprintf(stderr, "Failed to load library \"%s\".\n", path.c_str());

-            return NULL;

-        }

-    #else

-        handle = ::dlopen(path.c_str(), RTLD_NOW);

-        if (!handle){

-            const char* errorString = ::dlerror();

-            fprintf(stderr, "Failed to load library \"%s\".", path.c_str());

-            if(errorString) fprintf(stderr, " OS returned error: \"%s\".", errorString);

-            fprintf(stderr, "\n");

-            return NULL;

-        }

-    #endif

-    // return a DLibrary with the DLL handle

-    return new DLibrary(handle);

+	// load library - OS dependent operation

+#ifdef PLUMA_SYS_WINDOWS

+	handle = ::LoadLibraryA(path.c_str());

+	if (!handle) {

+		fprintf(stderr, "Failed to load library \"%s\".\n", path.c_str());

+		return NULL;

+	}

+#else

+	handle = ::dlopen(path.c_str(), RTLD_NOW);

+	if (!handle) {

+		const char* errorString = ::dlerror();

+		fprintf(stderr, "Failed to load library \"%s\".", path.c_str());

+		if(errorString) fprintf(stderr, " OS returned error: \"%s\".", errorString);

+		fprintf(stderr, "\n");

+		return NULL;

+	}

+#endif

+	// return a DLibrary with the DLL handle

+	return new DLibrary(handle);

 }

 

 

 ////////////////////////////////////////////////////////////

-DLibrary::~DLibrary(){

-    if (handle){

-        #ifdef PLUMA_SYS_WINDOWS

-            ::FreeLibrary( (HMODULE)handle );

-        #else

-            ::dlclose(handle);

-        #endif

-    }

+DLibrary::~DLibrary() {

+	if (handle) {

+#ifdef PLUMA_SYS_WINDOWS

+		::FreeLibrary( (HMODULE)handle );

+#else

+		::dlclose(handle);

+#endif

+	}

 }

 

 

 ////////////////////////////////////////////////////////////

-void* DLibrary::getSymbol(const std::string& symbol){

-    if (!handle){

-        fprintf(stderr, "Cannot inspect library symbols, library isn't loaded.\n");

-        return NULL;

-    }

-    void* res;

-    #ifdef PLUMA_SYS_WINDOWS

-        res = (void*)(::GetProcAddress((HMODULE)handle, symbol.c_str()));

-    #else

-        res = (void*)(::dlsym(handle, symbol.c_str()));

-    #endif

-    if (!res){

-        fprintf(stderr, "Library symbol \"%s\" not found.\n", symbol.c_str());

-        return NULL;

-    }

-    return res;

+void* DLibrary::getSymbol(const std::string& symbol) {

+	if (!handle) {

+		fprintf(stderr, "Cannot inspect library symbols, library isn't loaded.\n");

+		return NULL;

+	}

+	void* res;

+#ifdef PLUMA_SYS_WINDOWS

+	res = (void*)(::GetProcAddress((HMODULE)handle, symbol.c_str()));

+#else

+	res = (void*)(::dlsym(handle, symbol.c_str()));

+#endif

+	if (!res) {

+		fprintf(stderr, "Library symbol \"%s\" not found.\n", symbol.c_str());

+		return NULL;

+	}

+	return res;

 }

 

 

 ////////////////////////////////////////////////////////////

 DLibrary::DLibrary(void* handle):

-    handle(handle)

-{

-    // Nothing to do

+	handle(handle) {

+	// Nothing to do

 }

 

 }   // namespace pluma

diff --git a/src/uscxml/plugins/Pluma/Dir.cpp b/src/uscxml/plugins/Pluma/Dir.cpp
index 860220e..73271ea 100755..100644
--- a/src/uscxml/plugins/Pluma/Dir.cpp
+++ b/src/uscxml/plugins/Pluma/Dir.cpp
@@ -32,68 +32,68 @@
 #include <queue>

 

 

-namespace pluma{

+namespace pluma {

 

-namespace dir{

+namespace dir {

 

 

 ////////////////////////////////////////////////////////////

-void listFiles(std::list<std::string>& list, const std::string& folder, const std::string& extension, bool recursive){

-    DIR* dir;

-    DIR* subDir;

-    struct dirent *ent;

-    // try to open top folder

-    dir = opendir(folder.c_str());

-    if (dir == NULL){

-        // could not open directory

-      fprintf(stderr, "Could not open \"%s\" directory.\n", folder.c_str());

-      return;

-    }else{

-        // close, we'll process it next

-        closedir(dir);

-    }

-    // enqueue top folder

-    std::queue<std::string> folders;

-    folders.push(folder);

+void listFiles(std::list<std::string>& list, const std::string& folder, const std::string& extension, bool recursive) {

+	DIR* dir;

+	DIR* subDir;

+	struct dirent *ent;

+	// try to open top folder

+	dir = opendir(folder.c_str());

+	if (dir == NULL) {

+		// could not open directory

+		fprintf(stderr, "Could not open \"%s\" directory.\n", folder.c_str());

+		return;

+	} else {

+		// close, we'll process it next

+		closedir(dir);

+	}

+	// enqueue top folder

+	std::queue<std::string> folders;

+	folders.push(folder);

 

-    // run while has queued folders

-    while (!folders.empty()){

-        std::string currFolder = folders.front();

-        folders.pop();

-        dir = opendir(currFolder.c_str());

-        if (dir == NULL) continue;

-        // iterate through all the files and directories

-        while ((ent = readdir (dir)) != NULL) {

-            std::string name(ent->d_name);

-            // ignore "." and ".." directories

-            if ( name.compare(".") == 0 || name.compare("..") == 0) continue;

-            // add path to the file name

-            std::string path = currFolder;

-            path.append("/");

-            path.append(name);

-            // check if it's a folder by trying to open it

-            subDir = opendir(path.c_str());

-            if (subDir != NULL){

-                // it's a folder: close, we can process it later

-                closedir(subDir);

-                if (recursive) folders.push(path);

-            }else{

-                // it's a file

-                if (extension.empty()){

-                    list.push_back(path);

-                }else{

-                    // check file extension

-                    size_t lastDot = name.find_last_of('.');

-                    std::string ext = name.substr(lastDot+1);

-                    if (ext.compare(extension) == 0){

-                        // match

-                        list.push_back(path);

-                    }

-                } // endif (extension test)

-            } // endif (folder test)

-        } // endwhile (nextFile)

-        closedir(dir);

-    } // endwhile (queued folders)

+	// run while has queued folders

+	while (!folders.empty()) {

+		std::string currFolder = folders.front();

+		folders.pop();

+		dir = opendir(currFolder.c_str());

+		if (dir == NULL) continue;

+		// iterate through all the files and directories

+		while ((ent = readdir (dir)) != NULL) {

+			std::string name(ent->d_name);

+			// ignore "." and ".." directories

+			if ( name.compare(".") == 0 || name.compare("..") == 0) continue;

+			// add path to the file name

+			std::string path = currFolder;

+			path.append("/");

+			path.append(name);

+			// check if it's a folder by trying to open it

+			subDir = opendir(path.c_str());

+			if (subDir != NULL) {

+				// it's a folder: close, we can process it later

+				closedir(subDir);

+				if (recursive) folders.push(path);

+			} else {

+				// it's a file

+				if (extension.empty()) {

+					list.push_back(path);

+				} else {

+					// check file extension

+					size_t lastDot = name.find_last_of('.');

+					std::string ext = name.substr(lastDot+1);

+					if (ext.compare(extension) == 0) {

+						// match

+						list.push_back(path);

+					}

+				} // endif (extension test)

+			} // endif (folder test)

+		} // endwhile (nextFile)

+		closedir(dir);

+	} // endwhile (queued folders)

 

 } // end listFiles

 

diff --git a/src/uscxml/plugins/Pluma/Host.cpp b/src/uscxml/plugins/Pluma/Host.cpp
index eb37c33..73979a6 100755..100644
--- a/src/uscxml/plugins/Pluma/Host.cpp
+++ b/src/uscxml/plugins/Pluma/Host.cpp
@@ -30,149 +30,149 @@
 #include <cstdio>

 

 

-namespace pluma{

+namespace pluma {

 

 ////////////////////////////////////////////////////////////

-Host::Host(){

-    // Nothing to do

+Host::Host() {

+	// Nothing to do

 }

 

 

 ////////////////////////////////////////////////////////////

-bool Host::add(Provider* provider){

-    if (provider == NULL){

-        fprintf(stderr, "Trying to add a null provider.\n");

-        return false;

-    }

-    if (!validateProvider(provider)){

-        delete provider;

-        return false;

-    }

-    addRequests[ provider->plumaGetType() ].push_back(provider);

-    return true;

+bool Host::add(Provider* provider) {

+	if (provider == NULL) {

+		fprintf(stderr, "Trying to add a null provider.\n");

+		return false;

+	}

+	if (!validateProvider(provider)) {

+		delete provider;

+		return false;

+	}

+	addRequests[ provider->plumaGetType() ].push_back(provider);

+	return true;

 }

 

 

 ////////////////////////////////////////////////////////////

-Host::~Host(){

-    clearProviders();

-    // map frees itself

+Host::~Host() {

+	clearProviders();

+	// map frees itself

 }

 

 

 ////////////////////////////////////////////////////////////

-void Host::clearProviders(){

-    ProvidersMap::iterator it;

-    for (it = knownTypes.begin() ; it != knownTypes.end() ; ++it){

-        std::list<Provider*>& providers = it->second.providers;

-        std::list<Provider*>::iterator provIt;

-        for (provIt = providers.begin() ; provIt != providers.end() ; ++provIt){

-            delete *provIt;

-        }

-        std::list<Provider*>().swap(providers);

-    }

+void Host::clearProviders() {

+	ProvidersMap::iterator it;

+	for (it = knownTypes.begin() ; it != knownTypes.end() ; ++it) {

+		std::list<Provider*>& providers = it->second.providers;

+		std::list<Provider*>::iterator provIt;

+		for (provIt = providers.begin() ; provIt != providers.end() ; ++provIt) {

+			delete *provIt;

+		}

+		std::list<Provider*>().swap(providers);

+	}

 }

 

 

 ////////////////////////////////////////////////////////////

-bool Host::knows(const std::string& type) const{

-    return knownTypes.find(type) != knownTypes.end();

+bool Host::knows(const std::string& type) const {

+	return knownTypes.find(type) != knownTypes.end();

 }

 

 

 ////////////////////////////////////////////////////////////

-unsigned int Host::getVersion(const std::string& type) const{

-    ProvidersMap::const_iterator it = knownTypes.find(type);

-    if (it != knownTypes.end())

-        return it->second.version;

-    return 0;

+unsigned int Host::getVersion(const std::string& type) const {

+	ProvidersMap::const_iterator it = knownTypes.find(type);

+	if (it != knownTypes.end())

+		return it->second.version;

+	return 0;

 }

 

 

 ////////////////////////////////////////////////////////////

-unsigned int Host::getLowestVersion(const std::string& type) const{

-    ProvidersMap::const_iterator it = knownTypes.find(type);

-    if (it != knownTypes.end())

-        return it->second.lowestVersion;

-    return 0;

+unsigned int Host::getLowestVersion(const std::string& type) const {

+	ProvidersMap::const_iterator it = knownTypes.find(type);

+	if (it != knownTypes.end())

+		return it->second.lowestVersion;

+	return 0;

 }

 

 

 ////////////////////////////////////////////////////////////

-void Host::registerType(const std::string& type, unsigned int version, unsigned int lowestVersion){

-    if (!knows(type)){

-        ProviderInfo pi;

-        pi.version = version;

-        pi.lowestVersion = lowestVersion;

-        knownTypes[type] = pi;

-    }

+void Host::registerType(const std::string& type, unsigned int version, unsigned int lowestVersion) {

+	if (!knows(type)) {

+		ProviderInfo pi;

+		pi.version = version;

+		pi.lowestVersion = lowestVersion;

+		knownTypes[type] = pi;

+	}

 }

 

 

 ////////////////////////////////////////////////////////////

-const std::list<Provider*>* Host::getProviders(const std::string& type) const{

-    ProvidersMap::const_iterator it = knownTypes.find(type);

-    if (it != knownTypes.end())

-        return &it->second.providers;

-    return NULL;

+const std::list<Provider*>* Host::getProviders(const std::string& type) const {

+	ProvidersMap::const_iterator it = knownTypes.find(type);

+	if (it != knownTypes.end())

+		return &it->second.providers;

+	return NULL;

 }

 

 

 ////////////////////////////////////////////////////////////

-bool Host::validateProvider(Provider* provider) const{

-    const std::string& type = provider->plumaGetType();

-    if ( !knows(type) ){

-        fprintf(stderr, "%s provider type isn't registered.\n", type.c_str());

-        return false;

-    }

-    if (!provider->isCompatible(*this)){

-        fprintf(stderr, "Incompatible %s provider version.\n", type.c_str());

-        return false;

-    }

-    return true;

+bool Host::validateProvider(Provider* provider) const {

+	const std::string& type = provider->plumaGetType();

+	if ( !knows(type) ) {

+		fprintf(stderr, "%s provider type isn't registered.\n", type.c_str());

+		return false;

+	}

+	if (!provider->isCompatible(*this)) {

+		fprintf(stderr, "Incompatible %s provider version.\n", type.c_str());

+		return false;

+	}

+	return true;

 }

 

 

 ////////////////////////////////////////////////////////////

-bool Host::registerProvider(Provider* provider){

-    if (!validateProvider(provider)){

-        delete provider;

-        return false;

-    }

-    knownTypes[ provider->plumaGetType() ].providers.push_back(provider);

-    return true;

+bool Host::registerProvider(Provider* provider) {

+	if (!validateProvider(provider)) {

+		delete provider;

+		return false;

+	}

+	knownTypes[ provider->plumaGetType() ].providers.push_back(provider);

+	return true;

 }

 

 

 ////////////////////////////////////////////////////////////

-void Host::cancelAddictions(){

-    TempProvidersMap::iterator it;

-    for( it = addRequests.begin() ; it != addRequests.end() ; ++it){

-        std::list<Provider*> lst = it->second;

-        std::list<Provider*>::iterator providerIt;

-        for (providerIt = lst.begin() ; providerIt != lst.end() ; ++providerIt){

-            delete *providerIt;

-        }

-    }

-    // clear map

-    TempProvidersMap().swap(addRequests);

+void Host::cancelAddictions() {

+	TempProvidersMap::iterator it;

+	for( it = addRequests.begin() ; it != addRequests.end() ; ++it) {

+		std::list<Provider*> lst = it->second;

+		std::list<Provider*>::iterator providerIt;

+		for (providerIt = lst.begin() ; providerIt != lst.end() ; ++providerIt) {

+			delete *providerIt;

+		}

+	}

+	// clear map

+	TempProvidersMap().swap(addRequests);

 }

 

 

 ////////////////////////////////////////////////////////////

-bool Host::confirmAddictions(){

-    if (addRequests.empty()) return false;

-    TempProvidersMap::iterator it;

-    for( it = addRequests.begin() ; it != addRequests.end() ; ++it){

-        std::list<Provider*> lst = it->second;

-        std::list<Provider*>::iterator providerIt;

-        for (providerIt = lst.begin() ; providerIt != lst.end() ; ++providerIt){

-            knownTypes[it->first].providers.push_back(*providerIt);

-        }

-    }

-    // clear map

-    TempProvidersMap().swap(addRequests);

-    return true;

+bool Host::confirmAddictions() {

+	if (addRequests.empty()) return false;

+	TempProvidersMap::iterator it;

+	for( it = addRequests.begin() ; it != addRequests.end() ; ++it) {

+		std::list<Provider*> lst = it->second;

+		std::list<Provider*>::iterator providerIt;

+		for (providerIt = lst.begin() ; providerIt != lst.end() ; ++providerIt) {

+			knownTypes[it->first].providers.push_back(*providerIt);

+		}

+	}

+	// clear map

+	TempProvidersMap().swap(addRequests);

+	return true;

 }

 

 

diff --git a/src/uscxml/plugins/Pluma/PluginManager.cpp b/src/uscxml/plugins/Pluma/PluginManager.cpp
index 1124505..60cb46e 100755..100644
--- a/src/uscxml/plugins/Pluma/PluginManager.cpp
+++ b/src/uscxml/plugins/Pluma/PluginManager.cpp
@@ -31,168 +31,168 @@
 #include <Pluma/Dir.hpp>

 #include <cstdio>

 

-namespace pluma{

+namespace pluma {

 

 ////////////////////////////////////////////////////////////

-PluginManager::PluginManager(){

-    // Nothing to do

+PluginManager::PluginManager() {

+	// Nothing to do

 }

 

 

 ////////////////////////////////////////////////////////////

-PluginManager::~PluginManager(){

-    unloadAll();

+PluginManager::~PluginManager() {

+	unloadAll();

 }

 

 

 ////////////////////////////////////////////////////////////

-bool PluginManager::load(const std::string& path){

-    std::string plugName = getPluginName(path);

-    std::string realPath = resolvePathExtension(path);

-    DLibrary* lib = DLibrary::load(realPath);

-    if (!lib) return false;

-

-    fnRegisterPlugin* registerFunction;

-    registerFunction = reinterpret_cast<fnRegisterPlugin*>(lib->getSymbol("connect"));

-

-    if(!registerFunction){

-        fprintf(stderr, "Failed to initialize plugin \"%s\": connect function not found\n", plugName.c_str());

-        delete lib;

-        return false;

-    }

-    // try to initialize plugin:

-    if (!registerFunction(host)){

-        // plugin decided to fail

-        fprintf(stderr, "Self registry failed on plugin \"%s\".\n", plugName.c_str());

-        host.cancelAddictions();

-        delete lib;

-        return false;

-    }

-    // Store the library if addictions are confirmed

-    if (host.confirmAddictions())

-        libraries[plugName] = lib;

-    else{

-        // otherwise nothing was registered

-        fprintf(stderr, "Nothing registered by plugin \"%s\".\n", plugName.c_str());

-        delete lib;

-        return false;

-    }

-    return true;

+bool PluginManager::load(const std::string& path) {

+	std::string plugName = getPluginName(path);

+	std::string realPath = resolvePathExtension(path);

+	DLibrary* lib = DLibrary::load(realPath);

+	if (!lib) return false;

+

+	fnRegisterPlugin* registerFunction;

+	registerFunction = reinterpret_cast<fnRegisterPlugin*>(lib->getSymbol("connect"));

+

+	if(!registerFunction) {

+		fprintf(stderr, "Failed to initialize plugin \"%s\": connect function not found\n", plugName.c_str());

+		delete lib;

+		return false;

+	}

+	// try to initialize plugin:

+	if (!registerFunction(host)) {

+		// plugin decided to fail

+		fprintf(stderr, "Self registry failed on plugin \"%s\".\n", plugName.c_str());

+		host.cancelAddictions();

+		delete lib;

+		return false;

+	}

+	// Store the library if addictions are confirmed

+	if (host.confirmAddictions())

+		libraries[plugName] = lib;

+	else {

+		// otherwise nothing was registered

+		fprintf(stderr, "Nothing registered by plugin \"%s\".\n", plugName.c_str());

+		delete lib;

+		return false;

+	}

+	return true;

 }

 

 

 ////////////////////////////////////////////////////////////

-bool PluginManager::load(const std::string& folder, const std::string& pluginName){

-    if (folder.empty())

-        return load(pluginName);

-    else if (folder[folder.size()-1] == '/' || folder[folder.size()-1] == '\\')

-        return load(folder + pluginName);

-    return load(folder + '/' + pluginName);

+bool PluginManager::load(const std::string& folder, const std::string& pluginName) {

+	if (folder.empty())

+		return load(pluginName);

+	else if (folder[folder.size()-1] == '/' || folder[folder.size()-1] == '\\')

+		return load(folder + pluginName);

+	return load(folder + '/' + pluginName);

 }

 

 

 ////////////////////////////////////////////////////////////

-int PluginManager::loadFromFolder(const std::string& folder, bool recursive){

-    std::list<std::string> files;

-    dir::listFiles(files, folder, PLUMA_LIB_EXTENSION, recursive);

-    // try to load every library

-    int res = 0;

-    std::list<std::string>::const_iterator it;

-    for (it = files.begin() ; it != files.end() ; ++it){

-        if ( load(*it) ) ++res;

-    }

-    return res;

+int PluginManager::loadFromFolder(const std::string& folder, bool recursive) {

+	std::list<std::string> files;

+	dir::listFiles(files, folder, PLUMA_LIB_EXTENSION, recursive);

+	// try to load every library

+	int res = 0;

+	std::list<std::string>::const_iterator it;

+	for (it = files.begin() ; it != files.end() ; ++it) {

+		if ( load(*it) ) ++res;

+	}

+	return res;

 }

 

 

 ////////////////////////////////////////////////////////////

-bool PluginManager::unload(const std::string& pluginName){

-    std::string plugName = getPluginName(pluginName);

-    LibMap::iterator it = libraries.find(plugName);

-    if( it != libraries.end() ) {

-        delete it->second;

-        libraries.erase(it);

-        return true;

-    }

-    return false;

+bool PluginManager::unload(const std::string& pluginName) {

+	std::string plugName = getPluginName(pluginName);

+	LibMap::iterator it = libraries.find(plugName);

+	if( it != libraries.end() ) {

+		delete it->second;

+		libraries.erase(it);

+		return true;

+	}

+	return false;

 }

 

 

 ////////////////////////////////////////////////////////////

-void PluginManager::unloadAll(){

+void PluginManager::unloadAll() {

 

-    host.clearProviders();

-    LibMap::iterator it;

-    for (it = libraries.begin() ; it != libraries.end() ; ++it){

-        delete it->second;

-    }

-    libraries.clear();

+	host.clearProviders();

+	LibMap::iterator it;

+	for (it = libraries.begin() ; it != libraries.end() ; ++it) {

+		delete it->second;

+	}

+	libraries.clear();

 }

 

 

 ////////////////////////////////////////////////////////////

-std::string PluginManager::getPluginName(const std::string& path){

-    size_t lastDash = path.find_last_of("/\\");

-    size_t lastDot = path.find_last_of('.');

-    if (lastDash == std::string::npos) lastDash = 0;

-    else ++lastDash;

-    if (lastDot < lastDash || lastDot == std::string::npos){

-        // path without extension

-        lastDot = path.length();

-    }

-    return path.substr(lastDash, lastDot-lastDash);

+std::string PluginManager::getPluginName(const std::string& path) {

+	size_t lastDash = path.find_last_of("/\\");

+	size_t lastDot = path.find_last_of('.');

+	if (lastDash == std::string::npos) lastDash = 0;

+	else ++lastDash;

+	if (lastDot < lastDash || lastDot == std::string::npos) {

+		// path without extension

+		lastDot = path.length();

+	}

+	return path.substr(lastDash, lastDot-lastDash);

 }

 

 

 ////////////////////////////////////////////////////////////

-std::string PluginManager::resolvePathExtension(const std::string& path){

-    size_t lastDash = path.find_last_of("/\\");

-    size_t lastDot = path.find_last_of('.');

-    if (lastDash == std::string::npos) lastDash = 0;

-    else ++lastDash;

-    if (lastDot < lastDash || lastDot == std::string::npos){

-        // path without extension, add it

-        return path + "." + PLUMA_LIB_EXTENSION;

-    }

-    return path;

+std::string PluginManager::resolvePathExtension(const std::string& path) {

+	size_t lastDash = path.find_last_of("/\\");

+	size_t lastDot = path.find_last_of('.');

+	if (lastDash == std::string::npos) lastDash = 0;

+	else ++lastDash;

+	if (lastDot < lastDash || lastDot == std::string::npos) {

+		// path without extension, add it

+		return path + "." + PLUMA_LIB_EXTENSION;

+	}

+	return path;

 }

 

 

 ////////////////////////////////////////////////////////////

-void PluginManager::registerType(const std::string& type, unsigned int version, unsigned int lowestVersion){

-    host.registerType(type, version, lowestVersion);

+void PluginManager::registerType(const std::string& type, unsigned int version, unsigned int lowestVersion) {

+	host.registerType(type, version, lowestVersion);

 }

 

 

 ////////////////////////////////////////////////////////////

-bool PluginManager::addProvider(Provider* provider){

-    if (provider == NULL){

-        fprintf(stderr, "Trying to add null provider\n");

-        return false;

-    }

-    return host.registerProvider(provider);

+bool PluginManager::addProvider(Provider* provider) {

+	if (provider == NULL) {

+		fprintf(stderr, "Trying to add null provider\n");

+		return false;

+	}

+	return host.registerProvider(provider);

 }

 

 

 ////////////////////////////////////////////////////////////

-void PluginManager::getLoadedPlugins(std::vector<const std::string*>& pluginNames) const{

-    pluginNames.reserve(pluginNames.size()+libraries.size());

-    LibMap::const_iterator it;

-    for(it = libraries.begin() ; it != libraries.end() ; ++it){

-        pluginNames.push_back(&(it->first));

-    }

+void PluginManager::getLoadedPlugins(std::vector<const std::string*>& pluginNames) const {

+	pluginNames.reserve(pluginNames.size()+libraries.size());

+	LibMap::const_iterator it;

+	for(it = libraries.begin() ; it != libraries.end() ; ++it) {

+		pluginNames.push_back(&(it->first));

+	}

 }

 

 

 ////////////////////////////////////////////////////////////

-bool PluginManager::isLoaded(const std::string& pluginName) const{

-    return libraries.find(getPluginName(pluginName)) != libraries.end();

+bool PluginManager::isLoaded(const std::string& pluginName) const {

+	return libraries.find(getPluginName(pluginName)) != libraries.end();

 }

 

 

 ////////////////////////////////////////////////////////////

-const std::list<Provider*>* PluginManager::getProviders(const std::string& type) const{

-    return host.getProviders(type);

+const std::list<Provider*>* PluginManager::getProviders(const std::string& type) const {

+	return host.getProviders(type);

 }

 

 

diff --git a/src/uscxml/plugins/Pluma/Provider.cpp b/src/uscxml/plugins/Pluma/Provider.cpp
index 36d4da3..7691eb1 100755..100644
--- a/src/uscxml/plugins/Pluma/Provider.cpp
+++ b/src/uscxml/plugins/Pluma/Provider.cpp
@@ -30,23 +30,23 @@
 #include <Pluma/Host.hpp>

 

 

-namespace pluma{

+namespace pluma {

 

 ////////////////////////////////////////////////////////////

-Provider::~Provider(){

-    // Nothing to do

+Provider::~Provider() {

+	// Nothing to do

 }

 

 

 ////////////////////////////////////////////////////////////

-bool Provider::isCompatible(const Host& host) const{

-    // check compatibility with host

-    const std::string& type = this->plumaGetType();

-    if (!host.knows(type)) return false;

-    unsigned int lowest = host.getLowestVersion(type);

-    unsigned int current = host.getVersion(type);

-    unsigned int myVersion = this->getVersion();

-    return lowest <= myVersion && myVersion <= current;

+bool Provider::isCompatible(const Host& host) const {

+	// check compatibility with host

+	const std::string& type = this->plumaGetType();

+	if (!host.knows(type)) return false;

+	unsigned int lowest = host.getLowestVersion(type);

+	unsigned int current = host.getVersion(type);

+	unsigned int myVersion = this->getVersion();

+	return lowest <= myVersion && myVersion <= current;

 }

 

 }   // namespace pluma

diff --git a/src/uscxml/plugins/Pluma/uce-dirent.h b/src/uscxml/plugins/Pluma/uce-dirent.h
index ecf78eb..8cbd0e5 100755..100644
--- a/src/uscxml/plugins/Pluma/uce-dirent.h
+++ b/src/uscxml/plugins/Pluma/uce-dirent.h
@@ -1,8 +1,8 @@
 /*
  * uce-dirent.h - operating system independent dirent implementation
- * 
+ *
  * Copyright (C) 1998-2002  Toni Ronkko
- * 
+ *
  * Permission is hereby granted, free of charge, to any person obtaining
  * a copy of this software and associated documentation files (the
  * ``Software''), to deal in the Software without restriction, including
@@ -10,10 +10,10 @@
  * distribute, sublicense, and/or sell copies of the Software, and to
  * permit persons to whom the Software is furnished to do so, subject to
  * the following conditions:
- * 
+ *
  * The above copyright notice and this permission notice shall be included
  * in all copies or substantial portions of the Software.
- * 
+ *
  * THE SOFTWARE IS PROVIDED ``AS IS'', WITHOUT WARRANTY OF ANY KIND, EXPRESS
  * OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
  * MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
@@ -21,8 +21,8 @@
  * OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE,
  * ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
  * OTHER DEALINGS IN THE SOFTWARE.
- * 
- * 
+ *
+ *
  * May 28 1998, Toni Ronkko <tronkko@messi.uku.fi>
  *
  * $Id: uce-dirent.h,v 1.7 2002/05/13 10:48:35 tr Exp $
@@ -58,7 +58,7 @@
  * Revision 1.1  1998/07/04 16:27:51  tr
  * Initial revision
  *
- * 
+ *
  * MSVC 1.0 scans automatic dependencies incorrectly when your project
  * contains this very header.  The problem is that MSVC cannot handle
  * include directives inside #if..#endif block those are never entered.
@@ -105,12 +105,12 @@
  */
 #if !defined(HAVE_DIRENT_H) && !defined(HAVE_DIRECT_H) && !defined(HAVE_SYS_DIR_H) && !defined(HAVE_NDIR_H) && !defined(HAVE_SYS_NDIR_H) && !defined(HAVE_DIR_H)
 # if defined(_MSC_VER)                         /* Microsoft C/C++ */
-    /* no dirent.h */
+/* no dirent.h */
 # elif defined(__BORLANDC__)                   /* Borland C/C++ */
 #   define HAVE_DIRENT_H
 #   define VOID_CLOSEDIR
 # elif defined(__TURBOC__)                     /* Borland Turbo C */
-    /* no dirent.h */
+/* no dirent.h */
 # elif defined(__WATCOMC__)                    /* Watcom C/C++ */
 #   define HAVE_DIRECT_H
 # elif defined(__apollo)                       /* Apollo */
@@ -169,7 +169,7 @@
 
 #elif defined(MSDOS) || defined(WIN32)
 
-  /* figure out type of underlaying directory interface to be used */
+/* figure out type of underlaying directory interface to be used */
 # if defined(WIN32)
 #   define DIRENT_WIN32_INTERFACE
 # elif defined(MSDOS)
@@ -178,7 +178,7 @@
 #   error "missing native dirent interface"
 # endif
 
-  /*** WIN32 specifics ***/
+/*** WIN32 specifics ***/
 # if defined(DIRENT_WIN32_INTERFACE)
 #   include <windows.h>
 #   if !defined(DIRENT_MAXNAMLEN)
@@ -186,11 +186,11 @@
 #   endif
 
 
-  /*** MS-DOS specifics ***/
+/*** MS-DOS specifics ***/
 # elif defined(DIRENT_MSDOS_INTERFACE)
 #   include <dos.h>
 
-    /* Borland defines file length macros in dir.h */
+/* Borland defines file length macros in dir.h */
 #   if defined(__BORLANDC__)
 #     include <dir.h>
 #     if !defined(DIRENT_MAXNAMLEN)
@@ -200,7 +200,7 @@
 #       define _find_t find_t
 #     endif
 
-    /* Turbo C defines ffblk structure in dir.h */
+/* Turbo C defines ffblk structure in dir.h */
 #   elif defined(__TURBOC__)
 #     include <dir.h>
 #     if !defined(DIRENT_MAXNAMLEN)
@@ -208,13 +208,13 @@
 #     endif
 #     define DIRENT_USE_FFBLK
 
-    /* MSVC */
+/* MSVC */
 #   elif defined(_MSC_VER)
 #     if !defined(DIRENT_MAXNAMLEN)
 #       define DIRENT_MAXNAMLEN (12)
 #     endif
 
-    /* Watcom */
+/* Watcom */
 #   elif defined(__WATCOMC__)
 #     if !defined(DIRENT_MAXNAMLEN)
 #       if defined(__OS2__) || defined(__NT__)
@@ -227,7 +227,7 @@
 #   endif
 # endif
 
-  /*** generic MS-DOS and MS-Windows stuff ***/
+/*** generic MS-DOS and MS-Windows stuff ***/
 # if !defined(NAME_MAX) && defined(DIRENT_MAXNAMLEN)
 #   define NAME_MAX DIRENT_MAXNAMLEN
 # endif
@@ -236,67 +236,67 @@
 # endif
 
 
-  /*
-   * Substitute for real dirent structure.  Note that `d_name' field is a
-   * true character array although we have it copied in the implementation
-   * dependent data.  We could save some memory if we had declared `d_name'
-   * as a pointer refering the name within implementation dependent data.
-   * We have not done that since some code may rely on sizeof(d_name) to be
-   * something other than four.  Besides, directory entries are typically so
-   * small that it takes virtually no time to copy them from place to place.
-   */
-  typedef struct dirent {
-    char d_name[NAME_MAX + 1];
+/*
+ * Substitute for real dirent structure.  Note that `d_name' field is a
+ * true character array although we have it copied in the implementation
+ * dependent data.  We could save some memory if we had declared `d_name'
+ * as a pointer refering the name within implementation dependent data.
+ * We have not done that since some code may rely on sizeof(d_name) to be
+ * something other than four.  Besides, directory entries are typically so
+ * small that it takes virtually no time to copy them from place to place.
+ */
+typedef struct dirent {
+	char d_name[NAME_MAX + 1];
 
-    /*** Operating system specific part ***/
+	/*** Operating system specific part ***/
 # if defined(DIRENT_WIN32_INTERFACE)       /*WIN32*/
-    WIN32_FIND_DATA data;
+	WIN32_FIND_DATA data;
 # elif defined(DIRENT_MSDOS_INTERFACE)     /*MSDOS*/
 #   if defined(DIRENT_USE_FFBLK)
-    struct ffblk data;
+	struct ffblk data;
 #   else
-    struct _find_t data;
+	struct _find_t data;
 #   endif
 # endif
-  } dirent;
+} dirent;
 
-  /* DIR substitute structure containing directory name.  The name is
-   * essential for the operation of ``rewinndir'' function. */
-  typedef struct DIR {
-    char          *dirname;                    /* directory being scanned */
-    dirent        current;                     /* current entry */
-    int           dirent_filled;               /* is current un-processed? */
+/* DIR substitute structure containing directory name.  The name is
+ * essential for the operation of ``rewinndir'' function. */
+typedef struct DIR {
+	char          *dirname;                    /* directory being scanned */
+	dirent        current;                     /* current entry */
+	int           dirent_filled;               /* is current un-processed? */
 
-  /*** Operating system specific part ***/
+	/*** Operating system specific part ***/
 #  if defined(DIRENT_WIN32_INTERFACE)
-    HANDLE        search_handle;
+	HANDLE        search_handle;
 #  elif defined(DIRENT_MSDOS_INTERFACE)
 #  endif
-  } DIR;
+} DIR;
 
 # ifdef __cplusplus
 extern "C" {
 # endif
 
-/* supply prototypes for dirent functions */
-static DIR *opendir (const char *dirname);
-static struct dirent *readdir (DIR *dirp);
-static int closedir (DIR *dirp);
-static void rewinddir (DIR *dirp);
-
-/*
- * Implement dirent interface as static functions so that the user does not
- * need to change his project in any way to use dirent function.  With this
- * it is sufficient to include this very header from source modules using
- * dirent functions and the functions will be pulled in automatically.
- */
+	/* supply prototypes for dirent functions */
+	static DIR *opendir (const char *dirname);
+	static struct dirent *readdir (DIR *dirp);
+	static int closedir (DIR *dirp);
+	static void rewinddir (DIR *dirp);
+
+	/*
+	 * Implement dirent interface as static functions so that the user does not
+	 * need to change his project in any way to use dirent function.  With this
+	 * it is sufficient to include this very header from source modules using
+	 * dirent functions and the functions will be pulled in automatically.
+	 */
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
 #include <assert.h>
 #include <errno.h>
 
-/* use ffblk instead of _find_t if requested */
+	/* use ffblk instead of _find_t if requested */
 #if defined(DIRENT_USE_FFBLK)
 # define _A_ARCH   (FA_ARCH)
 # define _A_HIDDEN (FA_HIDDEN)
@@ -309,362 +309,354 @@ static void rewinddir (DIR *dirp);
 # define _dos_findfirst(name,flags,dest) findfirst(name,dest,flags)
 #endif
 
-static int _initdir (DIR *p);
-static const char *_getdirname (const struct dirent *dp);
-static void _setdirname (struct DIR *dirp);
-
-/*
- * <function name="opendir">
- * <intro>open directory stream for reading
- * <syntax>DIR *opendir (const char *dirname);
- *
- * <desc>Open named directory stream for read and return pointer to the
- * internal working area that is used for retrieving individual directory
- * entries.  The internal working area has no fields of your interest.
- *
- * <ret>Returns a pointer to the internal working area or NULL in case the 
- * directory stream could not be opened.  Global `errno' variable will set
- * in case of error as follows:
- *
- * <table>
- * [EACESS  |Permission denied.
- * [EMFILE  |Too many open files used by the process.
- * [ENFILE  |Too many open files in system.
- * [ENOENT  |Directory does not exist.
- * [ENOMEM  |Insufficient memory.
- * [ENOTDIR |dirname does not refer to directory.  This value is not
- *           reliable on MS-DOS and MS-Windows platforms.  Many
- *           implementations return ENOENT even when the name refers to a
- *           file.]
- * </table>
- * </function>
- */
-static DIR *
-opendir(
-    const char *dirname)
-{
-  DIR *dirp;
-  assert (dirname != NULL);
-  
-  dirp = (DIR*)malloc (sizeof (struct DIR));
-  if (dirp != NULL) {
-    char *p;
-    
-    /* allocate room for directory name */
-    dirp->dirname = (char*) malloc (strlen (dirname) + 1 + strlen ("\\*.*"));
-    if (dirp->dirname == NULL) {
-      /* failed to duplicate directory name.  errno set by malloc() */
-      free (dirp);
-      return NULL;
-    }
-    /* Copy directory name while appending directory separator and "*.*".
-     * Directory separator is not appended if the name already ends with
-     * drive or directory separator.  Directory separator is assumed to be
-     * '/' or '\' and drive separator is assumed to be ':'. */
-    strcpy (dirp->dirname, dirname);
-    p = strchr (dirp->dirname, '\0');
-    if (dirp->dirname < p  &&
-        *(p - 1) != '\\'  &&  *(p - 1) != '/'  &&  *(p - 1) != ':')
-    {
-      strcpy (p++, "/");
-    }
+	static int _initdir (DIR *p);
+	static const char *_getdirname (const struct dirent *dp);
+	static void _setdirname (struct DIR *dirp);
+
+	/*
+	 * <function name="opendir">
+	 * <intro>open directory stream for reading
+	 * <syntax>DIR *opendir (const char *dirname);
+	 *
+	 * <desc>Open named directory stream for read and return pointer to the
+	 * internal working area that is used for retrieving individual directory
+	 * entries.  The internal working area has no fields of your interest.
+	 *
+	 * <ret>Returns a pointer to the internal working area or NULL in case the
+	 * directory stream could not be opened.  Global `errno' variable will set
+	 * in case of error as follows:
+	 *
+	 * <table>
+	 * [EACESS  |Permission denied.
+	 * [EMFILE  |Too many open files used by the process.
+	 * [ENFILE  |Too many open files in system.
+	 * [ENOENT  |Directory does not exist.
+	 * [ENOMEM  |Insufficient memory.
+	 * [ENOTDIR |dirname does not refer to directory.  This value is not
+	 *           reliable on MS-DOS and MS-Windows platforms.  Many
+	 *           implementations return ENOENT even when the name refers to a
+	 *           file.]
+	 * </table>
+	 * </function>
+	 */
+	static DIR *
+	opendir(
+	    const char *dirname) {
+		DIR *dirp;
+		assert (dirname != NULL);
+
+		dirp = (DIR*)malloc (sizeof (struct DIR));
+		if (dirp != NULL) {
+			char *p;
+
+			/* allocate room for directory name */
+			dirp->dirname = (char*) malloc (strlen (dirname) + 1 + strlen ("\\*.*"));
+			if (dirp->dirname == NULL) {
+				/* failed to duplicate directory name.  errno set by malloc() */
+				free (dirp);
+				return NULL;
+			}
+			/* Copy directory name while appending directory separator and "*.*".
+			 * Directory separator is not appended if the name already ends with
+			 * drive or directory separator.  Directory separator is assumed to be
+			 * '/' or '\' and drive separator is assumed to be ':'. */
+			strcpy (dirp->dirname, dirname);
+			p = strchr (dirp->dirname, '\0');
+			if (dirp->dirname < p  &&
+			        *(p - 1) != '\\'  &&  *(p - 1) != '/'  &&  *(p - 1) != ':') {
+				strcpy (p++, "/");
+			}
 # ifdef DIRENT_WIN32_INTERFACE
-    strcpy (p, "*"); /*scan files with and without extension in win32*/
+			strcpy (p, "*"); /*scan files with and without extension in win32*/
 # else
-    strcpy (p, "*.*"); /*scan files with and without extension in DOS*/
+			strcpy (p, "*.*"); /*scan files with and without extension in DOS*/
 # endif
 
-    /* open stream */
-    if (_initdir (dirp) == 0) {
-      /* initialization failed */
-      free (dirp->dirname);
-      free (dirp);
-      return NULL;
-    }
-  }
-  return dirp;
-}
-
-
-/*
- * <function name="readdir">
- * <intro>read a directory entry
- * <syntax>struct dirent *readdir (DIR *dirp);
- *
- * <desc>Read individual directory entry and return pointer to a structure
- * containing the name of the entry.  Individual directory entries returned
- * include normal files, sub-directories, pseudo-directories "." and ".."
- * and also volume labels, hidden files and system files in MS-DOS and
- * MS-Windows.   You might want to use stat(2) function to determinate which
- * one are you dealing with.  Many dirent implementations already contain
- * equivalent information in dirent structure but you cannot depend on
- * this.
- *
- * The dirent structure contains several system dependent fields that
- * generally have no interest to you.  The only interesting one is char
- * d_name[] that is also portable across different systems.  The d_name
- * field contains the name of the directory entry without leading path.
- * While d_name is portable across different systems the actual storage
- * capacity of d_name varies from system to system and there is no portable
- * way to find out it at compile time as different systems define the
- * capacity of d_name with different macros and some systems do not define
- * capacity at all (besides actual declaration of the field). If you really
- * need to find out storage capacity of d_name then you might want to try
- * NAME_MAX macro. The NAME_MAX is defined in POSIX standard althought
- * there are many MS-DOS and MS-Windows implementations those do not define
- * it.  There are also systems that declare d_name as "char d_name[1]" and
- * then allocate suitable amount of memory at run-time.  Thanks to Alain
- * Decamps (Alain.Decamps@advalvas.be) for pointing it out to me.
- *
- * This all leads to the fact that it is difficult to allocate space
- * for the directory names when the very same program is being compiled on
- * number of operating systems.  Therefore I suggest that you always
- * allocate space for directory names dynamically.
- *
- * <ret>
- * Returns a pointer to a structure containing name of the directory entry
- * in `d_name' field or NULL if there was an error.  In case of an error the
- * global `errno' variable will set as follows:
- *
- * <table>
- * [EBADF  |dir parameter refers to an invalid directory stream.  This value
- *          is not set reliably on all implementations.]
- * </table>
- * </function>
- */
-static struct dirent *
-readdir (DIR *dirp)
-{
-  assert (dirp != NULL);
-  if (dirp == NULL) {
-    errno = EBADF;
-    return NULL;
-  }
+			/* open stream */
+			if (_initdir (dirp) == 0) {
+				/* initialization failed */
+				free (dirp->dirname);
+				free (dirp);
+				return NULL;
+			}
+		}
+		return dirp;
+	}
+
+
+	/*
+	 * <function name="readdir">
+	 * <intro>read a directory entry
+	 * <syntax>struct dirent *readdir (DIR *dirp);
+	 *
+	 * <desc>Read individual directory entry and return pointer to a structure
+	 * containing the name of the entry.  Individual directory entries returned
+	 * include normal files, sub-directories, pseudo-directories "." and ".."
+	 * and also volume labels, hidden files and system files in MS-DOS and
+	 * MS-Windows.   You might want to use stat(2) function to determinate which
+	 * one are you dealing with.  Many dirent implementations already contain
+	 * equivalent information in dirent structure but you cannot depend on
+	 * this.
+	 *
+	 * The dirent structure contains several system dependent fields that
+	 * generally have no interest to you.  The only interesting one is char
+	 * d_name[] that is also portable across different systems.  The d_name
+	 * field contains the name of the directory entry without leading path.
+	 * While d_name is portable across different systems the actual storage
+	 * capacity of d_name varies from system to system and there is no portable
+	 * way to find out it at compile time as different systems define the
+	 * capacity of d_name with different macros and some systems do not define
+	 * capacity at all (besides actual declaration of the field). If you really
+	 * need to find out storage capacity of d_name then you might want to try
+	 * NAME_MAX macro. The NAME_MAX is defined in POSIX standard althought
+	 * there are many MS-DOS and MS-Windows implementations those do not define
+	 * it.  There are also systems that declare d_name as "char d_name[1]" and
+	 * then allocate suitable amount of memory at run-time.  Thanks to Alain
+	 * Decamps (Alain.Decamps@advalvas.be) for pointing it out to me.
+	 *
+	 * This all leads to the fact that it is difficult to allocate space
+	 * for the directory names when the very same program is being compiled on
+	 * number of operating systems.  Therefore I suggest that you always
+	 * allocate space for directory names dynamically.
+	 *
+	 * <ret>
+	 * Returns a pointer to a structure containing name of the directory entry
+	 * in `d_name' field or NULL if there was an error.  In case of an error the
+	 * global `errno' variable will set as follows:
+	 *
+	 * <table>
+	 * [EBADF  |dir parameter refers to an invalid directory stream.  This value
+	 *          is not set reliably on all implementations.]
+	 * </table>
+	 * </function>
+	 */
+	static struct dirent *
+	readdir (DIR *dirp) {
+		assert (dirp != NULL);
+		if (dirp == NULL) {
+			errno = EBADF;
+			return NULL;
+		}
 
 #if defined(DIRENT_WIN32_INTERFACE)
-  if (dirp->search_handle == INVALID_HANDLE_VALUE) {
-    /* directory stream was opened/rewound incorrectly or it ended normally */
-    errno = EBADF;
-    return NULL;
-  }
+		if (dirp->search_handle == INVALID_HANDLE_VALUE) {
+			/* directory stream was opened/rewound incorrectly or it ended normally */
+			errno = EBADF;
+			return NULL;
+		}
 #endif
 
-  if (dirp->dirent_filled != 0) {
-    /*
-     * Directory entry has already been retrieved and there is no need to
-     * retrieve a new one.  Directory entry will be retrieved in advance
-     * when the user calls readdir function for the first time.  This is so
-     * because real dirent has separate functions for opening and reading
-     * the stream whereas Win32 and DOS dirents open the stream
-     * automatically when we retrieve the first file.  Therefore, we have to
-     * save the first file when opening the stream and later we have to
-     * return the saved entry when the user tries to read the first entry.
-     */
-    dirp->dirent_filled = 0;
-  } else {
-    /* fill in entry and return that */
+		if (dirp->dirent_filled != 0) {
+			/*
+			 * Directory entry has already been retrieved and there is no need to
+			 * retrieve a new one.  Directory entry will be retrieved in advance
+			 * when the user calls readdir function for the first time.  This is so
+			 * because real dirent has separate functions for opening and reading
+			 * the stream whereas Win32 and DOS dirents open the stream
+			 * automatically when we retrieve the first file.  Therefore, we have to
+			 * save the first file when opening the stream and later we have to
+			 * return the saved entry when the user tries to read the first entry.
+			 */
+			dirp->dirent_filled = 0;
+		} else {
+			/* fill in entry and return that */
 #if defined(DIRENT_WIN32_INTERFACE)
-    if (FindNextFile (dirp->search_handle, &dirp->current.data) == FALSE) {
-      /* Last file has been processed or an error occured */
-      FindClose (dirp->search_handle);
-      dirp->search_handle = INVALID_HANDLE_VALUE;
-      errno = ENOENT;
-      return NULL;
-    }
+			if (FindNextFile (dirp->search_handle, &dirp->current.data) == FALSE) {
+				/* Last file has been processed or an error occured */
+				FindClose (dirp->search_handle);
+				dirp->search_handle = INVALID_HANDLE_VALUE;
+				errno = ENOENT;
+				return NULL;
+			}
 
 # elif defined(DIRENT_MSDOS_INTERFACE)
-    if (_dos_findnext (&dirp->current.data) != 0) {
-      /* _dos_findnext and findnext will set errno to ENOENT when no
-       * more entries could be retrieved. */
-      return NULL;
-    }
+			if (_dos_findnext (&dirp->current.data) != 0) {
+				/* _dos_findnext and findnext will set errno to ENOENT when no
+				 * more entries could be retrieved. */
+				return NULL;
+			}
 # endif
 
-    _setdirname (dirp);
-    assert (dirp->dirent_filled == 0);
-  }
-  return &dirp->current;
-}
-
-
-/*
- * <function name="closedir">
- * <intro>close directory stream.
- * <syntax>int closedir (DIR *dirp);
- *
- * <desc>Close directory stream opened by the `opendir' function.  Close of
- * directory stream invalidates the DIR structure as well as previously read
- * dirent entry.
- *
- * <ret>The function typically returns 0 on success and -1 on failure but
- * the function may be declared to return void on same systems.  At least
- * Borland C/C++ and some UNIX implementations use void as a return type.
- * The dirent wrapper tries to define VOID_CLOSEDIR whenever closedir is
- * known to return nothing.  The very same definition is made by the GNU
- * autoconf if you happen to use it.
- *
- * The global `errno' variable will set to EBADF in case of error.
- * </function>
- */
-static int
-closedir (DIR *dirp)
-{   
-  int retcode = 0;
-
-  /* make sure that dirp points to legal structure */
-  assert (dirp != NULL);
-  if (dirp == NULL) {
-    errno = EBADF;
-    return -1;
-  }
- 
-  /* free directory name and search handles */
-  if (dirp->dirname != NULL) free (dirp->dirname);
+			_setdirname (dirp);
+			assert (dirp->dirent_filled == 0);
+		}
+		return &dirp->current;
+	}
+
+
+	/*
+	 * <function name="closedir">
+	 * <intro>close directory stream.
+	 * <syntax>int closedir (DIR *dirp);
+	 *
+	 * <desc>Close directory stream opened by the `opendir' function.  Close of
+	 * directory stream invalidates the DIR structure as well as previously read
+	 * dirent entry.
+	 *
+	 * <ret>The function typically returns 0 on success and -1 on failure but
+	 * the function may be declared to return void on same systems.  At least
+	 * Borland C/C++ and some UNIX implementations use void as a return type.
+	 * The dirent wrapper tries to define VOID_CLOSEDIR whenever closedir is
+	 * known to return nothing.  The very same definition is made by the GNU
+	 * autoconf if you happen to use it.
+	 *
+	 * The global `errno' variable will set to EBADF in case of error.
+	 * </function>
+	 */
+	static int
+	closedir (DIR *dirp) {
+		int retcode = 0;
+
+		/* make sure that dirp points to legal structure */
+		assert (dirp != NULL);
+		if (dirp == NULL) {
+			errno = EBADF;
+			return -1;
+		}
+
+		/* free directory name and search handles */
+		if (dirp->dirname != NULL) free (dirp->dirname);
 
 #if defined(DIRENT_WIN32_INTERFACE)
-  if (dirp->search_handle != INVALID_HANDLE_VALUE) {
-    if (FindClose (dirp->search_handle) == FALSE) {
-      /* Unknown error */
-      retcode = -1;
-      errno = EBADF;
-    }
-  }
-#endif                     
-
-  /* clear dirp structure to make sure that it cannot be used anymore*/
-  memset (dirp, 0, sizeof (*dirp));
+		if (dirp->search_handle != INVALID_HANDLE_VALUE) {
+			if (FindClose (dirp->search_handle) == FALSE) {
+				/* Unknown error */
+				retcode = -1;
+				errno = EBADF;
+			}
+		}
+#endif
+
+		/* clear dirp structure to make sure that it cannot be used anymore*/
+		memset (dirp, 0, sizeof (*dirp));
 # if defined(DIRENT_WIN32_INTERFACE)
-  dirp->search_handle = INVALID_HANDLE_VALUE;
+		dirp->search_handle = INVALID_HANDLE_VALUE;
 # endif
 
-  free (dirp);
-  return retcode;
-}
-
-
-/*
- * <function name="rewinddir">
- * <intro>rewind directory stream to the beginning
- * <syntax>void rewinddir (DIR *dirp);
- *
- * <desc>Rewind directory stream to the beginning so that the next call of
- * readdir() returns the very first directory entry again.  However, note
- * that next call of readdir() may not return the same directory entry as it
- * did in first time.  The directory stream may have been affected by newly
- * created files.
- *
- * Almost every dirent implementation ensure that rewinddir will update
- * the directory stream to reflect any changes made to the directory entries
- * since the previous ``opendir'' or ``rewinddir'' call.  Keep an eye on
- * this if your program depends on the feature.  I know at least one dirent
- * implementation where you are required to close and re-open the stream to
- * see the changes.
- *
- * <ret>Returns nothing.  If something went wrong while rewinding, you will
- * notice it later when you try to retrieve the first directory entry.
- */
-static void
-rewinddir (DIR *dirp)
-{   
-  /* make sure that dirp is legal */
-  assert (dirp != NULL);
-  if (dirp == NULL) {
-    errno = EBADF;
-    return;
-  }
-  assert (dirp->dirname != NULL);
-  
-  /* close previous stream */
+		free (dirp);
+		return retcode;
+	}
+
+
+	/*
+	 * <function name="rewinddir">
+	 * <intro>rewind directory stream to the beginning
+	 * <syntax>void rewinddir (DIR *dirp);
+	 *
+	 * <desc>Rewind directory stream to the beginning so that the next call of
+	 * readdir() returns the very first directory entry again.  However, note
+	 * that next call of readdir() may not return the same directory entry as it
+	 * did in first time.  The directory stream may have been affected by newly
+	 * created files.
+	 *
+	 * Almost every dirent implementation ensure that rewinddir will update
+	 * the directory stream to reflect any changes made to the directory entries
+	 * since the previous ``opendir'' or ``rewinddir'' call.  Keep an eye on
+	 * this if your program depends on the feature.  I know at least one dirent
+	 * implementation where you are required to close and re-open the stream to
+	 * see the changes.
+	 *
+	 * <ret>Returns nothing.  If something went wrong while rewinding, you will
+	 * notice it later when you try to retrieve the first directory entry.
+	 */
+	static void
+	rewinddir (DIR *dirp) {
+		/* make sure that dirp is legal */
+		assert (dirp != NULL);
+		if (dirp == NULL) {
+			errno = EBADF;
+			return;
+		}
+		assert (dirp->dirname != NULL);
+
+		/* close previous stream */
 #if defined(DIRENT_WIN32_INTERFACE)
-  if (dirp->search_handle != INVALID_HANDLE_VALUE) {
-    if (FindClose (dirp->search_handle) == FALSE) {
-      /* Unknown error */
-      errno = EBADF;
-    }
-  }
+		if (dirp->search_handle != INVALID_HANDLE_VALUE) {
+			if (FindClose (dirp->search_handle) == FALSE) {
+				/* Unknown error */
+				errno = EBADF;
+			}
+		}
 #endif
 
-  /* re-open previous stream */
-  if (_initdir (dirp) == 0) {
-    /* initialization failed but we cannot deal with error.  User will notice
-     * error later when she tries to retrieve first directory enty. */
-    /*EMPTY*/;
-  }
-}
-
-
-/*
- * Open native directory stream object and retrieve first file.
- * Be sure to close previous stream before opening new one.
- */
-static int
-_initdir (DIR *dirp)
-{ 
-  assert (dirp != NULL);
-  assert (dirp->dirname != NULL);
-  dirp->dirent_filled = 0;
+		/* re-open previous stream */
+		if (_initdir (dirp) == 0) {
+			/* initialization failed but we cannot deal with error.  User will notice
+			 * error later when she tries to retrieve first directory enty. */
+			/*EMPTY*/;
+		}
+	}
+
+
+	/*
+	 * Open native directory stream object and retrieve first file.
+	 * Be sure to close previous stream before opening new one.
+	 */
+	static int
+	_initdir (DIR *dirp) {
+		assert (dirp != NULL);
+		assert (dirp->dirname != NULL);
+		dirp->dirent_filled = 0;
 
 # if defined(DIRENT_WIN32_INTERFACE)
-  /* Open stream and retrieve first file */
-  dirp->search_handle = FindFirstFile (dirp->dirname, &dirp->current.data);
-  if (dirp->search_handle == INVALID_HANDLE_VALUE) {
-    /* something went wrong but we don't know what.  GetLastError() could
-     * give us more information about the error, but then we should map
-     * the error code into errno. */
-    errno = ENOENT;
-    return 0;
-  }
+		/* Open stream and retrieve first file */
+		dirp->search_handle = FindFirstFile (dirp->dirname, &dirp->current.data);
+		if (dirp->search_handle == INVALID_HANDLE_VALUE) {
+			/* something went wrong but we don't know what.  GetLastError() could
+			 * give us more information about the error, but then we should map
+			 * the error code into errno. */
+			errno = ENOENT;
+			return 0;
+		}
 
 # elif defined(DIRENT_MSDOS_INTERFACE)
-  if (_dos_findfirst (dirp->dirname,
-          _A_SUBDIR | _A_RDONLY | _A_ARCH | _A_SYSTEM | _A_HIDDEN,
-          &dirp->current.data) != 0)
-  {
-    /* _dos_findfirst and findfirst will set errno to ENOENT when no 
-     * more entries could be retrieved. */
-    return 0;
-  }
+		if (_dos_findfirst (dirp->dirname,
+		                    _A_SUBDIR | _A_RDONLY | _A_ARCH | _A_SYSTEM | _A_HIDDEN,
+		                    &dirp->current.data) != 0) {
+			/* _dos_findfirst and findfirst will set errno to ENOENT when no
+			 * more entries could be retrieved. */
+			return 0;
+		}
 # endif
 
-  /* initialize DIR and it's first entry */
-  _setdirname (dirp);
-  dirp->dirent_filled = 1;
-  return 1;
-}
+		/* initialize DIR and it's first entry */
+		_setdirname (dirp);
+		dirp->dirent_filled = 1;
+		return 1;
+	}
 
 
-/*
- * Return implementation dependent name of the current directory entry.
- */
-static const char *
-_getdirname (const struct dirent *dp)
-{
+	/*
+	 * Return implementation dependent name of the current directory entry.
+	 */
+	static const char *
+	_getdirname (const struct dirent *dp) {
 #if defined(DIRENT_WIN32_INTERFACE)
-  return dp->data.cFileName;
-  
+		return dp->data.cFileName;
+
 #elif defined(DIRENT_USE_FFBLK)
-  return dp->data.ff_name;
-  
+		return dp->data.ff_name;
+
 #else
-  return dp->data.name;
-#endif  
-}
+		return dp->data.name;
+#endif
+	}
 
 
-/*
- * Copy name of implementation dependent directory entry to the d_name field.
- */
-static void
-_setdirname (struct DIR *dirp) {
-  /* make sure that d_name is long enough */
-  assert (strlen (_getdirname (&dirp->current)) <= NAME_MAX);
-  
-  strncpy (dirp->current.d_name,
-      _getdirname (&dirp->current),
-      NAME_MAX);
-  dirp->current.d_name[NAME_MAX] = '\0'; /*char d_name[NAME_MAX+1]*/
-}
-  
+	/*
+	 * Copy name of implementation dependent directory entry to the d_name field.
+	 */
+	static void
+	_setdirname (struct DIR *dirp) {
+		/* make sure that d_name is long enough */
+		assert (strlen (_getdirname (&dirp->current)) <= NAME_MAX);
+
+		strncpy (dirp->current.d_name,
+		         _getdirname (&dirp->current),
+		         NAME_MAX);
+		dirp->current.d_name[NAME_MAX] = '\0'; /*char d_name[NAME_MAX+1]*/
+	}
+
 # ifdef __cplusplus
 }
 # endif