Changeset d027731b1848a3f06462a0aa71fd9e5926e14c9a

Timestamp:

11/18/10 02:25:20 (3 years ago)

Author:

Nedko Arnaudov <nedko@…>

Children:

c7d0a6a4794f10a73d8c2cb103aa1c33c1b7ce69

Parents:

a88ec8d69f922fad91f61239c8a7c84f915b825c

git-author:

Nedko Arnaudov <nedko@arnaudov.name> / 2010-11-18T02:15:38Z+0200

git-committer:

Nedko Arnaudov <nedko@arnaudov.name> / 2010-11-18T02:25:20Z+0200

Message:

ladishd: start terminal apps through shell

This will allow expansion of env vars used in commandline to happen
when apps are started in terminal. It already happens when apps are
started without terminal.

This breaks the default title, at least for xterm. For it, it is now
set explicitly.

Starting through shell is not used when there is no '$' in the
commandline. This should minimize the title problems when xterm is not
used.

Files:

• daemon/loader.c (modified) (3 diffs)

daemon/loader.c

@@ -256 +256 @@
 #endif
 
-static void loader_exec_program(const char * commandline, const char * working_dir, bool run_in_terminal)
-{
-  const char * argv[4];
+static
+void
+loader_exec_program(
+  const char * commandline,
+  const char * working_dir,
+  bool run_in_terminal,
+  const char * vgraph_name,
+  const char * app_name)
+{
+  const char * argv[8];
+  unsigned int i;
 
   /* for non terminal processes we use forkpty() that calls login_tty() that calls setsid() */
@@ -277 +285 @@
   }
 
+  i = 0;
+
   if (run_in_terminal)
   {
-    if (!conf_get(LADISH_CONF_KEY_DAEMON_TERMINAL, argv))
-    {
-      argv[0] = LADISH_CONF_KEY_DAEMON_TERMINAL_DEFAULT;
-    }
-
-    argv[1] = "-e";
-  }
-  else
-  {
-    if (!conf_get(LADISH_CONF_KEY_DAEMON_SHELL, argv))
-    {
-      argv[0] = LADISH_CONF_KEY_DAEMON_SHELL_DEFAULT;
-    }
-
-    argv[1] = "-c";
-  }
-
-  argv[2] = commandline;
-  argv[3] = NULL;
+    if (!conf_get(LADISH_CONF_KEY_DAEMON_TERMINAL, argv + i))
+    {
+      argv[i] = LADISH_CONF_KEY_DAEMON_TERMINAL_DEFAULT;
+    }
+    i++;
+
+    if (strcmp(argv[0], "xterm") == 0 &&
+        strchr(app_name, '"') == NULL &&
+        strchr(app_name, '\'') == NULL &&
+        strchr(app_name, '`') == NULL)
+    {
+      argv[i++] = "-T";
+      argv[i++] = app_name;
+    }
+
+    argv[i++] = "-e";
+  }
+
+  if (!conf_get(LADISH_CONF_KEY_DAEMON_SHELL, argv + i))
+  {
+    argv[i] = LADISH_CONF_KEY_DAEMON_SHELL_DEFAULT;
+  }
+  i++;
+
+  argv[i++] = "-c";
+
+  argv[i++] = commandline;
+  argv[i++] = NULL;
 
   log_info("Executing '%s' with PID %llu", commandline, (unsigned long long)getpid());
@@ -555 +574 @@
     putenv("LD_PRELOAD=libalsapid.so");
 
-    loader_exec_program(commandline, working_dir, run_in_terminal);
+    loader_exec_program(commandline, working_dir, run_in_terminal, vgraph_name, app_name);
 
     return false;  /* We should never get here */