args: handling for current path

Emulator uses binary path when skin client is executed.

Signed-off-by: GiWoong Kim <giwoong.kim@samsung.com>

diff --git a/oslib-posix.c b/oslib-posix.c
index 143b676932f8f707a52bb3f7b89dd9524c540712..09cec58c0597524af76f30d43fe729ba4fdd0ed8 100644 (file)
--- a/oslib-posix.c
+++ b/oslib-posix.c
@@ -93,14 +93,14 @@ void *qemu_oom_check(void *ptr)
         char _msg[] = "Failed to allocate memory in qemu.";
         char cmd[JAVA_MAX_COMMAND_LENGTH] = { 0, };
 
-        int len = strlen(JAVA_EXEFILE_PATH) + strlen(JAVA_EXEOPTION) + strlen(JAR_SKINFILE_PATH) +
+        int len = strlen(JAVA_EXEFILE_PATH) + strlen(JAVA_EXEOPTION) + strlen(JAR_SKINFILE) +
             strlen(JAVA_SIMPLEMODE_OPTION) + strlen(_msg) + 7;
         if (len > JAVA_MAX_COMMAND_LENGTH) {
             len = JAVA_MAX_COMMAND_LENGTH;
         }
 
         snprintf(cmd, len, "%s %s %s %s=\"%s\"",
-            JAVA_EXEFILE_PATH, JAVA_EXEOPTION, JAR_SKINFILE_PATH, JAVA_SIMPLEMODE_OPTION, _msg);
+            JAVA_EXEFILE_PATH, JAVA_EXEOPTION, JAR_SKINFILE, JAVA_SIMPLEMODE_OPTION, _msg);
         int ret = system(cmd);
 #endif
 

diff --git a/oslib-win32.c b/oslib-win32.c
index 2d779b022e645304c7cb01d5e75c1b7ab4f8735f..dc7adba22adf636141d5681b2654874733b51d4e 100644 (file)
--- a/oslib-win32.c
+++ b/oslib-win32.c
@@ -122,14 +122,14 @@ void *qemu_oom_check(void *ptr)
             strcpy(JAVA_EXEFILE_PATH, "java");
         }
 #endif
-        int len = strlen(JAVA_EXEFILE_PATH) + strlen(JAVA_EXEOPTION) + strlen(JAR_SKINFILE_PATH) +
+        int len = strlen(JAVA_EXEFILE_PATH) + strlen(JAVA_EXEOPTION) + strlen(JAR_SKINFILE) +
            strlen(JAVA_SIMPLEMODE_OPTION) + strlen(_msg) + 7;
         if (len > JAVA_MAX_COMMAND_LENGTH) {
             len = JAVA_MAX_COMMAND_LENGTH;
         }
 
         snprintf(cmd, len, "%s %s %s %s=\"%s\"",
-            JAVA_EXEFILE_PATH, JAVA_EXEOPTION, JAR_SKINFILE_PATH, JAVA_SIMPLEMODE_OPTION, _msg);
+            JAVA_EXEFILE_PATH, JAVA_EXEOPTION, JAR_SKINFILE, JAVA_SIMPLEMODE_OPTION, _msg);
         int ret = WinExec(cmd, SW_SHOW);
 #ifdef CONFIG_WIN32
            // for 64bit windows

diff --git a/tizen/src/debug_ch.c b/tizen/src/debug_ch.c
index 68c2b1fc8add524368e6af2b2ca7bbd2502ac81b..6d954b882131ff62c2999e7e737e382478a0c972 100644 (file)
--- a/tizen/src/debug_ch.c
+++ b/tizen/src/debug_ch.c
@@ -289,16 +289,11 @@ static void debug_init(void)
        strcat(debugchfile, "/DEBUGCH");
 #endif
 
