Changeset 35699 for main/trunk

Timestamp:

2021-10-25T00:14:15+13:00 (3 years ago)

Author:

davidb

Message:

dirname() wasn't part of VS, so adding in our own get_dirname()

Location:

main/trunk/search4j

Files:

• libsearch4j.cpp (modified) (3 diffs)
• libsearch4j.h (modified) (1 diff)

main/trunk/search4j/libsearch4j.cpp

@@ -339 +339 @@
 #endif
 
+
+char* get_dirname (const char* full_file_path)
+{
+  char* full_file_path_dup = strdup(full_file_path);
+#ifdef WINDOWS
+  char *p = strrchr(full_file_path_dup, '\\');
+#else
+  char *p = strrchr(full_file_path_dup, '/');
+#endif
+
+  if (p != NULL) {
+    p[0] = 0;
+  }
+    
+  return full_file_path_dup;
+}
+
 /*
 * function to find java
@@ -348 +365 @@
     if ( verbose ) cout << "Searching for a JVM" << endl;
     
-    char *javaHomeEnv = NULL;
+    char *javaHomeEnv = NULL; // use below would benefit from more careful application of strdup()/free()
     bool jvmFound = false;
     
@@ -559 +576 @@
         if ( strcmp(full_path_java,"") != 0) {
           // go two directories up from where 'java' was found
-          javaHomeEnv = dirname(dirname(full_path_java));
-
+
+          char* parent_dir = get_dirname(full_path_java);
+          char* parent_parent_dir = get_dirname(parent_dir);
+          
+          javaHomeEnv = parent_parent_dir; 
+
+          free(parent_dir); 
+          
           // Logic from here same as for other search4j java/javac testing
           if ( verbose ) cout << "(" << javaHomeEnv << ") ";

main/trunk/search4j/libsearch4j.h

@@ -6 +6 @@
 #include <sstream>
 #include <sys/stat.h>
-
-#include <libgen.h>
 
 using namespace std;