Re: Priorities for next release?

[Rich Felker <dalias@aerifal.cx>]

[-- Attachment #1: Type: text/plain, Size: 752 bytes --]

On Sat, Aug 11, 2012 at 04:51:28PM -0400, Rich Felker wrote:
> > I'm sending fgetln.c (+my diff), but please check it...
> > btw. it based on /usr.bin/make/util.c from OpenBSD:
> 
> If we add fgetln, I'd like a much higher quality of implementation.
> It's not clear from the past documentation I've read for this function
> that it's allowed to use a shared static buffer for all FILEs, and
> even if it were, I find that really ugly. Instead, simply returning a
> pointer into the FILE's buffer when the whole line is already present
> in the buffer, and otherwise allocating a FILE-local buffer for it,
> would be a lot nicer. fclose could then check the FILE-local pointer
> and free if it it was allocated.

See attached. Does it work okay?

Rich

[-- Attachment #2: fgetln.c --]
[-- Type: text/plain, Size: 341 bytes --]

#include "stdio_impl.h"

char *fgetln(FILE *f, size_t *plen)
{
	char *z;
	ssize_t l;
	if ((z=memchr(f->rpos, '\n', f->rend - f->rpos))) {
		char *ret = (char *)f->rpos;
		*plen = ++z - ret;
		f->rpos = (void *)z;
		return ret;
	}
	if ((l = getline(&f->getln_buf, (size_t[]){0}, f)) > 0) {
		*plen = l;
		return f->getln_buf;
	}
	return 0;
}

[-- Attachment #3: fgetln.diff --]
[-- Type: text/plain, Size: 631 bytes --]

diff --git a/src/internal/stdio_impl.h b/src/internal/stdio_impl.h
index d54c918..65dcfbd 100644
--- a/src/internal/stdio_impl.h
+++ b/src/internal/stdio_impl.h
@@ -57,7 +57,7 @@ struct __FILE_s {
 	int waiters;
 	void *cookie;
 	off_t off;
-	void *dummy4;
+	char *getln_buf;
 	void *mustbezero_2;
 	unsigned char *shend;
 	off_t shlim, shcnt;
diff --git a/src/stdio/fclose.c b/src/stdio/fclose.c
index 373a2c7..8fdc3f7 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;