Changeset 1742

Timestamp:

08/11/11 10:39:23 (7 months ago)

Author:

Freddie Akeroyd

Message:

Fix path length bug in C++ inquire file command - tests now work. Refs #299

Location:

trunk

Files:

• bindings/cpp/NeXusFile.hpp (modified) (1 diff)
• include/napi.h (modified) (1 diff)
• test/napi_test.c (modified) (1 diff)
• test/napi_test_cpp.cxx (modified) (1 diff)

trunk/bindings/cpp/NeXusFile.hpp

@@ -801 +801 @@
      * \return The name of the file.
      */
-    std::string inquireFile(const int buff_length = NX_MAXNAMELEN);
+    std::string inquireFile(const int buff_length = NX_MAXPATHLEN);
 
     /**

trunk/include/napi.h

@@ -119 +119 @@
 #define NX_MAXRANK 32
 #define NX_MAXNAMELEN 64
+#define NX_MAXPATHLEN 1024
 
 

trunk/test/napi_test.c

@@ -36 +36 @@
 static int testExternal(char *progName);
 
-char *relativePathOf(const char* filename) {
+static const char *relativePathOf(const char* filename) {
   char cwd[1024];
-  char *pointer;
 
   getcwd(cwd, sizeof(cwd));
   
-  if (strncmp(filename, cwd, strlen(cwd)) == 0) {
+  if (strncmp(filename, cwd, strlen(cwd)) == 0) 
+  {
         return filename+strlen(cwd)+1;
   }
-  return filename;
+  else
+  {
+        return filename;
+  }
 }
 

trunk/test/napi_test_cpp.cxx

@@ -17 +17 @@
 using std::vector;
 
-char *relativePathOf(std::string filenamestr) {
+static std::string relativePathOf(const std::string& filenamestr) {
   char cwd[1024];
-  char *filename;
-
-  filename = strdup(filenamestr.c_str());
 
   getcwd(cwd, sizeof(cwd));
   
-//fprintf(stderr, "filename %s cwd %s\n", filename, cwd);
-  if (strncmp(filename, cwd, strlen(cwd)) == 0) {
-        return filename + strlen(cwd) + 1;
-  }
-  return filename;
-}
-
-int writeTest(const string& filename, NXaccess create_code) {
+  if ( filenamestr.compare(0, strlen(cwd), cwd) == 0 )
+  {
+      return filenamestr.substr(strlen(cwd)+1);  // +1 to skip trailing /
+  }
+  else
+  {
+      return filenamestr;
+  }
+}
+
+static int writeTest(const string& filename, NXaccess create_code) {
   NeXus::File file(filename, create_code);
   // create group