Enable fmemopen(3) and open_{w,}memstream(3)

commiting on behalf of mpi@

3 files changed, 22 insertions, 14 deletions

diff --git a/include/stdio.h b/include/stdio.h
index 72fc43784fe..67d85d79dce 100644
--- a/include/stdio.h
+++ b/include/stdio.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: stdio.h,v 1.43 2013/01/30 00:08:13 brad Exp $	*/
+/*	$OpenBSD: stdio.h,v 1.44 2013/03/28 16:37:14 eric Exp $	*/
 /*	$NetBSD: stdio.h,v 1.18 1996/04/25 18:29:21 jtc Exp $	*/
 
 /*-
@@ -335,6 +335,11 @@ int	 putc_unlocked(int, FILE *);
 int	 putchar_unlocked(int);
 #endif /* __POSIX_VISIBLE >= 199506 */
 
+#if __POSIX_VISIBLE >= 200809
+FILE	*fmemopen(void *, size_t, const char *);
+FILE	*open_memstream(char **, size_t *);
+#endif /* __POSIX_VISIBLE >= 200809 */
+
 #if __XPG_VISIBLE
 char	*tempnam(const char *, const char *);
 #endif
diff --git a/include/wchar.h b/include/wchar.h
index d91204f12b3..442e89f9db2 100644
--- a/include/wchar.h
+++ b/include/wchar.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: wchar.h,v 1.23 2012/06/06 16:58:02 matthew Exp $	*/
+/*	$OpenBSD: wchar.h,v 1.24 2013/03/28 16:37:14 eric Exp $	*/
 /*	$NetBSD: wchar.h,v 1.16 2003/03/07 07:11:35 tshiozak Exp $	*/
 
 /*-
@@ -155,6 +155,8 @@ unsigned long int wcstoul(const wchar_t * __restrict, wchar_t ** __restrict,
 		int base);
 
 #if __POSIX_VISIBLE >= 200809
+FILE *open_wmemstream(wchar_t **, size_t *);
+
 wchar_t	*wcsdup(const wchar_t *);
 int wcscasecmp(const wchar_t *, const wchar_t *);
 int wcsncasecmp(const wchar_t *, const wchar_t *, size_t);
diff --git a/lib/libc/stdio/Makefile.inc b/lib/libc/stdio/Makefile.inc
index caee57667a0..802e96b568b 100644
--- a/lib/libc/stdio/Makefile.inc
+++ b/lib/libc/stdio/Makefile.inc
@@ -1,4 +1,4 @@
-#	$OpenBSD: Makefile.inc,v 1.23 2013/01/30 00:08:13 brad Exp $
+#	$OpenBSD: Makefile.inc,v 1.24 2013/03/28 16:37:13 eric Exp $
 
 # stdio sources
 .PATH: ${LIBCSRCDIR}/stdio
@@ -6,24 +6,24 @@
 CFLAGS+=-DFLOATING_POINT -DPRINTF_WIDE_CHAR -DSCANF_WIDE_CHAR
 
 SRCS+=	asprintf.c clrerr.c fclose.c fdopen.c feof.c ferror.c fflush.c fgetc.c \
-	fgetln.c fgetpos.c fgets.c fileno.c findfp.c flags.c fopen.c \
-	fprintf.c fpurge.c fputc.c fputs.c fread.c freopen.c fscanf.c \
+	fgetln.c fgetpos.c fgets.c fileno.c findfp.c flags.c fmemopen.c \
+	fopen.c fprintf.c fpurge.c fputc.c fputs.c fread.c freopen.c fscanf.c \
 	fseek.c fsetpos.c ftell.c funopen.c fvwrite.c fwalk.c fwrite.c \
-	getc.c getchar.c gets.c getw.c makebuf.c mktemp.c perror.c printf.c \
-	putc.c putchar.c puts.c putw.c refill.c remove.c rewind.c rget.c \
-	scanf.c setbuf.c setbuffer.c setvbuf.c snprintf.c sprintf.c sscanf.c \
-	stdio.c tempnam.c tmpfile.c tmpnam.c ungetc.c vasprintf.c vfprintf.c \
-	vfscanf.c vprintf.c vscanf.c vsnprintf.c vsprintf.c vsscanf.c \
-	wbuf.c wsetup.c flockfile.c \
+	getc.c getchar.c gets.c getw.c makebuf.c mktemp.c open_memstream.c \
+	open_wmemstream.c perror.c printf.c putc.c putchar.c puts.c putw.c \
+	refill.c remove.c rewind.c rget.c scanf.c setbuf.c setbuffer.c \
+	setvbuf.c snprintf.c sprintf.c sscanf.c stdio.c tempnam.c tmpfile.c \
+	tmpnam.c ungetc.c vasprintf.c vfprintf.c vfscanf.c vprintf.c vscanf.c \
+	vsnprintf.c vsprintf.c vsscanf.c wbuf.c wsetup.c flockfile.c \
 	fgetwc.c fgetws.c fputwc.c fputws.c fwide.c getwc.c getwchar.c \
 	putwc.c putwchar.c ungetwc.c \
 	fwprintf.c swprintf.c vfwprintf.c vswprintf.c vwprintf.c wprintf.c \
 	fwscanf.c swscanf.c vfwscanf.c vswscanf.c vwscanf.c wscanf.c \
 	getdelim.c getline.c dprintf.c vdprintf.c
 
-MAN+=	fclose.3 ferror.3 fflush.3 fgetln.3 fgets.3 fopen.3 fputs.3 \
-	fread.3 fseek.3 funopen.3 getc.3 mktemp.3 perror.3 printf.3 putc.3 \
-	remove.3 scanf.3 setbuf.3 stdio.3 tmpnam.3 ungetc.3 \
+MAN+=	fclose.3 ferror.3 fflush.3 fgetln.3 fgets.3 fmemopen.3 fopen.3 fputs.3 \
+	fread.3 fseek.3 funopen.3 getc.3 mktemp.3 open_memstream.3 perror.3 \
+	printf.3 putc.3 remove.3 scanf.3 setbuf.3 stdio.3 tmpnam.3 ungetc.3 \
 	fgetws.3 fputws.3 fwide.3 getwc.3 putwc.3 ungetwc.3 wprintf.3 wscanf.3 \
 	getdelim.3
 
@@ -41,6 +41,7 @@ MLINKS+=getdelim.3 getline.3
 MLINKS+=mktemp.3 mkstemp.3
 MLINKS+=mktemp.3 mkdtemp.3
 MLINKS+=mktemp.3 mkstemps.3
+MLINKS+=open_memstream.3 open_wmemstream.3
 MLINKS+=printf.3 fprintf.3 printf.3 snprintf.3 printf.3 sprintf.3 \
 	printf.3 vfprintf.3 printf.3 vprintf.3 printf.3 vsnprintf.3 \
 	printf.3 vsprintf.3 printf.3 asprintf.3 printf.3 vasprintf.3 \