diff options
Diffstat (limited to 'src/stdio')
-rw-r--r-- | src/stdio/fclose.c | 1 | ||||
-rw-r--r-- | src/stdio/fgetln.c | 19 | ||||
-rw-r--r-- | src/stdio/printf.c | 2 | ||||
-rw-r--r-- | src/stdio/vfprintf.c | 6 |
4 files changed, 23 insertions, 5 deletions
diff --git a/src/stdio/fclose.c b/src/stdio/fclose.c index 373a2c76..8fdc3f7d 100644 --- a/src/stdio/fclose.c +++ b/src/stdio/fclose.c @@ -16,6 +16,7 @@ int fclose(FILE *f) r = fflush(f); r |= f->close(f); + if (f->getln_buf) free(f->getln_buf); if (!perm) free(f); return r; diff --git a/src/stdio/fgetln.c b/src/stdio/fgetln.c new file mode 100644 index 00000000..06b88837 --- /dev/null +++ b/src/stdio/fgetln.c @@ -0,0 +1,19 @@ +#include "stdio_impl.h" + +char *fgetln(FILE *f, size_t *plen) +{ + char *ret = 0, *z; + ssize_t l; + FLOCK(f); + ungetc(getc_unlocked(f), f); + if ((z=memchr(f->rpos, '\n', f->rend - f->rpos))) { + ret = (char *)f->rpos; + *plen = ++z - ret; + f->rpos = (void *)z; + } else if ((l = getline(&f->getln_buf, (size_t[]){0}, f)) > 0) { + *plen = l; + ret = f->getln_buf; + } + FUNLOCK(f); + return ret; +} diff --git a/src/stdio/printf.c b/src/stdio/printf.c index efeb8b33..7b7c329f 100644 --- a/src/stdio/printf.c +++ b/src/stdio/printf.c @@ -6,7 +6,7 @@ int printf(const char *fmt, ...) int ret; va_list ap; va_start(ap, fmt); - ret = vprintf(fmt, ap); + ret = vfprintf(stdout, fmt, ap); va_end(ap); return ret; } diff --git a/src/stdio/vfprintf.c b/src/stdio/vfprintf.c index 116e1ced..d186d58b 100644 --- a/src/stdio/vfprintf.c +++ b/src/stdio/vfprintf.c @@ -430,7 +430,7 @@ static int getint(char **s) { static int printf_core(FILE *f, const char *fmt, va_list *ap, union arg *nl_arg, int *nl_type) { char *a, *z, *s=(char *)fmt; - unsigned l10n=0, litpct, fl; + unsigned l10n=0, fl; int w, p; union arg arg; int argpos; @@ -455,9 +455,7 @@ static int printf_core(FILE *f, const char *fmt, va_list *ap, union arg *nl_arg, /* Handle literal text and %% format specifiers */ for (a=s; *s && *s!='%'; s++); - litpct = strspn(s, "%")/2; /* Optimize %%%% runs */ - z = s+litpct; - s += 2*litpct; + for (z=s; s[0]=='%' && s[1]=='%'; z++, s+=2); l = z-a; if (f) out(f, a, l); if (l) continue; |