Skip site navigation (1)Skip section navigation (2)
Date:      Fri, 26 Jan 2018 17:13:04 +0000 (UTC)
From:      Warner Losh <imp@FreeBSD.org>
To:        src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org
Subject:   svn commit: r328438 - head/stand/libsa
Message-ID:  <201801261713.w0QHD49k082948@repo.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: imp
Date: Fri Jan 26 17:13:04 2018
New Revision: 328438
URL: https://svnweb.freebsd.org/changeset/base/328438

Log:
  Implement abort() as a call to panic.
  
  Sponsored by: Netflix

Added:
  head/stand/libsa/abort.c   (contents, props changed)
Modified:
  head/stand/libsa/Makefile
  head/stand/libsa/stand.h

Modified: head/stand/libsa/Makefile
==============================================================================
--- head/stand/libsa/Makefile	Fri Jan 26 17:13:00 2018	(r328437)
+++ head/stand/libsa/Makefile	Fri Jan 26 17:13:04 2018	(r328438)
@@ -19,7 +19,7 @@ LIB?=		sa
 NO_PIC=
 
 # standalone components and stuff we have modified locally
-SRCS+=	gzguts.h zutil.h __main.c assert.c bcd.c environment.c getopt.c gets.c \
+SRCS+=	gzguts.h zutil.h __main.c abort.c assert.c bcd.c environment.c getopt.c gets.c \
 	globals.c pager.c panic.c printf.c strdup.c strerror.c strtol.c strtoul.c \
 	random.c sbrk.c twiddle.c zalloc.c zalloc_malloc.c
 

Added: head/stand/libsa/abort.c
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/stand/libsa/abort.c	Fri Jan 26 17:13:04 2018	(r328438)
@@ -0,0 +1,35 @@
+/*
+ * Copyright (c) 2018 Netflix. 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 <sys/cdefs.h>
+__FBSDID("$FreeBSD$");
+
+#include <stand.h>
+
+void
+abort(void)
+{
+	panic("Bootloader aborted by abort");
+}

Modified: head/stand/libsa/stand.h
==============================================================================
--- head/stand/libsa/stand.h	Fri Jan 26 17:13:00 2018	(r328437)
+++ head/stand/libsa/stand.h	Fri Jan 26 17:13:04 2018	(r328438)
@@ -346,6 +346,9 @@ extern int		unsetenv(const char *name);
 extern ev_sethook_t	env_noset;		/* refuse set operation */
 extern ev_unsethook_t	env_nounset;		/* refuse unset operation */
 
+/* stdlib.h routines */
+extern void		abort(void);
+
 /* BCD conversions (undocumented) */
 extern u_char const	bcd2bin_data[];
 extern u_char const	bin2bcd_data[];



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201801261713.w0QHD49k082948>