mirrors/rufus
1
0
Fork 0
mirror of https://github.com/pbatard/rufus.git synced 2025-05-19 09:25:12 -04:00
Code Issues Projects Releases Packages Wiki Activity

[iso] fix processing of openSUSE Leap ISOs

Browse source 
* Looks like the openSUSE people are abusing the ISO9660 file system,
  and libcdio should be a bit more relaxed about it.
  So we alter libcdio to be more chill...
* Also relax the annoying 'from_733: broken byte order' messages
* Closes #1136
This commit is contained in:
Pete Batard 2018-05-26 14:40:52 +01:00
parent c43c49eb17
commit 31d1b396c7
4 changed files with 10 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

3
src/libcdio/cdio/bytesex.h
View file

@ -211,7 +211,8 @@ static CDIO_INLINE uint32_t
from_733_with_err (uint64_t p, bool *err) from_733_with_err (uint64_t p, bool *err)
{ {
if (uint64_swap_le_be (p) != p) { if (uint64_swap_le_be (p) != p) {
cdio_warn ("from_733: broken byte order"); // Commented out for Rufus
// cdio_warn ("from_733: broken byte order");
*err = true; *err = true;
} else { } else {
*err = false; *err = false;

2
src/libcdio/cdio/version.h
View file

@ -7,7 +7,7 @@
/*! CDIO_VERSION is a C-Preprocessor macro of a string that shows what /*! CDIO_VERSION is a C-Preprocessor macro of a string that shows what
version is used. cdio_version_string has the same value, but it is a version is used. cdio_version_string has the same value, but it is a
constant variable that can be accessed at run time. */ constant variable that can be accessed at run time. */
#define CDIO_VERSION "0.94 i686-w64-mingw32" #define CDIO_VERSION "0.94 (Rufus)"
extern const char *cdio_version_string; /**< = CDIO_VERSION */ extern const char *cdio_version_string; /**< = CDIO_VERSION */
/*! LIBCDIO_VERSION_NUM is a C-Preprocessor macro that can be used for /*! LIBCDIO_VERSION_NUM is a C-Preprocessor macro that can be used for

4
src/libcdio/iso9660/iso9660_fs.c
View file

@ -1123,8 +1123,8 @@ _fs_iso_stat_traverse (iso9660_t *p_iso, const iso9660_stat_t *_root,
if (!p_stat) { if (!p_stat) {
cdio_warn("Bad directory information for %s", splitpath[0]); cdio_warn("Bad directory information for %s", splitpath[0]);
free(_dirbuf); // Patched for Rufus - Don't bail out on this
return NULL; continue;
} }
/* If we have multiextent file parts, loop until the last one */ /* If we have multiextent file parts, loop until the last one */

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.0.1297" CAPTION "Rufus 3.0.1298"
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
@ -389,8 +389,8 @@ END
// //
VS_VERSION_INFO VERSIONINFO VS_VERSION_INFO VERSIONINFO
FILEVERSION 3,0,1297,0 FILEVERSION 3,0,1298,0
PRODUCTVERSION 3,0,1297,0 PRODUCTVERSION 3,0,1298,0
FILEFLAGSMASK 0x3fL FILEFLAGSMASK 0x3fL
#ifdef _DEBUG #ifdef _DEBUG
FILEFLAGS 0x1L FILEFLAGS 0x1L
@ -407,13 +407,13 @@ BEGIN
BEGIN BEGIN
VALUE "CompanyName", "Akeo Consulting (http://akeo.ie)" VALUE "CompanyName", "Akeo Consulting (http://akeo.ie)"
VALUE "FileDescription", "Rufus" VALUE "FileDescription", "Rufus"
VALUE "FileVersion", "3.0.1297" VALUE "FileVersion", "3.0.1298"
VALUE "InternalName", "Rufus" VALUE "InternalName", "Rufus"
VALUE "LegalCopyright", "© 2011-2018 Pete Batard (GPL v3)" VALUE "LegalCopyright", "© 2011-2018 Pete Batard (GPL v3)"
VALUE "LegalTrademarks", "http://www.gnu.org/copyleft/gpl.html" VALUE "LegalTrademarks", "http://www.gnu.org/copyleft/gpl.html"
VALUE "OriginalFilename", "rufus.exe" VALUE "OriginalFilename", "rufus.exe"
VALUE "ProductName", "Rufus" VALUE "ProductName", "Rufus"
VALUE "ProductVersion", "3.0.1297" VALUE "ProductVersion", "3.0.1298"
END END
END END
BLOCK "VarFileInfo" BLOCK "VarFileInfo"