Changeset ef0124 in git for Singular/feResource.cc

Timestamp:

May 5, 2000, 8:40:34 PM (24 years ago)

Author:

Olaf Bachmann <obachman@…>

Branches:

(u'spielwiese', '17f1d200f27c5bd38f5dfc6e8a0879242279d1d8')

Children:

ba9453910d26fdb676fa083bc02d866111ea5ece

Parents:

f9bfec9b7263804ac776257b32087185168b1000

Message:

*** empty log message ***


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

File:

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

Singular/feResource.cc

@@ -2 +2 @@
 *  Computer Algebra System SINGULAR     *
 ****************************************/
-/* $Id: feResource.cc,v 1.23 2000-04-27 10:07:06 obachman Exp $ */
+/* $Id: feResource.cc,v 1.24 2000-05-05 18:40:28 obachman Exp $ */
 /*
 * ABSTRACT: management of resources
@@ -11 +11 @@
 #include "mod2.h"
 #include "distrib.h"
-#ifndef ESINGULAR
+#if !defined(ESINGULAR) && !defined(TSINGULAR)
 #include "mmemory.h"
 #include "febase.h"
@@ -21 +21 @@
 
 #if defined(MAKE_DISTRIBUTION)
-#if defined(WINNT)
+#if defined(WINNT) && ! defined(__CYGWIN__)
 #define SINGULAR_DEFAULT_DIR "/Singular/"S_VERSION1
 #elif defined(macintosh)
@@ -80 +80 @@
   {"info",      'I',    feResBinary,"INFO",                 "%b/info",              ""},
   {"tkinfo",    'T',    feResBinary,"TKINFO",               "%b/tkinfo",            ""},
+#ifdef WINNT
+  {"rxvt",     'X',    feResBinary,"RXVT",                "%b/rxvt",             ""},
+#else
   {"xterm",     'X',    feResBinary,"XTERM",                "%b/xterm",             ""},
+#endif
   {"Path",      'p',    feResPath,  NULL,                   "%b;$PATH",         ""},
 #endif // ! defined(macintosh)
@@ -90 +94 @@
   {"EmacsLoad",'l',    feResFile,   "ESINGULAR_EMACS_LOAD",  "%e/.emacs-singular",             ""},
   {"EmacsDir",  'e',    feResDir,   "ESINGULAR_EMACS_DIR",   "%r/emacs",             ""},
+#elif defined(TSINGULAR)
+  {"SingularXterm",'M',feResBinary, "TSINGULAR_SINGULAR",    "%b/Singular",           ""},
 #else
   {"EmacsDir",  'e',    feResDir,   "SINGULAR_EMACS_DIR",   "%r/emacs",             ""},
@@ -254 +260 @@
 static char* feResourceDefault(feResourceConfig config)
 {
+  if (config == NULL) return NULL;
   char* value = (char*) AllocL(MAXRESOURCELEN);
   feSprintf(value, config->fmt, -1);
@@ -299 +306 @@
     if (executable != NULL)
     {
+#ifdef RESOURCE_DEBUG
+      printf("exec:%s\n", executable);
+#endif
       strcpy(value, executable);
+#ifdef RESOURCE_DEBUG
+      printf("value:%s\n", value);
+#endif
       FreeL(executable);
     }
@@ -317 +330 @@
     }
   }
+
+#ifdef RESOURCE_DEBUG
+      printf("value:%s\n", value);
+#endif
 
   if (*value == '\0' && config->fmt != NULL )
@@ -401 +418 @@
   char* executable = find_executable(feArgv0);
 #ifdef RESOURCE_DEBUG
-  printf("feGetExpandedExecutable: find_exec exited with =%s=\n", executable);
+  printf("feGetExpandedExecutable: find_exec exited with =%s=%d\n", executable, access(executable, X_OK));
 #endif
   if (executable == NULL)
@@ -421 +438 @@
 #ifdef RESOURCE_DEBUG
   printf("feVerifyResourceValue: entering with =%s=\n", value);
+  printf("%d:%d\n", access(value, R_OK), access(value, X_OK));
 #endif
   switch(type)
@@ -449 +467 @@
 {
   if (value == NULL || *value == '\0') return value;
+#ifdef RESOURCE_DEBUG
+      printf("Clean value:%s\n", value);
+#endif
 #ifdef WINNT
+#ifdef RESOURCE_DEBUG
+      printf("Clean WINNT value:%s\n", value);
+#endif
   if (type == feResBinary)
   {
     int l = strlen(value);
-    if (l < 4 || strcmp(&value[l-4], ".exe") != 0)
+    if (l < 4 || (strcmp(&value[l-4], ".exe") != 0 && 
+                  strcmp(&value[l-4], ".EXE") != 0))
       strcat(value, ".exe");
   }