From: Junio C Hamano <gitster@pobox.com>
To: git@vger.kernel.org
Subject: [PATCH 3/4] Add LF-to-CRLF streaming conversion
Date: Fri, 20 May 2011 23:58:46 -0700 [thread overview]
Message-ID: <1305961127-26540-4-git-send-email-gitster@pobox.com> (raw)
In-Reply-To: <1305961127-26540-1-git-send-email-gitster@pobox.com>
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>
---
convert.c | 37 +++++++++++++++++++++++++++++++++++++
1 files changed, 37 insertions(+), 0 deletions(-)
diff --git a/convert.c b/convert.c
index 1ec91a3..82fb75b 100644
--- a/convert.c
+++ b/convert.c
@@ -868,6 +868,39 @@ 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 = *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
@@ -892,6 +925,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;
}
--
1.7.5.2.369.g8fc017
next prev parent reply other threads:[~2011-05-21 6:59 UTC|newest]
Thread overview: 12+ messages / expand[flat|nested] mbox.gz Atom feed top
2011-05-21 6:58 [PATCH 0/4] streaming conversion API Junio C Hamano
2011-05-21 6:58 ` [PATCH] convert.h: move declarations for conversion from cache.h Junio C Hamano
2011-05-21 6:58 ` [PATCH 2/4] Add streaming filter API Junio C Hamano
2011-05-21 6:58 ` Junio C Hamano [this message]
2011-05-21 6:58 ` [PATCH 4/4] streaming filter: ident filter and filter cascading Junio C Hamano
2011-05-21 21:05 ` René Scharfe
2011-05-21 21:25 ` René Scharfe
2011-05-25 1:06 ` Junio C Hamano
2011-05-25 2:18 ` [PATCH] t0021: test application of both crlf and ident Junio C Hamano
2011-05-25 2:23 ` [PATCH v2?] streaming: filter cascading Junio C Hamano
2011-05-21 22:08 ` [PATCH 4/4] streaming filter: ident filter and " René Scharfe
2011-05-22 1:00 ` Junio C Hamano
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1305961127-26540-4-git-send-email-gitster@pobox.com \
--to=gitster@pobox.com \
--cc=git@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).