diff options
author | Philipp Gesang <phg@phi-gamma.net> | 2015-05-08 07:44:11 +0200 |
---|---|---|
committer | Philipp Gesang <phg@phi-gamma.net> | 2015-05-08 07:46:39 +0200 |
commit | 5bf96d61d1a639c607a8d21d475f89031f2c9d5b (patch) | |
tree | 15ad1756ca0c25c3b4a95e0ad834412afea25ccc /src | |
parent | 9b022cd4aa4f4cb8c8dce1c164086da857edbabf (diff) | |
download | vtcol-5bf96d61d1a639c607a8d21d475f89031f2c9d5b.tar.gz |
vtcol.rs: read from stdin if passed dash as file or scheme name
Diffstat (limited to 'src')
-rw-r--r-- | src/vtcol.rs | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/src/vtcol.rs b/src/vtcol.rs index de66928..8e36d0f 100644 --- a/src/vtcol.rs +++ b/src/vtcol.rs @@ -184,13 +184,17 @@ impl<'a> Job { Job::usage(&this, opts); panic!("no file name specified, aborting") }, - Some (fname) => Scheme::Custom(Some(fname.clone())) + Some (fname) => + if fname == "-" { Job::scheme_from_stdin() } + else { Scheme::Custom(Some(fname.clone())) } } } else { match matches.opt_str("s") { - Some (name) => Job::pick_scheme(&name), - None => Job::scheme_from_stdin() + None => Job::scheme_from_stdin(), + Some (name) => + if name == "-" { Job::scheme_from_stdin() } + else { Job::pick_scheme(&name) } } }; /* [let scheme] */ |