mir/bind
2
0
Fork 0
mirror of https://gitlab.isc.org/isc-projects/bind9 synced 2025-09-02 07:35:26 +00:00
Code Issues Releases Wiki Activity

bring into line w/ man page.

Browse Source
This commit is contained in:
Mark Andrews
2000-12-14 01:03:48 +00:00
parent f815ada673
commit 0de782ac54
2 changed files with 50 additions and 70 deletions
Download Patch File Download Diff File Expand all files Collapse all files

46
bin/check/check-zone.c
View File

@@ -15,7 +15,7 @@
* WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. * WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
*/ */
/* $Id: check-zone.c,v 1.1 2000/12/13 06:05:42 marka Exp $ */ /* $Id: check-zone.c,v 1.2 2000/12/14 01:03:48 marka Exp $ */
#include <config.h> #include <config.h>
@@ -41,7 +41,6 @@
static int debug = 0; static int debug = 0;
static int quiet = 0; static int quiet = 0;
static int stats = 0;
static isc_mem_t *mctx = NULL; static isc_mem_t *mctx = NULL;
dns_zone_t *zone = NULL; dns_zone_t *zone = NULL;
dns_zonetype_t zonetype = dns_zone_master; dns_zonetype_t zonetype = dns_zone_master;
@@ -50,24 +49,17 @@ static const char *dbtype[] = { "rbt" };
#define ERRRET(result, function) \ #define ERRRET(result, function) \
do { \ do { \
if (result != ISC_R_SUCCESS) { \ if (result != ISC_R_SUCCESS) { \
if (!quiet) \
fprintf(stderr, "%s() returned %s\n", \ fprintf(stderr, "%s() returned %s\n", \
function, dns_result_totext(result)); \ function, dns_result_totext(result)); \
return (result); \ return (result); \
} \ } \
} while (0) } while (0)
#define ERRCONT(result, function) \
if (result != ISC_R_SUCCESS) { \
fprintf(stderr, "%s() returned %s\n", \
function, dns_result_totext(result)); \
continue; \
} else \
(void)NULL
static void static void
usage() { usage() {
fprintf(stderr, fprintf(stderr,
"usage: zone_test [-dqs] [-c class] [-f file] zone\n"); "usage: zone_test [-dq] [-c class] zone [filename]\n");
exit(1); exit(1);
} }
@@ -120,20 +112,20 @@ setup(char *zonename, char *filename, char *classname) {
static void static void
destroy(void) { destroy(void) {
if (zone == NULL) if (zone != NULL)
return;
dns_zone_detach(&zone); dns_zone_detach(&zone);
} }
int int
main(int argc, char **argv) { main(int argc, char **argv) {
int c; int c;
char *origin = NULL;
char *filename = NULL; char *filename = NULL;
char *classname = "IN"; char *classname = "IN";
isc_log_t *lctx = NULL; isc_log_t *lctx = NULL;
isc_result_t result; isc_result_t result;
while ((c = isc_commandline_parse(argc, argv, "cdf:qs")) != EOF) { while ((c = isc_commandline_parse(argc, argv, "c:dqs")) != EOF) {
switch (c) { switch (c) {
case 'c': case 'c':
classname = isc_commandline_argument; classname = isc_commandline_argument;
@@ -141,17 +133,9 @@ main(int argc, char **argv) {
case 'd': case 'd':
debug++; debug++;
break; break;
case 'f':
if (filename != NULL)
usage();
filename = isc_commandline_argument;
break;
case 'q': case 'q':
quiet++; quiet++;
break; break;
case 's':
stats++;
break;
default: default:
usage(); usage();
} }
@@ -161,20 +145,26 @@ main(int argc, char **argv) {
usage(); usage();
RUNTIME_CHECK(isc_mem_create(0, 0, &mctx) == ISC_R_SUCCESS); RUNTIME_CHECK(isc_mem_create(0, 0, &mctx) == ISC_R_SUCCESS);
RUNTIME_CHECK(isc_log_create(mctx, &lctx, NULL) == ISC_R_SUCCESS); if (!quiet) {
RUNTIME_CHECK(isc_log_create(mctx, &lctx, NULL) ==
ISC_R_SUCCESS);
isc_log_setcontext(lctx); isc_log_setcontext(lctx);
dns_log_init(lctx); dns_log_init(lctx);
dns_log_setcontext(lctx); dns_log_setcontext(lctx);
}
if (filename == NULL) origin = argv[isc_commandline_index];
isc_commandline_index++;
if (argv[isc_commandline_index] != NULL)
filename = argv[isc_commandline_index]; filename = argv[isc_commandline_index];
result = setup(argv[isc_commandline_index], filename, classname); else
filename = origin;
result = setup(origin, filename, classname);
if (!quiet && result == ISC_R_SUCCESS) if (!quiet && result == ISC_R_SUCCESS)
fprintf(stdout, "OK\n "); fprintf(stdout, "OK\n ");
destroy(); destroy();
if (lctx != NULL)
isc_log_destroy(&lctx); isc_log_destroy(&lctx);
if (!quiet && stats)
isc_mem_stats(mctx, stdout);
isc_mem_destroy(&mctx); isc_mem_destroy(&mctx);
return (result); return ((result == ISC_R_SUCCESS) ? 0 : 1);
} }

46
bin/check/named-checkzone.c
View File

@@ -15,7 +15,7 @@
* WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. * WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
*/ */
/* $Id: named-checkzone.c,v 1.1 2000/12/13 06:05:42 marka Exp $ */ /* $Id: named-checkzone.c,v 1.2 2000/12/14 01:03:48 marka Exp $ */
#include <config.h> #include <config.h>
@@ -41,7 +41,6 @@
static int debug = 0; static int debug = 0;
static int quiet = 0; static int quiet = 0;
static int stats = 0;
static isc_mem_t *mctx = NULL; static isc_mem_t *mctx = NULL;
dns_zone_t *zone = NULL; dns_zone_t *zone = NULL;
dns_zonetype_t zonetype = dns_zone_master; dns_zonetype_t zonetype = dns_zone_master;
@@ -50,24 +49,17 @@ static const char *dbtype[] = { "rbt" };
#define ERRRET(result, function) \ #define ERRRET(result, function) \
do { \ do { \
if (result != ISC_R_SUCCESS) { \ if (result != ISC_R_SUCCESS) { \
if (!quiet) \
fprintf(stderr, "%s() returned %s\n", \ fprintf(stderr, "%s() returned %s\n", \
function, dns_result_totext(result)); \ function, dns_result_totext(result)); \
return (result); \ return (result); \
} \ } \
} while (0) } while (0)
#define ERRCONT(result, function) \
if (result != ISC_R_SUCCESS) { \
fprintf(stderr, "%s() returned %s\n", \
function, dns_result_totext(result)); \
continue; \
} else \
(void)NULL
static void static void
usage() { usage() {
fprintf(stderr, fprintf(stderr,
"usage: zone_test [-dqs] [-c class] [-f file] zone\n"); "usage: zone_test [-dq] [-c class] zone [filename]\n");
exit(1); exit(1);
} }
@@ -120,20 +112,20 @@ setup(char *zonename, char *filename, char *classname) {
static void static void
destroy(void) { destroy(void) {
if (zone == NULL) if (zone != NULL)
return;
dns_zone_detach(&zone); dns_zone_detach(&zone);
} }
int int
main(int argc, char **argv) { main(int argc, char **argv) {
int c; int c;
char *origin = NULL;
char *filename = NULL; char *filename = NULL;
char *classname = "IN"; char *classname = "IN";
isc_log_t *lctx = NULL; isc_log_t *lctx = NULL;
isc_result_t result; isc_result_t result;
while ((c = isc_commandline_parse(argc, argv, "cdf:qs")) != EOF) { while ((c = isc_commandline_parse(argc, argv, "c:dqs")) != EOF) {
switch (c) { switch (c) {
case 'c': case 'c':
classname = isc_commandline_argument; classname = isc_commandline_argument;
@@ -141,17 +133,9 @@ main(int argc, char **argv) {
case 'd': case 'd':
debug++; debug++;
break; break;
case 'f':
if (filename != NULL)
usage();
filename = isc_commandline_argument;
break;
case 'q': case 'q':
quiet++; quiet++;
break; break;
case 's':
stats++;
break;
default: default:
usage(); usage();
} }
@@ -161,20 +145,26 @@ main(int argc, char **argv) {
usage(); usage();
RUNTIME_CHECK(isc_mem_create(0, 0, &mctx) == ISC_R_SUCCESS); RUNTIME_CHECK(isc_mem_create(0, 0, &mctx) == ISC_R_SUCCESS);
RUNTIME_CHECK(isc_log_create(mctx, &lctx, NULL) == ISC_R_SUCCESS); if (!quiet) {
RUNTIME_CHECK(isc_log_create(mctx, &lctx, NULL) ==
ISC_R_SUCCESS);
isc_log_setcontext(lctx); isc_log_setcontext(lctx);
dns_log_init(lctx); dns_log_init(lctx);
dns_log_setcontext(lctx); dns_log_setcontext(lctx);
}
if (filename == NULL) origin = argv[isc_commandline_index];
isc_commandline_index++;
if (argv[isc_commandline_index] != NULL)
filename = argv[isc_commandline_index]; filename = argv[isc_commandline_index];
result = setup(argv[isc_commandline_index], filename, classname); else
filename = origin;
result = setup(origin, filename, classname);
if (!quiet && result == ISC_R_SUCCESS) if (!quiet && result == ISC_R_SUCCESS)
fprintf(stdout, "OK\n "); fprintf(stdout, "OK\n ");
destroy(); destroy();
if (lctx != NULL)
isc_log_destroy(&lctx); isc_log_destroy(&lctx);
if (!quiet && stats)
isc_mem_stats(mctx, stdout);
isc_mem_destroy(&mctx); isc_mem_destroy(&mctx);
return (result); return ((result == ISC_R_SUCCESS) ? 0 : 1);
} }