8f309aeb82
The strbuf_getline() interface allows a byte other than LF or NUL as
the line terminator, but this is only because I wrote these
codepaths anticipating that there might be a value other than NUL
and LF that could be useful when I introduced line_termination long
time ago. No useful caller that uses other value has emerged.
By now, it is clear that the interface is overly broad without a
good reason. Many codepaths have hardcoded preference to read
either LF terminated or NUL terminated records from their input, and
then call strbuf_getline() with LF or NUL as the third parameter.
This step introduces two thin wrappers around strbuf_getline(),
namely, strbuf_getline_lf() and strbuf_getline_nul(), and
mechanically rewrites these call sites to call either one of
them. The changes contained in this patch are:
* introduction of these two functions in strbuf.[ch]
* mechanical conversion of all callers to strbuf_getline() with
either '\n' or '\0' as the third parameter to instead call the
respective thin wrapper.
After this step, output from "git grep 'strbuf_getline('" would
become a lot smaller. An interim goal of this series is to make
this an empty set, so that we can have strbuf_getline_crlf() take
over the shorter name strbuf_getline().
Signed-off-by: Junio C Hamano <gitster@pobox.com>
35 lines
933 B
C
35 lines
933 B
C
#include "cache.h"
|
|
#include "sha1-array.h"
|
|
|
|
static void print_sha1(const unsigned char sha1[20], void *data)
|
|
{
|
|
puts(sha1_to_hex(sha1));
|
|
}
|
|
|
|
int main(int argc, char **argv)
|
|
{
|
|
struct sha1_array array = SHA1_ARRAY_INIT;
|
|
struct strbuf line = STRBUF_INIT;
|
|
|
|
while (strbuf_getline_lf(&line, stdin) != EOF) {
|
|
const char *arg;
|
|
unsigned char sha1[20];
|
|
|
|
if (skip_prefix(line.buf, "append ", &arg)) {
|
|
if (get_sha1_hex(arg, sha1))
|
|
die("not a hexadecimal SHA1: %s", arg);
|
|
sha1_array_append(&array, sha1);
|
|
} else if (skip_prefix(line.buf, "lookup ", &arg)) {
|
|
if (get_sha1_hex(arg, sha1))
|
|
die("not a hexadecimal SHA1: %s", arg);
|
|
printf("%d\n", sha1_array_lookup(&array, sha1));
|
|
} else if (!strcmp(line.buf, "clear"))
|
|
sha1_array_clear(&array);
|
|
else if (!strcmp(line.buf, "for_each_unique"))
|
|
sha1_array_for_each_unique(&array, print_sha1, NULL);
|
|
else
|
|
die("unknown command: %s", line.buf);
|
|
}
|
|
return 0;
|
|
}
|