walkero
/
fontconfig
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Use stat() if there are no d_type in struct dirent 

Reported by Thomas Klausner
This commit is contained in:
Akira TAGOH 2013-10-22 15:00:29 +09:00
parent 5e029db497
commit 76ea9af816
1 changed files with 18 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
test/test-migration.c
View File

@ -4,6 +4,11 @@
#include <unistd.h> #include <unistd.h>
#include <sys/types.h> #include <sys/types.h>
#include <dirent.h> #include <dirent.h>
#ifndef HAVE_STRUCT_DIRENT_D_TYPE
#include <sys/types.h>
#include <sys/stat.h>
#include <unistd.h>
#endif
#include <fontconfig/fontconfig.h> #include <fontconfig/fontconfig.h>
FcBool FcBool
@ -36,6 +41,9 @@ unlink_dirs(const char *dir)
size_t len = strlen (dir); size_t len = strlen (dir);
char *n = NULL; char *n = NULL;
FcBool ret = FcTrue; FcBool ret = FcTrue;
#ifndef HAVE_STRUCT_DIRENT_D_TYPE
struct stat statb;
#endif
if (!d) if (!d)
return FcFalse; return FcFalse;
@ -53,7 +61,17 @@ unlink_dirs(const char *dir)
strcpy (n, dir); strcpy (n, dir);
n[len] = '/'; n[len] = '/';
strcpy (&n[len + 1], e->d_name); strcpy (&n[len + 1], e->d_name);
#ifdef HAVE_STRUCT_DIRENT_D_TYPE
if (e->d_type == DT_DIR) if (e->d_type == DT_DIR)
#else
if (stat (n, &statb) == -1)
{
fprintf (stderr, "E: %s\n", n);
ret = FcFalse;
break;
}
if (S_ISDIR (statb.st_mode))
#endif
{ {
if (!unlink_dirs (n)) if (!unlink_dirs (n))
{ {