X-Git-Url: http://wien.tomnetworks.com/gitweb/?a=blobdiff_plain;f=support%2Fstdio.c;h=590ff8cf821dca7ef57b2182caadf3b6151bc52f;hb=098e88f3a87205d92516a1fe912b6f84164d0a59;hp=0ab5a11243c0ec71356f318c7e7c0964dd375ccb;hpb=1c14f1ee6d701510c15499d71fc2b324151a8629;p=mono.git

diff --git a/support/stdio.c b/support/stdio.c
index 0ab5a11243c..590ff8cf821 100644
--- a/support/stdio.c
+++ b/support/stdio.c
@@ -16,19 +16,25 @@
 
 G_BEGIN_DECLS
 
-#ifndef PLATFORM_WIN32
 gint32
 Mono_Posix_Syscall_L_ctermid (void)
 {
+#ifndef HOST_WIN32
 	return L_ctermid;
+#else
+	return -1;
+#endif
 }
 
 gint32
 Mono_Posix_Syscall_L_cuserid (void)
 {
+#if defined(__APPLE__) || defined (__OpenBSD__) || defined (HOST_WIN32)
+	return -1;
+#else
 	return L_cuserid;
+#endif
 }
-#endif /* ndef PLATFORM_WIN32 */
 
 mph_size_t
 Mono_Posix_Stdlib_fread (unsigned char *ptr, mph_size_t size, mph_size_t nmemb, void *stream)
@@ -45,7 +51,21 @@ Mono_Posix_Stdlib_fwrite (unsigned char *ptr, mph_size_t size, mph_size_t nmemb,
 	mph_return_if_size_t_overflow (size);
 	mph_return_if_size_t_overflow (nmemb);
 
-	return fwrite (ptr, (size_t) size, (size_t) nmemb, (FILE*) stream);
+	size_t ret = fwrite (ptr, (size_t) size, (size_t) nmemb, (FILE*) stream);
+#ifdef HOST_WIN32
+	// Workaround for a particular weirdness on Windows triggered by the
+	// StdioFileStreamTest.Write() test method. The test writes 15 bytes to a
+	// file, then rewinds the file pointer and reads the same bytes. It then
+	// writes 15 additional bytes to the file. This second write fails on
+	// Windows with 0 returned from fwrite(). Calling fseek() followed by a retry
+	// of fwrite() like we do here fixes the issue.
+	if (ret != nmemb)
+	{
+		fseek (stream, 0, SEEK_CUR);
+		ret = fwrite (ptr + (ret * nmemb), (size_t) size, (size_t) nmemb - ret, (FILE*) stream);
+	}
+#endif
+	return ret;
 }
 
 #ifdef HAVE_VSNPRINTF
@@ -138,6 +158,12 @@ Mono_Posix_Stdlib_TMP_MAX (void)
 	return TMP_MAX;
 }
 
+void*
+Mono_Posix_Stdlib_tmpfile (void)
+{
+	return tmpfile ();
+}
+
 gint32
 Mono_Posix_Stdlib_setvbuf (void* stream, void *buf, int mode, mph_size_t size)
 {
@@ -148,9 +174,62 @@ Mono_Posix_Stdlib_setvbuf (void* stream, void *buf, int mode, mph_size_t size)
 int 
 Mono_Posix_Stdlib_setbuf (void* stream, void* buf)
 {
-	errno = 0;
 	setbuf (stream, buf);
-	return errno == 0 ? 0 : -1;
+	return 0;
+}
+
+void*
+Mono_Posix_Stdlib_fopen (char* path, char* mode)
+{
+	return fopen (path, mode);
+}
+
+void*
+Mono_Posix_Stdlib_freopen (char* path, char* mode, void *stream)
+{
+	return freopen (path, mode, stream);
+}
+
+gint32
+Mono_Posix_Stdlib_fprintf (void* stream, char* format, char *message)
+{
+	return fprintf (stream, format, message);
+}
+
+gint32
+Mono_Posix_Stdlib_fgetc (void* stream)
+{
+	return fgetc (stream);
+}
+
+char*
+Mono_Posix_Stdlib_fgets (char* str, gint32 size, void* stream)
+{
+	return fgets (str, size, stream);
+}
+
+gint32
+Mono_Posix_Stdlib_fputc (gint32 c, void* stream)
+{
+	return fputc (c, stream);
+}
+
+gint32
+Mono_Posix_Stdlib_fputs (char* s, void* stream)
+{
+	return fputs (s, stream);
+}
+
+gint32
+Mono_Posix_Stdlib_fclose (void* stream)
+{
+	return fclose (stream);
+}
+
+gint32
+Mono_Posix_Stdlib_fflush (void* stream)
+{
+	return fflush (stream);
 }
 
 gint32
@@ -189,25 +268,45 @@ Mono_Posix_Stdlib_fsetpos (void* stream, void *pos)
 int
 Mono_Posix_Stdlib_rewind (void* stream)
 {
-	errno = 0;
-	rewind (stream);
-	return errno == 0 ? 0 : -1;
+	do {
+		rewind (stream);
+	} while (errno == EINTR);
+	mph_return_if_val_in_list5(errno, EAGAIN, EBADF, EFBIG, EINVAL, EIO);
+	mph_return_if_val_in_list5(errno, ENOSPC, ENXIO, EOVERFLOW, EPIPE, ESPIPE);
+	return 0;
 }
 
 int
 Mono_Posix_Stdlib_clearerr (void* stream)
 {
-	errno = 0;
 	clearerr (((FILE*) stream));
-	return errno == 0 ? 0 : -1;
+	return 0;
+}
+
+gint32
+Mono_Posix_Stdlib_ungetc (gint32 c, void* stream)
+{
+	return ungetc (c, stream);
+}
+
+gint32
+Mono_Posix_Stdlib_feof (void* stream)
+{
+	return feof (((FILE*) stream));
+}
+
+gint32
+Mono_Posix_Stdlib_ferror (void* stream)
+{
+	return ferror (((FILE*) stream));
 }
 
 int
-Mono_Posix_Stdlib_perror (const char* s)
+Mono_Posix_Stdlib_perror (const char* s, int err)
 {
-	errno = 0;
+	errno = err;
 	perror (s);
-	return errno == 0 ? 0 : -1;
+	return 0;
 }
 
 #define MPH_FPOS_LENGTH (sizeof(fpos_t)*2)