diff options
| author |   naddy <naddy@openbsd.org> | 2021-02-03 14:41:40 +0000 |
|---|---|---|
| committer | naddy <naddy@openbsd.org> | 2021-02-03 14:41:40 +0000 |
| commit | 5f012d926be75ece24c996bafabacc30738fabe5 (patch) | |
| tree | ad5970c20457d53e6fb43c719d79c20e11334038 | |
| parent | Turns off the direct ACK on every other segment (diff) | |
| download | wireguard-openbsd-5f012d926be75ece24c996bafabacc30738fabe5.tar.xz wireguard-openbsd-5f012d926be75ece24c996bafabacc30738fabe5.zip | |
unbreak getline() conversion in disklabel
| -rw-r--r-- | sbin/disklabel/editor.c | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/sbin/disklabel/editor.c b/sbin/disklabel/editor.c index 07e8250cef4..a7d9983a54c 100644 --- a/sbin/disklabel/editor.c +++ b/sbin/disklabel/editor.c @@ -1,4 +1,4 @@ -/* $OpenBSD: editor.c,v 1.365 2021/02/02 15:42:00 naddy Exp $ */ +/* $OpenBSD: editor.c,v 1.366 2021/02/03 14:41:40 naddy Exp $ */ /* * Copyright (c) 1997-2000 Todd C. Miller <millert@openbsd.org> @@ -2331,8 +2331,8 @@ void parse_autotable(char *filename) { FILE *cfile; - size_t bufsize = 0; - char *buf = NULL, *t; + size_t linesize = 0; + char *line = NULL, *buf, *t; uint idx = 0, pctsum = 0; struct space_allocation *sa; @@ -2342,7 +2342,7 @@ parse_autotable(char *filename) err(1, NULL); alloc_table_nitems = 1; - while (getline(&buf, &bufsize, cfile) != -1) { + while (getline(&line, &linesize, cfile) != -1) { if ((alloc_table[0].table = reallocarray(alloc_table[0].table, idx + 1, sizeof(*sa))) == NULL) err(1, NULL); @@ -2350,6 +2350,7 @@ parse_autotable(char *filename) memset(sa, 0, sizeof(*sa)); idx++; + buf = line; if ((sa->mp = get_token(&buf)) == NULL || (sa->mp[0] != '/' && strcmp(sa->mp, "swap"))) errx(1, "%s: parse error on line %u", filename, idx); @@ -2367,7 +2368,7 @@ parse_autotable(char *filename) if (pctsum > 100) errx(1, "%s: sum of extra space allocation > 100%%", filename); alloc_table[0].sz = idx; - free(buf); + free(line); fclose(cfile); } |