diff mbox

[v2,12/13] vvfat: handle KANJI lead byte 0xe5

Message ID 20170522211205.14265-13-hpoussin@reactos.org (mailing list archive)
State New, archived
Headers show

Commit Message

Hervé Poussineau May 22, 2017, 9:12 p.m. UTC 
Specification: "FAT: General overview of on-disk format" v1.03, page 23
Signed-off-by: Hervé Poussineau <hpoussin@reactos.org>
---
 block/vvfat.c | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

Comments

Philippe Mathieu-Daudé May 24, 2017, 4:20 a.m. UTC | #1 
Hi Hervé,

You explained in the cover "fix problems detected by disk checking 
utilities in read-only mode", do you think it would be doable to have 
unit-tests for those corner cases?

On 05/22/2017 06:12 PM, Hervé Poussineau wrote:
> Specification: "FAT: General overview of on-disk format" v1.03, page 23
> Signed-off-by: Hervé Poussineau <hpoussin@reactos.org>
> ---
>  block/vvfat.c | 9 +++++++--
>  1 file changed, 7 insertions(+), 2 deletions(-)
>
> diff --git a/block/vvfat.c b/block/vvfat.c
> index 5376659010..53e8faa54c 100644
> --- a/block/vvfat.c
> +++ b/block/vvfat.c
> @@ -590,6 +590,10 @@ static direntry_t *create_short_filename(BDRVVVFATState *s,
>          }
>      }
>
> +    if (entry->name[0] == 0xe5) {

This deserves a comment, and a #define would also be welcomed.

> +        entry->name[0] = 0x05;
> +    }
> +
>      /* numeric-tail generation */
>      for (j = 0; j < 8; j++) {
>          if (entry->name[j] == ' ') {
> @@ -710,8 +714,6 @@ static inline void init_fat(BDRVVVFATState* s)
>
>  }
>
> -/* TODO: in create_short_filename, 0xe5->0x05 is not yet handled! */
> -/* TODO: in parse_short_filename, 0x05->0xe5 is not yet handled! */
>  static inline direntry_t* create_short_and_long_name(BDRVVVFATState* s,
>          unsigned int directory_start, const char* filename, int is_dot)
>  {
> @@ -1744,6 +1746,9 @@ static int parse_short_name(BDRVVVFATState* s,
>      } else
>          lfn->name[i + j + 1] = '\0';
>
> +    if (lfn->name[0] == 0x05) {
> +        lfn->name[0] = 0xe5;
> +    }
>      lfn->len = strlen((char*)lfn->name);
>
>      return 0;
>
diff mbox

Patch

diff --git a/block/vvfat.c b/block/vvfat.c
index 5376659010..53e8faa54c 100644
--- a/block/vvfat.c
+++ b/block/vvfat.c
@@ -590,6 +590,10 @@  static direntry_t *create_short_filename(BDRVVVFATState *s,
         }
     }
 
+    if (entry->name[0] == 0xe5) {
+        entry->name[0] = 0x05;
+    }
+
     /* numeric-tail generation */
     for (j = 0; j < 8; j++) {
         if (entry->name[j] == ' ') {
@@ -710,8 +714,6 @@  static inline void init_fat(BDRVVVFATState* s)
 
 }
 
-/* TODO: in create_short_filename, 0xe5->0x05 is not yet handled! */
-/* TODO: in parse_short_filename, 0x05->0xe5 is not yet handled! */
 static inline direntry_t* create_short_and_long_name(BDRVVVFATState* s,
         unsigned int directory_start, const char* filename, int is_dot)
 {
@@ -1744,6 +1746,9 @@  static int parse_short_name(BDRVVVFATState* s,
     } else
         lfn->name[i + j + 1] = '\0';
 
+    if (lfn->name[0] == 0x05) {
+        lfn->name[0] = 0xe5;
+    }
     lfn->len = strlen((char*)lfn->name);
 
     return 0;