andre/cosmopolitan
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix strtol

Browse Source
This commit is contained in:
Justine Tunney
2020-12-29 21:39:43 -08:00
parent 1df136323b
commit 5eddadafbd
17 changed files with 83 additions and 105 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
libc/stdio/fgetc.c
View File

@@ -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->reader) return __fseteof(f);
if (f->reader(f) == -1) return -1;
if (f->beg < f->end) {
return f->buf[f->beg++];
} else {
return __fgetc(f);
}
return f->buf[f->beg++];
}

4
libc/stdio/fputc.c
View File

@@ -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);
}
}

69
libc/stdio/freplenish.c
View File

@@ -1,69 +0,0 @@
/*-*- mode:c;indent-tabs-mode:nil;c-basic-offset:2;tab-width:8;coding:utf-8 -*-│
│vi: set net ft=c ts=2 sts=2 sw=2 fenc=utf-8 :vi│
╞══════════════════════════════════════════════════════════════════════════════╡
│ Copyright 2020 Justine Alexandra Roberts Tunney │
│ │
│ Permission to use, copy, modify, and/or distribute this software for │
│ any purpose with or without fee is hereby granted, provided that the │
│ above copyright notice and this permission notice appear in all copies. │
│ │
│ THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL │
│ WARRANTIES WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED │
│ WARRANTIES OF MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE │
│ AUTHOR BE LIABLE FOR ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL │
│ DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR │
│ PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER │
│ TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR │
│ PERFORMANCE OF THIS SOFTWARE. │
╚─────────────────────────────────────────────────────────────────────────────*/
#include "libc/calls/calls.h"
#include "libc/calls/struct/iovec.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 */
/**
* Fills empty space in buffer with whatever's available.
*
* This can be used alongside functions like select() or poll() to
* 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);
}
}

1
libc/stdio/stdio.h
View File

@@ -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();