remove getenv

Change-Id: Ia1c1c021ba8d31060643d44bf94aa6928761e957

diff --git a/NativeLauncher/launcher/dotnet/dotnet_launcher.cc b/NativeLauncher/launcher/dotnet/dotnet_launcher.cc
index 672455809e6293fd2a1c3f0a49d2ad6467f23e20..6adff4b09a01dd0c46a6b18db5e89f6fe2d4411d 100644 (file)
--- a/NativeLauncher/launcher/dotnet/dotnet_launcher.cc
+++ b/NativeLauncher/launcher/dotnet/dotnet_launcher.cc
@@ -112,21 +112,6 @@ int CoreRuntime::initialize(bool standalone)
        putenv(const_cast<char *>("UNW_ARM_UNWIND_METHOD=6"));
 #endif // __arm__
 
-       if (standalone) {
-               const char *deviceApiDirectory = getenv("__deviceAPIDirectory");
-               const char *runtimeDirectory = getenv("__runtimeDirectory");
-               if (deviceApiDirectory != nullptr)
-                       __deviceAPIDirectory = deviceApiDirectory;
-               if (runtimeDirectory != nullptr)
-                       __runtimeDirectory = runtimeDirectory;
-
-#ifdef USE_MANAGED_LAUNCHER
-               const char *launcherAssembly = getenv("__launcherAssembly");
-               if (launcherAssembly != nullptr)
-                       __launcherAssembly = launcherAssembly;
-#endif
-       }
-
        if (__deviceAPIDirectory.empty()) {
                _ERR("Empty Device API Directory");
                return 1;

diff --git a/NativeLauncher/launcher/main.cc b/NativeLauncher/launcher/main.cc
index c23e16fd903cf87e9b59067b92f088f9a826bd7c..b5e566cf44bf60afc68b718606abb90bded4bce0 100644 (file)
--- a/NativeLauncher/launcher/main.cc
+++ b/NativeLauncher/launcher/main.cc
@@ -25,6 +25,8 @@
 #include <Ecore.h>
 #include <Eina.h>
 #include <aul.h>
+#include <sys/types.h>
+#include <unistd.h>
 
 #define __XSTR(x) #x
 #define __STR(x) __XSTR(x)
@@ -76,19 +78,20 @@ int main(int argc, char *argv[])
 
        if (standalone) {
                _DBG("##### Run it standalone #########");
-               const char* appId = getenv("AUL_APPID");
-               _DBG("AUL_APPID : %s", appId);
+               char appId[1024] = {0,};
                std::string appRoot;
-               if (appId != nullptr) {
+               if (AUL_R_OK == aul_app_get_appid_bypid(getpid(), appId, sizeof(appId))) {
                        const char* appRootPath = aul_get_app_root_path();
                        if (appRootPath != nullptr)
                                appRoot = std::string(appRootPath);
                } else {
-                       appId = "dotnet-launcher";
+                       // If appId is not set, it is executed directly by cmdline.
+                       // In this case, appRoot is passed as an argument.
+                       snprintf(appId, 16, "%s", "dotnet-launcher");
+                       appRoot = baseName(baseName(standalonePath));
                }
+               _DBG("AUL_APPID : %s", appId);
 
-               if (appRoot.empty())
-                       appRoot = baseName(baseName(standalonePath));
                if (runtime->initialize(true) != 0) {
                        _ERR("Failed to initialize");
                        return 1;

diff --git a/NativeLauncher/util/utils.cc b/NativeLauncher/util/utils.cc
index d5cf5d30e8d0d240508be97747570949c5b8807b..92440f111ccf0fd5c486873659bf54a4df9b858c 100644 (file)
--- a/NativeLauncher/util/utils.cc
+++ b/NativeLauncher/util/utils.cc
@@ -145,6 +145,7 @@ static bool extCheckAndGetFileNameIfExist(const std::string& dir, const std::str
        if (fName.length() < ext.length() ||
                        fHame.compare(fName.length() - ext.length(), ext.length(), ext) != 0) {
                return false;
+       }
 
        std::string fullName = concatPath(dir, entry->d_name);
        switch (entry->d_type) {