From: René Scharfe Date: Fri, 01 Oct 2021 09:10:09 GMT Subject: [PATCH 1/9] test-mergesort: use strbuf_getline() Message-ID: <928cb42c-c45b-c90a-c71b-2f6669e03251@web.de> In-Reply-To: <943b1e01-465e-5def-a766-0adf667690de@web.de> Strip line ending characters to make sure empty lines are sorted like sort(1) does. Signed-off-by: René Scharfe --- t/helper/test-mergesort.c | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/t/helper/test-mergesort.c b/t/helper/test-mergesort.c index c5cffaa4b7..621e2a5197 100644 --- a/t/helper/test-mergesort.c +++ b/t/helper/test-mergesort.c @@ -28,9 +28,7 @@ int cmd__mergesort(int argc, const char **argv) struct line *line, *p = NULL, *lines = NULL; struct strbuf sb = STRBUF_INIT; - for (;;) { - if (strbuf_getwholeline(&sb, stdin, '\n')) - break; + while (!strbuf_getline(&sb, stdin)) { line = xmalloc(sizeof(struct line)); line->text = strbuf_detach(&sb, NULL); if (p) { @@ -46,7 +44,7 @@ int cmd__mergesort(int argc, const char **argv) lines = llist_mergesort(lines, get_next, set_next, compare_strings); while (lines) { - printf("%s", lines->text); + puts(lines->text); lines = lines->next; } return 0; -- 2.33.0