ShuriZma
/
xqemu
mirror of https://github.com/xqemu/xqemu.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

vvfat: add constants for special values of name[0] 

Signed-off-by: Hervé Poussineau <hpoussin@reactos.org>
Signed-off-by: Kevin Wolf <kwolf@redhat.com>
This commit is contained in:
Hervé Poussineau 2017-07-15 15:28:38 +02:00 committed by Kevin Wolf
parent 208c38e4e4
commit 8c4517fd6e
1 changed files with 11 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
block/vvfat.c
View File

@ -71,6 +71,11 @@ void nonono(const char* file, int line, const char* msg) {
#endif #endif
#define DIR_DELETED 0xe5
#define DIR_KANJI DIR_DELETED
#define DIR_KANJI_FAKE 0x05
#define DIR_FREE 0x00
/* dynamic array functions */ /* dynamic array functions */
typedef struct array_t { typedef struct array_t {
char* pointer; char* pointer;
@ -466,7 +471,7 @@ static direntry_t *create_long_filename(BDRVVVFATState *s, const char *filename)
static char is_free(const direntry_t* direntry) static char is_free(const direntry_t* direntry)
{ {
return direntry->name[0]==0xe5 || direntry->name[0]==0x00; return direntry->name[0] == DIR_DELETED || direntry->name[0] == DIR_FREE;
} }
static char is_volume_label(const direntry_t* direntry) static char is_volume_label(const direntry_t* direntry)
@ -487,7 +492,7 @@ static char is_short_name(const direntry_t* direntry)
static char is_directory(const direntry_t* direntry) static char is_directory(const direntry_t* direntry)
{ {
return direntry->attributes & 0x10 && direntry->name[0] != 0xe5; return direntry->attributes & 0x10 && direntry->name[0] != DIR_DELETED;
} }
static inline char is_dot(const direntry_t* direntry) static inline char is_dot(const direntry_t* direntry)
@ -589,8 +594,8 @@ static direntry_t *create_short_filename(BDRVVVFATState *s,
} }
} }
if (entry->name[0] == 0xe5) { if (entry->name[0] == DIR_KANJI) {
entry->name[0] = 0x05; entry->name[0] = DIR_KANJI_FAKE;
} }
/* numeric-tail generation */ /* numeric-tail generation */
@ -1748,8 +1753,8 @@ static int parse_short_name(BDRVVVFATState* s,
} else } else
lfn->name[i + j + 1] = '\0'; lfn->name[i + j + 1] = '\0';
if (lfn->name[0] == 0x05) { if (lfn->name[0] == DIR_KANJI_FAKE) {
lfn->name[0] = 0xe5; lfn->name[0] = DIR_KANJI;
} }
lfn->len = strlen((char*)lfn->name); lfn->len = strlen((char*)lfn->name);