aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKartik Naik <kartik@bugqore.com>2026-06-26 13:24:53 +0530
committerKartik Naik <kartik@bugqore.com>2026-06-26 13:24:53 +0530
commit8c8af254aa0d8ed50a4d99fe8c60450819f2cbf3 (patch)
treecc67ed627a159cd020ceec50578c49fc787befcd
parent9c3856146a75ac038ffa8e2c089965bb91720236 (diff)
downloadportable-8c8af254aa0d8ed50a4d99fe8c60450819f2cbf3.tar.gz
portable-8c8af254aa0d8ed50a4d99fe8c60450819f2cbf3.tar.bz2
portable-8c8af254aa0d8ed50a4d99fe8c60450819f2cbf3.zip
getdelim: drop comment, give nbuf/nbufsiz function scope
-rw-r--r--crypto/compat/getdelim.c14
1 files changed, 4 insertions, 10 deletions
diff --git a/crypto/compat/getdelim.c b/crypto/compat/getdelim.c
index 2c5a8a0..9bacf0c 100644
--- a/crypto/compat/getdelim.c
+++ b/crypto/compat/getdelim.c
@@ -35,17 +35,12 @@
35ssize_t 35ssize_t
36getdelim(char **buf, size_t *bufsiz, int delimiter, FILE *fp) 36getdelim(char **buf, size_t *bufsiz, int delimiter, FILE *fp)
37{ 37{
38 char *ptr, *eptr; 38 char *ptr, *eptr, *nbuf;
39 size_t nbufsiz;
39 40
40 41
41 /*
42 * Ensure the buffer can hold at least one byte plus the NUL
43 * terminator before the loop writes to it. A caller-supplied
44 * buffer smaller than that is grown rather than overrun.
45 */
46 if (*buf == NULL || *bufsiz < 2) { 42 if (*buf == NULL || *bufsiz < 2) {
47 char *nbuf; 43 nbufsiz = BUFSIZ;
48 size_t nbufsiz = BUFSIZ;
49 if ((nbuf = realloc(*buf, nbufsiz)) == NULL) 44 if ((nbuf = realloc(*buf, nbufsiz)) == NULL)
50 return -1; 45 return -1;
51 *buf = nbuf; 46 *buf = nbuf;
@@ -70,9 +65,8 @@ getdelim(char **buf, size_t *bufsiz, int delimiter, FILE *fp)
70 return ptr - *buf; 65 return ptr - *buf;
71 } 66 }
72 if (ptr + 2 >= eptr) { 67 if (ptr + 2 >= eptr) {
73 char *nbuf;
74 size_t nbufsiz = *bufsiz * 2;
75 ssize_t d = ptr - *buf; 68 ssize_t d = ptr - *buf;
69 nbufsiz = *bufsiz * 2;
76 if ((nbuf = realloc(*buf, nbufsiz)) == NULL) 70 if ((nbuf = realloc(*buf, nbufsiz)) == NULL)
77 return -1; 71 return -1;
78 *buf = nbuf; 72 *buf = nbuf;