summaryrefslogtreecommitdiff
path: root/src/scandir.c
diff options
context:
space:
mode:
authorMatthias Melcher <fltk@matthiasm.com>2008-09-10 23:56:49 +0000
committerMatthias Melcher <fltk@matthiasm.com>2008-09-10 23:56:49 +0000
commitb6bde2e4569aa617c8a6af64947c688c624ed7f8 (patch)
tree010d15843eb7d4faf7cd1b0cd44d5b9c00462a83 /src/scandir.c
parentdfb50e85292687561927610e689eb5ab30d0ba26 (diff)
Merging the UTF8 patch, consisting of O'ksi'd s original 1.1.6 patch and additions by Ian. PLEASE BE AWARE that the patch in its current incarnation is a regression in many aspects and further work is required before we can announce Unicode support.
git-svn-id: file:///fltk/svn/fltk/branches/branch-1.3@6212 ea41ed52-d2ee-0310-a9c1-e6b18d33e121
Diffstat (limited to 'src/scandir.c')
-rw-r--r--src/scandir.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/src/scandir.c b/src/scandir.c
index 197f63fd6..27aa63567 100644
--- a/src/scandir.c
+++ b/src/scandir.c
@@ -21,6 +21,7 @@ USA. */
#else
# include "flstring.h"
+# include <FL/fl_utf8.H>
# if !HAVE_SCANDIR
# include <stdlib.h>
@@ -49,7 +50,7 @@ fl_scandir(const char *dir, struct dirent ***namelist,
int (*select)(struct dirent *),
int (*compar)(struct dirent **, struct dirent **))
{
- DIR *dp = opendir (dir);
+ DIR *dp = opendir (fl_utf2mbcs(dir));
struct dirent **v = NULL;
size_t vsize = 0, i;
struct dirent *d;