git: 037c2f4fe3d0 - stable/13 - libfetch: use more portable getline() interface
Baptiste Daroussin
bapt at FreeBSD.org
Wed Sep 22 10:02:03 UTC 2021
The branch stable/13 has been updated by bapt:
URL: https://cgit.FreeBSD.org/src/commit/?id=037c2f4fe3d0198d5794ed10f6f4086355b8f20c
commit 037c2f4fe3d0198d5794ed10f6f4086355b8f20c
Author: Daniel Kolesa <daniel at octaforge.org>
AuthorDate: 2021-08-17 14:01:46 +0000
Commit: Baptiste Daroussin <bapt at FreeBSD.org>
CommitDate: 2021-09-22 09:57:35 +0000
libfetch: use more portable getline() interface
this is for better portability in order to avoid using a function
which is BSD-only or available via libbsd
(cherry picked from commit ee3ca711a898cf41330c320826ea1e0e6e451f1d)
(cherry picked from commit 635eb7ac7990a2bb29e1992b739617a9db012bf2)
---
lib/libfetch/http.c | 9 ++++++---
1 file changed, 6 insertions(+), 3 deletions(-)
diff --git a/lib/libfetch/http.c b/lib/libfetch/http.c
index e61e23b1425a..bcb089dc0fc4 100644
--- a/lib/libfetch/http.c
+++ b/lib/libfetch/http.c
@@ -1526,12 +1526,13 @@ http_get_proxy(struct url * url, const char *flags)
static void
http_print_html(FILE *out, FILE *in)
{
- size_t len;
- char *line, *p, *q;
+ ssize_t len = 0;
+ size_t cap;
+ char *line = NULL, *p, *q;
int comment, tag;
comment = tag = 0;
- while ((line = fgetln(in, &len)) != NULL) {
+ while ((len = getline(&line, &cap, in)) >= 0) {
while (len && isspace((unsigned char)line[len - 1]))
--len;
for (p = q = line; q < line + len; ++q) {
@@ -1559,6 +1560,8 @@ http_print_html(FILE *out, FILE *in)
fwrite(p, q - p, 1, out);
fputc('\n', out);
}
+
+ free(line);
}
More information about the dev-commits-src-all
mailing list