Bug fix: xorriso -cut_out deleted previously cut-out pieces of the same file

This commit is contained in:
Thomas Schmitt 2009-09-24 15:52:16 +00:00
parent b20a66e5e2
commit 5f71126bcd
5 changed files with 30 additions and 29 deletions

View File

@ -4,7 +4,7 @@
libisoburn. By Vreixo Formoso <metalpain2002@yahoo.es> libisoburn. By Vreixo Formoso <metalpain2002@yahoo.es>
and Thomas Schmitt <scdbackup@gmx.net> and Thomas Schmitt <scdbackup@gmx.net>
Integrated sub project of libburnia-project.org. Integrated sub project of libburnia-project.org.
http://files.libburnia-project.org/releases/libisoburn-0.4.2.pl00.tar.gz http://files.libburnia-project.org/releases/libisoburn-0.4.2.pl01.tar.gz
Copyright (C) 2006-2009 Vreixo Formoso, Thomas Schmitt. Copyright (C) 2006-2009 Vreixo Formoso, Thomas Schmitt.
Provided under GPL version 2. Provided under GPL version 2.
------------------------------------------------------------------------------ ------------------------------------------------------------------------------
@ -35,10 +35,10 @@ Dynamic library and compile time header requirements for libisoburn-0.4.2 :
libisoburn and xorriso will not start with libraries which are older than their libisoburn and xorriso will not start with libraries which are older than their
headers seen at compile time. headers seen at compile time.
Obtain libisoburn-0.4.2.pl00.tar.gz, take it to a directory of your choice Obtain libisoburn-0.4.2.pl01.tar.gz, take it to a directory of your choice
and do: and do:
tar xzf libisoburn-0.4.2.pl00.tar.gz tar xzf libisoburn-0.4.2.pl01.tar.gz
cd libisoburn-0.4.2 cd libisoburn-0.4.2
Within that directory execute: Within that directory execute:

View File

@ -4,7 +4,7 @@
xorriso. By Thomas Schmitt <scdbackup@gmx.net> xorriso. By Thomas Schmitt <scdbackup@gmx.net>
Integrated sub project of libburnia-project.org but also published via: Integrated sub project of libburnia-project.org but also published via:
http://scdbackup.sourceforge.net/xorriso_eng.html http://scdbackup.sourceforge.net/xorriso_eng.html
http://scdbackup.sourceforge.net/xorriso-0.4.2.pl00.tar.gz http://scdbackup.sourceforge.net/xorriso-0.4.2.pl01.tar.gz
Copyright (C) 2006-2009 Thomas Schmitt, provided under GPL version 2. Copyright (C) 2006-2009 Thomas Schmitt, provided under GPL version 2.
------------------------------------------------------------------------------ ------------------------------------------------------------------------------
@ -46,9 +46,9 @@ Optional at compile time are:
If they were present at compile time, then the optional libraries have to If they were present at compile time, then the optional libraries have to
be present at runtime, too. be present at runtime, too.
Obtain xorriso-0.4.2.pl00.tar.gz, take it to a directory of your choice and do: Obtain xorriso-0.4.2.pl01.tar.gz, take it to a directory of your choice and do:
tar xzf xorriso-0.4.2.pl00.tar.gz tar xzf xorriso-0.4.2.pl01.tar.gz
cd xorriso-0.4.2 cd xorriso-0.4.2
Within that directory execute: Within that directory execute:

View File

