X-Git-Url: http://wien.tomnetworks.com/gitweb/?a=blobdiff_plain;f=support%2Fstdio.c;h=e5b54da47b909f222d3664480c522d34d40ca1f8;hb=2d86893ee60b50f40c5566841dba38ccaef3583c;hp=bd760c8ec59f80914e76bf0926c7b9cc93e8a03a;hpb=9975a45f43793e34318e593ddacd3f332f8d91c0;p=mono.git

diff --git a/support/stdio.c b/support/stdio.c
index bd760c8ec59..e5b54da47b9 100644
--- a/support/stdio.c
+++ b/support/stdio.c
@@ -16,7 +16,7 @@
 
 G_BEGIN_DECLS
 
-#ifndef PLATFORM_WIN32
+#ifndef HOST_WIN32
 gint32
 Mono_Posix_Syscall_L_ctermid (void)
 {
@@ -26,9 +26,13 @@ Mono_Posix_Syscall_L_ctermid (void)
 gint32
 Mono_Posix_Syscall_L_cuserid (void)
 {
+#if defined(__APPLE__) || defined (__OpenBSD__)
+	return -1;
+#else
 	return L_cuserid;
+#endif
 }
-#endif /* ndef PLATFORM_WIN32 */
+#endif /* ndef HOST_WIN32 */
 
 mph_size_t
 Mono_Posix_Stdlib_fread (unsigned char *ptr, mph_size_t size, mph_size_t nmemb, void *stream)
@@ -148,9 +152,8 @@ 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;
 }
 
 gint32
@@ -189,25 +192,27 @@ 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 (stream);
-	return errno == 0 ? 0 : -1;
+	clearerr (((FILE*) stream));
+	return 0;
 }
 
 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)