Skip to content

use memory_buffer to make color print behave atomic #1348 #1351

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
Oct 10, 2019
Merged

use memory_buffer to make color print behave atomic #1348 #1351

Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
3ce69f4
use memory_buffer to make color print behave atomic #1348
tankiJong Oct 9, 2019
d5e3967
properly use retset_color to append the reset_color marker
tankiJong Oct 9, 2019
aaae35f
update implementation, formatting
tankiJong Oct 10, 2019
b9a4b54
add terminator
tankiJong Oct 10, 2019
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
20 changes: 13 additions & 7 deletions include/fmt/color.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -504,24 +504,30 @@ template <typename S, typename Char = char_t<S> >
void vprint(std::FILE* f, const text_style& ts, const S& format,
basic_format_args<buffer_context<Char> > args) {
bool has_style = false;
basic_memory_buffer<Char> buf;
if (ts.has_emphasis()) {
has_style = true;
internal::fputs<Char>(internal::make_emphasis<Char>(ts.get_emphasis()), f);
auto emphasis = internal::make_emphasis<Char>(ts.get_emphasis());
buf.append(emphasis.begin(), emphasis.end());
}
if (ts.has_foreground()) {
has_style = true;
internal::fputs<Char>(
internal::make_foreground_color<Char>(ts.get_foreground()), f);
auto foreground =
internal::make_foreground_color<Char>(ts.get_foreground());
buf.append(foreground.begin(), foreground.end());
}
if (ts.has_background()) {
has_style = true;
internal::fputs<Char>(
internal::make_background_color<Char>(ts.get_background()), f);
auto background =
internal::make_background_color<Char>(ts.get_background());
buf.append(background.begin(), background.end());
}
vprint(f, format, args);
vformat_to(buf, format, args);
if (has_style) {
internal::reset_color<Char>(f);
internal::reset_color<Char>(buf);
}
buf.push_back(Char(0));
internal::fputs(buf.data(), f);
Copy link
Contributor

@orivej orivej Oct 10, 2019

Choose a reason for hiding this comment

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

Although it is unusual, the result of formatting args may contain zero bytes, then this fputs will truncate it and will not reset the color.

Copy link
Contributor Author

@tankiJong tankiJong Oct 10, 2019

Choose a reason for hiding this comment

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

Hi, thanks for bring that up! But I don't think I understand what you mean... Could you give an example?

Copy link
Contributor

@orivej orivej Oct 10, 2019

Choose a reason for hiding this comment

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

See the test in https://github.com/fmtlib/fmt/pull/1356/files

Copy link
Contributor Author

@tankiJong tankiJong Oct 11, 2019

Choose a reason for hiding this comment

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

Ah.. Yes, that's a good point, in case there is a terminator in the string, that won't work.

}

/**
Expand Down