diff options
| author |   camield <camield@openbsd.org> | 2003-01-19 15:28:12 +0000 |
|---|---|---|
| committer | camield <camield@openbsd.org> | 2003-01-19 15:28:12 +0000 |
| commit | 38afdbc1a88adc351c25d5616c953ad071cc599c (patch) | |
| tree | fdcb47f3e19e1514737cb922a34ca431ef7c2aee | |
| parent | Temporary fix for PR#3069 (thanks for the report, Alex Cichowski), until (diff) | |
| download | wireguard-openbsd-38afdbc1a88adc351c25d5616c953ad071cc599c.tar.xz wireguard-openbsd-38afdbc1a88adc351c25d5616c953ad071cc599c.zip | |
Simplify and KNF anchoropt processing.
ok dhartmei henning
| -rw-r--r-- | sbin/pfctl/pfctl.c | 21 |
1 files changed, 9 insertions, 12 deletions
diff --git a/sbin/pfctl/pfctl.c b/sbin/pfctl/pfctl.c index f027b3b2046..8239818d9ec 100644 --- a/sbin/pfctl/pfctl.c +++ b/sbin/pfctl/pfctl.c @@ -1,4 +1,4 @@ -/* $OpenBSD: pfctl.c,v 1.136 2003/01/19 13:48:06 dhartmei Exp $ */ +/* $OpenBSD: pfctl.c,v 1.137 2003/01/19 15:28:12 camield Exp $ */ /* * Copyright (c) 2001 Daniel Hartmeier @@ -1378,9 +1378,9 @@ main(int argc, char *argv[]) memset(anchorname, 0, sizeof(anchorname)); memset(rulesetname, 0, sizeof(rulesetname)); if (anchoropt != NULL) { - char *t = strchr(anchoropt, ':'); + char *t; - if (t == NULL) { + if ((t = strchr(anchoropt, ':')) == NULL) { if (strlcpy(anchorname, anchoropt, sizeof(anchorname)) >= sizeof(anchorname)) errx(1, "anchor name '%s' too long", @@ -1388,21 +1388,18 @@ main(int argc, char *argv[]) } else { char *p; - if (t == anchoropt || !strlen(t+1)) - errx(1, "anchor names '%s' invalid", anchoropt); - if ((p = malloc(strlen(anchoropt) + 1)) == NULL) - err(1, "malloc"); - strlcpy(p, anchoropt, strlen(anchoropt) + 1); - if ((t = strsep(&p, ":")) == NULL) - errx(1, "anchor names '%s' invalid", - anchoropt); + if ((p = strdup(anchoropt)) == NULL) + err(1, "anchoropt: strdup"); + t = strsep(&p, ":"); + if (*t == '\0' || *p == '\0') + errx(1, "anchor '%s' invalid", anchoropt); if (strlcpy(anchorname, t, sizeof(anchorname)) >= sizeof(anchorname)) errx(1, "anchor name '%s' too long", t); if (strlcpy(rulesetname, p, sizeof(rulesetname)) >= sizeof(rulesetname)) errx(1, "ruleset name '%s' too long", p); - free(t); + free(t); /* not p */ } } |