X-Git-Url: http://wien.tomnetworks.com/gitweb/?a=blobdiff_plain;f=support%2Fpwd.c;h=6e3b68a208e9bc2340facb98262023033f9a2527;hb=1091bd94fd707a8373ff561821457a45ff9a3d9c;hp=2e0b373cf29493fddb61219ae3c02ad88227f8fb;hpb=1c14f1ee6d701510c15499d71fc2b324151a8629;p=mono.git

diff --git a/support/pwd.c b/support/pwd.c
index 2e0b373cf29..6e3b68a208e 100644
--- a/support/pwd.c
+++ b/support/pwd.c
@@ -18,22 +18,26 @@
 
 G_BEGIN_DECLS
 
-static const size_t
+static const mph_string_offset_t
 passwd_offsets[] = {
-	offsetof (struct passwd, pw_name),
-	offsetof (struct passwd, pw_passwd),
-	offsetof (struct passwd, pw_gecos),
-	offsetof (struct passwd, pw_dir),
-	offsetof (struct passwd, pw_shell)
+	MPH_STRING_OFFSET (struct passwd, pw_name,    MPH_STRING_OFFSET_PTR),
+	MPH_STRING_OFFSET (struct passwd, pw_passwd,  MPH_STRING_OFFSET_PTR),
+#if HAVE_STRUCT_PASSWD_PW_GECOS
+	MPH_STRING_OFFSET (struct passwd, pw_gecos,   MPH_STRING_OFFSET_PTR),
+#endif  /* def HAVE_STRUCT_PASSWD_PW_GECOS */
+	MPH_STRING_OFFSET (struct passwd, pw_dir,     MPH_STRING_OFFSET_PTR),
+	MPH_STRING_OFFSET (struct passwd, pw_shell,   MPH_STRING_OFFSET_PTR)
 };
 
-static const size_t
+static const mph_string_offset_t
 mph_passwd_offsets[] = {
-	offsetof (struct Mono_Posix_Syscall__Passwd, pw_name),
-	offsetof (struct Mono_Posix_Syscall__Passwd, pw_passwd),
-	offsetof (struct Mono_Posix_Syscall__Passwd, pw_gecos),
-	offsetof (struct Mono_Posix_Syscall__Passwd, pw_dir),
-	offsetof (struct Mono_Posix_Syscall__Passwd, pw_shell)
+	MPH_STRING_OFFSET (struct Mono_Posix_Syscall__Passwd, pw_name,    MPH_STRING_OFFSET_PTR),
+	MPH_STRING_OFFSET (struct Mono_Posix_Syscall__Passwd, pw_passwd,  MPH_STRING_OFFSET_PTR),
+#if HAVE_STRUCT_PASSWD_PW_GECOS
+	MPH_STRING_OFFSET (struct Mono_Posix_Syscall__Passwd, pw_gecos,   MPH_STRING_OFFSET_PTR),
+#endif  /* def HAVE_STRUCT_PASSWD_PW_GECOS */
+	MPH_STRING_OFFSET (struct Mono_Posix_Syscall__Passwd, pw_dir,     MPH_STRING_OFFSET_PTR),
+	MPH_STRING_OFFSET (struct Mono_Posix_Syscall__Passwd, pw_shell,   MPH_STRING_OFFSET_PTR)
 };
 
 /*
@@ -179,6 +183,10 @@ Mono_Posix_Syscall_getpwuid_r (mph_uid_t uid,
 	} while ((r = getpwuid_r (uid, &_pwbuf, buf, buflen, (struct passwd**) pwbufp)) && 
 			recheck_range (r));
 
+	if (r == 0 && !(*pwbufp))
+		/* On solaris, this function returns 0 even if the entry was not found */
+		r = errno = ENOENT;
+
 	if (r == 0 && copy_passwd (pwbuf, &_pwbuf) == -1)
 		r = errno = ENOMEM;
 	free (buf);
@@ -187,6 +195,7 @@ Mono_Posix_Syscall_getpwuid_r (mph_uid_t uid,
 }
 #endif /* ndef HAVE_GETPWUID_R */
 
+#if HAVE_GETPWENT
 gint32
 Mono_Posix_Syscall_getpwent (struct Mono_Posix_Syscall__Passwd *pwbuf)
 {
@@ -208,6 +217,7 @@ Mono_Posix_Syscall_getpwent (struct Mono_Posix_Syscall__Passwd *pwbuf)
 	}
 	return 0;
 }
+#endif  /* def HAVE_GETPWENT */
 
 #ifdef HAVE_FGETPWENT
 gint32
@@ -233,21 +243,30 @@ Mono_Posix_Syscall_fgetpwent (void *stream, struct Mono_Posix_Syscall__Passwd *p
 }
 #endif /* ndef HAVE_FGETPWENT */
 
+#if HAVE_SETPWENT
 int
 Mono_Posix_Syscall_setpwent (void)
 {
 	errno = 0;
-	setpwent ();
-	return errno == 0 ? 0 : -1;
+	do {
+		setpwent ();
+	} while (errno == EINTR);
+	mph_return_if_val_in_list5(errno, EIO, EMFILE, ENFILE, ENOMEM, ERANGE);
+	return 0;
 }
+#endif  /* def HAVE_SETPWENT */
 
+#if HAVE_ENDPWENT
 int
 Mono_Posix_Syscall_endpwent (void)
 {
 	errno = 0;
 	endpwent ();
-	return errno == 0 ? 0 : -1;
+	if (errno == EIO)
+		return -1;
+	return 0;
 }
+#endif  /* def HAVE_ENDPWENT */
 
 G_END_DECLS