Changeset 97454d in git

Timestamp:

Apr 7, 1998, 8:35:28 PM (25 years ago)

Author:

Olaf Bachmann <obachman@…>

Branches:

(u'jengelh-datetime', 'ceac47cbc86fe4a15902392bdbb9bd2ae0ea02c6')(u'spielwiese', '00e2e9c41af3fde1273eb3633f4c0c7c3db2579d')

Children:

37e22dccbc1d4231d5dd6c765a95b61021b1266c

Parents:

80ad5e767969bf7b39d2bf33f65964782429ecb1

Message:

1998-04-07  Olaf Bachmann  <obachman@mathematik.uni-kl.de>

	* mpsr_Put.cc (mpsr_PutDump): dump does not dump LIB string
any more

	* extra.cc (jjSYSTEM): added System("whoami") to return full
	executable pathname of running Singular


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

Location:

Singular

Files:

• ChangeLog (modified) (1 diff)
• extra.cc (modified) (2 diffs)
• febase.cc (modified) (3 diffs)
• febase.h (modified) (2 diffs)
• find_exec.c (modified) (2 diffs)
• misc.cc (modified) (1 diff)
• mpsr_Get.cc (modified) (3 diffs)
• mpsr_GetPoly.cc (modified) (4 diffs)
• mpsr_Put.cc (modified) (2 diffs)
• silink.cc (modified) (5 diffs)
• spSpolyLoop.inc (modified) (1 diff)

Singular/ChangeLog

@@ +1 @@
+1998-04-07  Olaf Bachmann  <obachman@mathematik.uni-kl.de>
+
+        * mpsr_Put.cc (mpsr_PutDump): dump does not dump LIB string any more
+
+        * extra.cc (jjSYSTEM): added System("whoami") to return full
+        executable pathname of running Singular
+
 Tue Apr  7 10:27:50 MET DST 1998 hannes
         * fixed scanner bug: ignoring { and } in <block> (scanner.l)

Singular/extra.cc

@@ -2 +2 @@
 *  Computer Algebra System SINGULAR      *
 *****************************************/
-/* $Id: extra.cc,v 1.33 1998-04-06 17:59:27 obachman Exp $ */
+/* $Id: extra.cc,v 1.34 1998-04-07 18:35:21 obachman Exp $ */
 /*
 * ABSTRACT: general interface to internals of Singular ("system" command)
@@ -245 +245 @@
     #endif
     #endif
-#if 0
 /*==================== whoami ==================================*/
     if (strcmp((char*)(h->data), "whoami") == 0)
     {
-      res->rtype=STRING_CMD;
-    }
-#endif
+      res->rtyp=STRING_CMD;
+      res->data=(void*)feGetExpandedExecutable();
+      if (res->data != NULL)
+        res->data = mstrdup((char*) res->data);
+      else
+        res->data = mstrdup("");
+      return FALSE;
+    }
 /*==================== HC ==================================*/
     if (strcmp((char*)(h->data),"HC")==0)

Singular/febase.cc

@@ -2 +2 @@
 *  Computer Algebra System SINGULAR     *
 ****************************************/
-/* $Id: febase.cc,v 1.27 1998-04-06 17:59:27 obachman Exp $ */
+/* $Id: febase.cc,v 1.28 1998-04-07 18:35:22 obachman Exp $ */
 /*
 * ABSTRACT: i/o system
@@ -103 +103 @@
 #endif  /* macintosh */
 
-extern "C" char* find_executable_path(const char* argv0);
+extern "C" char* find_executable(const char* argv0);
 
 #define SINGULAR_RELATIVE_DATA_DIR "LIB"
 
 static char* SearchPath = NULL;
