Skip to content

libstdbuf: remove crash macro #5565

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 9 commits into from
Nov 30, 2023
Merged

libstdbuf: remove crash macro #5565

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
0a320ea
libstdbuf: remove crash macro
cswn Nov 21, 2023
1761a7d
libstdbuf: remove uucore macro/struct and use gnu messages
cswn Nov 23, 2023
2870484
libstdbuf: remove crash macro
cswn Nov 21, 2023
0db8fbb
libstdbuf: remove uucore macro/struct and use gnu messages
cswn Nov 23, 2023
be2eab2
libstdbuf: remove :? from print by printing file descriptor instead o…
cswn Nov 27, 2023
d71fccb
Merge branch 'main' of github.com:cswn/coreutils into libstdbuf-remov…
cswn Nov 27, 2023
8823244
merge main into libstdbuf-remove-crash-macro
cswn Nov 27, 2023
5e25798
resolve merge conflict
cswn Nov 27, 2023
05c30b1
libstdbuf: remove uucore from dependencies
cswn Nov 28, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 0 additions & 1 deletion Cargo.lock
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

1 change: 0 additions & 1 deletion src/uu/stdbuf/src/libstdbuf/Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,6 @@ crate-type = [
[dependencies]
cpp = "0.5"
libc = { workspace = true }
uucore = { version = ">=0.0.19", package = "uucore", path = "../../../../uucore" }

[build-dependencies]
cpp_build = "0.5"
14 changes: 10 additions & 4 deletions src/uu/stdbuf/src/libstdbuf/src/libstdbuf.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,10 +5,9 @@
// spell-checker:ignore (ToDO) IOFBF IOLBF IONBF cstdio setvbuf

use cpp::cpp;
use libc::{c_char, c_int, size_t, FILE, _IOFBF, _IOLBF, _IONBF};
use libc::{c_char, c_int, fileno, size_t, FILE, _IOFBF, _IOLBF, _IONBF};
use std::env;
use std::ptr;
use uucore::crash;

cpp! {{
#include <cstdio>
Expand Down Expand Up @@ -40,7 +39,10 @@ fn set_buffer(stream: *mut FILE, value: &str) {
input => {
let buff_size: usize = match input.parse() {
Ok(num) => num,
Err(e) => crash!(1, "incorrect size of buffer!: {}", e),
Err(_) => {
eprintln!("failed to allocate a {} byte stdio buffer", value);
std::process::exit(1);
}
};
(_IOFBF, buff_size as size_t)
}
Expand All @@ -52,7 +54,11 @@ fn set_buffer(stream: *mut FILE, value: &str) {
res = libc::setvbuf(stream, buffer, mode, size);
}
if res != 0 {
crash!(res, "error while calling setvbuf!");
eprintln!(
"could not set buffering of {} to mode {}",
unsafe { fileno(stream) },
mode
);
}
}

Expand Down