summaryrefslogtreecommitdiff
path: root/pretty.c
diff options
context:
space:
mode:
authorGovind Salinas <govind@sophiasuchtig.com>2008-03-21 10:05:06 -0500
committerJunio C Hamano <gitster@pobox.com>2008-03-23 00:41:54 -0700
commit42c8c74c1401352b0f388e47a2c9fcd52171c9d3 (patch)
treec51b572505ef9acd9a03b38ff2d433307bd134de /pretty.c
parentbc6100087cfac0293e6ccbea95a24223b724d072 (diff)
downloadgit-42c8c74c1401352b0f388e47a2c9fcd52171c9d3.tar.gz
pretty.c: add %x00 format specifier.
This adds a %xXX format which inserts two hexdigits after %x as a byte value in the resulting string. This can be used to add a NUL byte or any other byte that can make machine parsing easier. It is also necessary to use fwrite to print out the data since printf will terminate if you feed it a NUL. Signed-off-by: Govind Salinas <blix@sophiasuchtig.com> Signed-off-by: Junio C Hamano <gitster@pobox.com>
Diffstat (limited to 'pretty.c')
-rw-r--r--pretty.c11
1 files changed, 11 insertions, 0 deletions
diff --git a/pretty.c b/pretty.c
index 16bfb86cd3..6c04176cb8 100644
--- a/pretty.c
+++ b/pretty.c
@@ -457,6 +457,7 @@ static size_t format_commit_item(struct strbuf *sb, const char *placeholder,
const struct commit *commit = c->commit;
const char *msg = commit->buffer;
struct commit_list *p;
+ int h1, h2;
/* these are independent of the commit */
switch (placeholder[0]) {
@@ -478,6 +479,16 @@ static size_t format_commit_item(struct strbuf *sb, const char *placeholder,
case 'n': /* newline */
strbuf_addch(sb, '\n');
return 1;
+ case 'x':
+ /* %x00 == NUL, %x0a == LF, etc. */
+ if (0 <= (h1 = hexval_table[0xff & placeholder[1]]) &&
+ h1 <= 16 &&
+ 0 <= (h2 = hexval_table[0xff & placeholder[2]]) &&
+ h2 <= 16) {
+ strbuf_addch(sb, (h1<<4)|h2);
+ return 3;
+ } else
+ return 0;
}
/* these depend on the commit */