Author: spouliot
Date: 2005-04-25 08:48:48 -0400 (Mon, 25 Apr 2005)
New Revision: 43542

Modified:
   trunk/mono/mono/metadata/ChangeLog
   trunk/mono/mono/metadata/security.c
Log:
security.c: Fixed #74698 where sysconf returned -1 on FreeBSD.

Modified: trunk/mono/mono/metadata/ChangeLog
===================================================================
--- trunk/mono/mono/metadata/ChangeLog  2005-04-25 12:43:56 UTC (rev 43541)
+++ trunk/mono/mono/metadata/ChangeLog  2005-04-25 12:48:48 UTC (rev 43542)
@@ -1,3 +1,7 @@
+2005-04-25  Sebastien Pouliot  <[EMAIL PROTECTED]>
+
+       * security.c: Fixed #74698 where sysconf returned -1 on FreeBSD.
+
 2005-04-25  Martin Baulig  <[EMAIL PROTECTED]>
 
        Upgrade to the latest .NET 2.x beta (Visual Studio 2005 Beta 2).

Modified: trunk/mono/mono/metadata/security.c
===================================================================
--- trunk/mono/mono/metadata/security.c 2005-04-25 12:43:56 UTC (rev 43541)
+++ trunk/mono/mono/metadata/security.c 2005-04-25 12:48:48 UTC (rev 43542)
@@ -114,7 +114,20 @@
 
 #else /* not PLATFORM_WIN32 */
 
+#define MONO_SYSCONF_DEFAULT_SIZE      ((size_t) 1024)
 
+/*
+ * Ensure we always get a valid (usable) value from sysconf.
+ * In case of error, we return the default value.
+ */
+static size_t mono_sysconf (int name)
+{
+       size_t size = (size_t) sysconf (name);
+       /* default value */
+       return (size == -1) ? MONO_SYSCONF_DEFAULT_SIZE : size;
+}
+
+
 static gchar*
 GetTokenName (uid_t uid)
 {
@@ -131,9 +144,9 @@
 
 #ifdef HAVE_GETPWUID_R
 #ifdef _SC_GETPW_R_SIZE_MAX
-       fbufsize = (size_t) sysconf (_SC_GETPW_R_SIZE_MAX);
+       fbufsize = mono_sysconf (_SC_GETPW_R_SIZE_MAX);
 #else
-       fbufsize = (size_t) 1024;
+       fbufsize = MONO_SYSCONF_DEFAULT_SIZE;
 #endif
        fbuf = g_malloc0 (fbufsize);
        retval = getpwuid_r (uid, &pwd, fbuf, fbufsize, &p);
@@ -197,9 +210,9 @@
 
 #ifdef HAVE_GETPWUID_R
 #ifdef _SC_GETPW_R_SIZE_MAX
-       fbufsize = (size_t) sysconf (_SC_GETPW_R_SIZE_MAX);
+       fbufsize = mono_sysconf (_SC_GETPW_R_SIZE_MAX);
 #else
-       fbufsize = (size_t) 1024;
+       fbufsize = MONO_SYSCONF_DEFAULT_SIZE;
 #endif
 
        fbuf = g_malloc0 (fbufsize);
@@ -359,9 +372,9 @@
 
 #ifdef HAVE_GETPWNAM_R
 #ifdef _SC_GETPW_R_SIZE_MAX
-       fbufsize = (size_t) sysconf (_SC_GETPW_R_SIZE_MAX);
+       fbufsize = mono_sysconf (_SC_GETPW_R_SIZE_MAX);
 #else
-       fbufsize = (size_t) 1024;
+       fbufsize = MONO_SYSCONF_DEFAULT_SIZE;
 #endif
 
        fbuf = g_malloc0 (fbufsize);
@@ -515,9 +528,9 @@
 
 #ifdef HAVE_GETGRGID_R
 #ifdef _SC_GETGR_R_SIZE_MAX
-       fbufsize = (size_t) sysconf (_SC_GETGR_R_SIZE_MAX);
+       fbufsize = mono_sysconf (_SC_GETGR_R_SIZE_MAX);
 #else
-       fbufsize = (size_t) 1024;
+       fbufsize = MONO_SYSCONF_DEFAULT_SIZE;
 #endif
        fbuf = g_malloc0 (fbufsize);
        retval = getgrgid_r ((gid_t) GPOINTER_TO_INT (group), &grp, fbuf, 
fbufsize, &g);
@@ -567,9 +580,9 @@
                gchar *fbuf;
                gint32 retval;
 #ifdef _SC_GETGR_R_SIZE_MAX
-               size_t fbufsize = (size_t) sysconf (_SC_GETGR_R_SIZE_MAX);
+               size_t fbufsize = mono_sysconf (_SC_GETGR_R_SIZE_MAX);
 #else
-               size_t fbufsize = (size_t) 1024;
+               size_t fbufsize = MONO_SYSCONF_DEFAULT_SIZE;
 #endif
                fbuf = g_malloc0 (fbufsize);
                retval = getgrnam_r (utf8_groupname, &grp, fbuf, fbufsize, &g);

_______________________________________________
Mono-patches maillist  -  [email protected]
http://lists.ximian.com/mailman/listinfo/mono-patches

Reply via email to