Changeset 726d50 in git for Singular/feResource.cc

Timestamp:

Aug 6, 1999, 4:06:47 PM (25 years ago)

Author:

Olaf Bachmann <obachman@…>

Branches:

(u'fieker-DuVal', '117eb8c30fc9e991c4decca4832b1d19036c4c65')(u'spielwiese', '38077648e7239f98078663eb941c3c979511150a')

Children:

752871cd58b61cf450ea583fb80146c16c92a7c8

Parents:

36baed385512e1eb1c1731a1ebae7ac0130ea591

Message:

* changes and docu of help/Resources


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

File:

• Singular/feResource.cc (modified) (7 diffs)

Singular/feResource.cc

@@ -2 +2 @@
 *  Computer Algebra System SINGULAR     *
 ****************************************/
-/* $Id: feResource.cc,v 1.3 1999-08-05 11:28:02 obachman Exp $ */
+/* $Id: feResource.cc,v 1.4 1999-08-06 14:06:38 obachman Exp $ */
 /*
 * ABSTRACT: management of resources
@@ -12 +12 @@
 #include "mmemory.h"
 #include "febase.h"
+#include "version.h"
 
 // define RESOURCE_DEBUG for chattering about resource management
@@ -66 +67 @@
   {"BinDir",    'b',    feResDir,   "SINGULAR_BIN_DIR",     "%d/"S_UNAME            ""},
   {"RootDir",   'r',    feResDir,   "SINGULAR_ROOT_DIR",    "%b/..",                ""},
-  {"DefaultDir",'d',    feResDir,   "SINGULAR_DEFAULT_DIR",  NULL,                  SINGULAR_DEFAULT_DIR},
+  {"DefaultDir",'d',    feResDir,   "SINGULAR_DEFAULT_DIR",  SINGULAR_DEFAULT_DIR,  ""},
   {"InfoFile",  'i',    feResFile,  "SINGULAR_INFO_FILE",   "%r/info/singular.hlp", ""},
   {"IdxFile",   'x',    feResFile,  "SINGULAR_IDX_FILE",    "%r/doc/singular.idx",  ""},
@@ -157 +158 @@
 }
 
+void feReInitResources()
+{
+  int i = 0;
+  while (feResourceConfigs[i].key != NULL)
+  {
+    if (feResourceConfigs[i].value != "")
+    {
+      if (feResourceConfigs[i].value != NULL)
+        FreeL(feResourceConfigs[i].value);
+      feResourceConfigs[i].value = "";
+    }
+    i++;
+  }
+#ifdef RESOURCE_DEBUG
+  printf("feReInitResources: entering with feArgv0=%s=\n", feArgv0);
+  feResource('S');
+  feResource('b');
+  feResource('r');
+  feResource('s');
+#endif
+}
 
 /*****************************************************************
@@ -207 +229 @@
     char* evalue = getenv(config->env); 
     if (evalue != NULL)
-    {
+    { 
 #ifdef RESOURCE_DEBUG
       printf("feInitResource: Found value from env:%s\n", evalue);
 #endif
       strcpy(value, evalue);
-      if (feVerifyResourceValue(config->type, 
+      if (config->type == feResBinary  // do not verify binaries
+          ||
+          feVerifyResourceValue(config->type, 
                                 feCleanResourceValue(config->type, value)))
       {
@@ -282 +306 @@
                                 feCleanResourceValue(config->type, value)))
       {
-        config->value = value;
+        config->value = mstrdup(value);
 #ifdef RESOURCE_DEBUG
         printf("feInitResource: Set value of %s to =%s=\n", config->key, config->value);
@@ -637 +661 @@
 {
   int i = 0;
+  char* r;
   while (feResourceConfigs[i].key != NULL)
   {
+    r = feResource(feResourceConfigs[i].key, warn);
     StringAppend("%-10s:\t%s\n", feResourceConfigs[i].key, 
-                 feResource(feResourceConfigs[i].key, warn));
+                 (r != NULL ? r : ""));
     i++;
   }