Fix strtol

libc/fmt/atoi.c

@@ -17,7 +17,6 @@
 │ PERFORMANCE OF THIS SOFTWARE.                                                │
 ╚─────────────────────────────────────────────────────────────────────────────*/
 #include "libc/fmt/conv.h"
-#include "libc/fmt/strlol.internal.h"
 #include "libc/limits.h"
 
 /**
@@ -29,5 +28,9 @@
  *     flexibility in terms of inputs
  */
 int atoi(const char *s) {
-  return STRLOL(s, NULL, 10, INT_MIN, INT_MAX);
+  int res;
+  res = strtoimax(s, NULL, 10);
+  if (res < INT_MIN) return INT_MIN;
+  if (res > INT_MAX) return INT_MAX;
+  return res;
 }

libc/fmt/atol.c

@@ -17,9 +17,12 @@
 │ PERFORMANCE OF THIS SOFTWARE.                                                │
 ╚─────────────────────────────────────────────────────────────────────────────*/
 #include "libc/fmt/conv.h"
-#include "libc/fmt/strlol.internal.h"
 #include "libc/limits.h"
 
 long atol(const char *s) {
-  return STRLOL(s, NULL, 10, LONG_MIN, LONG_MAX);
+  long res;
+  res = strtoimax(s, NULL, 10);
+  if (res < LONG_MIN) return LONG_MIN;
+  if (res > LONG_MAX) return LONG_MAX;
+  return res;
 }

libc/fmt/atoll.c

@@ -17,9 +17,12 @@
 │ PERFORMANCE OF THIS SOFTWARE.                                                │
 ╚─────────────────────────────────────────────────────────────────────────────*/
 #include "libc/fmt/conv.h"
-#include "libc/fmt/strlol.internal.h"
 #include "libc/limits.h"
 
 long long atoll(const char *s) {
-  return STRLOL(s, NULL, 10, LONG_LONG_MIN, LONG_LONG_MAX);
+  long long res;
+  res = strtoimax(s, NULL, 10);
+  if (res < LONG_LONG_MIN) return LONG_LONG_MIN;
+  if (res > LONG_LONG_MAX) return LONG_LONG_MAX;
+  return res;
 }

libc/fmt/strlol.internal.h

@@ -1,16 +0,0 @@
-#ifndef COSMOPOLITAN_LIBC_COMPAT_STRLOL_H_
-#define COSMOPOLITAN_LIBC_COMPAT_STRLOL_H_
-#if !(__ASSEMBLER__ + __LINKER__ + 0)
-COSMOPOLITAN_C_START_
-
-#define STRLOL(STR, ENDPTR, OPTIONAL_BASE, MIN, MAX)      \
-  ({                                                      \
-    intmax_t res = strtoimax(STR, ENDPTR, OPTIONAL_BASE); \
-    if (res < MIN) return MIN;                            \
-    if (res > MAX) return MAX;                            \
-    res;                                                  \
-  })
-
-COSMOPOLITAN_C_END_
-#endif /* !(__ASSEMBLER__ + __LINKER__ + 0) */
-#endif /* COSMOPOLITAN_LIBC_COMPAT_STRLOL_H_ */

libc/fmt/strtol.c

@@ -17,7 +17,6 @@
 │ PERFORMANCE OF THIS SOFTWARE.                                                │
 ╚─────────────────────────────────────────────────────────────────────────────*/
 #include "libc/fmt/conv.h"
-#include "libc/fmt/strlol.internal.h"
 #include "libc/limits.h"
 
 /**
@@ -26,5 +25,9 @@
  * @param optional_base is recommended as 0 for flexidecimal
  */
 long strtol(const char *s, char **opt_out_end, int optional_base) {
-  return STRLOL(s, opt_out_end, optional_base, LONG_MIN, LONG_MAX);
+  long res;
+  res = strtoimax(s, opt_out_end, optional_base);
+  if (res < LONG_MIN) return LONG_MIN;
+  if (res > LONG_MAX) return LONG_MAX;
+  return res;
 }

libc/fmt/strtoll.c

@@ -17,9 +17,12 @@
 │ PERFORMANCE OF THIS SOFTWARE.                                                │
 ╚─────────────────────────────────────────────────────────────────────────────*/
 #include "libc/fmt/conv.h"
-#include "libc/fmt/strlol.internal.h"
 #include "libc/limits.h"
 
 long long strtoll(const char *s, char **endptr, int optional_base) {
-  return STRLOL(s, endptr, optional_base, LONG_LONG_MIN, LONG_LONG_MAX);
+  long long res;
+  res = strtoimax(s, endptr, optional_base);
+  if (res < LONG_LONG_MIN) return LONG_LONG_MIN;
+  if (res > LONG_LONG_MAX) return LONG_LONG_MAX;
+  return res;
 }

