mirror of
https://github.com/wpilibsuite/allwpilib
synced 2026-06-19 00:41:43 +00:00
63d1fb3bed
This was causing issues with tools, as the launchers would close stdout/stderr, resulting in write failures.
43 lines
2.0 KiB
Diff
43 lines
2.0 KiB
Diff
diff --git a/wpiutil/src/main/native/fmtlib/include/fmt/format-inl.h b/wpiutil/src/main/native/fmtlib/include/fmt/format-inl.h
|
|
index 2c51c50ae..cc89abdd3 100644
|
|
--- a/wpiutil/src/main/native/fmtlib/include/fmt/format-inl.h
|
|
+++ b/wpiutil/src/main/native/fmtlib/include/fmt/format-inl.h
|
|
@@ -92,8 +92,7 @@ FMT_FUNC void report_error(format_func func, int error_code,
|
|
// A wrapper around fwrite that throws on error.
|
|
inline void fwrite_fully(const void* ptr, size_t size, size_t count,
|
|
FILE* stream) {
|
|
- size_t written = std::fwrite(ptr, size, count, stream);
|
|
- if (written < count) FMT_THROW(system_error(errno, "cannot write to file"));
|
|
+ std::fwrite(ptr, size, count, stream);
|
|
}
|
|
|
|
#ifndef FMT_STATIC_THOUSANDS_SEPARATOR
|
|
diff --git a/wpiutil/src/main/native/fmtlib/include/fmt/xchar.h b/wpiutil/src/main/native/fmtlib/include/fmt/xchar.h
|
|
index 55825077f..9acb893fa 100644
|
|
--- a/wpiutil/src/main/native/fmtlib/include/fmt/xchar.h
|
|
+++ b/wpiutil/src/main/native/fmtlib/include/fmt/xchar.h
|
|
@@ -207,8 +207,7 @@ inline void vprint(std::FILE* f, wstring_view fmt, wformat_args args) {
|
|
wmemory_buffer buffer;
|
|
detail::vformat_to(buffer, fmt, args);
|
|
buffer.push_back(L'\0');
|
|
- if (std::fputws(buffer.data(), f) == -1)
|
|
- FMT_THROW(system_error(errno, FMT_STRING("cannot write to file")));
|
|
+ std::fputws(buffer.data(), f);
|
|
}
|
|
|
|
inline void vprint(wstring_view fmt, wformat_args args) {
|
|
diff --git a/wpiutil/src/main/native/fmtlib/src/os.cpp b/wpiutil/src/main/native/fmtlib/src/os.cpp
|
|
index 04b4dc506..4eb3e1fdd 100644
|
|
--- a/wpiutil/src/main/native/fmtlib/src/os.cpp
|
|
+++ b/wpiutil/src/main/native/fmtlib/src/os.cpp
|
|
@@ -277,8 +277,7 @@ std::size_t file::read(void* buffer, std::size_t count) {
|
|
std::size_t file::write(const void* buffer, std::size_t count) {
|
|
rwresult result = 0;
|
|
FMT_RETRY(result, FMT_POSIX_CALL(write(fd_, buffer, convert_rwcount(count))));
|
|
- if (result < 0) FMT_THROW(system_error(errno, "cannot write to file"));
|
|
- return detail::to_unsigned(result);
|
|
+ return count;
|
|
}
|
|
|
|
file file::dup(int fd) {
|