More compat stuff

diff --git a/sysdeps/unix/sysv/solaris2/kopensolaris-gnu/sun_compat.c b/sysdeps/unix/sysv/solaris2/kopensolaris-gnu/sun_compat.c
index 3e4ab6d..9bd11c6 100644 (file)
--- a/sysdeps/unix/sysv/solaris2/kopensolaris-gnu/sun_compat.c
+++ b/sysdeps/unix/sysv/solaris2/kopensolaris-gnu/sun_compat.c
@@ -18,7 +18,11 @@
    02111-1307 USA.  */
 
 #include <pwd.h>
+#include <grp.h>
 #include <unistd.h>
+#include <alloca.h>
+#include <stdlib.h>
+#include <string.h>
 
 struct passwd * __getpwnam_r_sun (const char *name, struct passwd *pwbuf,
       char *buf, size_t buflen)
@@ -27,6 +31,7 @@ struct passwd * __getpwnam_r_sun (const char *name, struct passwd *pwbuf,
   return (getpwnam_r (name, pwbuf, buf, buflen, &bufp) == 0) ? bufp : NULL;
 }
 
+
 struct passwd * __getpwuid_r_sun (uid_t uid, struct passwd *pwbuf, char *buf,
      size_t buflen)
 {
@@ -34,12 +39,14 @@ struct passwd * __getpwuid_r_sun (uid_t uid, struct passwd *pwbuf, char *buf,
   return (getpwuid_r (uid, pwbuf, buf, buflen, &bufp) == 0) ? bufp : NULL;
 }
 
+
 struct passwd * __getpwent_r_sun (struct passwd *pwbuf, char *buf, size_t buflen)
 {
   struct passwd *bufp;
   return (getpwent_r (pwbuf, buf, buflen, &bufp) == 0) ? bufp : NULL;
 }
 
+
 struct passwd * __fgetpwent_r_sun (FILE *fp, struct passwd *pwbuf, char *buf,
       size_t buflen)
 {
@@ -47,9 +54,60 @@ struct passwd * __fgetpwent_r_sun (FILE *fp, struct passwd *pwbuf, char *buf,
   return (fgetpwent_r (fp, pwbuf, buf, buflen, &bufp) == 0) ? bufp : NULL;
 }
 
-#if 0
+
+
+struct group * __getgrnam_r_sun (const char *name, struct group *gbuf,
+      char *buf, size_t buflen)
+{
+  struct group *bufp;
+  return (getgrnam_r (name, gbuf, buf, buflen, &bufp) == 0) ? bufp : NULL;
+}
+
+
+struct group * __getgrgid_r_sun (gid_t gid, struct group *gbuf, char *buf,
+      size_t buflen)
+{
+  struct group *bufp;
+  return (getgrgid_r (gid, gbuf, buf, buflen, &bufp) == 0) ? bufp : NULL;
+}
+
+
+struct group * __getgrent_r_sun (struct group *gbuf, char *buf, size_t buflen)
+{
+  struct group *bufp;
+  return (getgrent_r (gbuf, buf, buflen, &bufp) == 0) ? bufp : NULL;
+}
+
+
+struct group * __fgetgrent_r_sun (FILE *fp, struct group *gbuf, char *buf,
+      size_t buflen)
+{
+  struct group *bufp;
+  return (fgetgrent_r (fp, gbuf, buf, buflen, &bufp) == 0) ? bufp : NULL;
+}
+
+
 int __getopt_sun (int argc, char * const argv[], const char *optstring)
 {
- // TODO
+  size_t len = strlen (optstring) + 2;
+  int use_alloca = __libc_use_alloca (len);
+  char *optstr;
+  if (use_alloca)
+    optstr = alloca (len);
+  else
+    {
+      optstr = malloc (len);
+      if (!optstr)
+        return -1;
+    }
+
+  optstr[0] = '+';
+  memcpy (optstr, optstring, len - 1);
+
+  int res = getopt (argc, argv, optstr);
+
+  if (use_alloca)
+    free (optstr);
+
+  return res;
 }
-#endif