Changeset 1eed4e in git

Timestamp:

May 3, 1997, 7:23:33 PM (27 years ago)

Author:

Olaf Bachmann <obachman@…>

Branches:

(u'spielwiese', 'fe61d9c35bf7c61f2b6cbf1b56e25e2f08d536cc')

Children:

126cfafa551d9e07946af2c86b0a4724c46e6887

Parents:

a492d244011973fae73429206423e59369d4e872

Message:

Sat May  3 00:07:55 1997  Olaf Bachmann
<obachman@ratchwum.mathematik.uni-kl.de (Olaf Bachmann)>

	* febase.cc (feFopen): fixed bug in opening library from
	  SINGULAR_DATADIR: SINGULAR_DATADIR is appended to
	  getenv("SINGULARPATH")


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

Location:

Singular

Files:

• ChangeLog (modified) (1 diff)
• febase.cc (modified) (3 diffs)

Singular/ChangeLog

@@ -1 +1 @@
 Sat May  3 00:07:55 1997  Olaf Bachmann  <obachman@ratchwum.mathematik.uni-kl.de (Olaf Bachmann)>
+
+        * febase.cc (feFopen): fixed bug in opening library from
+          SINGULAR_DATADIR: SINGULAR_DATADIR is appended to
+          getenv("SINGULARPATH")
 
         * small mpsr Changes to reflect some name changes of MP Dicts

Singular/febase.cc

@@ -2 +2 @@
 *  Computer Algebra System SINGULAR     *
 ****************************************/
-/* $Id: febase.cc,v 1.15 1997-05-02 15:10:11 Singular Exp $ */
+/* $Id: febase.cc,v 1.16 1997-05-03 17:23:33 obachman Exp $ */
 /*
 * ABSTRACT: i/o system, handling of 'voices'
@@ -159 +159 @@
     #endif
     char *s;
+    #ifndef macintosh
+    // extend path by SINGULAR_DATADIR
+    s = (char*) AllocL(strlen(env)+strlen(SINGULAR_DATADIR)+2);
+    if (env != NULL)
+    {
+      strcpy(s, env);
+      s[strlen(env)] = FS_SEP;
+      s[strlen(env)+1] = '\0';
+      strcat(s, SINGULAR_DATADIR);
+    }
+    else strcpy(s, SINGULAR_DATADIR);
+    env = s;
+    #endif
     if (where==NULL) s=(char *)AllocL(250);
     else             s=where;
@@ -199 +212 @@
     }
     #ifndef macintosh
-      if (f==NULL)
-      {
-        char* ss = s;
-        int need_len = strlen(path) + strlen(SINGULAR_DATADIR) + 2;
-
-        if (where == NULL)
-        {
-          if (need_len > 250) ss = (char *) AllocL(need_len);
-          strcpy(ss,s);
-        }
-        else
-        {
-          if (need_len > strlen(where)) ss = (char *) AllocL(need_len);
-          strcpy(ss, s);
-        }
-        strcpy(ss,SINGULAR_DATADIR);
-        strcat(s, DIR_SEPP);
-        strcat(ss,path);
-        f=fopen(ss,mode);
-        if (ss != s) FreeL((ADDRESS)ss);
-      }
+    FreeL(env);
     #endif
     if (where==NULL) FreeL((ADDRESS)s);