#include <vector>
#include <memory>
-#include <Ecore.h>
#include <Eina.h>
#include <aul.h>
#include <sys/types.h>
#include <unistd.h>
-// By the specification, application id must be shorter than 50 character.
-// To add margin, set CMD_LINE_SIZE to 64. (padding size is included)
-#define APPID_MAX_LENGTH 64
+// By the specification, application id must be shorter than 50 characters.
+// Current length of argv[0] is 25 with a space. ("/usr/bin/dotnet-launcher ")
+// To be able to change argv[0] when standalone mode padding for executable path is added.
+#define APPID_MAX_LENGTH (25 + 105)
static std::string StandaloneOption("--standalone");
-static std::string PaddingOption("--PADDING_TO_CHANGE_CMDLINE_");
+static std::string PaddingOption("--PADDING_TO_CHANGE_CMDLINE_PADDING_TO_CHANGE_CMDLINE_PADDING_TO_CHANGE_CMDLINE_PADDING_TO_CHANGE_CMDLINE");
extern "C" int realMain(int argc, char *argv[], const char* mode)
{
}
i++;
standalonePath = argv[i];
- } if (PaddingOption.compare(argv[i]) == 0) {
+ } else if (PaddingOption.compare(argv[i]) == 0) {
paddingExist = true;
} else {
vargs.push_back(argv[i]);
std::unique_ptr<CoreRuntime> runtime(new CoreRuntime(mode));
if (corerunMode) {
- _INFO("##### Run it corerun Mode #########");
+ _INFO("##### Run in corerun mode #####");
char appId[APPID_MAX_LENGTH] = {0,};
std::string appRoot;
snprintf(appId, 16, "%s", "dotnet-launcher");
appRoot = baseName(argv[1]);
- if (runtime->initialize(true) != 0) {
+ if (runtime->initialize(true, false) != 0) {
_ERR("Failed to initialize");
return 1;
}
return 1;
}
} else if (standaloneMode) {
- _INFO("##### Run it standalone Mode #########");
+ _INFO("##### Run in standalone mode #####");
char appId[APPID_MAX_LENGTH] = {0,};
std::string appRoot;
if (AUL_R_OK == aul_app_get_appid_bypid(getpid(), appId, sizeof(appId))) {
}
_INFO("AUL_APPID : %s", appId);
- if (runtime->initialize(true) != 0) {
+ if (runtime->initialize(true, true) != 0) {
_ERR("Failed to initialize");
return 1;
}
// change cmdline from dotnet-launcher to executable path
int cmdlineSize = paddingExist ? APPID_MAX_LENGTH : APPID_MAX_LENGTH - PaddingOption.length();
memset(argv[0], '\0', cmdlineSize);
- snprintf(argv[0], cmdlineSize - 1, "%s", appId);
+ snprintf(argv[0], cmdlineSize, "%s", standalonePath);
int argsLen = vargs.size();
char** args = &vargs[0];
return 1;
}
} else {
+ // change cmdline from dotnet-hydra-launcher to dotnet-launcher
+ if (strcmp(argv[0], "/usr/bin/dotnet-hydra-launcher") == 0) {
+ memset(argv[0], '\0', strlen("/usr/bin/dotnet-hydra-launcher"));
+ snprintf(argv[0], strlen("/usr/bin/dotnet-launcher") + 1, "/usr/bin/dotnet-launcher");
+ }
+
Launchpad.onCreate = [&runtime]() {
- if (runtime->initialize(false) != 0)
+ if (runtime->initialize(false, true) != 0) {
_ERR("Failed to initialized");
- else
+ } else {
_INFO("Success to initialized");
+ }
};
Launchpad.onTerminate = [&runtime](const AppInfo& appInfo, int argc, char** argv) {