mirrors/rufus
1
0
Fork 0
mirror of https://github.com/pbatard/rufus.git synced 2025-05-31 14:58:26 -04:00
Code Issues Projects Releases Packages Wiki Activity

[misc] fix a potential WinPE 1.0 bug and improve ISO labels

Browse source 
* WinPE 1.x patch used rdisk(!) instead of rdisk(1)
* Remove trailing spaces on ISO labels
* Remove unnecessary comment during format
This commit is contained in:
Pete Batard 2012-05-31 00:49:28 +01:00
parent fd55a4ef0f
commit 94851dec7d
3 changed files with 12 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

6
src/iso.c
View file

@ -374,6 +374,7 @@ out:
BOOL ExtractISO(const char* src_iso, const char* dest_dir, bool scan)
{
size_t i;
int j;
FILE* fd;
BOOL r = FALSE;
iso9660_t* p_iso = NULL;
@ -457,6 +458,9 @@ try_iso:
out:
iso_blocking_status = -1;
if (scan_only) {
// Remove trailing spaces from the label
for (j=safe_strlen(iso_report.label)-1; ((j>=0)&&(isspace(iso_report.label[j]))); j--)
iso_report.label[j] = 0;
// We use the fact that UDF_BLOCKSIZE and ISO_BLOCKSIZE are the same here
iso_report.projected_size = total_blocks * ISO_BLOCKSIZE;
// We will link the existing isolinux.cfg from a syslinux.cfg we create
@ -546,7 +550,6 @@ BOOL ExtractISOFile(const char* iso, const char* iso_file, const char* dest_file
p_udf = udf_open(iso);
if (p_udf == NULL)
goto try_iso;
uprintf("Disc image is an UDF image\n");
p_udf_root = udf_get_root(p_udf, true, 0);
if (p_udf_root == NULL) {
@ -583,7 +586,6 @@ try_iso:
uprintf("Unable to open image '%s'.\n", iso);
goto out;
}
uprintf("Disc image is an ISO9660 image\n");
p_statbuf = iso9660_ifs_stat_translate(p_iso, iso_file);
if (p_statbuf == NULL) {