mirror of
https://github.com/uutils/coreutils.git
synced 2026-06-10 15:48:22 -07:00
Merge pull request #5886 from cakebaker/cut_set_exit_code
cut: set exit code to 1 if directory is specified
This commit is contained in:
@@ -11,7 +11,7 @@ use std::fs::File;
|
||||
use std::io::{stdin, stdout, BufReader, BufWriter, IsTerminal, Read, Write};
|
||||
use std::path::Path;
|
||||
use uucore::display::Quotable;
|
||||
use uucore::error::{FromIo, UResult, USimpleError};
|
||||
use uucore::error::{set_exit_code, FromIo, UResult, USimpleError};
|
||||
use uucore::line_ending::LineEnding;
|
||||
|
||||
use self::searcher::Searcher;
|
||||
@@ -319,6 +319,7 @@ fn cut_files(mut filenames: Vec<String>, mode: &Mode) {
|
||||
|
||||
if path.is_dir() {
|
||||
show_error!("{}: Is a directory", filename.maybe_quote());
|
||||
set_exit_code(1);
|
||||
continue;
|
||||
}
|
||||
|
||||
|
||||
@@ -212,20 +212,25 @@ fn test_zero_terminated_only_delimited() {
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn test_directory_and_no_such_file() {
|
||||
fn test_is_a_directory() {
|
||||
let (at, mut ucmd) = at_and_ucmd!();
|
||||
|
||||
at.mkdir("some");
|
||||
|
||||
ucmd.arg("-b1")
|
||||
.arg("some")
|
||||
.run()
|
||||
.fails()
|
||||
.code_is(1)
|
||||
.stderr_is("cut: some: Is a directory\n");
|
||||
}
|
||||
|
||||
#[test]
|
||||
fn test_no_such_file() {
|
||||
new_ucmd!()
|
||||
.arg("-b1")
|
||||
.arg("some")
|
||||
.run()
|
||||
.fails()
|
||||
.code_is(1)
|
||||
.stderr_is("cut: some: No such file or directory\n");
|
||||
}
|
||||
|
||||
|
||||
Reference in New Issue
Block a user