Changeset 05ed3d in git

Timestamp:

Mar 7, 2011, 3:54:52 PM (13 years ago)

Author:

Hans Schoenemann <hannes@…>

Branches:

(u'spielwiese', 'fe61d9c35bf7c61f2b6cbf1b56e25e2f08d536cc')

Children:

655e1f2210a79176f9daf87646858640c4f13b55

Parents:

a57ef555e0c154ed94fcdcf1752d2e76b1733c50

Message:

fix unexpected end in ssiLink

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

File:

• Singular/ssiLink.cc (modified) (6 diffs)

Singular/ssiLink.cc

@@ -56 +56 @@
   char level;
   char ungetc_buf; /* status sets to !=0, if ungetc was used, ssiRead* set to 0*/
+  char send_quit_at_exit;
 
 } ssiInfo;
@@ -578 +579 @@
       pipe(cp);
       pid_t pid=fork();
-      if (pid==0) /*child*/
+      if (pid==0) /*fork: child*/
       {
         link_list hh=(link_list)ssiToBeClosed->next;
@@ -627 +628 @@
         /* never reached*/
       }
-      else if (pid>0)
+      else if (pid>0) /*fork: parent*/
       {
         d->pid=pid;
@@ -636 +637 @@
         d->fd_write=pc[1];
         SI_LINK_SET_RW_OPEN_P(l);
+        d->send_quit_at_exit=1;
       }
       else
@@ -781 +783 @@
       d->f_write = fdopen(newsockfd, "w");
       SI_LINK_SET_RW_OPEN_P(l);
+      d->send_quit_at_exit=1;
       close(sockfd);
       fprintf(d->f_write,"98 %d %d %u %u\n",SSI_VERSION,MAX_TOK,test,verbose);
@@ -874 +877 @@
     || (strcmp(l->mode,"fork")==0))
     {
-      fprintf(d->f_write,"99\n");fflush(d->f_write);
+      if (d->send_quit_at_exit)
+      {
+        fprintf(d->f_write,"99\n");fflush(d->f_write);
+      }
       link_list hh=ssiToBeClosed;
       if (hh!=NULL)