diff options
| author | Simon McVittie <smcv@debian.org> | 2012-07-18 18:45:10 +0100 |
|---|---|---|
| committer | Simon McVittie <smcv@debian.org> | 2012-07-18 18:45:10 +0100 |
| commit | 509d9025ad1cbc88619ee3c602d5cd7b1b4a2541 (patch) | |
| tree | 2549eac79bd437337c7560294135c36f8e56841b /tools | |
| parent | b313f4096282ed86c088e0d27f4f0798e5529521 (diff) | |
| download | dbus-509d9025ad1cbc88619ee3c602d5cd7b1b4a2541.tar.gz | |
Imported Upstream version 1.6.4upstream/1.6.4
Diffstat (limited to 'tools')
| -rw-r--r-- | tools/Makefile.in | 2 | ||||
| -rw-r--r-- | tools/dbus-launch-win.c | 7 |
2 files changed, 5 insertions, 4 deletions
diff --git a/tools/Makefile.in b/tools/Makefile.in index 75b963d9..b8e779f6 100644 --- a/tools/Makefile.in +++ b/tools/Makefile.in @@ -1,4 +1,4 @@ -# Makefile.in generated by automake 1.11.5 from Makefile.am. +# Makefile.in generated by automake 1.11.6 from Makefile.am. # @configure_input@ # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, diff --git a/tools/dbus-launch-win.c b/tools/dbus-launch-win.c index ea4bf0dd..215fac3f 100644 --- a/tools/dbus-launch-win.c +++ b/tools/dbus-launch-win.c @@ -130,9 +130,10 @@ main (int argc, char **argv) fprintf (stderr, "%ls %ls\n", dbusDaemonPath, command); #else command[0] = L'\0'; - /* Windows CE has a different interpretation of cmdline: Start with argv[1]. */ - wcscpy_s (command, sizeof (command), dbusDaemonPath); - wcscat_s (command, sizeof (command), L" --session"); + /* Windows cmdline starts with path, which can contain spaces. */ + wcscpy_s (command, sizeof (command), L"\""); + wcscat_s (command, sizeof (command), dbusDaemonPath); + wcscat_s (command, sizeof (command), L"\" --session"); if (verbose) fprintf (stderr, "%ls\n", command); #endif |