mirror of
https://github.com/freebsd/freebsd-src
synced 2024-09-06 17:18:32 +00:00
Simplify rule retrieval and improve error handling.
MFC after: 1 month Sponsored by: The FreeBSD Foundation
This commit is contained in:
parent
73e900646a
commit
4cf0d89598
Notes:
svn2git
2020-12-20 02:59:44 +00:00
svn path=/head/; revision=291451
|
@ -387,20 +387,24 @@ show_limits(const char *filter, int hflag, int nflag)
|
|||
char *outbuf = NULL;
|
||||
size_t outbuflen = RCTL_DEFAULT_BUFSIZE / 4;
|
||||
|
||||
do {
|
||||
for (;;) {
|
||||
outbuflen *= 4;
|
||||
outbuf = realloc(outbuf, outbuflen);
|
||||
if (outbuf == NULL)
|
||||
err(1, "realloc");
|
||||
error = rctl_get_limits(filter, strlen(filter) + 1,
|
||||
outbuf, outbuflen);
|
||||
if (error == 0)
|
||||
break;
|
||||
if (errno == ERANGE)
|
||||
continue;
|
||||
if (errno == ENOSYS)
|
||||
enosys();
|
||||
warn("rctl_get_limits");
|
||||
free(outbuf);
|
||||
|
||||
error = rctl_get_limits(filter, strlen(filter) + 1, outbuf,
|
||||
outbuflen);
|
||||
if (error && errno != ERANGE) {
|
||||
if (errno == ENOSYS)
|
||||
enosys();
|
||||
warn("rctl_get_limits");
|
||||
}
|
||||
} while (error && errno == ERANGE);
|
||||
return (error);
|
||||
}
|
||||
|
||||
print_rules(outbuf, hflag, nflag);
|
||||
free(outbuf);
|
||||
|
@ -466,20 +470,24 @@ show_usage(const char *filter, int hflag)
|
|||
char *copy, *outbuf = NULL, *tmp;
|
||||
size_t outbuflen = RCTL_DEFAULT_BUFSIZE / 4;
|
||||
|
||||
do {
|
||||
for (;;) {
|
||||
outbuflen *= 4;
|
||||
outbuf = realloc(outbuf, outbuflen);
|
||||
if (outbuf == NULL)
|
||||
err(1, "realloc");
|
||||
error = rctl_get_racct(filter, strlen(filter) + 1,
|
||||
outbuf, outbuflen);
|
||||
if (error == 0)
|
||||
break;
|
||||
if (errno == ERANGE)
|
||||
continue;
|
||||
if (errno == ENOSYS)
|
||||
enosys();
|
||||
warn("rctl_get_racct");
|
||||
free(outbuf);
|
||||
|
||||
error = rctl_get_racct(filter, strlen(filter) + 1, outbuf,
|
||||
outbuflen);
|
||||
if (error && errno != ERANGE) {
|
||||
if (errno == ENOSYS)
|
||||
enosys();
|
||||
warn("rctl_get_racct");
|
||||
}
|
||||
} while (error && errno == ERANGE);
|
||||
return (error);
|
||||
}
|
||||
|
||||
copy = outbuf;
|
||||
while ((tmp = strsep(©, ",")) != NULL) {
|
||||
|
@ -512,19 +520,23 @@ show_rules(const char *filter, int hflag, int nflag)
|
|||
else
|
||||
filterlen = 0;
|
||||
|
||||
do {
|
||||
for (;;) {
|
||||
outbuflen *= 4;
|
||||
outbuf = realloc(outbuf, outbuflen);
|
||||
if (outbuf == NULL)
|
||||
err(1, "realloc");
|
||||
|
||||
error = rctl_get_rules(filter, filterlen, outbuf, outbuflen);
|
||||
if (error && errno != ERANGE) {
|
||||
if (errno == ENOSYS)
|
||||
enosys();
|
||||
warn("rctl_get_rules");
|
||||
}
|
||||
} while (error && errno == ERANGE);
|
||||
if (error == 0)
|
||||
break;
|
||||
if (errno == ERANGE)
|
||||
continue;
|
||||
if (errno == ENOSYS)
|
||||
enosys();
|
||||
warn("rctl_get_rules");
|
||||
free(outbuf);
|
||||
|
||||
return (error);
|
||||
}
|
||||
|
||||
print_rules(outbuf, hflag, nflag);
|
||||
free(outbuf);
|
||||
|
|
Loading…
Reference in a new issue