From f41c5d7661cb1815d3aeb5ab2116937b7a2a7e00 Mon Sep 17 00:00:00 2001 From: perry Date: Mon, 2 Feb 1998 22:52:15 +0000 Subject: [PATCH] it turns out we don't want getvfsbyname after all. --- lib/libc/gen/Makefile.inc | 4 +- lib/libc/gen/getvfsbyname.3 | 100 ------------------------------------ lib/libc/gen/getvfsbyname.c | 85 ------------------------------ 3 files changed, 1 insertion(+), 188 deletions(-) delete mode 100644 lib/libc/gen/getvfsbyname.3 delete mode 100644 lib/libc/gen/getvfsbyname.c diff --git a/lib/libc/gen/Makefile.inc b/lib/libc/gen/Makefile.inc index cb51eb65a9fc..84273137b007 100644 --- a/lib/libc/gen/Makefile.inc +++ b/lib/libc/gen/Makefile.inc @@ -1,10 +1,9 @@ -# $NetBSD: Makefile.inc,v 1.86 1998/02/02 02:41:17 perry Exp $ +# $NetBSD: Makefile.inc,v 1.87 1998/02/02 22:52:15 perry Exp $ # from: @(#)Makefile.inc 8.6 (Berkeley) 5/4/95 # gen sources .PATH: ${.CURDIR}/arch/${MACHINE_ARCH}/gen ${.CURDIR}/gen -# XXX add getvfsbyname.c SRCS+= _errno.c alarm.c assert.c basename.c clock.c closedir.c \ confstr.c ctermid.c ctype_.c daemon.c devname.c dirname.c \ disklabel.c err.c errx.c errlist.c errno.c execl.c execle.c \ @@ -36,7 +35,6 @@ SRCS+= _err.c _errx.c _sys_errlist.c _sys_nerr.c _sys_siglist.c \ .include "${.CURDIR}/arch/${MACHINE_ARCH}/gen/Makefile.inc" -# XXX add getvfsbyname.3 MAN+= alarm.3 basename.3 clock.3 confstr.3 ctermid.3 ctype.3 \ daemon.3 devname.3 directory.3 dirname.3 err.3 exec.3 \ fnmatch.3 frexp.3 ftok.3 fts.3 getbsize.3 getcap.3 getcwd.3 \ diff --git a/lib/libc/gen/getvfsbyname.3 b/lib/libc/gen/getvfsbyname.3 deleted file mode 100644 index 23cd2c35285e..000000000000 --- a/lib/libc/gen/getvfsbyname.3 +++ /dev/null @@ -1,100 +0,0 @@ -.\" $NetBSD: getvfsbyname.3,v 1.2 1998/02/02 02:41:25 perry Exp $ -.\" -.\" Copyright (c) 1995 -.\" The Regents of the University of California. 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. -.\" 3. All advertising materials mentioning features or use of this software -.\" must display the following acknowledgement: -.\" This product includes software developed by the University of -.\" California, Berkeley and its contributors. -.\" 4. Neither the name of the University nor the names of its contributors -.\" may be used to endorse or promote products derived from this software -.\" without specific prior written permission. -.\" -.\" THIS SOFTWARE IS PROVIDED BY THE REGENTS 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 REGENTS 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. -.\" -.\" @(#)kvm_getvfsbyname.3 8.3 (Berkeley) 5/4/95 -.\" -.Dd May 4, 1995 -.Dt GETVFSBYNAME 3 -.Os -.Sh NAME -.Nm getvfsbyname -.Nd get information about a filesystem -.Sh SYNOPSIS -.Fd #include -.Fd #include -.Fd #include -.br -.Ft int -.Fn getvfsbyname "const char *name" "struct vfsconf *vfc" -.Sh DESCRIPTION -The -.Fn getvfsbyname -function provides access to information about a -filesystem module that is configured in the kernel. -If successful, -the requested filesystem -.Fa vfsconf -is returned in the location pointed to by -.Nm vfc . -The fields in a -.Dq Li struct vfsconf -are defined as follows: -.Pp -.Bl -tag -compact -width vfc_refcount -.It vfc_name -the name of the filesystem -.It vfc_typenum -the filesystem type number assigned by the kernel -.It vfc_refcount -the number of active mount points using the filesystem -.It vfc_flags -flag bits that are used to initialize a new mount point -using the filesystem -.El -.Sh RETURN VALUES -If the call to -.Nm getvfsbyname -is successful, 0 is returned. -Otherwise \-1 is returned and -.Va errno -is set appropriately. -.Sh ERRORS -The following errors may be reported: -.Bl -tag -width Er -.It Bq Er EFAULT -The -.Fa vfc -pointer contains an invalid address. -.It Bq Er ENOENT -The -.Fa name -specifies a filesystem that is unknown or not configured in the kernel. -.Sh SEE ALSO -.Xr sysctl 1 , -.Xr mount 2 , -.Xr sysctl 3 , -.Xr mount 8 -.Sh HISTORY -A variant of the -.Fn getvfsbyname -function first appeared in FreeBSD 2.0. diff --git a/lib/libc/gen/getvfsbyname.c b/lib/libc/gen/getvfsbyname.c deleted file mode 100644 index 855eb0c0e665..000000000000 --- a/lib/libc/gen/getvfsbyname.c +++ /dev/null @@ -1,85 +0,0 @@ -/* $NetBSD: getvfsbyname.c,v 1.2 1998/02/02 02:41:26 perry Exp $ */ - -/* - * Copyright (c) 1995 - * The Regents of the University of California. 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. - * 3. All advertising materials mentioning features or use of this software - * must display the following acknowledgement: - * This product includes software developed by the University of - * California, Berkeley and its contributors. - * 4. Neither the name of the University nor the names of its contributors - * may be used to endorse or promote products derived from this software - * without specific prior written permission. - * - * THIS SOFTWARE IS PROVIDED BY THE REGENTS 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 REGENTS 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 -#if defined(LIBC_SCCS) && !defined(lint) -#if 0 -static char sccsid[] = "@(#)kvm_getvfsbyname.c 8.1 (Berkeley) 4/3/95"; -#else -__RCSID("$NetBSD"); -#endif -#endif /* LIBC_SCCS and not lint */ - -#include -#include -#include -#include -#include - -int getvfsbyname __P((const char *, struct vfsconf *)); - -/* - * Given a filesystem name, determine if it is resident in the kernel, - * and if it is resident, return its vfsconf structure. - */ -int -getvfsbyname(fsname, vfcp) - const char *fsname; - struct vfsconf *vfcp; -{ - int name[4], maxtypenum, cnt; - size_t buflen; - - name[0] = CTL_VFS; - name[1] = VFS_GENERIC; - name[2] = VFS_MAXTYPENUM; - buflen = 4; - if (sysctl(name, 3, &maxtypenum, &buflen, (void *)0, (size_t)0) < 0) - return (-1); - name[2] = VFS_CONF; - buflen = sizeof *vfcp; - for (cnt = 0; cnt < maxtypenum; cnt++) { - name[3] = cnt; - if (sysctl(name, 4, vfcp, &buflen, (void *)0, (size_t)0) < 0) { - if (errno != EOPNOTSUPP) - return (-1); - continue; - } - if (!strcmp(fsname, vfcp->vfc_name)) - return (0); - } - errno = ENOENT; - return (-1); -}