From 03e6fec230ec47add31cc2483434a1dee377c3aa Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?R=C3=A9mi=20Denis-Courmont?= <rem@videolan.org>
Date: Sat, 25 Nov 2006 13:25:03 +0000
Subject: [PATCH] mkv: use (open|read)dir wrappers
---
modules/demux/mkv.cpp | 12 +++++++-----
1 file changed, 7 insertions(+), 5 deletions(-)
diff --git a/modules/demux/mkv.cpp b/modules/demux/mkv.cpp
index 1f8c6a29ef2a..f5238da46d11 100644
--- a/modules/demux/mkv.cpp
+++ b/modules/demux/mkv.cpp
@@ -38,6 +38,7 @@
#include <codecs.h> /* BITMAPINFOHEADER, WAVEFORMATEX */
#include "iso_lang.h"
#include "vlc_meta.h"
+#include "charset.h"
#include <iostream>
#include <cassert>
@@ -1491,16 +1492,16 @@ static int Open( vlc_object_t * p_this )
}
}
- struct dirent *p_file_item;
- DIR *p_src_dir = opendir(s_path.c_str());
+ DIR *p_src_dir = utf8_opendir(s_path.c_str());
if (p_src_dir != NULL)
{
- while ((p_file_item = (dirent *) readdir(p_src_dir)))
+ char *psz_file;
+ while ((psz_file = utf8_readdir(p_src_dir)) != NULL)
{
- if (strlen(p_file_item->d_name) > 4)
+ if (strlen(psz_file) > 4)
{
- s_filename = s_path + DIRECTORY_SEPARATOR + p_file_item->d_name;
+ s_filename = s_path + DIRECTORY_SEPARATOR + psz_file;
#ifdef WIN32
if (!strcasecmp(s_filename.c_str(), p_demux->psz_path))
@@ -1545,6 +1546,7 @@ static int Open( vlc_object_t * p_this )
}
}
}
+ free (psz_file);
}
closedir( p_src_dir );
}
--
GitLab