+static char* ExpandedExecutable = NULL;
+
+char* feGetExpandedExecutable(const char* argv0)
+{
+  if (ExpandedExecutable == NULL)
+  {
+    if (argv0 != NULL)
+      ExpandedExecutable = find_executable(argv0);
+  }
+  return ExpandedExecutable;
+}
+
+static char* feRemovePathnameHead(const char* ef)
+{
+  if (ef != NULL)
+  {
+    char *temp, *temp2, *temp3;
+
+    temp2 = mstrdup(ef);
+    temp3 = temp2;
+    temp = NULL;
+    while (*temp3 != '\0')
+    {
+      if (*temp3 == DIR_SEP) temp = temp3;
+      temp3++;
+    }
+    if (temp != NULL)
+    {
+      *temp = '\0';
+    }
+    return temp2;
+  }
+  else 
+    return NULL;
+}
+
 
 // Return the file search path for singular w.r.t. the following priorities:
@@ -125 +161 @@
   
     if (argv0 != NULL)
-      sibbling = find_executable_path(argv0);
+      sibbling = feRemovePathnameHead(feGetExpandedExecutable(argv0));
   
     if (env != NULL)

Singular/febase.h

@@ -4 +4 @@
 *  Computer Algebra System SINGULAR     *
 ****************************************/
-/* $Id: febase.h,v 1.10 1998-04-06 17:59:28 obachman Exp $ */
+/* $Id: febase.h,v 1.11 1998-04-07 18:35:23 obachman Exp $ */
 /*
 * ABSTRACT
@@ -66 +66 @@
 
 char*   feGetSearchPath(const char* argv0 = NULL);
+char*   feGetExpandedExecutable(const char* argv0 = NULL);
 FILE *  feFopen(char *path, char *mode, char *where=NULL, int useWerror=FALSE);
 void    fePause(void);

Singular/find_exec.c

@@ -171 +171 @@
 }
 
-char* find_executable_path(const char *name)
-{
-  char *ef = find_executable(name);
-  char *temp, *temp2;
-  
-  temp2 = ef;
-  if (ef != NULL)
-  {
-    temp = NULL;
-    while (*ef != '\0')
-    {
-      if (*ef == '/') temp = ef;
-      ef++;
-    }
-    if (temp != NULL)
-    {
-      *temp = '\0';
-    }
-  }
-  return temp2;
-}
-
-  
 #else
 
@@ -201 +178 @@
 }
 
-char* find_executable_path(const char *name)
-{
-  return NULL;
-}
-
 #endif /* #if ! defined(MSDOS) && ! defined(macintosh) && defined(HAVE_SYS_TYPES_H) && defined(HAVE_PWD_H)&&defined(HAVE_SYS_PARAM_H) */
 

Singular/misc.cc

@@ -675 +675 @@
   StringSet("\t");
 #ifdef HAVE_FACTORY
-              StringAppend("factory (%s),", factoryVersion);
+              StringAppend("factory(%s),", factoryVersion);
 #endif
 #ifdef HAVE_LIBFAC_P

Singular/mpsr_Get.cc

@@ -3 +3 @@
 ****************************************/
 
-/* $Id: mpsr_Get.cc,v 1.14 1997-12-03 16:58:54 obachman Exp $ */
+/* $Id: mpsr_Get.cc,v 1.15 1998-04-07 18:35:25 obachman Exp $ */
 /***************************************************************
  *
@@ -171 +171 @@
 {
   number n = (number) Alloc(sizeof(rnumber));
-
+#ifdef LDEBUG
+    n->debug=123456;
+#endif
   mlv->r = mpsr_rDefault(0);
   n->s = 3;
@@ -846 +848 @@
   mpsr_Status_t status = mpsr_Success;
 
-  MP_SkipMsg(link);
-  while ((! MP_TestEofMsg(link)) && (status == mpsr_Success))
+  status = (MP_InitMsg(link) == MP_Success ? mpsr_Success : mpsr_MP_Failure);
+  while ((status == mpsr_Success) && (! MP_TestEofMsg(link)))
   {
     status=mpsr_GetLeftv(link, &mlv, 0);

Singular/mpsr_GetPoly.cc

@@ -3 +3 @@
 ****************************************/
 
