nerd/rufus
1
1
Fork 0
mirror of https://github.com/pbatard/rufus.git synced 2024-08-14 23:57:05 +00:00
Code Issues 1 Projects Releases Wiki Activity

[iso] align with latest from libcdio-pbatard

Browse source
This commit is contained in:
Pete Batard 2012-01-30 00:05:05 +00:00
parent 84729a27bd
commit 5cba49453c
6 changed files with 43 additions and 43 deletions
Download patch file Download diff file Expand all files Collapse all files

8
src/libcdio/driver/_cdio_stdio.c
View file

@ -186,11 +186,11 @@ static ssize_t
_stdio_read(void *user_data, void *buf, size_t count) _stdio_read(void *user_data, void *buf, size_t count)
{ {
_UserData *const ud = user_data; _UserData *const ud = user_data;
long read; long read_count;
read = fread(buf, 1, count, ud->fd); read_count = fread(buf, 1, count, ud->fd);
if (read != count) if (read_count != count)
{ /* fixme -- ferror/feof */ { /* fixme -- ferror/feof */
if (feof (ud->fd)) if (feof (ud->fd))
{ {
@ -206,7 +206,7 @@ _stdio_read(void *user_data, void *buf, size_t count)
cdio_debug ("fread (): short read and no EOF?!?"); cdio_debug ("fread (): short read and no EOF?!?");
} }
return read; return read_count;
} }
/*! /*!

28
src/libcdio/iso9660/iso9660.c
View file

@ -301,7 +301,7 @@ iso9660_get_ltime (const iso9660_ltime_t *p_ldate,
*/ */
void void
iso9660_set_dtime_with_timezone (const struct tm *p_tm, iso9660_set_dtime_with_timezone (const struct tm *p_tm,
int timezone, int time_zone,
/*out*/ iso9660_dtime_t *p_idr_date) /*out*/ iso9660_dtime_t *p_idr_date)
{ {
memset (p_idr_date, 0, 7); memset (p_idr_date, 0, 7);
@ -317,7 +317,7 @@ iso9660_set_dtime_with_timezone (const struct tm *p_tm,
/* The ISO 9660 timezone is in the range -48..+52 and each unit /* The ISO 9660 timezone is in the range -48..+52 and each unit
represents a 15-minute interval. */ represents a 15-minute interval. */
p_idr_date->dt_gmtoff = timezone / 15; p_idr_date->dt_gmtoff = time_zone / 15;
if (p_idr_date->dt_gmtoff < -48 ) { if (p_idr_date->dt_gmtoff < -48 ) {
@ -337,14 +337,14 @@ iso9660_set_dtime_with_timezone (const struct tm *p_tm,
void void
iso9660_set_dtime (const struct tm *p_tm, /*out*/ iso9660_dtime_t *p_idr_date) iso9660_set_dtime (const struct tm *p_tm, /*out*/ iso9660_dtime_t *p_idr_date)
{ {
int timezone; int time_zone;
#ifdef HAVE_TM_GMTOFF #ifdef HAVE_TM_GMTOFF
/* Convert seconds to minutes */ /* Convert seconds to minutes */
timezone = p_tm->tm_gmtoff / 60; time_zone = p_tm->tm_gmtoff / 60;
#else #else
timezone = (p_tm->tm_isdst > 0) ? -60 : 0; time_zone = (p_tm->tm_isdst > 0) ? -60 : 0;
#endif #endif
iso9660_set_dtime_with_timezone (p_tm, timezone, p_idr_date); iso9660_set_dtime_with_timezone (p_tm, time_zone, p_idr_date);
} }
/*! /*!
@ -354,7 +354,7 @@ iso9660_set_dtime (const struct tm *p_tm, /*out*/ iso9660_dtime_t *p_idr_date)
*/ */
void void
iso9660_set_ltime_with_timezone (const struct tm *p_tm, iso9660_set_ltime_with_timezone (const struct tm *p_tm,
int timezone, int time_zone,
/*out*/ iso9660_ltime_t *pvd_date) /*out*/ iso9660_ltime_t *pvd_date)
{ {
char *_pvd_date = (char *) pvd_date; char *_pvd_date = (char *) pvd_date;
@ -371,7 +371,7 @@ iso9660_set_ltime_with_timezone (const struct tm *p_tm,
0 /* 1/100 secs */ ); 0 /* 1/100 secs */ );
/* Set time zone in 15-minute interval encoding. */ /* Set time zone in 15-minute interval encoding. */
pvd_date->lt_gmtoff -= (timezone / 15); pvd_date->lt_gmtoff -= (time_zone / 15);
if (pvd_date->lt_gmtoff < -48 ) { if (pvd_date->lt_gmtoff < -48 ) {
cdio_warn ("Converted ISO 9660 timezone %d is less than -48. Adjusted", cdio_warn ("Converted ISO 9660 timezone %d is less than -48. Adjusted",
@ -390,14 +390,14 @@ iso9660_set_ltime_with_timezone (const struct tm *p_tm,
void void
iso9660_set_ltime (const struct tm *p_tm, /*out*/ iso9660_ltime_t *pvd_date) iso9660_set_ltime (const struct tm *p_tm, /*out*/ iso9660_ltime_t *pvd_date)
{ {
int timezone; int time_zone;
#ifdef HAVE_TM_GMTOFF #ifdef HAVE_TM_GMTOFF
/* Set time zone in 15-minute interval encoding. */ /* Set time zone in 15-minute interval encoding. */
timezone = p_tm->tm_gmtoff / 60; time_zone = p_tm->tm_gmtoff / 60;
#else #else
timezone = (p_tm->tm_isdst > 0) ? -60 : 0; time_zone = (p_tm->tm_isdst > 0) ? -60 : 0;
#endif #endif
iso9660_set_ltime_with_timezone (p_tm, timezone, pvd_date); iso9660_set_ltime_with_timezone (p_tm, time_zone, pvd_date);
} }
/*! /*!
@ -1126,7 +1126,7 @@ iso9660_get_application_id(iso9660_pvd_t *p_pvd)
return strdup(strip_trail(p_pvd->application_id, ISO_MAX_APPLICATION_ID)); return strdup(strip_trail(p_pvd->application_id, ISO_MAX_APPLICATION_ID));
} }
#if FIXME #ifdef FIXME
lsn_t lsn_t
iso9660_get_dir_extent(const iso9660_dir_t *idr) iso9660_get_dir_extent(const iso9660_dir_t *idr)
{ {
@ -1142,7 +1142,7 @@ iso9660_get_dir_len(const iso9660_dir_t *idr)
return idr->length; return idr->length;
} }
#if FIXME #ifdef FIXME
uint8_t uint8_t
iso9660_get_dir_size(const iso9660_dir_t *idr) iso9660_get_dir_size(const iso9660_dir_t *idr)
{ {

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

@ -994,7 +994,7 @@ _fs_stat_traverse (const CdIo_t *p_cdio, const iso9660_stat_t *_root,
while (offset < (_root->secsize * ISO_BLOCKSIZE)) while (offset < (_root->secsize * ISO_BLOCKSIZE))
{ {
iso9660_dir_t *p_iso9660_dir = (void *) &_dirbuf[offset]; iso9660_dir_t *p_iso9660_dir = (void *) &_dirbuf[offset];
iso9660_stat_t *p_stat; iso9660_stat_t *p_iso9660_stat;
int cmp; int cmp;
if (!iso9660_get_dir_len(p_iso9660_dir)) if (!iso9660_get_dir_len(p_iso9660_dir))
@ -1003,25 +1003,25 @@ _fs_stat_traverse (const CdIo_t *p_cdio, const iso9660_stat_t *_root,
continue; continue;
} }
p_stat = _iso9660_dir_to_statbuf (p_iso9660_dir, dunno, p_iso9660_stat = _iso9660_dir_to_statbuf (p_iso9660_dir, dunno,
p_env->i_joliet_level); p_env->i_joliet_level);
cmp = strcmp(splitpath[0], p_stat->filename); cmp = strcmp(splitpath[0], p_iso9660_stat->filename);
if ( 0 != cmp && 0 == p_env->i_joliet_level if ( 0 != cmp && 0 == p_env->i_joliet_level
&& yep != p_stat->rr.b3_rock ) { && yep != p_iso9660_stat->rr.b3_rock ) {
char *trans_fname = NULL; char *trans_fname = NULL;
unsigned int i_trans_fname=strlen(p_stat->filename); unsigned int i_trans_fname=strlen(p_iso9660_stat->filename);
if (i_trans_fname) { if (i_trans_fname) {
trans_fname = calloc(1, i_trans_fname+1); trans_fname = calloc(1, i_trans_fname+1);
if (!trans_fname) { if (!trans_fname) {
cdio_warn("can't allocate %lu bytes", cdio_warn("can't allocate %lu bytes",
(long unsigned int) strlen(p_stat->filename)); (long unsigned int) strlen(p_iso9660_stat->filename));
free(p_stat); free(p_iso9660_stat);
return NULL; return NULL;
} }
iso9660_name_translate_ext(p_stat->filename, trans_fname, iso9660_name_translate_ext(p_iso9660_stat->filename, trans_fname,
p_env->i_joliet_level); p_env->i_joliet_level);
cmp = strcmp(splitpath[0], trans_fname); cmp = strcmp(splitpath[0], trans_fname);
free(trans_fname); free(trans_fname);
@ -1030,15 +1030,15 @@ _fs_stat_traverse (const CdIo_t *p_cdio, const iso9660_stat_t *_root,
if (!cmp) { if (!cmp) {
iso9660_stat_t *ret_stat iso9660_stat_t *ret_stat
= _fs_stat_traverse (p_cdio, p_stat, &splitpath[1]); = _fs_stat_traverse (p_cdio, p_iso9660_stat, &splitpath[1]);
free(p_stat->rr.psz_symlink); free(p_iso9660_stat->rr.psz_symlink);
free(p_stat); free(p_iso9660_stat);
free (_dirbuf); free (_dirbuf);
return ret_stat; return ret_stat;
} }
free(p_stat->rr.psz_symlink); free(p_iso9660_stat->rr.psz_symlink);
free(p_stat); free(p_iso9660_stat);
offset += iso9660_get_dir_len(p_iso9660_dir); offset += iso9660_get_dir_len(p_iso9660_dir);
} }
@ -1418,7 +1418,7 @@ find_lsn_recurse (void *p_image, iso9660_readdir_t iso9660_readdir,
{ {
iso9660_stat_t *statbuf = _cdio_list_node_data (entnode); iso9660_stat_t *statbuf = _cdio_list_node_data (entnode);
const char *psz_filename = (char *) statbuf->filename; const char *psz_filename = (char *) statbuf->filename;
const unsigned int len = strlen(psz_path) + strlen(psz_filename)+2; unsigned int len = strlen(psz_path) + strlen(psz_filename)+2;
if (*ppsz_full_filename != NULL) free(*ppsz_full_filename); if (*ppsz_full_filename != NULL) free(*ppsz_full_filename);
*ppsz_full_filename = calloc(1, len); *ppsz_full_filename = calloc(1, len);
@ -1431,7 +1431,7 @@ find_lsn_recurse (void *p_image, iso9660_readdir_t iso9660_readdir,
} }
if (statbuf->lsn == lsn) { if (statbuf->lsn == lsn) {
unsigned int len=sizeof(iso9660_stat_t)+strlen(statbuf->filename)+1; len = sizeof(iso9660_stat_t)+strlen(statbuf->filename)+1;
iso9660_stat_t *ret_stat = calloc(1, len); iso9660_stat_t *ret_stat = calloc(1, len);
if (!ret_stat) if (!ret_stat)
{ {

2
src/libcdio/iso9660/rock.c
View file

@ -458,7 +458,7 @@ parse_rock_ridge_stat_internal(iso9660_dir_t *p_iso9660_dir,
case SIG('R','E'): case SIG('R','E'):
cdio_warn("Attempt to read p_stat for relocated directory"); cdio_warn("Attempt to read p_stat for relocated directory");
goto out; goto out;
#if FINISHED #ifdef FINISHED
case SIG('C','L'): case SIG('C','L'):
{ {
iso9660_stat_t * reloc; iso9660_stat_t * reloc;

6
src/libcdio/udf/udf_fs.c
View file

@ -510,9 +510,9 @@ udf_get_root (udf_t *p_udf, bool b_any_partition, partition_num_t i_partition)
Directory File Entry. Directory File Entry.
*/ */
for (i_lba = mvds_start; i_lba < mvds_end; i_lba++) { for (i_lba = mvds_start; i_lba < mvds_end; i_lba++) {
uint8_t data[UDF_BLOCKSIZE]; uint8_t data2[UDF_BLOCKSIZE];
partition_desc_t *p_partition = (partition_desc_t *) &data; partition_desc_t *p_partition = (partition_desc_t *) &data2;
if (DRIVER_OP_SUCCESS != udf_read_sectors (p_udf, p_partition, i_lba, 1) ) if (DRIVER_OP_SUCCESS != udf_read_sectors (p_udf, p_partition, i_lba, 1) )
return NULL; return NULL;
@ -528,7 +528,7 @@ udf_get_root (udf_t *p_udf, bool b_any_partition, partition_num_t i_partition)
} }
} else if (!udf_checktag(&p_partition->tag, TAGID_LOGVOL)) { } else if (!udf_checktag(&p_partition->tag, TAGID_LOGVOL)) {
/* Get fileset descriptor */ /* Get fileset descriptor */
logical_vol_desc_t *p_logvol = (logical_vol_desc_t *) &data; logical_vol_desc_t *p_logvol = (logical_vol_desc_t *) &data2;
bool b_valid = bool b_valid =
UDF_BLOCKSIZE == uint32_from_le(p_logvol->logical_blocksize); UDF_BLOCKSIZE == uint32_from_le(p_logvol->logical_blocksize);

12
src/rufus.rc
View file

@ -33,7 +33,7 @@ LANGUAGE LANG_ENGLISH, SUBLANG_NEUTRAL
IDD_DIALOG DIALOGEX 12, 12, 206, 278 IDD_DIALOG DIALOGEX 12, 12, 206, 278
STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | WS_POPUP | WS_CAPTION | WS_SYSMENU STYLE DS_SETFONT | DS_MODALFRAME | DS_FIXEDSYS | WS_POPUP | WS_CAPTION | WS_SYSMENU
EXSTYLE WS_EX_APPWINDOW EXSTYLE WS_EX_APPWINDOW
CAPTION "Rufus v1.0.7.146" CAPTION "Rufus v1.0.7.147"
FONT 8, "MS Shell Dlg", 400, 0, 0x1 FONT 8, "MS Shell Dlg", 400, 0, 0x1
BEGIN BEGIN
DEFPUSHBUTTON "Start",IDC_START,94,236,50,14 DEFPUSHBUTTON "Start",IDC_START,94,236,50,14
@ -70,7 +70,7 @@ BEGIN
DEFPUSHBUTTON "OK",IDOK,231,175,50,14,WS_GROUP DEFPUSHBUTTON "OK",IDOK,231,175,50,14,WS_GROUP
CONTROL "<a href=""http://rufus.akeo.ie"">http://rufus.akeo.ie</a>",IDC_ABOUT_RUFUS_URL, CONTROL "<a href=""http://rufus.akeo.ie"">http://rufus.akeo.ie</a>",IDC_ABOUT_RUFUS_URL,
"SysLink",WS_TABSTOP,46,47,114,9 "SysLink",WS_TABSTOP,46,47,114,9
LTEXT "Version 1.0.7 (Build 146)",IDC_STATIC,46,19,78,8 LTEXT "Version 1.0.7 (Build 147)",IDC_STATIC,46,19,78,8
PUSHBUTTON "License...",IDC_ABOUT_LICENSE,46,175,50,14,WS_GROUP 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 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 LTEXT "Report bugs or request enhancements at:",IDC_STATIC,46,66,187,8
@ -208,8 +208,8 @@ END
// //
VS_VERSION_INFO VERSIONINFO VS_VERSION_INFO VERSIONINFO
FILEVERSION 1,0,7,146 FILEVERSION 1,0,7,147
PRODUCTVERSION 1,0,7,146 PRODUCTVERSION 1,0,7,147
FILEFLAGSMASK 0x3fL FILEFLAGSMASK 0x3fL
#ifdef _DEBUG #ifdef _DEBUG
FILEFLAGS 0x1L FILEFLAGS 0x1L
@ -226,13 +226,13 @@ BEGIN
BEGIN BEGIN
VALUE "CompanyName", "akeo.ie" VALUE "CompanyName", "akeo.ie"
VALUE "FileDescription", "Rufus" VALUE "FileDescription", "Rufus"
VALUE "FileVersion", "1.0.7.146" VALUE "FileVersion", "1.0.7.147"
VALUE "InternalName", "Rufus" VALUE "InternalName", "Rufus"
VALUE "LegalCopyright", "© 2011 Pete Batard (GPL v3)" VALUE "LegalCopyright", "© 2011 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", "1.0.7.146" VALUE "ProductVersion", "1.0.7.147"
END END
END END
BLOCK "VarFileInfo" BLOCK "VarFileInfo"