Changeset 3706b2 in git

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

Location:

Singular

Files:

• misc_ip.cc (modified) (9 diffs)
• ssiLink.cc (modified) (4 diffs)

Singular/misc_ip.cc

@@ -7 +7 @@
  *
  * For more general information, see the documentation in misc_ip.h.
- *
- * @internal @version \$Id$
  *
  **/
@@ -262 +260 @@
               p_ui +=add;
               //add += 2; if (add == 6) add = 2;
-              add =2+2*(add==2);
+              add =2+2*(add==2);
             }
             mpz_set_ui(nn,nn_ui);
@@ -679 +677 @@
     v=v->next;
   } while (v!=NULL);
-   
+
 #ifdef OM_SINGULAR_CONFIG_H
    // set global variable to show memory usage
@@ -686 +684 @@
   else om_sing_opt_show_mem = 0;
 #endif
-   
+
   return FALSE;
 }
@@ -1032 +1030 @@
     }
   }
-  if (i<=0)
-  {
+  if(!singular_in_batchmode)
+  {
+    if (i<=0)
+    {
       if (TEST_V_QUIET)
       {
@@ -1041 +1041 @@
           printf("\n$Bye.\n");
       }
-    //#ifdef sun
-    //  #ifndef __svr4__
-    //    _cleanup();
-    //    _exit(0);
-    //  #endif
-    //#endif
-    exit(0);
-  }
-  else
-  {
-      if(!singular_in_batchmode)
-      {
+      //#ifdef sun
+      //  #ifndef __svr4__
+      //    _cleanup();
+      //    _exit(0);
+      //  #endif
+      //#endif
+      i=0;
+    }
+    else
+    {
         printf("\nhalt %d\n",i);
-      }
+    }
   }
   #ifdef HAVE_MPSR
@@ -1114 +1112 @@
   memset(&sLastPrinted,0,sizeof(sleftv));
   sLastPrinted.rtyp=NONE;
-  
+
   extern int iiInitArithmetic(); iiInitArithmetic(); // iparith.cc
 
@@ -1127 +1125 @@
 
   coeffs_BIGINT = nInitChar(n_Q,NULL);
-  
-#if 1 
+
+#if 1
    // def HAVE_POLYEXTENSIONS
   if(TRUE)
@@ -1134 +1132 @@
     n_coeffType type = nRegister(n_algExt, naInitChar);
     assume(type == n_algExt);
-     
+
     type = nRegister(n_transExt, ntInitChar);
     assume(type == n_transExt);

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;
       }