From 5f71126bcd3ecd5935ac2ff2c266d6e697528b7d Mon Sep 17 00:00:00 2001 From: Thomas Schmitt Date: Thu, 24 Sep 2009 15:52:16 +0000 Subject: [PATCH] Bug fix: xorriso -cut_out deleted previously cut-out pieces of the same file --- libisoburn/branches/ZeroFourTwoPl01/README | 6 ++--- .../branches/ZeroFourTwoPl01/xorriso/README | 6 ++--- .../ZeroFourTwoPl01/xorriso/xorriso_eng.html | 23 +++++++++++++++---- .../xorriso/xorriso_timestamp.h | 2 +- .../ZeroFourTwoPl01/xorriso/xorrisoburn.c | 22 ++++-------------- 5 files changed, 30 insertions(+), 29 deletions(-) diff --git a/libisoburn/branches/ZeroFourTwoPl01/README b/libisoburn/branches/ZeroFourTwoPl01/README index b8f081fd..46ad758b 100644 --- a/libisoburn/branches/ZeroFourTwoPl01/README +++ b/libisoburn/branches/ZeroFourTwoPl01/README @@ -4,7 +4,7 @@ libisoburn. By Vreixo Formoso and Thomas Schmitt 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. 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 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: - tar xzf libisoburn-0.4.2.pl00.tar.gz + tar xzf libisoburn-0.4.2.pl01.tar.gz cd libisoburn-0.4.2 Within that directory execute: diff --git a/libisoburn/branches/ZeroFourTwoPl01/xorriso/README b/libisoburn/branches/ZeroFourTwoPl01/xorriso/README index d0d9e717..e58a0140 100644 --- a/libisoburn/branches/ZeroFourTwoPl01/xorriso/README +++ b/libisoburn/branches/ZeroFourTwoPl01/xorriso/README @@ -4,7 +4,7 @@ xorriso. By Thomas Schmitt Integrated sub project of libburnia-project.org but also published via: 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. ------------------------------------------------------------------------------ @@ -46,9 +46,9 @@ Optional at compile time are: If they were present at compile time, then the optional libraries have to 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 Within that directory execute: diff --git a/libisoburn/branches/ZeroFourTwoPl01/xorriso/xorriso_eng.html b/libisoburn/branches/ZeroFourTwoPl01/xorriso/xorriso_eng.html index 60ef4064..1e45e7fa 100644 --- a/libisoburn/branches/ZeroFourTwoPl01/xorriso/xorriso_eng.html +++ b/libisoburn/branches/ZeroFourTwoPl01/xorriso/xorriso_eng.html @@ -429,7 +429,7 @@ files or trees to disk:

Download as source code (see README):

-
xorriso-0.4.2.pl00.tar.gz +
xorriso-0.4.2.pl01.tar.gz (1295 KB).
(Released 29 Aug 2009)
@@ -468,6 +468,13 @@ Bug fixes towards xorriso-0.4.0.pl00:

+

+Bug fixes towards xorriso-0.4.2.pl00: +

    +
  • -cut_out deleted previously cut-out pieces of the same file
    • +
+

+

Enhancements towards previous stable version xorriso-0.4.0.pl00:

    @@ -518,17 +525,23 @@ cdrecord and mkisofs.

    Development snapshot, version 0.4.3 :

    Bug fixes towards xorriso-0.4.2.pl00:
      -
    • - none yet -
      • +
    • -cut_out deleted previously cut-out pieces of the same file
      • +
    • -for_backup did not enable -xattr and -md5 if no drive was chosen yet
      • +
    • With -as cdrecord : -xa1 and -xamix were ignored although they do matter
      • +
    • xorrisofs -help, xorrecord -help displayed original xorriso -help
    -
    Enhancements towards stable version 0.4.2.pl00: +
    Enhancements towards stable version 0.4.2.pl01:
      -
    • - none yet -
      • +
    • New option -scdbackup_tag
      • +
    • Option -toc now reports "Media product:"
    @@ -546,7 +559,7 @@ installation see README)
    xorriso-0.4.3.tar.gz -(1295 KB). +(1310 KB).
    A dynamically linked development version of xorriso can be obtained from repositories of diff --git a/libisoburn/branches/ZeroFourTwoPl01/xorriso/xorriso_timestamp.h b/libisoburn/branches/ZeroFourTwoPl01/xorriso/xorriso_timestamp.h index 36ac43d8..6a8dfb9d 100644 --- a/libisoburn/branches/ZeroFourTwoPl01/xorriso/xorriso_timestamp.h +++ b/libisoburn/branches/ZeroFourTwoPl01/xorriso/xorriso_timestamp.h @@ -1 +1 @@ -#define Xorriso_timestamP "2009.08.29.143001" +#define Xorriso_timestamP "2009.09.22.153001" diff --git a/libisoburn/branches/ZeroFourTwoPl01/xorriso/xorrisoburn.c b/libisoburn/branches/ZeroFourTwoPl01/xorriso/xorrisoburn.c index 06168f59..0ef31ffc 100644 --- a/libisoburn/branches/ZeroFourTwoPl01/xorriso/xorrisoburn.c +++ b/libisoburn/branches/ZeroFourTwoPl01/xorriso/xorrisoburn.c @@ -702,7 +702,7 @@ int Xorriso_get_drive_handles(struct XorrisO *xorriso, ret= burn_drive_get_drive_role(*drive); if(ret != 1) { 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); return(2); } @@ -2919,8 +2919,8 @@ cannot_lstat:; if(ret>0) { target_is_dir= LIBISO_ISDIR(node); target_is_split= 0; - if(target_is_dir) - target_is_split= Xorriso_is_split(xorriso, "", (void *) node, 1); + if(target_is_dir && !(xorriso->split_size <= 0)) + target_is_split= Xorriso_is_split(xorriso, "", (void *) node, 1 | 2); if(!((target_is_dir && !target_is_split) && source_is_dir)) { 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_split= 0; - if(target_is_dir && !(flag&128)) - target_is_split= Xorriso_is_split(xorriso, "", (void *) node, 1); + if(target_is_dir && !((flag & 128) || xorriso->split_size <= 0)) + target_is_split= Xorriso_is_split(xorriso, "", (void *) node, 1 | 2); if(!((target_is_dir && !target_is_split) && source_is_dir)) { Xorriso_process_msg_queues(xorriso,0); @@ -5870,18 +5870,6 @@ int Xorriso_list_formats(struct XorrisO *xorriso, int flag) return(0); if(ret == 2) 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, &num_formats); if(ret<=0) {