@ -429,7 +429,7 @@ files or trees to disk:
<P> <P>
<DL> <DL>
<DT><H3>Download as source code (see README):</H3></DT> <DT><H3>Download as source code (see README):</H3></DT>
<DD><A HREF="xorriso-0.4.2.pl00.tar.gz">xorriso-0.4.2.pl00.tar.gz</A> <DD><A HREF="xorriso-0.4.2.pl01.tar.gz">xorriso-0.4.2.pl01.tar.gz</A>
(1295 KB). (1295 KB).
</DD> </DD>
<DD>(Released 29 Aug 2009)</DD> <DD>(Released 29 Aug 2009)</DD>
@ -468,6 +468,13 @@ Bug fixes towards xorriso-0.4.0.pl00:
</P> </P>
<P>
Bug fixes towards xorriso-0.4.2.pl00:
<UL>
<LI>-cut_out deleted previously cut-out pieces of the same file</LI>
</UL>
</P>
<P> <P>
Enhancements towards previous stable version xorriso-0.4.0.pl00: Enhancements towards previous stable version xorriso-0.4.0.pl00:
<UL> <UL>
@ -518,17 +525,23 @@ cdrecord and mkisofs.</DT>
<DT><H3>Development snapshot, version 0.4.3 :</H3></DT> <DT><H3>Development snapshot, version 0.4.3 :</H3></DT>
<DD>Bug fixes towards xorriso-0.4.2.pl00: <DD>Bug fixes towards xorriso-0.4.2.pl00:
<UL> <UL>
<LI>- none yet -</LI> <LI>-cut_out deleted previously cut-out pieces of the same file</LI>
<LI>-for_backup did not enable -xattr and -md5 if no drive was chosen yet</LI>
<LI>With -as cdrecord : -xa1 and -xamix were ignored although they do matter</LI>
<LI>xorrisofs -help, xorrecord -help displayed original xorriso -help</LI>
<!-- <!--
<LI>- none yet -</LI>
--> -->
</UL> </UL>
</DD> </DD>
<DD>Enhancements towards stable version 0.4.2.pl00: <DD>Enhancements towards stable version 0.4.2.pl01:
<UL> <UL>
</LI> </LI>
<LI>- none yet -</LI> <LI>New option -scdbackup_tag</LI>
<LI>Option -toc now reports "Media product:"</LI>
<!-- <!--
<LI>- none yet -</LI>
--> -->
</UL> </UL>
</DD> </DD>
@ -546,7 +559,7 @@ installation see README)
</DD> </DD>
<DD> <DD>
<A HREF="xorriso-0.4.3.tar.gz">xorriso-0.4.3.tar.gz</A> <A HREF="xorriso-0.4.3.tar.gz">xorriso-0.4.3.tar.gz</A>
(1295 KB). (1310 KB).
</DD> </DD>
<DT>A dynamically linked development version of xorriso can be obtained <DT>A dynamically linked development version of xorriso can be obtained
from repositories of from repositories of

View File

@ -1 +1 @@
#define Xorriso_timestamP "2009.08.29.143001" #define Xorriso_timestamP "2009.09.22.153001"

View File

@ -702,7 +702,7 @@ int Xorriso_get_drive_handles(struct XorrisO *xorriso,
ret= burn_drive_get_drive_role(*drive); ret= burn_drive_get_drive_role(*drive);
if(ret != 1) { if(ret != 1) {
sprintf(xorriso->info_text, sprintf(xorriso->info_text,
"Output device is not an MMC drive. Desired operation does not apply"); "Output device is not an MMC drive. Desired operation does not apply.");
Xorriso_msgs_submit(xorriso, 0, xorriso->info_text, 0, "NOTE", 0); Xorriso_msgs_submit(xorriso, 0, xorriso->info_text, 0, "NOTE", 0);
return(2); return(2);
} }
@ -2919,8 +2919,8 @@ cannot_lstat:;
if(ret>0) { if(ret>0) {
target_is_dir= LIBISO_ISDIR(node); target_is_dir= LIBISO_ISDIR(node);
target_is_split= 0; target_is_split= 0;
if(target_is_dir) if(target_is_dir && !(xorriso->split_size <= 0))
target_is_split= Xorriso_is_split(xorriso, "", (void *) node, 1); target_is_split= Xorriso_is_split(xorriso, "", (void *) node, 1 | 2);
if(!((target_is_dir && !target_is_split) && source_is_dir)) { if(!((target_is_dir && !target_is_split) && source_is_dir)) {
Xorriso_process_msg_queues(xorriso,0); Xorriso_process_msg_queues(xorriso,0);
@ -3222,8 +3222,8 @@ int Xorriso_graft_in(struct XorrisO *xorriso, void *boss_iter,
target_is_dir= LIBISO_ISDIR(node); target_is_dir= LIBISO_ISDIR(node);
target_is_split= 0; target_is_split= 0;
if(target_is_dir && !(flag&128)) if(target_is_dir && !((flag & 128) || xorriso->split_size <= 0))
target_is_split= Xorriso_is_split(xorriso, "", (void *) node, 1); target_is_split= Xorriso_is_split(xorriso, "", (void *) node, 1 | 2);
if(!((target_is_dir && !target_is_split) && source_is_dir)) { if(!((target_is_dir && !target_is_split) && source_is_dir)) {
Xorriso_process_msg_queues(xorriso,0); Xorriso_process_msg_queues(xorriso,0);
@ -5870,18 +5870,6 @@ int Xorriso_list_formats(struct XorrisO *xorriso, int flag)
return(0); return(0);
if(ret == 2) if(ret == 2)
goto ex; goto ex;
#ifdef NIX
/* <<< obsoleted by bit0 of Xorriso_get_drive_handles */
ret= burn_drive_get_drive_role(drive);
if(ret!=1) {
sprintf(xorriso->info_text,
"output device is not an MMC drive. -list_format does not apply");
Xorriso_msgs_submit(xorriso, 0, xorriso->info_text, 0, "NOTE", 0);
ret= 2; goto ex;
}
#endif /* NIX */
ret = burn_disc_get_formats(drive, &status, &size, &dummy, ret = burn_disc_get_formats(drive, &status, &size, &dummy,
&num_formats); &num_formats);
if(ret<=0) { if(ret<=0) {