nerd/rufus
1
1
Fork 0
mirror of https://github.com/pbatard/rufus.git synced 2024-08-14 23:57:05 +00:00
Code Issues 1 Projects Releases Wiki Activity

[ext2fs] return a more explicit error on directory corruption

Browse source
This commit is contained in:
Pete Batard 2022-05-14 10:19:36 +02:00
parent 4cdbad283a
commit 1dcfd69dee
No known key found for this signature in database
GPG key ID: 38E0CF5E69EDD671
2 changed files with 7 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

5
src/format_ext.c
View file

@ -406,14 +406,14 @@ BOOL FormatExtFs(DWORD DriveIndex, uint64_t PartitionOffset, DWORD BlockSize, LP
// Create root and lost+found dirs // Create root and lost+found dirs
r = ext2fs_mkdir(ext2fs, EXT2_ROOT_INO, EXT2_ROOT_INO, 0); r = ext2fs_mkdir(ext2fs, EXT2_ROOT_INO, EXT2_ROOT_INO, 0);
if (r != 0) { if (r != 0) {
SET_EXT2_FORMAT_ERROR(ERROR_DIR_NOT_ROOT); SET_EXT2_FORMAT_ERROR(ERROR_FILE_CORRUPT);
uprintf("Failed to create %s root dir: %s", FSName, error_message(r)); uprintf("Failed to create %s root dir: %s", FSName, error_message(r));
goto out; goto out;
} }
ext2fs->umask = 077; ext2fs->umask = 077;
r = ext2fs_mkdir(ext2fs, EXT2_ROOT_INO, 0, "lost+found"); r = ext2fs_mkdir(ext2fs, EXT2_ROOT_INO, 0, "lost+found");
if (r != 0) { if (r != 0) {
SET_EXT2_FORMAT_ERROR(ERROR_DIR_NOT_ROOT); SET_EXT2_FORMAT_ERROR(ERROR_FILE_CORRUPT);
uprintf("Failed to create %s 'lost+found' dir: %s", FSName, error_message(r)); uprintf("Failed to create %s 'lost+found' dir: %s", FSName, error_message(r));
goto out; goto out;
} }
@ -491,7 +491,6 @@ BOOL FormatExtFs(DWORD DriveIndex, uint64_t PartitionOffset, DWORD BlockSize, LP
goto out; goto out;
} }
UpdateProgressWithInfo(OP_FORMAT, MSG_217, 100, 100); UpdateProgressWithInfo(OP_FORMAT, MSG_217, 100, 100);
uprintf("Done");
ret = TRUE; ret = TRUE;
out: out:

10
src/rufus.rc
View file

@ -33,7 +33,7 @@ LANGUAGE LANG_NEUTRAL, SUBLANG_NEUTRAL
IDD_DIALOG DIALOGEX 12, 12, 232, 326 IDD_DIALOG DIALOGEX 12, 12, 232, 326
STYLE DS_SETFONT | DS_MODALFRAME | DS_CENTER | WS_MINIMIZEBOX | WS_POPUP | WS_CAPTION | WS_SYSMENU STYLE DS_SETFONT | DS_MODALFRAME | DS_CENTER | WS_MINIMIZEBOX | WS_POPUP | WS_CAPTION | WS_SYSMENU
EXSTYLE WS_EX_ACCEPTFILES EXSTYLE WS_EX_ACCEPTFILES
CAPTION "Rufus 3.19.1889" CAPTION "Rufus 3.19.1890"
FONT 9, "Segoe UI Symbol", 400, 0, 0x0 FONT 9, "Segoe UI Symbol", 400, 0, 0x0
BEGIN BEGIN
LTEXT "Drive Properties",IDS_DRIVE_PROPERTIES_TXT,8,6,53,12,NOT WS_GROUP LTEXT "Drive Properties",IDS_DRIVE_PROPERTIES_TXT,8,6,53,12,NOT WS_GROUP
@ -395,8 +395,8 @@ END
// //
VS_VERSION_INFO VERSIONINFO VS_VERSION_INFO VERSIONINFO
FILEVERSION 3,19,1889,0 FILEVERSION 3,19,1890,0
PRODUCTVERSION 3,19,1889,0 PRODUCTVERSION 3,19,1890,0
FILEFLAGSMASK 0x3fL FILEFLAGSMASK 0x3fL
#ifdef _DEBUG #ifdef _DEBUG
FILEFLAGS 0x1L FILEFLAGS 0x1L
@ -414,13 +414,13 @@ BEGIN
VALUE "Comments", "https://rufus.ie" VALUE "Comments", "https://rufus.ie"
VALUE "CompanyName", "Akeo Consulting" VALUE "CompanyName", "Akeo Consulting"
VALUE "FileDescription", "Rufus" VALUE "FileDescription", "Rufus"
VALUE "FileVersion", "3.19.1889" VALUE "FileVersion", "3.19.1890"
VALUE "InternalName", "Rufus" VALUE "InternalName", "Rufus"
VALUE "LegalCopyright", "© 2011-2022 Pete Batard (GPL v3)" VALUE "LegalCopyright", "© 2011-2022 Pete Batard (GPL v3)"
VALUE "LegalTrademarks", "https://www.gnu.org/licenses/gpl-3.0.html" VALUE "LegalTrademarks", "https://www.gnu.org/licenses/gpl-3.0.html"
VALUE "OriginalFilename", "rufus-3.19.exe" VALUE "OriginalFilename", "rufus-3.19.exe"
VALUE "ProductName", "Rufus" VALUE "ProductName", "Rufus"
VALUE "ProductVersion", "3.19.1889" VALUE "ProductVersion", "3.19.1890"
END END
END END
BLOCK "VarFileInfo" BLOCK "VarFileInfo"