* include/stdint.h: Add missing newline at eof.

	* include/stdio.h (_snwprintf): Correct spelling.
	(_vsnwprintf): Likewise.
	(snprintf): Add prototype.
	(vsnprintf): Add prototype and inline definition.
	(snwprintf): Add prototype.
	(vsnwprintf): Add prototype and inline definition.
	* include/wchar.h (_snwprintf): Correct spelling.
	(_vsnwprintf): Likewise.
	(snwprintf): Add prototype.
	(vsnwprintf): Add prototype and inline definition.
	* mingwex/Makefile.in: Add snprintf.o, snwprintf.o
	to libmingwex.a.
	* mingwex/snprintf.c: New file.
	* mingwex/snwprintf.c: New file.

7 files changed, 85 insertions, 9 deletions

diff --git a/winsup/mingw/ChangeLog b/winsup/mingw/ChangeLog
index 7540b9b32..86ffb33d8 100644
--- a/winsup/mingw/ChangeLog
+++ b/winsup/mingw/ChangeLog
@@ -1,7 +1,25 @@
+2002-03-29  Danny Smith  <dannysmith@sourceforge.users.net>
+
+	* include/stdint.h: Add missing newline at eof. 
+	* include/stdio.h (_snwprintf): Correct spelling.
+	(_vsnwprintf): Likewise.
+	(snprintf): Add prototype.
+	(vsnprintf): Add prototype and inline definition.
+	(snwprintf): Add prototype.
+	(vsnwprintf): Add prototype and inline definition.
+	* include/wchar.h (_snwprintf): Correct spelling.
+	(_vsnwprintf): Likewise.
+	(snwprintf): Add prototype.
+	(vsnwprintf): Add prototype and inline definition.
+	* mingwex/Makefile.in: Add snprintf.o, snwprintf.o
+	to libmingwex.a.
+	* mingwex/snprintf.c: New file.
+	* mingwex/snwprintf.c: New file.
+
 2002-03-26  Danny Smith  <dannysmith@sourceforge.users.net>
 
-	* moldname.def.in (__MSVCRT__): Replace with !(__CRTDLL).
-	(wpopen): Add if !(__CRTDLL).
+	* moldname.def.in (__MSVCRT__): Replace with !(__CRTDLL__).
+	(wpopen): Add if !(__CRTDLL__).
 	* Makefile.in (moldname-msvcrt.def rule): Use -C, not -c to
 	preserve comments.
 	(moldname-crtdll.def rule): Likewise.
diff --git a/winsup/mingw/include/stdint.h b/winsup/mingw/include/stdint.h
index c3a79c5bb..71c6708ff 100644
--- a/winsup/mingw/include/stdint.h
+++ b/winsup/mingw/include/stdint.h
@@ -181,4 +181,4 @@ typedef unsigned long long   uintmax_t;
 
 #endif  /* !defined ( __cplusplus) || defined __STDC_CONSTANT_MACROS */
 
-#endif
\ No newline at end of file
+#endif
diff --git a/winsup/mingw/include/stdio.h b/winsup/mingw/include/stdio.h
index 7cd59f3a3..65db38ded 100644
--- a/winsup/mingw/include/stdio.h
+++ b/winsup/mingw/include/stdio.h
@@ -216,6 +216,13 @@ int	vprintf (const char*, va_list);
 int	vsprintf (char*, const char*, va_list);
 int	_vsnprintf (char*, size_t, const char*, va_list);
 
+#ifndef __NO_ISOCEXT  /* externs in libmingwex.a */
+int snprintf(char* s, size_t n, const char*  format, ...);
+extern inline int vsnprintf (char* s, size_t n, const char* format,
+			   va_list arg)
+  { return _vsnprintf ( s, n, format, arg); }
+#endif
+
 /*
  * Formatted Input
  */
@@ -319,11 +326,11 @@ int	fileno (FILE*);
 int	fwprintf (FILE*, const wchar_t*, ...);
 int	wprintf (const wchar_t*, ...);
 int	swprintf (wchar_t*, const wchar_t*, ...);
-int	_swnprintf (wchar_t*, size_t, const wchar_t*, ...);
+int	_snwprintf (wchar_t*, size_t, const wchar_t*, ...);
 int	vfwprintf (FILE*, const wchar_t*, va_list);
 int	vwprintf (const wchar_t*, va_list);
 int	vswprintf (wchar_t*, const wchar_t*, va_list);
-int	_vswnprintf (wchar_t*, size_t, const wchar_t*, va_list);
+int	_vsnwprintf (wchar_t*, size_t, const wchar_t*, va_list);
 int	fwscanf (FILE*, const wchar_t*, ...);
 int	wscanf (const wchar_t*, ...);
 int	swscanf (const wchar_t*, const wchar_t*, ...);
@@ -349,6 +356,14 @@ int	_wremove (const wchar_t*);
 void	_wperror (const wchar_t*);
 FILE*	_wpopen (const wchar_t*, const wchar_t*);
 #endif	/* __MSVCRT__ */
+
+#ifndef __NO_ISOCEXT  /* externs in libmingwex.a */
+int snwprintf(wchar_t* s, size_t n, const wchar_t*  format, ...);
+extern inline int vsnwprintf (wchar_t* s, size_t n, const wchar_t* format,
+			   va_list arg)
+  { return _vsnwprintf ( s, n, format, arg); }
+#endif
+
 #define _WSTDIO_DEFINED
 #endif /* _WSTDIO_DEFINED */
 
