Eina: ignore EINA_FILE_LNK on Windows

This commit is contained in:
Vincent Torri 2018-01-27 15:18:59 +01:00 committed by Jean-Philippe Andre
parent ef0f0a50b2
commit 78af66ffb4
2 changed files with 4 additions and 6 deletions

View File

@ -123,7 +123,7 @@ typedef enum {
EINA_FILE_DIR, /**< Directory type */
EINA_FILE_BLK, /**< Block device type (unused on Windows) */
EINA_FILE_REG, /**< Regular file type */
EINA_FILE_LNK, /**< Symbolic link type */
EINA_FILE_LNK, /**< Symbolic link type (unused on Windows) */
EINA_FILE_SOCK, /**< UNIX domain socket type (unused on Windows) */
EINA_FILE_WHT /**< Whiteout file type (unused on Windows) */
} Eina_File_Type;

View File

@ -330,14 +330,13 @@ _eina_file_win32_direct_ls_iterator_next(Eina_File_Direct_Iterator *it, void **d
if (attr & FILE_ATTRIBUTE_DIRECTORY)
it->info.type = EINA_FILE_DIR;
else if (attr & FILE_ATTRIBUTE_REPARSE_POINT)
it->info.type = EINA_FILE_LNK;
else if (attr & (FILE_ATTRIBUTE_ARCHIVE |
FILE_ATTRIBUTE_COMPRESSED |
FILE_ATTRIBUTE_HIDDEN |
FILE_ATTRIBUTE_NORMAL |
FILE_ATTRIBUTE_SPARSE_FILE |
FILE_ATTRIBUTE_TEMPORARY))
FILE_ATTRIBUTE_TEMPORARY |
FILE_ATTRIBUTE_REPARSE_POINT))
it->info.type = EINA_FILE_REG;
else
it->info.type = EINA_FILE_UNKNOWN;
@ -1061,8 +1060,7 @@ eina_file_statat(void *container EINA_UNUSED, Eina_File_Direct_Info *info, Eina_
if (stat64(info->path, &buf))
{
if (info->type != EINA_FILE_LNK)
info->type = EINA_FILE_UNKNOWN;
info->type = EINA_FILE_UNKNOWN;
return -1;
}