[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-block] [PATCH v2 07/13] vvfat: always create . and .. entries at f
From: |
Hervé Poussineau |
Subject: |
[Qemu-block] [PATCH v2 07/13] vvfat: always create . and .. entries at first and in that order |
Date: |
Mon, 22 May 2017 23:11:59 +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 c1034cdd1f..d4664c531b 100644
--- a/block/vvfat.c
+++ b/block/vvfat.c
@@ -728,6 +728,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);
@@ -749,8 +755,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 v2 13/13] vvfat: change OEM name to 'MSWIN4.1', (continued)
- [Qemu-block] [PATCH v2 09/13] vvfat: correctly create base short names for non-ASCII filenames, Hervé Poussineau, 2017/05/22
- [Qemu-block] [PATCH v2 11/13] vvfat: limit number of entries in root directory in FAT12/FAT16, Hervé Poussineau, 2017/05/22
- [Qemu-block] [PATCH v2 01/13] vvfat: fix qemu-img map and qemu-img convert, Hervé Poussineau, 2017/05/22
- [Qemu-block] [PATCH v2 07/13] vvfat: always create . and .. entries at first and in that order,
Hervé Poussineau <=
- [Qemu-block] [PATCH v2 03/13] vvfat: fix typos, Hervé Poussineau, 2017/05/22
- [Qemu-block] [PATCH v2 10/13] vvfat: correctly generate numeric-tail of short file names, Hervé Poussineau, 2017/05/22
- [Qemu-block] [PATCH v2 04/13] vvfat: rename useless enumeration values, Hervé Poussineau, 2017/05/22
- [Qemu-block] [PATCH v2 02/13] vvfat: replace tabs by 8 spaces, Hervé Poussineau, 2017/05/22
- Re: [Qemu-block] [Qemu-devel] [PATCH v2 00/13] vvfat: misc fixes for read-only mode, no-reply, 2017/05/22