Leak more stuff into libgeom.

lib/libgeom/Makefile

@@ -1,9 +1,13 @@
 # $FreeBSD$
 
 LIB=	geom
-SRCS=	geom_stats.c
+SRCS+=	geom_getxml.c
+SRCS+=	geom_stats.c
+SRCS+=	geom_xml2tree.c
 INCS=	libgeom.h
 
+CFLAGS += -I${.CURDIR}
+
 WARNS?=	3
 
 MAN=	libgeom.3

lib/libgeom/geom_getxml.c

@@ -0,0 +1,66 @@
+/*-
+ * Copyright (c) 2003 Poul-Henning Kamp
+ * 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. The names of the authors may not be used to endorse or promote
+ *    products derived from this software without specific prior written
+ *    permission.
+ *
+ * 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$
+ */
+
+#include <sys/types.h>
+#include <sys/sysctl.h>
+#include <stdlib.h>
+#include <string.h>
+#include "libgeom.h"
+
+char *
+geom_getxml()
+{
+	char *p;
+	size_t l;
+	int i;
+
+	l = 1024 * 1024;	/* Start big, realloc back */
+	p = malloc(l);
+	if (p) {
+		i = sysctlbyname("kern.geom.confxml", p, &l, NULL, 0);
+		if (i == 0) {
+			p = realloc(p, strlen(p) + 1);
+			return (p);
+		}
+		free(p);
+	}
+	l = 0;
+	i = sysctlbyname("kern.geom.confxml", p, &l, NULL, 0);
+	if (i != 0)
+		return (NULL);
+	p = malloc(l + 4096);
+	i = sysctlbyname("kern.geom.confxml", p, &l, NULL, 0);
+	if (i == 0) {
+		p = realloc(p, strlen(p) + 1);
+		return (p);
+	}
+	return (NULL);
+}

lib/libgeom/geom_stats.c

@@ -42,11 +42,6 @@
 #include <sys/types.h>
 
 #include <geom/geom_stats.h>
-#if 0
-#include <stdio.h>
-#include <stdint.h>
-#include <err.h>
-#endif
 
 /************************************************************/
 static uint npages, pagesize, spp;