--- deliantra/server/common/utils.C	2008/05/16 17:09:38	1.78
+++ deliantra/server/common/utils.C	2008/12/28 06:59:26	1.83
@@ -35,6 +35,9 @@
 #include <global.h>
 #include <material.h>
 
+#include <sys/time.h>
+#include <sys/resource.h>
+
 #include <glib.h>
 
 refcnt_base::refcnt_t refcnt_dummy;
@@ -199,9 +202,9 @@
 /* convert materialname to materialtype_t */
 
 materialtype_t *
-name_to_material (const shstr &name)
+name_to_material (const shstr_cmp name)
 {
-  for (materialtype_t *mt = materialt; mt && mt->next; mt = mt->next)
+  for (materialtype_t *mt = materialt; mt; mt = mt->next)
     if (name == mt->name)
       return mt;
 
@@ -217,10 +220,10 @@
   materialtype_t *mt;
   int j;
 
-  if (op->materialname == NULL)
+  if (!op->materialname)
     return;
 
-  if (change->materialname != NULL && strcmp (op->materialname, change->materialname))
+  if (change->materialname && strcmp (op->materialname, change->materialname))
     return;
 
   if (!op->is_armor ())
@@ -250,14 +253,16 @@
 {
   materialtype_t *mt, *lmt;
 
-  if (op->materialname != NULL)
+  if (!op->materialname)
     return;
 
-  if (nmt == NULL)
+  if (nmt)
+    lmt = nmt;
+  else
     {
-      lmt = NULL;
+      lmt = 0;
 
-      for (mt = materialt; mt && mt->next; mt = mt->next)
+      for (mt = materialt; mt; mt = mt->next)
         if (op->materials & mt->material && rndm (1, 100) <= mt->chance &&
             difficulty >= mt->difficulty && (op->magic >= mt->magic || mt->magic == 0))
           {
@@ -266,10 +271,8 @@
               break;
           }
     }
-  else
-    lmt = nmt;
 
-  if (lmt != NULL)
+  if (lmt)
     {
       if (op->stats.dam && op->is_weapon ())
         {
@@ -448,10 +451,39 @@
 {
   if (!fork ())
     {
-      signal (SIGABRT, SIG_DFL);
+      signal (SIGINT , SIG_IGN);
+      signal (SIGTERM, SIG_IGN);
+      signal (SIGABRT, SIG_IGN);
+
+      signal (SIGSEGV, SIG_DFL);
+      signal (SIGBUS , SIG_DFL);
+      signal (SIGILL , SIG_DFL);
+      signal (SIGTRAP, SIG_DFL);
+
       // try to put corefiles into a subdirectory, if existing, to allow
       // an administrator to reduce the I/O load.
       chdir ("cores");
+
+      // try to detach us from as many external dependencies as possible
+      // as coredumping can take time by closing all fd's.
+      {
+        struct rlimit lim;
+
+        if (getrlimit (RLIMIT_NOFILE, &lim))
+          lim.rlim_cur = 1024;
+
+        for (int i = 0; i < lim.rlim_cur; ++i)
+          close (i);
+      }
+
+      {
+        sigset_t empty;
+        sigemptyset (&empty);
+        sigprocmask (SIG_SETMASK, &empty, 0);
+      }
+
+      // try to coredump with SIGTRAP
+      kill (getpid (), SIGTRAP);
       abort ();
     }