Changeset f323dd1 in git for findexec

Timestamp:

Feb 29, 2012, 5:18:58 PM (12 years ago)

Author:

Hans Schoenemann <hannes@…>

Branches:

(u'spielwiese', 'fe61d9c35bf7c61f2b6cbf1b56e25e2f08d536cc')

Children:

8d8cd944663cf80b3fd163a42279526ce163a5fd

Parents:

d8b0f69f9828897dca663d5bb516369b1b0ac64a

Message:

chg: move feResource to findexec lib

Location:

findexec

Files:

• Makefile.am (modified) (2 diffs)
• feResource.cc (moved) (moved from libpolys/resources/feResource.cc) (18 diffs)
• feResource.h (moved) (moved from libpolys/resources/feResource.h) (2 diffs)

findexec/Makefile.am

@@ -16 +16 @@
 INCLUDES = -I${top_srcdir} -I${top_builddir} 
 
-SOURCES  = omFindExec.c
+SOURCES  = omFindExec.c feResource.cc
 libfindexec_la_SOURCES   = $(SOURCES)
 libfindexec_g_la_SOURCES = $(SOURCES)
@@ -22 +22 @@
 libfindexec_includedir  =$(includedir)/singular/findexec/
 
-libfindexec_include_HEADERS = omFindExec.h
+libfindexec_include_HEADERS = omFindExec.h feResource.h
 
 

findexec/feResource.cc

@@ -2 +2 @@
 *  Computer Algebra System SINGULAR     *
 ****************************************/
-/* $Id$ */
 /*
 * ABSTRACT: management of resources
@@ -10 +9 @@
 #include <unistd.h>
 #include <string.h>
-#include <unistd.h>
+#include <stdio.h>
 #include <sys/param.h>
 
@@ -34 +33 @@
 
 
-#include <reporter/reporter.h>
+//#include <reporter/reporter.h>
 //char* feResource(const char id, int warn = -1);
 //char* feResource(const char* key, int warn = -1);
@@ -41 +40 @@
 // #define RESOURCE_DEBUG
 
-#define SINGULAR_DEFAULT_DIR "/usr/local/Singular/"S_VERSION1
+#define SINGULAR_DEFAULT_DIR "/usr/local/Singular/"PACKAGE_VERSION
 
 /*****************************************************************
@@ -48 +47 @@
  *
  *****************************************************************/
-typedef enum {feResUndef = 0, feResBinary, feResDir, feResFile, feResUrl, feResPath} feResourceType;
-
-typedef struct feResourceConfig_s
-{
-  const char*           key;   // key to identify resource
-  const char            id;    // char id to identify resource
-  feResourceType  type;  // type of Resource
-  const char*           env;   // env variable to look for
-  const char*           fmt;   // format string -- see below for epxlaination
-  char*                 value; // what it was set to: may be changed
-} feResourceConfig_s;
-typedef feResourceConfig_s * feResourceConfig;
-
 // feSprintf transforms format strings as follows:
 // 1.) substrings of the form %c (c being a letter) are replaced by respective resource value
@@ -68 +54 @@
 // 1.) '/' characters are replaced by respective directory - separators
 // 2.) ';' characters are replaced by respective path separators
