From 02b56823ba57974509ecdee6f93903f8e3a2a42e Mon Sep 17 00:00:00 2001 From: Cho Woong Suk Date: Tue, 5 Sep 2017 08:58:51 +0900 Subject: [PATCH] bug-fix: to pass argument, change exectuable name to appid Change-Id: I1873bec7879c97c449060b98c895d8437a3a45f4 (cherry picked from commit 8564ec92b5775026190ed190e81b272324fda4de) --- NativeLauncher/launcher/main.cc | 14 +++++--------- 1 file changed, 5 insertions(+), 9 deletions(-) diff --git a/NativeLauncher/launcher/main.cc b/NativeLauncher/launcher/main.cc index b532832..a3ad62b 100644 --- a/NativeLauncher/launcher/main.cc +++ b/NativeLauncher/launcher/main.cc @@ -37,6 +37,8 @@ #define LAUNCHER_VERSION_STR __STR(VERSION) #endif +#define CMD_LINE_SIZE 24 // sizeof("/usr/bin/dotnet-launcher") + static std::string VersionOption("--version"); static std::string StandaloneOption("--standalone"); @@ -45,7 +47,6 @@ int main(int argc, char *argv[]) int i; bool standalone = false; char* standalonePath = nullptr; - int cmdlineSize = 0; std::vector vargs; @@ -62,11 +63,10 @@ int main(int argc, char *argv[]) return 1; } i++; - standalonePath = strdup(argv[i]); + standalonePath = argv[i]; } else { vargs.push_back(argv[i]); } - cmdlineSize += (strlen(argv[i]) +1); } using tizen::runtime::LauncherInterface; @@ -100,8 +100,8 @@ int main(int argc, char *argv[]) } // change cmdline from dotnet-launcher to executable path - memset(argv[0], '\0', cmdlineSize); - snprintf(argv[0], cmdlineSize, "%s", standalonePath); + memset(argv[0], '\0', CMD_LINE_SIZE); + snprintf(argv[0], CMD_LINE_SIZE - 1, "%s", appId); int argsLen = vargs.size(); char** args = &vargs[0]; @@ -132,10 +132,6 @@ int main(int argc, char *argv[]) Launchpad.loaderMain(argc, argv); } - if (standalonePath != nullptr) { - free(standalonePath); - } - runtime->dispose(); return 0; } -- 2.7.4