lf_to_crlf_filter(): tell the caller we added "\n" when draining
This can only happen when the input size is multiple of the buffer size of the cascade filter (16k) and ends with an LF, but in such a case, the code forgot to tell the caller that it added the "\n" it could not add during the last round. Signed-off-by: Junio C Hamano <gitster@pobox.com>
Junio C Hamano committed
Dec 16, 2011 at 14:39 UTC
87afe9a5ed759668e35513c44eacd2fd393ba658
1 file changed
+7
-5
convert.c
+7
-5
@@ -879,7 +879,7 @@ int is_null_stream_filter(struct stream_filter *filter)
879
880
struct lf_to_crlf_filter {
881
struct stream_filter filter;
882
- int want_lf;
882
+ unsigned want_lf:1;
883
};
884
885
static int lf_to_crlf_filter_fn(struct stream_filter *filter,
@@ -895,8 +895,11 @@ static int lf_to_crlf_filter_fn(struct stream_filter *filter,
895
lf_to_crlf->want_lf = 0;
896
}
897
898
- if (!input)
899
- return 0; /* We've already dealt with the state */
898
+ /* We are told to drain */
899
+ if (!input) {
900
+ *osize_p -= o;
901
+ return 0;
902
+ }
903
904
count = *isize_p;
905
if (count) {
@@ -931,10 +934,9 @@ static struct stream_filter_vtbl lf_to_crlf_vtbl = {
934
935
static struct stream_filter *lf_to_crlf_filter(void)
936
{
934
- struct lf_to_crlf_filter *lf_to_crlf = xmalloc(sizeof(*lf_to_crlf));
937
+ struct lf_to_crlf_filter *lf_to_crlf = xcalloc(1, sizeof(*lf_to_crlf));
938
939
lf_to_crlf->filter.vtbl = &lf_to_crlf_vtbl;
937
- lf_to_crlf->want_lf = 0;
940
return (struct stream_filter *)lf_to_crlf;
941
}
942