X-Git-Url: http://wien.tomnetworks.com/gitweb/?a=blobdiff_plain;f=support%2Fpwd.c;h=38859e0d7c61bb3522adf62da87ec0bba2fe3b0c;hb=bfb32c4d6fffc175d9378a71f2b501b8188abe90;hp=32d8f94fdd1c8abf39743af0c54547e0ac5be160;hpb=fe1aa3d23dbe023522a53ab77c69fdf433a87c31;p=mono.git

diff --git a/support/pwd.c b/support/pwd.c
index 32d8f94fdd1..38859e0d7c6 100644
--- a/support/pwd.c
+++ b/support/pwd.c
@@ -4,7 +4,7 @@
  * Authors:
  *   Jonathan Pryor (jonpryor@vt.edu)
  *
- * Copyright (C) 2004 Jonathan Pryor
+ * Copyright (C) 2004-2005 Jonathan Pryor
  */
 
 #include <pwd.h>
@@ -119,7 +119,7 @@ Mono_Posix_Syscall_getpwuid (mph_uid_t uid, struct Mono_Posix_Syscall__Passwd *p
 gint32
 Mono_Posix_Syscall_getpwnam_r (const char *name, 
 	struct Mono_Posix_Syscall__Passwd *pwbuf,
-	struct passwd **pwbufp)
+	void **pwbufp)
 {
 	char *buf, *buf2;
 	size_t buflen;
@@ -143,7 +143,7 @@ Mono_Posix_Syscall_getpwnam_r (const char *name,
 		}
 		buf = buf2;
 		errno = 0;
-	} while ((r = getpwnam_r (name, &_pwbuf, buf, buflen, pwbufp)) && 
+	} while ((r = getpwnam_r (name, &_pwbuf, buf, buflen, (struct passwd**) pwbufp)) && 
 			recheck_range (r));
 
 	if (r == 0 && !(*pwbufp))
@@ -162,7 +162,7 @@ Mono_Posix_Syscall_getpwnam_r (const char *name,
 gint32
 Mono_Posix_Syscall_getpwuid_r (mph_uid_t uid,
 	struct Mono_Posix_Syscall__Passwd *pwbuf,
-	struct passwd **pwbufp)
+	void **pwbufp)
 {
 	char *buf, *buf2;
 	size_t buflen;
@@ -186,7 +186,7 @@ Mono_Posix_Syscall_getpwuid_r (mph_uid_t uid,
 		}
 		buf = buf2;
 		errno = 0;
-	} while ((r = getpwuid_r (uid, &_pwbuf, buf, buflen, pwbufp)) && 
+	} while ((r = getpwuid_r (uid, &_pwbuf, buf, buflen, (struct passwd**) pwbufp)) && 
 			recheck_range (r));
 
 	if (r == 0 && copy_passwd (pwbuf, &_pwbuf) == -1)
@@ -221,7 +221,7 @@ Mono_Posix_Syscall_getpwent (struct Mono_Posix_Syscall__Passwd *pwbuf)
 
 #ifdef HAVE_FGETPWENT
 gint32
-Mono_Posix_Syscall_fgetpwent (FILE *stream, struct Mono_Posix_Syscall__Passwd *pwbuf)
+Mono_Posix_Syscall_fgetpwent (void *stream, struct Mono_Posix_Syscall__Passwd *pwbuf)
 {
 	struct passwd *pw;
 
@@ -231,7 +231,7 @@ Mono_Posix_Syscall_fgetpwent (FILE *stream, struct Mono_Posix_Syscall__Passwd *p
 	}
 
 	errno = 0;
-	pw = fgetpwent (stream);
+	pw = fgetpwent ((FILE*) stream);
 	if (pw == NULL)
 		return -1;
 
@@ -243,6 +243,22 @@ Mono_Posix_Syscall_fgetpwent (FILE *stream, struct Mono_Posix_Syscall__Passwd *p
 }
 #endif /* ndef HAVE_FGETPWENT */
 
+int
+Mono_Posix_Syscall_setpwent (void)
+{
+	errno = 0;
+	setpwent ();
+	return errno == 0 ? 0 : -1;
+}
+
+int
+Mono_Posix_Syscall_endpwent (void)
+{
+	errno = 0;
+	endpwent ();
+	return errno == 0 ? 0 : -1;
+}
+
 G_END_DECLS
 
 /*