matthiasbeyer/imag
1
0
Fork 0
Code Releases Activity

Fix: Pass /dev/tty as stdin for editor

Browse source 
This fixes the issue that spawning the editor trashes the terminal.

The signature of the Runtime::editor() function changed, which has to be
fixed in using code.
This commit is contained in:
Matthias Beyer 2018-03-23 22:24:49 +01:00
parent 0600f1d5f9
commit ea38f2ffbf
2 changed files with 8 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
lib/core/libimagrt/src/error.rs
View file

@ -23,6 +23,7 @@ error_chain! {
} }
foreign_links { foreign_links {
IO(::std::io::Error);
TomlDeError(::toml::de::Error); TomlDeError(::toml::de::Error);
TomlQueryError(::toml_query::error::Error); TomlQueryError(::toml_query::error::Error);
HandlebarsTemplateError(::handlebars::TemplateError); HandlebarsTemplateError(::handlebars::TemplateError);

12
lib/core/libimagrt/src/runtime.rs
View file

@ -39,6 +39,7 @@ use io::OutputProxy;
use libimagerror::trace::*; use libimagerror::trace::*;
use libimagstore::store::Store; use libimagstore::store::Store;
use libimagstore::file_abstraction::InMemoryFileAbstraction; use libimagstore::file_abstraction::InMemoryFileAbstraction;
use libimagutil::debug_result::DebugResult;
use spec::CliSpec; use spec::CliSpec;
/// The Runtime object /// The Runtime object
@ -454,7 +455,7 @@ impl<'a> Runtime<'a> {
} }
/// Get a editor command object which can be called to open the $EDITOR /// Get a editor command object which can be called to open the $EDITOR
pub fn editor(&self) -> Option<Command> { pub fn editor(&self) -> Result<Option<Command>, RuntimeError> {
self.cli() self.cli()
.value_of("editor") .value_of("editor")
.map(String::from) .map(String::from)
@ -466,18 +467,19 @@ impl<'a> Runtime<'a> {
}) })
}) })
.or(env::var("EDITOR").ok()) .or(env::var("EDITOR").ok())
.map(|s| {debug!("Editing with '{}'", s); s}) .ok_or_else(|| RuntimeErrorKind::IOError.into())
.map_dbg(|s| format!("Editing with '{}'", s))
.and_then(|s| { .and_then(|s| {
let mut split = s.split(" "); let mut split = s.split(" ");
let command = split.next(); let command = split.next();
if command.is_none() { if command.is_none() {
return None return Ok(None)
} }
let mut c = Command::new(command.unwrap()); // secured above let mut c = Command::new(command.unwrap()); // secured above
c.args(split); c.args(split);
c.stdin(::std::process::Stdio::null()); c.stdin(::std::fs::File::open("/dev/tty")?);
c.stderr(::std::process::Stdio::inherit()); c.stderr(::std::process::Stdio::inherit());
Some(c) Ok(Some(c))
}) })
} }