-    if ( 0 == strlen( bin_dir ) ) {
-        strcpy( debugchfile, "DEBUGCH" );
+    if (0 == strlen(bin_dir)) {
+        strcpy(debugchfile, "DEBUGCH");
     } else {
-        strcat( debugchfile, bin_dir );
-#ifdef _WIN32
-        strcat( debugchfile, "\\" );
-#else
-        strcat( debugchfile, "/" );
-#endif
-        strcat( debugchfile, "DEBUGCH" );
+        strcat(debugchfile, bin_dir);
+        strcat(debugchfile, "DEBUGCH");
     }
 
        fp= fopen(debugchfile, "r");

diff --git a/tizen/src/emulator.c b/tizen/src/emulator.c
index b211dd3b7cd952ab52f4029baf8c68409f5aa31c..f0d2c80588a7ed3a68a7d03836da36a1a41fb299 100644 (file)
--- a/tizen/src/emulator.c
+++ b/tizen/src/emulator.c
@@ -310,7 +310,6 @@ static void parse_options(int argc, char *argv[], int *skin_argc,
 
 static void get_bin_dir(char *exec_argv)
 {
-
     if (!exec_argv) {
         return;
     }
@@ -336,11 +335,20 @@ static void get_bin_dir(char *exec_argv)
     }
 
     strncpy(bin_dir, data, strlen(data) - strlen(p));
+#ifdef _WIN32
+    strcat(bin_dir, "\\");
+#else
+    strcat(bin_dir, "/");
+#endif
 
     free(data);
 
 }
 
+char* get_bin_path(void) {
+    return bin_dir;
+}
+
 void set_image_and_log_path(char *qemu_argv)
 {
     int i, j = 0;

diff --git a/tizen/src/emulator.h b/tizen/src/emulator.h
index 618cc08a61f5f6f2e750b1b510fb8d4217f0f5b0..d4bbcc7bf143b593c38da82e469efd4358c48ab0 100644 (file)
--- a/tizen/src/emulator.h
+++ b/tizen/src/emulator.h
@@ -43,6 +43,7 @@
 extern char tizen_target_path[MAXLEN];
 
 void exit_emulator(void);
+char* get_bin_path(void);
 void set_image_and_log_path(char *qemu_argv);
 void redir_output(void);
 void extract_qemu_info(int qemu_argc, char **qemu_argv);

diff --git a/tizen/src/skin/maruskin_client.c b/tizen/src/skin/maruskin_client.c
index 351cb56f3798062c343ea212133565d01853cd90..fe209dc4714d017fb510baa33b97db6c2de878f2 100644 (file)
--- a/tizen/src/skin/maruskin_client.c
+++ b/tizen/src/skin/maruskin_client.c
@@ -101,7 +101,11 @@ static void* run_skin_client(void* arg)
     }
 #endif
 
-    int len = strlen(JAVA_EXEFILE_PATH) + strlen(JAVA_EXEOPTION) + strlen(JAR_SKINFILE_PATH) +
+    char* bin_dir = get_bin_path();
+    INFO("bin directory : %s\n", bin_dir);
+
+    int len = strlen(JAVA_EXEFILE_PATH) + strlen(JAVA_EXEOPTION) +
+        strlen(bin_dir) + strlen(JAR_SKINFILE) +
         strlen(OPT_SVR_PORT) + strlen(buf_skin_server_port) + strlen(OPT_UID) + strlen(buf_uid) +
         strlen(OPT_VM_PATH) + strlen(vm_path) + strlen(OPT_NET_BASE_PORT) + strlen(buf_tizen_base_port) +
         strlen(argv) + 42;
@@ -110,8 +114,9 @@ static void* run_skin_client(void* arg)
         len = JAVA_MAX_COMMAND_LENGTH;
     }
 
-    snprintf( cmd, len, "%s %s %s=. %s %s=\"%d\" %s=\"%d\" %s=\"%s\" %s=\"%d\" %s",
-        JAVA_EXEFILE_PATH, JAVA_EXEOPTION, JAVA_LIBRARY_PATH, JAR_SKINFILE_PATH,
+    snprintf(cmd, len, "%s %s %s=. %s%s %s=\"%d\" %s=\"%d\" %s=\"%s\" %s=\"%d\" %s",
+        JAVA_EXEFILE_PATH, JAVA_EXEOPTION, JAVA_LIBRARY_PATH,
+        bin_dir, JAR_SKINFILE,
         OPT_SVR_PORT, skin_server_port,
         OPT_UID, uid,
         OPT_VM_PATH, vm_path,
@@ -272,13 +277,19 @@ int start_simple_client(char* msg) {
     }
 #endif
 
-    int len = strlen(JAVA_EXEFILE_PATH) + strlen(JAVA_EXEOPTION) + strlen(JAR_SKINFILE_PATH) +
+    char* bin_dir = get_bin_path();
+    INFO("bin directory : %s\n", bin_dir);
+
+    int len = strlen(JAVA_EXEFILE_PATH) + strlen(JAVA_EXEOPTION) +
+        strlen(bin_dir) + strlen(JAR_SKINFILE) +
         strlen(JAVA_SIMPLEMODE_OPTION) + strlen(msg) + 7;
     if (len > JAVA_MAX_COMMAND_LENGTH) {
         len = JAVA_MAX_COMMAND_LENGTH;
     }
 
-    snprintf(cmd, len, "%s %s %s %s=\"%s\"", JAVA_EXEFILE_PATH, JAVA_EXEOPTION, JAR_SKINFILE_PATH, JAVA_SIMPLEMODE_OPTION, msg);
+    snprintf(cmd, len, "%s %s %s%s %s=\"%s\"",
+        JAVA_EXEFILE_PATH, JAVA_EXEOPTION,
+        bin_dir, JAR_SKINFILE, JAVA_SIMPLEMODE_OPTION, msg);
     INFO("command for swt : %s\n", cmd);
 
 #ifdef CONFIG_WIN32

diff --git a/tizen/src/skin/maruskin_client.h b/tizen/src/skin/maruskin_client.h
index 4ef18553b557e89ebeff003ff308c6ea2ea71beb..32488a9b7d807db8988d9b7b1ee4b4cec7cc6271 100644 (file)
--- a/tizen/src/skin/maruskin_client.h
+++ b/tizen/src/skin/maruskin_client.h
@@ -35,7 +35,7 @@
 
 #define JAVA_MAX_COMMAND_LENGTH 1024
 
-#define JAR_SKINFILE_PATH "emulator-skin.jar"
+#define JAR_SKINFILE "emulator-skin.jar"
 #define JAVA_LIBRARY_PATH "-Djava.library.path"
 
 #ifndef CONFIG_DARWIN