Support color printing strings with zero bytes

orivej · orivej · commit 7fd7ef32c22e · 2019-10-11T18:48:43.000Z
This is a clean up after #1351.
diff --git a/include/fmt/color.h b/include/fmt/color.h
@@ -503,8 +503,7 @@ void vprint(std::FILE* f, const text_style& ts, const S& format,
             basic_format_args<buffer_context<Char> > args) {
   basic_memory_buffer<Char> buf;
   internal::vformat_to(buf, ts, to_string_view(format), args);
-  buf.push_back(Char(0));
-  internal::fputs(buf.data(), f);
+  std::fwrite(buf.data(), 1, buf.size(), f);
 }
 
 /**
diff --git a/test/color-test.cc b/test/color-test.cc
@@ -45,6 +45,8 @@ TEST(ColorsTest, ColorsPrint) {
   EXPECT_WRITE(stdout,
                fmt::print(bg(fmt::terminal_color::bright_magenta), "tbmagenta"),
                "\x1b[105mtbmagenta\x1b[0m");
+  EXPECT_WRITE(stdout, fmt::print(fmt::emphasis::bold, "{}", std::string("a\0b", 3)),
+               std::string("\x1b[1ma\0b\x1b[0m", 11));
 }
 
 TEST(ColorsTest, Format) {

Original file line number	Diff line number	Diff line change
`@@ -503,8 +503,7 @@ void vprint(std::FILE* f, const text_style& ts, const S& format,`
`503`	`503`	`basic_format_args<buffer_context<Char> > args) {`
`504`	`504`	`basic_memory_buffer<Char> buf;`
`505`	`505`	`internal::vformat_to(buf, ts, to_string_view(format), args);`
`506`		`- buf.push_back(Char(0));`
`507`		`- internal::fputs(buf.data(), f);`
	`506`	`+ std::fwrite(buf.data(), 1, buf.size(), f);`
`508`	`507`	`}`
`509`	`508`
`510`	`509`	`/**`
Original file line number	Diff line number	Diff line change
`@@ -45,6 +45,8 @@ TEST(ColorsTest, ColorsPrint) {`
`45`	`45`	`EXPECT_WRITE(stdout,`
`46`	`46`	`fmt::print(bg(fmt::terminal_color::bright_magenta), "tbmagenta"),`
`47`	`47`	`"\x1b[105mtbmagenta\x1b[0m");`
	`48`	`+ EXPECT_WRITE(stdout, fmt::print(fmt::emphasis::bold, "{}", std::string("a\0b", 3)),`
	`49`	`+ std::string("\x1b[1ma\0b\x1b[0m", 11));`
`48`	`50`	`}`
`49`	`51`
`50`	`52`	`TEST(ColorsTest, Format) {`