diff options
author | joe <joe@FreeBSD.org> | 1999-12-06 21:18:32 +0000 |
---|---|---|
committer | joe <joe@FreeBSD.org> | 1999-12-06 21:18:32 +0000 |
commit | a5c97eab80753140cfec015a6f85c1cfaf657634 (patch) | |
tree | a0d42464d7a27bc702e59194a4f323192a3cfb97 /usr.bin/whois | |
parent | 72d1e2ab21d9844e293def2b2744a8ab9e6286ef (diff) | |
download | FreeBSD-src-a5c97eab80753140cfec015a6f85c1cfaf657634.zip FreeBSD-src-a5c97eab80753140cfec015a6f85c1cfaf657634.tar.gz |
Add braces ({}) to all the places that they're missing.
Diffstat (limited to 'usr.bin/whois')
-rw-r--r-- | usr.bin/whois/whois.c | 52 |
1 files changed, 34 insertions, 18 deletions
diff --git a/usr.bin/whois/whois.c b/usr.bin/whois/whois.c index 32f0f7d..0ef3d4b 100644 --- a/usr.bin/whois/whois.c +++ b/usr.bin/whois/whois.c @@ -98,7 +98,7 @@ main(argc, argv) qnichost = NULL; flags = 0; use_qnichost = 0; - while ((ch = getopt(argc, argv, "adgh:impQrR6")) != -1) + while ((ch = getopt(argc, argv, "adgh:impQrR6")) != -1) { switch((char)ch) { case 'a': host = ANICHOST; @@ -137,20 +137,23 @@ main(argc, argv) default: usage(); } + } argc -= optind; argv += optind; - if (!argc) + if (!argc) { usage(); + } memset(&sin, 0, sizeof(sin)); sin.sin_len = sizeof(sin); sin.sin_family = AF_INET; sp = getservbyname("whois", "tcp"); - if (sp == NULL) + if (sp == NULL) { sin.sin_port = htons(WHOIS_PORT); - else + } else { sin.sin_port = sp->s_port; + } /* * If no nic host is specified, use whois-servers.net @@ -159,8 +162,9 @@ main(argc, argv) if (host == NULL) { use_qnichost = 1; host = NICHOST; - if (!(flags & WHOIS_QUICK)) + if (!(flags & WHOIS_QUICK)) { flags |= WHOIS_INIC_FALLBACK | WHOIS_RECURSE; + } } while (argc--) { if (use_qnichost) { @@ -168,14 +172,17 @@ main(argc, argv) free(qnichost); qnichost = NULL; } - for (i = j = 0; (*argv)[i]; i++) - if ((*argv)[i] == '.') + for (i = j = 0; (*argv)[i]; i++) { + if ((*argv)[i] == '.') { j = i; + } + } if (j != 0) { qnichost = (char *) calloc(i - j + 1 + strlen(QNICHOST_TAIL), sizeof(char)); - if (!qnichost) + if (!qnichost) { err(1, "calloc"); + } strcpy(qnichost, *argv + j + 1); strcat(qnichost, QNICHOST_TAIL); @@ -192,9 +199,10 @@ main(argc, argv) } if (!qnichost && inet_aton(host, &sin.sin_addr) == 0) { hp = gethostbyname2(host, AF_INET); - if (hp == NULL) + if (hp == NULL) { errx(EX_NOHOST, "%s: %s", host, hstrerror(h_errno)); + } host = hp->h_name; sin.sin_addr = *(struct in_addr *)hp->h_addr_list[0]; } @@ -216,32 +224,37 @@ whois(name, sinp, flags) int s, nomatch; s = socket(PF_INET, SOCK_STREAM, 0); - if (s < 0) + if (s < 0) { err(EX_OSERR, "socket"); + } - if (connect(s, (struct sockaddr *)sinp, sizeof(*sinp)) < 0) + if (connect(s, (struct sockaddr *)sinp, sizeof(*sinp)) < 0) { err(EX_OSERR, "connect"); + } sfi = fdopen(s, "r"); sfo = fdopen(s, "w"); - if (sfi == NULL || sfo == NULL) + if (sfi == NULL || sfo == NULL) { err(EX_OSERR, "fdopen"); + } (void)fprintf(sfo, "%s\r\n", name); (void)fflush(sfo); nhost = NULL; nomatch = 0; while ((buf = fgetln(sfi, &len))) { - if (buf[len - 2] == '\r') + if (buf[len - 2] == '\r') { buf[len - 2] = '\0'; - else + } else { buf[len - 1] = '\0'; + } if ((flags & WHOIS_RECURSE) && !nhost && (p = strstr(buf, "Whois Server: "))) { p += sizeof("Whois Server: ") - 1; if ((len = strcspn(p, " \t\n\r"))) { - if ((nhost = malloc(len + 1)) == NULL) + if ((nhost = malloc(len + 1)) == NULL) { err(1, "malloc"); + } memcpy(nhost, p, len); nhost[len] = '\0'; } @@ -252,8 +265,9 @@ whois(name, sinp, flags) if ((len = strcspn(p, "\"")) && strncasecmp(name, p, len) == 0 && name[len] == '\0' && - strchr(name, '.') == NULL) + strchr(name, '.') == NULL) { nomatch = 1; + } } (void)puts(buf); } @@ -266,12 +280,14 @@ whois(name, sinp, flags) if (nhost) { if (inet_aton(nhost, &sinp->sin_addr) == 0) { struct hostent *hp = gethostbyname2(nhost, AF_INET); - if (hp == NULL) + if (hp == NULL) { return; + } sinp->sin_addr = *(struct in_addr *)hp->h_addr_list[0]; } - if (!nomatch) + if (!nomatch) { free(nhost); + } whois(name, sinp, 0); } } |