Accept directory in LIBBLURAY_CP

ChangeLog

@@ -2,6 +2,7 @@
 - Add UDF volume identifier to DISC_INFO.
 - Fix infinite loop with some broken HDMV menus.
 - Emit BD_EVENT_PLAYLIST_STOP when playlist playback is stopped in middle.
+- Accept directory name (without .jar file name) in LIBBLURAY_CP.
 
 2015-01-26: Version 0.7.0
 - Add player setting for BD-J persistent storage and cache paths.

src/libbluray/bdj/bdj.c

@@ -220,14 +220,23 @@ static const char *_find_libbluray_jar(void)
     FILE *fp;
     unsigned i;
 
-    // check if overriding the classpath
-    if (!classpath) {
-        classpath = getenv("LIBBLURAY_CP");
-    }
     if (classpath) {
         return classpath;
     }
 
+    // check if overriding the classpath
+    classpath = getenv("LIBBLURAY_CP");
+    if (classpath) {
+        size_t cp_len = strlen(classpath);
+
+        // directory or file ?
+        if (cp_len > 0 && (classpath[cp_len - 1] == '/' || classpath[cp_len - 1] == '\\')) {
+            classpath = str_printf("%s%s", classpath, BDJ_JARFILE);
+        }
+
+        return classpath;
+    }
+
     BD_DEBUG(DBG_BDJ, "LIBBLURAY_CP not set, searching for "BDJ_JARFILE" ...\n");
 
     // check directory where libbluray.so was loaded from