From 3133513f11c4ecec33b460ed701479858479a6a3 Mon Sep 17 00:00:00 2001 From: Pete Batard Date: Thu, 19 Jan 2012 13:51:55 +0000 Subject: [PATCH] [iso] add udf extraction of image files --- src/iso.c | 118 ++++++++++++++++++++++++++++++++++++++------------- src/rufus.rc | 12 +++--- 2 files changed, 94 insertions(+), 36 deletions(-) diff --git a/src/iso.c b/src/iso.c index 6375ea4a..f0e8f07a 100644 --- a/src/iso.c +++ b/src/iso.c @@ -56,6 +56,10 @@ CdIo_t* cdio_open (const char *psz_source, driver_id_t driver_id) {return NULL;} void cdio_destroy (CdIo_t *p_cdio) {} +const char* extract_dir = "D:/tmp/iso"; + +// TODO: Unicode support, timestamp preservation + static void udf_print_file_info(const udf_dirent_t *p_udf_dirent, const char* psz_dirname) { time_t mod_time = udf_get_modification_time(p_udf_dirent); @@ -70,32 +74,87 @@ static void udf_print_file_info(const udf_dirent_t *p_udf_dirent, const char* ps static void udf_list_files(udf_t *p_udf, udf_dirent_t *p_udf_dirent, const char *psz_path) { - if (!p_udf_dirent) + FILE *fd = NULL; + int len; + char* fullpath; + const char* basename; + udf_dirent_t *p_udf_dirent2; + uint64_t i, file_len, i_blocks; + uint8_t buf[UDF_BLOCKSIZE]; + ssize_t i_read; + + if ((p_udf_dirent == NULL) || (psz_path == NULL)) return; - udf_print_file_info(p_udf_dirent, psz_path); + +// udf_print_file_info(p_udf_dirent, psz_path); while (udf_readdir(p_udf_dirent)) { + basename = udf_get_filename(p_udf_dirent); + len = 3 + strlen(psz_path) + strlen(basename) + strlen(extract_dir); + fullpath = (char*)calloc(sizeof(char), len); + len = _snprintf(fullpath, len, "%s%s/%s", extract_dir, psz_path, basename); + if (len < 0) { + goto err; + } +uprintf("FULLPATH: %s\n", fullpath); if (udf_is_dir(p_udf_dirent)) { - udf_dirent_t *p_udf_dirent2 = udf_opendir(p_udf_dirent); - if (p_udf_dirent2) { - const char *psz_dirname = udf_get_filename(p_udf_dirent); - const unsigned int i_newlen = 2 + strlen(psz_path) + strlen(psz_dirname); - char* psz_newpath = (char*)calloc(sizeof(char), i_newlen); - _snprintf(psz_newpath, i_newlen, "%s%s/", psz_path, psz_dirname); - udf_list_files(p_udf, p_udf_dirent2, psz_newpath); - free(psz_newpath); + _mkdir(fullpath); + p_udf_dirent2 = udf_opendir(p_udf_dirent); + if (p_udf_dirent2 != NULL) { + udf_list_files(p_udf, p_udf_dirent2, &fullpath[strlen(extract_dir)]); + } else { +// printf("do we have problem?\n"); } } else { - udf_print_file_info(p_udf_dirent, NULL); - } - } -} + fd = fopen(fullpath, "wb"); + if (fd == NULL) { + uprintf("Unable to create file %s\n", fullpath); + goto err; + } + file_len = udf_get_file_length(p_udf_dirent); +//uprintf("file len = %d\n", file_len); + i_blocks = CEILING(file_len, UDF_BLOCKSIZE); +//uprintf("i_blocks = %d\n", i_blocks); + for (i=0; ifilename, ".") == 0) || (strcmp(p_statbuf->filename, "..") == 0) ) continue; // Eliminate . and .. entries - iso9660_name_translate(p_statbuf->filename, p); + iso9660_name_translate(p_statbuf->filename, basename); uprintf("%s [LSN %6d] %8u %s\n", (p_statbuf->type == _STAT_DIR)?"d":"-", p_statbuf->lsn, p_statbuf->size, filename); if (p_statbuf->type == _STAT_DIR) { - // TODO: Joliet and Unicode support _mkdir(filename); iso_list_files(p_iso, iso_filename); } else { @@ -159,9 +215,12 @@ static void iso_list_files(iso9660_t* p_iso, const char *psz_path) goto out; } fclose(fd); + fd = NULL; } } out: + if (fd != NULL) + fclose(fd); _cdio_list_free(p_entlist, true); } @@ -171,7 +230,6 @@ BOOL ExtractISO(const char* src_iso, const char* dest_dir) iso9660_t* p_iso = NULL; udf_t* p_udf = NULL; udf_dirent_t* p_udf_root; -// udf_dirent_t* p_udf_file = NULL; char *psz_str = NULL; char vol_id[UDF_VOLID_SIZE] = ""; char volset_id[UDF_VOLSET_ID_SIZE+1] = ""; @@ -279,9 +337,9 @@ out: int main(int argc, char** argv) { // ExtractISO("D:\\Incoming\\GRMSDKX_EN_DVD.iso", NULL); - ExtractISO("D:\\fd11src.iso", NULL); +// ExtractISO("D:\\fd11src.iso", NULL); // ExtractISO("D:\\Incoming\\en_windows_driver_kit_3790.iso", NULL); -// ExtractISO("D:\\Incoming\\en_windows_7_ultimate_with_sp1_x64_dvd_618240.iso", NULL); + ExtractISO("D:\\Incoming\\en_windows_7_ultimate_with_sp1_x64_dvd_618240.iso", NULL); // ExtractISO("D:\\Incoming\\Windows 8 Preview\\WindowsDeveloperPreview-64bit-English-Developer.iso", NULL); #ifdef _CRTDBG_MAP_ALLOC diff --git a/src/rufus.rc b/src/rufus.rc index 1f405c2c..da22d271 100644 --- a/src/rufus.rc +++ b/src/rufus.rc @@ -33,7 +33,7 @@ LANGUAGE LANG_ENGLISH, SUBLANG_NEUTRAL IDD_DIALOG DIALOGEX 12, 12, 206, 278 STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | WS_POPUP | WS_CAPTION | WS_SYSMENU EXSTYLE WS_EX_APPWINDOW -CAPTION "Rufus v1.0.7.139" +CAPTION "Rufus v1.0.7.140" FONT 8, "MS Shell Dlg", 400, 0, 0x1 BEGIN DEFPUSHBUTTON "Start",IDC_START,94,236,50,14 @@ -70,7 +70,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.0.7 (Build 139)",IDC_STATIC,46,19,78,8 + LTEXT "Version 1.0.7 (Build 140)",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 @@ -208,8 +208,8 @@ END // VS_VERSION_INFO VERSIONINFO - FILEVERSION 1,0,7,139 - PRODUCTVERSION 1,0,7,139 + FILEVERSION 1,0,7,140 + PRODUCTVERSION 1,0,7,140 FILEFLAGSMASK 0x3fL #ifdef _DEBUG FILEFLAGS 0x1L @@ -226,13 +226,13 @@ BEGIN BEGIN VALUE "CompanyName", "akeo.ie" VALUE "FileDescription", "Rufus" - VALUE "FileVersion", "1.0.7.139" + VALUE "FileVersion", "1.0.7.140" 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.0.7.139" + VALUE "ProductVersion", "1.0.7.140" END END BLOCK "VarFileInfo"