Selectively replace fopen() with fopen_utf8()

[pcsx_rearmed.git] / plugins / cdrcimg / cdrcimg.c

diff --git a/plugins/cdrcimg/cdrcimg.c b/plugins/cdrcimg/cdrcimg.c
index 91cf1ca..007e96b 100644 (file)
--- a/plugins/cdrcimg/cdrcimg.c
+++ b/plugins/cdrcimg/cdrcimg.c
@@ -8,13 +8,17 @@
  * See the COPYING file in the top-level directory.
  */
 
+#include <compat/fopen_utf8.h>
+
 #include <stdio.h>
 #include <string.h>
 #include <stdlib.h>
 #include <zlib.h>
 #ifndef _WIN32
 #define CALLBACK
+#ifndef NO_DYLIB
 #include <dlfcn.h>
+#endif
 #else
 #define WIN32_LEAN_AND_MEAN
 #include <windows.h>
@@ -285,7 +289,7 @@ static long CDRinit(void)
                        return -1;
                }
        }
-#ifndef _WIN32
+#if !defined(_WIN32) && !defined(NO_DYLIB)
        if (pBZ2_bzBuffToBuffDecompress == NULL) {
                void *h = dlopen("/usr/lib/libbz2.so.1", RTLD_LAZY);
                if (h == NULL)
@@ -319,7 +323,7 @@ static long handle_eboot(void)
        int i, ret;
        FILE *f;
 
-       f = fopen(cd_fname, "rb");
+       f = fopen_utf8(cd_fname, "rb");
        if (f == NULL) {
                err("missing file: %s: ", cd_fname);
                perror(NULL);
@@ -458,7 +462,7 @@ static long CDRopen(void)
                return -1;
        }
 
-       f = fopen(table_fname, "rb");
+       f = fopen_utf8(table_fname, "rb");
        if (f == NULL) {
                err("missing file: %s: ", table_fname);
                perror(NULL);
@@ -523,7 +527,7 @@ static long CDRopen(void)
                break;
        }
 
-       cd_file = fopen(cd_fname, "rb");
+       cd_file = fopen_utf8(cd_fname, "rb");
        if (cd_file == NULL) {
                err("failed to open: %s: ", table_fname);
                perror(NULL);