svn commit: r328613 - head/stand/libsa

[Warner Losh]

Author: imp
Date: Wed Jan 31 04:29:00 2018
New Revision: 328613
URL: https://svnweb.freebsd.org/changeset/base/328613

Log:
  Kill copies of strtol and strtoul. Use the ones that are in libc,
  since they suffice. Create xlocale_private.h which provides the most
  minimal locale implementation we can get away with. Add strtoll and
  strtoull from libc.

Added:
  head/stand/libsa/xlocale_private.h   (contents, props changed)
Deleted:
  head/stand/libsa/strtol.c
  head/stand/libsa/strtoul.c
Modified:
  head/stand/libsa/Makefile

Modified: head/stand/libsa/Makefile
==============================================================================
--- head/stand/libsa/Makefile	Wed Jan 31 03:05:14 2018	(r328612)
+++ head/stand/libsa/Makefile	Wed Jan 31 04:29:00 2018	(r328613)
@@ -20,7 +20,7 @@ NO_PIC=
 
 # standalone components and stuff we have modified locally
 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 \
+	globals.c pager.c panic.c printf.c strdup.c strerror.c \
 	random.c sbrk.c twiddle.c zalloc.c zalloc_malloc.c
 
 # private (pruned) versions of libc string functions
@@ -40,7 +40,7 @@ SRCS+=	bcmp.c bcopy.c bzero.c ffs.c fls.c \
 
 # stdlib functions from libc
 .PATH: ${LIBC_SRC}/stdlib
-SRCS+=	abs.c
+SRCS+=	abs.c strtol.c strtoll.c strtoul.c strtoull.c
 
 .if ${MACHINE_CPUARCH} == "arm"
 .PATH: ${LIBC_SRC}/arm/gen

Added: head/stand/libsa/xlocale_private.h
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/stand/libsa/xlocale_private.h	Wed Jan 31 04:29:00 2018	(r328613)
@@ -0,0 +1,36 @@
+/*-
+ * Copyright (c) 2018 Netflix
+ *
+ * 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.
+ *
+ * $FreeBSD$
+ */
+
+#ifndef STAND_XLOCALE_PRIVATE_H
+#define STAND_XLOCALE_PRIVATE_H 1
+
+typedef int locale_t;
+#define FIX_LOCALE(x)
+#define isspace_l(c, l) isspace(c)
+#define __get_locale()	0
+
+#endif /* STAND_XLOCALE_PRIVATE_H */