libc/fmt/strtoul.c

@@ -17,9 +17,12 @@
 │ PERFORMANCE OF THIS SOFTWARE.                                                │
 ╚─────────────────────────────────────────────────────────────────────────────*/
 #include "libc/fmt/conv.h"
-#include "libc/fmt/strlol.internal.h"
 #include "libc/limits.h"
 
 unsigned long strtoul(const char *s, char **endptr, int optional_base) {
-  return STRLOL(s, endptr, optional_base, ULONG_MIN, ULONG_MAX);
+  unsigned long long res;
+  res = strtoimax(s, endptr, optional_base);
+  if (res < ULONG_MIN) return ULONG_MIN;
+  if (res > ULONG_MAX) return ULONG_MAX;
+  return res;
 }

libc/fmt/strtoull.c

@@ -17,9 +17,12 @@
 │ PERFORMANCE OF THIS SOFTWARE.                                                │
 ╚─────────────────────────────────────────────────────────────────────────────*/
 #include "libc/fmt/conv.h"
-#include "libc/fmt/strlol.internal.h"
 #include "libc/limits.h"
 
 unsigned long long strtoull(const char *s, char **endptr, int optional_base) {
-  return STRLOL(s, endptr, optional_base, ULONG_LONG_MIN, ULONG_LONG_MAX);
+  unsigned long long res;
+  res = strtoimax(s, endptr, optional_base);
+  if (res < ULONG_LONG_MIN) return ULONG_LONG_MIN;
+  if (res > ULONG_LONG_MAX) return ULONG_LONG_MAX;
+  return res;
 }

libc/stdio/fgetc.c

@@ -19,14 +19,19 @@
 #include "libc/stdio/internal.h"
 #include "libc/stdio/stdio.h"
 
