Changeset d905bf in git

Timestamp:

Jul 27, 2011, 1:27:40 PM (13 years ago)

Author:

Hans Schoenemann <hannes@…>

Branches:

(u'fieker-DuVal', '117eb8c30fc9e991c4decca4832b1d19036c4c65')(u'spielwiese', '38077648e7239f98078663eb941c3c979511150a')

Children:

47a616dc41a262aba8e9cab6aacb0bae06174469

Parents:

cca6025b5e2b8a20c6d6df8a3b127131e492594e

Message:

better error check with ssiClose

git-svn-id: file:///usr/local/Singular/svn/trunk@14351 2c84dea3-7e68-4137-9b89-c4e89433aadc

File:

• Singular/ssiLink.cc (modified) (1 diff)

Singular/ssiLink.cc

@@ -981 +981 @@
 BOOLEAN ssiClose(si_link l)
 {
-  ssiInfo *d = (ssiInfo *)l->data;
-  if (d!=NULL)
-  {
-    if (d->r!=NULL) rKill(d->r);
-    if (d->f_read!=NULL) fclose(d->f_read);
-    if ((strcmp(l->mode,"tcp")==0)
-    || (strcmp(l->mode,"fork")==0))
-    {
-      link_list hh=ssiToBeClosed;
-      if (hh!=NULL)
-      {
-        if (hh->l==l)
+  if (l!=NULL)
+  {
+    ssiInfo *d = (ssiInfo *)l->data;
+    if (d!=NULL)
+    {
+      if (d->r!=NULL) rKill(d->r);
+      if (d->f_read!=NULL) fclose(d->f_read);
+      if ((strcmp(l->mode,"tcp")==0)
+      || (strcmp(l->mode,"fork")==0))
+      {
+        link_list hh=ssiToBeClosed;
+        if (hh!=NULL)
         {
-           ssiToBeClosed=(link_list)hh->next;
-           omFreeSize(hh,sizeof(link_struct));
+          if (hh->l==l)
+          {
+             ssiToBeClosed=(link_list)hh->next;
+             omFreeSize(hh,sizeof(link_struct));
+          }
+          else while(hh!=NULL)
+          {
+            link_list hhh=(link_list)hh->next;
+            if (hhh->l==l)
+            {
+              hh->next=hhh->next;
+              omFreeSize(hhh,sizeof(link_struct));
+              break;
+            }
+            hh=(link_list)hh->next;
+          }
         }
-        else while(hh!=NULL)
-        {
-          link_list hhh=(link_list)hh->next;
-          if (hhh->l==l)
-          {
-            hh->next=hhh->next;
-            omFreeSize(hhh,sizeof(link_struct));
-            break;
-          }
-          hh=(link_list)hh->next;
+        if (d->send_quit_at_exit)
+        {  
+          fputs("99\n",d->f_write);fflush(d->f_write);
         }
       }
-      if (d->send_quit_at_exit)
-      {
-        fputs("99\n",d->f_write);fflush(d->f_write);
-      }
-    }
-    if (d->f_write!=NULL) fclose(d->f_write);
-    if (d->pid!=0)
-    {
-      kill(d->pid,15);
-      waitpid(d->pid,NULL,WNOHANG);
-      kill(d->pid,9); // just to be sure
-      waitpid(d->pid,NULL,0);
-    }
-    omFreeSize((ADDRESS)d,(sizeof *d));
-  }
-  l->data=NULL;
-  SI_LINK_SET_CLOSE_P(l);
+      if (d->f_write!=NULL) fclose(d->f_write);
+      if (d->pid!=0)
+      {
+        kill(d->pid,15);
+        waitpid(d->pid,NULL,WNOHANG);
+        kill(d->pid,9); // just to be sure
+        waitpid(d->pid,NULL,0);
+      }
+      omFreeSize((ADDRESS)d,(sizeof *d));
+    }
+    l->data=NULL;
+    SI_LINK_SET_CLOSE_P(l);
+  }
   return FALSE;
 }