remove isc_glob

the isc_glob module was originally needed to support posix-style glob
processing on Windows, but is now just an unnecessary wrapper around
glob(3). this commit removes it.

diff --git a/lib/isc/Makefile.am b/lib/isc/Makefile.am
index 3876a1ce0ebeb49559c8aba5920b1e4d7a087890..6689e45c08e4b6352b5931e408baace065c291f9 100644 (file)
--- a/lib/isc/Makefile.am
+++ b/lib/isc/Makefile.am
@@ -32,7 +32,6 @@ libisc_la_HEADERS =                   \
        include/isc/fsaccess.h          \
        include/isc/fuzz.h              \
        include/isc/getaddresses.h      \
-       include/isc/glob.h              \
        include/isc/hash.h              \
        include/isc/hashmap.h           \
        include/isc/heap.h              \
@@ -133,7 +132,6 @@ libisc_la_SOURCES =         \
        fsaccess_common.c       \
        fsaccess_common_p.h     \
        getaddresses.c          \
-       glob.c                  \
        hash.c                  \
        hashmap.c               \
        heap.c                  \

diff --git a/lib/isc/glob.c b/lib/isc/glob.c
deleted file mode 100644 (file)
index 71e6e6f..0000000
--- a/lib/isc/glob.c
+++ /dev/null
@@ -1,52 +0,0 @@
-/*
- * Copyright (C) Internet Systems Consortium, Inc. ("ISC")
- *
- * SPDX-License-Identifier: MPL-2.0
- *
- * This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, you can obtain one at https://mozilla.org/MPL/2.0/.
- *
- * See the COPYRIGHT file distributed with this work for additional
- * information regarding copyright ownership.
- */
-
-#include <errno.h>
-#include <glob.h>
-#include <stdio.h>
-#include <string.h>
-
-#include <isc/errno.h>
-#include <isc/glob.h>
-#include <isc/result.h>
-#include <isc/types.h>
-#include <isc/util.h>
-
-isc_result_t
-isc_glob(const char *pattern, glob_t *pglob) {
-       REQUIRE(pattern != NULL);
-       REQUIRE(*pattern != '\0');
-       REQUIRE(pglob != NULL);
-
-       int rc = glob(pattern, GLOB_ERR, NULL, pglob);
-
-       switch (rc) {
-       case 0:
-               return (ISC_R_SUCCESS);
-
-       case GLOB_NOMATCH:
-               return (ISC_R_FILENOTFOUND);
-
-       case GLOB_NOSPACE:
-               return (ISC_R_NOMEMORY);
-
-       default:
-               return (errno != 0 ? isc_errno_toresult(errno) : ISC_R_IOERROR);
-       }
-}
-
-void
-isc_globfree(glob_t *pglob) {
-       REQUIRE(pglob != NULL);
-       globfree(pglob);
-}

diff --git a/lib/isc/include/isc/glob.h b/lib/isc/include/isc/glob.h
deleted file mode 100644 (file)
index c9e8d19..0000000
--- a/lib/isc/include/isc/glob.h
+++ /dev/null
@@ -1,43 +0,0 @@
-/*
- * Copyright (C) Internet Systems Consortium, Inc. ("ISC")
- *
- * SPDX-License-Identifier: MPL-2.0
- *
- * This Source Code Form is subject to the terms of the Mozilla Public
- * License, v. 2.0. If a copy of the MPL was not distributed with this
- * file, you can obtain one at https://mozilla.org/MPL/2.0/.
- *
- * See the COPYRIGHT file distributed with this work for additional
- * information regarding copyright ownership.
- */
-
-#pragma once
-
-#include <isc/lang.h>
-#include <isc/result.h>
-
-#if HAVE_GLOB_H
-#include <glob.h>
-#else
-#include <stddef.h>
-
-#include <isc/mem.h>
-
-typedef struct {
-       size_t     gl_pathc;
-       char     **gl_pathv;
-       isc_mem_t *mctx;
-       void      *reserved;
-} glob_t;
-
-#endif
-
-ISC_LANG_BEGINDECLS
-
-isc_result_t
-isc_glob(const char *pattern, glob_t *pglob);
-
-void
-isc_globfree(glob_t *pglob);
-
-ISC_LANG_ENDDECLS