packaging
/
ostree
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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>
This commit is contained in:
Giuseppe Scrivano 2015-01-16 11:48:50 +01:00 committed by Colin Walters
parent f2ae405f9f
commit ce957f8649
1 changed files with 6 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/ostree/ot-editor.c
View File

@ -68,6 +68,7 @@ ot_editor_prompt (OstreeRepo *repo,
GOutputStream *output; GOutputStream *output;
const char *editor; const char *editor;
char *ret = NULL; char *ret = NULL;
gs_free gchar *args = NULL;
editor = get_editor (); editor = get_editor ();
if (editor == NULL) if (editor == NULL)
@ -86,7 +87,11 @@ ot_editor_prompt (OstreeRepo *repo,
!g_io_stream_close (G_IO_STREAM (io), cancellable, error)) !g_io_stream_close (G_IO_STREAM (io), cancellable, error))
goto out; 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_stdin_disposition (ctx, GS_SUBPROCESS_STREAM_DISPOSITION_INHERIT);
gs_subprocess_context_set_stdout_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); gs_subprocess_context_set_stderr_disposition (ctx, GS_SUBPROCESS_STREAM_DISPOSITION_INHERIT);