Skip to content

[libc] fwrite_unlocked: only return errno if an actual error occurred. #167350

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 4 commits into from
Nov 10, 2025
Merged

[libc] fwrite_unlocked: only return errno if an actual error occurred. #167350

Changes from 2 commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
2ccd126
[libc] fwrite_unlocked: only return errno if an actual error occurred.
Sterling-Augustine Nov 10, 2025
ccb1b25
FileIOResult is not a std::expected or similar. Don't treat it that way.
Sterling-Augustine Nov 10, 2025
9b0318a
Fix size calculation.
Sterling-Augustine Nov 10, 2025
64fad09
Fix calculation to be against nmemb, not size.
Sterling-Augustine Nov 10, 2025
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
7 changes: 5 additions & 2 deletions libc/src/stdio/printf_core/vfprintf_internal.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -51,8 +51,11 @@ LIBC_INLINE void funlockfile(::FILE *f) { ::funlockfile(f); }
LIBC_INLINE FileIOResult fwrite_unlocked(const void *ptr, size_t size,
size_t nmemb, ::FILE *f) {
// Need to use system errno in this case, as system write will set this errno
// which we need to propagate back into our code.
return {::fwrite_unlocked(ptr, size, nmemb, f), errno};
// which we need to propagate back into our code. fwrite only modifies errno
// if there was an error, and errno may have previously been nonzero. Only
// return errno if there was an error.
auto bytes = ::fwrite_unlocked(ptr, size, nmemb, f);
return {bytes, bytes == nmemb * size ? 0 : errno};
Copy link
Contributor

@jtstogel jtstogel Nov 10, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Docs for fwrite say say that it returns the number of elements written, not bytes (https://man7.org/linux/man-pages/man3/fwrite.3p.html#RETURN_VALUE). Is fwrite_unlocked different?

Copy link
Contributor Author

@Sterling-Augustine Sterling-Augustine Nov 10, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

good catch fixed.

}
#endif // LIBC_COPT_STDIO_USE_SYSTEM_FILE
} // namespace internal
Expand Down
Loading