diff --git a/winsup/mingw/include/wchar.h b/winsup/mingw/include/wchar.h
index 054c40355..c9ffb9bec 100644
--- a/winsup/mingw/include/wchar.h
+++ b/winsup/mingw/include/wchar.h
@@ -105,11 +105,11 @@ int 	_wfindnexti64 (long, struct _wfinddatai64_t*);
 int	fwprintf (FILE*, const wchar_t*, ...);
 int	wprintf (const wchar_t*, ...);
 int	swprintf (wchar_t*, const wchar_t*, ...);
-int	_swnprintf (wchar_t*, size_t, const wchar_t*, ...);
+int	_snwprintf (wchar_t*, size_t, const wchar_t*, ...);
 int	vfwprintf (FILE*, const wchar_t*, va_list);
 int	vwprintf (const wchar_t*, va_list);
 int	vswprintf (wchar_t*, const wchar_t*, va_list);
-int	_vswnprintf (wchar_t*, size_t, const wchar_t*, va_list);
+int	_vsnwprintf (wchar_t*, size_t, const wchar_t*, va_list);
 int	fwscanf (FILE*, const wchar_t*, ...);
 int	wscanf (const wchar_t*, ...);
 int	swscanf (const wchar_t*, const wchar_t*, ...);
@@ -117,6 +117,13 @@ wint_t	fgetwc (FILE*);
 wint_t	fputwc (wchar_t, FILE*);
 wint_t	ungetwc (wchar_t, FILE*);
 
+#ifndef __NO_ISOCEXT  /* externs in libmingwex.a */
+int snwprintf(wchar_t* s, size_t n, const wchar_t*  format, ...);
+extern inline int vsnwprintf (wchar_t* s, size_t n, const wchar_t* format,
+			   va_list arg)
+  { return _vsnwprintf ( s, n, format, arg); }
+#endif
+
 #ifdef __MSVCRT__ 
 wchar_t* fgetws (wchar_t*, int, FILE*);
 int	fputws (const wchar_t*, FILE*);
diff --git a/winsup/mingw/mingwex/Makefile.in b/winsup/mingw/mingwex/Makefile.in
index 40e44e289..7334f51f2 100644
--- a/winsup/mingw/mingwex/Makefile.in
+++ b/winsup/mingw/mingwex/Makefile.in
@@ -61,6 +61,8 @@ DISTFILES = Makefile.in configure configure.in \
 	round.c \
 	signbit.c \
 	sitest.c \
+	snprintf.c \
+	snwprintf.c \
 	strtof.c \
 	strtoimax.c \
 	strtoumax.c \
@@ -118,6 +120,8 @@ STDLIB_STUB_OBJS = \
 	lltow.o ulltow.o \
 	atoll.o wtoll.o \
 	strtof.o wcstof.o
+STDIO_STUB_OBJS = \
+	snprintf.o snwprintf.o
 MATH_OBJS = \
 	fpclassify.o fucom.o round.o \
 	rint.o signbit.o trunc.o \
@@ -133,8 +137,8 @@ FENV_OBJS = fesetround.o  fegetround.o \
 POSIX_OBJS = \
 	dirent.o
 
-LIB_OBJS = $(Q8_OBJS) $(STDLIB_STUB_OBJS) $(MATH_OBJS) $(MATH_STUB_OBJS) \
-	$(FENV_OBJS) $(POSIX_OBJS)
+LIB_OBJS = $(Q8_OBJS) $(STDLIB_STUB_OBJS) $(STDIO_STUB_OBJS) \
+	$(MATH_OBJS) $(MATH_STUB_OBJS) $(FENV_OBJS) $(POSIX_OBJS) 
 
 LIBS = $(LIBMINGWEX_A)
 DLLS = 
diff --git a/winsup/mingw/mingwex/snprintf.c b/winsup/mingw/mingwex/snprintf.c
new file mode 100644
index 000000000..e533d5035
--- /dev/null
+++ b/winsup/mingw/mingwex/snprintf.c
@@ -0,0 +1,16 @@
+#include <stdarg.h>

+#include <stdio.h>

+

+int snprintf(char* buffer, size_t n, const char* format, ...)

+{

+  int retval;

+  va_list argptr;

+         

+  va_start( argptr, format );

+  retval = _vsnprintf( buffer, n, format, argptr );

+  va_end( argptr );

+  return retval;

+}

+

+int vsnprintf (char* s, size_t n, const char* format, va_list arg)

+  { return _vsnprintf ( s, n, format, arg); }

diff --git a/winsup/mingw/mingwex/snwprintf.c b/winsup/mingw/mingwex/snwprintf.c
new file mode 100644
index 000000000..25b0de4cf
--- /dev/null
+++ b/winsup/mingw/mingwex/snwprintf.c
@@ -0,0 +1,16 @@
+#include <stdarg.h>

+#include <wchar.h>

+

+int  swnprintf(wchar_t* buffer, size_t n, const wchar_t* format, ...)

+{

+    int retval;

+    va_list argptr;

+          

+    va_start( argptr, format );

+    retval = _vswnprintf( buffer, n, format, argptr );

+    va_end( argptr );

+    return retval;

+}

+

+int  vswnprintf(wchar_t *buffer,  size_t n, const wchar_t * format, va_list argptr)

+{ return _vswnprintf( buffer, n, format, argptr );}