Skip to content

src: use custom fprintf alike to write errors to stderr #31446

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

Closed
addaleax wants to merge 11 commits into from
Closed

src: use custom fprintf alike to write errors to stderr #31446

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
a35bf6b
src: add C++-style sprintf utility
addaleax Jan 21, 2020
ec00fda
src: use custom fprintf alike to write errors to stderr
addaleax Jan 21, 2020
6db1bb7
fixup! src: add C++-style sprintf utility
addaleax Jan 21, 2020
3d90553
fixup! src: use custom fprintf alike to write errors to stderr
addaleax Jan 21, 2020
8824f8b
fixup! src: add C++-style sprintf utility
addaleax Jan 21, 2020
bed1750
fixup! src: use custom fprintf alike to write errors to stderr
addaleax Jan 21, 2020
cb717aa
fixup! fixup! src: add C++-style sprintf utility
addaleax Jan 21, 2020
3a1c801
fixup! fixup! fixup! src: add C++-style sprintf utility
addaleax Jan 21, 2020
a851023
fixup! src: add C++-style sprintf utility
addaleax Jan 22, 2020
bd8c9d6
fixup! src: use custom fprintf alike to write errors to stderr
addaleax Jan 22, 2020
13b9da7
fixup! src: add C++-style sprintf utility
addaleax Jan 22, 2020
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
Prev Previous commit
Next Next commit
fixup! src: use custom fprintf alike to write errors to stderr
  • Loading branch information
@addaleax
addaleax committed Jan 21, 2020
commit 3d905534f2af713725a39781efcc0cf4a6e6a140
15 changes: 11 additions & 4 deletions src/debug_utils.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -442,15 +442,23 @@ std::vector<std::string> NativeSymbolDebuggingContext::GetLoadedLibraries() {
}

void FWrite(FILE* file, const std::string& str) {
if (file != stderr && file != stdout) goto simple_fwrite;
auto simple_fwrite = [&]() {
fwrite(str.data(), str.size(), 1, file);
Comment thread
addaleax marked this conversation as resolved.
Resolved
};

if (file != stderr && file != stdout) {
simple_fwrite();
return;
}
#ifdef _WIN32
HANDLE handle =
GetStdHandle(file == stdout ? STD_OUTPUT_HANDLE : STD_ERROR_HANDLE);

// Check if stderr is something other than a tty/console
if (handle == INVALID_HANDLE_VALUE || handle == nullptr ||
uv_guess_handle(_fileno(file)) != UV_TTY) {
goto simple_fwrite;
simple_fwrite();
return;
}

// Get required wide buffer size
Expand All @@ -469,8 +477,7 @@ void FWrite(FILE* file, const std::string& str) {
return;
}
#endif
simple_fwrite:
fwrite(str.data(), str.size(), 1, file);
simple_fwrite();
}

} // namespace node
Expand Down
2 changes: 1 addition & 1 deletion src/node_errors.cc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -106,7 +106,7 @@ static std::string GetErrorSource(Isolate* isolate,
filename_string,
linenum,
sourceline.c_str());
CHECK_GE(buf.size(), 0);
CHECK_GT(buf.size(), 0);

constexpr int kUnderlineBufsize = 1020;
char underline_buf[kUnderlineBufsize + 4];
Expand Down