1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
|
Index: exo-open/main.c
===================================================================
--- exo-open/main.c (revision 30250)
+++ exo-open/main.c (revision 30251)
@@ -36,7 +36,17 @@
#include <exo/exo.h>
+/**
+ * For testing this code the following commands should work:
+ *
+ * exo-open --launch WebBrowser http://xfce.org (bug #5461).
+ * exo-open http://xfce.org
+ * exo-open --launch TerminalEmulator ./script.sh 'something with a space' 'nospace' (bug #5132).
+ * exo-open --launch TerminalEmulator ssh -l username some.host.com
+ **/
+
+
static gboolean opt_help = FALSE;
static gboolean opt_version = FALSE;
static gchar *opt_launch = NULL;
@@ -143,6 +153,8 @@
{
if (argc > 1)
{
+ /* NOTE: see the comment at the top of this document! */
+
/* combine all specified parameters to one parameter string */
join = g_string_new (NULL);
for (i = 1; argv[i] != NULL; i++)
@@ -150,11 +162,18 @@
/* separate the arguments */
if (i > 1)
join = g_string_append_c (join, ' ');
-
- /* append the quoted argument */
- quoted = g_shell_quote (argv[i]);
- join = g_string_append (join, quoted);
- g_free (quoted);
+
+ /* only quote arguments with spaces */
+ if (strchr (argv[i], ' ') != NULL)
+ {
+ quoted = g_shell_quote (argv[i]);
+ join = g_string_append (join, quoted);
+ g_free (quoted);
+ }
+ else
+ {
+ join = g_string_append (join, argv[i]);
+ }
}
parameter = g_string_free (join, FALSE);
}
@@ -163,6 +182,10 @@
parameter = NULL;
}
+#ifndef NDEBUG
+ g_message ("launch=%s, wd=%s, parameters (%d)=%s", opt_launch, opt_working_directory, argc, parameter);
+#endif
+
/* run the preferred application */
if (!exo_execute_preferred_application (opt_launch, parameter, opt_working_directory, NULL, &err))
{
|
