diff --git a/lib/libevent/Makefile b/lib/libevent/Makefile deleted file mode 100644 index 1299811afe..0000000000 --- a/lib/libevent/Makefile +++ /dev/null @@ -1,30 +0,0 @@ - -PACKAGE=lib${LIB} -.PATH: ${SRCTOP}/contrib/pf/libevent - -.include - -LIB= event -SHLIB_MAJOR= 1 -PRIVATELIB= - -SRCS= buffer.c evbuffer.c event.c kqueue.c log.c poll.c select.c signal.c -INCS= event.h - -CFLAGS+= -I${.CURDIR} \ - -DHAVE_CLOCK_GETTIME \ - -DHAVE_FCNTL_H \ - -DHAVE_POLL \ - -DHAVE_SELECT \ - -DHAVE_SETFD \ - -DHAVE_STDARG_H \ - -DHAVE_SYS_IOCTL_H \ - -DHAVE_SYS_TIME_H \ - -DHAVE_UNISTD_H \ - -DHAVE_VASPRINTF \ - -DHAVE_WORKING_KQUEUE \ - -DVERSION='"1.3b"' - -WARNS?= 2 - -.include diff --git a/lib/libevent/Makefile.depend b/lib/libevent/Makefile.depend deleted file mode 100644 index 6ef78fac5c..0000000000 --- a/lib/libevent/Makefile.depend +++ /dev/null @@ -1,15 +0,0 @@ -# Autogenerated - do NOT edit! - -DIRDEPS = \ - include \ - include/xlocale \ - lib/${CSU_DIR} \ - lib/libc \ - lib/libcompiler_rt \ - - -.include - -.if ${DEP_RELDIR} == ${_DEP_RELDIR} -# local dependencies - needed for -jN in clean tree -.endif diff --git a/lib/libnandfs/Makefile b/lib/libnandfs/Makefile deleted file mode 100644 index df71853cc6..0000000000 --- a/lib/libnandfs/Makefile +++ /dev/null @@ -1,10 +0,0 @@ -# $FreeBSD: stable/11/lib/libnandfs/Makefile 298107 2016-04-16 07:45:30Z gjb $ - -PACKAGE=lib${LIB} -LIB= nandfs -SRCS+= nandfs.c -INCS= libnandfs.h - -CFLAGS += -I${.CURDIR} - -.include diff --git a/lib/libnandfs/Makefile.depend b/lib/libnandfs/Makefile.depend deleted file mode 100644 index 84b8ddd67e..0000000000 --- a/lib/libnandfs/Makefile.depend +++ /dev/null @@ -1,16 +0,0 @@ -# Autogenerated - do NOT edit! - -DIRDEPS = \ - gnu/lib/csu \ - include \ - include/xlocale \ - lib/${CSU_DIR} \ - lib/libc \ - lib/libcompiler_rt \ - - -.include - -.if ${DEP_RELDIR} == ${_DEP_RELDIR} -# local dependencies - needed for -jN in clean tree -.endif diff --git a/lib/libnandfs/libnandfs.h b/lib/libnandfs/libnandfs.h deleted file mode 100644 index 925ea8d730..0000000000 --- a/lib/libnandfs/libnandfs.h +++ /dev/null @@ -1,67 +0,0 @@ -/*- - * SPDX-License-Identifier: BSD-2-Clause-FreeBSD - * - * Copyright (c) 2010-2012 Semihalf. - * All rights reserved. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions - * are met: - * 1. Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * 2. Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer in the - * documentation and/or other materials provided with the distribution. - * - * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND - * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE - * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE - * ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE - * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL - * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS - * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) - * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT - * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY - * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF - * SUCH DAMAGE. - * - * $FreeBSD: stable/11/lib/libnandfs/libnandfs.h 331722 2018-03-29 02:50:57Z eadler $ - */ - -#ifndef _LIBNANDFS_NANDFS_H -#define _LIBNANDFS_NANDFS_H - -struct nandfs { - struct nandfs_fsdata n_fsdata; - struct nandfs_super_block n_sb; - char n_ioc[MNAMELEN]; - char n_dev[MNAMELEN]; - int n_iocfd; - int n_devfd; - int n_flags; - char n_errmsg[120]; -}; - -int nandfs_iserror(struct nandfs *); -const char *nandfs_errmsg(struct nandfs *); - -void nandfs_init(struct nandfs *, const char *); -void nandfs_destroy(struct nandfs *); - -const char *nandfs_dev(struct nandfs *); - -int nandfs_open(struct nandfs *); -void nandfs_close(struct nandfs *); - -int nandfs_get_cpstat(struct nandfs *, struct nandfs_cpstat *); - -ssize_t nandfs_get_cp(struct nandfs *, uint64_t, - struct nandfs_cpinfo *, size_t); - -ssize_t nandfs_get_snap(struct nandfs *, uint64_t, - struct nandfs_cpinfo *, size_t); - -int nandfs_make_snap(struct nandfs *, uint64_t *); -int nandfs_delete_snap(struct nandfs *, uint64_t); - -#endif /* _LIBNANDFS_NANDFS_H */ diff --git a/lib/libnandfs/nandfs.c b/lib/libnandfs/nandfs.c deleted file mode 100644 index a6b24750ba..0000000000 --- a/lib/libnandfs/nandfs.c +++ /dev/null @@ -1,249 +0,0 @@ -/*- - * SPDX-License-Identifier: BSD-2-Clause-FreeBSD - * - * Copyright (c) 2010-2012 Semihalf. - * All rights reserved. - * - * Redistribution and use in source and binary forms, with or without - * modification, are permitted provided that the following conditions - * are met: - * 1. Redistributions of source code must retain the above copyright - * notice, this list of conditions and the following disclaimer. - * 2. Redistributions in binary form must reproduce the above copyright - * notice, this list of conditions and the following disclaimer in the - * documentation and/or other materials provided with the distribution. - * - * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND - * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE - * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE - * ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE - * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL - * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS - * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) - * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT - * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY - * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF - * SUCH DAMAGE. - */ - -#include -__FBSDID("$FreeBSD: stable/11/lib/libnandfs/nandfs.c 331722 2018-03-29 02:50:57Z eadler $"); - -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include - -#include -#include - -#define NANDFS_IS_VALID 0x1 -#define NANDFS_IS_OPENED 0x2 -#define NANDFS_IS_OPENED_DEV 0x4 -#define NANDFS_IS_ERROR 0x8 - -#define DEBUG -#undef DEBUG -#ifdef DEBUG -#define NANDFS_DEBUG(fmt, args...) do { \ - printf("libnandfs:" fmt "\n", ##args); } while (0) -#else -#define NANDFS_DEBUG(fmt, args...) -#endif - -#define NANDFS_ASSERT_VALID(fs) assert((fs)->n_flags & NANDFS_IS_VALID) -#define NANDFS_ASSERT_VALID_DEV(fs) \ - assert(((fs)->n_flags & (NANDFS_IS_VALID | NANDFS_IS_OPENED_DEV)) == \ - (NANDFS_IS_VALID | NANDFS_IS_OPENED_DEV)) - -int -nandfs_iserror(struct nandfs *fs) -{ - - NANDFS_ASSERT_VALID(fs); - - return (fs->n_flags & NANDFS_IS_ERROR); -} - -const char * -nandfs_errmsg(struct nandfs *fs) -{ - - NANDFS_ASSERT_VALID(fs); - - assert(nandfs_iserror(fs)); - assert(fs->n_errmsg); - return (fs->n_errmsg); -} - -static void -nandfs_seterr(struct nandfs *fs, const char *fmt, ...) -{ - va_list ap; - - va_start(ap, fmt); - vsnprintf(fs->n_errmsg, sizeof(fs->n_errmsg), fmt, ap); - va_end(ap); - fs->n_flags |= NANDFS_IS_ERROR; -} - -const char * -nandfs_dev(struct nandfs *fs) -{ - - NANDFS_ASSERT_VALID(fs); - return (fs->n_dev); -} - -void -nandfs_init(struct nandfs *fs, const char *dir) -{ - - snprintf(fs->n_ioc, sizeof(fs->n_ioc), "%s/%s", dir, "."); - fs->n_iocfd = -1; - fs->n_flags = NANDFS_IS_VALID; -} - -void -nandfs_destroy(struct nandfs *fs) -{ - - assert(fs->n_iocfd == -1); - fs->n_flags &= - ~(NANDFS_IS_ERROR | NANDFS_IS_VALID); - assert(fs->n_flags == 0); -} - -int -nandfs_open(struct nandfs *fs) -{ - struct nandfs_fsinfo fsinfo; - - fs->n_flags |= NANDFS_IS_OPENED; - - fs->n_iocfd = open(fs->n_ioc, O_RDONLY, S_IRUSR | S_IWUSR | S_IRGRP | - S_IWGRP | S_IROTH | S_IWOTH); - if (fs->n_iocfd == -1) { - nandfs_seterr(fs, "couldn't open %s: %s", fs->n_ioc, - strerror(errno)); - return (-1); - } - - if (ioctl(fs->n_iocfd, NANDFS_IOCTL_GET_FSINFO, &fsinfo) == -1) { - nandfs_seterr(fs, "couldn't fetch fsinfo: %s", - strerror(errno)); - return (-1); - } - - memcpy(&fs->n_fsdata, &fsinfo.fs_fsdata, sizeof(fs->n_fsdata)); - memcpy(&fs->n_sb, &fsinfo.fs_super, sizeof(fs->n_sb)); - snprintf(fs->n_dev, sizeof(fs->n_dev), "%s", fsinfo.fs_dev); - - return (0); -} - -void -nandfs_close(struct nandfs *fs) -{ - - NANDFS_ASSERT_VALID(fs); - assert(fs->n_flags & NANDFS_IS_OPENED); - - close(fs->n_iocfd); - fs->n_iocfd = -1; - fs->n_flags &= ~NANDFS_IS_OPENED; -} - -int -nandfs_get_cpstat(struct nandfs *fs, struct nandfs_cpstat *cpstat) -{ - - NANDFS_ASSERT_VALID(fs); - - if (ioctl(fs->n_iocfd, NANDFS_IOCTL_GET_CPSTAT, cpstat) == -1) { - nandfs_seterr(fs, "ioctl NANDFS_IOCTL_GET_CPSTAT: %s", - strerror(errno)); - return (-1); - } - - return (0); -} - -static ssize_t -nandfs_get_cpinfo(struct nandfs *fs, uint64_t cno, int mode, - struct nandfs_cpinfo *cpinfo, size_t nci) -{ - struct nandfs_argv args; - - NANDFS_ASSERT_VALID(fs); - - args.nv_base = (u_long)cpinfo; - args.nv_nmembs = nci; - args.nv_index = cno; - args.nv_flags = mode; - - if (ioctl(fs->n_iocfd, NANDFS_IOCTL_GET_CPINFO, &args) == -1) { - nandfs_seterr(fs, "ioctl NANDFS_IOCTL_GET_CPINFO: %s", - strerror(errno)); - return (-1); - } - - return (args.nv_nmembs); -} - -ssize_t -nandfs_get_cp(struct nandfs *fs, uint64_t cno, struct nandfs_cpinfo *cpinfo, - size_t nci) -{ - - return (nandfs_get_cpinfo(fs, cno, NANDFS_CHECKPOINT, cpinfo, nci)); -} - -ssize_t -nandfs_get_snap(struct nandfs *fs, uint64_t cno, struct nandfs_cpinfo *cpinfo, - size_t nci) -{ - - return (nandfs_get_cpinfo(fs, cno, NANDFS_SNAPSHOT, cpinfo, nci)); -} - -int -nandfs_make_snap(struct nandfs *fs, uint64_t *cno) -{ - - NANDFS_ASSERT_VALID(fs); - - if (ioctl(fs->n_iocfd, NANDFS_IOCTL_MAKE_SNAP, cno) == -1) { - nandfs_seterr(fs, "ioctl NANDFS_IOCTL_MAKE_SNAP: %s", - strerror(errno)); - return (-1); - } - - return (0); -} - -int -nandfs_delete_snap(struct nandfs *fs, uint64_t cno) -{ - - NANDFS_ASSERT_VALID(fs); - - if (ioctl(fs->n_iocfd, NANDFS_IOCTL_DELETE_SNAP, &cno) == -1) { - nandfs_seterr(fs, "ioctl NANDFS_IOCTL_DELETE_SNAP: %s", - strerror(errno)); - return (-1); - } - - return (0); -}