Changeset 17b0b05 in git for libpolys/resources/feResource.cc

Timestamp:

May 12, 2011, 3:12:45 PM (13 years ago)

Author:

Hans Schoenemann <hannes@…>

Branches:

(u'spielwiese', '17f1d200f27c5bd38f5dfc6e8a0879242279d1d8')

Children:

2c41bc0e28c6628127866480994b3041a3c1f0af

Parents:

ea000154f0b80de2f44a961be0d4a407828b72c9

git-author:

Hans Schoenemann <hannes@mathematik.uni-kl.de>2011-05-12 15:12:45+02:00

git-committer:

Mohamed Barakat <mohamed.barakat@rwth-aachen.de>2011-11-09 12:36:07+01:00

Message:

fix loading of gftables

- fix loading in nfReadTable
- fix feCleanUpFile
- add to feResourceConfigs: %b/../../factory/gftables
- add feStringAppendResources to test of GF polys

File:

• libpolys/resources/feResource.cc (modified) (4 diffs)

libpolys/resources/feResource.cc

@@ -17 +17 @@
 
 #include "feResource.h"
-
 
 #ifdef AIX_4
@@ -83 +82 @@
    "%r/../LIB;"
    "%d/LIB;"
-   "%d/../LIB"
+   "%d/../LIB;"
+   "%b/../../../factory/gftables;"
+   "%b/../../factory/gftables",
    ""},
   {"Singular",  'S',    feResBinary,"SINGULAR_EXECUTABLE",  "%d/"S_UNAME"/Singular",(char *)""},
@@ -523 +524 @@
         if (*(fn+2) == '.' && (*(fn + 3) == '/' || *(fn + 3) == '\0'))
         {
+        #if 0
+        // this does not work: ./../../mmm will be changed to ./../mmm
+        // but we only want to change ././mmm to ./mmm
           *fn = '\0';
           s = strrchr(fname, '/');
@@ -534 +538 @@
             *fn = '/';
           }
+        #endif
         }
         else if (*(fn+2) == '/' || *(fn+2) == '\0')