Changeset d9e190 in git

Timestamp:

Apr 21, 2011, 4:41:50 PM (12 years ago)

Author:

Mohamed Barakat <mohamed.barakat@…>

Branches:

(u'spielwiese', '0d6b7fcd9813a1ca1ed4220cfa2b104b97a0a003')

Children:

6d28ba7962ff547926c1a0ce553ff7070a77746e

Parents:

4f07ef5931598da3a05c62cb735d25ecaac0c5a9

git-author:

Mohamed Barakat <mohamed.barakat@rwth-aachen.de>2011-04-21 16:41:50+02:00

git-committer:

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

Message:

got rid of program_invocation_name (non-portable) and replaced it by an educated guess
changed the test generation script to save a copy of the program name in main

Location:

libpolys

Files:

• resources/feResource.cc (modified) (3 diffs)
• tests/coeffs_test.h (modified) (1 diff)
• tests/cxxtestgen.pl (modified) (2 diffs)
• tests/polys_test.h (modified) (1 diff)

libpolys/resources/feResource.cc

@@ -10 +10 @@
 #include <unistd.h>
 #include <string.h>
+#include <unistd.h>
+#include <sys/param.h>
 
 #include "config.h"
@@ -15 +17 @@
 
 #include "feResource.h"
-
-
-// the following is needed due to 'program_invocation_name'
-#define _GNU_SOURCE
-#include <errno.h>
 
 
@@ -179 +176 @@
 void feInitResources(char* argv0)
 {
-  if (argv0==NULL)
-  {
-    argv0 = program_invocation_name;
-  }
-  
 #if defined(ix86_Win) && defined(__GNUC__)
   if (cygwin32_posix_path_list_p (getenv("PATH")))
     fePathSep = ':';
 #endif
-  feArgv0 = omStrDup(argv0);
-#ifdef RESOURCE_DEBUG
-  printf("feInitResources: entering with argv0=%s=\n", argv0);
+  if (argv0==NULL)
+  {
+    feArgv0 = (char*)omAlloc0(MAXPATHLEN+strlen("/Singular"));
+    getcwd(feArgv0,MAXPATHLEN);
+    strcpy(feArgv0+strlen(feArgv0),"/Singular");
+  }
+  else
+    feArgv0 = omStrDup(argv0);
+#ifdef RESOURCE_DEBUG
+  printf("feInitResources: entering with argv0=%s=\n", feArgv0);
 #endif
   // init some Resources

libpolys/tests/coeffs_test.h

@@ -343 +343 @@
     bool setUpWorld() {
       clog << endl << ( "<world>" ) << endl;
-      feInitResources();
+      feInitResources(argv0);
       return true;
     }

libpolys/tests/cxxtestgen.pl

@@ -536 +536 @@
 sub writeMain() {
   if ( $gui ) {
+    print "char* argv0;\n";
     print "int main( int argc, char *argv[] ) {\n";
+    print "argv0 = argv[0];\n";
     $noStaticInit &&
       print " CxxTest::initialize();\n";
@@ -543 +545 @@
   }
   elsif ( $runner ) {
-    print "int main() {\n";
+    print "char* argv0;\n";
+    print "int main( int argc, char *argv[] ) {\n";
+    print "argv0 = argv[0];\n";
     $noStaticInit &&
       print " CxxTest::initialize();\n";

libpolys/tests/polys_test.h

@@ -37 +37 @@
     bool setUpWorld() {
       clog << ( "<world>" ) << endl;
-      feInitResources();
+      feInitResources(argv0);
       
       TS_ASSERT_EQUALS( nRegister( n_Zp, npInitChar), n_Zp );