-static feResourceConfig_s feResourceConfigs[] =
+feResourceConfig_s feResourceConfigs[] =
 {
   {"SearchPath",    's', feResPath,  NULL,
@@ -96 +82 @@
   {"HtmlHelpFile",'C',  feResFile,  "SINGULAR_CHM_FILE",    "%r/doc/Manual.chm",    (char *)""},
 #endif
-  {"ManualUrl", 'u',    feResUrl,   "SINGULAR_URL",         "http://www.singular.uni-kl.de/Manual/"S_VERSION1,    (char *)""},
+  {"ManualUrl", 'u',    feResUrl,   "SINGULAR_URL",         "http://www.singular.uni-kl.de/Manual/"PACKAGE_VERSION,    (char *)""},
   {"ExDir",     'm',    feResDir,   "SINGULAR_EXAMPLES_DIR","%r/examples",          (char *)""},
   {"Path",      'p',    feResPath,  NULL,                   "%b;$PATH",             (char *)""},
@@ -130 +116 @@
 static char* feInitResource(feResourceConfig config, int warn);
 static char* feGetExpandedExecutable();
-static BOOLEAN feVerifyResourceValue(feResourceType type, char* value);
+static int feVerifyResourceValue(feResourceType type, char* value);
 static char* feCleanResourceValue(feResourceType type, char* value);
 static char* feCleanUpFile(char* fname);
@@ -278 +264 @@
 static char* feInitResource(feResourceConfig config, int warn)
 {
-  assume(config != NULL);
+  /*assume(config != NULL);*/
 #ifdef RESOURCE_DEBUG
   printf("feInitResource: entering for %s\n", config->key);
@@ -351 +337 @@
   else if (config->fmt == NULL)
   {
-    sprintf(value, "Wrong Resource Specification of %s", config->key);
-    dReportBug(value);
+    printf("Bug >>Wrong Resource Specification of %s<< at %s:%d\n",config->key,__FILE__,__LINE__);
     return NULL;
   }
@@ -388 +373 @@
   if (warn > 0 || (warn < 0 && config->value != NULL))
   {
-    Warn("Could not get %s. ", config->key);
-    Warn("Either set environment variable %s to %s,",
+    printf("// ** Could not get %s. ", config->key);
+    printf("// ** Either set environment variable %s to %s,",
          config->env, config->key);
     feSprintf(value, config->fmt, warn);
-    Warn("or make sure that %s is at %s", config->key, value);
+    printf("// ** or make sure that %s is at %s", config->key, value);
   }
 #ifdef RESOURCE_DEBUG
@@ -405 +390 @@
   if (feArgv0 == NULL || *feArgv0 == '\0')
   {
-    if (feArgv0 == NULL) dReportBug("feArgv0 == NULL");
-    else dReportBug("feArgv0 == ''");
+    if (feArgv0 == NULL)
+      printf("Bug >>feArgv0 == NULL<< at %s:%d\n",__FILE__,__LINE__);
+    else
+      printf("Bug >>feArgv0 == ''<< at %s:%d\n",__FILE__,__LINE__);
     return NULL;
   }
@@ -430 +417 @@
   if (value == NULL)
   {
-    char message[MAXRESOURCELEN];
-    sprintf(message, "Could not get expanded executable from %s", feArgv0);
-    dReportBug(message);
+    printf("Bug >>Could not get expanded executable from %s<< at %s:%d\n",feArgv0,__FILE__,__LINE__);
     return NULL;
   }
@@ -439 +424 @@
 
 
-static BOOLEAN feVerifyResourceValue(feResourceType type, char* value)
+static int feVerifyResourceValue(feResourceType type, char* value)
 {
 #ifdef RESOURCE_DEBUG
@@ -449 +434 @@
       case feResUrl:
       case feResPath:
-        return TRUE;
+        return 1;
 
       case feResFile:
@@ -459 +444 @@
 
       default:
-        return FALSE;
+        return 0;
   }
 }
@@ -663 +648 @@
 static void mystrcpy(char* d, char* s)
 {
-  assume(d != NULL && s != NULL);
+  /*assume(d != NULL && s != NULL);*/
   while (*s != '\0')
   {
@@ -727 +712 @@
 }
 
-void feStringAppendResources(int warn)
-{
-  int i = 0;
-  char* r;
-  StringAppend("%-10s:\t%s\n", "argv[0]", feArgv0);
-  while (feResourceConfigs[i].key != NULL)
-  {
-    r = feResource(feResourceConfigs[i].key, warn);
-    StringAppend("%-10s:\t%s\n", feResourceConfigs[i].key,
-                 (r != NULL ? r : ""));
-    i++;
-  }
-}

findexec/feResource.h

@@ -17 +17 @@
  *
  *****************************************************************/
+typedef enum {feResUndef = 0, feResBinary, feResDir, feResFile, feResUrl, feResPath} feResourceType;
+
+typedef struct feResourceConfig_s
+{
+  const char*           key;   // key to identify resource
+  const char            id;    // char id to identify resource
+  feResourceType  type;  // type of Resource
+  const char*           env;   // env variable to look for
+  const char*           fmt;   // format string -- see below for epxlaination
+  char*                 value; // what it was set to: may be changed
+} feResourceConfig_s;
+typedef feResourceConfig_s * feResourceConfig;
+
+extern feResourceConfig_s feResourceConfigs[];
+
 // returns value of Resource as read-only string, or NULL
 // if Resource not found
@@ -36 +51 @@
 // Re-inits resources, should be called after changing env. variables
 void feReInitResources();
-// Prints resources into string with StringAppend, etc
-void feStringAppendResources(int warn = -1);
 #endif /* end ifdef __cplusplus */