Fix injection of javascript

[Issue#] LINUXNGWAP-693

[Problem] loadInjectedJavaScript does not inject javascript

[Cause] Condition in the for loop prevents any files in the read
directory from being processed.

[Solution] Correct a condition in the for loop.

[Verification] Build wrt-plugins-common.

Change-Id: Ic9c2651621680a3673b0fefb8881d72df965a663

diff --git a/src/modules/tizen/Filesystem/Node.cpp b/src/modules/tizen/Filesystem/Node.cpp
index eddbe19..221285c 100644 (file)
--- a/src/modules/tizen/Filesystem/Node.cpp
+++ b/src/modules/tizen/Filesystem/Node.cpp
@@ -104,7 +104,7 @@ Node::NameList Node::getChildNames() const
     struct dirent entry;
     struct dirent *entry_result;
     for (return_code = readdir_r(dir, &entry, &entry_result);
-            entry_result != NULL && return_code != 0;
+            entry_result != NULL && return_code == 0;
             return_code = readdir_r(dir, &entry, &entry_result)) {
         if (!strncmp(entry.d_name, ".", 1) ||
             !strncmp(entry.d_name, "..", 2))
@@ -146,7 +146,7 @@ NodeList Node::getChildNodes(const NodeFilterPtr& filter) const
     struct dirent entry;
     struct dirent *entry_result;
     for (return_code = readdir_r(dir, &entry, &entry_result);
-            entry_result != NULL && return_code != 0;
+            entry_result != NULL && return_code == 0;
             return_code = readdir_r(dir, &entry, &entry_result)) {
         if (!strncmp(entry.d_name, ".", 1) ||
             !strncmp(entry.d_name, "..", 2))

diff --git a/src/plugin-loading/js_page_session.cpp b/src/plugin-loading/js_page_session.cpp
index 64d0a45..91f8cec 100644 (file)
--- a/src/plugin-loading/js_page_session.cpp
+++ b/src/plugin-loading/js_page_session.cpp
@@ -401,7 +401,7 @@ void JSPageSession::Impl::loadInjectedJavaScript()
 
     // make file list from DIR_PATH
     for (return_code = readdir_r(dir, &libdir, &result);
-            result != NULL && return_code != 0;
+            result != NULL && return_code == 0;
             return_code = readdir_r(dir, &libdir, &result)) {
         if (strncmp(libdir.d_name, ".", 2) == 0 ||
             strncmp(libdir.d_name, "..", 3) == 0)

diff --git a/src/plugins-installer/plugin_installer.cpp b/src/plugins-installer/plugin_installer.cpp
index 824f6b9..929971b 100644 (file)
--- a/src/plugins-installer/plugin_installer.cpp
+++ b/src/plugins-installer/plugin_installer.cpp
@@ -386,7 +386,7 @@ int PluginsInstaller::installAllPlugins()
     std::list<std::string> pluginsPaths;
 
     for (return_code = readdir_r(dir, &libdir, &result);
-            result != NULL && return_code != 0;
+            result != NULL && return_code == 0;
             return_code = readdir_r(dir, &libdir, &result)) {
         if (strcmp(libdir.d_name, ".") == 0 ||
             strcmp(libdir.d_name, "..") == 0)