2005-09-14 Geoff Norton <gnorton@customerdna.com>

[mono.git] / support / grp.c

diff --git a/support/grp.c b/support/grp.c
index b2051c9019f9707621b670fa6cb24de52484e361..9fa70b93c927e8c947732e883db8944bf1c1e17f 100644 (file)
--- a/support/grp.c
+++ b/support/grp.c
@@ -114,6 +114,7 @@ Mono_Posix_Syscall_getgrnam (const char *name, struct Mono_Posix_Syscall__Group
                return -1;
        }
 
+       errno = 0;
        _gbuf = getgrnam (name);
        if (_gbuf == NULL)
                return -1;
@@ -135,6 +136,7 @@ Mono_Posix_Syscall_getgrgid (mph_gid_t gid, struct Mono_Posix_Syscall__Group *gb
                return -1;
        }
 
+       errno = 0;
        _gbuf = getgrgid (gid);
        if (_gbuf == NULL)
                return -1;
@@ -146,10 +148,11 @@ Mono_Posix_Syscall_getgrgid (mph_gid_t gid, struct Mono_Posix_Syscall__Group *gb
        return 0;
 }
 
+#ifdef HAVE_GETGRNAM_R
 gint32
 Mono_Posix_Syscall_getgrnam_r (const char *name, 
        struct Mono_Posix_Syscall__Group *gbuf,
-       struct group **gbufp)
+       void **gbufp)
 {
        char *buf, *buf2;
        size_t buflen;
@@ -172,7 +175,13 @@ Mono_Posix_Syscall_getgrnam_r (const char *name,
                        return -1;
                }
                buf = buf2;
-       } while ((r = getgrnam_r (name, &_grbuf, buf, buflen, gbufp)) && r == ERANGE);
+               errno = 0;
+       } while ((r = getgrnam_r (name, &_grbuf, buf, buflen, (struct group**) gbufp)) && 
+                       recheck_range (r));
+
+       /* On Solaris, this function returns 0 even if the entry was not found */
+       if (r == 0 && !(*gbufp))
+               r = errno = ENOENT;
 
        if (r == 0 && copy_group (gbuf, &_grbuf) == -1)
                r = errno = ENOMEM;
@@ -180,11 +189,13 @@ Mono_Posix_Syscall_getgrnam_r (const char *name,
 
        return r;
 }
+#endif /* ndef HAVE_GETGRNAM_R */
 
+#ifdef HAVE_GETGRGID_R
 gint32
 Mono_Posix_Syscall_getgrgid_r (mph_gid_t gid,
        struct Mono_Posix_Syscall__Group *gbuf,
-       struct group **gbufp)
+       void **gbufp)
 {
        char *buf, *buf2;
        size_t buflen;
@@ -207,7 +218,13 @@ Mono_Posix_Syscall_getgrgid_r (mph_gid_t gid,
                        return -1;
                }
                buf = buf2;
-       } while ((r = getgrgid_r (gid, &_grbuf, buf, buflen, gbufp)) && r == ERANGE);
+               errno = 0;
+       } while ((r = getgrgid_r (gid, &_grbuf, buf, buflen, (struct group**) gbufp)) && 
+                       recheck_range (r));
+
+       /* On Solaris, this function returns 0 even if the entry was not found */
+       if (r == 0 && !(*gbufp))
+               r = errno = ENOENT;
 
        if (r == 0 && copy_group (gbuf, &_grbuf) == -1)
                r = errno = ENOMEM;
@@ -215,6 +232,7 @@ Mono_Posix_Syscall_getgrgid_r (mph_gid_t gid,
 
        return r;
 }
+#endif /* ndef HAVE_GETGRGID_R */
 
 gint32
 Mono_Posix_Syscall_getgrent (struct Mono_Posix_Syscall__Group *grbuf)
@@ -226,6 +244,7 @@ Mono_Posix_Syscall_getgrent (struct Mono_Posix_Syscall__Group *grbuf)
                return -1;
        }
 
+       errno = 0;
        gr = getgrent ();
        if (gr == NULL)
                return -1;
@@ -239,7 +258,7 @@ Mono_Posix_Syscall_getgrent (struct Mono_Posix_Syscall__Group *grbuf)
 
 #ifdef HAVE_FGETGRENT
 gint32
-Mono_Posix_Syscall_fgetgrent (FILE *stream, struct Mono_Posix_Syscall__Group *grbuf)
+Mono_Posix_Syscall_fgetgrent (void *stream, struct Mono_Posix_Syscall__Group *grbuf)
 {
        struct group *gr;
 
@@ -248,7 +267,8 @@ Mono_Posix_Syscall_fgetgrent (FILE *stream, struct Mono_Posix_Syscall__Group *gr
                return -1;
        }
 
-       gr = fgetgrent (stream);
+       errno = 0;
+       gr = fgetgrent ((FILE*) stream);
        if (gr == NULL)
                return -1;