summaryrefslogtreecommitdiff
path: root/convert.c
diff options
context:
space:
mode:
authorJunio C Hamano <gitster@pobox.com>2011-05-20 23:47:56 (GMT)
committerJunio C Hamano <gitster@pobox.com>2011-05-26 23:47:15 (GMT)
commite322ee38ad8d655f5a32b3482ae9ce813b73e4bc (patch)
tree1993de07e6196b7e3ea917d072c3c212be6203cc /convert.c
parent4ae6670444388f5ba68850e42a93af4019922c26 (diff)
downloadgit-e322ee38ad8d655f5a32b3482ae9ce813b73e4bc.zip
git-e322ee38ad8d655f5a32b3482ae9ce813b73e4bc.tar.gz
git-e322ee38ad8d655f5a32b3482ae9ce813b73e4bc.tar.bz2
Add LF-to-CRLF streaming conversion
If we do not have to guess or validate by scanning the input, we can just stream this through. Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'convert.c')
-rw-r--r--convert.c41
1 files changed, 41 insertions, 0 deletions
diff --git a/convert.c b/convert.c
index 4951372..c352d66 100644
--- a/convert.c
+++ b/convert.c
@@ -872,6 +872,43 @@ int is_null_stream_filter(struct stream_filter *filter)
return filter == &null_filter_singleton;
}
+static int lf_to_crlf_filter_fn(struct stream_filter *filter,
+ const char *input, size_t *isize_p,
+ char *output, size_t *osize_p)
+{
+ size_t count;
+
+ if (!input)
+ return 0; /* we do not keep any states */
+ count = *isize_p;
+ if (count) {
+ size_t i, o;
+ for (i = o = 0; o < *osize_p && i < count; i++) {
+ char ch = input[i];
+ if (ch == '\n') {
+ if (o + 1 < *osize_p)
+ output[o++] = '\r';
+ else
+ break;
+ }
+ output[o++] = ch;
+ }
+
+ *osize_p -= o;
+ *isize_p -= i;
+ }
+ return 0;
+}
+
+static struct stream_filter_vtbl lf_to_crlf_vtbl = {
+ lf_to_crlf_filter_fn,
+ null_free_fn,
+};
+
+static struct stream_filter lf_to_crlf_filter_singleton = {
+ &lf_to_crlf_vtbl,
+};
+
/*
* Return an appropriately constructed filter for the path, or NULL if
* the contents cannot be filtered without reading the whole thing
@@ -896,6 +933,10 @@ struct stream_filter *get_stream_filter(const char *path, const unsigned char *s
(crlf_action == CRLF_GUESS && auto_crlf == AUTO_CRLF_FALSE))
return &null_filter_singleton;
+ if (output_eol(crlf_action) == EOL_CRLF &&
+ !(crlf_action == CRLF_AUTO || crlf_action == CRLF_GUESS))
+ return &lf_to_crlf_filter_singleton;
+
return NULL;
}