Changeset c232af in git for Singular/feResource.cc

Timestamp:

Aug 14, 2000, 2:58:28 PM (24 years ago)

Author:

Olaf Bachmann <obachman@…>

Branches:

(u'spielwiese', '4a9821a93ffdc22a6696668bd4f6b8c9de3e6c5f')

Children:

d26c2e9dd38f1531c0e77c38e6177109182b5bca

Parents:

4697a8a1ccbf49d0048033ea29c651e3966ba729

Message:

* omalloc stuff


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

File:

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

Singular/feResource.cc

@@ -2 +2 @@
 *  Computer Algebra System SINGULAR     *
 ****************************************/
-/* $Id: feResource.cc,v 1.26 2000-05-25 13:37:28 obachman Exp $ */
+/* $Id: feResource.cc,v 1.27 2000-08-14 12:56:06 obachman Exp $ */
 /*
 * ABSTRACT: management of resources
@@ -12 +12 @@
 #include "distrib.h"
 #if !defined(ESINGULAR) && !defined(TSINGULAR)
-#include "mmemory.h"
+#include <omalloc.h>
 #include "febase.h"
-extern "C" char* find_executable(const char* argv0);
 #endif
 
@@ -111 +110 @@
 #define MAXRESOURCELEN 5*MAXPATHLEN
 
-#ifdef MTRACK
-BOOLEAN feRes_works=FALSE;
-#endif
-
 char fePathSep =
 #if defined(WINNT)
@@ -178 +173 @@
     fePathSep = ':';
 #endif
-  feArgv0 = mstrdup(argv0);
+  feArgv0 = omStrDup(argv0);
 #ifdef RESOURCE_DEBUG
   printf("feInitResources: entering with argv0=%s=\n", argv0);
@@ -195 +190 @@
   if (path != NULL) setenv("PATH", path, 1);
 #endif
-#ifdef MTRACK
-  feRes_works=TRUE;
-#endif
 }
 
@@ -208 +200 @@
     {
       if (feResourceConfigs[i].value != NULL)
-        FreeL(feResourceConfigs[i].value);
+        omFree(feResourceConfigs[i].value);
       feResourceConfigs[i].value = "";
     }
@@ -261 +253 @@
 {
   if (config == NULL) return NULL;
-  char* value = (char*) AllocL(MAXRESOURCELEN);
+  char* value = (char*) omAlloc(MAXRESOURCELEN);
   feSprintf(value, config->fmt, -1);
   return value;
@@ -293 +285 @@
         printf("feInitResource: Set value of %s to =%s=\n", config->key, value);
 #endif
-        config->value = mstrdup(value);
+        config->value = omStrDup(value);
         return config->value;
       }
@@ -313 +305 @@
       printf("value:%s\n", value);
 #endif
-      FreeL(executable);
+      omFree(executable);
     }
   }
@@ -353 +345 @@
     printf("feInitResource: Set value of %s to =%s=\n", config->key, value);
 #endif
-    config->value = mstrdup(value);
+    config->value = omStrDup(value);
     return config->value;
   }
@@ -359 +351 @@
   {
     // for binaries, search through PATH once more
-    char* executable = find_executable(config->key);
+    char* executable = omFindExec(config->key, value);
     if (executable != NULL)
     {
-      strcpy(value, executable);
-      FreeL(executable);
       if (feVerifyResourceValue(config->type,
                                 feCleanResourceValue(config->type, value)))
       {
-        config->value = mstrdup(value);
+        config->value = omStrDup(value);
 #ifdef RESOURCE_DEBUG
         printf("feInitResource: Set value of %s to =%s=\n", config->key, config->value);
@@ -416 +406 @@
   printf("feGetExpandedExecutable: calling find_exec with =%s=\n", feArgv0);
 #endif
-  char* executable = find_executable(feArgv0);
+  char executable[MAXRESOURCELEN];
+  char* value = omFindExec(feArgv0, executable);
 #ifdef RESOURCE_DEBUG
   printf("feGetExpandedExecutable: find_exec exited with =%s=%d\n", executable, access(executable, X_OK));
 #endif
-  if (executable == NULL)
+  if (value == NULL)
   {
     char message[MAXRESOURCELEN];
@@ -427 +418 @@
     return NULL;
   }
-  return executable;
+  return omStrDup(value);
 #else // macintosh
   return feArgv0;
@@ -581 +572 @@
   }
 
-  path_comps = (char**) AllocL(n_comps*sizeof(char*));
+  path_comps = (char**) omAlloc(n_comps*sizeof(char*));
   path_comps[0]=opath;
   path=opath;
@@ -661 +652 @@
     *opath = '\0';
   }
-  FreeL(path_comps);
+  omFree(path_comps);
 #ifdef RESOURCE_DEBUG
   Print("feCleanUpPath: leaving with path=%s=\n", opath);