[Glibc-bsd-commits] r5157 - in trunk/freebsd-glue: debian include src/freebsd-glue

[rmh at alioth.debian.org]

Author: rmh
Date: 2013-11-23 19:57:21 +0000 (So, 23 lis 2013)
New Revision: 5157

Added:
   trunk/freebsd-glue/src/freebsd-glue/getbootfile.c
Modified:
   trunk/freebsd-glue/debian/changelog
   trunk/freebsd-glue/include/paths.h
   trunk/freebsd-glue/src/freebsd-glue/Makefile
Log:
Add getbootfile().

Modified: trunk/freebsd-glue/debian/changelog
===================================================================
--- trunk/freebsd-glue/debian/changelog	2013-11-23 19:47:54 UTC (rev 5156)
+++ trunk/freebsd-glue/debian/changelog	2013-11-23 19:57:21 UTC (rev 5157)
@@ -8,8 +8,9 @@
   * Add _PATH_DEVZERO.
   * Split additions for libcrypt, libutil and libz into separate
     libraries.
+  * Add getbootfile().
 
- -- Robert Millan <rmh at debian.org>  Fri, 01 Nov 2013 13:38:42 +0100
+ -- Robert Millan <rmh at debian.org>  Sat, 23 Nov 2013 20:57:05 +0100
 
 freebsd-glue (0.1.14) unstable; urgency=low
 

Modified: trunk/freebsd-glue/include/paths.h
===================================================================
--- trunk/freebsd-glue/include/paths.h	2013-11-23 19:47:54 UTC (rev 5156)
+++ trunk/freebsd-glue/include/paths.h	2013-11-23 19:57:21 UTC (rev 5157)
@@ -16,4 +16,10 @@
 #define	_PATH_UFSSUSPEND	"/dev/ufssuspend"
 #endif
 
+__BEGIN_DECLS
+#ifdef __FreeBSD_kernel__
+const char *getbootfile(void);
 #endif
+__END_DECLS
+
+#endif

Modified: trunk/freebsd-glue/src/freebsd-glue/Makefile
===================================================================
--- trunk/freebsd-glue/src/freebsd-glue/Makefile	2013-11-23 19:47:54 UTC (rev 5156)
+++ trunk/freebsd-glue/src/freebsd-glue/Makefile	2013-11-23 19:57:21 UTC (rev 5157)
@@ -17,6 +17,7 @@
 SRCS+=	\
 	cpuset.c \
 	disklabel.c \
+	getbootfile.c \
 	linkaddr.c \
 	login_class.c \
 	mac.c \

Added: trunk/freebsd-glue/src/freebsd-glue/getbootfile.c
===================================================================
--- trunk/freebsd-glue/src/freebsd-glue/getbootfile.c	                        (rev 0)
+++ trunk/freebsd-glue/src/freebsd-glue/getbootfile.c	2013-11-23 19:57:21 UTC (rev 5157)
@@ -0,0 +1,53 @@
+/*
+ * Copyright (c) 1989, 1993
+ *	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.
+ */
+
+#if defined(LIBC_SCCS) && !defined(lint)
+static char sccsid[] = "From: @(#)gethostname.c	8.1 (Berkeley) 6/4/93";
+#endif /* LIBC_SCCS and not lint */
+#include <sys/cdefs.h>
+__FBSDID("$FreeBSD$");
+
+#include <sys/param.h>
+#include <sys/sysctl.h>
+
+#include <paths.h>
+
+const char *
+getbootfile(void)
+{
+	static char name[MAXPATHLEN];
+	size_t size = sizeof name;
+	int mib[2];
+
+	mib[0] = CTL_KERN;
+	mib[1] = KERN_BOOTFILE;
+	if (sysctl(mib, 2, name, &size, NULL, 0) == -1)
+		return ("/boot/kernel/kernel");
+	return (name);
+}