Changeset a88046d in git

Timestamp:

Feb 22, 2011, 3:59:00 PM (13 years ago)

Author:

Hans Schoenemann <hannes@…>

Branches:

(u'spielwiese', 'fe61d9c35bf7c61f2b6cbf1b56e25e2f08d536cc')

Children:

44e1b7f0f7a27c9f7b399a40751abcd38bf57a36

Parents:

f12c61125d77d6d34a5e0a4f7a5f3ab7ebbc0403

Message:

version/option for ssi link

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

Location:

Singular

Files:

• newstruct.cc (modified) (1 diff)
• ssiLink.cc (modified) (8 diffs)

Singular/newstruct.cc

@@ -194 +194 @@
             &&(al->m[nm->pos-1].data!=(void*)0L))
             {
-              Werror("different ring %lx(data) - %lx(basering)", al->m[nm->pos-1].data,currRing);
+              Werror("different ring %lx(data) - %lx(basering)",
+                (long unsigned)(al->m[nm->pos-1].data),(long unsigned)currRing);
               return TRUE;
             }

Singular/ssiLink.cc

@@ -39 +39 @@
 #include <Singular/lists.h>
 #include <Singular/ssiLink.h>
+
+
+#define SSI_VERSION 1
 
 typedef struct
@@ -638 +641 @@
       }
     }
+    // ---------------------------------------------------------------------
     else if (strcmp(mode,"tcp")==0)
     {
@@ -686 +690 @@
       close(sockfd);
     }
-    // stdin or stdout
-    else if (flag == SI_LINK_READ)
-    {
-      d->f_read = stdin;
-      mode = "r";
-    }
+    // no ssi-Link on stdin or stdout
     else
     {
-      d->f_write = stdout;
-      mode = "a";
-    }
-  }
+      Werror("invalid mode >>%s<< for ssi",mode);
+      l->data=NULL;
+      omFree(d);
+      return TRUE;
+    }
+  } 
+  // =========================================================================
   else /*l->name=NULL*/
   {
@@ -776 +778 @@
       SI_LINK_SET_RW_OPEN_P(l);
       close(sockfd);
-    }
+      fprintf(d->f_write,"98 %d %d %u %u\n",SSI_VERSION,MAX_TOK,test,verbose);
+    }
+    // ----------------------------------------------------------------------
     else if(strcmp(mode,"connect")==0)
     {
@@ -815 +819 @@
       }
     }
+    // ======================================================================
     else
     {
-      // normal ascii link to a file
+      // normal link to a file
       FILE *outfile;
       char *filename=l->name;
@@ -838 +843 @@
       {
         if (strcmp(l->mode,"r")==0) d->f_read = outfile;
-        else d->f_write = outfile;
+        else
+        {
+          d->f_write = outfile;
+          fprintf(d->f_write,"98 %d %d %u %u\n",SSI_VERSION,MAX_TOK,test,verbose);
+        }
       }
       else
@@ -975 +984 @@
              res->data=ssiReadIntvec(d);
              break;
+    // ------------
+    case 98: // version
+             {
+                int n98_v,n98_m;
+                BITSET n98_o1,n98_o2;
+                fscanf(d->f_read,"%d %d %u %u\n",&n98_v,&n98_m,&n98_o1,&n98_o2);
+                if ((n98_v!=SSI_VERSION) ||(n98_m!=MAX_TOK))
+                {
+                  Print("incompatible versions of ssi: %d/%d vs %d/%d",
+                                  SSI_VERSION,MAX_TOK,n98_v,n98_m);
+                }
+                test=n98_o1;
+                verbose=n98_o2;
+                break;
+             }
     case 99: ssiClose(l); exit(0);
     case 0: if (feof(d->f_read))
@@ -1275 +1299 @@
 // 17 intvec <len> ...
 //
+// 98: verify version: <ssi-version> <MAX_TOK> <OPT1> <OPT2>
 // 99: quit Singular