tizen 2.3.1 release

[framework/uifw/elementary.git] / src / bin / quicklaunch.c

diff --git a/src/bin/quicklaunch.c b/src/bin/quicklaunch.c
index c9e6de9..d6b8717 100644 (file)
--- a/src/bin/quicklaunch.c
+++ b/src/bin/quicklaunch.c
@@ -9,12 +9,19 @@
 #include <sys/types.h>
 #include <sys/socket.h>
 #include <sys/un.h>
+#ifdef HAVE_ENVIRON
+# define _GNU_SOURCE 1
+#endif
 #include <unistd.h>
 #include <sys/stat.h>
 #include <fcntl.h>
 #include <signal.h>
 #include <sys/wait.h>
 
+#ifdef HAVE_ENVIRON
+extern char **environ;
+#endif
+
 static double restart_time = 0.0;
 
 #define LENGTH_OF_SOCKADDR_UN(s) (strlen((s)->sun_path) + (size_t)(((struct sockaddr_un *)NULL)->sun_path))
@@ -91,20 +98,56 @@ handle_run(int fd, unsigned long bytes)
    unsigned char *buf = NULL;
    int i;
    char **argv = NULL;
+   char **envir = NULL;
    char *cwd;
-   int argc;
+   int argc, envnum;
+   unsigned long off;
 
    buf = alloca(bytes);
-   if (read(fd, buf, bytes) <= 0)
+   if (read(fd, buf, bytes) != (int)bytes)
      {
+        CRITICAL("cannot read %i bytes of args and environment data", (int)bytes);
         close(fd);
         return;
      }
    close(fd);
+   
    argc = ((unsigned long *)(buf))[0];
-   argv = (char **)(&(((unsigned long *)(buf))[1]));
-   for (i = 0; i < argc; i++) argv[i] = (char *)(buf + (unsigned long)argv[i]);
-   cwd = argv[argc - 1] + strlen(argv[argc - 1]) + 1;
+   envnum = ((unsigned long *)(buf))[1];
+
+   if (argc <= 0)
+     {
+        CRITICAL("no executable specified");
+        return;
+     }
+   
+   argv = alloca(argc * sizeof(char *));
+   if (envnum > 0) envir = alloca(envnum * sizeof(char *));
+   off = ((unsigned long *)(buf))[2 + argc + envnum] - sizeof(unsigned long);
+   cwd = (char *)(buf + off);
+
+   for (i = 0; i < argc; i++)
+     {
+        off = ((unsigned long *)(buf))[2 + i] - sizeof(unsigned long);
+        argv[i] = (char *)(buf + off);
+     }
+
+#ifdef HAVE_ENVIRON
+   if (envir)
+     {
+#ifdef HAVE_CLEARENV
+        clearenv();
+#else
+        environ = NULL;
+#endif
+        for (i = 0; i < envnum; i++)
+          {
+             off = ((unsigned long *)(buf))[2 + argc + i] - sizeof(unsigned long);
+             envir[i] = (char *)(buf + off);
+             putenv(envir[i]);
+          }
+     }
+#endif
    elm_quicklaunch_prepare(argc, argv);
    elm_quicklaunch_fork(argc, argv, cwd, post_fork, NULL);
    elm_quicklaunch_cleanup();
@@ -119,6 +162,7 @@ main(int argc, char **argv)
    struct linger lin;
    char buf[PATH_MAX];
    struct sigaction action;
+   const char *disp;
 
    if (!eina_init())
      {
@@ -133,14 +177,16 @@ main(int argc, char **argv)
        _log_dom = EINA_LOG_DOMAIN_GLOBAL;
      }
 
-   if (!getenv("DISPLAY"))
-     {
-       CRITICAL("DISPLAY env var not set");
-       exit(-1);
-     }
+   if (!(disp = getenv("DISPLAY"))) disp = "unknown";
    snprintf(buf, sizeof(buf), "/tmp/elm-ql-%i", getuid());
-   if (stat(buf, &st) < 0) mkdir(buf, S_IRUSR | S_IWUSR | S_IXUSR);
-   snprintf(buf, sizeof(buf), "/tmp/elm-ql-%i/%s", getuid(), getenv("DISPLAY"));
+   if (stat(buf, &st) < 0)
+      if (mkdir(buf, S_IRUSR | S_IWUSR | S_IXUSR) < 0)
+        {
+           CRITICAL("cannot create directory '%s' : %s",
+                buf, strerror(errno));
+           exit(-1);
+        }
+   snprintf(buf, sizeof(buf), "/tmp/elm-ql-%i/%s", getuid(), disp);
    unlink(buf);
    sock = socket(AF_UNIX, SOCK_STREAM, 0);
    if (sock < 0)
@@ -278,10 +324,7 @@ main(int argc, char **argv)
 
             num = read(fd, &bytes, sizeof(unsigned long));
             if (num == sizeof(unsigned long))
-              {
-                 ecore_app_args_set(argc, (const char **)argv);
-                 handle_run(fd, bytes);
-              }
+               handle_run(fd, bytes);
          }
        while (elm_quicklaunch_sub_shutdown() > 0);
      }