Changeset 3706b2 in git for Singular/ssiLink.cc

Timestamp:

May 18, 2012, 1:42:21 PM (11 years ago)

Author:

Hans Schoenemann <hannes@…>

Branches:

(u'jengelh-datetime', 'ceac47cbc86fe4a15902392bdbb9bd2ae0ea02c6')(u'spielwiese', 'a800fe4b3e9d37a38c5a10cc0ae9dfa0c15a4ee6')

Children:

e5324ae0d87043f3dd2f19e754586d0028d614cc

Parents:

d0015c9c5906ccd1040927a2140a137a93d743b1

Message:

add:  add: slStatusSsiL also for ssi:connect, better handling of close

File:

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

Singular/ssiLink.cc

@@ -784 +784 @@
           //myynest=0;
           fe_fgets_stdin=fe_fgets_dummy;
-          WerrorS_callback=WerrorS_batch;
+          WerrorS_callback=WerrorS_batch;
           if ((u!=NULL)&&(u->rtyp==IDHDL))
           {
@@ -1207 +1207 @@
                 return ssiRead1(l);
              }
-    case 99: ssiClose(l); exit(0);
+    case 99: ssiClose(l); m2_end(0);
     case 0: if (feof(d->f_read))
             {
@@ -1402 +1402 @@
 {
 // input: L: a list with links of type
-//           ssi-fork, ssi-tcp, MPtcp-fork or MPtcp-launch.
+//           ssi-connect, ssi-fork, ssi-tcp, MPtcp-fork or MPtcp-launch.
 //           Note: Not every entry in L must be set.
 //        timeout: timeout for select in micro-seconds
@@ -1479 +1479 @@
       if (((strcmp(l->m->type,"ssi")!=0) && (strcmp(l->m->type,"MPtcp")!=0))
       || ((strcmp(l->mode,"fork")!=0) && (strcmp(l->mode,"tcp")!=0)
-        && (strcmp(l->mode,"launch")!=0)))
-      {
-        WerrorS("all links must be of type ssi:fork, ssi:tcp, MPtcp:fork\n");
-        WerrorS("or MPtcp:launch");
+        && (strcmp(l->mode,"launch")!=0) && (strcmp(l->mode,"connect")!=0)))
+      {
+        WerrorS("all links must be of type ssi:fork, ssi:tcp, ssi:connect,");
+        WerrorS(" MPtcp:fork or MPtcp:launch");
         return -2;
       }