From: Junio C Hamano <gitster@pobox.com>
To: Jeff King <peff@peff.net>
Cc: Johannes Schindelin <Johannes.Schindelin@gmx.de>, git@vger.kernel.org
Subject: Re: What's cooking in git.git (Jan 2016, #02; Mon, 11)
Date: Wed, 13 Jan 2016 15:54:05 -0800 [thread overview]
Message-ID: <xmqqlh7tkpcy.fsf@gitster.mtv.corp.google.com> (raw)
In-Reply-To: <xmqqpox5kpsy.fsf@gitster.mtv.corp.google.com> (Junio C. Hamano's message of "Wed, 13 Jan 2016 15:44:29 -0800")
Junio C Hamano <gitster@pobox.com> writes:
> My plan is to use a function pointer to switch between them. A code
> like the above in practice look more like
>
> (1) there is a config/option parser that sets line_terminator that
> is typically a file-scope global.
>
> if (z_option)
> line_terminator = '\0';
> else
> line_terminator = '\n';
>
> (2) the callsite calls getline with it
>
> strbuf_getline(..., line_terminator);
>
> So we can introduce a file-scope global, (*getline_fn)(), and then
> tweak (1) by removing line_terminator and replacing the assignment
> with an assignment to getline_fn.
And after doing the obvious wholesale replacement on callers that
hardcode either '\n' or '\0' with this:
#!/bin/sh
perl -i -p -e '
s/strbuf_getline\((.*?), '\''\\n'\''\)/strbuf_getline_lf($1)/g;
s/strbuf_getline\((.*?), '\''\\0'\''\)/strbuf_getline_nul($1)/g;
' "$@"
the only direct callers of strbuf_getline() that remain in the tree
are check-attr, check-ignore, checkout-index and mktree.
And the conversion of mktree would look like this. I might further
tweak it to rename and flip the polarity of lf_lines to nul_lines,
but I do not think that matters very much.
builtin/mktree.c | 15 +++++++++------
strbuf.h | 3 +++
2 files changed, 12 insertions(+), 6 deletions(-)
diff --git a/builtin/mktree.c b/builtin/mktree.c
index a964d6b..7633d35 100644
--- a/builtin/mktree.c
+++ b/builtin/mktree.c
@@ -65,7 +65,7 @@ static const char *mktree_usage[] = {
NULL
};
-static void mktree_line(char *buf, size_t len, int line_termination, int allow_missing)
+static void mktree_line(char *buf, size_t len, int lf_lines, int allow_missing)
{
char *ptr, *ntr;
unsigned mode;
@@ -97,7 +97,7 @@ static void mktree_line(char *buf, size_t len, int line_termination, int allow_m
*ntr++ = 0; /* now at the beginning of SHA1 */
path = ntr + 41; /* at the beginning of name */
- if (line_termination && path[0] == '"') {
+ if (lf_lines && path[0] == '"') {
struct strbuf p_uq = STRBUF_INIT;
if (unquote_c_style(&p_uq, path, NULL))
die("invalid quoting");
@@ -141,13 +141,14 @@ int cmd_mktree(int ac, const char **av, const char *prefix)
{
struct strbuf sb = STRBUF_INIT;
unsigned char sha1[20];
- int line_termination = '\n';
+ int lf_lines = 1;
int allow_missing = 0;
int is_batch_mode = 0;
int got_eof = 0;
+ strbuf_getline_fn getline_fn;
const struct option option[] = {
- OPT_SET_INT('z', NULL, &line_termination, N_("input is NUL terminated"), '\0'),
+ OPT_SET_INT('z', NULL, &lf_lines, N_("input is NUL terminated"), '\0'),
OPT_SET_INT( 0 , "missing", &allow_missing, N_("allow missing objects"), 1),
OPT_SET_INT( 0 , "batch", &is_batch_mode, N_("allow creation of more than one tree"), 1),
OPT_END()
@@ -155,9 +156,11 @@ int cmd_mktree(int ac, const char **av, const char *prefix)
ac = parse_options(ac, av, prefix, option, mktree_usage, 0);
+ getline_fn = lf_lines ? strbuf_getline_lf : strbuf_getline_nul;
+
while (!got_eof) {
while (1) {
- if (strbuf_getline(&sb, stdin, line_termination) == EOF) {
+ if (getline_fn(&sb, stdin) == EOF) {
got_eof = 1;
break;
}
@@ -167,7 +170,7 @@ int cmd_mktree(int ac, const char **av, const char *prefix)
break;
die("input format error: (blank line only valid in batch mode)");
}
- mktree_line(sb.buf, sb.len, line_termination, allow_missing);
+ mktree_line(sb.buf, sb.len, lf_lines, allow_missing);
}
if (is_batch_mode && got_eof && used < 1) {
/*
diff --git a/strbuf.h b/strbuf.h
index db053be..9c8d715 100644
--- a/strbuf.h
+++ b/strbuf.h
@@ -405,6 +405,9 @@ static inline int strbuf_getline_nul(struct strbuf *sb, FILE *fp)
return strbuf_getline(sb, fp, '\0');
}
+typedef int (*strbuf_getline_fn)(struct strbuf *, FILE *);
+
+
/**
* Like `strbuf_getline`, but keeps the trailing terminator (if
* any) in the buffer.
next prev parent reply other threads:[~2016-01-13 23:54 UTC|newest]
Thread overview: 19+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-01-11 23:45 What's cooking in git.git (Jan 2016, #02; Mon, 11) Junio C Hamano
2016-01-12 0:06 ` Mike Hommey
2016-01-12 3:04 ` Junio C Hamano
2016-01-12 4:34 ` Edmundo Carmona Antoranz
2016-01-12 8:39 ` Johannes Schindelin
2016-01-12 18:47 ` Junio C Hamano
2016-01-12 21:49 ` Jeff King
2016-01-13 23:07 ` Junio C Hamano
2016-01-13 23:22 ` Jeff King
2016-01-13 23:44 ` Junio C Hamano
2016-01-13 23:54 ` Junio C Hamano [this message]
2016-01-14 10:21 ` Jeff King
2016-01-13 2:56 ` David A. Greene
2016-01-18 13:35 ` Michael J Gruber
2016-01-18 17:06 ` Jeff King
2016-01-18 21:39 ` Eric Wong
2016-01-19 7:07 ` Michael J Gruber
2016-01-25 9:56 ` Duy Nguyen
2016-01-25 22:03 ` 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
List information: http://vger.kernel.org/majordomo-info.html
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=xmqqlh7tkpcy.fsf@gitster.mtv.corp.google.com \
--to=gitster@pobox.com \
--cc=Johannes.Schindelin@gmx.de \
--cc=git@vger.kernel.org \
--cc=peff@peff.net \
/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.
Code repositories for project(s) associated with this public inbox
https://80x24.org/mirrors/git.git
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 read-only IMAP folder(s) and NNTP newsgroup(s).