Remove workaround with multiple include folders; Instead use a naive escape function

[hashcat.git] / src / hashcat.c

diff --git a/src/hashcat.c b/src/hashcat.c
index b147aee..ea9fb03 100644 (file)
--- a/src/hashcat.c
+++ b/src/hashcat.c
@@ -15393,32 +15393,33 @@ int main (int argc, char **argv)
        * default building options
        */
 
-      char build_opts[1024] = { 0 };
-
-      // we don't have sm_* on vendors not NV but it doesn't matter
+      char cpath[1024] = { 0 };
 
       #if _WIN
-      snprintf (build_opts, sizeof (build_opts) - 1, "-I \"%s\\OpenCL\\\" -I '%s\\OpenCL\\' -I %s\\OpenCL\\ -I\"%s\\OpenCL\\\" -I'%s\\OpenCL\\' -I%s\\OpenCL\\", shared_dir, shared_dir, shared_dir, shared_dir, shared_dir, shared_dir);
+
+      snprintf (cpath, sizeof (cpath) - 1, "%s\\OpenCL\\", shared_dir);
+
+      char cpath_real[MAX_PATH] = { 0 };
+
+      GetFullPathName (cpath, MAX_PATH, cpath_real, NULL);
+
       #else
-      snprintf (build_opts, sizeof (build_opts) - 1, "-I \"%s/OpenCL/\" -I '%s/OpenCL/' -I %s/OpenCL/ -I\"%s/OpenCL/\" -I'%s/OpenCL/' -I%s/OpenCL/", shared_dir, shared_dir, shared_dir, shared_dir, shared_dir, shared_dir);
-      #endif
 
-      char build_opts_new[1024] = { 0 };
+      snprintf (cpath, sizeof (cpath) - 1, "%s/OpenCL/", shared_dir);
 
-      snprintf (build_opts_new, sizeof (build_opts_new) - 1, "%s -DVENDOR_ID=%u -DCUDA_ARCH=%d -DVECT_SIZE=%u -DDEVICE_TYPE=%u -DKERN_TYPE=%u -D_unroll -cl-std=CL1.1", build_opts, device_param->device_vendor_id, (device_param->sm_major * 100) + device_param->sm_minor, device_param->vector_width, (u32) device_param->device_type, kern_type);
+      char *cpath_real = realpath (cpath, NULL);
 
-      strncpy (build_opts, build_opts_new, sizeof (build_opts) - 1);
+      #endif
 
-      /*
-      if (device_param->device_vendor_id == VENDOR_ID_INTEL_SDK)
-      {
-        // we do vectorizing much better than the auto-vectorizer
+      char cpath_escaped[1024] = { 0 };
 
-        snprintf (build_opts_new, sizeof (build_opts_new) - 1, "%s -cl-opt-disable", build_opts);
+      naive_escape (cpath_real, cpath_escaped);
 
-        strncpy (build_opts, build_opts_new, sizeof (build_opts) - 1);
-      }
-      */
+      // we don't have sm_* on vendors not NV but it doesn't matter
+
+      char build_opts[1024] = { 0 };
+
+      snprintf (build_opts, sizeof (build_opts) - 1, "-I %s -D VENDOR_ID=%u -D CUDA_ARCH=%d -D VECT_SIZE=%u -D DEVICE_TYPE=%u -D KERN_TYPE=%u -D _unroll -cl-std=CL1.1", cpath_escaped, device_param->device_vendor_id, (device_param->sm_major * 100) + device_param->sm_minor, device_param->vector_width, (u32) device_param->device_type, kern_type);
 
       #ifdef DEBUG
       log_info ("- Device #%u: build_opts '%s'\n", device_id + 1, build_opts);