mirrors/cosmopolitan
1
0
Fork 0
mirror of https://github.com/jart/cosmopolitan.git synced 2025-07-04 18:28:30 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Apply clang-format update to repo (#1154)

Browse source 
Commit bc6c183 introduced a bunch of discrepancies between what files
look like in the repo and what clang-format says they should look like.
However, there were already a few discrepancies prior to that. Most of
these discrepancies seemed to be unintentional, but a few of them were
load-bearing (e.g., a #include that violated header ordering needing
something to have been #defined by a 'later' #include.)

I opted to take what I hope is a relatively smooth-brained approach: I
reverted the .clang-format change, ran clang-format on the whole repo,
reapplied the .clang-format change, reran clang-format again, and then
reverted the commit that contained the first run. Thus the full effect
of this PR should only be to apply the changed formatting rules to the
repo, and from skimming the results, this seems to be the case.

My work can be checked by applying the short, manual commits, and then
rerunning the command listed in the autogenerated commits (those whose
messages I have prefixed auto:) and seeing if your results agree.

It might be that the other diffs should be fixed at some point but I'm
leaving that aside for now.

fd '\.c(c|pp)?$' --print0| xargs -0 clang-format -i
This commit is contained in:
Jōshin 2024-04-25 10:38:00 -07:00 • committed by GitHub
parent 342d0c81e5
commit 6e6fc38935
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
863 changed files with 9201 additions and 4627 deletions
Download patch file Download diff file Expand all files Collapse all files

3
libc/stdio/__freadptr.c
View file

@ -20,7 +20,8 @@
#include "libc/stdio/stdio_ext.h"
const char *__freadptr(FILE *f, size_t *sizep) {
if (f->beg == f->end) return 0;
if (f->beg == f->end)
return 0;
*sizep = f->end - f->beg;
return (const char *)f->buf + f->beg;
}

9
libc/stdio/appendd.c
View file

@ -48,8 +48,10 @@ ssize_t appendd(char **b, const void *s, size_t l) {
z = appendz((p = *b));
n = ROUNDUP(z.i + l + 1, 8) + W;
if (n > z.n) {
if (!z.n) z.n = W * 2;
while (n > z.n) z.n += z.n >> 1;
if (!z.n)
z.n = W * 2;
while (n > z.n)
z.n += z.n >> 1;
z.n = ROUNDUP(z.n, W);
if ((p = realloc(p, z.n))) {
z.n = malloc_usable_size(p);
@ -65,7 +67,8 @@ ssize_t appendd(char **b, const void *s, size_t l) {
p[z.i] = 0;
}
z.i += l;
if (!IsTiny() && W == 8) z.i |= (size_t)APPEND_COOKIE << 48;
if (!IsTiny() && W == 8)
z.i |= (size_t)APPEND_COOKIE << 48;
*(size_t *)(p + z.n - W) = z.i;
return l;
}

3
libc/stdio/appendstrlist.c
View file

@ -25,7 +25,8 @@ int AppendStrList(struct StrList *sl) {
char **p2;
if (sl->i == sl->n) {
n2 = sl->n;
if (!n2) n2 = 2;
if (!n2)
n2 = 2;
n2 += n2 >> 1;
if ((p2 = realloc(sl->p, n2 * sizeof(*p2)))) {
sl->p = p2;

9
libc/stdio/appendw.c
View file

@ -62,8 +62,10 @@ ssize_t appendw(char **b, uint64_t w) {
l = w ? (bsrl(w) >> 3) + 1 : 1;
n = ROUNDUP(z.i + 8 + 1, 8) + W;
if (n > z.n) {
if (!z.n) z.n = W * 2;
while (n > z.n) z.n += z.n >> 1;
if (!z.n)
z.n = W * 2;
while (n > z.n)
z.n += z.n >> 1;
z.n = ROUNDUP(z.n, W);
if ((p = realloc(p, z.n))) {
z.n = malloc_usable_size(p);
@ -77,7 +79,8 @@ ssize_t appendw(char **b, uint64_t w) {
WRITE64LE(q, w);
q[8] = 0;
z.i += l;
if (!IsTiny() && W == 8) z.i |= (size_t)APPEND_COOKIE << 48;
if (!IsTiny() && W == 8)
z.i |= (size_t)APPEND_COOKIE << 48;
*(size_t *)(p + z.n - W) = z.i;
return l;
}

24
libc/stdio/dirstream.c
View file

@ -214,7 +214,8 @@ TryAgain:
// e.g. \\?\C:\ stays the same
} else {
--i; // foo\bar\ -> foo\ (parent)
while (i && jp[i - 1] != '\\') --i;
while (i && jp[i - 1] != '\\')
--i;
}
} else {
while (*p) {
@ -259,7 +260,8 @@ GiveUpOnGettingInode:
dir->windata.cFileName);
dir->ent.d_type = GetNtDirentType(&dir->windata);
dir->isdone = !FindNextFile(dir->hand, &dir->windata);
if (pretend_this_file_doesnt_exist) goto TryAgain;
if (pretend_this_file_doesnt_exist)
goto TryAgain;
return &dir->ent;
}
@ -332,7 +334,8 @@ DIR *fdopendir(int fd) {
enametoolong();
return 0;
}
if (len) memcpy(dir->zip.prefix.path, name, len);
if (len)
memcpy(dir->zip.prefix.path, name, len);
if (len && dir->zip.prefix.path[len - 1] != '/') {
dir->zip.prefix.path[len++] = '/';
}
@ -379,7 +382,8 @@ DIR *opendir(const char *name) {
return 0;
}
DIR *res = fdopendir(fd);
if (!res) close(fd);
if (!res)
close(fd);
return res;
}
@ -402,10 +406,14 @@ static struct dirent *readdir_zipos(DIR *dir) {
ent->d_name[2] = 0;
struct ZiposUri p;
p.len = dir->zip.prefix.len;
if (p.len) memcpy(p.path, dir->zip.prefix.path, p.len);
while (p.len && p.path[p.len - 1] == '/') --p.len;
while (p.len && p.path[p.len - 1] != '/') --p.len;
while (p.len && p.path[p.len - 1] == '/') --p.len;
if (p.len)
memcpy(p.path, dir->zip.prefix.path, p.len);
while (p.len && p.path[p.len - 1] == '/')
--p.len;
while (p.len && p.path[p.len - 1] != '/')
--p.len;
while (p.len && p.path[p.len - 1] == '/')
--p.len;
p.path[p.len] = 0;
ent->d_ino = __zipos_inode(
dir->zip.zipos, __zipos_scan(dir->zip.zipos, &p), p.path, p.len);

9
libc/stdio/dumphexc.c
View file

@ -29,7 +29,8 @@ char *DumpHexc(const char *p, size_t n, size_t *z) {
long o;
int i, m;
char A[128], *q, *s = 0;
if (n == -1) n = p ? strlen(p) : 0;
if (n == -1)
n = p ? strlen(p) : 0;
appendw(&s, '"' | '\\' << 8 | '\n' << 16);
for (o = 0; (m = MIN(16, n)); p += m, n -= m) {
q = A;
@ -39,12 +40,14 @@ char *DumpHexc(const char *p, size_t n, size_t *z) {
*q++ = "0123456789abcdef"[(p[i] & 0xF0) >> 4];
*q++ = "0123456789abcdef"[(p[i] & 0x0F) >> 0];
}
if (o) appendw(&s, '\\' | '\n' << 8);
if (o)
appendw(&s, '\\' | '\n' << 8);
appendd(&s, A, q - A);
o += m;
}
if (appendw(&s, '"') != -1) {
if (z) *z = appendz(s).i;
if (z)
*z = appendz(s).i;
return s;
} else {
free(s);

3
libc/stdio/fclose.c
View file

@ -35,7 +35,8 @@
*/
int fclose(FILE *f) {
int rc;
if (!f) return 0;
if (!f)
return 0;
__fflush_unregister(f);
fflush(f);
if (_weaken(free)) {

6
libc/stdio/fflush.c
View file

@ -26,8 +26,10 @@
*/
int fflush(FILE *f) {
int rc;
if (f) flockfile(f);
if (f)
flockfile(f);
rc = fflush_unlocked(f);
if (f) funlockfile(f);
if (f)
funlockfile(f);
return rc;
}

3
libc/stdio/fgetc_unlocked.c
View file

@ -31,7 +31,8 @@ int fgetc_unlocked(FILE *f) {
if (f->beg < f->end) {
return f->buf[f->beg++] & 255;
} else {
if (!fread_unlocked(b, 1, 1, f)) return -1;
if (!fread_unlocked(b, 1, 1, f))
return -1;
return b[0];
}
}

3
libc/stdio/fgetln.c
View file

@ -46,7 +46,8 @@ char *fgetln(FILE *stream, size_t *len) {
size_t n = 0;
flockfile(stream);
if ((rc = getdelim_unlocked(&stream->getln, &n, '\n', stream)) > 0) {
if (len) *len = rc;
if (len)
*len = rc;
res = stream->getln;
} else {
res = 0;

9
libc/stdio/fgets_unlocked.c
View file

@ -48,11 +48,13 @@ char *fgets_unlocked(char *s, int size, FILE *f) {
if ((t = memchr(b, '\n', n))) {
n = t + 1 - b;
}
if (n) memcpy(p, b, n);
if (n)
memcpy(p, b, n);
f->beg += n;
size -= n - 1;
p += n;
if (t) break;
if (t)
break;
} else {
if ((c = fgetc_unlocked(f)) == -1) {
if (ferror_unlocked(f) == EINTR) {
@ -62,7 +64,8 @@ char *fgets_unlocked(char *s, int size, FILE *f) {
}
}
*p++ = c & 255;
if (c == '\n') break;
if (c == '\n')
break;
}
}
if (p > s || f->state != -1) {

6
libc/stdio/fgetwc_unlocked.c
View file

@ -35,11 +35,13 @@ wint_t fgetwc_unlocked(FILE *f) {
} else {
return -1;
}
if (b < 0300) return b;
if (b < 0300)
return b;
n = ThomPikeLen(b);
x = ThomPikeByte(b);
while (--n) {
if ((c = fgetc_unlocked(f)) == -1) return -1;
if ((c = fgetc_unlocked(f)) == -1)
return -1;
y = c;
if (ThomPikeCont(y)) {
x = ThomPikeMerge(x, y);

6
libc/stdio/fgetws_unlocked.c
View file

@ -38,11 +38,13 @@ wchar_t *fgetws_unlocked(wchar_t *s, int size, FILE *f) {
if (size > 0) {
while (--size > 0) {
if ((c = fgetwc_unlocked(f)) == -1) {
if (ferror_unlocked(f) == EINTR) continue;
if (ferror_unlocked(f) == EINTR)
continue;
break;
}
*p++ = c;
if (c == '\n') break;
if (c == '\n')
break;
}
*p = '\0';
}

3
libc/stdio/fmemopen.c
View file

@ -50,7 +50,8 @@ FILE *fmemopen(void *buf, size_t size, const char *mode) {
if (buf) {
f->nofree = true;
} else {
if (!size) size = BUFSIZ;
if (!size)
size = BUFSIZ;
// TODO(jart): Why do we need calloc()?
if (!_weaken(calloc) || !(buf = _weaken(calloc)(1, size))) {
__stdio_free(f);

273
libc/stdio/fmt.c
View file

@ -140,7 +140,8 @@ static int __fmt_atoi(const char **str) {
static int __fmt_pad(int out(const char *, void *, size_t), void *arg,
unsigned long n) {
int i, rc;
for (rc = i = 0; i < n; ++i) rc |= out(" ", arg, 1);
for (rc = i = 0; i < n; ++i)
rc |= out(" ", arg, 1);
return rc;
}
@ -212,24 +213,30 @@ static int __fmt_ntoa_format(int out(const char *, void *, size_t), void *arg,
/* pad spaces up to given width */
if (!(flags & FLAGS_LEFT) && !(flags & FLAGS_ZEROPAD)) {
if (len < width) {
if (__fmt_pad(out, arg, width - len) == -1) return -1;
if (__fmt_pad(out, arg, width - len) == -1)
return -1;
}
}
if (sign_character != '\0' && out(&sign_character, arg, 1) == -1) return -1;
if (sign_character != '\0' && out(&sign_character, arg, 1) == -1)
return -1;
if (flags & FLAGS_HASH) {
if (out("0", arg, 1) == -1) return -1;
if (out("0", arg, 1) == -1)
return -1;
if (alternate_form_middle_char != '\0' &&
out(&alternate_form_middle_char, arg, 1) == -1)
return -1;
}
for (i = 0; i < prec_width_zeros; ++i)
if (out("0", arg, 1) == -1) return -1;
if (out("0", arg, 1) == -1)
return -1;
reverse(buf, actual_buf_len);
if (out(buf, arg, actual_buf_len) == -1) return -1;
if (out(buf, arg, actual_buf_len) == -1)
return -1;
/* append pad spaces up to given width */
if (flags & FLAGS_LEFT) {
if (len < width) {
if (__fmt_pad(out, arg, width - len) == -1) return -1;
if (__fmt_pad(out, arg, width - len) == -1)
return -1;
}
}
return 0;
@ -245,7 +252,8 @@ static int __fmt_ntoa2(int out(const char *, void *, size_t), void *arg,
len = 0;
// we check for log2base!=3, since otherwise we'll print nothing for
// a value of 0 with precision 0 when # mandates that one be printed
if (!value && log2base != 3) flags &= ~FLAGS_HASH;
if (!value && log2base != 3)
flags &= ~FLAGS_HASH;
if (value || !(flags & FLAGS_PRECISION)) {
count = 0;
do {
@ -357,7 +365,8 @@ static int __fmt_stoa_byte(out_f out, void *a, uint64_t c) {
static int __fmt_stoa_wide(out_f out, void *a, uint64_t w) {
char buf[8];
if (!isascii(w)) w = tpenc(w);
if (!isascii(w))
w = tpenc(w);
WRITE64LE(buf, w);
return out(buf, a, w ? (bsr(w) >> 3) + 1 : 1);
}
@ -431,7 +440,8 @@ static int __fmt_stoa(int out(const char *, void *, size_t), void *arg,
emit = __fmt_stoa_byte;
}
if (!(flags & FLAGS_PRECISION)) precision = -1;
if (!(flags & FLAGS_PRECISION))
precision = -1;
if (!(flags & FLAGS_PRECISION) || !ignorenul) {
if (signbit == 63) {
precision = wcsnlen((const wchar_t *)p, precision);
@ -461,30 +471,37 @@ static int __fmt_stoa(int out(const char *, void *, size_t), void *arg,
}
if (pad && !(flags & FLAGS_LEFT)) {
if (__fmt_pad(out, arg, pad) == -1) return -1;
if (__fmt_pad(out, arg, pad) == -1)
return -1;
}
if (!(flags & FLAGS_NOQUOTE) && (flags & FLAGS_REPR)) {
if (signbit == 63) {
if (out("L", arg, 1) == -1) return -1;
if (out("L", arg, 1) == -1)
return -1;
} else if (signbit == 15) {
if (out("u", arg, 1) == -1) return -1;
if (out("u", arg, 1) == -1)
return -1;
}
buf[0] = qchar;
if (out(buf, arg, 1) == -1) return -1;
if (out(buf, arg, 1) == -1)
return -1;
}
if (justdobytes) {
while (precision--) {
wc = *p++ & 0xff;
if (!wc && !ignorenul) break;
if (emit(out, arg, wc) == -1) return -1;
if (!wc && !ignorenul)
break;
if (emit(out, arg, wc) == -1)
return -1;
}
} else {
while (precision--) {
if (signbit == 15) {
wc = *(const char16_t *)p;
if (!wc && !ignorenul) break;
if (!wc && !ignorenul)
break;
if (IsUcs2(wc)) {
p += sizeof(char16_t);
} else if (IsUtf16Cont(wc)) {
@ -498,34 +515,42 @@ static int __fmt_stoa(int out(const char *, void *, size_t), void *arg,
}
} else if (signbit == 63) {
wc = *(const wint_t *)p;
if (!wc && !ignorenul) break;
if (!wc && !ignorenul)
break;
p += sizeof(wint_t);
if (!wc) break;
if (!wc)
break;
} else {
wc = *p++ & 0xff;
if (!wc && !ignorenul) break;
if (!wc && !ignorenul)
break;
if (!isascii(wc)) {
if (ThomPikeCont(wc)) continue;
if (ThomPikeCont(wc))
continue;
n = ThomPikeLen(wc) - 1;
wc = ThomPikeByte(wc);
if (n > precision) break;
if (n > precision)
break;
precision -= n;
while (n--) {
wc = ThomPikeMerge(wc, *p++);
}
}
}
if (emit(out, arg, wc) == -1) return -1;
if (emit(out, arg, wc) == -1)
return -1;
}
}
if (!(flags & FLAGS_NOQUOTE) && (flags & FLAGS_REPR)) {
buf[0] = qchar;
if (out(buf, arg, 1) == -1) return -1;
if (out(buf, arg, 1) == -1)
return -1;
}
if (pad && (flags & FLAGS_LEFT)) {
if (__fmt_pad(out, arg, pad) == -1) return -1;
if (__fmt_pad(out, arg, pad) == -1)
return -1;
}
return 0;
@ -606,7 +631,8 @@ static int __fmt_fpiprec(struct FPBits *b) {
const FPI *fpi;
int i, j, k, m;
uint32_t *bits;
if (b->kind == STRTOG_Zero) return (b->ex = 0);
if (b->kind == STRTOG_Zero)
return (b->ex = 0);
fpi = b->fpi;
bits = b->bits;
for (k = (fpi->nbits - 1) >> 2; k > 0; --k) {
@ -623,14 +649,16 @@ static int __fmt_fpiprec(struct FPBits *b) {
}
break;
}
for (i = 0; i < 28 && !((bits[0] >> i) & 0xf); i += 4) donothing;
for (i = 0; i < 28 && !((bits[0] >> i) & 0xf); i += 4)
donothing;
if (i) {
b->ex += i;
m = k >> 3;
k -= (i >> 2);
for (j = 0;; ++j) {
bits[j] >>= i;
if (j == m) break;
if (j == m)
break;
bits[j] |= bits[j + 1] << (32 - i);
}
}
@ -650,8 +678,10 @@ static int __fmt_bround(struct FPBits *b, int prec, int prec1) {
inc = 0;
k = m - 1;
if ((t = bits[k >> 3] >> (j = (k & 7) * 4)) & 8) {
if (t & 7) goto inc1;
if (j && bits[k >> 3] << (32 - j)) goto inc1;
if (t & 7)
goto inc1;
if (j && bits[k >> 3] << (32 - j))
goto inc1;
while (k >= 8) {
k -= 8;
if (bits[k >> 3]) {
@ -669,26 +699,31 @@ haveinc:
if ((n = 4 * (m & 7)))
for (;; ++j) {
bits[j - i] = bits[j] >> n;
if (j == k) break;
if (j == k)
break;
bits[j - i] |= bits[j + 1] << (32 - n);
}
else
for (;; ++j) {
bits[j - i] = bits[j];
if (j == k) break;
if (j == k)
break;
}
k = prec >> 3;
if (inc) {
for (j = 0; !(++bits[j] & 0xffffffff); ++j) donothing;
for (j = 0; !(++bits[j] & 0xffffffff); ++j)
donothing;
if (j > k) {
onebit:
bits[0] = 1;
b->ex += 4 * prec;
return 1;
}
if ((j = prec & 7) < 7 && bits[k] >> (j + 1) * 4) goto onebit;
if ((j = prec & 7) < 7 && bits[k] >> (j + 1) * 4)
goto onebit;
}
for (i = 0; !(bits[i >> 3] & (0xf << 4 * (i & 7))); ++i) donothing;
for (i = 0; !(bits[i >> 3] & (0xf << 4 * (i & 7))); ++i)
donothing;
if (i) {
b->ex += 4 * i;
prec -= i;
@ -697,7 +732,8 @@ haveinc:
i *= 4;
for (m = j;; ++m) {
bits[m - j] = bits[m] >> i;
if (m == k) break;
if (m == k)
break;
bits[m - j] |= bits[m + 1] << (32 - i);
}
}
@ -805,9 +841,11 @@ int __fmt(void *fn, void *arg, const char *format, va_list va) {
while (*format) {
if (*format != '%') {
for (n = 1; format[n]; ++n) {
if (format[n] == '%') break;
if (format[n] == '%')
break;
}
if (out(format, arg, n) == -1) return -1;
if (out(format, arg, n) == -1)
return -1;
format += n;
continue;
}
@ -815,38 +853,46 @@ int __fmt(void *fn, void *arg, const char *format, va_list va) {
if (!IsTiny()) {
if (format[1] == 's') { // FAST PATH: PLAIN STRING
s = va_arg(va, char *);
if (!s) s = "(null)";
if (out(s, arg, strlen(s)) == -1) return -1;
if (!s)
s = "(null)";
if (out(s, arg, strlen(s)) == -1)
return -1;
format += 2;
continue;
} else if (format[1] == 'd') { // FAST PATH: PLAIN INTEGER
d = va_arg(va, int);
if (out(ibuf, arg, FormatInt32(ibuf, d) - ibuf) == -1) return -1;
if (out(ibuf, arg, FormatInt32(ibuf, d) - ibuf) == -1)
return -1;
format += 2;
continue;
} else if (format[1] == 'u') { // FAST PATH: PLAIN UNSIGNED
u = va_arg(va, unsigned);
if (out(ibuf, arg, FormatUint32(ibuf, u) - ibuf) == -1) return -1;
if (out(ibuf, arg, FormatUint32(ibuf, u) - ibuf) == -1)
return -1;
format += 2;
continue;
} else if (format[1] == 'x') { // FAST PATH: PLAIN HEX
u = va_arg(va, unsigned);
if (out(ibuf, arg, uint64toarray_radix16(u, ibuf)) == -1) return -1;
if (out(ibuf, arg, uint64toarray_radix16(u, ibuf)) == -1)
return -1;
format += 2;
continue;
} else if (format[1] == 'l' && format[2] == 'x') {
lu = va_arg(va, unsigned long); // FAST PATH: PLAIN LONG HEX
if (out(ibuf, arg, uint64toarray_radix16(lu, ibuf)) == -1) return -1;
if (out(ibuf, arg, uint64toarray_radix16(lu, ibuf)) == -1)
return -1;
format += 3;
continue;
} else if (format[1] == 'l' && format[2] == 'd') {
ld = va_arg(va, long); // FAST PATH: PLAIN LONG
if (out(ibuf, arg, FormatInt64(ibuf, ld) - ibuf) == -1) return -1;
if (out(ibuf, arg, FormatInt64(ibuf, ld) - ibuf) == -1)
return -1;
format += 3;
continue;
} else if (format[1] == 'l' && format[2] == 'u') {
lu = va_arg(va, unsigned long); // FAST PATH: PLAIN UNSIGNED LONG
if (out(ibuf, arg, FormatUint64(ibuf, lu) - ibuf) == -1) return -1;
if (out(ibuf, arg, FormatUint64(ibuf, lu) - ibuf) == -1)
return -1;
format += 3;
continue;
} else if (format[1] == '.' && format[2] == '*' && format[3] == 's') {
@ -858,7 +904,8 @@ int __fmt(void *fn, void *arg, const char *format, va_list va) {
s = "(null)";
n = MIN(6, n);
}
if (out(s, arg, n) == -1) return -1;
if (out(s, arg, n) == -1)
return -1;
format += 4;
continue;
}
@ -951,7 +998,8 @@ int __fmt(void *fn, void *arg, const char *format, va_list va) {
format++;
break;
}
if (format[1] == 'l') format++;
if (format[1] == 'l')
format++;
// fallthrough
case 't': // ptrdiff_t
case 'z': // size_t
@ -1074,7 +1122,8 @@ int __fmt(void *fn, void *arg, const char *format, va_list va) {
case 'F':
case 'f':
if (!(flags & FLAGS_PRECISION)) prec = 6;
if (!(flags & FLAGS_PRECISION))
prec = 6;
if (!longdouble) {
x = va_arg(va, double);
s = s0 = dtoa(x, 3, prec, &decpt, &fpb.sign, &se);
@ -1093,7 +1142,8 @@ int __fmt(void *fn, void *arg, const char *format, va_list va) {
}
if (decpt == 9999) {
Format9999:
if (s0) freedtoa(s0);
if (s0)
freedtoa(s0);
bzero(special, sizeof(special));
s = q = special;
if (fpb.sign) {
@ -1107,37 +1157,49 @@ int __fmt(void *fn, void *arg, const char *format, va_list va) {
flags &= ~(FLAGS_PRECISION | FLAGS_PLUS | FLAGS_HASH | FLAGS_SPACE);
prec = 0;
rc = __fmt_stoa(out, arg, s, flags, prec, width, signbit, qchar);
if (rc == -1) return -1;
if (rc == -1)
return -1;
break;
}
FormatReal:
if (fpb.sign /* && (x || sign) */) sign = '-';
if (prec > 0) width -= prec;
if (fpb.sign /* && (x || sign) */)
sign = '-';
if (prec > 0)
width -= prec;
if (width > 0) {
if (sign) --width;
if (sign)
--width;
if (decpt <= 0) {
--width;
if (prec > 0) --width;
if (prec > 0)
--width;
} else {
if (s == se) decpt = 1;
if (s == se)
decpt = 1;
width -= decpt;
if (prec > 0 || (flags & FLAGS_HASH)) --width;
if (prec > 0 || (flags & FLAGS_HASH))
--width;
}
}
if (width > 0 && !(flags & FLAGS_LEFT)) {
if ((flags & FLAGS_ZEROPAD)) {
if (sign) __FMT_PUT(sign);
if (sign)
__FMT_PUT(sign);
sign = 0;
do __FMT_PUT('0');
do
__FMT_PUT('0');
while (--width > 0);
} else
do __FMT_PUT(' ');
do
__FMT_PUT(' ');
while (--width > 0);
}
if (sign) __FMT_PUT(sign);
if (sign)
__FMT_PUT(sign);
if (decpt <= 0) {
__FMT_PUT('0');
if (prec > 0 || (flags & FLAGS_HASH)) __FMT_PUT('.');
if (prec > 0 || (flags & FLAGS_HASH))
__FMT_PUT('.');
while (decpt < 0) {
__FMT_PUT('0');
prec--;
@ -1152,7 +1214,8 @@ int __fmt(void *fn, void *arg, const char *format, va_list va) {
}
__FMT_PUT(c);
} while (--decpt > 0);
if (prec > 0 || (flags & FLAGS_HASH)) __FMT_PUT('.');
if (prec > 0 || (flags & FLAGS_HASH))
__FMT_PUT('.');
}
while (--prec >= 0) {
if ((c = *s)) {
@ -1162,14 +1225,18 @@ int __fmt(void *fn, void *arg, const char *format, va_list va) {
}
__FMT_PUT(c);
}
while (--width >= 0) __FMT_PUT(' ');
if (s0) freedtoa(s0);
while (--width >= 0)
__FMT_PUT(' ');
if (s0)
freedtoa(s0);
break;
case 'G':
case 'g':
if (!(flags & FLAGS_PRECISION)) prec = 6;
if (prec < 1) prec = 1;
if (!(flags & FLAGS_PRECISION))
prec = 6;
if (prec < 1)
prec = 1;
if (!longdouble) {
x = va_arg(va, double);
s = s0 = dtoa(x, 2, prec, &decpt, &fpb.sign, &se);
@ -1186,7 +1253,8 @@ int __fmt(void *fn, void *arg, const char *format, va_list va) {
s = s0 = gdtoa(fpb.fpi, fpb.ex, fpb.bits, &fpb.kind, prec ? 2 : 0,
prec, &decpt, &se);
}
if (decpt == 9999) goto Format9999;
if (decpt == 9999)
goto Format9999;
c = se - s;
prec1 = prec;
if (!prec) {
@ -1199,18 +1267,22 @@ int __fmt(void *fn, void *arg, const char *format, va_list va) {
prec -= decpt;
else
prec = c - decpt;
if (prec < 0) prec = 0;
if (prec < 0)
prec = 0;
goto FormatReal;
}
d -= 2;
if (!(flags & FLAGS_HASH) && prec > c) prec = c;
if (!(flags & FLAGS_HASH) && prec > c)
prec = c;
--prec;
goto FormatExpo;
case 'e':
case 'E':
if (!(flags & FLAGS_PRECISION)) prec = 6;
if (prec < 0) prec = 0;
if (!(flags & FLAGS_PRECISION))
prec = 6;
if (prec < 0)
prec = 0;
if (!longdouble) {
x = va_arg(va, double);
s = s0 = dtoa(x, 2, prec + 1, &decpt, &fpb.sign, &se);
@ -1227,31 +1299,41 @@ int __fmt(void *fn, void *arg, const char *format, va_list va) {
s = s0 = gdtoa(fpb.fpi, fpb.ex, fpb.bits, &fpb.kind, prec ? 2 : 0,
prec, &decpt, &se);
}
if (decpt == 9999) goto Format9999;
if (decpt == 9999)
goto Format9999;
FormatExpo:
if (fpb.sign /* && (x || sign) */) sign = '-';
if (fpb.sign /* && (x || sign) */)
sign = '-';
if ((width -= prec + 5) > 0) {
if (sign) --width;
if (prec || (flags & FLAGS_HASH)) --width;
if (sign)
--width;
if (prec || (flags & FLAGS_HASH))
--width;
}
if ((c = --decpt) < 0) c = -c;
if ((c = --decpt) < 0)
c = -c;
while (c >= 100) {
--width;
c /= 10;
}
if (width > 0 && !(flags & FLAGS_LEFT)) {
if ((flags & FLAGS_ZEROPAD)) {
if (sign) __FMT_PUT(sign);
if (sign)
__FMT_PUT(sign);
sign = 0;
do __FMT_PUT('0');
do
__FMT_PUT('0');
while (--width > 0);
} else
do __FMT_PUT(' ');
do
__FMT_PUT(' ');
while (--width > 0);
}
if (sign) __FMT_PUT(sign);
if (sign)
__FMT_PUT(sign);
__FMT_PUT(*s++);
if (prec || (flags & FLAGS_HASH)) __FMT_PUT('.');
if (prec || (flags & FLAGS_HASH))
__FMT_PUT('.');
while (--prec >= 0) {
if ((c = *s)) {
s++;
@ -1273,7 +1355,8 @@ int __fmt(void *fn, void *arg, const char *format, va_list va) {
for (;;) {
i1 = decpt / k;
__FMT_PUT(i1 + '0');
if (--c <= 0) break;
if (--c <= 0)
break;
decpt -= i1 * k;
decpt *= 10;
}
@ -1307,7 +1390,8 @@ int __fmt(void *fn, void *arg, const char *format, va_list va) {
bw = 1;
bex = fpb.ex + 4 * prec1;
if (bex) {
if ((i1 = bex) < 0) i1 = -i1;
if ((i1 = bex) < 0)
i1 = -i1;
while (i1 >= 10) {
++bw;
i1 /= 10;
@ -1317,19 +1401,24 @@ int __fmt(void *fn, void *arg, const char *format, va_list va) {
sign = '-';
}
if ((width -= bw + 5) > 0) {
if (sign) --width;
if (prec1 || (flags & FLAGS_HASH)) --width;
if (sign)
--width;
if (prec1 || (flags & FLAGS_HASH))
--width;
}
if ((width -= MAX(prec, prec1)) > 0 && !(flags & FLAGS_LEFT) &&
!(flags & FLAGS_ZEROPAD)) {
do __FMT_PUT(' ');
do
__FMT_PUT(' ');
while (--width > 0);
}
if (sign) __FMT_PUT(sign);
if (sign)
__FMT_PUT(sign);
__FMT_PUT('0');
__FMT_PUT(alphabet[17]); // x or X
if ((flags & FLAGS_ZEROPAD) && width > 0 && !(flags & FLAGS_LEFT)) {
do __FMT_PUT('0');
do
__FMT_PUT('0');
while (--width > 0);
}
i1 = prec1 & 7;
@ -1340,7 +1429,8 @@ int __fmt(void *fn, void *arg, const char *format, va_list va) {
}
while (prec1 > 0) {
if (--i1 < 0) {
if (--k < 0) break;
if (--k < 0)
break;
i1 = 7;
}
__FMT_PUT(alphabet[(fpb.bits[k] >> 4 * i1) & 0xf]);
@ -1363,7 +1453,8 @@ int __fmt(void *fn, void *arg, const char *format, va_list va) {
for (;;) {
i1 = bex / c;
__FMT_PUT('0' + i1);
if (!--bw) break;
if (!--bw)
break;
bex -= i1 * c;
bex *= 10;
}

3
libc/stdio/fputc_unlocked.c
View file

@ -33,7 +33,8 @@ int fputc_unlocked(int c, FILE *f) {
return c & 255;
} else {
b = c;
if (!fwrite_unlocked(&b, 1, 1, f)) return -1;
if (!fwrite_unlocked(&b, 1, 1, f))
return -1;
return b;
}
}

3
libc/stdio/fputs_unlocked.c
View file

@ -34,6 +34,7 @@ int fputs_unlocked(const char *s, FILE *f) {
size_t n, r;
n = strlen(s);
r = fwrite_unlocked(s, 1, n, f);
if (!r && n) return -1;
if (!r && n)
return -1;
return r;
}

3
libc/stdio/fread_unlocked.c
View file

@ -97,7 +97,8 @@ size_t fread_unlocked(void *buf, size_t stride, size_t count, FILE *f) {
return count;
} else {
n = (m + n) / stride;
if (n < count) f->state = -1;
if (n < count)
f->state = -1;
return n;
}
}

3
libc/stdio/fseek_unlocked.c
View file

@ -40,7 +40,8 @@ int fseek_unlocked(FILE *f, int64_t offset, int whence) {
int res;
int64_t pos;
if (f->fd != -1) {
if (__fflush_impl(f) == -1) return -1;
if (__fflush_impl(f) == -1)
return -1;
if (whence == SEEK_CUR && f->beg < f->end) {
offset -= f->end - f->beg;
}

6
libc/stdio/ftell.c
View file

@ -26,9 +26,11 @@
static inline int64_t ftell_unlocked(FILE *f) {
int64_t pos;
if (f->fd != -1) {
if (__fflush_impl(f) == -1) return -1;
if (__fflush_impl(f) == -1)
return -1;
if ((pos = lseek(f->fd, 0, SEEK_CUR)) != -1) {
if (f->beg < f->end) pos -= f->end - f->beg;
if (f->beg < f->end)
pos -= f->end - f->beg;
return pos;
} else {
f->state = errno == ESPIPE ? EBADF : errno;

3
libc/stdio/getcwd.c
View file

@ -49,7 +49,8 @@ char *getcwd(char *buf, size_t size) {
return 0;
}
} else {
if (!size) size = 4096;
if (!size)
size = 4096;
if (!(path = malloc(size))) {
return 0; // enomem
}

6
libc/stdio/getdelim_unlocked.c
View file

@ -40,7 +40,8 @@ ssize_t getdelim_unlocked(char **s, size_t *n, int delim, FILE *f) {
f->state = errno = EINVAL;
return -1;
}
if (!*s) *n = 0;
if (!*s)
*n = 0;
for (i = 0;; i += m) {
m = f->end - f->beg;
if ((p = memchr(f->buf + f->beg, delim, m))) {
@ -67,7 +68,8 @@ ssize_t getdelim_unlocked(char **s, size_t *n, int delim, FILE *f) {
} else if (f->fd == -1) {
break;
} else if ((rc = read(f->fd, f->buf, f->size)) != -1) {
if (!rc) break;
if (!rc)
break;
f->end = rc;
} else if (errno != EINTR) {
f->state = errno;

6
libc/stdio/getentropy.c
View file

@ -42,12 +42,14 @@ int getentropy(void *p, size_t n) {
} else if ((!p && n) || (IsAsan() && !__asan_is_valid(p, n))) {
rc = efault();
} else if (IsXnu() || IsOpenbsd()) {
if (sys_getentropy(p, n)) notpossible;
if (sys_getentropy(p, n))
notpossible;
rc = 0;
} else {
BLOCK_SIGNALS;
BLOCK_CANCELATION;
if (__getrandom(p, n, 0) != n) notpossible;
if (__getrandom(p, n, 0) != n)
notpossible;
ALLOW_CANCELATION;
ALLOW_SIGNALS;
rc = 0;

9
libc/stdio/kvappendf.c
View file

@ -46,8 +46,10 @@ ssize_t kvappendf(char **b, const char *f, va_list v) {
if ((r = kvsnprintf(p + z.i, z.n ? z.n - W - z.i : 0, f, v)) >= 0) {
n = ROUNDUP(z.i + r + 1, 8) + W;
if (n > z.n) {
if (!z.n) z.n = W * 2;
while (n > z.n) z.n += z.n >> 1;
if (!z.n)
z.n = W * 2;
while (n > z.n)
z.n += z.n >> 1;
z.n = ROUNDUP(z.n, W);
if ((p = realloc(p, z.n))) {
z.n = malloc_usable_size(p);
@ -61,7 +63,8 @@ ssize_t kvappendf(char **b, const char *f, va_list v) {
}
}
z.i += r;
if (!IsTiny() && W == 8) z.i |= (size_t)APPEND_COOKIE << 48;
if (!IsTiny() && W == 8)
z.i |= (size_t)APPEND_COOKIE << 48;
*(size_t *)(p + z.n - W) = z.i;
}
va_end(w);

12
libc/stdio/mt19937.c
View file

@ -100,13 +100,16 @@ void _Smt19937(uint64_t K[], size_t n) {
for (i = 1, j = 0, k = MAX(NN, n); k; k--) {
mt[i] = (mt[i] ^ ((mt[i - 1] ^ (mt[i - 1] >> 62)) * 0x369dea0f31a53f85)) +
K[j] + j;
if (++i >= NN) mt[0] = mt[NN - 1], i = 1;
if (++j >= n) j = 0;
if (++i >= NN)
mt[0] = mt[NN - 1], i = 1;
if (++j >= n)
j = 0;
}
for (k = NN - 1; k; k--) {
mt[i] =
(mt[i] ^ ((mt[i - 1] ^ (mt[i - 1] >> 62)) * 0x27bb2ee687b0b0fd)) - i;
if (++i >= NN) mt[0] = mt[NN - 1], i = 1;
if (++i >= NN)
mt[0] = mt[NN - 1], i = 1;
}
mt[0] = 0x8000000000000000; /* assures non-zero initial array */
}
@ -122,7 +125,8 @@ uint64_t _mt19937(void) {
int i;
uint64_t x;
if (mti >= NN) {
if (mti == NN + 1) _smt19937(5489);
if (mti == NN + 1)
_smt19937(5489);
for (i = 0; i < NN - MM; i++) {
x = (mt[i] & UM) | (mt[i + 1] & LM);
mt[i] = mt[i + MM] ^ (x >> 1) ^ mag01[x & 1];

3
libc/stdio/pclose.c
View file

@ -42,7 +42,8 @@ int pclose(FILE *f) {
bool iscancelled, wasinterrupted;
pid = f->pid;
fclose(f);
if (!pid) return 0;
if (!pid)
return 0;
iscancelled = false;
wasinterrupted = false;
for (e = errno;;) {

9
libc/stdio/popen.c
View file

@ -70,14 +70,17 @@ FILE *popen(const char *cmdline, const char *mode) {
errno = rc;
return 0;
}
if (pipe2(pipefds, O_CLOEXEC) == -1) return NULL;
if (pipe2(pipefds, O_CLOEXEC) == -1)
return NULL;
if ((f = fdopen(pipefds[dir], mode))) {
switch ((pid = fork())) {
case 0:
unassert(dup2(pipefds[!dir], !dir) == !dir);
// we can't rely on cloexec because cocmd builtins don't execve
if (pipefds[0] != !dir) unassert(!close(pipefds[0]));
if (pipefds[1] != !dir) unassert(!close(pipefds[1]));
if (pipefds[0] != !dir)
unassert(!close(pipefds[0]));
if (pipefds[1] != !dir)
unassert(!close(pipefds[1]));
// "The popen() function shall ensure that any streams from
// previous popen() calls that remain open in the parent
// process are closed in the new child process." -POSIX

204
libc/stdio/printargs.c
View file

@ -187,7 +187,8 @@ textstartup void __printargs(const char *prologue) {
(void)x;
if (!PLEDGED(STDIO)) return;
if (!PLEDGED(STDIO))
return;
ftrace_enabled(-1);
strace_enabled(-1);
@ -263,25 +264,44 @@ textstartup void __printargs(const char *prologue) {
});
kprintf(prologue);
kprintf(" ");
if (X86_HAVE(SSE3)) kprintf(" SSE3");
if (X86_HAVE(SSSE3)) kprintf(" SSSE3");
if (X86_HAVE(SSE4_2)) kprintf(" SSE4_2");
if (X86_HAVE(POPCNT)) kprintf(" POPCNT");
if (X86_HAVE(AVX)) kprintf(" AVX");
if (X86_HAVE(AVX2)) kprintf(" AVX2");
if (X86_HAVE(FMA)) kprintf(" FMA");
if (X86_HAVE(BMI)) kprintf(" BMI");
if (X86_HAVE(BMI2)) kprintf(" BMI2");
if (X86_HAVE(ADX)) kprintf(" ADX");
if (X86_HAVE(F16C)) kprintf(" F16C");
if (X86_HAVE(SHA)) kprintf(" SHA");
if (X86_HAVE(AES)) kprintf(" AES");
if (X86_HAVE(RDRND)) kprintf(" RDRND");
if (X86_HAVE(RDSEED)) kprintf(" RDSEED");
if (X86_HAVE(RDTSCP)) kprintf(" RDTSCP");
if (X86_HAVE(RDPID)) kprintf(" RDPID");
if (X86_HAVE(LA57)) kprintf(" LA57");
if (X86_HAVE(FSGSBASE)) kprintf(" FSGSBASE");
if (X86_HAVE(SSE3))
kprintf(" SSE3");
if (X86_HAVE(SSSE3))
kprintf(" SSSE3");
if (X86_HAVE(SSE4_2))
kprintf(" SSE4_2");
if (X86_HAVE(POPCNT))
kprintf(" POPCNT");
if (X86_HAVE(AVX))
kprintf(" AVX");
if (X86_HAVE(AVX2))
kprintf(" AVX2");
if (X86_HAVE(FMA))
kprintf(" FMA");
if (X86_HAVE(BMI))
kprintf(" BMI");
if (X86_HAVE(BMI2))
kprintf(" BMI2");
if (X86_HAVE(ADX))
kprintf(" ADX");
if (X86_HAVE(F16C))
kprintf(" F16C");
if (X86_HAVE(SHA))
kprintf(" SHA");
if (X86_HAVE(AES))
kprintf(" AES");
if (X86_HAVE(RDRND))
kprintf(" RDRND");
if (X86_HAVE(RDSEED))
kprintf(" RDSEED");
if (X86_HAVE(RDTSCP))
kprintf(" RDTSCP");
if (X86_HAVE(RDPID))
kprintf(" RDPID");
if (X86_HAVE(LA57))
kprintf(" LA57");
if (X86_HAVE(FSGSBASE))
kprintf(" FSGSBASE");
#elif defined(__aarch64__)
kprintf(" AARCH64\n");
#else
@ -297,7 +317,8 @@ textstartup void __printargs(const char *prologue) {
if ((n = poll(u.pfds, ARRAYLEN(u.pfds), 0)) != -1) {
for (i = 0; i < ARRAYLEN(u.pfds); ++i) {
char oflagbuf[128];
if (i && (u.pfds[i].revents & POLLNVAL)) continue;
if (i && (u.pfds[i].revents & POLLNVAL))
continue;
PRINT(" ☼ %d (revents=%#hx fcntl(F_GETFL)=%s isatty()=%hhhd)", i,
u.pfds[i].revents, (DescribeOpenFlags)(oflagbuf, fcntl(i, F_GETFL)),
isatty(i));
@ -364,8 +385,10 @@ textstartup void __printargs(const char *prologue) {
for (gotsome = false, i = 0; i < RLIM_NLIMITS; ++i) {
if (!getrlimit(i, &rlim)) {
char buf[20];
if (rlim.rlim_cur == RLIM_INFINITY) rlim.rlim_cur = -1;
if (rlim.rlim_max == RLIM_INFINITY) rlim.rlim_max = -1;
if (rlim.rlim_cur == RLIM_INFINITY)
rlim.rlim_cur = -1;
if (rlim.rlim_max == RLIM_INFINITY)
rlim.rlim_max = -1;
PRINT(" ☼ %-20s %,16ld %,16ld", (DescribeRlimitName)(buf, i),
rlim.rlim_cur, rlim.rlim_max);
gotsome = true;
@ -488,32 +511,55 @@ textstartup void __printargs(const char *prologue) {
}
kprintf(prologue);
kprintf(" c_iflag =");
if (termios.c_iflag & IGNBRK) kprintf(" IGNBRK");
if (termios.c_iflag & BRKINT) kprintf(" BRKINT");
if (termios.c_iflag & IGNPAR) kprintf(" IGNPAR");
if (termios.c_iflag & PARMRK) kprintf(" PARMRK");
if (termios.c_iflag & INPCK) kprintf(" INPCK");
if (termios.c_iflag & ISTRIP) kprintf(" ISTRIP");
if (termios.c_iflag & INLCR) kprintf(" INLCR");
if (termios.c_iflag & IGNCR) kprintf(" IGNCR");
if (termios.c_iflag & ICRNL) kprintf(" ICRNL");
if (termios.c_iflag & IXON) kprintf(" IXON");
if (termios.c_iflag & IXANY) kprintf(" IXANY");
if (termios.c_iflag & IXOFF) kprintf(" IXOFF");
if (termios.c_iflag & IMAXBEL) kprintf(" IMAXBEL");
if (termios.c_iflag & IUTF8) kprintf(" IUTF8");
if (termios.c_iflag & IUCLC) kprintf(" IUCLC");
if (termios.c_iflag & IGNBRK)
kprintf(" IGNBRK");
if (termios.c_iflag & BRKINT)
kprintf(" BRKINT");
if (termios.c_iflag & IGNPAR)
kprintf(" IGNPAR");
if (termios.c_iflag & PARMRK)
kprintf(" PARMRK");
if (termios.c_iflag & INPCK)
kprintf(" INPCK");
if (termios.c_iflag & ISTRIP)
kprintf(" ISTRIP");
if (termios.c_iflag & INLCR)
kprintf(" INLCR");
if (termios.c_iflag & IGNCR)
kprintf(" IGNCR");
if (termios.c_iflag & ICRNL)
kprintf(" ICRNL");
if (termios.c_iflag & IXON)
kprintf(" IXON");
if (termios.c_iflag & IXANY)
kprintf(" IXANY");
if (termios.c_iflag & IXOFF)
kprintf(" IXOFF");
if (termios.c_iflag & IMAXBEL)
kprintf(" IMAXBEL");
if (termios.c_iflag & IUTF8)
kprintf(" IUTF8");
if (termios.c_iflag & IUCLC)
kprintf(" IUCLC");
kprintf("\n");
kprintf(prologue);
kprintf(" c_oflag =");
if (termios.c_oflag & OPOST) kprintf(" OPOST");
if (termios.c_oflag & ONLCR) kprintf(" ONLCR");
if (termios.c_oflag & OCRNL) kprintf(" OCRNL");
if (termios.c_oflag & ONOCR) kprintf(" ONOCR");
if (termios.c_oflag & ONLRET) kprintf(" ONLRET");
if (termios.c_oflag & OFILL) kprintf(" OFILL");
if (termios.c_oflag & OFDEL) kprintf(" OFDEL");
if (termios.c_oflag & OLCUC) kprintf(" OLCUC");
if (termios.c_oflag & OPOST)
kprintf(" OPOST");
if (termios.c_oflag & ONLCR)
kprintf(" ONLCR");
if (termios.c_oflag & OCRNL)
kprintf(" OCRNL");
if (termios.c_oflag & ONOCR)
kprintf(" ONOCR");
if (termios.c_oflag & ONLRET)
kprintf(" ONLRET");
if (termios.c_oflag & OFILL)
kprintf(" OFILL");
if (termios.c_oflag & OFDEL)
kprintf(" OFDEL");
if (termios.c_oflag & OLCUC)
kprintf(" OLCUC");
if ((termios.c_oflag & NLDLY) == NL1) {
kprintf(" NL1");
} else if ((termios.c_oflag & NLDLY) == NL2) {
@ -547,13 +593,20 @@ textstartup void __printargs(const char *prologue) {
kprintf("\n");
kprintf(prologue);
kprintf(" c_cflag =");
if (termios.c_cflag & PARENB) kprintf(" PARENB");
if (termios.c_cflag & PARODD) kprintf(" PARODD");
if (termios.c_cflag & CSTOPB) kprintf(" CSTOPB");
if (termios.c_cflag & PARODD) kprintf(" PARODD");
if (termios.c_cflag & HUPCL) kprintf(" HUPCL");
if (termios.c_cflag & CREAD) kprintf(" CREAD");
if (termios.c_cflag & CLOCAL) kprintf(" CLOCAL");
if (termios.c_cflag & PARENB)
kprintf(" PARENB");
if (termios.c_cflag & PARODD)
kprintf(" PARODD");
if (termios.c_cflag & CSTOPB)
kprintf(" CSTOPB");
if (termios.c_cflag & PARODD)
kprintf(" PARODD");
if (termios.c_cflag & HUPCL)
kprintf(" HUPCL");
if (termios.c_cflag & CREAD)
kprintf(" CREAD");
if (termios.c_cflag & CLOCAL)
kprintf(" CLOCAL");
if ((termios.c_cflag & CSIZE) == CS5) {
kprintf(" CS5");
} else if ((termios.c_cflag & CSIZE) == CS6) {
@ -566,21 +619,36 @@ textstartup void __printargs(const char *prologue) {
kprintf("\n");
kprintf(prologue);
kprintf(" c_lflag =");
if (termios.c_lflag & ISIG) kprintf(" ISIG");
if (termios.c_lflag & ICANON) kprintf(" ICANON");
if (termios.c_lflag & ECHO) kprintf(" ECHO");
if (termios.c_lflag & ECHOE) kprintf(" ECHOE");
if (termios.c_lflag & ECHOK) kprintf(" ECHOK");
if (termios.c_lflag & ECHONL) kprintf(" ECHONL");
if (termios.c_lflag & NOFLSH) kprintf(" NOFLSH");
if (termios.c_lflag & TOSTOP) kprintf(" TOSTOP");
if (termios.c_lflag & IEXTEN) kprintf(" IEXTEN");
if (termios.c_lflag & ECHOCTL) kprintf(" ECHOCTL");
if (termios.c_lflag & ECHOPRT) kprintf(" ECHOPRT");
if (termios.c_lflag & ECHOKE) kprintf(" ECHOKE");
if (termios.c_lflag & FLUSHO) kprintf(" FLUSHO");
if (termios.c_lflag & PENDIN) kprintf(" PENDIN");
if (termios.c_lflag & XCASE) kprintf(" XCASE");
if (termios.c_lflag & ISIG)
kprintf(" ISIG");
if (termios.c_lflag & ICANON)
kprintf(" ICANON");
if (termios.c_lflag & ECHO)
kprintf(" ECHO");
if (termios.c_lflag & ECHOE)
kprintf(" ECHOE");
if (termios.c_lflag & ECHOK)
kprintf(" ECHOK");
if (termios.c_lflag & ECHONL)
kprintf(" ECHONL");
if (termios.c_lflag & NOFLSH)
kprintf(" NOFLSH");
if (termios.c_lflag & TOSTOP)
kprintf(" TOSTOP");
if (termios.c_lflag & IEXTEN)
kprintf(" IEXTEN");
if (termios.c_lflag & ECHOCTL)
kprintf(" ECHOCTL");
if (termios.c_lflag & ECHOPRT)
kprintf(" ECHOPRT");
if (termios.c_lflag & ECHOKE)
kprintf(" ECHOKE");
if (termios.c_lflag & FLUSHO)
kprintf(" FLUSHO");
if (termios.c_lflag & PENDIN)
kprintf(" PENDIN");
if (termios.c_lflag & XCASE)
kprintf(" XCASE");
kprintf("\n");
PRINT(" cfgetispeed() = %u", cfgetispeed(&termios));
PRINT(" cfgetospeed() = %u", cfgetospeed(&termios));

9
libc/stdio/puts_unlocked.c
View file

@ -29,11 +29,14 @@ int puts_unlocked(const char *s) {
size_t n, r;
if ((n = strlen(s))) {
r = fwrite_unlocked(s, 1, n, stdout);
if (!r) return -1;
if (r < n) return r;
if (!r)
return -1;
if (r < n)
return r;
}
if (fputc_unlocked('\n', stdout) == -1) {
if (feof_unlocked(stdout)) return n;
if (feof_unlocked(stdout))
return n;
return -1;
}
return n + 1;

12
libc/stdio/random.c
View file

@ -87,7 +87,8 @@ void srandom(unsigned seed) {
char *initstate(unsigned seed, char *state, size_t size) {
void *old;
if (size < 8) return 0;
if (size < 8)
return 0;
old = savestate();
if (size < 32) {
n = 0;
@ -115,10 +116,13 @@ char *setstate(char *state) {
long random(void) {
long k;
if (!n) return (x[0] = lcg31(x[0]));
if (!n)
return (x[0] = lcg31(x[0]));
x[i] += x[j];
k = x[i] >> 1;
if (++i == n) i = 0;
if (++j == n) j = 0;
if (++i == n)
i = 0;
if (++j == n)
j = 0;
return k;
}

3
libc/stdio/rdseed.c
View file

@ -48,7 +48,8 @@ uint64_t rdseed(void) {
: CFLAG_CONSTRAINT(cf), "=r"(x)
: /* no inputs */
: "cc");
if (cf) return x;
if (cf)
return x;
asm volatile("pause");
}
}

3
libc/stdio/rngset.c
View file

@ -52,7 +52,8 @@ dontasan void *rngset(void *b, size_t n, uint64_t seed(void), size_t reseed) {
reseed = 8;
}
while (n) {
if (seed) t = seed();
if (seed)
t = seed();
if (!seed || reseed > 8) {
n -= (m = reseed < n ? reseed : n);
while (m >= 8) {

3
libc/stdio/setvbuf.c
View file

@ -36,7 +36,8 @@
int setvbuf(FILE *f, char *buf, int mode, size_t size) {
flockfile(f);
if (buf) {
if (!size) size = BUFSIZ;
if (!size)
size = BUFSIZ;
if (!f->nofree && //
f->buf != buf && //
f->buf != f->mem && //

3
libc/stdio/sortstrlist.c
View file

@ -23,7 +23,8 @@ static int CompareStrings(const void *p1, const void *p2) {
const char *a = *(const char **)p1;
const char *b = *(const char **)p2;
for (; *a == *b; a++, b++) {
if (!*a) break;
if (!*a)
break;
}
return (*a & 0xff) - (*b & 0xff);
}

3
libc/stdio/ungetc_unlocked.c
View file

@ -24,7 +24,8 @@
* Pushes byte back to stream.
*/
int ungetc_unlocked(int c, FILE *f) {
if (c == -1) return -1;
if (c == -1)
return -1;
if (f->beg) {
if (c != f->buf[--f->beg]) {
f->buf[f->beg] = c;

3
libc/stdio/ungetwc_unlocked.c
View file

@ -27,7 +27,8 @@ wint_t ungetwc_unlocked(wint_t c, FILE *f) {
char b[6];
unsigned n;
uint64_t w;
if (c == -1) return -1;
if (c == -1)
return -1;
n = 0;
w = tpenc(c);
do {

9
libc/stdio/vappendf.c
View file

@ -39,8 +39,10 @@ ssize_t(vappendf)(char **b, const char *f, va_list v) {
if ((r = (vsnprintf)(p + z.i, z.n ? z.n - W - z.i : 0, f, v)) >= 0) {
n = ROUNDUP(z.i + r + 1, 8) + W;
if (n > z.n) {
if (!z.n) z.n = W * 2;
while (n > z.n) z.n += z.n >> 1;
if (!z.n)
z.n = W * 2;
while (n > z.n)
z.n += z.n >> 1;
z.n = ROUNDUP(z.n, W);
if ((p = realloc(p, z.n))) {
z.n = malloc_usable_size(p);
@ -54,7 +56,8 @@ ssize_t(vappendf)(char **b, const char *f, va_list v) {
}
}
z.i += r;
if (!IsTiny() && W == 8) z.i |= (size_t)APPEND_COOKIE << 48;
if (!IsTiny() && W == 8)
z.i |= (size_t)APPEND_COOKIE << 48;
*(size_t *)(p + z.n - W) = z.i;
}
va_end(w);

23
libc/stdio/vcscanf.c
View file

@ -29,11 +29,12 @@
#include "libc/sysv/errfuns.h"
#include "third_party/gdtoa/gdtoa.h"
#define READ \
({ \
int c = callback(arg); \
if (c != -1) ++consumed; \
c; \
#define READ \
({ \
int c = callback(arg); \
if (c != -1) \
++consumed; \
c; \
})
#define FP_BUFFER_GROW 48
@ -150,7 +151,8 @@ int __vcscanf(int callback(void *), //
break;
case 'c':
rawmode = true;
if (!width) width = 1;
if (!width)
width = 1;
// fallthrough
case 's':
while (isspace(c)) {
@ -574,7 +576,8 @@ int __vcscanf(int callback(void *), //
buf = NULL;
} else {
do {
if (isspace(c)) break;
if (isspace(c))
break;
} while ((c = READ) != -1);
}
break;
@ -589,9 +592,11 @@ Done:
while (freeme) {
struct FreeMe *entry = freeme;
freeme = entry->next;
if (items == -1) free(entry->ptr);
if (items == -1)
free(entry->ptr);
free(entry);
}
if (fpbuf) free(fpbuf);
if (fpbuf)
free(fpbuf);
return items;
}

3
libc/stdio/vdprintf.c
View file

@ -63,7 +63,8 @@ int vdprintf(int fd, const char *fmt, va_list va) {
t.n = 0;
t.t = 0;
t.fd = fd;
if (__fmt(vdprintf_putc, &t, fmt, va) == -1) return -1;
if (__fmt(vdprintf_putc, &t, fmt, va) == -1)
return -1;
if (t.n) {
iov[0].iov_base = t.b;
iov[0].iov_len = t.n;

6
libc/stdio/vsnprintf.c
View file

@ -59,7 +59,9 @@ static int vsnprintfputchar(const char *s, struct SprintfStr *t, size_t n) {
int vsnprintf(char *buf, size_t size, const char *fmt, va_list va) {
struct SprintfStr str = {buf, 0, size};
int rc = __fmt(vsnprintfputchar, &str, fmt, va);
if (rc < 0) return rc;
if (str.n) str.p[MIN(str.i, str.n - 1)] = '\0';
if (rc < 0)
return rc;
if (str.n)
str.p[MIN(str.i, str.n - 1)] = '\0';
return str.i;
}