From 261834e31f14572c5fb4097cb920b069de21a490 Mon Sep 17 00:00:00 2001 From: Pete Batard Date: Thu, 16 Aug 2012 01:55:08 +0100 Subject: [PATCH] [iso] relax ISO-9660 compliance * Due to Arch Linux (archlinux-2012.08.04-dual.iso) - See #90 * It is still possible that this patch will have unwanted effect for ISO-9660 compliant images... --- src/libcdio/iso9660/iso9660.c | 5 +++-- src/rufus.rc | 12 ++++++------ 2 files changed, 9 insertions(+), 8 deletions(-) diff --git a/src/libcdio/iso9660/iso9660.c b/src/libcdio/iso9660/iso9660.c index fd589d6d..60d42cc7 100644 --- a/src/libcdio/iso9660/iso9660.c +++ b/src/libcdio/iso9660/iso9660.c @@ -446,8 +446,9 @@ iso9660_name_translate_ext(const char *psz_oldname, char *psz_newname, if (!c) break; - /* Lower case, unless we have Joliet extensions. */ - if (!i_joliet_level && isupper(c)) c = tolower(c); + /* We're supposed to lower the case when Joliet extensions are not in use + * but some images fail if we do that. I'm looking at you Arch Linux!!! */ + /* if (!i_joliet_level && isupper(c)) c = tolower(c); */ /* Drop trailing '.;1' (ISO 9660:1988 7.5.1 requires period) */ if (c == '.' && i == len - 3 diff --git a/src/rufus.rc b/src/rufus.rc index ecfa22d8..d6001cae 100644 --- a/src/rufus.rc +++ b/src/rufus.rc @@ -30,7 +30,7 @@ LANGUAGE LANG_ENGLISH, SUBLANG_NEUTRAL IDD_DIALOG DIALOGEX 12, 12, 206, 316 STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | DS_CENTER | WS_POPUP | WS_CAPTION | WS_SYSMENU EXSTYLE WS_EX_APPWINDOW -CAPTION "Rufus v1.2.0.183" +CAPTION "Rufus v1.2.0.184" FONT 8, "MS Shell Dlg", 400, 0, 0x1 BEGIN DEFPUSHBUTTON "Start",IDC_START,94,278,50,14 @@ -77,7 +77,7 @@ BEGIN DEFPUSHBUTTON "OK",IDOK,231,175,50,14,WS_GROUP CONTROL "http://rufus.akeo.ie",IDC_ABOUT_RUFUS_URL, "SysLink",WS_TABSTOP,46,47,114,9 - LTEXT "Version 1.2.0 (Build 183)",IDC_STATIC,46,19,78,8 + LTEXT "Version 1.2.0 (Build 184)",IDC_STATIC,46,19,78,8 PUSHBUTTON "License...",IDC_ABOUT_LICENSE,46,175,50,14,WS_GROUP EDITTEXT IDC_ABOUT_COPYRIGHTS,46,107,235,63,ES_MULTILINE | ES_READONLY | WS_VSCROLL LTEXT "Report bugs or request enhancements at:",IDC_STATIC,46,66,187,8 @@ -237,8 +237,8 @@ END // VS_VERSION_INFO VERSIONINFO - FILEVERSION 1,2,0,183 - PRODUCTVERSION 1,2,0,183 + FILEVERSION 1,2,0,184 + PRODUCTVERSION 1,2,0,184 FILEFLAGSMASK 0x3fL #ifdef _DEBUG FILEFLAGS 0x1L @@ -255,13 +255,13 @@ BEGIN BEGIN VALUE "CompanyName", "akeo.ie" VALUE "FileDescription", "Rufus" - VALUE "FileVersion", "1.2.0.183" + VALUE "FileVersion", "1.2.0.184" VALUE "InternalName", "Rufus" VALUE "LegalCopyright", "© 2011 Pete Batard (GPL v3)" VALUE "LegalTrademarks", "http://www.gnu.org/copyleft/gpl.html" VALUE "OriginalFilename", "rufus.exe" VALUE "ProductName", "Rufus" - VALUE "ProductVersion", "1.2.0.183" + VALUE "ProductVersion", "1.2.0.184" END END BLOCK "VarFileInfo"