[Xfce4-commits] <terminal:master> Don't pre-parse options after -x (bug #9167).

[Nick Schermer]

Updating branch refs/heads/master
         to 8b517a3e0026a68deb966e9c565d4b7a0628cc61 (commit)
       from de3e1c70cc532ff04f0a40d0100ac73f0fb80be2 (commit)

commit 8b517a3e0026a68deb966e9c565d4b7a0628cc61
Author: Nick Schermer <nick at xfce.org>
Date:   Wed Dec 26 01:24:06 2012 +0100

    Don't pre-parse options after -x (bug #9167).

 terminal/terminal-options.c |    4 ++++
 1 files changed, 4 insertions(+), 0 deletions(-)

diff --git a/terminal/terminal-options.c b/terminal/terminal-options.c
index 332d22b..b6f0672 100644
--- a/terminal/terminal-options.c
+++ b/terminal/terminal-options.c
@@ -159,6 +159,10 @@ terminal_options_parse (gint       argc,
       if (argv[n] == NULL || *argv[n] != '-')
         continue;
 
+      /* everything after execute belongs to the command */
+      if (terminal_option_cmp ("execute", 'x', argc, argv, &n, NULL))
+        break;
+
       if (terminal_option_cmp ("help", 'h', argc, argv, &n, NULL))
         *show_help = TRUE;
       else if (terminal_option_cmp ("version", 'V', argc, argv, &n, NULL))