uutils/coreutils
0
0
Fork 0
mirror of https://github.com/uutils/coreutils.git synced 2026-06-10 15:48:22 -07:00
Code Issues Packages Projects Releases Wiki Activity

wc: make --files0-from work with streams

Browse Source
This commit is contained in:
Jed Denlea
2023-05-21 23:59:32 -07:00
parent d58ee5a28a
commit c4b53a44b5
3 changed files with 315 additions and 156 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/uu/wc/src/countable.rs
+1
View File
@@ -28,6 +28,7 @@ impl WordCountable for StdinLock<'_> {
self
}
}
impl WordCountable for File {
type Buffered = BufReader<Self>;
src/uu/wc/src/wc.rs
+301 -147
View File
File diff suppressed because it is too large Load Diff
tests/by-util/test_wc.rs
+13 -9
View File
@@ -424,10 +424,12 @@ fn test_files0_from() {
new_ucmd!()
.args(&["--files0-from=files0_list.txt"])
.run()
.stdout_is(
" 13 109 772 lorem_ipsum.txt\n 18 204 1115 moby_dick.txt\n 5 57 302 \
alice_in_wonderland.txt\n 36 370 2189 total\n",
);
.stdout_is(concat!(
" 13 109 772 lorem_ipsum.txt\n",
" 18 204 1115 moby_dick.txt\n",
" 5 57 302 alice_in_wonderland.txt\n",
" 36 370 2189 total\n",
));
}
#[test]
@@ -436,7 +438,7 @@ fn test_files0_from_with_stdin() {
.args(&["--files0-from=-"])
.pipe_in("lorem_ipsum.txt")
.run()
.stdout_is(" 13 109 772 lorem_ipsum.txt\n");
.stdout_is("13 109 772 lorem_ipsum.txt\n");
}
#[test]
@@ -445,10 +447,12 @@ fn test_files0_from_with_stdin_in_file() {
.args(&["--files0-from=files0_list_with_stdin.txt"])
.pipe_in_fixture("alice_in_wonderland.txt")
.run()
.stdout_is(
" 13 109 772 lorem_ipsum.txt\n 18 204 1115 moby_dick.txt\n 5 57 302 \
-\n 36 370 2189 total\n",
);
.stdout_is(concat!(
" 13 109 772 lorem_ipsum.txt\n",
" 18 204 1115 moby_dick.txt\n",
" 5 57 302 -\n",
" 36 370 2189 total\n",
));
}
#[test]