Merge lp:~vanvugt/mir/fix-1676320 into lp:mir

[Daniel van Vugt]

mirout: Add support for -- after actions (LP: #1676320)

For example: mirout rotate right -- --desktop_file_hint=unity8

[Alan Griffiths (alan-griffiths)]

Sure. (one perfect day we'll dispense with all this "--desktop_file_hint" inconvenience and folks will wonder "why?")

review: Approve

[Mir CI Bot (mir-ci-bot)]

PASSED: Continuous integration, rev:4118
https://mir-jenkins.ubuntu.com/job/mir-ci/3249/
Executed test runs:
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-mir/4375
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-0-fetch/4462
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-1-sourcepkg/release=vivid+overlay/4452
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-1-sourcepkg/release=xenial+overlay/4452
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-1-sourcepkg/release=zesty/4452
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=amd64,compiler=clang,platform=mesa,release=zesty/4407
        deb: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=amd64,compiler=clang,platform=mesa,release=zesty/4407/artifact/output/*zip*/output.zip
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=amd64,compiler=gcc,platform=mesa,release=xenial+overlay/4407
        deb: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=amd64,compiler=gcc,platform=mesa,release=xenial+overlay/4407/artifact/output/*zip*/output.zip
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=amd64,compiler=gcc,platform=mesa,release=zesty/4407
        deb: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=amd64,compiler=gcc,platform=mesa,release=zesty/4407/artifact/output/*zip*/output.zip
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=cross-armhf,compiler=gcc,platform=android,release=vivid+overlay/4407
        deb: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=cross-armhf,compiler=gcc,platform=android,release=vivid+overlay/4407/artifact/output/*zip*/output.zip
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=i386,compiler=gcc,platform=android,release=vivid+overlay/4407
        deb: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=i386,compiler=gcc,platform=android,release=vivid+overlay/4407/artifact/output/*zip*/output.zip
    SUCCESS: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=i386,compiler=gcc,platform=mesa,release=xenial+overlay/4407
        deb: https://mir-jenkins.ubuntu.com/job/build-2-binpkg-mir/arch=i386,compiler=gcc,platform=mesa,release=xenial+overlay/4407/artifact/output/*zip*/output.zip

Click here to trigger a rebuild:
https://mir-jenkins.ubuntu.com/job/mir-ci/3249/rebuild

review: Approve (continuous-integration)

=== modified file 'src/utils/out.c'
--- src/utils/out.c	2017-02-17 08:46:05 +0000
+++ src/utils/out.c	2017-03-27 09:20:48 +0000
@@ -184,7 +184,16 @@
     char** action_end = actionv + actionc;
     for (char** action = actionv; action < action_end; ++action)
     {
-        if (!strcmp(*action, "output"))
+        if (!strcmp(*action, "--"))
+        {
+            /*
+             * -- is the only dash option which will and must occur near the
+             * end of the command line. So we need to not misinterpret that
+             * as a command.
+             */
+            return true;
+        }
+        else if (!strcmp(*action, "output"))
         {
             int output_id;
             if (++action < action_end && 1 == sscanf(*action, "%d", &output_id))