-/* $Id: mpsr_GetPoly.cc,v 1.14 1998-03-27 14:44:25 obachman Exp $ */
+/* $Id: mpsr_GetPoly.cc,v 1.15 1998-04-07 18:35:26 obachman Exp $ */
 
 /***************************************************************
@@ -242 +242 @@
     mpz_ptr gnum;
     y =  (number) Alloc0(sizeof(rnumber));
+#ifdef LDEBUG
+    y->debug = 123456;
+#endif
     y->s = 3;
     gnum = &(y->z);
@@ -260 +263 @@
     *x =  (number) Alloc0(sizeof(rnumber));
     y = (number) *x;
+#ifdef LDEBUG
+    y->debug = 123456;
+#endif
     y->s = 1;
     failr(GetApInt(link, &(y->z)));
@@ -282 +288 @@
       *x =  (number) Alloc0(sizeof(rnumber));
       y = (number) *x;
+#ifdef LDEBUG
+      y->debug = 123456;
+#endif
       mpz_init_set_ui(&(y->z), ui);
       y->s = 3;

Singular/mpsr_Put.cc

@@ -2 +2 @@
 *  Computer Algebra System SINGULAR     *
 ****************************************/
-/* $Id: mpsr_Put.cc,v 1.7 1998-01-16 14:29:55 krueger Exp $ */
+/* $Id: mpsr_Put.cc,v 1.8 1998-04-07 18:35:27 obachman Exp $ */
 
 
@@ -534 +534 @@
 #endif
     }
-    else if (IDTYP(h) != LINK_CMD)
+    // do not dump LIB string and Links
+    else if (!(IDTYP(h) == STRING_CMD && strcmp("LIB", IDID(h)) == 0) &&
+             IDTYP(h) != LINK_CMD)
     {
       cmd.arg1.name = IDID(h);

Singular/silink.cc

@@ -2 +2 @@
 *  Computer Algebra System SINGULAR     *
 ****************************************/
-/* $Id: silink.cc,v 1.15 1998-02-27 16:28:01 Singular Exp $ */
+/* $Id: silink.cc,v 1.16 1998-04-07 18:35:27 obachman Exp $ */
 
 /*
@@ -459 +459 @@
 
   if (currRingHdl != rh) rSetHdl(rh, TRUE);
-  fwrite("RETURN();\n",1,10,fd);
+  fprintf(fd, "RETURN();\n");
   fflush(fd);
   
@@ -526 +526 @@
   if (type_id == QRING_CMD) return DumpQring(fd, h, type_str);
   
+  // do not dump LIB string
   if (type_id == STRING_CMD && strcmp("LIB", IDID(h)) == 0)
   {
-    if (fprintf(fd, "LIB \"%s\";\n", IDSTRING(h)) == EOF) return TRUE;
-    else return FALSE;
+    return FALSE;
   }
                                       
@@ -646 +646 @@
     while (*pstr != '\0')
     {
-      if (*pstr == '"') fputc('\\', fd);
+      if (*pstr == '"' || *pstr == '\\')  fputc('\\', fd);
       fputc(*pstr, fd);
       pstr++;
@@ -660 +660 @@
       fputc('"', fd);
       while (*pstr != '\0') {
-        if (*pstr == '"') fputc('\\', fd);
-        fputc(*pstr, fd);
-        pstr++;
+        if (*pstr == '"' || *pstr == '\\') fputc('\\', fd);
+        fputc(*pstr, fd);
+        pstr++;
       }
       fputc('"', fd);

Singular/spSpolyLoop.inc

@@ -1525 +1525 @@
     {
       assume(pComp0(b, a2) == 1);
-      assume(pComp0(b,a2) == 1);
       pSetCoeff0(b,npMultM(pGetCoeff(a1), tneg));
       a = pNext(a) = b;       // append b to result and advance a1