[ostree] editor: honor arguments environment variable

[Colin Walters <walters src gnome org>]

commit ce957f864907e665591e02455ed87f70d3ebe930
Author: Giuseppe Scrivano <gscrivan redhat com>
Date:   Fri Jan 16 11:48:50 2015 +0100

    editor: honor arguments environment variable
    
    My EDITOR looks like "EDITOR=emacs -nw", ensure that it is honored.
    
    Signed-off-by: Giuseppe Scrivano <gscrivan redhat com>

 src/ostree/ot-editor.c |    7 ++++++-
 1 files changed, 6 insertions(+), 1 deletions(-)
---
diff --git a/src/ostree/ot-editor.c b/src/ostree/ot-editor.c
index e1ca1a1..608c58b 100644
--- a/src/ostree/ot-editor.c
+++ b/src/ostree/ot-editor.c
@@ -68,6 +68,7 @@ ot_editor_prompt (OstreeRepo *repo,
   GOutputStream *output;
   const char *editor;
   char *ret = NULL;
+  gs_free gchar *args = NULL;
 
   editor = get_editor ();
   if (editor == NULL)
@@ -86,7 +87,11 @@ ot_editor_prompt (OstreeRepo *repo,
       !g_io_stream_close (G_IO_STREAM (io), cancellable, error))
     goto out;
 
-  ctx = gs_subprocess_context_newv (editor, gs_file_get_path_cached (file), NULL);
+  {
+    gs_free gchar *quoted_file = g_shell_quote (gs_file_get_path_cached (file));
+    args = g_strconcat (editor, " ", quoted_file, NULL);
+  }
+  ctx = gs_subprocess_context_newv ("/bin/sh", "-c", args, NULL);
   gs_subprocess_context_set_stdin_disposition (ctx, GS_SUBPROCESS_STREAM_DISPOSITION_INHERIT);
   gs_subprocess_context_set_stdout_disposition (ctx, GS_SUBPROCESS_STREAM_DISPOSITION_INHERIT);
   gs_subprocess_context_set_stderr_disposition (ctx, GS_SUBPROCESS_STREAM_DISPOSITION_INHERIT);