Changeset 6f0a55 in git for Singular

Timestamp:

Feb 14, 2024, 3:05:03 PM (3 months ago)

Author:

Hans Schoenemann <hannes@…>

Branches:

(u'spielwiese', 'b4f17ed1d25f93d46dbe29e4b499baecc2fd51bb')

Children:

956c8a3cd124c9c2699cd7c5eb20233d90e2f41a

Parents:

a95300a2a7eb5b30b4ea424081ee2110c95212de

git-author:

Hans Schoenemann <hannes@mathematik.uni-kl.de>2024-02-14 15:05:03+01:00

git-committer:

Hans Schoenemann <hannes@mathematik.uni-kl.de>2024-02-14 15:06:06+01:00

Message:

format, handling localhost for ssi:tcp

File:

• Singular/links/ssiLink.cc (modified) (5 diffs)

Singular/links/ssiLink.cc

@@ -1028 +1028 @@
         int err1=pipe(pc);
         int err2=pipe(cp);
-        if (err1 || err2)
-        {
+        if (err1 || err2)
+        {
           Werror("pipe failed with %d\n",errno);
           return TRUE;
-        }
+        }
         link_list n=(link_list)omAlloc(sizeof(link_struct));
         n->u=u;
@@ -1197 +1197 @@
     }
     // =========================================================================
-    else /*l->name=NULL*/
+    else /*now l->name!=NULL*/
     {
       // tcp mode
@@ -1253 +1253 @@
         char* ssh_command = (char*)omAlloc(256);
         char* ser_host = (char*)omAlloc(64);
-        gethostname(ser_host,64);
+        if(strcmp(cli_host,"localhost")==0)
+          strcpy(ser_host,"localhost");
+        else
+          gethostname(ser_host,64);
         if (strcmp(cli_host,"localhost")==0) /*avoid "ssh localhost" as key may change*/
           snprintf(ssh_command,256,"%s -q --batch --link=ssi --MPhost=%s --MPport=%d &",path,ser_host,portno);
@@ -1263 +1266 @@
         if (TEST_OPT_PROT) { Print("running >>%s<<\n",ssh_command); }
         int re=system(ssh_command);
-        if (re<0)
-        {
+        if (re<0)
+        {
           Werror("ERROR running `%s` (%d)",ssh_command,re);
           l->data=NULL;
@@ -1270 +1273 @@
           omFree(d);
           return TRUE;
-        }
+        }
         omFree(ssh_command);
         omFree(ser_host);