Changeset b6f537 in git for Singular/tesths.cc

Timestamp:

Sep 21, 1999, 6:40:16 PM (25 years ago)

Author:

Olaf Bachmann <obachman@…>

Branches:

(u'spielwiese', '4a9821a93ffdc22a6696668bd4f6b8c9de3e6c5f')

Children:

212d09b90045920b3214c1edb67fdc3d3cdd28c1

Parents:

62b9a81f29192223ddf7f533eaee4293ed7ee63b

Message:

* resource file loading


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

File:

• Singular/tesths.cc (modified) (2 diffs)

Singular/tesths.cc

@@ -2 +2 @@
 *  Computer Algebra System SINGULAR     *
 ****************************************/
-/* $Id: tesths.cc,v 1.73 1999-09-21 14:44:59 obachman Exp $ */
+/* $Id: tesths.cc,v 1.74 1999-09-21 16:40:16 obachman Exp $ */
 
 /*
@@ -181 +181 @@
   {
     char buf[MAXPATHLEN];
-    FILE * rc=myfopen(".singularrc","r");
-    if (rc!=NULL)
-    {
+    FILE * rc = feFopen("." DIR_SEPP ".singularrc", "r", buf);
+    if (rc == NULL) rc = feFopen("~" DIR_SEPP ".singularrc", "r", buf);
+    if (rc == NULL) rc = feFopen(".singularrc", "r", buf);
+    
+    if (rc != NULL)
+    {
+
+      if (BVERBOSE(V_LOAD_LIB))
+        Print("// ** executing %s\n", buf);
       fclose(rc);
-      newFile(".singularrc");
-    }
-    else
-    {
-      char *home = getenv("HOME");
-      if (home != NULL)
-      {
-        strcpy(buf, home);
-        strcat(buf, "/.singularrc");
-        rc = myfopen(buf, "r");
-        if (rc != NULL)
-        {
-          fclose(rc);
-          newFile(buf);
-        }
-      }
-    }
-    // 
-    FILE *fd = feFopen(".singularrc", "r", buf, FALSE, TRUE);
-    if (fd != NULL)
-    {
-      fclose(fd);
       newFile(buf);
     }