Merge commit '5bf6a55912986320c6106459852d8269aed3b0d1'

soramimi · Jun 27, 2024 · 1937de1 · 1937de1
2 parents f88220b + 5bf6a55
commit 1937de1
Showing 1 changed file with 15 additions and 7 deletions.
diff --git a/src/common/strformat.h b/src/common/strformat.h
@@ -752,20 +752,24 @@ class string_formatter {
 	{
 		return format_pointer(val);
 	}
+	void reset_format_params()
+	{
+		upper_ = false;
+		zero_padding_ = false;
+		align_left_ = false;
+		plus_ = false;
+		width_ = -1;
+		precision_ = -1;
+		lflag_ = 0;
+	}
 	void format(std::function<Part *(int)> const &callback, int width, int precision)
 	{
 		if (advance(false)) {
 			if (*next_ == '%') {
 				next_++;
 			}
 
-			upper_ = false;
-			zero_padding_ = false;
-			align_left_ = false;
-			plus_ = false;
-			width_ = -1;
-			precision_ = -1;
-			lflag_ = 0;
+			reset_format_params();
 
 			while (1) {
 				int c = (unsigned char)*next_;
@@ -851,6 +855,10 @@ class string_formatter {
 			}
 
 			head_ = next_;
+		} else {
+			reset_format_params();
+			Part *p = callback('s');
+			add_part(&list_, p);
 		}
 	}
 	int length()