From 73cf8658dacf406d6781cfb3b69ff428e47df943 Mon Sep 17 00:00:00 2001 From: "Brett T. Warden" Date: Thu, 26 Jan 2023 14:29:27 -0800 Subject: [PATCH] Add a newline after hostname entry Always add a newline after printing the hostname: entry, just in case userdata API call returns *just* the hostname. Update the test data to just such a bare hostname. Fixes #59 --- src/ucd-data-fetch.c | 15 ++++++++++----- tests/fetch_data/hostname | 2 +- 2 files changed, 11 insertions(+), 6 deletions(-) diff --git a/src/ucd-data-fetch.c b/src/ucd-data-fetch.c index d45ccdf..ffa87f1 100644 --- a/src/ucd-data-fetch.c +++ b/src/ucd-data-fetch.c @@ -445,11 +445,16 @@ int main(int argc, char *argv[]) { } /* don't write part #2 if 404 or some non-error */ - if ((result != 2) && (write_lines(out, f, cl, "hostname: ") != 0)) { - close(out); - fclose(f); - unlink(outpath); - FAIL("write_lines()"); + if (result != 2) { + if (write_lines(out, f, cl, "hostname: ") != 0) { + close(out); + fclose(f); + unlink(outpath); + FAIL("write_lines()"); + } + + /* Write an extra linefeed in case userdata hostname didn't end with one */ + write(out, "\n", 1); } /* cleanup */ diff --git a/tests/fetch_data/hostname b/tests/fetch_data/hostname index f162297..14c672e 100644 --- a/tests/fetch_data/hostname +++ b/tests/fetch_data/hostname @@ -1 +1 @@ -myhostname +myhostname \ No newline at end of file