nerd
/
rufus
mirror of https://github.com/pbatard/rufus.git
1
1
Fork 0
Code Issues 1 Projects Releases Wiki Activity

[iso] add work around for ISOs that use nonstandard Rock Ridge extensions 

* Looking at you Kali Linux!
* Also silence the annoying 'from_733: broken byte order' warning
This commit is contained in:
Pete Batard 2017-07-21 13:11:44 +01:00
parent f1aeb63267
commit 39e418fbe9
3 changed files with 11 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/libcdio/cdio/bytesex.h
View File

@ -200,8 +200,9 @@ to_733(uint32_t i)
static CDIO_INLINE uint32_t
from_733 (uint64_t p)
{
if (uint64_swap_le_be (p) != p)
cdio_warn ("from_733: broken byte order");
// Commented out for Rufus
// if (uint64_swap_le_be (p) != p)
// cdio_warn ("from_733: broken byte order");
return (UINT32_C(0xFFFFFFFF) & p);
}

4
src/libcdio/iso9660/rock.c
View File

@ -182,9 +182,11 @@ get_rock_ridge_filename(iso9660_dir_t * p_iso9660_dir,
case SIG('P','L'):
case SIG('T','F'):
case SIG('Z','F'):
case SIG('A','L'): // Kali Linux *NONSTANDARD* extension
break;
default:
/* Something got screwed up here */
/* Warn about other nonstandard Rock Ridge extensions */
cdio_warn("Invalid Rock Ridge extension detected: '%c%c'\n", *chr, *(chr+1));
goto out;
}

10
src/rufus.rc
View File

@ -33,7 +33,7 @@ LANGUAGE LANG_NEUTRAL, SUBLANG_NEUTRAL
IDD_DIALOG DIALOGEX 12, 12, 242, 376
STYLE DS_SETFONT | DS_MODALFRAME | DS_CENTER | WS_MINIMIZEBOX | WS_POPUP | WS_CAPTION | WS_SYSMENU
EXSTYLE WS_EX_ACCEPTFILES
CAPTION "Rufus 2.16.1147"
CAPTION "Rufus 2.16.1148"
FONT 8, "Segoe UI Symbol", 400, 0, 0x0
BEGIN
LTEXT "Device",IDS_DEVICE_TXT,9,6,200,8
@ -366,8 +366,8 @@ END
//
VS_VERSION_INFO VERSIONINFO
FILEVERSION 2,16,1147,0
PRODUCTVERSION 2,16,1147,0
FILEVERSION 2,16,1148,0
PRODUCTVERSION 2,16,1148,0
FILEFLAGSMASK 0x3fL
#ifdef _DEBUG
FILEFLAGS 0x1L
@ -384,13 +384,13 @@ BEGIN
BEGIN
VALUE "CompanyName", "Akeo Consulting (http://akeo.ie)"
VALUE "FileDescription", "Rufus"
VALUE "FileVersion", "2.16.1147"
VALUE "FileVersion", "2.16.1148"
VALUE "InternalName", "Rufus"
VALUE "LegalCopyright", "© 2011-2017 Pete Batard (GPL v3)"
VALUE "LegalTrademarks", "http://www.gnu.org/copyleft/gpl.html"
VALUE "OriginalFilename", "rufus.exe"
VALUE "ProductName", "Rufus"
VALUE "ProductVersion", "2.16.1147"
VALUE "ProductVersion", "2.16.1148"
END
END
BLOCK "VarFileInfo"