[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-block] [PATCH 07/13] vvfat: always create . and .. entries at firs
From: |
Hervé Poussineau |
Subject: |
[Qemu-block] [PATCH 07/13] vvfat: always create . and .. entries at first and in that order |
Date: |
Mon, 15 May 2017 22:31:07 +0200 |
readdir() doesn't always return . and .. entries at first and in that order.
This leads to not creating them at first in the directory, which raises some
errors on file system checking utilities like MS-DOS Scandisk.
Specification: "FAT: General overview of on-disk format" v1.03, page 25
Fixes: https://bugs.launchpad.net/qemu/+bug/1599539
Signed-off-by: Hervé Poussineau <address@hidden>
---
block/vvfat.c | 13 +++++++++++--
1 file changed, 11 insertions(+), 2 deletions(-)
diff --git a/block/vvfat.c b/block/vvfat.c
index 348cffe1c4..7da07068b8 100644
--- a/block/vvfat.c
+++ b/block/vvfat.c
@@ -721,6 +721,12 @@ static int read_directory(BDRVVVFATState* s, int
mapping_index)
i = mapping->info.dir.first_dir_index =
first_cluster == 0 ? 0 : s->directory.next;
+ if (first_cluster != 0) {
+ /* create the top entries of a subdirectory */
+ (void)create_short_and_long_name(s, i, ".", 1);
+ (void)create_short_and_long_name(s, i, "..", 1);
+ }
+
/* actually read the directory, and allocate the mappings */
while((entry=readdir(dir))) {
unsigned int length=strlen(dirname)+2+strlen(entry->d_name);
@@ -742,8 +748,11 @@ static int read_directory(BDRVVVFATState* s, int
mapping_index)
}
/* create directory entry for this file */
- direntry=create_short_and_long_name(s, i, entry->d_name,
- is_dot || is_dotdot);
+ if (!is_dot && !is_dotdot) {
+ direntry = create_short_and_long_name(s, i, entry->d_name, 0);
+ } else {
+ direntry = array_get(&(s->directory), is_dot ? i : i + 1);
+ }
direntry->attributes=(S_ISDIR(st.st_mode)?0x10:0x20);
direntry->reserved[0]=direntry->reserved[1]=0;
direntry->ctime=fat_datetime(st.st_ctime,1);
--
2.11.0
- [Qemu-block] [PATCH 00/13] vvfat: misc fixes for read-only mode, Hervé Poussineau, 2017/05/15
- [Qemu-block] [PATCH 06/13] vvfat: fix field names in FAT12/FAT16 boot sector, Hervé Poussineau, 2017/05/15
- [Qemu-block] [PATCH 03/13] vvfat: fix typos, Hervé Poussineau, 2017/05/15
- [Qemu-block] [PATCH 04/13] vvfat: rename useless enumeration values, Hervé Poussineau, 2017/05/15
- [Qemu-block] [PATCH 07/13] vvfat: always create . and .. entries at first and in that order,
Hervé Poussineau <=
- [Qemu-block] [PATCH 09/13] vvfat: correctly create base short names for non-ASCII filenames, Hervé Poussineau, 2017/05/15
- [Qemu-block] [PATCH 12/13] vvfat: handle KANJI lead byte 0xe5, Hervé Poussineau, 2017/05/15
- [Qemu-block] [PATCH 08/13] vvfat: correctly create long names for non-ASCII filenames, Hervé Poussineau, 2017/05/15
- [Qemu-block] [PATCH 13/13] vvfat: change OEM name to 'MSWIN4.1', Hervé Poussineau, 2017/05/15
- [Qemu-block] [PATCH 11/13] vvfat: limit number of entries in root directory in FAT12/FAT16, Hervé Poussineau, 2017/05/15
- [Qemu-block] [PATCH 10/13] vvfat: correctly generate numeric-tail of short file names, Hervé Poussineau, 2017/05/15
- [Qemu-block] [PATCH 05/13] vvfat: introduce offset_to_bootsector, offset_to_fat and offset_to_root_dir, Hervé Poussineau, 2017/05/15