[Mldonkey-commits] mldonkey config/config.h.in config/configure.in...

[mldonkey-commits]

CVSROOT:        /sources/mldonkey
Module name:    mldonkey
Branch:         
Changes by:     spiralvoice <address@hidden>    06/05/18 17:26:18

Modified files:
        config         : config.h.in configure.in 
        distrib        : ChangeLog 
        src/utils/lib  : magiclib_stub.c 

Log message:
        patch #5103

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/mldonkey/mldonkey/config/config.h.in.diff?tr1=1.24&tr2=1.25&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/mldonkey/mldonkey/config/configure.in.diff?tr1=1.264&tr2=1.265&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/mldonkey/mldonkey/distrib/ChangeLog.diff?tr1=1.831&tr2=1.832&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/mldonkey/mldonkey/src/utils/lib/magiclib_stub.c.diff?tr1=1.1&tr2=1.2&r1=text&r2=text

Patches:
Index: mldonkey/config/config.h.in
diff -u mldonkey/config/config.h.in:1.24 mldonkey/config/config.h.in:1.25
--- mldonkey/config/config.h.in:1.24    Sat Feb  4 22:26:35 2006
+++ mldonkey/config/config.h.in Thu May 18 17:26:18 2006
@@ -174,3 +174,9 @@
 
 /* Define to 1 if you have setrlimit() */
 #undef HAVE_SETRLIMIT
+
+/* Define to 1 if you have strerror() */
+#undef HAVE_STRERROR
+
+/* Define to 1 if you have strerror_r() */
+#undef HAVE_STRERROR_R
Index: mldonkey/config/configure.in
diff -u mldonkey/config/configure.in:1.264 mldonkey/config/configure.in:1.265
--- mldonkey/config/configure.in:1.264  Mon May 15 17:43:09 2006
+++ mldonkey/config/configure.in        Thu May 18 17:26:18 2006
@@ -595,7 +595,7 @@
 AC_CHECK_SIZEOF(short)
 AC_CHECK_SIZEOF(float)
 AC_CHECK_SIZEOF(double)
-AC_CHECK_FUNCS(setrlimit getrlimit)
+AC_CHECK_FUNCS(setrlimit getrlimit strerror_r strerror)
 AC_CHECK_HEADERS(byteswap.h,,)
 
 # various header files
Index: mldonkey/distrib/ChangeLog
diff -u mldonkey/distrib/ChangeLog:1.831 mldonkey/distrib/ChangeLog:1.832
--- mldonkey/distrib/ChangeLog:1.831    Wed May 17 08:52:43 2006
+++ mldonkey/distrib/ChangeLog  Thu May 18 17:26:18 2006
@@ -14,6 +14,9 @@
 ChangeLog
 =========
 
+2006/05/18
+5103: Fix compile bug in magiclib_stub.c on Solaris & NetBSD
+
 2006/05/17
 5101: G2: Gnutella2 fixes/log updates (zet)
 - Gnutella2 (G2) is working again
Index: mldonkey/src/utils/lib/magiclib_stub.c
diff -u mldonkey/src/utils/lib/magiclib_stub.c:1.1 
mldonkey/src/utils/lib/magiclib_stub.c:1.2
--- mldonkey/src/utils/lib/magiclib_stub.c:1.1  Fri May 12 21:08:31 2006
+++ mldonkey/src/utils/lib/magiclib_stub.c      Thu May 18 17:26:18 2006
@@ -16,8 +16,9 @@
    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the file
    LICENSE for more details.
 */
-/*     $Id: magiclib_stub.c,v 1.1 2006/05/12 21:08:31 spiralvoice Exp $        
 */
+/*     $Id: magiclib_stub.c,v 1.2 2006/05/18 17:26:18 spiralvoice Exp $        
 */
 
+#include "../../../config/config.h"
 #include <caml/mlvalues.h>
 #include <caml/memory.h>
 #include <caml/alloc.h>
@@ -73,11 +74,15 @@
     err = magic_errno(cookie);
     if ((errmsg = malloc(len)) == NULL) raise_out_of_memory();
     strcpy(errmsg, fname);
+#ifdef HAVE_STRERROR_R
     while (strerror_r(err, errmsg + flen, len - flen) < 0) {
       len *= 2;
       errmsg = realloc(errmsg, len);
       if (errmsg == NULL) raise_out_of_memory();
     }
+#else
+      strcat (errmsg, strerror(err));        
+#endif
     raise_sys_error(copy_string(errmsg));
   }
 }
@@ -142,10 +147,14 @@
       /* No cookie yet, so one cannot use the above generic err fun */
       if ((errmsg = malloc(len)) == NULL) raise_out_of_memory();
       strcpy(errmsg, "Magiclib.create: "); /* 14 chars */
+#ifdef HAVE_STRERROR_R
       while (strerror_r(errno, errmsg + 14, len - 14) < 0) {
         len *= 2;
         if ((errmsg = realloc(errmsg, len)) == NULL) raise_out_of_memory();
       }
+#else
+      strcat (errmsg, strerror(errno));
+#endif
       raise_sys_error(copy_string(errmsg));
     }
   }