[Glibc-bsd-commits] r4031 - trunk/glibc-ports/kfreebsd/sys

[Robert Millan]

Author: rmh
Date: 2012-01-29 00:51:36 +0000 (Sun, 29 Jan 2012)
New Revision: 4031

Modified:
   trunk/glibc-ports/kfreebsd/sys/mount.h
Log:
Add getvfsbyname

Modified: trunk/glibc-ports/kfreebsd/sys/mount.h
===================================================================
--- trunk/glibc-ports/kfreebsd/sys/mount.h	2012-01-28 23:37:04 UTC (rev 4030)
+++ trunk/glibc-ports/kfreebsd/sys/mount.h	2012-01-29 00:51:36 UTC (rev 4031)
@@ -29,6 +29,14 @@
 #include <sys/ucred.h>
 #include <sys/queue.h>
 
+/* For getvfsbyname.  */
+#include <stddef.h>
+#include <sys/mount.h>
+#include <sys/sysctl.h>
+#include <errno.h>
+#include <stdlib.h>
+#include <string.h>
+
 /*
  * File identifier.
  * These are unique per filesystem on a single machine.
@@ -345,9 +353,70 @@
 int	nmount(struct iovec *, unsigned int, int);
 int	unmount(const char *, int);
 
-/* C library stuff */
-int	getvfsbyname(const char *, struct xvfsconf *);
+/*
+ * 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.
+ * 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.
+ */
 
+/*
+ * Given a filesystem name, determine if it is resident in the kernel,
+ * and if it is resident, return its xvfsconf structure.
+ */
+static inline int
+getvfsbyname(fsname, vfcp)
+	const char *fsname;
+	struct xvfsconf *vfcp;
+{
+	struct xvfsconf *xvfsp;
+	size_t buflen;
+	int cnt, i;
+
+	if (sysctlbyname("vfs.conflist", NULL, &buflen, NULL, 0) < 0)
+		return (-1);
+	xvfsp = malloc(buflen);
+	if (xvfsp == NULL)
+		return (-1);
+	if (sysctlbyname("vfs.conflist", xvfsp, &buflen, NULL, 0) < 0) {
+		free(xvfsp);
+		return (-1);
+	}
+	cnt = buflen / sizeof(struct xvfsconf);
+	for (i = 0; i < cnt; i++) {
+		if (strcmp(fsname, xvfsp[i].vfc_name) == 0) {
+			memcpy(vfcp, xvfsp + i, sizeof(struct xvfsconf));
+			free(xvfsp);
+			return (0);
+		}
+	}
+	free(xvfsp);
+	errno = ENOENT;
+	return (-1);
+}
+
 /* getfsstat() appears in BSD 4.4.  A variant of this API is found on OSF/1,
    but on that system the user also needs to include <sys/fs_types.h>.  */