+static noinline int __fgetc(FILE *f) {
+  if (!f->reader) return __fseteof(f);
+  if (f->reader(f) == -1) return -1;
+  return f->buf[f->beg++];
+}
+
 /**
  * Reads uint8_t from stream.
  */
 int fgetc(FILE *f) {
-  int c;
+  if (f->beg < f->end) {
-  if (f->beg >= f->end) {
+    return f->buf[f->beg++];
-    if (!f->reader) return __fseteof(f);
+  } else {
-    if (f->reader(f) == -1) return -1;
+    return __fgetc(f);
   }
-  return f->buf[f->beg++];
 }

libc/stdio/fputc.c

@@ -20,7 +20,7 @@
 #include "libc/stdio/internal.h"
 #include "libc/stdio/stdio.h"
 
-static noinline int __fputcg(int c, FILE *f) {
+static noinline int __fputc(int c, FILE *f) {
   if (f->beg < f->size) {
     f->buf[f->beg++] = c;
     if (f->beg == f->size || f->bufmode == _IONBF ||
@@ -47,6 +47,6 @@ noinstrument int fputc(int c, FILE *f) {
     f->buf[f->beg++] = c;
     return c & 0xff;
   } else {
-    return __fputcg(c, f);
+    return __fputc(c, f);
   }
 }

libc/stdio/stdio.h

@@ -59,7 +59,6 @@ FILE *fmemopen(void *, size_t, const char *) paramsnonnull((3)) nodiscard;
 FILE *freopen(const char *, const char *, FILE *) paramsnonnull((2, 3));
 size_t fread(void *, size_t, size_t, FILE *) paramsnonnull();
 size_t fwrite(const void *, size_t, size_t, FILE *) paramsnonnull();
-int freplenish(FILE *) paramsnonnull();
 int fclose(FILE *);
 int fclose_s(FILE **) paramsnonnull();
 long fseek(FILE *, long, int) paramsnonnull();

libc/tinymath/fabs.S

@@ -19,15 +19,14 @@
 #include "libc/macros.h"
 .source	__FILE__
 
-/	Returns absolute value of double.
+/	Returns absolute value of 𝑥.
 /
-/	@param	xmm0 has double in lower half
+/	@param	𝑥 is double passed in lower half on %xmm0
-/	@return	xmm0 has result in lower half
+/	@return	absolute value in %xmm0
 fabs:	.leafprologue
 	.profilable
 	mov	$0x7fffffffffffffff,%rax
-	movq	%xmm0,%rdx
+	movq	%rax,%xmm1
-	and	%rax,%rdx
+	pand	%xmm1,%xmm0
-	movq	%rdx,%xmm0
 	.leafepilogue
 	.endfn	fabs,globl

libc/tinymath/fabsf.S

@@ -19,6 +19,10 @@
 #include "libc/macros.h"
 .source	__FILE__
 
+/	Returns absolute value of 𝑥.
+/
+/	@param	𝑥 is float passed in lower quarter on %xmm0
+/	@return	absolute value in %xmm0
 fabsf:	.leafprologue
 	.profilable
 	movd	%xmm0,%eax

libc/tinymath/fabsl.S

@@ -19,6 +19,10 @@
 #include "libc/macros.h"
 .source	__FILE__
 
+/	Returns absolute value of 𝑥.
+/
+/	@param	𝑥 long double passed on stack
+/	@return	absolute value in %st
 fabsl:	push	%rbp
 	mov	%rsp,%rbp
 	.profilable

test/libc/fmt/strtoimax_test.c

@@ -49,3 +49,7 @@ TEST(strtoimax, testTwosBane) {
   EXPECT_EQ(((uintmax_t)0x8000000000000000) << 64 | 0x0000000000000000,
             strtoimax("0x80000000000000000000000000000000", NULL, 0));
 }
+
+TEST(strtol, neghex) {
+  ASSERT_EQ(-16, strtol("0xfffffffffffffff0", NULL, 0));
+}

test/libc/str/strlcpy_test.c

@@ -3,19 +3,18 @@
 ╞══════════════════════════════════════════════════════════════════════════════╡
 │ Copyright 2020 Justine Alexandra Roberts Tunney                              │
 │                                                                              │
-│ This program is free software; you can redistribute it and/or modify         │
+│ Permission to use, copy, modify, and/or distribute this software for         │
-│ it under the terms of the GNU General Public License as published by         │
+│ any purpose with or without fee is hereby granted, provided that the         │
-│ the Free Software Foundation; version 2 of the License.                      │
+│ above copyright notice and this permission notice appear in all copies.      │
 │                                                                              │
-│ This program is distributed in the hope that it will be useful, but          │
+│ THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL                │
-│ WITHOUT ANY WARRANTY; without even the implied warranty of                   │
+│ WARRANTIES WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED                │
-│ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU             │
+│ WARRANTIES OF MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE             │
-│ General Public License for more details.                                     │
+│ AUTHOR BE LIABLE FOR ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL         │
-│                                                                              │
+│ DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR        │
-│ You should have received a copy of the GNU General Public License            │
+│ PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER               │
-│ along with this program; if not, write to the Free Software                  │
+│ TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR             │
-│ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA                │
+│ PERFORMANCE OF THIS SOFTWARE.                                                │
-│ 02110-1301 USA                                                               │
 ╚─────────────────────────────────────────────────────────────────────────────*/
 #include "libc/str/str.h"
 #include "libc/testlib/testlib.h"

test/libc/tinymath/fabs_test.c

@@ -16,54 +16,13 @@
 │ TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR             │
 │ PERFORMANCE OF THIS SOFTWARE.                                                │
 ╚─────────────────────────────────────────────────────────────────────────────*/
-#include "libc/calls/calls.h"
+#include "libc/math.h"
-#include "libc/calls/struct/iovec.h"
+#include "libc/testlib/testlib.h"
-#include "libc/errno.h"
-#include "libc/sock/sock.h"
-#include "libc/stdio/internal.h"
-#include "libc/stdio/stdio.h"
 
-/* TODO(jart): Delete or rework */
+TEST(fabs, test) {
-
+  EXPECT_LDBL_EQ(3.14, fabs(3.14));
-/**
+  EXPECT_LDBL_EQ(3.14, fabs(-3.14));
- * Fills empty space in buffer with whatever's available.
+  EXPECT_EQ(1, !!isnan(fabs(NAN)));
- *
+  EXPECT_EQ(1, !!isnan(fabs(-NAN)));
- * This can be used alongside functions like select() or poll() to
+  EXPECT_EQ(0, !!signbit(fabs(-NAN)));
- * perform reads at opportune moments, thereby minimizing latency.
- */
-int freplenish(FILE *f) {
-  ssize_t rc;
-  size_t got;
-  struct iovec iov[2];
-  if (f->beg == f->end) {
-    f->beg = f->end = 0;
-  }
-  if (f->beg <= f->end) {
-    if (f->beg) {
-      iov[0].iov_base = f->buf + f->end;
-      iov[0].iov_len = f->size - f->end;
-      iov[1].iov_base = f->buf;
-      iov[1].iov_len = f->beg - 1;
-      rc = readv(f->fd, iov, 2);
-    } else {
-      rc = read(f->fd, f->buf, f->size - (f->end - f->beg) - 1);
-    }
-  } else {
-    if (f->end + 1 == f->beg) return 0;
-    rc = read(f->fd, f->buf + f->end, f->beg - f->end - 1);
-  }
-
-  if (rc != -1) {
-    if (rc) {
-      got = rc;
-      f->end = (f->end + got) % f->size;
-      return got;
-    } else {
-      return __fseteof(f);
-    }
-  } else if (errno == EINTR || errno == EAGAIN) {
-    return 0;
-  } else {
-    return __fseterrno(f);
-  }
 }