Changes - j0ke.net Open Build Service

@@ -1,3 +1,18 @@ +SVN trunk (to become libisoburn-1.2.8.tar.gz or higher) +=============================================================================== +* Bug fix: -tell_media_space altered the pointers to MD5 of data files + which stem from a previous session. This produced false + mismatches with -check_md5_r. +* Bug fix: CD tracks were reported with the sizes of the tracks in the + first session. +* Bug fix: -check_media use=outdev sector_map= stored TOC of input drive +* Bug fix: -hide hfsplus and -as mkisofs -hide-hfsplus had no effect. + Thanks to Davy Ho. +* Bug fix: ./configure did not abort if libburn.h or libisofs.h were missing +* New command -move +* New -as mkisofs options -eltorito-id , -eltorito-selcrit + + libisoburn-1.2.6.tar.gz Tue Jan 08 2013 =============================================================================== * Bug fix: SIGSEGV by uninitialized local variable with

@@ -3076,7 +3076,7 @@ *.zip*) \ unzip $(distdir).zip ;;\ esac - chmod -R a-w $(distdir); chmod a+w $(distdir) + chmod -R a-w $(distdir); chmod u+w $(distdir) mkdir $(distdir)/_build mkdir $(distdir)/_inst chmod a-w $(distdir)

@@ -4,7 +4,7 @@ GNU xorriso. By Thomas Schmitt <scdbackup@gmx.net> Derived from and supported by libburnia-project.org, published via: http://www.gnu.org/software/xorriso/xorriso_eng.html -http://www.gnu.org/software/xorriso/xorriso-1.2.6.tar.gz +http://www.gnu.org/software/xorriso/xorriso-1.2.8.tar.gz Provided under GPL version 3 or later. No warranty. ------------------------------------------------------------------------------ @@ -46,10 +46,10 @@ If they were present at compile time, then the optional libraries have to be present at runtime, too. -Obtain xorriso-1.2.6.tar.gz, take it to a directory of your choice and do: +Obtain xorriso-1.2.8.tar.gz, take it to a directory of your choice and do: - tar xzf xorriso-1.2.6.tar.gz - cd xorriso-1.2.6 + tar xzf xorriso-1.2.8.tar.gz + cd xorriso-1.2.8 Within that directory execute: @@ -356,9 +356,9 @@ This binary is very lean but depends on properly installed libraries of suitable revision. -Dynamic library and compile time header requirements for libisoburn-1.2.6 : -- libburn.so.4 , version libburn-1.2.6 or higher -- libisofs.so.6 , version libisofs-1.2.6 or higher +Dynamic library and compile time header requirements for libisoburn-1.2.8 : +- libburn.so.4 , version libburn-1.2.8 or higher +- libisofs.so.6 , version libisofs-1.2.8 or higher libisoburn and xorriso will not start with libraries which are older than their headers seen at compile time. So compile in the oldest possible installation setup unless you have reason to enforce a newer bug fix level.

@@ -275,7 +275,7 @@ # report actual input values of CONFIG_FILES etc. instead of their # values after options handling. ac_log=" -This file was extended by libisoburn $as_me 1.2.5, which was +This file was extended by libisoburn $as_me 1.2.7, which was generated by GNU Autoconf 2.60. Invocation command line was CONFIG_FILES = $CONFIG_FILES @@ -314,7 +314,7 @@ Report bugs to <bug-autoconf@gnu.org>." ac_cs_version="\ -libisoburn config.status 1.2.5 +libisoburn config.status 1.2.7 configured by ./configure_ts, generated by GNU Autoconf 2.60, with options \"'--prefix=/usr'\" @@ -471,8 +471,8 @@ s,@PATH_SEPARATOR@,|#_!!_#|:,g s,@PACKAGE_NAME@,|#_!!_#|libisoburn,g s,@PACKAGE_TARNAME@,|#_!!_#|libisoburn,g -s,@PACKAGE_VERSION@,|#_!!_#|1.2.5,g -s,@PACKAGE_STRING@,|#_!!_#|libisoburn 1.2.5,g +s,@PACKAGE_VERSION@,|#_!!_#|1.2.7,g +s,@PACKAGE_STRING@,|#_!!_#|libisoburn 1.2.7,g s,@PACKAGE_BUGREPORT@,|#_!!_#|http://libburnia-project.org,g s,@exec_prefix@,|#_!!_#|${prefix},g s,@prefix@,|#_!!_#|/usr,g @@ -496,7 +496,7 @@ s,@libdir@,|#_!!_#|${exec_prefix}/lib,g s,@localedir@,|#_!!_#|${datarootdir}/locale,g s,@mandir@,|#_!!_#|${datarootdir}/man,g -s,@DEFS@,|#_!!_#|-DPACKAGE_NAME=\\"libisoburn\\" -DPACKAGE_TARNAME=\\"libisoburn\\" -DPACKAGE_VERSION=\\"1.2.5\\" -DPACKAGE_STRING=\\"libisoburn\\ 1.2.5\\" -DPACKAGE_BUGREPORT=\\"http://libburnia-project.org\\" -DPACKAGE=\\"libisoburn\\" -DVERSION=\\"1.2.5\\" -DSTDC_HEADERS=1 -DHAVE_SYS_TYPES_H=1 -DHAVE_SYS_STAT_H=1 -DHAVE_STDLIB_H=1 -DHAVE_STRING_H=1 -DHAVE_MEMORY_H=1 -DHAVE_STRINGS_H=1 -DHAVE_INTTYPES_H=1 -DHAVE_STDINT_H=1 -DHAVE_UNISTD_H=1 -DHAVE_FSEEKO=1 -DICONV_CONST= -DHAVE_DLFCN_H=1 -DHAVE_LIBACL=1 -DHAVE_LIBZ=1 -DHAVE_LIBJTE=1,g +s,@DEFS@,|#_!!_#|-DPACKAGE_NAME=\\"libisoburn\\" -DPACKAGE_TARNAME=\\"libisoburn\\" -DPACKAGE_VERSION=\\"1.2.7\\" -DPACKAGE_STRING=\\"libisoburn\\ 1.2.7\\" -DPACKAGE_BUGREPORT=\\"http://libburnia-project.org\\" -DPACKAGE=\\"libisoburn\\" -DVERSION=\\"1.2.7\\" -DSTDC_HEADERS=1 -DHAVE_SYS_TYPES_H=1 -DHAVE_SYS_STAT_H=1 -DHAVE_STDLIB_H=1 -DHAVE_STRING_H=1 -DHAVE_MEMORY_H=1 -DHAVE_STRINGS_H=1 -DHAVE_INTTYPES_H=1 -DHAVE_STDINT_H=1 -DHAVE_UNISTD_H=1 -DHAVE_FSEEKO=1 -DICONV_CONST= -DHAVE_DLFCN_H=1 -DHAVE_TM_GMTOFF=1 -DHAVE_LIBACL=1 -DHAVE_LIBZ=1 -DHAVE_LIBJTE=1,g s,@ECHO_C@,|#_!!_#|,g s,@ECHO_N@,|#_!!_#|-n,g s,@ECHO_T@,|#_!!_#|,g @@ -521,7 +521,7 @@ s,@INSTALL_DATA@,|#_!!_#|${INSTALL} -m 644,g s,@CYGPATH_W@,|#_!!_#|echo,g s,@PACKAGE@,|#_!!_#|libisoburn,g -s,@VERSION@,|#_!!_#|1.2.5,g +s,@VERSION@,|#_!!_#|1.2.7,g s,@ACLOCAL@,|#_!!_#|${SHELL} /home/thomas/projekte/cdrskin_dir/libisoburn-develop/missing --run aclocal-1.9,g s,@AUTOCONF@,|#_!!_#|${SHELL} /home/thomas/projekte/cdrskin_dir/libisoburn-develop/missing --run autoconf,g s,@AUTOMAKE@,|#_!!_#|${SHELL} /home/thomas/projekte/cdrskin_dir/libisoburn-develop/missing --run automake-1.9,g @@ -539,11 +539,11 @@ s,@am__untar@,|#_!!_#|${AMTAR} xf -,g s,@ISOBURN_MAJOR_VERSION@,|#_!!_#|1,g s,@ISOBURN_MINOR_VERSION@,|#_!!_#|2,g -s,@ISOBURN_MICRO_VERSION@,|#_!!_#|5,g +s,@ISOBURN_MICRO_VERSION@,|#_!!_#|7,g s,@LT_RELEASE@,|#_!!_#|1.2,g -s,@LT_CURRENT@,|#_!!_#|82,g +s,@LT_CURRENT@,|#_!!_#|84,g s,@LT_REVISION@,|#_!!_#|0,g -s,@LT_AGE@,|#_!!_#|81,g +s,@LT_AGE@,|#_!!_#|83,g s,@LT_CURRENT_MINUS_AGE@,|#_!!_#|1,g s,@MAINTAINER_MODE_TRUE@,|#_!!_#|#,g s,@MAINTAINER_MODE_FALSE@,|#_!!_#|,g

@@ -1,6 +1,6 @@ #! /bin/sh # Guess values for system-dependent variables and create Makefiles. -# Generated by GNU Autoconf 2.60 for xorriso 1.2.6. +# Generated by GNU Autoconf 2.60 for xorriso 1.2.8. # # Report bugs to <http://libburnia-project.org>. # @@ -713,8 +713,8 @@ # Identity of this package. PACKAGE_NAME='xorriso' PACKAGE_TARNAME='xorriso' -PACKAGE_VERSION='1.2.6' -PACKAGE_STRING='xorriso 1.2.6' +PACKAGE_VERSION='1.2.8' +PACKAGE_STRING='xorriso 1.2.8' PACKAGE_BUGREPORT='http://libburnia-project.org' ac_default_prefix=/usr/local @@ -1397,7 +1397,7 @@ # Omit some internal or obsolete options to make the list less imposing. # This message is too long to be a string in the A/UX 3.1 sh. cat <<_ACEOF -\`configure' configures xorriso 1.2.6 to adapt to many kinds of systems. +\`configure' configures xorriso 1.2.8 to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... @@ -1468,7 +1468,7 @@ if test -n "$ac_init_help"; then case $ac_init_help in - short | recursive ) echo "Configuration of xorriso 1.2.6:";; + short | recursive ) echo "Configuration of xorriso 1.2.8:";; esac cat <<\_ACEOF @@ -1594,7 +1594,7 @@ test -n "$ac_init_help" && exit $ac_status if $ac_init_version; then cat <<\_ACEOF -xorriso configure 1.2.6 +xorriso configure 1.2.8 generated by GNU Autoconf 2.60 Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001, @@ -1608,7 +1608,7 @@ This file contains any messages produced by compilers while running configure, to aid debugging if configure makes a mistake. -It was created by xorriso $as_me 1.2.6, which was +It was created by xorriso $as_me 1.2.8, which was generated by GNU Autoconf 2.60. Invocation command line was $ $0 $@ @@ -2418,7 +2418,7 @@ # Define the identity of the package. PACKAGE='xorriso' - VERSION='1.2.6' + VERSION='1.2.8' cat >>confdefs.h <<_ACEOF @@ -2586,14 +2586,14 @@ BURN_MAJOR_VERSION=1 BURN_MINOR_VERSION=2 -BURN_MICRO_VERSION=6 +BURN_MICRO_VERSION=8 LIBISOFS_MAJOR_VERSION=1 LIBISOFS_MINOR_VERSION=2 -LIBISOFS_MICRO_VERSION=6 +LIBISOFS_MICRO_VERSION=8 @@ -25993,7 +25993,7 @@ # report actual input values of CONFIG_FILES etc. instead of their # values after options handling. ac_log=" -This file was extended by xorriso $as_me 1.2.6, which was +This file was extended by xorriso $as_me 1.2.8, which was generated by GNU Autoconf 2.60. Invocation command line was CONFIG_FILES = $CONFIG_FILES @@ -26046,7 +26046,7 @@ _ACEOF cat >>$CONFIG_STATUS <<_ACEOF ac_cs_version="\\ -xorriso config.status 1.2.6 +xorriso config.status 1.2.8 configured by $0, generated by GNU Autoconf 2.60, with options \\"`echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`\\"

@@ -3,7 +3,7 @@ # Copyright (c) 2007 - 2013 Thomas Schmitt <scdbackup@gmx.net> # Provided under GPL version 2 or later. -AC_INIT([xorriso], [1.2.6], [http://libburnia-project.org]) +AC_INIT([xorriso], [1.2.8], [http://libburnia-project.org]) AC_PREREQ([2.50]) AC_CANONICAL_HOST @@ -23,14 +23,14 @@ BURN_MAJOR_VERSION=1 BURN_MINOR_VERSION=2 -BURN_MICRO_VERSION=6 +BURN_MICRO_VERSION=8 AC_SUBST(BURN_MAJOR_VERSION) AC_SUBST(BURN_MINOR_VERSION) AC_SUBST(BURN_MICRO_VERSION) LIBISOFS_MAJOR_VERSION=1 LIBISOFS_MINOR_VERSION=2 -LIBISOFS_MICRO_VERSION=6 +LIBISOFS_MICRO_VERSION=8 AC_SUBST(LIBISOFS_MAJOR_VERSION) AC_SUBST(LIBISOFS_MINOR_VERSION) AC_SUBST(LIBISOFS_MICRO_VERSION)

@@ -65,7 +65,7 @@ ------------------------------------------------------------------------ Usage: - /usr/bin/xorriso-tcltk [options] + frontend/xorriso-tcltk [options] Options: All options must be given with two dashes ("--option") in order to distinguish them from any options of the Tcl shell. @@ -105,9 +105,16 @@ reply messages and enable this logging. The log lines will be appended. Path "-" means stderr. --script_log_file path - Set a file address for logging of major xorriso commands - and enable this logging. + Set a file address for logging of essential xorriso + commands and enable this logging. The log lines will be appended. Path "-" means stderr. + --script_log_all_commands + With logging of commands log non-essential commands too. + --use_command_move + Use xorriso command -move for the "Move to: button + if xorriso version is >= 1.2.8 + --use_command_mv + Use xorriso command -mv for the "Move to:" button. If neither --stdio nor --named_pipes is given, then this script will try to locate itself in the filesystem and start a xorriso

@@ -19,9 +19,9 @@ # And, well, a graphical widget set would be nice. -set own_version "1.2.6" +set own_version "1.2.8" -# Minimum version of xorriso to be used as backend provess. +# Minimum version of xorriso to be used as backend process. # Older versions of xorriso do not offer commands -msg_op and -launch_frontend set min_xorriso_version "1.2.6" @@ -68,9 +68,16 @@ puts stderr " reply messages and enable this logging." puts stderr " The log lines will be appended. Path \"-\" means stderr." puts stderr " --script_log_file path" - puts stderr " Set a file address for logging of major xorriso commands" - puts stderr " and enable this logging." + puts stderr " Set a file address for logging of essential xorriso" + puts stderr " commands and enable this logging." puts stderr " The log lines will be appended. Path \"-\" means stderr." + puts stderr " --script_log_all_commands" + puts stderr " With logging of commands log non-essential commands too." + puts stderr " --use_command_move" + puts stderr " Use xorriso command -move for the \"Move to:\" button" + puts stderr " if xorriso version is >= 1.2.8" + puts stderr " --use_command_mv" + puts stderr " Use xorriso command -mv for the \"Move to:\" button." puts stderr "" puts stderr "If neither --stdio nor --named_pipes is given, then this script" puts stderr "will try to locate itself in the filesystem and start a xorriso" @@ -137,6 +144,9 @@ # This may be expected when xorriso is being shut down by this frontend. set expect_broken_pipes "0" +# Whether to use command -move rather than -mv. Possible since xorriso-1.2.8. +set use_command_move 1 + # Local copies of xorriso state @@ -193,6 +203,9 @@ # Whether to log essential commands: 0=off , 1=no extract , 2=with extract set cmd_logging_mode 0 +# Whether to log all commands if cmd_logging_mode is 1: 0=off , 1=on +set cmd_logging_all 0 + # The last logged -cd path. Used to prevent redundant logging of -cd. set recent_cd_path "" @@ -240,6 +253,7 @@ global cmd_sent cmd_conn debug_logging debug_log_conn display_busy 1 + log_command $cmd 0 debug_log_puts \ " ==============================================================" @@ -270,7 +284,7 @@ # Send a command and make it a candidate for the log script # proc send_loggable_cmd {cmd} { - log_command $cmd + log_command $cmd 1 send_marked_cmd $cmd } @@ -775,6 +789,7 @@ # proc check_xorriso_version {} { global sieve_ret result_list pre_msglist xorriso_version min_xorriso_version + global use_command_move global reply_conn set version "0.0.0 (= unknown)" @@ -802,6 +817,9 @@ "red" "embedded" central_exit 2 } + if {$xorriso_version < "1.2.8"} { + set use_command_move 0 + } set_display_msg $disp_en_mem } @@ -1609,7 +1627,7 @@ proc isomanip_mv {} { global .isolist global isomanip_move_target isolist_names isodir_is_pwd isodir_adr - global isodir_return_name + global isodir_return_name use_command_move if {$isomanip_move_target == ""} { xorriso_tcltk_errmsg \ @@ -1658,7 +1676,7 @@ set name_ftype [isofs_filetype $name] # Ask for confirmation if overwriting is about to happen - if {$target_ftype == "d"} { + if {$target_ftype == "d" && $use_command_move == 0} { set eff_target [combine_dir_and_name $target $name] set eff_target_ftype [isofs_filetype $eff_target] } else { @@ -1667,11 +1685,17 @@ } if {[handle_overwriting "isofs" $eff_target $eff_target_ftype \ "isofs" $name $name_ftype $multi_source \ - "" ""] == "0"} { + "" "" "replace"] == "0"} { if {$multi_source == 0} { return "" } continue } - send_loggable_cmd "-mv [make_text_shellsafe $name] [make_text_shellsafe $target] --" + if {$use_command_move == 0} { + send_loggable_cmd \ + "-mv [make_text_shellsafe $name] [make_text_shellsafe $target] --" + } else { + send_loggable_cmd \ + "-move [make_text_shellsafe $name] [make_text_shellsafe $target] --" + } } if {[llength $selected] == 1} { @@ -2006,7 +2030,7 @@ set line "n.a." reset_highest_cmd_sev clear_sieve - send_marked_cmd "-tell_media_space" + send_loggable_cmd "-tell_media_space" if {[compare_sev $highest_cmd_sev "FAILURE"] < 0} { set ac "" read_sieve "After commit :" @@ -2026,7 +2050,7 @@ # proc handle_overwriting {target_fs target target_ftype source_fs source source_ftype multi_source - selected_adr selected_ftype} { + selected_adr selected_ftype dir_action} { global overwrite_iso_files overwrite_iso_dirs overwrite_disk_files if {$target_fs == "localfs"} { @@ -2058,6 +2082,16 @@ if {$target_ftype != ""} { if {$target_ftype == "d"} { if {$source_ftype == "d"} { + if {$dir_action == "replace"} { + if {$overwrite_iso_dirs != 1} { + xorriso_tcltk_errmsg "xorriso-tcltk : SORRY : You would have to enable \"Overwrite $overwrite_fs dirs\" for\n[make_text_shellsafe $target]" + return "0" + } + if {[$what_window \ + "Really replace existing $to_fs directory\n\n[make_text_shellsafe $target]\n\nby $from_fs directory\n[make_text_shellsafe $source]\n?"] \ + != 1} { return "0" } + return "1" + } if {[$what_window \ "Really merge existing $to_fs directory\n\n[make_text_shellsafe $target]\n\nwith $from_fs directory\n[make_text_shellsafe $source]\n?"] \ != 1} { return "0" } @@ -2136,7 +2170,7 @@ reset_yesno_to_all if {[handle_overwriting "isofs" $target $target_ftype \ "localfs" $insert_from_adr $source_ftype 0 \ - $selected_adr $selected_ftype] == "0"} { + $selected_adr $selected_ftype "merge"] == "0"} { return "" } @@ -2232,7 +2266,7 @@ set source_ftype [isofs_filetype $i] if {[handle_overwriting "localfs" $target $target_ftype \ "isofs" $i $source_ftype $multi_source \ - "" ""] == 0} { + "" "" "merge"] == 0} { continue } send_loggable_cmd \ @@ -3538,7 +3572,7 @@ # proc init_input {} { global borderwidth busy_text_exists xorriso_version debug_logging - global cmd_logging_mode cmd_log_target osirrox_allowed + global cmd_logging_mode cmd_log_target osirrox_allowed cmd_logging_all global .input .input_line1 .xorriso_version .busy .busy_text global .refresh_state .end_button .cmdline .log_pipes_switch @@ -3579,6 +3613,10 @@ -command "effectuate_command_logging 0" \ -variable cmd_logging_mode \ -onvalue 1 -offvalue 0 + $m add checkbutton -label "Log non-essential commands" \ + -indicatoron 1 -selectcolor "" \ + -variable cmd_logging_all \ + -onvalue 1 -offvalue 0 $m add command -label "Set log script address" \ -command "set_log_script_address" $m add separator @@ -4311,7 +4349,7 @@ # The central storage for help texts. # proc tell_helptext {what} { - global own_version argv0 bwidget_version + global own_version argv0 bwidget_version use_command_move if {$what == "Help"} { return \ @@ -4526,7 +4564,12 @@ if {$what == "Command:"} { return \ "The \"Command:\" field can be used to send commands to xorriso. -See the manual page of xorriso for its concepts and commands." +See the manual page of xorriso for its concepts and commands. + +Normally the other GUI elements will emit xorriso commands for you. +This input field is presented only to make accessible those features +of xorriso which are not covered by the GUI. Use the \"Refresh disp\" +button to update the display after you have manually transmitted commands." } if {$what == "Script/Log"} { return \ @@ -4539,6 +4582,10 @@ get sent via the \"Command:\" field. Commands -osirrox and -extract will be logged only as comments. +The \"Log non-essential commands\" switch controls whether all commands +shall be logged if \"Log command script\" is enabled. Commands +-msg_op \"parse\" and -msg_op \"parse_bulk\" will be logged only as comments. + The item \"Set log script address\" pops up a file tree browser window which asks for the target of appending to script. Address \"-\" means standard error. Else it must not yet exist or be a writable data file. @@ -4815,6 +4862,9 @@ burn a data file from hard disk onto the output drive. The address of the disk file is taken from the neighboring text field. +No input drive may be aquired. (Delete all characters from the field +\"Input drive/image\" and hit Return to give up the input drive.) + The medium in the drive must be blank. (It is well possible to burn image files to appendable media. But the @@ -4981,7 +5031,7 @@ ---------------------------------------------------------------------------- The \"Overwrite ISO dirs\" switch controls whether it is allowed to replace -an ISO directory by a non-directory file. See xorriso command -overwrite \"on\". +an ISO directory by a another file. See xorriso command -overwrite \"on\". ---------------------------------------------------------------------------- @@ -5140,7 +5190,8 @@ in earlier sessions beginning from the session where they were inserted." } if {$what == "Move to:"} { - return \ + if {$use_command_move == 0} { + return \ "The \"Move to:\" button uses command -mv to move each of the selected items to the address that is given by the text field right to the button. @@ -5148,6 +5199,11 @@ be moved underneath that directory and keep their leaf names. Else there may be only one selected item which will be renamed to the given address." + } else { + return \ +"The \"Move to:\" button uses command -move to rename each of the selected +items to the address that is given by the text field right to the button." + } } if {$what == "Make dir"} { return \ @@ -5517,14 +5573,20 @@ # Log a command (if enabled) # -proc log_command {cmd} { - global cmd_log_conn cmd_logging_mode recent_cd_path +proc log_command {cmd essential} { + global cmd_log_conn cmd_logging_mode cmd_logging_all recent_cd_path if {$cmd_logging_mode < 1} {return ""} + if {$essential <= 0} { + if {$cmd_logging_all <= 0} {return ""} + } else { + # Leave logging to non-essential call which will come soon after + if {$cmd_logging_all > 0} {return ""} + } if {[string first "-cd " $cmd] == 0} { set path [string range $cmd 4 end] - if {$path == $recent_cd_path} {return ""} + if {$path == $recent_cd_path && $cmd_logging_all <= 0} {return ""} set recent_cd_path $path } @@ -5539,6 +5601,9 @@ set prefix "# " } } + if {[string first "-msg_op parse" $cmd] != -1} { + set prefix "# " + } puts $cmd_log_conn $prefix$cmd flush $cmd_log_conn } @@ -5713,7 +5778,7 @@ proc setup_by_args {argv0 argv} { global cmd_pipe_adr reply_pipe_adr main_window_geometry click_to_focus global have_bwidget cmd_conn reply_conn geometry stdout stdin - global osirrox_allowed + global osirrox_allowed cmd_logging_all use_command_move # wish normally eats the -geometry option and puts the result into $geometry catch {set main_window_geometry $geometry} @@ -5779,6 +5844,10 @@ # postpone actual log start until start_xorriso has been passed set script_logging 1 } + if {$opt == "--script_log_all_commands"} { + set ok "1" + set cmd_logging_all 1 + } if {$opt == "--no_extract"} { set ok "1" set osirrox_allowed 0 @@ -5787,6 +5856,14 @@ set ok "1" set have_bwidget "-1" } + if {$opt == "--use_command_move"} { + set ok "1" + set use_command_move 1 + } + if {$opt == "--use_command_mv"} { + set ok "1" + set use_command_move 0 + } if {$ok == 0} { puts stderr "$argv0 : Unknown option '$opt'" print_usage $argv0

@@ -1,7 +1,7 @@ /* -*- indent-tabs-mode: t; tab-width: 8; c-basic-offset: 8; -*- */ /* Copyright (c) 2004 - 2006 Derek Foreman, Ben Jansens - Copyright (c) 2006 - 2012 Thomas Schmitt <scdbackup@gmx.net> + Copyright (c) 2006 - 2013 Thomas Schmitt <scdbackup@gmx.net> Provided under GPL version 2 or later. */ @@ -2123,7 +2123,7 @@ ret = 0; ex:; if (first == 0) - sg_give_next_adr(&enm, fname, sizeof(fname), -1); + sg_give_next_adr(&enm, fname, fname_size, -1); BURN_FREE_MEM(fname); BURN_FREE_MEM(msg); return ret;

@@ -343,7 +343,6 @@ "session", "point", "pmin", ... Do not rely on the current size of a burn_toc_entry. - ts A70201 : DVD extension, see below */ struct burn_toc_entry { @@ -372,6 +371,8 @@ older elements in this structure: bit0= DVD extension is valid @since 0.3.2 @since 0.5.2 : DVD extensions are made valid for CD too + bit1= LRA extension is valid @since 0.7.2 + bit2= Track status bits extension is valid @since 1.2.8 */ unsigned char extensions_valid; @@ -393,6 +394,24 @@ This would mean profiles: 0x11, 0x15, 0x13, 0x14, 0x51, 0x41, 0x42 */ int last_recorded_address; + + /* ts B30112 : Track status bits extension. extensions_valid:bit2 */ + /* @since 1.2.8 */ + /* Names as of READ TRACK INFORMATION, MMC-5 6.27.3 : + bit0 - bit3 = Track Mode + bit4 = Copy + bit5 = Damage + bit6 - bit7 = LJRS + bit8 - bit11 = Data Mode + bit12 = FP + bit13 = Packet/Inc + bit14 = Blank + bit15 = RT + bit16 = NWA_V + bit17 = LRA_V + */ + int track_status_bits; + }; @@ -1955,7 +1974,7 @@ int flag); /* ts B20108 */ -/** Inquire the CD track start number, as set by default ot by +/** Inquire the CD track start number, as set by default or by burn_session_set_start_tno(). @param session The session to be inquired @return > 0 is the currently set CD track start number @@ -3387,8 +3406,12 @@ void burn_session_get_leadout_entry(struct burn_session *s, struct burn_toc_entry *entry); -/** Gets an array of all the sessions for the disc +/** Gets an array of all complete sessions for the disc THIS IS NO LONGER VALID AFTER YOU ADD OR REMOVE A SESSION + The result array contains *num + burn_disc_get_incomplete_sessions() + elements. All above *num are incomplete sessions. + Typically there is at most one incomplete session with one empty track. + DVD+R and BD-R seem to allow more than one track with even readable data. @param d Disc to get session array for @param num Returns the number of sessions in the array @return array of sessions @@ -3396,6 +3419,17 @@ struct burn_session **burn_disc_get_sessions(struct burn_disc *d, int *num); +/* ts B30112 */ +/* @since 1.2.8 */ +/** Obtains the number of incomplete sessions which are recorded in the + result array of burn_disc_get_sessions() after the complete sessions. + See above. + @param d Disc object to inquire + @return Number of incomplete sessions +*/ +int burn_disc_get_incomplete_sessions(struct burn_disc *d); + + int burn_disc_get_sectors(struct burn_disc *d); /** Gets an array of all the tracks for a session @@ -3451,7 +3485,7 @@ */ #define burn_header_version_major 1 #define burn_header_version_minor 2 -#define burn_header_version_micro 6 +#define burn_header_version_micro 8 /** Note: Above version numbers are also recorded in configure.ac because libtool wants them as parameters at build time. @@ -4048,6 +4082,12 @@ */ #define Libburn_dummy_probe_write_modeS 1 +/* ts B30112 */ +/* Handle DVD+R with reserved tracks in incomplete first session + by loading info about the incomplete session into struct burn_disc +*/ +#define Libburn_disc_with_incomplete_sessioN 1 + /* Early experimental: Do not define Libburn_develop_quality_scaN unless you want to work

@@ -1126,6 +1126,12 @@ if (dlen + 2 > old_alloc_len) dlen = old_alloc_len - 2; d->complete_sessions = 1 + c->page->data[3] - c->page->data[2]; + +#ifdef Libburn_disc_with_incomplete_sessioN + /* ts B30112 : number of open sessions */ + d->incomplete_sessions = 0; +#endif + d->last_track_no = d->complete_sessions; if (dlen - 2 < (d->last_track_no + 1) * 8) { libdax_msgs_submit(libdax_messenger, d->global_index, @@ -1253,9 +1259,22 @@ {ret = -1; goto ex;} BURN_ALLOC_MEM(buf, struct buffer, 1); +#ifdef Libburn_disc_with_incomplete_sessioN + + if (d->last_track_no <= 0 || + d->complete_sessions + d->incomplete_sessions <= 0 || + d->status == BURN_DISC_BLANK) + {ret = 2; goto ex;} + +#else + if (d->last_track_no <= 0 || d->complete_sessions <= 0 || d->status == BURN_DISC_BLANK) {ret = 2; goto ex;} + +#endif /* ! Libburn_disc_with_incomplete_sessioN */ + + if (d->last_track_no > BURN_MMC_FAKE_TOC_MAX_SIZE) { msg = calloc(1, 160); if (msg != NULL) { @@ -1279,18 +1298,34 @@ d->disc = burn_disc_create(); if (d->disc == NULL) {ret = -1; goto ex;} - d->toc_entries = d->last_track_no + d->complete_sessions; + d->toc_entries = d->last_track_no + + d->complete_sessions + d->incomplete_sessions; d->toc_entry = calloc(d->toc_entries, sizeof(struct burn_toc_entry)); if (d->toc_entry == NULL) {ret = -1; goto ex;} memset(d->toc_entry, 0,d->toc_entries * sizeof(struct burn_toc_entry)); + +#ifdef Libburn_disc_with_incomplete_sessioN + + for (i = 0; i < d->complete_sessions + d->incomplete_sessions; i++) { + +#else + for (i = 0; i < d->complete_sessions; i++) { + +#endif + session = burn_session_create(); if (session == NULL) {ret = -1; goto ex;} burn_disc_add_session(d->disc, session, BURN_POS_END); burn_session_free(session); } + +#ifdef Libburn_disc_with_incomplete_sessioN + d->disc->incomplete_sessions = d->incomplete_sessions; +#endif + memset(size_data, 0, 4); memset(start_data, 0, 4); @@ -1333,7 +1368,16 @@ entry; } +#ifdef Libburn_disc_with_incomplete_sessioN + + if (session_number > d->complete_sessions) { + +#else + if (session_number > d->disc->sessions) { + +#endif + if (i == d->last_track_no - 1) { /* ts A70212 : Last track field Free Blocks */ burn_drive_set_media_capacity_remaining(d, @@ -1341,7 +1385,18 @@ ((off_t) 2048)); d->media_lba_limit = 0; } + +#ifdef Libburn_disc_with_incomplete_sessioN + + if (session_number > d->disc->sessions ) + continue; + +#else + continue; + +#endif + } entry = &(d->toc_entry[i + session_number - 1]); @@ -1359,12 +1414,16 @@ memcpy(end_data, tdata + 28, 4); mmc_fake_toc_entry(entry, session_number, i + 1, size_data, start_data, end_data); + entry->track_status_bits = tdata[5] | (tdata[6] << 8) | + (tdata[7] << 16); + entry->extensions_valid |= 4; if (prev_session != session_number) d->disc->session[session_number - 1]->firsttrack = i+1; d->disc->session[session_number - 1]->lasttrack = i+1; prev_session = session_number; } + if (prev_session > 0 && prev_session <= d->disc->sessions) { /* leadout entry of last session of closed disc */ entry = &(d->toc_entry[(d->last_track_no - 1) + prev_session]); @@ -2029,16 +2088,28 @@ d->current_profile == 0x12 || d->current_profile == 0x43) d->status = BURN_DISC_BLANK; +#ifdef Libburn_disc_with_incomplete_sessioN + /* ts B30112 : number of open sessions */ + d->incomplete_sessions = 0; +#endif + if (d->status == BURN_DISC_BLANK) { d->last_track_no = 1; /* The "incomplete track" */ d->complete_sessions = 0; } else { - /* ts A70131 : number of non-empty sessions */ + /* ts A70131 : number of closed sessions */ d->complete_sessions = number_of_sessions; /* mmc5r03c.pdf 6.22.3.1.3 State of Last Session: 3=complete */ - if (d->state_of_last_session != 3 && d->complete_sessions >= 1) + if (d->state_of_last_session != 3 && + d->complete_sessions >= 1) { d->complete_sessions--; +#ifdef Libburn_disc_with_incomplete_sessioN + d->incomplete_sessions++; +#endif + + } + /* ts A70129 : mmc5r03c.pdf 6.22.3.1.7 This includes the "incomplete track" if the disk is appendable. I.e number of complete tracks + 1. */ @@ -2713,9 +2784,9 @@ if (r <= 0 || w <= 0) { /* ts A70712 : now searching for best speed descriptor */ if (w > 0 && r <= 0) - burn_drive_get_best_speed(d, r, &best_sd, 1); + burn_drive_get_best_speed(d, r, &best_sd, 1 | 2); else - burn_drive_get_best_speed(d, w, &best_sd, 0); + burn_drive_get_best_speed(d, w, &best_sd, 2); if (best_sd != NULL) { w = best_sd->write_speed; d->nominal_write_speed = w; @@ -4020,8 +4091,10 @@ /* ts A61225 */ +/* @param flag bit0= register speed descriptors +*/ static int mmc_get_write_performance_al(struct burn_drive *d, - int *alloc_len, int *max_descr) + int *alloc_len, int *max_descr, int flag) { struct buffer *buf = NULL; int len, i, b, num_descr, ret, old_alloc_len; @@ -4104,7 +4177,7 @@ pd = c->page->data; if (num_descr > *max_descr) num_descr = *max_descr; - for (i = 0; i < num_descr; i++) { + for (i = 0; i < num_descr && (flag & 1); i++) { exact_bit = !!(pd[8 + i*16] & 2); end_lba = read_speed = write_speed = 0; for (b = 0; b < 4 ; b++) { @@ -4179,15 +4252,25 @@ return 0; /* first command execution to learn number of descriptors and - dxfer_len */ - ret = mmc_get_write_performance_al(d, &alloc_len, &max_descr); + dxfer_len + */ + ret = mmc_get_write_performance_al(d, &alloc_len, &max_descr, 0); + if (max_descr > 0 && ret > 0) { + /* Some drives announce only 1 descriptor if asked for 0. + So ask twice for non-0 descriptors. + */ + ret = mmc_get_write_performance_al(d, &alloc_len, &max_descr, + 0); + } /* fprintf(stderr,"LIBBURN_DEBUG: ACh alloc_len = %d , ret = %d\n", alloc_len, ret); */ if (max_descr > 0 && ret > 0) - /* second execution with announced length */ - ret = mmc_get_write_performance_al(d, &alloc_len, &max_descr); + /* final execution with announced length */ + max_descr = (alloc_len - 8) / 16; + ret = mmc_get_write_performance_al(d, &alloc_len, &max_descr, + 1); return ret; } @@ -5014,6 +5097,11 @@ d->disc_info_valid = 0; d->num_format_descr = 0; d->complete_sessions = 0; + +#ifdef Libburn_disc_with_incomplete_sessioN + d->incomplete_sessions = 0; +#endif + d->state_of_last_session = -1; d->last_track_no = 1; d->media_capacity_remaining = 0;

@@ -65,6 +65,11 @@ d->refcnt = 1; d->sessions = 0; d->session = NULL; + +#ifdef Libburn_disc_with_incomplete_sessioN + d->incomplete_sessions= 0; +#endif + return d; } @@ -691,10 +696,37 @@ struct burn_session **burn_disc_get_sessions(struct burn_disc *d, int *num) { + +#ifdef Libburn_disc_with_incomplete_sessioN + + *num = d->sessions - d->incomplete_sessions; + +#else + *num = d->sessions; + +#endif + + return d->session; } + +/* ts B30112 : API */ +int burn_disc_get_incomplete_sessions(struct burn_disc *d) +{ +#ifdef Libburn_disc_with_incomplete_sessioN + + return d->incomplete_sessions; + +#else + + return 0; + +#endif +} + + struct burn_track **burn_session_get_tracks(struct burn_session *s, int *num) { *num = s->tracks; @@ -737,11 +769,11 @@ ret = 1; goto ex; } - track_offset = burn_session_get_start_tno(d->session[0], 0); - if (track_offset <= 0) - track_offset = 1; for (sidx = 0; sidx < d->sessions; sidx++) { + track_offset = burn_session_get_start_tno(d->session[sidx], 0); + if (track_offset <= 0) + track_offset = 1; if (d->session[sidx] == NULL) { sprintf(msg, "d->session[%d of %d] == NULL", sidx, d->sessions);

@@ -144,6 +144,11 @@ { int sessions; struct burn_session **session; + +#ifdef Libburn_disc_with_incomplete_sessioN + int incomplete_sessions; +#endif + int refcnt; };

@@ -287,6 +287,12 @@ /* ts A90107 */ int state_of_last_session; +#ifdef Libburn_disc_with_incomplete_sessioN + /* ts B30112 */ + int incomplete_sessions; +#endif + + /* ts A70129 : from 51h READ DISC INFORMATION Last Track Number in Last Session */ int last_track_no;

@@ -1861,7 +1861,7 @@ struct burn_drive *d = o->drive; struct buffer *out = d->buffer; int sectors; - int i, open_ended = 0, ret= 0, is_flushed = 0; + int i, open_ended = 0, ret= 0, is_flushed = 0, track_open = 0; int first_buf_cap = 0, further_cap = 0, buf_cap_step = 1024; /* ts A70213 : eventually expand size of track to max */ @@ -1889,6 +1889,7 @@ if (ret <= 0) goto ex; } + track_open = 1; sectors = burn_track_get_sectors_2(t, 1); open_ended = burn_track_is_open_ended(t); @@ -1971,7 +1972,7 @@ ex:; if (d->cancel) burn_source_cancel(t->source); - if (!is_flushed) + if (track_open && !is_flushed) d->sync_cache(d); /* burn_write_flush() was not called */ return ret; }

@@ -1586,6 +1586,7 @@ struct isoburn_toc_disc *isoburn_toc_drive_get_disc(struct burn_drive *d) { int ret, session_count= 0, track_count= 0, num_tracks= 0, i, j; + int open_sessions= 0; struct isoburn *o; struct isoburn_toc_entry *t; struct isoburn_toc_disc *toc_disc= NULL; @@ -1601,6 +1602,7 @@ toc_disc->tracks= NULL; toc_disc->track_pointers= NULL; toc_disc->session_count= 0; + toc_disc->incomplete_session_count= 0; toc_disc->track_count= 0; toc_disc->toc= NULL; @@ -1641,18 +1643,26 @@ return(NULL); } s= burn_disc_get_sessions(toc_disc->disc, &session_count); - for(i= 0; i<session_count; i++) { + open_sessions= burn_disc_get_incomplete_sessions(toc_disc->disc); + for(i= 0; i < session_count + open_sessions; i++) { tracks = burn_session_get_tracks(s[i], &num_tracks); + if(i == session_count + open_sessions - 1 && open_sessions > 0) { + /* Do not count the invisible track of the last incomplete session */ + num_tracks--; + } track_count+= num_tracks; } - if(session_count<=0 || track_count<=0) + if(session_count + open_sessions <= 0 || track_count <= 0) goto failure; - ret= isoburn_toc_new_arrays(toc_disc, session_count, track_count, 0); + ret= isoburn_toc_new_arrays(toc_disc, session_count + open_sessions, + track_count, 0); if(ret<=0) goto failure; track_count= 0; - for(i= 0; i<session_count; i++) { + for(i= 0; i < session_count + open_sessions; i++) { tracks = burn_session_get_tracks(s[i], &num_tracks); + if(i == session_count + open_sessions - 1 && open_sessions > 0) + num_tracks--; toc_disc->sessions[i].session= s[i]; toc_disc->sessions[i].track_pointers= toc_disc->track_pointers+track_count; toc_disc->sessions[i].track_count= num_tracks; @@ -1664,6 +1674,7 @@ track_count+= num_tracks; } toc_disc->session_count= session_count; + toc_disc->incomplete_session_count= open_sessions; toc_disc->track_count= track_count; return(toc_disc); } @@ -1672,7 +1683,7 @@ int isoburn_toc_disc_get_sectors(struct isoburn_toc_disc *disc) { struct isoburn_toc_entry *t; - int ret= 0, num_sessions, num_tracks; + int ret= 0, num_sessions, num_tracks, open_sessions= 0, session_idx= -1; struct burn_session **sessions; struct burn_track **tracks; struct burn_toc_entry entry; @@ -1684,9 +1695,23 @@ ret= t->start_lba + t->track_blocks; } else if(disc->disc!=NULL) { sessions= burn_disc_get_sessions(disc->disc, &num_sessions); - if(num_sessions > 0) { - tracks = burn_session_get_tracks(sessions[num_sessions - 1], - &num_tracks); + open_sessions= burn_disc_get_incomplete_sessions(disc->disc); + if(num_sessions + open_sessions > 0) { + session_idx= num_sessions + open_sessions - 1; + tracks = burn_session_get_tracks(sessions[session_idx], &num_tracks); + if(open_sessions > 0) { + /* Do not count the invisible track of the last incomplete session */ + num_tracks--; + } + if(num_tracks <= 0) + session_idx--; + } + if(session_idx >= 0) { + tracks = burn_session_get_tracks(sessions[session_idx], &num_tracks); + if(session_idx == num_sessions + open_sessions - 1 && open_sessions > 0) { + /* Do not count the invisible track of the last incomplete session */ + num_tracks--; + } if(num_tracks > 0) { burn_track_get_entry(tracks[num_tracks - 1], &entry); if(entry.extensions_valid & 1) @@ -1709,6 +1734,12 @@ } +int isoburn_toc_disc_get_incmpl_sess(struct isoburn_toc_disc *disc) +{ + return(disc->incomplete_session_count); +} + + int isoburn_toc_session_get_sectors(struct isoburn_toc_session *s) { struct isoburn_toc_entry *t;

@@ -28,7 +28,6 @@ int track_no; /* point */ int start_lba; int track_blocks; - char *volid; /* For caching a volume id from emulated toc on overwriteables */ struct isoburn_toc_entry *next; @@ -768,6 +767,7 @@ struct isoburn_toc_track *tracks; /* storage array */ struct isoburn_toc_track **track_pointers; /* storage array */ int session_count; + int incomplete_session_count; int track_count; struct isoburn_toc_entry *toc; };

@@ -242,7 +242,7 @@ */ #define isoburn_libisofs_req_major 1 #define isoburn_libisofs_req_minor 2 -#define isoburn_libisofs_req_micro 6 +#define isoburn_libisofs_req_micro 8 /** The minimum version of libburn to be used with this version of libisoburn at compile time. @@ -250,7 +250,7 @@ */ #define isoburn_libburn_req_major 1 #define isoburn_libburn_req_minor 2 -#define isoburn_libburn_req_micro 6 +#define isoburn_libburn_req_micro 8 /** The minimum compile time requirements of libisoburn towards libjte are the same as of a suitable libisofs towards libjte. @@ -305,7 +305,7 @@ */ #define isoburn_header_version_major 1 #define isoburn_header_version_minor 2 -#define isoburn_header_version_micro 6 +#define isoburn_header_version_micro 8 /** Note: Above version numbers are also recorded in configure.ac because libtool wants them as parameters at build time. @@ -596,7 +596,11 @@ int isoburn_toc_disc_get_sectors(struct isoburn_toc_disc *disc); -/** Get the array of session handles from the table of content. +/** Get the array of session handles and the number of complete sessions + from the table of content. + The result array contains *num + isoburn_toc_disc_get_incmpl_sess() + elements. All above *num are incomplete sessions. + Typically there is at most one incomplete session with no track. Wrapper for: burn_disc_get_sessions() @since 0.1.6 @param disc The master handle of the medium @@ -607,6 +611,16 @@ struct isoburn_toc_disc *disc, int *num); +/** Obtain the number of incomplete sessions which are recorded in the + result array of isoburn_toc_disc_get_sessions() after the complete + sessions. See above. + @since 1.2.8 + @param disc The master handle of the medium + @return the number of incomplete sessions +*/ +int isoburn_toc_disc_get_incmpl_sess(struct isoburn_toc_disc *disc); + + /** Tell the number of 2048 byte blocks covered by a particular session. Wrapper for: burn_session_get_sectors() @since 0.1.6

@@ -1,7 +1,7 @@ /* * Copyright (c) 2007 Vreixo Formoso * Copyright (c) 2007 Mario Danic - * Copyright (c) 2009 - 2012 Thomas Schmitt + * Copyright (c) 2009 - 2013 Thomas Schmitt * * This file is part of the libisofs project; you can redistribute it and/or * modify it under the terms of the GNU General Public License version 2 @@ -1613,7 +1613,8 @@ */; } else if (ret == 1 && img->checksum_array == NULL) { /* No checksum array loaded. Delete "isofs.cx" */ - iso_node_set_attrs(node, (size_t) 1, + if (!target->will_cancel) + iso_node_set_attrs(node, (size_t) 1, &cx_names, cx_value_lengths, &cx_valuept, 4 | 8); no_md5 = 1; } else if (ret == 1 && value_length == 4) { @@ -1639,8 +1640,9 @@ } /* Equip nodes with provisory isofs.cx numbers: 4 byte, all 0. Omit those from old image which will not be copied and have no MD5. + Do not alter the nodes if this is only a will_cancel run. */ - if (!no_md5) { + if (!(target->will_cancel || no_md5)) { ret = iso_file_set_isofscx(file, (unsigned int) 0, 0); if (ret < 0) return ret;

@@ -127,7 +127,7 @@ /* insert the filesrc in the tree */ ret = iso_rbtree_insert(img->files, fsrc, (void**)src); if (ret <= 0) { - if (ret == 0 && (*src)->checksum_index > 0) { + if (ret == 0 && (*src)->checksum_index > 0 && !img->will_cancel) { /* Duplicate file source was mapped to previously registered source */ cret = iso_file_set_isofscx(file, (*src)->checksum_index, 0); @@ -152,7 +152,7 @@ no_md5 = 1; } - if ((img->md5_file_checksums & 1) && !no_md5) { + if ((img->md5_file_checksums & 1) && !(no_md5 || img->will_cancel)) { img->checksum_idx_counter++; if (img->checksum_idx_counter < 0x7fffffff) { fsrc->checksum_index = img->checksum_idx_counter;

@@ -241,6 +241,10 @@ char *copyright_file_id; char *abstract_file_id; char *biblio_file_id; + char *creation_time; + char *modification_time; + char *expiration_time; + char *effective_time; /* extension information */ @@ -2089,6 +2093,10 @@ free(data->copyright_file_id); free(data->abstract_file_id); free(data->biblio_file_id); + free(data->creation_time); + free(data->modification_time); + free(data->expiration_time); + free(data->effective_time); free(data->input_charset); free(data->local_charset); @@ -2317,7 +2325,15 @@ data->copyright_file_id[0] = 0; data->abstract_file_id[0] = 0; data->biblio_file_id[0] = 0; - } + } + data->creation_time = + iso_util_strcopy_untail((char*) pvm->vol_creation_time, 17); + data->modification_time = + iso_util_strcopy_untail((char*) pvm->vol_modification_time, 17); + data->expiration_time = + iso_util_strcopy_untail((char*) pvm->vol_expiration_time, 17); + data->effective_time = + iso_util_strcopy_untail((char*) pvm->vol_effective_time, 17); data->nblocks = iso_read_bb(pvm->vol_space_size, 4, NULL); @@ -2857,9 +2873,9 @@ { int ret, idx, to_copy; struct stat info; - IsoNode *new; + IsoNode *new = NULL; IsoBoot *bootcat; - char *name; + char *name = NULL; char *dest = NULL; ImageFileSourceData *data; _ImageFsData *fsdata; @@ -2887,7 +2903,6 @@ goto ex; } - new = NULL; switch (info.st_mode & S_IFMT) { case S_IFREG: { @@ -2901,9 +2916,8 @@ "More than one catalog node has been found. " "We can continue, but that could lead to " "problems"); - if (ret < 0) { + if (ret < 0) goto ex; - } iso_node_unref((IsoNode*)image->bootcat->node); } @@ -2911,9 +2925,7 @@ * a regular file */ new = calloc(1, sizeof(IsoBoot)); if (new == NULL) { - ret = ISO_OUT_OF_MEM; - free(name); - goto ex; + ret = ISO_OUT_OF_MEM; goto ex; } bootcat = (IsoBoot *) new; bootcat->lba = data->sections[0].block; @@ -2924,10 +2936,7 @@ if (bootcat->size > 0) { bootcat->content = calloc(1, bootcat->size); if (bootcat->content == NULL) { - ret = ISO_OUT_OF_MEM; - free(name); - free(new); - goto ex; + ret = ISO_OUT_OF_MEM; goto ex; } to_copy = bootcat->size; if (bootcat->size > fsdata->catsize) @@ -2944,16 +2953,14 @@ IsoFile *file; ret = iso_file_source_stream_new(src, &stream); - if (ret < 0) { - free(name); + if (ret < 0) goto ex; - } + /* take a ref to the src, as stream has taken our ref */ iso_file_source_ref(src); file = calloc(1, sizeof(IsoFile)); if (file == NULL) { - free(name); iso_stream_unref(stream); {ret = ISO_OUT_OF_MEM; goto ex;} } @@ -2977,7 +2984,6 @@ data->block_size_log2, data->uncompressed_size, 0); if (ret < 0) { - free(name); iso_stream_unref(stream); goto ex; } @@ -3008,7 +3014,6 @@ ret = iso_msg_submit(image->id, ISO_EL_TORITO_WARN, 0, "More than one ISO node has been found for the same boot image."); if (ret < 0) { - free(name); iso_stream_unref(stream); goto ex; } @@ -3026,7 +3031,6 @@ /* source is a directory */ new = calloc(1, sizeof(IsoDir)); if (new == NULL) { - free(name); {ret = ISO_OUT_OF_MEM; goto ex;} } new->type = LIBISO_DIR; @@ -3042,12 +3046,10 @@ ret = iso_file_source_readlink(src, dest, LIBISOFS_NODE_PATH_MAX); if (ret < 0) { - free(name); goto ex; } link = calloc(1, sizeof(IsoSymlink)); if (link == NULL) { - free(name); {ret = ISO_OUT_OF_MEM; goto ex;} } link->dest = strdup(dest); @@ -3068,8 +3070,7 @@ IsoSpecial *special; special = calloc(1, sizeof(IsoSpecial)); if (special == NULL) { - free(name); - {ret = ISO_OUT_OF_MEM; goto ex;} + ret = ISO_OUT_OF_MEM; goto ex; } special->dev = info.st_rdev; special->node.type = LIBISO_SPECIAL; @@ -3080,11 +3081,12 @@ new->refcount = 0; } break; + default: + ret = ISO_BAD_ISO_FILETYPE; goto ex; } - /* fill fields */ new->refcount++; - new->name = name; + new->name = name; name = NULL; new->mode = info.st_mode; new->uid = info.st_uid; new->gid = info.st_gid; @@ -3099,7 +3101,7 @@ ret = src_aa_to_node(src, new, 0); if (ret < 0) { - goto failure; + goto ex; } /* Attach ino as xinfo if valid and no IsoStream is involved */ @@ -3107,18 +3109,17 @@ !fsdata->make_new_ino) { ret = iso_node_set_ino(new, info.st_ino, 0); if (ret < 0) - goto failure; + goto ex; } - *node = new; + *node = new; new = NULL; {ret = ISO_SUCCESS; goto ex;} -failure:; - /* todo: stuff any possible memory leak here */ +ex:; if (name != NULL) free(name); - free(new); -ex:; + if (new != NULL) + iso_node_unref(new); LIBISO_FREE_MEM(dest); return ret; } @@ -3568,6 +3569,8 @@ iso_image_set_copyright_file_id(image, data->copyright_file_id); iso_image_set_abstract_file_id(image, data->abstract_file_id); iso_image_set_biblio_file_id(image, data->biblio_file_id); + iso_image_set_pvd_times(image, data->creation_time, + data->modification_time, data->expiration_time, data->effective_time); if (features != NULL) { *features = malloc(sizeof(IsoReadImageFeatures));

@@ -145,6 +145,10 @@ free(image->copyright_file_id); free(image->abstract_file_id); free(image->biblio_file_id); + free(image->creation_time); + free(image->modification_time); + free(image->expiration_time); + free(image->effective_time); if (image->used_inodes != NULL) free(image->used_inodes); if (image->system_area_data != NULL) @@ -335,6 +339,37 @@ return image->biblio_file_id; } +int iso_image_set_pvd_times(IsoImage *image, + char *creation_time, char *modification_time, + char *expiration_time, char *effective_time) +{ + if (creation_time == NULL || modification_time == NULL || + expiration_time == NULL || effective_time == NULL) + return ISO_NULL_POINTER; + image->creation_time = strdup(creation_time); + image->modification_time = strdup(modification_time); + image->expiration_time = strdup(expiration_time); + image->effective_time = strdup(effective_time); + if (image->creation_time == NULL || image->modification_time == NULL || + image->expiration_time == NULL || image->effective_time == NULL) + return ISO_OUT_OF_MEM; + return ISO_SUCCESS; +} + +int iso_image_get_pvd_times(IsoImage *image, + char **creation_time, char **modification_time, + char **expiration_time, char **effective_time) +{ + if (image->creation_time == NULL || image->modification_time == NULL || + image->expiration_time == NULL || image->effective_time == NULL) + return ISO_NULL_POINTER; + *creation_time = image->creation_time; + *modification_time = image->modification_time; + *expiration_time = image->expiration_time; + *effective_time = image->effective_time; + return ISO_SUCCESS; +} + int iso_image_get_msg_id(IsoImage *image) { return image->id;

@@ -49,6 +49,10 @@ char *copyright_file_id; char *abstract_file_id; char *biblio_file_id; + char *creation_time; + char *modification_time; + char *expiration_time; + char *effective_time; /* el-torito boot catalog */ struct el_torito_boot_catalog *bootcat; @@ -234,4 +238,8 @@ uint32_t idx_count, int flag); +int iso_image_set_pvd_times(IsoImage *image, + char *creation_time, char *modification_time, + char *expiration_time, char *effective_time); + #endif /*LIBISO_IMAGE_H_*/

@@ -4,7 +4,7 @@ /* * Copyright (c) 2007-2008 Vreixo Formoso, Mario Danic - * Copyright (c) 2009-2012 Thomas Schmitt + * Copyright (c) 2009-2013 Thomas Schmitt * * This file is part of the libisofs project; you can redistribute it and/or * modify it under the terms of the GNU General Public License version 2 @@ -84,7 +84,7 @@ */ #define iso_lib_header_version_major 1 #define iso_lib_header_version_minor 2 -#define iso_lib_header_version_micro 6 +#define iso_lib_header_version_micro 8 /** * Get version of the libisofs library at runtime. @@ -3028,6 +3028,36 @@ const char *iso_image_get_biblio_file_id(const IsoImage *image); /** + * Get the four timestamps from the Primary Volume Descriptor of the imported + * ISO image. The timestamps are strings which are either empty or consist + * of 17 digits of the form YYYYMMDDhhmmsscc. + * None of the returned string pointers shall be used for altering or freeing + * data. They are just for reading. + * + * @param image + * The image to be inquired. + * @param vol_creation_time + * Returns a pointer to the Volume Creation time: + * When "the information in the volume was created." + * @param vol_modification_time + * Returns a pointer to Volume Modification time: + * When "the information in the volume was last modified." + * @param vol_expiration_time + * Returns a pointer to Volume Expiration time: + * When "the information in the volume may be regarded as obsolete." + * @param vol_effective_time + * Returns a pointer to Volume Expiration time: + * When "the information in the volume may be used." + * @return + * ISO_SUCCESS or error + * + * @since 1.2.8 + */ +int iso_image_get_pvd_times(IsoImage *image, + char **creation_time, char **modification_time, + char **expiration_time, char **effective_time); + +/** * Create a new set of El-Torito bootable images by adding a boot catalog * and the default boot image. * Further boot images may then be added by iso_image_add_boot_image(). @@ -7424,11 +7454,14 @@ /** Too many chained symbolic links (FAILURE, HIGH, -395) */ #define ISO_DEEP_SYMLINK 0xE830FE75 +/** Unrecognized file type in ISO image (FAILURE, HIGH, -396) */ +#define ISO_BAD_ISO_FILETYPE 0xE830FE74 + /* Internal developer note: Place new error codes directly above this comment. Newly introduced errors must get a message entry in - libisofs/message.c, function iso_error_to_msg() + libisofs/messages.c, function iso_error_to_msg() */ /* ! PLACE NEW ERROR CODES ABOVE. NOT AFTER THIS LINE ! */

@@ -1,5 +1,5 @@ /* - * Copyright (c) 2009 Thomas Schmitt + * Copyright (c) 2009 - 2013 Thomas Schmitt * * This file is part of the libisofs project; you can redistribute it and/or * modify it under the terms of the GNU General Public License version 2 @@ -527,18 +527,25 @@ if (md5_pt == NULL) return 0; - ret = iso_node_lookup_attr(node, "isofs.cx", &value_length, - &value, 0); - if (ret == 1 && value_length == 4) { - for (i = 0; i < 4; i++) - idx = (idx << 8) | ((unsigned char *) value)[i]; - if (idx > 0 && idx <= target->checksum_idx_counter) { - memcpy(target->checksum_buffer + 16 * idx, md5_pt, 16); + if (!target->will_cancel) { + ret = iso_node_lookup_attr(node, "isofs.cx", &value_length, + &value, 0); + if (ret == 1 && value_length == 4) { + for (i = 0; i < 4; i++) + idx = (idx << 8) | ((unsigned char *) value)[i]; + if (idx > 0 && idx <= target->checksum_idx_counter) { + memcpy(target->checksum_buffer + 16 * idx, md5_pt, 16); + } } + if (value != NULL) + free(value); + + /* ts B30114 : It is unclear why these are removed here. + At least with the opts->will_cancel runs, + this is not appropriate. + */ + iso_node_remove_xinfo(node, checksum_md5_xinfo_func); } - if (value != NULL) - free(value); - iso_node_remove_xinfo(node, checksum_md5_xinfo_func); iso_node_remove_xinfo(node, checksum_cx_xinfo_func); } } else if (node->type == LIBISO_DIR) {

@@ -500,6 +500,8 @@ return "Symbolic link cannot be resolved"; case ISO_DEEP_SYMLINK: return "Too many chained symbolic links"; + case ISO_BAD_ISO_FILETYPE: + return "Unrecognized file type in ISO image"; default: return "Unknown error"; }

@@ -261,7 +261,7 @@ if (o->jtemplate_out == NULL) return 0; - memset(md5, 0, sizeof(md5)); + memset(md5, 0, 16); /* Cheaper to check file size first */ if (size < o->jte_min_size)

@@ -191,7 +191,7 @@ putu32(ctx->buf[1], digest + 4); putu32(ctx->buf[2], digest + 8); putu32(ctx->buf[3], digest + 12); - memset(ctx, 0, sizeof(ctx)); /* In case it's sensitive */ + memset(ctx, 0, sizeof(*ctx)); /* In case it's sensitive */ } /* The four core functions - F1 is optimized somewhat */

@@ -1,7 +1,7 @@ #! /bin/sh # libtoolT - Provide generalized library-building support services. -# Generated automatically by (GNU libisoburn 1.2.5) +# Generated automatically by (GNU libisoburn 1.2.7) # NOTE: Changes made to this file will be lost: look at ltmain.sh. # # Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001

@@ -134,6 +134,7 @@ strcpy(m->list_delimiter, "--"); m->ino_behavior= 7; m->iso_level= 3; + m->iso_level_is_default= 1; m->do_joliet= 0; m->do_hfsplus= 0; m->do_fat= 0; @@ -148,6 +149,7 @@ m->scdbackup_tag_written[0]= 0; m->scdbackup_tag_listname[0]= 0; m->relax_compliance= 0; + m->allow_dir_id_ext_dflt= 1; m->rr_reloc_dir[0]= 0; m->rr_reloc_flags= 1; m->untranslated_name_len= 0; @@ -241,6 +243,7 @@ m->boot_image_bin_path[0]= 0; m->boot_image_bin_form[0]= 0; m->boot_image_emul= 0; + m->boot_emul_default= 1; m->boot_image_load_size= 4 * 512; /* hearsay out of libisofs/demo/iso.c */ memset(m->boot_id_string, 0, sizeof(m->boot_id_string)); memset(m->boot_selection_crit, 0, sizeof(m->boot_selection_crit));

@@ -14071,10 +14071,14 @@ libisoburn/libisoburn.h libisoburn.h was missing in commit 4941 - [] +2013.01.08.103001 [4944] Makefile.am Had to add xorriso-tcltk to EXTRA_DIST although it is in bin_SCRIPTS +2013.01.08.103001 [4945] +xorriso/xorriso_makefile_am.txt +Had to add xorriso-tcltk to EXTRA_DIST although it is in bin_SCRIPTS + ----------------------------------- release - xorriso-1.2.6 - 2013.01.08.103001 =============================================================================== * Bug fix: SIGSEGV by uninitialized local variable with @@ -14098,7 +14102,7 @@ * Proof-of-concept of a GUI frontend program: xorriso-tcltk written in Tcl/Tk. - [] +2013.01.08.151611 [4950] configure.ac README libisoburn/libisoburn.h @@ -14122,33 +14126,257 @@ xorriso/xorrecord.info Version leap to libisoburn-1.2.7 - [] +08 Jan 2013 [4951] ChangeLog xorriso/changelog.txt Documented changes and release timestamp - [] +08 Jan 2013 [4952] svn move -m Promoted branch to tag http://svn.libburnia-project.org/libisoburn/branches/1.2.6 http://svn.libburnia-project.org/libisoburn/tags/1.2.6 ------------------------------------- cycle - xorriso-1.2.7 - +------------------------------------ cycle - xorriso-1.2.7 - 2013.01.08.151611 - [] +09 Jan 2013 [4953] +frontend/xorriso-tcltk +For now only demanding xorriso >= 1.2.6 for xorriso-tcltk-1.2.7 + +11 Jan 2013 [4954] +xorriso/xorriso_eng.html +Presenting xorriso-tcltk on the GNU xorriso web page + +2013.01.13.093116 [4957] +xorriso/match.c +Curbed the number of wildcard warnings to 3 for iso and 3 for disk + +2013.01.13.102527 [4958] +configure.ac +libisoburn/libisoburn.h +Requiring libburn-1.2.7 + +2013.01.13.200742 [4959] +libisoburn/libisoburn.h +libisoburn/isoburn.h +libisoburn/burn_wrap.c +libisoburn/libisoburn.ver +New API call isoburn_toc_disc_get_incmpl_sess() + +2013.01.14.094419 [4960] +xorriso/drive_mgt.c +Making use of new libisoburn API call to show incomplete sessions + +2013.01.15.104804 [4962] +frontend/xorriso-tcltk +frontend/README-tcltk +New feature "Log non-essential commands" and --script_log_all_commands + +15 Jan 2013 [4963] +xorriso/xorriso.texi +xorriso/xorriso.1 +xorriso/xorriso.info +Clarified meaning of "After commit" prediction of -tell_media_space + +16 Jan 2013 [4964] +xorriso/xorriso_eng.html +ChangeLog +Updated change log and web page + +2013.01.16.181831 [4967] +xorriso/emulators.c +xorriso/opts_p_z.c +Updated copyright message of xorriso + +------------------------------------ cycle - xorriso-1.2.7 - 2013.01.16.181831 +* Bug fix: -print_size and -tell_media_space altered the pointers to MD5 + of data files which stem from a previous session. This produced + false mismatches with -check_md5_r. +* Bug fix: CD tracks were reported with the sizes of the tracks in the + first session. + + +12 Feb 2013 [4968] +doc/faq.wiki +Mentioned xorriso-tcltk in the online FAQ + +12 Feb 2013 [4969] +doc/faq.wiki +Improved mentioning of xorriso-tcltk in the online FAQ + +2013.02.18.104738 [4970] +xorriso/emulators.c +xorriso/xorrisofs.texi +xorriso/xorrisofs.info +xorriso/xorrisofs.1 +New -as mkisofs options -eltorito-id , -eltorito-selcrit + +18 Feb 2012 [4971] +xorriso/xorriso_eng.html +ChangeLog +Updated change log and web page + +------------------------------------ cycle - xorriso-1.2.7 - 2013.02.18.104738 +* New -as mkisofs options -eltorito-id , -eltorito-selcrit + + +2013.02.26.082331 [4973] +xorriso/check_media.c +Corrected wrong use of sizeof + +2013.02.26.103233 [4974] +xorriso/drive_mgt.c +Bug fix: -check_media use=outdev sector_map= stored TOC of input drive + +2013.03.06.164347 [4983] +xorriso/iso_manip.c +Bug fix: -hide hfsplus and -as mkisofs -hide-hfsplus had no effect. Thanks to Davy Ho. + +2013.03.06.164906 [4984] +xorriso/drive_mgt.c +With -list_speeds : reporting the effective speed 0 if it deviates from speed H + +2013.03.10.193344 [4985] +xorriso/xorriso_private.h +xorriso/base_obj.c +xorriso/opts_a_c.c +xorriso/emulators.c +xorriso/write_run.c +xorriso/xorriso.texi +xorriso/xorriso.info +xorriso/xorriso.1 +Improved interaction of -as mkisofs command with other commands + +10 Mar 2013 [4986] xorriso/xorriso_eng.html ChangeLog Updated change log and web page ------------------------------------- cycle - xorriso-1.2.7 - +------------------------------------ cycle - xorriso-1.2.7 - 2013.03.10.193344 +* Bug fix: -check_media use=outdev sector_map= stored TOC of input drive +* Bug fix: -hide hfsplus and -as mkisofs -hide-hfsplus had no effect. + Thanks to Davy Ho. + + +2013.03.12.124913 [4988] +configure.ac +libisoburn/libisoburn.h +Requiring libisofs-1.2.7 + +2013.03.12.194637 [4989] +xorriso/write_run.c +Prevented rollover of El Torito Sector Count of large EFI boot images + +2013.03.12.194842 [4990] +configure.ac +xorriso/misc_funct.c +xorriso/xorriso.texi +xorriso/xorriso.info +xorriso/xorriso.1 +Corrected the interpretation of user supplied ECMA-119 timestamp strings + +2013.03.12.195052 [4991] +xorriso/xorriso.h +xorriso/iso_img.c +xorriso/text_io.c +xorriso/xorriso.texi +xorriso/xorriso.info +xorriso/xorriso.1 +Reporting volume timestamps with -pvd_info + +2013.03.13.195851 [4992] +xorriso/xorriso.h +xorriso/parse_exec.c +xorriso/opts_d_h.c +xorriso/opts_i_o.c +xorriso/xorriso.texi +xorriso/xorriso.info +xorriso/xorriso.1 +libisoburn/libisoburn.ver +New command -move + +2013.03.17.110559 [4993] +configure.ac +Bug fix: ./configure did not abort if libburn.h or libisofs.h were missing + +18 Mar 2013 [5000] +svn copy -m Branching for libisoburn release 1.2.8 +http://svn.libburnia-project.org/libisoburn/trunk +http://svn.libburnia-project.org/libisoburn/branches/1.2.8 + +18 Mar 2013 [5001] +frontend/xorriso-tcltk +frontend/README-tcltk +Making use of command -move in xorriso-tcltk + +2013.03.18.093001 [5002] +configure.ac +README +libisoburn/libisoburn.h +xorriso/README_gnu_xorriso +xorriso/xorriso.h +xorriso/xorrisoburn.h +xorriso/xorriso_main.c +xorriso/xorriso_eng.html +xorriso/make_xorriso_standalone.sh +xorriso/configure_ac.txt +frontend/xorriso-tcltk +xorriso/xorriso_timestamp.h +xorriso/xorriso.texi +xorriso/xorriso.1 +xorriso/xorriso.info +xorriso/xorrisofs.texi +xorriso/xorrisofs.1 +xorriso/xorrisofs.info +xorriso/xorrecord.texi +xorriso/xorrecord.1 +xorriso/xorrecord.info +Version leap to libisoburn-1.2.8 + +18 Mar 2013 [5003] +ChangeLog +xorriso/changelog.txt +Documented changes and release timestamp + +----------------------------------- release - xorriso-1.2.8 - 2013.03.18.093001 +* Bug fix: -tell_media_space altered the pointers to MD5 of data files + which stem from a previous session. This produced false + mismatches with -check_md5_r. +* Bug fix: CD tracks were reported with the sizes of the tracks in the + first session. +* Bug fix: -check_media use=outdev sector_map= stored TOC of input drive +* Bug fix: -hide hfsplus and -as mkisofs -hide-hfsplus had no effect. + Thanks to Davy Ho. +* Bug fix: ./configure did not abort if libburn.h or libisofs.h were missing +* New command -move +* New -as mkisofs options -eltorito-id , -eltorito-selcrit + + +18 Mar 2013 [] +frontend/xorriso-tcltk +frontend/README-tcltk +Making use of command -move in xorriso-tcltk + + +------------------------------------ cycle - xorriso-1.2.9 - +* New command -move +* Bug fix: ./configure did not abort if libburn.h or libisofs.h were missing + + + [] +xorriso/xorriso_eng.html +ChangeLog +Updated change log and web page +------------------------------------ cycle - xorriso-1.2.9 - [] xorriso/xorriso_eng.html ChangeLog Updated change log and web page ------------------------------------- cycle - xorriso-1.2.7 - +------------------------------------ cycle - xorriso-1.2.9 - + ********************************************************************** @@ -14164,14 +14392,6 @@ - make optional use of ttk::treeview instead of BWidget (needs Tk 8.5) ->>> on BD-RE --as cdrecord -v dev='/dev/sr5' blank=as_needed --as cdrecord -v --grow_overwriteable_iso dev='/dev/sr5' '/dvdbuffer/mini.iso' -multi stream_recording=32s --as cdrecord -v --grow_overwriteable_iso dev='/dev/sr5' '/dvdbuffer/mini.iso' -multi stream_recording=32s -The second burn on appendable BD-RE does not activate the new session. - - ->>> Command -rename with unambigous semantics ? >>> The call of Xorriso_remake_hln_array() lasts long even after small

@@ -1,7 +1,7 @@ /* xorriso - creates, loads, manipulates and burns ISO 9660 filesystem images. - Copyright 2007-2011 Thomas Schmitt, <scdbackup@gmx.net> + Copyright 2007-2013 Thomas Schmitt, <scdbackup@gmx.net> Provided under GPL version 2 or later. @@ -282,11 +282,11 @@ int Sectorbitmap_from_file(struct SectorbitmaP **o, char *path, char *msg, int *os_errno, int flag) { - int ret, fd= -1, sectors, sector_size, i, todo, map_size, skip; + int ret, fd= -1, sectors, sector_size, i, todo, map_size, skip, bufsize= 1024; unsigned char *map; unsigned char *buf; - buf= TSOB_FELD(unsigned char, 1024); + buf= TSOB_FELD(unsigned char, bufsize); if(buf == NULL) return(-1); @@ -320,8 +320,8 @@ sscanf(((char *) buf) + 25, "%d", &skip); if(skip < 0) {ret= 0; goto wrong_filetype;} - for(i= 0; i < skip; i+= sizeof(buf)) { - todo= sizeof(buf); + for(i= 0; i < skip; i+= bufsize) { + todo= bufsize; if(i + todo > skip) todo= skip - i; ret= read(fd, buf, todo); @@ -345,8 +345,8 @@ } map= (*o)->map; map_size= (*o)->map_size; - for(i= 0; i < map_size; i+= sizeof(buf)) { - todo= sizeof(buf); + for(i= 0; i < map_size; i+= bufsize) { + todo= bufsize; if(i + todo > map_size) todo= map_size - i; ret= read(fd, buf, todo);

@@ -769,7 +769,8 @@ } -/* @param flag bit2=do not try to read ISO heads +/* @param flag bit1=report about output drive rather than input drive + bit2=do not try to read ISO heads */ int Xorriso_toc_to_string(struct XorrisO *xorriso, char **toc_text, int flag) { @@ -780,7 +781,7 @@ ret= Xorriso_push_outlists(xorriso, &stack_handle, 1); if(ret <= 0) goto ex; - toc_ret= Xorriso_toc(xorriso, flag & 4); + toc_ret= Xorriso_toc(xorriso, flag & (2 | 4)); ret= Xorriso_pull_outlists(xorriso, stack_handle, &results, &infos, 0); if(ret <= 0) goto ex; @@ -941,6 +942,7 @@ int last_track_start= 0, last_track_size= -1, num_data= 0, is_data= 0; int is_inout_drive= 0, drive_role, status, num_formats, emul_lba; int not_recognizable= 0, start_lba, end_lba; + int sessions_seen, open_sessions= 0, have_real_open_session= 0; char profile_name[80],*respt,*devadr, *typetext= ""; struct burn_toc_entry toc_entry; struct burn_drive_info *dinfo; @@ -1194,11 +1196,16 @@ } else { num_data= 0; sessions= isoburn_toc_disc_get_sessions(disc, &num_sessions); - for (session_no= 0; session_no<num_sessions && !(xorriso->request_to_abort); + open_sessions= isoburn_toc_disc_get_incmpl_sess(disc); + for (session_no= 0; + session_no < num_sessions + open_sessions && + !(xorriso->request_to_abort); session_no++) { tracks= isoburn_toc_session_get_tracks(sessions[session_no], &num_tracks); - if (tracks==NULL) + if (tracks == NULL || num_tracks <= 0) continue; + if(session_no == num_sessions + open_sessions - 1 && open_sessions > 0) + have_real_open_session= 1; for(track_no= 0; track_no<num_tracks && !(xorriso->request_to_abort); track_no++) { track_count++; @@ -1236,7 +1243,12 @@ image_blocks= track_size; } } - if(ret>0 && track_no==0) { + if(session_no >= num_sessions && track_no == 0) { + if(ret <= 0) + volume_id[0]= 0; + sprintf(respt, "Incmp session: %3d , %9d , %9ds , %s\n", + session_no+1, lba, image_blocks, volume_id); + } else if(ret>0 && track_no==0) { sprintf(respt, "ISO session : %3d , %9d , %9ds , %s\n", session_no+1, lba, image_blocks , volume_id); } else if(ret>0) { @@ -1289,8 +1301,11 @@ */ Sfile_scale(((double) num_data) * 2048.0, mem_text,5,1e4,1); + sessions_seen= num_sessions + open_sessions; + if(open_sessions > 0 && !have_real_open_session) + sessions_seen--; sprintf(respt, "Media summary: %d session%s, %d data blocks, %s data", - num_sessions, (num_sessions==1 ? "" : "s"), num_data, mem_text); + sessions_seen, (sessions_seen == 1 ? "" : "s"), num_data, mem_text); if(num_data_from_format) num_free= 0; else @@ -1309,10 +1324,15 @@ Xorriso_toc_line(xorriso, flag & 8); } } - if(profile_no == 0x41 && num_sessions >= 300) { + if(profile_no == 0x41 && sessions_seen >= 300) { sprintf(xorriso->info_text, "Sequential BD-R medium now contains %d sessions. It is likely to soon fail writing.", - num_sessions); + sessions_seen); + Xorriso_msgs_submit(xorriso, 0, xorriso->info_text, 0, "WARNING", 0); + } + + if(have_real_open_session) { + sprintf(xorriso->info_text, "Incomplete session encountered !"); Xorriso_msgs_submit(xorriso, 0, xorriso->info_text, 0, "WARNING", 0); } @@ -1682,6 +1702,14 @@ sprintf(respt + strlen(respt), " %5dk , %4.1fx%s\n", high, ((double) high) * 1000.0 / speed_factor, speed_unit); Xorriso_result(xorriso,0); + ret= burn_drive_get_best_speed(drive, 0, &item, 2); + if(ret > 0 && item != NULL) + if(item->write_speed != high) { + sprintf(respt, "Write speed 0: %5dk , %4.1fx%s\n", + item->write_speed, + ((double) item->write_speed) * 1000.0 / speed_factor, speed_unit); + Xorriso_result(xorriso,0); + } } else { sprintf(xorriso->info_text, "Could not get any write speed information from drive"); @@ -2886,7 +2914,8 @@ goto ex; } } - Xorriso_toc_to_string(xorriso, &toc_info, 4 * !job->map_with_volid); + Xorriso_toc_to_string(xorriso, &toc_info, + (2 * !!job->use_dev) | (4 * !job->map_with_volid)); } ret= Xorriso_open_job_data_to(xorriso, job, 0); if(ret <= 0)

@@ -1,7 +1,7 @@ /* xorriso - creates, loads, manipulates and burns ISO 9660 filesystem images. - Copyright 2007-2012 Thomas Schmitt, <scdbackup@gmx.net> + Copyright 2007-2013 Thomas Schmitt, <scdbackup@gmx.net> Provided under GPL version 2 or later. @@ -397,7 +397,7 @@ /* Perform actions */ Xorriso_option_report_about(xorriso, "NOTE", 0); if(do_version) { - sprintf(xorriso->result_line, "Cdrecord 2.01-Emulation Copyright (C) 2012 see libburnia-project.org xorriso\n"); + sprintf(xorriso->result_line, "Cdrecord 2.01-Emulation Copyright (C) 2013 see libburnia-project.org xorriso\n"); Xorriso_result(xorriso, 1); Xorriso_option_version(xorriso, 0); } @@ -589,7 +589,8 @@ static char arg1_options[][41]= { "-abstract", "-A", "-appid", "-biblio", "-b", "-B", "-boot-load-seg", "-boot-load-size", "-C", "-c", "-check-session", "-copyright", - "-dir-mode", "-file-mode", "-G", "-gid", "-hide", "-hide-list", + "-dir-mode", "-eltorito-id", "-eltorito-selcrit", + "-file-mode", "-G", "-gid", "-hide", "-hide-list", "-hidden", "-hidden-list", "-hide-joliet", "-hide-joliet-list", "-hide-hfsplus", "-hide-hfsplus-list", "-hide-udf", "-hide-udf-list", "-input-charset", "-output-charset", @@ -702,20 +703,13 @@ } -int Xorriso_genisofs_add_boot(struct XorrisO *xorriso, char *whom, - int *option_b, int *emul_boot, int flag) +int Xorriso_genisofs_add_boot(struct XorrisO *xorriso, int flag) { int ret; - if(*option_b) - xorriso->boot_image_emul= *emul_boot; - else - xorriso->boot_image_emul= 0; ret= Xorriso_attach_boot_image(xorriso, 0); if(ret <= 0) xorriso->boot_image_bin_path[0]= 0; - *option_b= 0; - *emul_boot= 2; return(ret); } @@ -823,6 +817,8 @@ " -hard-disk-boot Boot image is a hard disk image", " -no-emul-boot Boot image is 'no emulation' image", " -boot-info-table Patch boot image with info table", +" -eltorito-id ID Set El Torito Id String", +" -eltorito-selcrit HEXBYTES Set El Torito Selection Criteria", " -isohybrid-gpt-basdat Mark El Torito boot image as Basic Data in GPT", " -isohybrid-gpt-hfsplus Mark El Torito boot image as HFS+ in GPT", " -isohybrid-apm-hfsplus Mark El Torito boot image as HFS+ in APM", @@ -1092,9 +1088,10 @@ int argc, char **argv, int flag) { int ret, i, j, was_path= 0, was_other_option= 0, mem_graft_points, mem; - int do_print_size= 0, fd, idx, iso_level= 1, emul_boot= 2; - int option_b= 0, was_failure= 0, fret, lower_r= 0, zero= 0; - int dir_mode= -1, file_mode= -1, count, partition_number, allow_dir_id_ext= 1; + int do_print_size= 0, fd, idx, iso_level= -1; + int was_failure= 0, fret, lower_r= 0, zero= 0; + int dir_mode= -1, file_mode= -1, count, partition_number; + int allow_dir_id_ext= -1; int root_seen= 0, do_md5_mem, option_d= 0, arg_count; mode_t mode_and, mode_or; int with_boot_image= 0, with_cat_path= 0, with_emul_toc= 0; @@ -1172,7 +1169,7 @@ continue; if(strcmp(argpt, "-version")==0) { sprintf(xorriso->result_line, -"mkisofs 2.01-Emulation Copyright (C) 2012 see libburnia-project.org xorriso\n" +"mkisofs 2.01-Emulation Copyright (C) 2013 see libburnia-project.org xorriso\n" ); fd= xorriso->dev_fd_1; if(fd<0) @@ -1695,6 +1692,8 @@ strcmp(argpt, "-c") == 0 || strcmp(argpt, "-eltorito-catalog") == 0 || strcmp(argpt, "-boot-load-size") == 0 || + strcmp(argpt, "-eltorito-id") == 0 || + strcmp(argpt, "-eltorito-selcrit") == 0 || strcmp(argpt, "--embedded-boot")==0 || strcmp(argpt, "-generic-boot")==0 || strcmp(argpt, "-G") == 0 || @@ -2070,10 +2069,14 @@ /* Enforce odd mkisofs defaults on first pathspec */ xorriso->pacifier_style= 1; + if(xorriso->allow_dir_id_ext_dflt && allow_dir_id_ext < 0) + allow_dir_id_ext= 1; if(allow_dir_id_ext == 1) { Xorriso_relax_compliance(xorriso, "allow_dir_id_ext", 0); allow_dir_id_ext= 2; } + if(xorriso->iso_level_is_default && iso_level < 0) + iso_level= 1; if(iso_level >= 1 && iso_level <= 3) { sprintf(sfe, "iso_9660_level=%d", iso_level); Xorriso_relax_compliance(xorriso, sfe, 0); @@ -2167,9 +2170,11 @@ else argpt= argv[i]; if(strcmp(argpt, "-no-emul-boot")==0) { - emul_boot= xorriso->boot_image_emul= 0; + xorriso->boot_image_emul= 0; + xorriso->boot_emul_default= 0; } else if(strcmp(argpt, "-hard-disk-boot")==0) { - emul_boot= xorriso->boot_image_emul= 1; + xorriso->boot_image_emul= 1; + xorriso->boot_emul_default= 0; } else if(strcmp(argpt, "-boot-info-table")==0) { xorriso->patch_isolinux_image= (xorriso->patch_isolinux_image & ~2) | 1; } else if(strcmp(argpt, "-b") == 0 || @@ -2179,14 +2184,14 @@ i++; if(strcmp(argpt, "--efi-boot") == 0) { if(xorriso->boot_image_bin_path[0]) { - ret= Xorriso_genisofs_add_boot(xorriso, whom, - &option_b, &emul_boot, 0); + ret= Xorriso_genisofs_add_boot(xorriso, 0); if(ret <= 0) goto problem_handler_boot; } boot_path= xorriso->boot_image_bin_path; xorriso->boot_efi_default= 1; - emul_boot= xorriso->boot_image_emul= 0; + xorriso->boot_image_emul= 0; + xorriso->boot_emul_default= 0; } else { boot_path= xorriso->boot_image_bin_path; @@ -2195,8 +2200,8 @@ else xorriso->boot_platform_id= 0x00; xorriso->boot_efi_default= 0; - option_b= 1; - xorriso->boot_image_emul= emul_boot; + if(xorriso->boot_emul_default) + xorriso->boot_image_emul= 2; } boot_path[0]= 0; if(argv[i][0] != '/') @@ -2205,10 +2210,7 @@ if(ret <= 0) goto ex; if(xorriso->boot_efi_default && xorriso->boot_image_bin_path[0]) { - option_b= 0; - emul_boot= 0; - ret= Xorriso_genisofs_add_boot(xorriso, whom, - &option_b, &emul_boot, 0); + ret= Xorriso_genisofs_add_boot(xorriso, 0); if(ret <= 0) goto problem_handler_boot; } @@ -2234,6 +2236,18 @@ i++; sscanf(argv[i], "%d", &ret); xorriso->boot_image_load_size= ret * 512; + } else if(strcmp(argpt, "-eltorito-id") == 0 || + strcmp(argpt, "-eltorito-selcrit") == 0) { + if(i+1>=argc) + goto not_enough_args; + i++; + if(strcmp(argpt, "-eltorito-id") == 0) + sprintf(sfe, "id_string=%s", argv[i]); + else + sprintf(sfe, "sel_crit=%s", argv[i]); + ret= Xorriso_option_boot_image(xorriso, "any", sfe, 0); + if(ret <= 0) + goto problem_handler_boot; } else if(strncmp(argpt, "isolinux_mbr=", 13)==0) { sprintf(sfe, "isohybrid=%s", argpt + 13); ret= Xorriso_option_boot_image(xorriso, "isolinux", sfe, 0); @@ -2248,8 +2262,7 @@ } else if(strcmp(argpt, "-isohybrid-apm-hfsplus") == 0) { xorriso->patch_isolinux_image = xorriso->patch_isolinux_image | (1 << 8); } else if(strcmp(argpt, "-eltorito-alt-boot")==0) { - ret= Xorriso_genisofs_add_boot(xorriso, whom, - &option_b, &emul_boot, 0); + ret= Xorriso_genisofs_add_boot(xorriso, 0); if(ret <= 0) goto problem_handler_boot; } else if(strcmp(argpt, "--embedded-boot")==0 || @@ -2341,11 +2354,6 @@ } if(with_boot_image && with_cat_path == 0) strcpy(xorriso->boot_image_cat_path, "/boot.catalog"); - if(xorriso->boot_image_bin_path[0]) { - ret= Xorriso_genisofs_add_boot(xorriso, whom, &option_b, &emul_boot, 0); - if(ret <= 0) - goto ex; - } /* The boot catalog has to be hidden separately */ if(xorriso->boot_image_cat_path[0]) { ret= Xorriso_path_is_hidden(xorriso, xorriso->boot_image_cat_path, 0);

@@ -1,7 +1,7 @@ /* xorriso - creates, loads, manipulates and burns ISO 9660 filesystem images. - Copyright 2007-2012 Thomas Schmitt, <scdbackup@gmx.net> + Copyright 2007-2013 Thomas Schmitt, <scdbackup@gmx.net> Provided under GPL version 2 or later. @@ -243,7 +243,7 @@ IsoImage *image; struct burn_drive_info *dinfo; struct burn_drive *drive; - char *msg, block_head[8]; + char *msg, block_head[8], *crt, *mdt, *ext, *eft; off_t head_count; msg= xorriso->result_line; @@ -292,6 +292,19 @@ Xorriso_result(xorriso,0); sprintf(msg, "Biblio File : %s\n", xorriso->biblio_file); Xorriso_result(xorriso,0); + + ret= iso_image_get_pvd_times(image, &crt, &mdt, &ext, &eft); + if(ret != ISO_SUCCESS) + crt= mdt= ext= eft= ""; + sprintf(msg, "Creation Time: %s\n", crt); + Xorriso_result(xorriso,0); + sprintf(msg, "Modif. Time : %s\n", mdt); + Xorriso_result(xorriso,0); + sprintf(msg, "Expir. Time : %s\n", ext); + Xorriso_result(xorriso,0); + sprintf(msg, "Eff. Time : %s\n", eft); + Xorriso_result(xorriso,0); + return(1); }

@@ -1,7 +1,7 @@ /* xorriso - creates, loads, manipulates and burns ISO 9660 filesystem images. - Copyright 2007-2012 Thomas Schmitt, <scdbackup@gmx.net> + Copyright 2007-2013 Thomas Schmitt, <scdbackup@gmx.net> Provided under GPL version 2 or later. @@ -166,6 +166,7 @@ bit3= cut_out_node: offset and size are valid bit8= hide in iso_rr bit9= hide in joliet + bit10= hide in hfsplus */ int Xorriso_tree_graft_node(struct XorrisO *xorriso, IsoImage *volume, IsoDir *dir, char *disk_path, char *img_name, @@ -218,8 +219,8 @@ goto ex; } } - if(flag & (256 | 512)) { - ret= Xorriso_set_hidden(xorriso, (void *) *node, "", (flag >> 8) & 3, 0); + if(flag & (256 | 512 | 1024)) { + ret= Xorriso_set_hidden(xorriso, (void *) *node, "", (flag >> 8) & 7, 0); if(ret <= 0) goto ex; }

@@ -1,5 +1,5 @@  - + <html> <head> <meta name="generator" content="groff -Thtml, via man -H, via xorriso/convert_man_to_html.sh"> @@ -1647,5 +1647,5 @@ </td> </table> <hr> -<BR><HR><FONT SIZE=-1><CENTER>(HTML generated from xorrecord.1 on Tue Jan 8 12:05:25 CET 2013 by man_xorrecord_to_html.sh )</CENTER></FONT></body> +<BR><HR><FONT SIZE=-1><CENTER>(HTML generated from xorrecord.1 on Mon Mar 18 11:06:06 CET 2013 by man_xorrecord_to_html.sh )</CENTER></FONT></body> </html>

@@ -1,5 +1,5 @@  - + <html> <head> <meta name="generator" content="groff -Thtml, via man -H, via xorriso/convert_man_to_html.sh"> @@ -1582,7 +1582,8 @@ directories can only be replaced, not merged. Note that if the target directory exists, then -mv inserts the source objects into this directory rather than attempting to -replace it.</p> +replace it. Command -move, on the other hand, would +attempt to replace it.</p>  <p>The commands in this section alter the ISO image and not the local filesystem.</p> @@ -2477,6 +2478,28 @@ <tr valign="top" align="left"> <td width="10%"></td> <td width="89%"> +<p><b>-move</b> iso_rr_path iso_rr_path</p></td> +</table> + +<table width="100%" border=0 rules="none" frame="void" + cols="2" cellspacing="0" cellpadding="0"> +<tr valign="top" align="left"> +<td width="21%"></td> +<td width="77%"> +<p>Rename the file given by the first (origin) iso_rr_path +to the second (destination) iso_rr_path. Deviate from rules +of shell command mv by not moving the origin file underneath +an existing destination directory. The origin file will +rather replace such a directory, if this is allowed by +command -overwrite.</p> +</td> +</table> + +<table width="100%" border=0 rules="none" frame="void" + cols="2" cellspacing="0" cellpadding="0"> +<tr valign="top" align="left"> +<td width="10%"></td> +<td width="89%"> <p><b>-mv</b> iso_rr_path [***] iso_rr_path</p></td> </table>  @@ -2833,7 +2856,14 @@ scdbackup timestamps:<br> YYMMDD[.hhmm[ss]]<br> where "A0" is year 2000, "B0" is 2010, -etc.</p> +etc.<br> +ECMA-119 volume timestamps:<br> +YYYYMMDDhhmmsscc<br> +These are normally given as GMT. The suffix "LOC" +causes local timezone conversion. E.g. 2013010720574700, +2013010720574700LOC. The last two digits cc (centiseconds) +will be ignored, but must be present in order to make the +format recognizable.</p> </td> </table>  @@ -3731,7 +3761,11 @@ "Write speed H" are the best guesses for lower and upper speed limit. "Write speed l" and "Write speed h" may appear only with CD and eventually -override the list of other speed offers.</p> +override the list of other speed offers.<br> +Only if the drive reports contradicting speed information +there will appear "Write speed 0", which tells the +outcome of speed selection by command -speed 0, if it +deviates from "Write speed H".</p> </td> </table>  @@ -4221,8 +4255,8 @@ E.g. 2010040711405800 is 7 Apr 2010 11:40:58 (+0 centiseconds).<br> Timestrings for the other types may be given as with command --alter_date. They are prone to timezone computations. -The timestrings "default" or +-alter_date. Some of them are prone to timezone +computations. The timestrings "default" or "overridden" cause default settings: "c" and "m" will show the current time of image creation. "x" and "f" will be marked as @@ -5819,7 +5853,14 @@ <td width="77%"> <p>Print available space on the output medium and the free space after subtracting already foreseeable consumption by -next -commit.</p> +next -commit.<br> +Note that the title of the prediction "After commit +:" is misleading. It is rather the space that may still +be filled in this session without making the next +-commit fail from medium overflow.<br> +The free space after the next -commit might be smaller +by several MB. This depends on medium type, number of +recorded sessions, and drive habits.</p> </td> </table>  @@ -5836,11 +5877,15 @@ <tr valign="top" align="left"> <td width="21%"></td> <td width="77%"> -<p>Print various ID strings which can be found in loaded ISO -images. Some of them may be changed by commands like --volid or -publisher. For these IDs --pvd_info reports what would be written with the next --commit.</p> +<p>Print various ID strings and timestamps which can be +found in loaded ISO images. Some of the IDs may be changed +by commands like -volid or -publisher. For these +IDs -pvd_info reports what would be written with the +next -commit. The timestamps get not automatically +propagated from loaded image to newly written image. The +ones for new images may be set by command +-volume_date. See there for the meaning of the +particular timestamps.</p> </td> </table>  @@ -7090,9 +7135,15 @@ (= "UPDATE") and -quiet (= "SORRY") persist. The output file persists until things happen like -commit, -rollback, --dev, or end of <b>xorriso</b>. -pacifier gets -set to "mkisofs" if files are added to the -image.<br> +-dev, or end of <b>xorriso</b>.<br> +Options which affect all file objects in the ISO image, like +-r or -dir-mode, will be applied only to +files which are present in the ISO image when the command +-as ends. If you use several -as mkisofs +commands in the same run, then consider to put such options +into the last -as command.<br> +-pacifier gets set to "mkisofs" if files are +added to the image.<br> -graft-points is equivalent to -pathspecs on. Note that pathspecs without "=" are interpreted differently than with <b>xorriso</b> command @@ -9086,5 +9137,5 @@ </td> </table> <hr> -<BR><HR><FONT SIZE=-1><CENTER>(HTML generated from xorriso.1 on Tue Jan 8 12:05:24 CET 2013 by man_xorriso_to_html.sh )</CENTER></FONT></body> +<BR><HR><FONT SIZE=-1><CENTER>(HTML generated from xorriso.1 on Mon Mar 18 11:06:06 CET 2013 by man_xorriso_to_html.sh )</CENTER></FONT></body> </html>

@@ -1,5 +1,5 @@  - + <html> <head> <meta name="generator" content="groff -Thtml, via man -H, via xorriso/convert_man_to_html.sh"> @@ -2520,6 +2520,49 @@ <tr valign="top" align="left"> <td width="10%"></td> <td width="89%"> +<p><b>-eltorito-id</b> text|56_hexdigits</p></td> +</table> + +<table width="100%" border=0 rules="none" frame="void" + cols="2" cellspacing="0" cellpadding="0"> +<tr valign="top" align="left"> +<td width="21%"></td> +<td width="77%"> +<p>Define the ID string of the boot catalog section where +the boot image will be listed. If the value consists of 56 +characters [0-9A-Fa-f] then it is +converted into 28 bytes, else the first 28 characters become +the ID string. The ID string of the first boot image becomes +the overall catalog ID. It is limited to 24 characters. +Other id_strings become section IDs.</p> +</td> +</table> + +<table width="100%" border=0 rules="none" frame="void" + cols="2" cellspacing="0" cellpadding="0"> +<tr valign="top" align="left"> +<td width="10%"></td> +<td width="89%"> +<p><b>-eltorito-selcrit</b> hexdigits</p></td> +</table> + +<table width="100%" border=0 rules="none" frame="void" + cols="2" cellspacing="0" cellpadding="0"> +<tr valign="top" align="left"> +<td width="21%"></td> +<td width="77%"> +<p>Define the Selection Criteria of the boot image. Up to 20 +bytes get read from the given characters +[0-9A-Fa-f]. They get attributed to the +boot image entry in the catalog.</p> +</td> +</table> + +<table width="100%" border=0 rules="none" frame="void" + cols="2" cellspacing="0" cellpadding="0"> +<tr valign="top" align="left"> +<td width="10%"></td> +<td width="89%"> <p><b>-boot-info-table</b></p></td> </table>  @@ -4281,5 +4324,5 @@ </td> </table> <hr> -<BR><HR><FONT SIZE=-1><CENTER>(HTML generated from xorrisofs.1 on Tue Jan 8 12:05:24 CET 2013 by man_xorrisofs_to_html.sh )</CENTER></FONT></body> +<BR><HR><FONT SIZE=-1><CENTER>(HTML generated from xorrisofs.1 on Mon Mar 18 11:06:06 CET 2013 by man_xorrisofs_to_html.sh )</CENTER></FONT></body> </html>

@@ -1,7 +1,7 @@ /* xorriso - creates, loads, manipulates and burns ISO 9660 filesystem images. - Copyright 2007-2010 Thomas Schmitt, <scdbackup@gmx.net> + Copyright 2007-2013 Thomas Schmitt, <scdbackup@gmx.net> Provided under GPL version 2 or later. @@ -753,8 +753,19 @@ */ int Xorriso_warn_of_wildcards(struct XorrisO *xorriso, char *path, int flag) { + static int count_iso= 0, count_disk= 0, max_iso= 3, max_disk= 3; + if(strchr(path,'*')!=NULL || strchr(path,'?')!=NULL || strchr(path,'[')!=NULL) { + if(flag & 2) { + count_disk++; + if(count_disk > max_disk) + return(1); + } else { + count_iso++; + if(count_iso > max_iso) + return(1); + } if(flag&1) { sprintf(xorriso->info_text, "Pattern expansion of wildcards \"*?[\" does not apply to this command");

@@ -457,14 +457,20 @@ int Decode_ecma119_format(struct tm *erg, char *text, int flag) -/* YYYYMMDDhhmmsscc */ +/* YYYYMMDDhhmmsscc[LOC] */ /* 2010040711405800 */ { - int i, l, num; + int i, l, num, utc= 1; memset(erg, 0, sizeof(*erg)); erg->tm_isdst= -1; l= strlen(text); + if(l == 19) { + if(strcmp(text + 16, "LOC") != 0) + return(0); + utc= 0; + l= 16; + } if(l != 16) return(0); for(i= 0; i < l; i++) @@ -491,7 +497,7 @@ erg->tm_sec= 10*(text[12]-'0')+text[13]-'0'; if(erg->tm_sec > 59) return(0); - return(1); + return(1 + !utc); } @@ -575,7 +581,7 @@ char scale_chr; double value,seconds; struct tm result_tm; - int seconds_valid= 0; + int seconds_valid= 0, ret; *date= 0; if(code[0]=='-' || code[0]=='+' || code[0]=='=' || code[0]=='@'){ @@ -627,10 +633,21 @@ seconds= mktime(&result_tm); seconds_valid= 1; goto completed; - } else if(Decode_ecma119_format(&result_tm, code, 0)>0) { - /* YYYYMMDDhhmmsscc */ - /* 2010040711405800 */ + } else if((ret= Decode_ecma119_format(&result_tm, code, 0)) > 0) { + /* YYYYMMDDhhmmsscc[UTC] */ + /* 2010040711405800UTC */ seconds= mktime(&result_tm); + if(ret == 1) { + +#ifdef HAVE_TM_GMTOFF + seconds+= result_tm.tm_gmtoff; +#else + if(result_tm.tm_isdst < 0) + result_tm.tm_isdst = 0; + seconds-= timezone - result_tm.tm_isdst * 3600; +#endif + + } seconds_valid= 1; goto completed; }

@@ -998,11 +998,14 @@ if(strcmp(treatpt + 10, "none") == 0 || strcmp(treatpt + 10, "no_emulation") == 0) { xorriso->boot_image_emul= 0; + xorriso->boot_emul_default= 0; } else if(strcmp(treatpt + 10, "hard_disk") == 0) { xorriso->boot_image_emul= 1; + xorriso->boot_emul_default= 0; } else if(strcmp(treatpt + 10, "floppy") == 0 || strcmp(treatpt + 10, "diskette") == 0) { xorriso->boot_image_emul= 2; + xorriso->boot_emul_default= 0; } else { sprintf(xorriso->info_text, "-boot_image %s : Unknown media_type : %s",

@@ -1738,8 +1738,12 @@ " Delete the given files from the ISO image.", " -rm_r iso_rr_path [***]", " Delete the given directory trees from ISO image.", +" -move iso_rr_path iso_rr_path", +" Rename the single file given by the first iso_rr_path to", +" the second iso_rr_path.", " -mv iso_rr_path [***] iso_rr_path", -" Rename the given file objects in the ISO tree to iso_rr_path.", +" Like shell command mv rename the given file objects in the", +" ISO tree to the last of the iso_rr_path parameters.", " -chown uid iso_rr_path [***]", " Equivalent to chown in the ISO image.", " -chown_r uid iso_rr_path [***]",

@@ -866,6 +866,33 @@ } +/* Command -move */ +int Xorriso_option_move(struct XorrisO *xorriso, char *origin, char *dest, + int flag) +{ + int ret; + char *eff_origin= NULL, *eff_dest= NULL; + + Xorriso_alloc_meM(eff_origin, char, SfileadrL); + Xorriso_alloc_meM(eff_dest, char, SfileadrL); + + ret= Xorriso_normalize_img_path(xorriso, xorriso->wdi, origin, eff_origin, 0); + if(ret <= 0) + goto ex; + ret= Xorriso_normalize_img_path(xorriso, xorriso->wdi, dest, eff_dest, 0); + if(ret <= 0) + goto ex; + ret= Xorriso_rename(xorriso, NULL, eff_origin, eff_dest, 0); + if(ret <= 0) + goto ex; + ret= 1; +ex:; + Xorriso_free_meM(eff_origin); + Xorriso_free_meM(eff_dest); + return(ret); +} + + /* Command -msg_op */ int Xorriso_option_msg_op(struct XorrisO *xorriso, char *what, char *arg, int flag)

@@ -1,7 +1,7 @@ /* xorriso - creates, loads, manipulates and burns ISO 9660 filesystem images. - Copyright 2007-2012 Thomas Schmitt, <scdbackup@gmx.net> + Copyright 2007-2013 Thomas Schmitt, <scdbackup@gmx.net> Provided under GPL version 2 or later. @@ -1816,7 +1816,7 @@ sprintf(xorriso->result_line, "ISO 9660 Rock Ridge filesystem manipulator and CD/DVD/BD burn program\n"); sprintf(xorriso->result_line+strlen(xorriso->result_line), -"Copyright (C) 2012, Thomas Schmitt <scdbackup@gmx.net>, libburnia project.\n"); +"Copyright (C) 2013, Thomas Schmitt <scdbackup@gmx.net>, libburnia project.\n"); Xorriso_result(xorriso, 0); sprintf(xorriso->result_line, "xorriso version : %d.%d.%d%s\n",

@@ -529,7 +529,7 @@ "data_cache_size", "errfile_log","error_behavior","extract","extract_single", "jigdo","lns","lnsi","load","logfile", - "map","map_single","msg_op","page","return_with", + "map","map_single","move","msg_op","page","return_with", "scdbackup_tag","update","update_r","volume_date", "" }; @@ -684,7 +684,7 @@ "* File manipulations:", "iso_rr_pattern", - "rm", "rm_r", "rmdir", "mv", + "rm", "rm_r", "rmdir", "move", "mv", "chown", "chown_r", "chgrp", "chgrp_r", "chmod", "chmod_r", "setfacl", "setfacl_r", "setfacl_list", "setfattr", "setfattr_r", "setfattr_list", "alter_date", "alter_date_r", "hide", @@ -1446,6 +1446,10 @@ (*idx)++; ret= Xorriso_option_mount_opts(xorriso, arg1, 0); + } else if(strcmp(cmd, "move")==0) { + (*idx)+= 2; + ret= Xorriso_option_move(xorriso, arg1, arg2, 0); + } else if(strcmp(cmd,"msg_op") == 0) { (*idx)+= 2; ret= Xorriso_option_msg_op(xorriso, arg1, arg2, 0);

@@ -1737,12 +1737,18 @@ { 0, -1, -1, -1, -1, -1}, 1, 1}, {"CopyrightFile:", 3, "CopyrightFile: ", "", 1, { 0, -1, -1, -1, -1, -1}, 1, 1}, + {"Creation Time:", 3, "Creation Time: ", "", 1, { 0, -1, -1, -1, -1, -1}, + 1, 1}, {"DVD obs 64 kB:", 3, "DVD obs 64 kB:", "", 1, { 0, -1, -1, -1, -1, -1}, 1, 0}, {"Drive current:", 3, "Drive current:", "", 2, { 0, 1, -1, -1, -1, -1}, 2, 0}, {"Drive type :", 3, "Drive type :", "", 3, { 1, 3, 5, -1, -1, -1}, 2, 0}, + {"Eff. Time :", 3, "Eff. Time : ", "", 1, { 0, -1, -1, -1, -1, -1}, + 1, 1}, + {"Expir. Time :", 3, "Expir. Time : ", "", 1, { 0, -1, -1, -1, -1, -1}, + 1, 1}, {"Ext. filters :", 3, "Ext. filters : ", "", 1, { 0, -1, -1, -1, -1, -1}, 1, 1}, {"File damaged :", 3, "File damaged :", "", 4, { 0, 2, 4, 6, -1, -1}, @@ -1783,6 +1789,8 @@ 2, 1}, {"Media summary:", 3, "Media summary:", "", 4, { 0, 2, 5, 7, -1, -1}, 2, 0}, + {"Modif. Time :", 3, "Modif. Time : ", "", 1, { 0, -1, -1, -1, -1, -1}, + 1, 1}, {"PVD address :", 3, "PVD address :", "", 1, { 0, -1, -1, -1, -1, -1}, 1, 0}, {"Preparer Id :", 3, "Preparer Id : ", "", 1, { 0, -1, -1, -1, -1, -1},

@@ -2,7 +2,7 @@ /* xorriso - creates, loads, manipulates and burns ISO 9660 filesystem images. - Copyright 2007-2012 Thomas Schmitt, <scdbackup@gmx.net> + Copyright 2007-2013 Thomas Schmitt, <scdbackup@gmx.net> Provided under GPL version 2 or later. @@ -576,6 +576,12 @@ {ret= 0; goto ex;} } el_torito_set_boot_platform_id(bootimg, (uint8_t) platform_id); + if(load_size / 512 > 65535) { + sprintf(xorriso->info_text, + "Boot image load size exceeds 65535 blocks. Will record 65535 in El Torito."); + Xorriso_msgs_submit(xorriso, 0, xorriso->info_text, 0, "WARNING", 0); + load_size= 65535 * 512; + } el_torito_set_load_size(bootimg, load_size / 512); el_torito_set_id_string(bootimg, xorriso->boot_id_string); el_torito_set_selection_crit(bootimg, xorriso->boot_selection_crit); @@ -588,6 +594,7 @@ xorriso->boot_image_bin_path[0]= 0; xorriso->boot_image_bin_form[0]= 0; xorriso->boot_image_emul= 0; + xorriso->boot_emul_default= 1; xorriso->boot_image_load_size= 4 * 512; memset(xorriso->boot_id_string, 0, sizeof(xorriso->boot_id_string)); memset(xorriso->boot_selection_crit, 0, @@ -2077,8 +2084,10 @@ } else if((l == 16 && strncmp(cpt, "allow_dir_id_ext", l) == 0) || (l == 19 && strncmp(cpt, "allow_dir_id_ext_on", l) == 0) ) { xorriso->relax_compliance|= isoburn_igopt_allow_dir_id_ext; + xorriso->allow_dir_id_ext_dflt= 0; } else if((l == 20 && strncmp(cpt, "allow_dir_id_ext_off", l) == 0)) { xorriso->relax_compliance&= ~isoburn_igopt_allow_dir_id_ext; + xorriso->allow_dir_id_ext_dflt= 0; } else if((l == 12 && strncmp(cpt, "omit_version", l) == 0) || (l == 15 && strncmp(cpt, "omit_version_on", l) == 0) ) { @@ -2207,10 +2216,12 @@ if(value == 1 || value == 2) { limit= ((off_t) 4) * ((off_t) 1024*1024*1024) - ((off_t) 1); xorriso->iso_level= value; + xorriso->iso_level_is_default= 0; if(xorriso->file_size_limit > limit) xorriso->file_size_limit= limit; } else if(value == 3) { xorriso->iso_level= value; + xorriso->iso_level_is_default= 0; if(xorriso->file_size_limit < Xorriso_default_file_size_limiT) xorriso->file_size_limit= Xorriso_default_file_size_limiT; } else {

@@ -9,7 +9,7 @@ .\" First parameter, NAME, should be all caps .\" Second parameter, SECTION, should be 1-8, maybe w/ subsection .\" other parameters are allowed: see man(7), man(1) -.TH XORRECORD 1 "Version 1.2.6, Jan 08, 2013" +.TH XORRECORD 1 "Version 1.2.8, Mar 18, 2013" .\" Please adjust this date whenever revising the manpage. .\" .\" Some roff macros, for reference:

@@ -15,7 +15,7 @@  File: xorrecord.info, Node: Top, Next: Overview, Up: (dir) -xorrecord 1.2.6 +xorrecord 1.2.8 *************** xorrecord - Emulation of CD/DVD/BD program cdrecord by program xorriso

@@ -1,7 +1,7 @@ \input texinfo @c -*-texinfo-*- @c %**start of header @setfilename xorrecord.info -@settitle GNU xorrecord 1.2.6 +@settitle GNU xorrecord 1.2.8 @c %**end of header @c @c man-ignore-lines begin @@ -50,7 +50,7 @@ @c man .\" First parameter, NAME, should be all caps @c man .\" Second parameter, SECTION, should be 1-8, maybe w/ subsection @c man .\" other parameters are allowed: see man(7), man(1) -@c man .TH XORRECORD 1 "Version 1.2.6, Jan 08, 2013" +@c man .TH XORRECORD 1 "Version 1.2.8, Mar 18, 2013" @c man .\" Please adjust this date whenever revising the manpage. @c man .\" @c man .\" Some roff macros, for reference: @@ -76,7 +76,7 @@ @end copying @c man-ignore-lines end @titlepage -@title Manual of GNU xorriso personality xorrecord 1.2.6 +@title Manual of GNU xorriso personality xorrecord 1.2.8 @author Thomas Schmitt @page @vskip 0pt plus 1filll @@ -85,7 +85,7 @@ @contents @ifnottex @node Top -@top xorrecord 1.2.6 +@top xorrecord 1.2.8 @c man-ignore-lines 1 @c man .SH NAME

@@ -9,7 +9,7 @@ .\" First parameter, NAME, should be all caps .\" Second parameter, SECTION, should be 1-8, maybe w/ subsection .\" other parameters are allowed: see man(7), man(1) -.TH XORRISO 1 "Version 1.2.6, Jan 08, 2013" +.TH XORRISO 1 "Version 1.2.8, Mar 18, 2013" .\" Please adjust this date whenever revising the manpage. .\" .\" Some roff macros, for reference: @@ -1013,7 +1013,7 @@ Renaming of files has similar collision handling, but directories can only be replaced, not merged. Note that if the target directory exists, then \-mv inserts the source objects into this directory rather than attempting -to replace it. +to replace it. Command \-move, on the other hand, would attempt to replace it. .PP The commands in this section alter the ISO image and not the local filesystem. .TP @@ -1438,6 +1438,13 @@ \fB\-rmdir\fR iso_rr_path [***] Delete empty directories. .TP +\fB\-move\fR iso_rr_path iso_rr_path +Rename the file given by the first (origin) iso_rr_path to the second +(destination) iso_rr_path. +Deviate from rules of shell command mv by not moving the origin file underneath +an existing destination directory. The origin file will rather replace such a +directory, if this is allowed by command \-overwrite. +.TP \fB\-mv\fR iso_rr_path [***] iso_rr_path Rename the given file objects in the ISO tree to the last parameter in the list. Use the same rules as with shell command mv. @@ -1599,6 +1606,15 @@ YYMMDD[.hhmm[ss]] .br where "A0" is year 2000, "B0" is 2010, etc. +.br +ECMA\-119 volume timestamps: +.br + YYYYMMDDhhmmsscc +.br +These are normally given as GMT. The suffix "LOC" causes local timezone +conversion. E.g. 2013010720574700, 2013010720574700LOC. +The last two digits cc (centiseconds) will be ignored, but must be present +in order to make the format recognizable. .TP \fB\-alter_date_r\fR type timestring iso_rr_path [***] Like \-alter_date but affecting all files below eventual directories. @@ -2269,6 +2285,10 @@ are the best guesses for lower and upper speed limit. "Write speed l" and "Write speed h" may appear only with CD and eventually override the list of other speed offers. +.br +Only if the drive reports contradicting speed information there will appear +"Write speed 0", which tells the outcome of speed selection by command +\-speed 0, if it deviates from "Write speed H". .TP \fB\-close_damaged\fR "as_needed"|"force" Try to close the upcomming track and session if the drive reported the medium @@ -2544,7 +2564,7 @@ E.g. 2010040711405800 is 7 Apr 2010 11:40:58 (+0 centiseconds). .br Timestrings for the other types may be given as with command \-alter_date. -They are prone to timezone computations. The timestrings "default" or +Some of them are prone to timezone computations. The timestrings "default" or "overridden" cause default settings: "c" and "m" will show the current time of image creation. "x" and "f" will be marked as insignificant. "uuid" will be deactivated. @@ -3493,11 +3513,21 @@ \fB\-tell_media_space\fR Print available space on the output medium and the free space after subtracting already foreseeable consumption by next \-commit. +.br +Note that the title of the prediction "After commit :" is misleading. +It is rather the space that may still be filled in this session without +making the next \-commit fail from medium overflow. +.br +The free space after the next \-commit might be smaller by several MB. +This depends on medium type, number of recorded sessions, and drive habits. .TP \fB\-pvd_info\fR -Print various ID strings which can be found in loaded ISO images. Some of -them may be changed by commands like \-volid or \-publisher. For these -IDs \-pvd_info reports what would be written with the next \-commit. +Print various ID strings and timestamps which can be found in loaded ISO +images. Some of the IDs may be changed by commands like \-volid or \-publisher. +For these IDs \-pvd_info reports what would be written with the next \-commit. +The timestamps get not automatically propagated from loaded image to newly +written image. The ones for new images may be set by command \-volume_date. +See there for the meaning of the particular timestamps. .TP .B Navigation in ISO image and disk filesystem: .TP @@ -4071,6 +4101,12 @@ \-quiet (= "SORRY") persist. The output file persists until things happen like \-commit, \-rollback, \-dev, or end of \fBxorriso\fR. +.br +Options which affect all file objects in the ISO image, like \-r or \-dir\-mode, +will be applied only to files which are present in the ISO image when +the command \-as ends. If you use several \-as mkisofs commands in the same +run, then consider to put such options into the last \-as command. +.br \-pacifier gets set to "mkisofs" if files are added to the image. .br \-graft\-points is equivalent to \-pathspecs on. Note that pathspecs without "="

@@ -68,7 +68,7 @@ */ #define Xorriso_header_version_majoR 1 #define Xorriso_header_version_minoR 2 -#define Xorriso_header_version_micrO 6 +#define Xorriso_header_version_micrO 8 /** If needed: Something like ".pl01" to indicate a bug fix. Normally empty. @@ -796,6 +796,9 @@ "CopyrightFile:" up to 1 result from -pvd_info argv[0]= file name (Note: prefix is "CopyrightFile: ") + "Creation Time:" up to 1 result from -pvd_info + argv[0]= YYYYMMDDhhmmsscc + (Note: prefix is "Creation Time: ") "DVD obs 64 kB:" up to 1 result from -list_extras argv[0]= "yes" or "no" "Drive current:" up to 2 results from -dev, -indev, -toc, others @@ -805,6 +808,12 @@ argv[0]= vendor argv[1]= product argv[2]= revision + "Eff. Time :" up to 1 result from -pvd_info + argv[0]= YYYYMMDDhhmmsscc + (Note: prefix is "EffectiveTime: ") + "Expir. Time :" up to 1 result from -pvd_info + argv[0]= YYYYMMDDhhmmsscc + (Note: prefix is "Expir. Time : ") "Ext. filters :" up to 1 result from -list_extras argv[0]= "yes" or "no" , possibly more info (Note: prefix is "Ext. filters : ") @@ -874,6 +883,9 @@ argv[1]= data blocks (full count) argv[2]= data (with unit letter k,m,g) argv[3]= free (with unit letter k,m,g) + "Modif. Time :" up to 1 result from -pvd_info + argv[0]= YYYYMMDDhhmmsscc + (Note: prefix is "Modif. Time : ") "PVD address :" up to 1 result from -pvd_info argv[0]= block address with "s" appended "Preparer Id :" up to 1 result from -pvd_info @@ -1627,6 +1639,10 @@ /* Command -mount_opts option[:...] */ int Xorriso_option_mount_opts(struct XorrisO *xorriso, char *mode, int flag); +/* Command -move */ +int Xorriso_option_move(struct XorrisO *xorriso, char *origin, char *dest, + int flag); + /* Command -msg_op */ int Xorriso_option_msg_op(struct XorrisO *xorriso, char *what, char *arg, int flag);

@@ -15,7 +15,7 @@  File: xorriso.info, Node: Top, Next: Overview, Up: (dir) -GNU xorriso 1.2.6 +GNU xorriso 1.2.8 ***************** xorriso - creates, loads, manipulates and writes ISO 9660 filesystem @@ -942,7 +942,8 @@ Renaming of files has similar collision handling, but directories can only be replaced, not merged. Note that if the target directory exists, then -mv inserts the source objects into this directory rather than -attempting to replace it. +attempting to replace it. Command -move, on the other hand, would +attempt to replace it. The commands in this section alter the ISO image and not the local filesystem. @@ -1318,6 +1319,13 @@ -rmdir iso_rr_path [***] Delete empty directories. +-move iso_rr_path iso_rr_path + Rename the file given by the first (origin) iso_rr_path to the + second (destination) iso_rr_path. Deviate from rules of shell + command mv by not moving the origin file underneath an existing + destination directory. The origin file will rather replace such a + directory, if this is allowed by command -overwrite. + -mv iso_rr_path [***] iso_rr_path Rename the given file objects in the ISO tree to the last parameter in the list. Use the same rules as with shell command mv. @@ -1449,6 +1457,12 @@ scdbackup timestamps: YYMMDD[.hhmm[ss]] where "A0" is year 2000, "B0" is 2010, etc. + ECMA-119 volume timestamps: + YYYYMMDDhhmmsscc + These are normally given as GMT. The suffix "LOC" causes local + timezone conversion. E.g. 2013010720574700, 2013010720574700LOC. + The last two digits cc (centiseconds) will be ignored, but must be + present in order to make the format recognizable. -alter_date_r type timestring iso_rr_path [***] Like -alter_date but affecting all files below eventual @@ -2013,6 +2027,9 @@ the best guesses for lower and upper speed limit. "Write speed l" and "Write speed h" may appear only with CD and eventually override the list of other speed offers. + Only if the drive reports contradicting speed information there + will appear "Write speed 0", which tells the outcome of speed + selection by command -speed 0, if it deviates from "Write speed H". -close_damaged "as_needed"|"force" Try to close the upcomming track and session if the drive reported @@ -2254,7 +2271,7 @@ search --fs-uuid --set YYYY-MM-DD-hh-mm-ss-cc E.g. 2010040711405800 is 7 Apr 2010 11:40:58 (+0 centiseconds). Timestrings for the other types may be given as with command - -alter_date. They are prone to timezone computations. The + -alter_date. Some of them are prone to timezone computations. The timestrings "default" or "overridden" cause default settings: "c" and "m" will show the current time of image creation. "x" and "f" will be marked as insignificant. "uuid" will be deactivated. @@ -3060,12 +3077,22 @@ -tell_media_space Print available space on the output medium and the free space after subtracting already foreseeable consumption by next -commit. + Note that the title of the prediction "After commit :" is + misleading. It is rather the space that may still be filled in + this session without making the next -commit fail from medium + overflow. + The free space after the next -commit might be smaller by several + MB. This depends on medium type, number of recorded sessions, and + drive habits. -pvd_info - Print various ID strings which can be found in loaded ISO images. - Some of them may be changed by commands like -volid or -publisher. - For these IDs -pvd_info reports what would be written with the - next -commit. + Print various ID strings and timestamps which can be found in + loaded ISO images. Some of the IDs may be changed by commands like + -volid or -publisher. For these IDs -pvd_info reports what would + be written with the next -commit. The timestamps get not + automatically propagated from loaded image to newly written image. + The ones for new images may be set by command -volume_date. See + there for the meaning of the particular timestamps.  File: xorriso.info, Node: Navigate, Next: Verify, Prev: Inquiry, Up: Commands @@ -3594,8 +3621,13 @@ -commit at the end of a "mkisofs" option list. Verbosity settings -v (= "UPDATE") and -quiet (= "SORRY") persist. The output file persists until things happen like -commit, -rollback, -dev, or end - of `xorriso'. -pacifier gets set to "mkisofs" if files are added - to the image. + of `xorriso'. + Options which affect all file objects in the ISO image, like -r or + -dir-mode, will be applied only to files which are present in the + ISO image when the command -as ends. If you use several -as + mkisofs commands in the same run, then consider to put such + options into the last -as command. + -pacifier gets set to "mkisofs" if files are added to the image. -graft-points is equivalent to -pathspecs on. Note that pathspecs without "=" are interpreted differently than with `xorriso' command -add. Directories get merged with the root directory of @@ -4668,10 +4700,10 @@ * -abort_on controls abort on error: Exception. (line 27) * -abstract_file sets abstract file name: SetWrite. (line 233) * -acl controls handling of ACLs: Loading. (line 143) -* -add inserts one or more paths: Insert. (line 45) -* -add_plainly inserts one or more paths: Insert. (line 64) -* -alter_date sets timestamps in ISO image: Manip. (line 147) -* -alter_date_r sets timestamps in ISO image: Manip. (line 167) +* -add inserts one or more paths: Insert. (line 46) +* -add_plainly inserts one or more paths: Insert. (line 65) +* -alter_date sets timestamps in ISO image: Manip. (line 154) +* -alter_date_r sets timestamps in ISO image: Manip. (line 180) * -append_partition adds arbitrary file after image end: Bootable. (line 234) * -application_id sets application id: SetWrite. (line 192) @@ -4692,15 +4724,15 @@ * -check_md5_r verifies file tree checksums: Verify. (line 170) * -check_media reads media block by block: Verify. (line 21) * -check_media_defaults sets -check_media options: Verify. (line 41) -* -chgrp sets group in ISO image: Manip. (line 50) -* -chgrp_r sets group in ISO image: Manip. (line 55) -* -chmod sets permissions in ISO image: Manip. (line 58) -* -chmod_r sets permissions in ISO image: Manip. (line 70) -* -chown sets ownership in ISO image: Manip. (line 42) -* -chown_r sets ownership in ISO image: Manip. (line 47) -* -clone copies ISO directory tree: Insert. (line 179) +* -chgrp sets group in ISO image: Manip. (line 57) +* -chgrp_r sets group in ISO image: Manip. (line 62) +* -chmod sets permissions in ISO image: Manip. (line 65) +* -chmod_r sets permissions in ISO image: Manip. (line 77) +* -chown sets ownership in ISO image: Manip. (line 49) +* -chown_r sets ownership in ISO image: Manip. (line 54) +* -clone copies ISO directory tree: Insert. (line 180) * -close controls media closing: SetWrite. (line 335) -* -close_damaged closes damaged track and session: Writing. (line 155) +* -close_damaged closes damaged track and session: Writing. (line 158) * -close_filter_list bans filter registration: Filter. (line 52) * -commit writes pending ISO image: Writing. (line 29) * -commit_eject writes and ejects: Writing. (line 56) @@ -4709,19 +4741,19 @@ * -compare_r reports ISO/disk differences: Navigate. (line 159) * -compliance controls standard compliance: SetWrite. (line 58) * -copyright_file sets copyright file name: SetWrite. (line 227) -* -cp_clone copies ISO directory tree: Insert. (line 191) +* -cp_clone copies ISO directory tree: Insert. (line 192) * -cp_rx copies file trees to disk: Restore. (line 111) * -cpax copies files to disk: Restore. (line 107) -* -cpr inserts like with cp -r: Insert. (line 155) +* -cpr inserts like with cp -r: Insert. (line 156) * -cpx copies files to disk: Restore. (line 95) -* -cut_out inserts piece of data file: Insert. (line 129) +* -cut_out inserts piece of data file: Insert. (line 130) * -data_cache_size adjusts read cache size: Loading. (line 269) * -dev acquires one drive for input and output: AqDrive. (line 12) * -device_links gets list of drives: Inquiry. (line 18) * -devices gets list of drives: Inquiry. (line 7) * -dialog enables dialog mode: DialogCtl. (line 7) * -disk_dev_ino fast incremental backup: Loading. (line 190) -* -disk_pattern controls pattern expansion: Insert. (line 34) +* -disk_pattern controls pattern expansion: Insert. (line 35) * -displacement compensate altered image start address: Loading. (line 36) * -drive_class controls drive accessability: Loading. (line 54) @@ -4758,7 +4790,7 @@ * -hardlinks controls handling of hard links: Loading. (line 110) * -help prints help text: Scripting. (line 20) * -hfsplus enables production of HFS+ partition: SetWrite. (line 14) -* -hide excludes file names from directory trees: Manip. (line 171) +* -hide excludes file names from directory trees: Manip. (line 184) * -history brings text into readline history: Scripting. (line 44) * -in_charset sets input character set: Loading. (line 92) * -indev acquires a drive for input: AqDrive. (line 24) @@ -4772,9 +4804,9 @@ * -list_extras lists compile time extra features: Scripting. (line 26) * -list_formats lists available formats: Writing. (line 129) -* -list_profiles lists supported media: Writing. (line 169) +* -list_profiles lists supported media: Writing. (line 172) * -list_speeds lists available write speeds: Writing. (line 141) -* -lns creates ISO symbolic link: Insert. (line 174) +* -lns creates ISO symbolic link: Insert. (line 175) * -load addresses a particular session as input: Loading. (line 11) * -local_charset sets terminal character set: Charset. (line 47) * -logfile logs output channels to file: Frontend. (line 20) @@ -4786,17 +4818,18 @@ * -lsl lists files in ISO image: Navigate. (line 38) * -lslx lists files on disk: Navigate. (line 62) * -lsx lists files on disk: Navigate. (line 51) -* -map inserts path: Insert. (line 88) -* -map_l inserts paths from disk file: Insert. (line 97) -* -map_single inserts path: Insert. (line 93) +* -map inserts path: Insert. (line 89) +* -map_l inserts paths from disk file: Insert. (line 98) +* -map_single inserts path: Insert. (line 94) * -mark sets synchronizing message: Frontend. (line 25) * -md5 controls handling of MD5 sums: Loading. (line 156) -* -mkdir creates ISO directory: Insert. (line 169) +* -mkdir creates ISO directory: Insert. (line 170) * -mount issues mount command for ISO session: Restore. (line 129) * -mount_cmd composes mount command line: Inquiry. (line 52) * -mount_cmd controls mount command: Inquiry. (line 68) * -msg_op perform operations on program messages: Frontend. (line 30) -* -mv renames file in ISO image: Manip. (line 35) +* -mv renames files in ISO image: Manip. (line 42) +* -mv renames single file in ISO image: Manip. (line 35) * -no_rc disables startup files: Scripting. (line 7) * -not_leaf sets exclusion pattern: SetInsert. (line 62) * -not_list sets exclusions from disk file: SetInsert. (line 67) @@ -4807,11 +4840,11 @@ * -out_charset sets output character set: SetWrite. (line 258) * -outdev acquires a drive for output: AqDrive. (line 31) * -overwrite enables overwriting in ISO: SetInsert. (line 127) -* -pacifier controls pacifier text form: Emulation. (line 158) +* -pacifier controls pacifier text form: Emulation. (line 163) * -padding sets amount or mode of image padding: SetWrite. (line 349) * -page set terminal geometry: DialogCtl. (line 19) * -paste_in copies file into disk file: Restore. (line 124) -* -path_list inserts paths from disk file: Insert. (line 78) +* -path_list inserts paths from disk file: Insert. (line 79) * -pathspecs sets meaning of = with -add: SetInsert. (line 118) * -pkt_output consolidates text output: Frontend. (line 7) * -preparer_id sets preparer id: SetWrite. (line 246) @@ -4823,13 +4856,13 @@ * -prog_help prints help text: Frontend. (line 154) * -prompt prompts for enter key: Scripting. (line 110) * -publisher sets publisher id: SetWrite. (line 186) -* -pvd_info shows image id strings: Inquiry. (line 104) +* -pvd_info shows image id strings: Inquiry. (line 111) * -pwd tells working directory in ISO: Navigate. (line 20) * -pwdx tells working directory on disk: Navigate. (line 23) * -quoted_not_list sets exclusions: SetInsert. (line 72) -* -quoted_path_list inserts paths from disk file: Insert. (line 83) +* -quoted_path_list inserts paths from disk file: Insert. (line 84) * -read_mkisofsrc searches and reads .mkisofsrc file: Emulation. - (line 146) + (line 151) * -reassure enables confirmation question: DialogCtl. (line 32) * -report_about controls verbosity: Exception. (line 55) * -return_with controls exit value: Exception. (line 39) @@ -4843,18 +4876,18 @@ * -rom_toc_scan searches for sessions: Loading. (line 211) * -rr_reloc_dir sets name of relocation directory: SetWrite. (line 141) -* -scdbackup_tag enables scdbackup checksum tag: Emulation. (line 168) +* -scdbackup_tag enables scdbackup checksum tag: Emulation. (line 173) * -scsi_log reports SCSI commands: Scripting. (line 147) * -session_log logs written sessions: Scripting. (line 138) * -session_string composes session info line: Inquiry. (line 78) * -set_filter applies filter to file: Filter. (line 60) * -set_filter_r applies filter to file tree: Filter. (line 89) -* -setfacl sets ACL in ISO image: Manip. (line 73) -* -setfacl_list sets ACL in ISO image: Manip. (line 101) -* -setfacl_r sets ACL in ISO image: Manip. (line 98) -* -setfattr sets xattr in ISO image: Manip. (line 111) -* -setfattr_list sets xattr in ISO image: Manip. (line 127) -* -setfattr_r sets xattr in ISO image: Manip. (line 124) +* -setfacl sets ACL in ISO image: Manip. (line 80) +* -setfacl_list sets ACL in ISO image: Manip. (line 108) +* -setfacl_r sets ACL in ISO image: Manip. (line 105) +* -setfattr sets xattr in ISO image: Manip. (line 118) +* -setfattr_list sets xattr in ISO image: Manip. (line 134) +* -setfattr_r sets xattr in ISO image: Manip. (line 131) * -show_stream shows data source and filters: Navigate. (line 169) * -show_stream_r shows data source and filters: Navigate. (line 183) * -signal_handling controls handling of system signals: Exception. @@ -4872,9 +4905,9 @@ * -toc shows list of sessions: Inquiry. (line 28) * -toc_of shows list of sessions: Inquiry. (line 43) * -uid sets global ownership: SetWrite. (line 264) -* -update inserts path if different: Insert. (line 102) -* -update_l inserts paths if different: Insert. (line 124) -* -update_r inserts paths if different: Insert. (line 113) +* -update inserts path if different: Insert. (line 103) +* -update_l inserts paths if different: Insert. (line 125) +* -update_r inserts paths if different: Insert. (line 114) * -use_readline enables readline for dialog: DialogCtl. (line 28) * -version prints help text: Scripting. (line 23) * -volid sets volume id: SetWrite. (line 160) @@ -4897,9 +4930,9 @@ * ACL, _definition: Extras. (line 49) * ACL, control handling, -acl: Loading. (line 143) -* ACL, set in ISO image, -setfacl: Manip. (line 73) -* ACL, set in ISO image, -setfacl_list: Manip. (line 101) -* ACL, set in ISO image, -setfacl_r: Manip. (line 98) +* ACL, set in ISO image, -setfacl: Manip. (line 80) +* ACL, set in ISO image, -setfacl_list: Manip. (line 108) +* ACL, set in ISO image, -setfacl_r: Manip. (line 105) * ACL, show in ISO image, -getfacl: Navigate. (line 70) * ACL, show in ISO image, -getfacl_r: Navigate. (line 77) * APM block size: Bootable. (line 225) @@ -4910,12 +4943,12 @@ * Backslash Interpretation, _definition: Processing. (line 52) * Backup, enable fast incremental, -disk_dev_ino: Loading. (line 190) * Backup, enable features, -for_backup: Loading. (line 185) -* Backup, scdbackup checksum tag, -scdbackup: Emulation. (line 168) +* Backup, scdbackup checksum tag, -scdbackup: Emulation. (line 173) * Blank media, _definition: Media. (line 29) * Blind growing, _definition: Methods. (line 40) * Bootability, control, -boot_image: Bootable. (line 26) * Bugs, reporting: Bugreport. (line 6) -* cdrecord, Emulation: Emulation. (line 111) +* cdrecord, Emulation: Emulation. (line 116) * Character Set, _definition: Charset. (line 6) * Character Set, for input, -in_charset: Loading. (line 92) * Character Set, for input/output, -charset: Charset. (line 43) @@ -4929,7 +4962,7 @@ * Create, new ISO image, _definition: Methods. (line 6) * Cylinder alignment, _definition: Bootable. (line 188) * Cylinder size, _definition: Bootable. (line 177) -* Damaged track and session, close, -close_damaged: Writing. (line 155) +* Damaged track and session, close, -close_damaged: Writing. (line 158) * Delete, from ISO image, -rm: Manip. (line 21) * Delete, from ISO image, -rm_r: Manip. (line 28) * Delete, ISO directory, -rmdir: Manip. (line 32) @@ -4938,9 +4971,9 @@ * Dialog, enable dialog mode, -dialog: DialogCtl. (line 7) * Dialog, line editing, -use_readline: DialogCtl. (line 28) * Dialog, terminal geometry, -page: DialogCtl. (line 19) -* Directories, copy, -cp_clone: Insert. (line 191) -* Directory, copy, -clone: Insert. (line 179) -* Directory, create, -mkdir: Insert. (line 169) +* Directories, copy, -cp_clone: Insert. (line 192) +* Directory, copy, -clone: Insert. (line 180) +* Directory, create, -mkdir: Insert. (line 170) * Directory, delete, -rmdir: Manip. (line 32) * disk_path, _definition: Insert. (line 6) * Drive, _definition: Drives. (line 6) @@ -4953,7 +4986,7 @@ * Drive, for output, -outdev: AqDrive. (line 31) * Drive, get drive list, -device_links: Inquiry. (line 18) * Drive, get drive list, -devices: Inquiry. (line 7) -* Drive, list supported media, -list_profiles: Writing. (line 169) +* Drive, list supported media, -list_profiles: Writing. (line 172) * Drive, reduce activity, -calm_drive: Loading. (line 240) * Drive, report SCSI commands, -scsi_log: Scripting. (line 147) * Drive, write and eject, -commit_eject: Writing. (line 56) @@ -4962,10 +4995,10 @@ * EFI system partition, _definition: Bootable. (line 157) * El Torito, _definition: Extras. (line 19) * Emulation, -as: Emulation. (line 13) -* Emulation, .mkisofsrc, -read_mkisofsrc: Emulation. (line 146) -* Emulation, cdrecord, -as: Emulation. (line 111) +* Emulation, .mkisofsrc, -read_mkisofsrc: Emulation. (line 151) +* Emulation, cdrecord, -as: Emulation. (line 116) * Emulation, mkisofs, -as: Emulation. (line 16) -* Emulation, pacifier form, -pacifier: Emulation. (line 158) +* Emulation, pacifier form, -pacifier: Emulation. (line 163) * Examples: Examples. (line 6) * extattr, _definition: Extras. (line 65) * Filter, _definition: Filter. (line 6) @@ -4981,13 +5014,13 @@ (line 116) * GPT, _definition: Extras. (line 38) * Group, global in ISO image, -gid: SetWrite. (line 268) -* Group, in ISO image, -chgrp: Manip. (line 50) -* Group, in ISO image, -chgrp_r: Manip. (line 55) +* Group, in ISO image, -chgrp: Manip. (line 57) +* Group, in ISO image, -chgrp_r: Manip. (line 62) * Growing, _definition: Methods. (line 19) * Hard links, control handling, -hardlinks: Loading. (line 110) * HFS+ allocation block size: Bootable. (line 222) * HFS+ serial number: Bootable. (line 219) -* hidden, set in ISO image, -hide: Manip. (line 171) +* hidden, set in ISO image, -hide: Manip. (line 184) * Image reading, cache size, -data_cache_size: Loading. (line 269) * Image, _definition: Model. (line 9) * Image, demand volume ID, -assert_volid: Loading. (line 84) @@ -5003,29 +5036,29 @@ * Image, set volume id, -volid: SetWrite. (line 160) * Image, set volume set id, -volset_id: SetWrite. (line 181) * Image, set volume timestamp, -volume_date: SetWrite. (line 208) -* Image, show id strings, -pvd_info: Inquiry. (line 104) +* Image, show id strings, -pvd_info: Inquiry. (line 111) * Insert, enable overwriting, -overwrite: SetInsert. (line 127) * Insert, file exclusion absolute, -not_paths: SetInsert. (line 55) * Insert, file exclusion from file, -not_list: SetInsert. (line 67) * Insert, file exclusion pattern, -not_leaf: SetInsert. (line 62) * Insert, file exclusion, -not_mgt: SetInsert. (line 23) * Insert, file exclusion, -quoted_not_list: SetInsert. (line 72) -* Insert, if different, -update: Insert. (line 102) -* Insert, if different, -update_l: Insert. (line 124) -* Insert, if different, -update_r: Insert. (line 113) +* Insert, if different, -update: Insert. (line 103) +* Insert, if different, -update_l: Insert. (line 125) +* Insert, if different, -update_r: Insert. (line 114) * Insert, large file splitting, -split_size: SetInsert. (line 140) * Insert, limit data file size, -file_size_limit: SetInsert. (line 7) * Insert, links or mount points, -follow: SetInsert. (line 76) * Insert, meaning of = with -add, -pathspecs: SetInsert. (line 118) -* Insert, non-dashed arguments, -add_plainly: Insert. (line 64) -* Insert, path, -map: Insert. (line 88) -* Insert, path, -map_single: Insert. (line 93) -* Insert, paths from disk file, -map_l: Insert. (line 97) -* Insert, paths from disk file, -path_list: Insert. (line 78) -* Insert, paths from disk file, -quoted_path_list: Insert. (line 83) -* Insert, paths, -cpr: Insert. (line 155) -* Insert, pathspecs, -add: Insert. (line 45) -* Insert, piece of data file, -cut_out: Insert. (line 129) +* Insert, non-dashed arguments, -add_plainly: Insert. (line 65) +* Insert, path, -map: Insert. (line 89) +* Insert, path, -map_single: Insert. (line 94) +* Insert, paths from disk file, -map_l: Insert. (line 98) +* Insert, paths from disk file, -path_list: Insert. (line 79) +* Insert, paths from disk file, -quoted_path_list: Insert. (line 84) +* Insert, paths, -cpr: Insert. (line 156) +* Insert, pathspecs, -add: Insert. (line 46) +* Insert, piece of data file, -cut_out: Insert. (line 130) * ISO 9660, _definition: Model. (line 6) * iso_rr_path, _definition: Insert. (line 7) * Jigdo Template Extraction, -jigdo: Jigdo. (line 33) @@ -5062,16 +5095,16 @@ * Next writeable address, -grow_blindly: AqDrive. (line 46) * Overwriteable media, _definition: Media. (line 14) * Ownership, global in ISO image, -uid: SetWrite. (line 264) -* Ownership, in ISO image, -chown: Manip. (line 42) -* Ownership, in ISO image, -chown_r: Manip. (line 47) +* Ownership, in ISO image, -chown: Manip. (line 49) +* Ownership, in ISO image, -chown_r: Manip. (line 54) * Partition offset, _definition: Bootable. (line 167) * Partition table, _definition: Bootable. (line 128) * Pathspec, _definition: SetInsert. (line 120) * Pattern expansion, _definition: Processing. (line 24) -* Pattern expansion, for disk paths, -disk_pattern: Insert. (line 34) +* Pattern expansion, for disk paths, -disk_pattern: Insert. (line 35) * Pattern expansion, for ISO paths, -iso_rr_pattern: Manip. (line 10) -* Permissions, in ISO image, -chmod: Manip. (line 58) -* Permissions, in ISO image, -chmod_r: Manip. (line 70) +* Permissions, in ISO image, -chmod: Manip. (line 65) +* Permissions, in ISO image, -chmod_r: Manip. (line 77) * PReP partition, _definition: Bootable. (line 152) * Problems, reporting: Bugreport. (line 6) * Process, consolidate text output, -pkt_output: Frontend. (line 7) @@ -5107,7 +5140,8 @@ * Quoted input, _definition: Processing. (line 46) * Recovery, retrieve blocks, -check_media: Verify. (line 21) * Relocation directory, set name, -rr_reloc_dir: SetWrite. (line 141) -* Rename, in ISO image, -mv: Manip. (line 35) +* Rename, in ISO image, -move: Manip. (line 35) +* Rename, in ISO image, -mv: Manip. (line 42) * Restore, copy file into disk file, -paste_in: Restore. (line 124) * Restore, copy file piece to disk, -extract_cut: Restore. (line 84) * Restore, copy file to disk, -extract_single: Restore. (line 75) @@ -5129,12 +5163,12 @@ * Sorting order, for -x, -list_arg_sorting: ArgSort. (line 27) * SUN Disk Label, production: Bootable. (line 210) * SUN SPARC boot images, activation: Bootable. (line 255) -* Symbolic link, create, -lns: Insert. (line 174) +* Symbolic link, create, -lns: Insert. (line 175) * System area, _definition: Bootable. (line 121) * Table-of-content, search sessions, -rom_toc_scan: Loading. (line 211) * Table-of-content, show, -toc: Inquiry. (line 28) -* Timestamps, set in ISO image, -alter_date: Manip. (line 147) -* Timestamps, set in ISO image, -alter_date_r: Manip. (line 167) +* Timestamps, set in ISO image, -alter_date: Manip. (line 154) +* Timestamps, set in ISO image, -alter_date_r: Manip. (line 180) * Tree, disk, traverse, -findx: Navigate. (line 106) * Tree, ISO, traverse and alter, -find: CmdFind. (line 7) * Verify, check blocks, -check_media: Verify. (line 21) @@ -5165,9 +5199,9 @@ * Write, TAO or SAO/DAO, -write_type: SetWrite. (line 341) * xattr, _definition: Extras. (line 65) * xattr, control handling, -xattr: Loading. (line 151) -* xattr, set in ISO image, -setfattr: Manip. (line 111) -* xattr, set in ISO image, -setfattr_list: Manip. (line 127) -* xattr, set in ISO image, -setfattr_r: Manip. (line 124) +* xattr, set in ISO image, -setfattr: Manip. (line 118) +* xattr, set in ISO image, -setfattr_list: Manip. (line 134) +* xattr, set in ISO image, -setfattr_r: Manip. (line 131) * xattr, show in ISO image, -getfattr: Navigate. (line 81) * xattr, show in ISO image, -getfattr_r: Navigate. (line 85) @@ -5188,46 +5222,46 @@ Node: AqDrive27650 Node: Loading30695 Node: Insert46151 -Node: SetInsert56287 -Node: Manip64864 -Node: CmdFind73688 -Node: Filter88393 -Node: Writing92949 -Node: SetWrite102128 -Node: Bootable120871 -Node: Jigdo136265 -Node: Charset140512 -Node: Exception143274 -Node: DialogCtl149394 -Node: Inquiry151992 -Node: Navigate157452 -Node: Verify165750 -Node: Restore174782 -Node: Emulation181869 -Node: Scripting191681 -Node: Frontend198842 -Node: Examples206917 -Node: ExDevices208095 -Node: ExCreate208754 -Node: ExDialog210039 -Node: ExGrowing211304 -Node: ExModifying212109 -Node: ExBootable212613 -Node: ExCharset213165 -Node: ExPseudo213986 -Node: ExCdrecord214884 -Node: ExMkisofs215201 -Node: ExGrowisofs216541 -Node: ExException217676 -Node: ExTime218130 -Node: ExIncBackup218589 -Node: ExRestore222581 -Node: ExRecovery223541 -Node: Files224111 -Node: Seealso225410 -Node: Bugreport226133 -Node: Legal226714 -Node: CommandIdx227725 -Node: ConceptIdx243954 +Node: SetInsert56350 +Node: Manip64927 +Node: CmdFind74436 +Node: Filter89141 +Node: Writing93697 +Node: SetWrite103085 +Node: Bootable121836 +Node: Jigdo137230 +Node: Charset141477 +Node: Exception144239 +Node: DialogCtl150359 +Node: Inquiry152957 +Node: Navigate159035 +Node: Verify167333 +Node: Restore176365 +Node: Emulation183452 +Node: Scripting193576 +Node: Frontend200737 +Node: Examples208812 +Node: ExDevices209990 +Node: ExCreate210649 +Node: ExDialog211934 +Node: ExGrowing213199 +Node: ExModifying214004 +Node: ExBootable214508 +Node: ExCharset215060 +Node: ExPseudo215881 +Node: ExCdrecord216779 +Node: ExMkisofs217096 +Node: ExGrowisofs218436 +Node: ExException219571 +Node: ExTime220025 +Node: ExIncBackup220484 +Node: ExRestore224476 +Node: ExRecovery225436 +Node: Files226006 +Node: Seealso227305 +Node: Bugreport228028 +Node: Legal228609 +Node: CommandIdx229620 +Node: ConceptIdx245922  End Tag Table

@@ -1,7 +1,7 @@ \input texinfo @c -*-texinfo-*- @c %**start of header @setfilename xorriso.info -@settitle GNU xorriso 1.2.6 +@settitle GNU xorriso 1.2.8 @c %**end of header @c @c man-ignore-lines begin @@ -50,7 +50,7 @@ @c man .\" First parameter, NAME, should be all caps @c man .\" Second parameter, SECTION, should be 1-8, maybe w/ subsection @c man .\" other parameters are allowed: see man(7), man(1) -@c man .TH XORRISO 1 "Version 1.2.6, Jan 08, 2013" +@c man .TH XORRISO 1 "Version 1.2.8, Mar 18, 2013" @c man .\" Please adjust this date whenever revising the manpage. @c man .\" @c man .\" Some roff macros, for reference: @@ -77,7 +77,7 @@ @end copying @c man-ignore-lines end @titlepage -@title Manual of GNU xorriso 1.2.6 +@title Manual of GNU xorriso 1.2.8 @author Thomas Schmitt @page @vskip 0pt plus 1filll @@ -86,7 +86,7 @@ @contents @ifnottex @node Top -@top GNU xorriso 1.2.6 +@top GNU xorriso 1.2.8 @c man-ignore-lines 1 @c man .SH NAME @@ -1271,7 +1271,7 @@ Renaming of files has similar collision handling, but directories can only be replaced, not merged. Note that if the target directory exists, then -mv inserts the source objects into this directory rather than attempting -to replace it. +to replace it. Command -move, on the other hand, would attempt to replace it. @c man .PP @sp 1 The commands in this section alter the ISO image and not the local filesystem. @@ -1773,8 +1773,17 @@ @cindex Directory, delete, -rmdir Delete empty directories. @c man .TP +@item -move iso_rr_path iso_rr_path +@kindex -mv renames single file in ISO image +@cindex Rename, in ISO image, -move +Rename the file given by the first (origin) iso_rr_path to the second +(destination) iso_rr_path. +Deviate from rules of shell command mv by not moving the origin file underneath +an existing destination directory. The origin file will rather replace such a +directory, if this is allowed by command -overwrite. +@c man .TP @item -mv iso_rr_path [***] iso_rr_path -@kindex -mv renames file in ISO image +@kindex -mv renames files in ISO image @cindex Rename, in ISO image, -mv Rename the given file objects in the ISO tree to the last parameter in the list. Use the same rules as with shell command mv. @@ -1962,6 +1971,15 @@ YYMMDD[.hhmm[ss]] @* where "A0" is year 2000, "B0" is 2010, etc. +@* +ECMA-119 volume timestamps: +@* + YYYYMMDDhhmmsscc +@* +These are normally given as GMT. The suffix "LOC" causes local timezone +conversion. E.g. 2013010720574700, 2013010720574700LOC. +The last two digits cc (centiseconds) will be ignored, but must be present +in order to make the format recognizable. @c man .TP @item -alter_date_r type timestring iso_rr_path [***] @kindex -alter_date_r sets timestamps in ISO image @@ -2703,6 +2721,10 @@ are the best guesses for lower and upper speed limit. "Write speed l" and "Write speed h" may appear only with CD and eventually override the list of other speed offers. +@* +Only if the drive reports contradicting speed information there will appear +"Write speed 0", which tells the outcome of speed selection by command +-speed 0, if it deviates from "Write speed H". @c man .TP @item -close_damaged "as_needed"|"force" @kindex -close_damaged closes damaged track and session @@ -3011,7 +3033,7 @@ E.g. 2010040711405800 is 7 Apr 2010 11:40:58 (+0 centiseconds). @* Timestrings for the other types may be given as with command -alter_date. -They are prone to timezone computations. The timestrings "default" or +Some of them are prone to timezone computations. The timestrings "default" or "overridden" cause default settings: "c" and "m" will show the current time of image creation. "x" and "f" will be marked as insignificant. "uuid" will be deactivated. @@ -4091,13 +4113,23 @@ @cindex Write, free space, -tell_media_space Print available space on the output medium and the free space after subtracting already foreseeable consumption by next -commit. +@* +Note that the title of the prediction "After commit :" is misleading. +It is rather the space that may still be filled in this session without +making the next -commit fail from medium overflow. +@* +The free space after the next -commit might be smaller by several MB. +This depends on medium type, number of recorded sessions, and drive habits. @c man .TP @item -pvd_info @kindex -pvd_info shows image id strings @cindex Image, show id strings, -pvd_info -Print various ID strings which can be found in loaded ISO images. Some of -them may be changed by commands like -volid or -publisher. For these -IDs -pvd_info reports what would be written with the next -commit. +Print various ID strings and timestamps which can be found in loaded ISO +images. Some of the IDs may be changed by commands like -volid or -publisher. +For these IDs -pvd_info reports what would be written with the next -commit. +The timestamps get not automatically propagated from loaded image to newly +written image. The ones for new images may be set by command -volume_date. +See there for the meaning of the particular timestamps. @end table @c man .TP @c man .B Navigation in ISO image and disk filesystem: @@ -4784,6 +4816,12 @@ -quiet (= "SORRY") persist. The output file persists until things happen like -commit, -rollback, -dev, or end of @command{xorriso}. +@* +Options which affect all file objects in the ISO image, like -r or -dir-mode, +will be applied only to files which are present in the ISO image when +the command -as ends. If you use several -as mkisofs commands in the same +run, then consider to put such options into the last -as command. +@* -pacifier gets set to "mkisofs" if files are added to the image. @* -graft-points is equivalent to -pathspecs on. Note that pathspecs without "="

@@ -85,6 +85,8 @@ <DD>allow zisofs, gzip compression, and Jigdo file production.</DD> <DT>libbz2 and libbz2-devel</DT> <DD>allow bzip2 compression of Jigdo template files.</DD> +<DT>Tcl, Tk >= 8.4, Tcl/Tk package BWidget</DT> +<DD>enable the operation of GUI frontend script <KBD>xorriso-tcltk</KBD>.</DD> </DL> </P> @@ -158,6 +160,45 @@ </P> <P> +<H2>GUI Frontend:</H2> +xorriso itself is entirely controlled by text commands. In dialog mode, +xorriso reads them as text lines from standard input. +Together with some helpful xorriso commands, it is quite easy for frontend +programs to operate a separate xorriso process. +<BR> +Other than the usual batch programs, xorriso will take care of maintaining +the emerging ISO image model. Its state can be inquired by the frontend +at any time. The frontend is supposed to care for the display of the inquired +xorriso state and to send xorriso commands to manipulate the ISO image model. +<BR> +As a proof of concept, there is a Tcl/Tk script which can +be launched by shell command <KBD>xorriso-tcltk</KBD> +<BR> +Click on this image to see a screenshot: +<BR> +<A HREF="xorriso-tcltk-screen.gif"> +<IMG SRC="xorriso-tcltk-thumb.jpg" BORDER=1 + ALT="To screenshot of frontend script xorriso-tcltk"></A> +<BR> +See also file +<A HREF="http://svn.libburnia-project.org/libisoburn/trunk/frontend/README-tcltk"> +frontend/README-tcltk. +</A> +<BR> +The script <KBD>xorriso-tcltk</KBD> +is part of the tarball and gets installed by <KBD>make install</KBD>. If a +xorriso distro package does not install it, you may get it directly from +<A HREF="http://libburnia-project.org/export/head/libisoburn/trunk/frontend/xorriso-tcltk"> +libburnia SVN: frontend/xorriso-tcltk +</A> +You will probably have to give it x-permission after download. Some browsers +insist in adding ".htm" to the file name. +<BR> +Further you need xorriso >= 1.2.8, Tcl, Tk >= 8.4, +Tcl/Tk package "BWidget". +</P> + +<P> <H2>Command Examples:</H2> <DL> @@ -461,21 +502,21 @@ <P> <DL> <DT><H3>Download as source code (see README):</H3></DT> -<DD><A HREF="xorriso-1.2.6.tar.gz">xorriso-1.2.6.tar.gz</A> -(2315 KB). +<DD><A HREF="xorriso-1.2.8.tar.gz">xorriso-1.2.8.tar.gz</A> +(2325 KB). </DD> -<DD>(Released 08 Jan 2013)</DD> -<DD><A HREF="xorriso-1.2.6.tar.gz.sig">xorriso-1.2.6.tar.gz.sig</A></DD> +<DD>(Released 18 Mar 2013)</DD> +<DD><A HREF="xorriso-1.2.8.tar.gz.sig">xorriso-1.2.8.tar.gz.sig</A></DD> <DD> (detached GPG signature for verification by -<KBD>gpg --verify xorriso-1.2.6.tar.gz.sig xorriso-1.2.6.tar.gz</KBD> +<KBD>gpg --verify xorriso-1.2.8.tar.gz.sig xorriso-1.2.8.tar.gz</KBD> <BR> after <KBD>gpg --keyserver keys.gnupg.net --recv-keys ABC0A854</KBD>). </DD> <DD> Also on <A HREF="http://www.gnu.org/prep/ftp.html"> mirrors of ftp://ftp.gnu.org/gnu/ </A> -as xorriso/xorriso-1.2.6.tar.gz +as xorriso/xorriso-1.2.8.tar.gz </DD> </DL> </DD> @@ -512,11 +553,23 @@ <HR> <P> -Bug fixes towards previous stable version xorriso-1.2.4: +Bug fixes towards previous stable version xorriso-1.2.6: <UL> -<LI>SIGSEGV by uninitialized local variable with -check_media patch_lba0="on". Regression by version 1.0.6</LI> -<LI>-partition_offset 16 kept -isohybrid-gpt-basdat from writing MBR entries 0xef</LI> -<LI>-rollback did not work if indev and outdev were empty</LI> +<LI> +-tell_media_space altered the pointers to MD5 +of data files which stem from a previous session. This produced +false mismatches with -check_md5_r. +</LI> +<LI> +CD tracks were reported with the sizes of the tracks in the first session. +</LI> +<LI> +-check_media use=outdev sector_map= stored TOC of input drive +</LI> +<LI> +-hide hfsplus and -as mkisofs -hide-hfsplus had no effect. +</LI> +<LI>./configure did not abort if libburn.h or libisofs.h were missing</LI>  @@ -535,19 +588,10 @@ --> <P> -Enhancements towards previous stable version xorriso-1.2.4: +Enhancements towards previous stable version xorriso-1.2.6: <UL> -<LI>New -boot_image partition_cyl_align mode "all"</LI> -<LI>New -blank mode prefix "force:"</LI> -<LI>New -osirrox settings "blocked" and "unblock"</LI> -<LI>New command -lns for creating symbolic links</LI> -<LI>New command -toc_of</LI> -<LI>New command -msg_op</LI> -<LI>New command -launch_frontend</LI> -<LI> -Proof-of-concept of a GUI frontend program: xorriso-tcltk written in Tcl/Tk. -<A HREF="xorriso-tcltk-screen.gif">(See screenshot)</A> -</LI> +<LI>New command -move</LI> +<LI>New -as mkisofs options -eltorito-id , -eltorito-selcrit</LI>  @@ -570,16 +614,16 @@ <A HREF="http://www.fsf.org/"> FSF </A> match completely. </DT> <DD> </DD> -<DT>libburn-1.2.6</DT> +<DT>libburn-1.2.8</DT> <DD>reads and writes data from and to CD, DVD, BD.</DD> <DD>(founded by Derek Foreman and Ben Jansens, developed and maintained since August 2006 by Thomas Schmitt from team of libburnia-project.org)</DD> -<DT>libisofs-1.2.6</DT> +<DT>libisofs-1.2.8</DT> <DD>operates on ISO 9660 filesystem images.</DD> <DD>(By Vreixo Formoso, Mario Danic and Thomas Schmitt from team of libburnia-project.org. HFS+ code by Vladimir Serbinenko.)</DD> -<DT>libisoburn-1.2.6</DT> +<DT>libisoburn-1.2.8</DT> <DD>coordinates libburn and libisofs, emulates multi-session where needed, and hosts the original source code of program xorriso.</DD> <DD>It provides the complete functionality of xorriso via @@ -600,18 +644,20 @@ <P> <DL> -<DT><H3>Development snapshot, version 1.2.7 :</H3></DT> -<DD>Bug fixes towards xorriso-1.2.6: +<DT><H3>Development snapshot, version 1.2.9 :</H3></DT> +<DD>Bug fixes towards xorriso-1.2.8: <UL> <LI>- none yet -</LI>  </UL> </DD> -<DD>Enhancements towards stable version 1.2.6: +<DD>Enhancements towards stable version 1.2.8: <UL> <LI>- none yet -</LI>  </UL> @@ -619,13 +665,13 @@ <DD> </DD> -<DD><A HREF="README_xorriso_devel">README 1.2.7</A> -<DD><A HREF="xorriso_help_devel">xorriso-1.2.7 -help</A></DD> -<DD><A HREF="xorrisofs_help_devel">xorriso-1.2.7 -as mkisofs -help</A></DD> -<DD><A HREF="xorrecord_help_devel">xorriso-1.2.7 -as cdrecord -help</A></DD> -<DD><A HREF="man_1_xorriso_devel.html">man xorriso (as of 1.2.7)</A></DD> -<DD><A HREF="man_1_xorrisofs_devel.html">man xorrisofs (as of 1.2.7)</A></DD> -<DD><A HREF="man_1_xorrecord_devel.html">man xorrecord (as of 1.2.7)</A></DD> +<DD><A HREF="README_xorriso_devel">README 1.2.9</A> +<DD><A HREF="xorriso_help_devel">xorriso-1.2.9 -help</A></DD> +<DD><A HREF="xorrisofs_help_devel">xorriso-1.2.9 -as mkisofs -help</A></DD> +<DD><A HREF="xorrecord_help_devel">xorriso-1.2.9 -as cdrecord -help</A></DD> +<DD><A HREF="man_1_xorriso_devel.html">man xorriso (as of 1.2.9)</A></DD> +<DD><A HREF="man_1_xorrisofs_devel.html">man xorrisofs (as of 1.2.9)</A></DD> +<DD><A HREF="man_1_xorrecord_devel.html">man xorrecord (as of 1.2.9)</A></DD> <DD> </DD> <DT>If you want to distribute development versions of xorriso, then use this tarball which produces static linking between xorriso and the @@ -635,8 +681,8 @@ installation see README) </DD> <DD> -<A HREF="xorriso-1.2.7.tar.gz">xorriso-1.2.7.tar.gz</A> -(2315 KB). +<A HREF="xorriso-1.2.9.tar.gz">xorriso-1.2.9.tar.gz</A> +(2325 KB). </DD> <DT>A dynamically linked development version of xorriso can be obtained from repositories of @@ -711,12 +757,6 @@ <A HREF="http://www.webframe.org">www.webframe.org</A><BR> <A HREF="http://sourceforge.net">sourceforge.net</A><BR> - - </FONT></CENTER> </P>

@@ -111,7 +111,7 @@ */ #define Xorriso_req_majoR 1 #define Xorriso_req_minoR 2 -#define Xorriso_req_micrO 6 +#define Xorriso_req_micrO 8 static void yell_xorriso()

@@ -138,6 +138,7 @@ */ int iso_level; + int iso_level_is_default; int do_joliet; int do_hfsplus; int do_fat; @@ -179,6 +180,7 @@ char scdbackup_tag_listname[SfileadrL]; int relax_compliance; /* opaque bitfield to be set by xorrisoburn */ + int allow_dir_id_ext_dflt; /* -compliance allow_dir_id_ext still on default */ char rr_reloc_dir[256]; int rr_reloc_flags; int untranslated_name_len; @@ -367,6 +369,7 @@ 1=emulation as hard disk 2=emulation as floppy */ + int boot_emul_default; /* 1= boot_image_emul is still default */ off_t boot_image_load_size; unsigned char boot_id_string[29]; unsigned char boot_selection_crit[21];

@@ -1 +1 @@ -#define Xorriso_timestamP "2013.01.08.103001" +#define Xorriso_timestamP "2013.03.18.093001"

@@ -4,7 +4,7 @@ a command line oriented batch and dialog tool which creates, loads, manipulates and burns ISO 9660 filesystem images. - Copyright 2007-2012 Thomas Schmitt, <scdbackup@gmx.net> + Copyright 2007-2013 Thomas Schmitt, <scdbackup@gmx.net> Provided under GPL version 2 or later. @@ -19,7 +19,7 @@ */ #define xorriso_libisoburn_req_major 1 #define xorriso_libisoburn_req_minor 2 -#define xorriso_libisoburn_req_micro 6 +#define xorriso_libisoburn_req_micro 8 struct SpotlisT; /* List of intervals with different read qualities */

@@ -9,7 +9,7 @@ .\" First parameter, NAME, should be all caps .\" Second parameter, SECTION, should be 1-8, maybe w/ subsection .\" other parameters are allowed: see man(7), man(1) -.TH XORRISOFS 1 "Version 1.2.6, Jan 08, 2013" +.TH XORRISOFS 1 "Version 1.2.8, Mar 18, 2013" .\" Please adjust this date whenever revising the manpage. .\" .\" Some roff macros, for reference: @@ -901,6 +901,19 @@ boot image will be marked as emulating a floppy. (Not suitable for any known boot loader.) .TP +\fB\-eltorito-id\fR text|56_hexdigits +Define the ID string of the boot catalog +section where the boot image will be listed. If the value consists of 56 +characters [0\-9A\-Fa\-f] then it is converted into 28 bytes, else the first +28 characters become the ID string. +The ID string of the first boot image becomes the overall catalog ID. +It is limited to 24 characters. Other id_strings become section IDs. +.TP +\fB\-eltorito-selcrit\fR hexdigits +Define the Selection Criteria of the boot image. +Up to 20 bytes get read from the given characters [0\-9A\-Fa\-f]. +They get attributed to the boot image entry in the catalog. +.TP \fB\-boot-info-table\fR Overwrite certain bytes in the current boot image. The information will be supplied by xorriso in the course of image production: Block address of

@@ -14,7 +14,7 @@  File: xorrisofs.info, Node: Top, Next: Overview, Up: (dir) -xorrisofs 1.2.5 +xorrisofs 1.2.8 *************** xorrisofs - Emulation of ISO 9660 program mkisofs by program xorriso @@ -892,6 +892,19 @@ boot image will be marked as emulating a floppy. (Not suitable for any known boot loader.) +-eltorito-id text|56_hexdigits + Define the ID string of the boot catalog section where the boot + image will be listed. If the value consists of 56 characters + [0-9A-Fa-f] then it is converted into 28 bytes, else the first 28 + characters become the ID string. The ID string of the first boot + image becomes the overall catalog ID. It is limited to 24 + characters. Other id_strings become section IDs. + +-eltorito-selcrit hexdigits + Define the Selection Criteria of the boot image. Up to 20 bytes + get read from the given characters [0-9A-Fa-f]. They get + attributed to the boot image entry in the catalog. + -boot-info-table Overwrite certain bytes in the current boot image. The information will be supplied by xorriso in the course of image production: @@ -1702,7 +1715,7 @@ * --acl Recording of ACLs: SetExtras. (line 71) * --boot-catalog-hide Hide El Torito boot catalog: Bootable. - (line 95) + (line 108) * --efi-boot El Torito EFI boot image: Bootable. (line 58) * --embedded-boot Fill System Area e.g. by MBR: SystemArea. (line 35) * --emul-toc enable table-of-content emulation: SetProduct. (line 35) @@ -1738,9 +1751,9 @@ * -b El Torito PC-BIOS boot image: Bootable. (line 32) * -B SUN SPARC boot images: SystemArea. (line 177) * -biblio set Biblio File path: ImageId. (line 72) -* -boot-info-table Patch El Torito boot image: Bootable. (line 80) +* -boot-info-table Patch El Torito boot image: Bootable. (line 93) * -boot-load-size El Torito boot image load size: Bootable. (line 63) -* -c El Torito boot catalog name: Bootable. (line 86) +* -c El Torito boot catalog name: Bootable. (line 99) * -C set load address and write address offset: Loading. (line 28) * -cdrecord-params set load address and write address offset: Loading. (line 50) @@ -1762,7 +1775,10 @@ * -eltorito-alt-boot begin next boot catalog entry: Bootable. (line 43) * -eltorito-boot El Torito PC-BIOS boot image: Bootable. (line 40) -* -eltorito-catalog El Torito boot catalog name: Bootable. (line 92) +* -eltorito-catalog El Torito boot catalog name: Bootable. (line 105) +* -eltorito-id El Torito boot section id string: Bootable. (line 80) +* -eltorito-selcrit El Torito boot selection criteria: Bootable. + (line 88) * -exclude exclude disk files from inserting: SetInsert. (line 42) * -exclude-list exclude disk files from inserting: SetInsert. (line 51) @@ -1905,21 +1921,25 @@ * Biblio File, set path, -biblio: ImageId. (line 72) * Block address, set sort weight, --sort-weight: SetProduct. (line 49) * Bootability, boot catalog hidden, --boot-catalog-hide: Bootable. - (line 95) + (line 108) * Bootability, boot catalog name, -c, -eltorito-catalog: Bootable. - (line 86) + (line 99) * Bootability, boot image emulation, -hard-disk-boot: Bootable. (line 68) * Bootability, boot image load size, -boot-load-size: Bootable. (line 63) * Bootability, boot image patching, -boot-info-table: Bootable. - (line 80) + (line 93) * Bootability, control, --efi-boot: Bootable. (line 58) * Bootability, control, -b, -eltorito-boot: Bootable. (line 32) * Bootability, control, -B, -sparc-boot: SystemArea. (line 177) * Bootability, control, -e: Bootable. (line 50) * Bootability, control, -mips-boot: SystemArea. (line 164) * Bootability, control, -mipsel-boot: SystemArea. (line 171) +* Bootability, El Torito section id string, -eltorito-id: Bootable. + (line 80) +* Bootability, El Torito selection criteria, -eltorito-selcrit: Bootable. + (line 88) * Bootability, fill System Area e.g. by MBR, -G, --embedded-boot, -generic-boot: SystemArea. (line 25) * Bootability, for CHRP, -chrp-boot-part: SystemArea. (line 149) @@ -2089,23 +2109,23 @@ Node: SetHide28860 Node: ImageId30168 Node: Bootable33673 -Node: SystemArea37738 -Node: Charset47381 -Node: Jigdo48407 -Node: Miscellaneous52674 -Node: Examples54047 -Node: ExSimple54533 -Node: ExGraft55012 -Node: ExMkisofs56259 -Node: ExGrowisofs57512 -Node: ExIncBackup58684 -Node: ExIncBckAcc61792 -Node: ExBootable63468 -Node: Files65560 -Node: Seealso66634 -Node: Bugreport67290 -Node: Legal67871 -Node: CommandIdx68766 -Node: ConceptIdx82400 +Node: SystemArea38383 +Node: Charset48026 +Node: Jigdo49052 +Node: Miscellaneous53319 +Node: Examples54692 +Node: ExSimple55178 +Node: ExGraft55657 +Node: ExMkisofs56904 +Node: ExGrowisofs58157 +Node: ExIncBackup59329 +Node: ExIncBckAcc62437 +Node: ExBootable64113 +Node: Files66205 +Node: Seealso67279 +Node: Bugreport67935 +Node: Legal68516 +Node: CommandIdx69411 +Node: ConceptIdx83258  End Tag Table

@@ -1,7 +1,7 @@ \input texinfo @c -*-texinfo-*- @c %**start of header @setfilename xorrisofs.info -@settitle GNU xorrisofs 1.2.6 +@settitle GNU xorrisofs 1.2.8 @c %**end of header @c @c man-ignore-lines begin @@ -50,7 +50,7 @@ @c man .\" First parameter, NAME, should be all caps @c man .\" Second parameter, SECTION, should be 1-8, maybe w/ subsection @c man .\" other parameters are allowed: see man(7), man(1) -@c man .TH XORRISOFS 1 "Version 1.2.6, Jan 08, 2013" +@c man .TH XORRISOFS 1 "Version 1.2.8, Mar 18, 2013" @c man .\" Please adjust this date whenever revising the manpage. @c man .\" @c man .\" Some roff macros, for reference: @@ -76,7 +76,7 @@ @end copying @c man-ignore-lines end @titlepage -@title Manual of GNU xorriso personality xorrisofs 1.2.6 +@title Manual of GNU xorriso personality xorrisofs 1.2.8 @author Thomas Schmitt @page @vskip 0pt plus 1filll @@ -85,7 +85,7 @@ @contents @ifnottex @node Top -@top xorrisofs 1.2.5 +@top xorrisofs 1.2.8 @c man-ignore-lines 1 @c man .SH NAME @@ -1245,6 +1245,23 @@ boot image will be marked as emulating a floppy. (Not suitable for any known boot loader.) @c man .TP +@item -eltorito-id text|56_hexdigits +@kindex -eltorito-id El Torito boot section id string +@cindex Bootability, El Torito section id string, -eltorito-id +Define the ID string of the boot catalog +section where the boot image will be listed. If the value consists of 56 +characters [0-9A-Fa-f] then it is converted into 28 bytes, else the first +28 characters become the ID string. +The ID string of the first boot image becomes the overall catalog ID. +It is limited to 24 characters. Other id_strings become section IDs. +@c man .TP +@item -eltorito-selcrit hexdigits +@kindex -eltorito-selcrit El Torito boot selection criteria +@cindex Bootability, El Torito selection criteria, -eltorito-selcrit +Define the Selection Criteria of the boot image. +Up to 20 bytes get read from the given characters [0-9A-Fa-f]. +They get attributed to the boot image entry in the catalog. +@c man .TP @item -boot-info-table @kindex -boot-info-table Patch El Torito boot image @cindex Bootability, boot image patching, -boot-info-table

[-] [+]	Changed	xorriso.changes
@@ -1,4 +1,9 @@ ------------------------------------------------------------------- +Thu Mar 21 20:24:58 UTC 2013 - cs@linux-administrator.com + +- update to release 1.2.8 + +------------------------------------------------------------------- Thu Jan 10 20:29:41 UTC 2013 - cs@linux-administrator.com - update to release 1.2.6
[-] [+]	Changed	xorriso.spec ^
@@ -1,5 +1,5 @@ Name: xorriso -Version: 1.2.6 +Version: 1.2.8 Release: 1 License: GPL URL: http://scdbackup.sourceforge.net/xorriso_eng.html
[-] [+]	Changed	xorriso-1.2.8.tar.bz2/ChangeLog ^
@@ -1,3 +1,18 @@ +SVN trunk (to become libisoburn-1.2.8.tar.gz or higher) +=============================================================================== +* Bug fix: -tell_media_space altered the pointers to MD5 of data files + which stem from a previous session. This produced false + mismatches with -check_md5_r. +* Bug fix: CD tracks were reported with the sizes of the tracks in the + first session. +* Bug fix: -check_media use=outdev sector_map= stored TOC of input drive +* Bug fix: -hide hfsplus and -as mkisofs -hide-hfsplus had no effect. + Thanks to Davy Ho. +* Bug fix: ./configure did not abort if libburn.h or libisofs.h were missing +* New command -move +* New -as mkisofs options -eltorito-id , -eltorito-selcrit + + libisoburn-1.2.6.tar.gz Tue Jan 08 2013 =============================================================================== * Bug fix: SIGSEGV by uninitialized local variable with
[-] [+]	Changed	xorriso-1.2.8.tar.bz2/Makefile.in ^
@@ -3076,7 +3076,7 @@ .zip) \ unzip $(distdir).zip ;;\ esac - chmod -R a-w $(distdir); chmod a+w $(distdir) + chmod -R a-w $(distdir); chmod u+w $(distdir) mkdir $(distdir)/_build mkdir $(distdir)/_inst chmod a-w $(distdir)
[-] [+]	Changed	xorriso-1.2.8.tar.bz2/README ^
@@ -4,7 +4,7 @@ GNU xorriso. By Thomas Schmitt <scdbackup@gmx.net> Derived from and supported by libburnia-project.org, published via: http://www.gnu.org/software/xorriso/xorriso_eng.html -http://www.gnu.org/software/xorriso/xorriso-1.2.6.tar.gz +http://www.gnu.org/software/xorriso/xorriso-1.2.8.tar.gz Provided under GPL version 3 or later. No warranty. ------------------------------------------------------------------------------ @@ -46,10 +46,10 @@ If they were present at compile time, then the optional libraries have to be present at runtime, too. -Obtain xorriso-1.2.6.tar.gz, take it to a directory of your choice and do: +Obtain xorriso-1.2.8.tar.gz, take it to a directory of your choice and do: - tar xzf xorriso-1.2.6.tar.gz - cd xorriso-1.2.6 + tar xzf xorriso-1.2.8.tar.gz + cd xorriso-1.2.8 Within that directory execute: @@ -356,9 +356,9 @@ This binary is very lean but depends on properly installed libraries of suitable revision. -Dynamic library and compile time header requirements for libisoburn-1.2.6 : -- libburn.so.4 , version libburn-1.2.6 or higher -- libisofs.so.6 , version libisofs-1.2.6 or higher +Dynamic library and compile time header requirements for libisoburn-1.2.8 : +- libburn.so.4 , version libburn-1.2.8 or higher +- libisofs.so.6 , version libisofs-1.2.8 or higher libisoburn and xorriso will not start with libraries which are older than their headers seen at compile time. So compile in the oldest possible installation setup unless you have reason to enforce a newer bug fix level.
[-] [+]	Changed	xorriso-1.2.8.tar.bz2/config.status ^
@@ -275,7 +275,7 @@ # report actual input values of CONFIG_FILES etc. instead of their # values after options handling. ac_log=" -This file was extended by libisoburn $as_me 1.2.5, which was +This file was extended by libisoburn $as_me 1.2.7, which was generated by GNU Autoconf 2.60. Invocation command line was CONFIG_FILES = $CONFIG_FILES @@ -314,7 +314,7 @@ Report bugs to <bug-autoconf@gnu.org>." ac_cs_version="\ -libisoburn config.status 1.2.5 +libisoburn config.status 1.2.7 configured by ./configure_ts, generated by GNU Autoconf 2.60, with options \"'--prefix=/usr'\" @@ -471,8 +471,8 @@ s,@PATH_SEPARATOR@,\|#_!!_#\|:,g s,@PACKAGE_NAME@,\|#_!!_#\|libisoburn,g s,@PACKAGE_TARNAME@,\|#_!!_#\|libisoburn,g -s,@PACKAGE_VERSION@,\|#_!!_#\|1.2.5,g -s,@PACKAGE_STRING@,\|#_!!_#\|libisoburn 1.2.5,g +s,@PACKAGE_VERSION@,\|#_!!_#\|1.2.7,g +s,@PACKAGE_STRING@,\|#_!!_#\|libisoburn 1.2.7,g s,@PACKAGE_BUGREPORT@,\|#_!!_#\|http://libburnia-project.org,g s,@exec_prefix@,\|#_!!_#\|${prefix},g s,@prefix@,\|#_!!_#\|/usr,g @@ -496,7 +496,7 @@ s,@libdir@,\|#_!!_#\|${exec_prefix}/lib,g s,@localedir@,\|#_!!_#\|${datarootdir}/locale,g s,@mandir@,\|#_!!_#\|${datarootdir}/man,g -s,@DEFS@,\|#_!!_#\|-DPACKAGE_NAME=\\"libisoburn\\" -DPACKAGE_TARNAME=\\"libisoburn\\" -DPACKAGE_VERSION=\\"1.2.5\\" -DPACKAGE_STRING=\\"libisoburn\\ 1.2.5\\" -DPACKAGE_BUGREPORT=\\"http://libburnia-project.org\\" -DPACKAGE=\\"libisoburn\\" -DVERSION=\\"1.2.5\\" -DSTDC_HEADERS=1 -DHAVE_SYS_TYPES_H=1 -DHAVE_SYS_STAT_H=1 -DHAVE_STDLIB_H=1 -DHAVE_STRING_H=1 -DHAVE_MEMORY_H=1 -DHAVE_STRINGS_H=1 -DHAVE_INTTYPES_H=1 -DHAVE_STDINT_H=1 -DHAVE_UNISTD_H=1 -DHAVE_FSEEKO=1 -DICONV_CONST= -DHAVE_DLFCN_H=1 -DHAVE_LIBACL=1 -DHAVE_LIBZ=1 -DHAVE_LIBJTE=1,g +s,@DEFS@,\|#_!!_#\|-DPACKAGE_NAME=\\"libisoburn\\" -DPACKAGE_TARNAME=\\"libisoburn\\" -DPACKAGE_VERSION=\\"1.2.7\\" -DPACKAGE_STRING=\\"libisoburn\\ 1.2.7\\" -DPACKAGE_BUGREPORT=\\"http://libburnia-project.org\\" -DPACKAGE=\\"libisoburn\\" -DVERSION=\\"1.2.7\\" -DSTDC_HEADERS=1 -DHAVE_SYS_TYPES_H=1 -DHAVE_SYS_STAT_H=1 -DHAVE_STDLIB_H=1 -DHAVE_STRING_H=1 -DHAVE_MEMORY_H=1 -DHAVE_STRINGS_H=1 -DHAVE_INTTYPES_H=1 -DHAVE_STDINT_H=1 -DHAVE_UNISTD_H=1 -DHAVE_FSEEKO=1 -DICONV_CONST= -DHAVE_DLFCN_H=1 -DHAVE_TM_GMTOFF=1 -DHAVE_LIBACL=1 -DHAVE_LIBZ=1 -DHAVE_LIBJTE=1,g s,@ECHO_C@,\|#_!!_#\|,g s,@ECHO_N@,\|#_!!_#\|-n,g s,@ECHO_T@,\|#_!!_#\|,g @@ -521,7 +521,7 @@ s,@INSTALL_DATA@,\|#_!!_#\|${INSTALL} -m 644,g s,@CYGPATH_W@,\|#_!!_#\|echo,g s,@PACKAGE@,\|#_!!_#\|libisoburn,g -s,@VERSION@,\|#_!!_#\|1.2.5,g +s,@VERSION@,\|#_!!_#\|1.2.7,g s,@ACLOCAL@,\|#_!!_#\|${SHELL} /home/thomas/projekte/cdrskin_dir/libisoburn-develop/missing --run aclocal-1.9,g s,@AUTOCONF@,\|#_!!_#\|${SHELL} /home/thomas/projekte/cdrskin_dir/libisoburn-develop/missing --run autoconf,g s,@AUTOMAKE@,\|#_!!_#\|${SHELL} /home/thomas/projekte/cdrskin_dir/libisoburn-develop/missing --run automake-1.9,g @@ -539,11 +539,11 @@ s,@am__untar@,\|#_!!_#\|${AMTAR} xf -,g s,@ISOBURN_MAJOR_VERSION@,\|#_!!_#\|1,g s,@ISOBURN_MINOR_VERSION@,\|#_!!_#\|2,g -s,@ISOBURN_MICRO_VERSION@,\|#_!!_#\|5,g +s,@ISOBURN_MICRO_VERSION@,\|#_!!_#\|7,g s,@LT_RELEASE@,\|#_!!_#\|1.2,g -s,@LT_CURRENT@,\|#_!!_#\|82,g +s,@LT_CURRENT@,\|#_!!_#\|84,g s,@LT_REVISION@,\|#_!!_#\|0,g -s,@LT_AGE@,\|#_!!_#\|81,g +s,@LT_AGE@,\|#_!!_#\|83,g s,@LT_CURRENT_MINUS_AGE@,\|#_!!_#\|1,g s,@MAINTAINER_MODE_TRUE@,\|#_!!_#\|#,g s,@MAINTAINER_MODE_FALSE@,\|#_!!_#\|,g
[-] [+]	Changed	xorriso-1.2.8.tar.bz2/configure ^
@@ -1,6 +1,6 @@ #! /bin/sh # Guess values for system-dependent variables and create Makefiles. -# Generated by GNU Autoconf 2.60 for xorriso 1.2.6. +# Generated by GNU Autoconf 2.60 for xorriso 1.2.8. # # Report bugs to <http://libburnia-project.org>. # @@ -713,8 +713,8 @@ # Identity of this package. PACKAGE_NAME='xorriso' PACKAGE_TARNAME='xorriso' -PACKAGE_VERSION='1.2.6' -PACKAGE_STRING='xorriso 1.2.6' +PACKAGE_VERSION='1.2.8' +PACKAGE_STRING='xorriso 1.2.8' PACKAGE_BUGREPORT='http://libburnia-project.org' ac_default_prefix=/usr/local @@ -1397,7 +1397,7 @@ # Omit some internal or obsolete options to make the list less imposing. # This message is too long to be a string in the A/UX 3.1 sh. cat <<_ACEOF -\`configure' configures xorriso 1.2.6 to adapt to many kinds of systems. +\`configure' configures xorriso 1.2.8 to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... @@ -1468,7 +1468,7 @@ if test -n "$ac_init_help"; then case $ac_init_help in - short \| recursive ) echo "Configuration of xorriso 1.2.6:";; + short \| recursive ) echo "Configuration of xorriso 1.2.8:";; esac cat <<\_ACEOF @@ -1594,7 +1594,7 @@ test -n "$ac_init_help" && exit $ac_status if $ac_init_version; then cat <<\_ACEOF -xorriso configure 1.2.6 +xorriso configure 1.2.8 generated by GNU Autoconf 2.60 Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001, @@ -1608,7 +1608,7 @@ This file contains any messages produced by compilers while running configure, to aid debugging if configure makes a mistake. -It was created by xorriso $as_me 1.2.6, which was +It was created by xorriso $as_me 1.2.8, which was generated by GNU Autoconf 2.60. Invocation command line was $ $0 $@ @@ -2418,7 +2418,7 @@ # Define the identity of the package. PACKAGE='xorriso' - VERSION='1.2.6' + VERSION='1.2.8' cat >>confdefs.h <<_ACEOF @@ -2586,14 +2586,14 @@ BURN_MAJOR_VERSION=1 BURN_MINOR_VERSION=2 -BURN_MICRO_VERSION=6 +BURN_MICRO_VERSION=8 LIBISOFS_MAJOR_VERSION=1 LIBISOFS_MINOR_VERSION=2 -LIBISOFS_MICRO_VERSION=6 +LIBISOFS_MICRO_VERSION=8 @@ -25993,7 +25993,7 @@ # report actual input values of CONFIG_FILES etc. instead of their # values after options handling. ac_log=" -This file was extended by xorriso $as_me 1.2.6, which was +This file was extended by xorriso $as_me 1.2.8, which was generated by GNU Autoconf 2.60. Invocation command line was CONFIG_FILES = $CONFIG_FILES @@ -26046,7 +26046,7 @@ _ACEOF cat >>$CONFIG_STATUS <<_ACEOF ac_cs_version="\\ -xorriso config.status 1.2.6 +xorriso config.status 1.2.8 configured by $0, generated by GNU Autoconf 2.60, with options \\"`echo "$ac_configure_args" \| sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`\\"
[-] [+]	Changed	xorriso-1.2.8.tar.bz2/configure.ac ^
@@ -3,7 +3,7 @@ # Copyright (c) 2007 - 2013 Thomas Schmitt <scdbackup@gmx.net> # Provided under GPL version 2 or later. -AC_INIT([xorriso], [1.2.6], [http://libburnia-project.org]) +AC_INIT([xorriso], [1.2.8], [http://libburnia-project.org]) AC_PREREQ([2.50]) AC_CANONICAL_HOST @@ -23,14 +23,14 @@ BURN_MAJOR_VERSION=1 BURN_MINOR_VERSION=2 -BURN_MICRO_VERSION=6 +BURN_MICRO_VERSION=8 AC_SUBST(BURN_MAJOR_VERSION) AC_SUBST(BURN_MINOR_VERSION) AC_SUBST(BURN_MICRO_VERSION) LIBISOFS_MAJOR_VERSION=1 LIBISOFS_MINOR_VERSION=2 -LIBISOFS_MICRO_VERSION=6 +LIBISOFS_MICRO_VERSION=8 AC_SUBST(LIBISOFS_MAJOR_VERSION) AC_SUBST(LIBISOFS_MINOR_VERSION) AC_SUBST(LIBISOFS_MICRO_VERSION)
[-] [+]	Changed	xorriso-1.2.8.tar.bz2/frontend/README-tcltk ^
@@ -65,7 +65,7 @@ ------------------------------------------------------------------------ Usage: - /usr/bin/xorriso-tcltk [options] + frontend/xorriso-tcltk [options] Options: All options must be given with two dashes ("--option") in order to distinguish them from any options of the Tcl shell. @@ -105,9 +105,16 @@ reply messages and enable this logging. The log lines will be appended. Path "-" means stderr. --script_log_file path - Set a file address for logging of major xorriso commands - and enable this logging. + Set a file address for logging of essential xorriso + commands and enable this logging. The log lines will be appended. Path "-" means stderr. + --script_log_all_commands + With logging of commands log non-essential commands too. + --use_command_move + Use xorriso command -move for the "Move to: button + if xorriso version is >= 1.2.8 + --use_command_mv + Use xorriso command -mv for the "Move to:" button. If neither --stdio nor --named_pipes is given, then this script will try to locate itself in the filesystem and start a xorriso
[-] [+]	Changed	xorriso-1.2.8.tar.bz2/frontend/xorriso-tcltk ^
@@ -19,9 +19,9 @@ # And, well, a graphical widget set would be nice. -set own_version "1.2.6" +set own_version "1.2.8" -# Minimum version of xorriso to be used as backend provess. +# Minimum version of xorriso to be used as backend process. # Older versions of xorriso do not offer commands -msg_op and -launch_frontend set min_xorriso_version "1.2.6" @@ -68,9 +68,16 @@ puts stderr " reply messages and enable this logging." puts stderr " The log lines will be appended. Path \"-\" means stderr." puts stderr " --script_log_file path" - puts stderr " Set a file address for logging of major xorriso commands" - puts stderr " and enable this logging." + puts stderr " Set a file address for logging of essential xorriso" + puts stderr " commands and enable this logging." puts stderr " The log lines will be appended. Path \"-\" means stderr." + puts stderr " --script_log_all_commands" + puts stderr " With logging of commands log non-essential commands too." + puts stderr " --use_command_move" + puts stderr " Use xorriso command -move for the \"Move to:\" button" + puts stderr " if xorriso version is >= 1.2.8" + puts stderr " --use_command_mv" + puts stderr " Use xorriso command -mv for the \"Move to:\" button." puts stderr "" puts stderr "If neither --stdio nor --named_pipes is given, then this script" puts stderr "will try to locate itself in the filesystem and start a xorriso" @@ -137,6 +144,9 @@ # This may be expected when xorriso is being shut down by this frontend. set expect_broken_pipes "0" +# Whether to use command -move rather than -mv. Possible since xorriso-1.2.8. +set use_command_move 1 + # Local copies of xorriso state @@ -193,6 +203,9 @@ # Whether to log essential commands: 0=off , 1=no extract , 2=with extract set cmd_logging_mode 0 +# Whether to log all commands if cmd_logging_mode is 1: 0=off , 1=on +set cmd_logging_all 0 + # The last logged -cd path. Used to prevent redundant logging of -cd. set recent_cd_path "" @@ -240,6 +253,7 @@ global cmd_sent cmd_conn debug_logging debug_log_conn display_busy 1 + log_command $cmd 0 debug_log_puts \ " ==============================================================" @@ -270,7 +284,7 @@ # Send a command and make it a candidate for the log script # proc send_loggable_cmd {cmd} { - log_command $cmd + log_command $cmd 1 send_marked_cmd $cmd } @@ -775,6 +789,7 @@ # proc check_xorriso_version {} { global sieve_ret result_list pre_msglist xorriso_version min_xorriso_version + global use_command_move global reply_conn set version "0.0.0 (= unknown)" @@ -802,6 +817,9 @@ "red" "embedded" central_exit 2 } + if {$xorriso_version < "1.2.8"} { + set use_command_move 0 + } set_display_msg $disp_en_mem } @@ -1609,7 +1627,7 @@ proc isomanip_mv {} { global .isolist global isomanip_move_target isolist_names isodir_is_pwd isodir_adr - global isodir_return_name + global isodir_return_name use_command_move if {$isomanip_move_target == ""} { xorriso_tcltk_errmsg \ @@ -1658,7 +1676,7 @@ set name_ftype [isofs_filetype $name] # Ask for confirmation if overwriting is about to happen - if {$target_ftype == "d"} { + if {$target_ftype == "d" && $use_command_move == 0} { set eff_target [combine_dir_and_name $target $name] set eff_target_ftype [isofs_filetype $eff_target] } else { @@ -1667,11 +1685,17 @@ } if {[handle_overwriting "isofs" $eff_target $eff_target_ftype \ "isofs" $name $name_ftype $multi_source \ - "" ""] == "0"} { + "" "" "replace"] == "0"} { if {$multi_source == 0} { return "" } continue } - send_loggable_cmd "-mv [make_text_shellsafe $name] [make_text_shellsafe $target] --" + if {$use_command_move == 0} { + send_loggable_cmd \ + "-mv [make_text_shellsafe $name] [make_text_shellsafe $target] --" + } else { + send_loggable_cmd \ + "-move [make_text_shellsafe $name] [make_text_shellsafe $target] --" + } } if {[llength $selected] == 1} { @@ -2006,7 +2030,7 @@ set line "n.a." reset_highest_cmd_sev clear_sieve - send_marked_cmd "-tell_media_space" + send_loggable_cmd "-tell_media_space" if {[compare_sev $highest_cmd_sev "FAILURE"] < 0} { set ac "" read_sieve "After commit :" @@ -2026,7 +2050,7 @@ # proc handle_overwriting {target_fs target target_ftype source_fs source source_ftype multi_source - selected_adr selected_ftype} { + selected_adr selected_ftype dir_action} { global overwrite_iso_files overwrite_iso_dirs overwrite_disk_files if {$target_fs == "localfs"} { @@ -2058,6 +2082,16 @@ if {$target_ftype != ""} { if {$target_ftype == "d"} { if {$source_ftype == "d"} { + if {$dir_action == "replace"} { + if {$overwrite_iso_dirs != 1} { + xorriso_tcltk_errmsg "xorriso-tcltk : SORRY : You would have to enable \"Overwrite $overwrite_fs dirs\" for\n[make_text_shellsafe $target]" + return "0" + } + if {[$what_window \ + "Really replace existing $to_fs directory\n\n[make_text_shellsafe $target]\n\nby $from_fs directory\n[make_text_shellsafe $source]\n?"] \ + != 1} { return "0" } + return "1" + } if {[$what_window \ "Really merge existing $to_fs directory\n\n[make_text_shellsafe $target]\n\nwith $from_fs directory\n[make_text_shellsafe $source]\n?"] \ != 1} { return "0" } @@ -2136,7 +2170,7 @@ reset_yesno_to_all if {[handle_overwriting "isofs" $target $target_ftype \ "localfs" $insert_from_adr $source_ftype 0 \ - $selected_adr $selected_ftype] == "0"} { + $selected_adr $selected_ftype "merge"] == "0"} { return "" } @@ -2232,7 +2266,7 @@ set source_ftype [isofs_filetype $i] if {[handle_overwriting "localfs" $target $target_ftype \ "isofs" $i $source_ftype $multi_source \ - "" ""] == 0} { + "" "" "merge"] == 0} { continue } send_loggable_cmd \ @@ -3538,7 +3572,7 @@ # proc init_input {} { global borderwidth busy_text_exists xorriso_version debug_logging - global cmd_logging_mode cmd_log_target osirrox_allowed + global cmd_logging_mode cmd_log_target osirrox_allowed cmd_logging_all global .input .input_line1 .xorriso_version .busy .busy_text global .refresh_state .end_button .cmdline .log_pipes_switch @@ -3579,6 +3613,10 @@ -command "effectuate_command_logging 0" \ -variable cmd_logging_mode \ -onvalue 1 -offvalue 0 + $m add checkbutton -label "Log non-essential commands" \ + -indicatoron 1 -selectcolor "" \ + -variable cmd_logging_all \ + -onvalue 1 -offvalue 0 $m add command -label "Set log script address" \ -command "set_log_script_address" $m add separator @@ -4311,7 +4349,7 @@ # The central storage for help texts. # proc tell_helptext {what} { - global own_version argv0 bwidget_version + global own_version argv0 bwidget_version use_command_move if {$what == "Help"} { return \ @@ -4526,7 +4564,12 @@ if {$what == "Command:"} { return \ "The \"Command:\" field can be used to send commands to xorriso. -See the manual page of xorriso for its concepts and commands." +See the manual page of xorriso for its concepts and commands. + +Normally the other GUI elements will emit xorriso commands for you. +This input field is presented only to make accessible those features +of xorriso which are not covered by the GUI. Use the \"Refresh disp\" +button to update the display after you have manually transmitted commands." } if {$what == "Script/Log"} { return \ @@ -4539,6 +4582,10 @@ get sent via the \"Command:\" field. Commands -osirrox and -extract will be logged only as comments. +The \"Log non-essential commands\" switch controls whether all commands +shall be logged if \"Log command script\" is enabled. Commands +-msg_op \"parse\" and -msg_op \"parse_bulk\" will be logged only as comments. + The item \"Set log script address\" pops up a file tree browser window which asks for the target of appending to script. Address \"-\" means standard error. Else it must not yet exist or be a writable data file. @@ -4815,6 +4862,9 @@ burn a data file from hard disk onto the output drive. The address of the disk file is taken from the neighboring text field. +No input drive may be aquired. (Delete all characters from the field +\"Input drive/image\" and hit Return to give up the input drive.) + The medium in the drive must be blank. (It is well possible to burn image files to appendable media. But the @@ -4981,7 +5031,7 @@ ---------------------------------------------------------------------------- The \"Overwrite ISO dirs\" switch controls whether it is allowed to replace -an ISO directory by a non-directory file. See xorriso command -overwrite \"on\". +an ISO directory by a another file. See xorriso command -overwrite \"on\". ---------------------------------------------------------------------------- @@ -5140,7 +5190,8 @@ in earlier sessions beginning from the session where they were inserted." } if {$what == "Move to:"} { - return \ + if {$use_command_move == 0} { + return \ "The \"Move to:\" button uses command -mv to move each of the selected items to the address that is given by the text field right to the button. @@ -5148,6 +5199,11 @@ be moved underneath that directory and keep their leaf names. Else there may be only one selected item which will be renamed to the given address." + } else { + return \ +"The \"Move to:\" button uses command -move to rename each of the selected +items to the address that is given by the text field right to the button." + } } if {$what == "Make dir"} { return \ @@ -5517,14 +5573,20 @@ # Log a command (if enabled) # -proc log_command {cmd} { - global cmd_log_conn cmd_logging_mode recent_cd_path +proc log_command {cmd essential} { + global cmd_log_conn cmd_logging_mode cmd_logging_all recent_cd_path if {$cmd_logging_mode < 1} {return ""} + if {$essential <= 0} { + if {$cmd_logging_all <= 0} {return ""} + } else { + # Leave logging to non-essential call which will come soon after + if {$cmd_logging_all > 0} {return ""} + } if {[string first "-cd " $cmd] == 0} { set path [string range $cmd 4 end] - if {$path == $recent_cd_path} {return ""} + if {$path == $recent_cd_path && $cmd_logging_all <= 0} {return ""} set recent_cd_path $path } @@ -5539,6 +5601,9 @@ set prefix "# " } } + if {[string first "-msg_op parse" $cmd] != -1} { + set prefix "# " + } puts $cmd_log_conn $prefix$cmd flush $cmd_log_conn } @@ -5713,7 +5778,7 @@ proc setup_by_args {argv0 argv} { global cmd_pipe_adr reply_pipe_adr main_window_geometry click_to_focus global have_bwidget cmd_conn reply_conn geometry stdout stdin - global osirrox_allowed + global osirrox_allowed cmd_logging_all use_command_move # wish normally eats the -geometry option and puts the result into $geometry catch {set main_window_geometry $geometry} @@ -5779,6 +5844,10 @@ # postpone actual log start until start_xorriso has been passed set script_logging 1 } + if {$opt == "--script_log_all_commands"} { + set ok "1" + set cmd_logging_all 1 + } if {$opt == "--no_extract"} { set ok "1" set osirrox_allowed 0 @@ -5787,6 +5856,14 @@ set ok "1" set have_bwidget "-1" } + if {$opt == "--use_command_move"} { + set ok "1" + set use_command_move 1 + } + if {$opt == "--use_command_mv"} { + set ok "1" + set use_command_move 0 + } if {$ok == 0} { puts stderr "$argv0 : Unknown option '$opt'" print_usage $argv0
[-] [+]	Changed	xorriso-1.2.8.tar.bz2/libburn/drive.c ^
@@ -1,7 +1,7 @@ /* -- indent-tabs-mode: t; tab-width: 8; c-basic-offset: 8; -- / / Copyright (c) 2004 - 2006 Derek Foreman, Ben Jansens - Copyright (c) 2006 - 2012 Thomas Schmitt <scdbackup@gmx.net> + Copyright (c) 2006 - 2013 Thomas Schmitt <scdbackup@gmx.net> Provided under GPL version 2 or later. */ @@ -2123,7 +2123,7 @@ ret = 0; ex:; if (first == 0) - sg_give_next_adr(&enm, fname, sizeof(fname), -1); + sg_give_next_adr(&enm, fname, fname_size, -1); BURN_FREE_MEM(fname); BURN_FREE_MEM(msg); return ret;
[-] [+]	Changed	xorriso-1.2.8.tar.bz2/libburn/libburn.h ^
@@ -343,7 +343,6 @@ "session", "point", "pmin", ... Do not rely on the current size of a burn_toc_entry. - ts A70201 : DVD extension, see below / struct burn_toc_entry { @@ -372,6 +371,8 @@ older elements in this structure: bit0= DVD extension is valid @since 0.3.2 @since 0.5.2 : DVD extensions are made valid for CD too + bit1= LRA extension is valid @since 0.7.2 + bit2= Track status bits extension is valid @since 1.2.8 / unsigned char extensions_valid; @@ -393,6 +394,24 @@ This would mean profiles: 0x11, 0x15, 0x13, 0x14, 0x51, 0x41, 0x42 / int last_recorded_address; + + / ts B30112 : Track status bits extension. extensions_valid:bit2 / + / @since 1.2.8 / + / Names as of READ TRACK INFORMATION, MMC-5 6.27.3 : + bit0 - bit3 = Track Mode + bit4 = Copy + bit5 = Damage + bit6 - bit7 = LJRS + bit8 - bit11 = Data Mode + bit12 = FP + bit13 = Packet/Inc + bit14 = Blank + bit15 = RT + bit16 = NWA_V + bit17 = LRA_V + / + int track_status_bits; + }; @@ -1955,7 +1974,7 @@ int flag); / ts B20108 / -/* Inquire the CD track start number, as set by default ot by +/** Inquire the CD track start number, as set by default or by burn_session_set_start_tno(). @param session The session to be inquired @return > 0 is the currently set CD track start number @@ -3387,8 +3406,12 @@ void burn_session_get_leadout_entry(struct burn_session s, struct burn_toc_entry entry); -/ Gets an array of all the sessions for the disc +/ Gets an array of all complete sessions for the disc THIS IS NO LONGER VALID AFTER YOU ADD OR REMOVE A SESSION + The result array contains num + burn_disc_get_incomplete_sessions() + elements. All above num are incomplete sessions. + Typically there is at most one incomplete session with one empty track. + DVD+R and BD-R seem to allow more than one track with even readable data. @param d Disc to get session array for @param num Returns the number of sessions in the array @return array of sessions @@ -3396,6 +3419,17 @@ struct burn_session *burn_disc_get_sessions(struct burn_disc d, int num); +/ ts B30112 / +/ @since 1.2.8 / +/* Obtains the number of incomplete sessions which are recorded in the + result array of burn_disc_get_sessions() after the complete sessions. + See above. + @param d Disc object to inquire + @return Number of incomplete sessions +/ +int burn_disc_get_incomplete_sessions(struct burn_disc d); + + int burn_disc_get_sectors(struct burn_disc d); /* Gets an array of all the tracks for a session @@ -3451,7 +3485,7 @@ / #define burn_header_version_major 1 #define burn_header_version_minor 2 -#define burn_header_version_micro 6 +#define burn_header_version_micro 8 /* Note: Above version numbers are also recorded in configure.ac because libtool wants them as parameters at build time. @@ -4048,6 +4082,12 @@ / #define Libburn_dummy_probe_write_modeS 1 +/ ts B30112 / +/ Handle DVD+R with reserved tracks in incomplete first session + by loading info about the incomplete session into struct burn_disc +/ +#define Libburn_disc_with_incomplete_sessioN 1 + / Early experimental: Do not define Libburn_develop_quality_scaN unless you want to work
[-] [+]	Changed	xorriso-1.2.8.tar.bz2/libburn/mmc.c ^
@@ -1126,6 +1126,12 @@ if (dlen + 2 > old_alloc_len) dlen = old_alloc_len - 2; d->complete_sessions = 1 + c->page->data[3] - c->page->data[2]; + +#ifdef Libburn_disc_with_incomplete_sessioN + /* ts B30112 : number of open sessions / + d->incomplete_sessions = 0; +#endif + d->last_track_no = d->complete_sessions; if (dlen - 2 < (d->last_track_no + 1) 8) { libdax_msgs_submit(libdax_messenger, d->global_index, @@ -1253,9 +1259,22 @@ {ret = -1; goto ex;} BURN_ALLOC_MEM(buf, struct buffer, 1); +#ifdef Libburn_disc_with_incomplete_sessioN + + if (d->last_track_no <= 0 \|\| + d->complete_sessions + d->incomplete_sessions <= 0 \|\| + d->status == BURN_DISC_BLANK) + {ret = 2; goto ex;} + +#else + if (d->last_track_no <= 0 \|\| d->complete_sessions <= 0 \|\| d->status == BURN_DISC_BLANK) {ret = 2; goto ex;} + +#endif /* ! Libburn_disc_with_incomplete_sessioN / + + if (d->last_track_no > BURN_MMC_FAKE_TOC_MAX_SIZE) { msg = calloc(1, 160); if (msg != NULL) { @@ -1279,18 +1298,34 @@ d->disc = burn_disc_create(); if (d->disc == NULL) {ret = -1; goto ex;} - d->toc_entries = d->last_track_no + d->complete_sessions; + d->toc_entries = d->last_track_no + + d->complete_sessions + d->incomplete_sessions; d->toc_entry = calloc(d->toc_entries, sizeof(struct burn_toc_entry)); if (d->toc_entry == NULL) {ret = -1; goto ex;} memset(d->toc_entry, 0,d->toc_entries sizeof(struct burn_toc_entry)); + +#ifdef Libburn_disc_with_incomplete_sessioN + + for (i = 0; i < d->complete_sessions + d->incomplete_sessions; i++) { + +#else + for (i = 0; i < d->complete_sessions; i++) { + +#endif + session = burn_session_create(); if (session == NULL) {ret = -1; goto ex;} burn_disc_add_session(d->disc, session, BURN_POS_END); burn_session_free(session); } + +#ifdef Libburn_disc_with_incomplete_sessioN + d->disc->incomplete_sessions = d->incomplete_sessions; +#endif + memset(size_data, 0, 4); memset(start_data, 0, 4); @@ -1333,7 +1368,16 @@ entry; } +#ifdef Libburn_disc_with_incomplete_sessioN + + if (session_number > d->complete_sessions) { + +#else + if (session_number > d->disc->sessions) { + +#endif + if (i == d->last_track_no - 1) { /* ts A70212 : Last track field Free Blocks / burn_drive_set_media_capacity_remaining(d, @@ -1341,7 +1385,18 @@ ((off_t) 2048)); d->media_lba_limit = 0; } + +#ifdef Libburn_disc_with_incomplete_sessioN + + if (session_number > d->disc->sessions ) + continue; + +#else + continue; + +#endif + } entry = &(d->toc_entry[i + session_number - 1]); @@ -1359,12 +1414,16 @@ memcpy(end_data, tdata + 28, 4); mmc_fake_toc_entry(entry, session_number, i + 1, size_data, start_data, end_data); + entry->track_status_bits = tdata[5] \| (tdata[6] << 8) \| + (tdata[7] << 16); + entry->extensions_valid \|= 4; if (prev_session != session_number) d->disc->session[session_number - 1]->firsttrack = i+1; d->disc->session[session_number - 1]->lasttrack = i+1; prev_session = session_number; } + if (prev_session > 0 && prev_session <= d->disc->sessions) { / leadout entry of last session of closed disc / entry = &(d->toc_entry[(d->last_track_no - 1) + prev_session]); @@ -2029,16 +2088,28 @@ d->current_profile == 0x12 \|\| d->current_profile == 0x43) d->status = BURN_DISC_BLANK; +#ifdef Libburn_disc_with_incomplete_sessioN + / ts B30112 : number of open sessions / + d->incomplete_sessions = 0; +#endif + if (d->status == BURN_DISC_BLANK) { d->last_track_no = 1; / The "incomplete track" / d->complete_sessions = 0; } else { - / ts A70131 : number of non-empty sessions / + / ts A70131 : number of closed sessions / d->complete_sessions = number_of_sessions; / mmc5r03c.pdf 6.22.3.1.3 State of Last Session: 3=complete / - if (d->state_of_last_session != 3 && d->complete_sessions >= 1) + if (d->state_of_last_session != 3 && + d->complete_sessions >= 1) { d->complete_sessions--; +#ifdef Libburn_disc_with_incomplete_sessioN + d->incomplete_sessions++; +#endif + + } + / ts A70129 : mmc5r03c.pdf 6.22.3.1.7 This includes the "incomplete track" if the disk is appendable. I.e number of complete tracks + 1. / @@ -2713,9 +2784,9 @@ if (r <= 0 \|\| w <= 0) { / ts A70712 : now searching for best speed descriptor / if (w > 0 && r <= 0) - burn_drive_get_best_speed(d, r, &best_sd, 1); + burn_drive_get_best_speed(d, r, &best_sd, 1 \| 2); else - burn_drive_get_best_speed(d, w, &best_sd, 0); + burn_drive_get_best_speed(d, w, &best_sd, 2); if (best_sd != NULL) { w = best_sd->write_speed; d->nominal_write_speed = w; @@ -4020,8 +4091,10 @@ / ts A61225 / +/ @param flag bit0= register speed descriptors +/ static int mmc_get_write_performance_al(struct burn_drive d, - int alloc_len, int max_descr) + int alloc_len, int max_descr, int flag) { struct buffer buf = NULL; int len, i, b, num_descr, ret, old_alloc_len; @@ -4104,7 +4177,7 @@ pd = c->page->data; if (num_descr > max_descr) num_descr = max_descr; - for (i = 0; i < num_descr; i++) { + for (i = 0; i < num_descr && (flag & 1); i++) { exact_bit = !!(pd[8 + i16] & 2); end_lba = read_speed = write_speed = 0; for (b = 0; b < 4 ; b++) { @@ -4179,15 +4252,25 @@ return 0; /* first command execution to learn number of descriptors and - dxfer_len / - ret = mmc_get_write_performance_al(d, &alloc_len, &max_descr); + dxfer_len + / + ret = mmc_get_write_performance_al(d, &alloc_len, &max_descr, 0); + if (max_descr > 0 && ret > 0) { + /* Some drives announce only 1 descriptor if asked for 0. + So ask twice for non-0 descriptors. + / + ret = mmc_get_write_performance_al(d, &alloc_len, &max_descr, + 0); + } / fprintf(stderr,"LIBBURN_DEBUG: ACh alloc_len = %d , ret = %d\n", alloc_len, ret); / if (max_descr > 0 && ret > 0) - / second execution with announced length / - ret = mmc_get_write_performance_al(d, &alloc_len, &max_descr); + / final execution with announced length */ + max_descr = (alloc_len - 8) / 16; + ret = mmc_get_write_performance_al(d, &alloc_len, &max_descr, + 1); return ret; } @@ -5014,6 +5097,11 @@ d->disc_info_valid = 0; d->num_format_descr = 0; d->complete_sessions = 0; + +#ifdef Libburn_disc_with_incomplete_sessioN + d->incomplete_sessions = 0; +#endif + d->state_of_last_session = -1; d->last_track_no = 1; d->media_capacity_remaining = 0;
[-] [+]	Changed	xorriso-1.2.8.tar.bz2/libburn/structure.c ^
@@ -65,6 +65,11 @@ d->refcnt = 1; d->sessions = 0; d->session = NULL; + +#ifdef Libburn_disc_with_incomplete_sessioN + d->incomplete_sessions= 0; +#endif + return d; } @@ -691,10 +696,37 @@ struct burn_session *burn_disc_get_sessions(struct burn_disc d, int num) { + +#ifdef Libburn_disc_with_incomplete_sessioN + + num = d->sessions - d->incomplete_sessions; + +#else + num = d->sessions; + +#endif + + return d->session; } + +/ ts B30112 : API / +int burn_disc_get_incomplete_sessions(struct burn_disc d) +{ +#ifdef Libburn_disc_with_incomplete_sessioN + + return d->incomplete_sessions; + +#else + + return 0; + +#endif +} + + struct burn_track *burn_session_get_tracks(struct burn_session s, int num) { num = s->tracks; @@ -737,11 +769,11 @@ ret = 1; goto ex; } - track_offset = burn_session_get_start_tno(d->session[0], 0); - if (track_offset <= 0) - track_offset = 1; for (sidx = 0; sidx < d->sessions; sidx++) { + track_offset = burn_session_get_start_tno(d->session[sidx], 0); + if (track_offset <= 0) + track_offset = 1; if (d->session[sidx] == NULL) { sprintf(msg, "d->session[%d of %d] == NULL", sidx, d->sessions);
[-] [+]	Changed	xorriso-1.2.8.tar.bz2/libburn/structure.h ^
@@ -144,6 +144,11 @@ { int sessions; struct burn_session **session; + +#ifdef Libburn_disc_with_incomplete_sessioN + int incomplete_sessions; +#endif + int refcnt; };
[-] [+]	Changed	xorriso-1.2.8.tar.bz2/libburn/transport.h ^
@@ -287,6 +287,12 @@ /* ts A90107 / int state_of_last_session; +#ifdef Libburn_disc_with_incomplete_sessioN + / ts B30112 / + int incomplete_sessions; +#endif + + / ts A70129 : from 51h READ DISC INFORMATION Last Track Number in Last Session */ int last_track_no;
[-] [+]	Changed	xorriso-1.2.8.tar.bz2/libburn/write.c ^
@@ -1861,7 +1861,7 @@ struct burn_drive d = o->drive; struct buffer out = d->buffer; int sectors; - int i, open_ended = 0, ret= 0, is_flushed = 0; + int i, open_ended = 0, ret= 0, is_flushed = 0, track_open = 0; int first_buf_cap = 0, further_cap = 0, buf_cap_step = 1024; /* ts A70213 : eventually expand size of track to max / @@ -1889,6 +1889,7 @@ if (ret <= 0) goto ex; } + track_open = 1; sectors = burn_track_get_sectors_2(t, 1); open_ended = burn_track_is_open_ended(t); @@ -1971,7 +1972,7 @@ ex:; if (d->cancel) burn_source_cancel(t->source); - if (!is_flushed) + if (track_open && !is_flushed) d->sync_cache(d); / burn_write_flush() was not called */ return ret; }
[-] [+]	Changed	xorriso-1.2.8.tar.bz2/libisoburn/burn_wrap.c ^
@@ -1586,6 +1586,7 @@ struct isoburn_toc_disc isoburn_toc_drive_get_disc(struct burn_drive d) { int ret, session_count= 0, track_count= 0, num_tracks= 0, i, j; + int open_sessions= 0; struct isoburn o; struct isoburn_toc_entry t; struct isoburn_toc_disc toc_disc= NULL; @@ -1601,6 +1602,7 @@ toc_disc->tracks= NULL; toc_disc->track_pointers= NULL; toc_disc->session_count= 0; + toc_disc->incomplete_session_count= 0; toc_disc->track_count= 0; toc_disc->toc= NULL; @@ -1641,18 +1643,26 @@ return(NULL); } s= burn_disc_get_sessions(toc_disc->disc, &session_count); - for(i= 0; i<session_count; i++) { + open_sessions= burn_disc_get_incomplete_sessions(toc_disc->disc); + for(i= 0; i < session_count + open_sessions; i++) { tracks = burn_session_get_tracks(s[i], &num_tracks); + if(i == session_count + open_sessions - 1 && open_sessions > 0) { + / Do not count the invisible track of the last incomplete session / + num_tracks--; + } track_count+= num_tracks; } - if(session_count<=0 \|\| track_count<=0) + if(session_count + open_sessions <= 0 \|\| track_count <= 0) goto failure; - ret= isoburn_toc_new_arrays(toc_disc, session_count, track_count, 0); + ret= isoburn_toc_new_arrays(toc_disc, session_count + open_sessions, + track_count, 0); if(ret<=0) goto failure; track_count= 0; - for(i= 0; i<session_count; i++) { + for(i= 0; i < session_count + open_sessions; i++) { tracks = burn_session_get_tracks(s[i], &num_tracks); + if(i == session_count + open_sessions - 1 && open_sessions > 0) + num_tracks--; toc_disc->sessions[i].session= s[i]; toc_disc->sessions[i].track_pointers= toc_disc->track_pointers+track_count; toc_disc->sessions[i].track_count= num_tracks; @@ -1664,6 +1674,7 @@ track_count+= num_tracks; } toc_disc->session_count= session_count; + toc_disc->incomplete_session_count= open_sessions; toc_disc->track_count= track_count; return(toc_disc); } @@ -1672,7 +1683,7 @@ int isoburn_toc_disc_get_sectors(struct isoburn_toc_disc disc) { struct isoburn_toc_entry t; - int ret= 0, num_sessions, num_tracks; + int ret= 0, num_sessions, num_tracks, open_sessions= 0, session_idx= -1; struct burn_session sessions; struct burn_track tracks; struct burn_toc_entry entry; @@ -1684,9 +1695,23 @@ ret= t->start_lba + t->track_blocks; } else if(disc->disc!=NULL) { sessions= burn_disc_get_sessions(disc->disc, &num_sessions); - if(num_sessions > 0) { - tracks = burn_session_get_tracks(sessions[num_sessions - 1], - &num_tracks); + open_sessions= burn_disc_get_incomplete_sessions(disc->disc); + if(num_sessions + open_sessions > 0) { + session_idx= num_sessions + open_sessions - 1; + tracks = burn_session_get_tracks(sessions[session_idx], &num_tracks); + if(open_sessions > 0) { + / Do not count the invisible track of the last incomplete session / + num_tracks--; + } + if(num_tracks <= 0) + session_idx--; + } + if(session_idx >= 0) { + tracks = burn_session_get_tracks(sessions[session_idx], &num_tracks); + if(session_idx == num_sessions + open_sessions - 1 && open_sessions > 0) { + / Do not count the invisible track of the last incomplete session / + num_tracks--; + } if(num_tracks > 0) { burn_track_get_entry(tracks[num_tracks - 1], &entry); if(entry.extensions_valid & 1) @@ -1709,6 +1734,12 @@ } +int isoburn_toc_disc_get_incmpl_sess(struct isoburn_toc_disc disc) +{ + return(disc->incomplete_session_count); +} + + int isoburn_toc_session_get_sectors(struct isoburn_toc_session s) { struct isoburn_toc_entry t;
[-] [+]	Changed	xorriso-1.2.8.tar.bz2/libisoburn/isoburn.h ^
@@ -28,7 +28,6 @@ int track_no; /* point / int start_lba; int track_blocks; - char volid; /* For caching a volume id from emulated toc on overwriteables / struct isoburn_toc_entry next; @@ -768,6 +767,7 @@ struct isoburn_toc_track tracks; / storage array / struct isoburn_toc_track track_pointers; / storage array / int session_count; + int incomplete_session_count; int track_count; struct isoburn_toc_entry toc; };
[-] [+]	Changed	xorriso-1.2.8.tar.bz2/libisoburn/libisoburn.h ^
@@ -242,7 +242,7 @@ / #define isoburn_libisofs_req_major 1 #define isoburn_libisofs_req_minor 2 -#define isoburn_libisofs_req_micro 6 +#define isoburn_libisofs_req_micro 8 /* The minimum version of libburn to be used with this version of libisoburn at compile time. @@ -250,7 +250,7 @@ / #define isoburn_libburn_req_major 1 #define isoburn_libburn_req_minor 2 -#define isoburn_libburn_req_micro 6 +#define isoburn_libburn_req_micro 8 /* The minimum compile time requirements of libisoburn towards libjte are the same as of a suitable libisofs towards libjte. @@ -305,7 +305,7 @@ / #define isoburn_header_version_major 1 #define isoburn_header_version_minor 2 -#define isoburn_header_version_micro 6 +#define isoburn_header_version_micro 8 /* Note: Above version numbers are also recorded in configure.ac because libtool wants them as parameters at build time. @@ -596,7 +596,11 @@ int isoburn_toc_disc_get_sectors(struct isoburn_toc_disc disc); -/* Get the array of session handles from the table of content. +/** Get the array of session handles and the number of complete sessions + from the table of content. + The result array contains num + isoburn_toc_disc_get_incmpl_sess() + elements. All above num are incomplete sessions. + Typically there is at most one incomplete session with no track. Wrapper for: burn_disc_get_sessions() @since 0.1.6 @param disc The master handle of the medium @@ -607,6 +611,16 @@ struct isoburn_toc_disc disc, int num); +/** Obtain the number of incomplete sessions which are recorded in the + result array of isoburn_toc_disc_get_sessions() after the complete + sessions. See above. + @since 1.2.8 + @param disc The master handle of the medium + @return the number of incomplete sessions +/ +int isoburn_toc_disc_get_incmpl_sess(struct isoburn_toc_disc disc); + + /** Tell the number of 2048 byte blocks covered by a particular session. Wrapper for: burn_session_get_sectors() @since 0.1.6
[-] [+]	Changed	xorriso-1.2.8.tar.bz2/libisofs/ecma119.c ^
@@ -1,7 +1,7 @@ /* * Copyright (c) 2007 Vreixo Formoso * Copyright (c) 2007 Mario Danic - * Copyright (c) 2009 - 2012 Thomas Schmitt + * Copyright (c) 2009 - 2013 Thomas Schmitt * * This file is part of the libisofs project; you can redistribute it and/or * modify it under the terms of the GNU General Public License version 2 @@ -1613,7 +1613,8 @@ /; } else if (ret == 1 && img->checksum_array == NULL) { / No checksum array loaded. Delete "isofs.cx" / - iso_node_set_attrs(node, (size_t) 1, + if (!target->will_cancel) + iso_node_set_attrs(node, (size_t) 1, &cx_names, cx_value_lengths, &cx_valuept, 4 \| 8); no_md5 = 1; } else if (ret == 1 && value_length == 4) { @@ -1639,8 +1640,9 @@ } / Equip nodes with provisory isofs.cx numbers: 4 byte, all 0. Omit those from old image which will not be copied and have no MD5. + Do not alter the nodes if this is only a will_cancel run. */ - if (!no_md5) { + if (!(target->will_cancel \|\| no_md5)) { ret = iso_file_set_isofscx(file, (unsigned int) 0, 0); if (ret < 0) return ret;
[-] [+]	Changed	xorriso-1.2.8.tar.bz2/libisofs/filesrc.c ^
@@ -127,7 +127,7 @@ /* insert the filesrc in the tree / ret = iso_rbtree_insert(img->files, fsrc, (void)src); if (ret <= 0) { - if (ret == 0 && (src)->checksum_index > 0) { + if (ret == 0 && (src)->checksum_index > 0 && !img->will_cancel) { / Duplicate file source was mapped to previously registered source / cret = iso_file_set_isofscx(file, (src)->checksum_index, 0); @@ -152,7 +152,7 @@ no_md5 = 1; } - if ((img->md5_file_checksums & 1) && !no_md5) { + if ((img->md5_file_checksums & 1) && !(no_md5 \|\| img->will_cancel)) { img->checksum_idx_counter++; if (img->checksum_idx_counter < 0x7fffffff) { fsrc->checksum_index = img->checksum_idx_counter;
[-] [+]	Changed	xorriso-1.2.8.tar.bz2/libisofs/fs_image.c ^
@@ -241,6 +241,10 @@ char copyright_file_id; char abstract_file_id; char biblio_file_id; + char creation_time; + char modification_time; + char expiration_time; + char effective_time; / extension information / @@ -2089,6 +2093,10 @@ free(data->copyright_file_id); free(data->abstract_file_id); free(data->biblio_file_id); + free(data->creation_time); + free(data->modification_time); + free(data->expiration_time); + free(data->effective_time); free(data->input_charset); free(data->local_charset); @@ -2317,7 +2325,15 @@ data->copyright_file_id[0] = 0; data->abstract_file_id[0] = 0; data->biblio_file_id[0] = 0; - } + } + data->creation_time = + iso_util_strcopy_untail((char) pvm->vol_creation_time, 17); + data->modification_time = + iso_util_strcopy_untail((char) pvm->vol_modification_time, 17); + data->expiration_time = + iso_util_strcopy_untail((char) pvm->vol_expiration_time, 17); + data->effective_time = + iso_util_strcopy_untail((char) pvm->vol_effective_time, 17); data->nblocks = iso_read_bb(pvm->vol_space_size, 4, NULL); @@ -2857,9 +2873,9 @@ { int ret, idx, to_copy; struct stat info; - IsoNode new; + IsoNode new = NULL; IsoBoot bootcat; - char name; + char name = NULL; char dest = NULL; ImageFileSourceData data; _ImageFsData fsdata; @@ -2887,7 +2903,6 @@ goto ex; } - new = NULL; switch (info.st_mode & S_IFMT) { case S_IFREG: { @@ -2901,9 +2916,8 @@ "More than one catalog node has been found. " "We can continue, but that could lead to " "problems"); - if (ret < 0) { + if (ret < 0) goto ex; - } iso_node_unref((IsoNode)image->bootcat->node); } @@ -2911,9 +2925,7 @@ * a regular file / new = calloc(1, sizeof(IsoBoot)); if (new == NULL) { - ret = ISO_OUT_OF_MEM; - free(name); - goto ex; + ret = ISO_OUT_OF_MEM; goto ex; } bootcat = (IsoBoot ) new; bootcat->lba = data->sections[0].block; @@ -2924,10 +2936,7 @@ if (bootcat->size > 0) { bootcat->content = calloc(1, bootcat->size); if (bootcat->content == NULL) { - ret = ISO_OUT_OF_MEM; - free(name); - free(new); - goto ex; + ret = ISO_OUT_OF_MEM; goto ex; } to_copy = bootcat->size; if (bootcat->size > fsdata->catsize) @@ -2944,16 +2953,14 @@ IsoFile file; ret = iso_file_source_stream_new(src, &stream); - if (ret < 0) { - free(name); + if (ret < 0) goto ex; - } + / take a ref to the src, as stream has taken our ref / iso_file_source_ref(src); file = calloc(1, sizeof(IsoFile)); if (file == NULL) { - free(name); iso_stream_unref(stream); {ret = ISO_OUT_OF_MEM; goto ex;} } @@ -2977,7 +2984,6 @@ data->block_size_log2, data->uncompressed_size, 0); if (ret < 0) { - free(name); iso_stream_unref(stream); goto ex; } @@ -3008,7 +3014,6 @@ ret = iso_msg_submit(image->id, ISO_EL_TORITO_WARN, 0, "More than one ISO node has been found for the same boot image."); if (ret < 0) { - free(name); iso_stream_unref(stream); goto ex; } @@ -3026,7 +3031,6 @@ / source is a directory / new = calloc(1, sizeof(IsoDir)); if (new == NULL) { - free(name); {ret = ISO_OUT_OF_MEM; goto ex;} } new->type = LIBISO_DIR; @@ -3042,12 +3046,10 @@ ret = iso_file_source_readlink(src, dest, LIBISOFS_NODE_PATH_MAX); if (ret < 0) { - free(name); goto ex; } link = calloc(1, sizeof(IsoSymlink)); if (link == NULL) { - free(name); {ret = ISO_OUT_OF_MEM; goto ex;} } link->dest = strdup(dest); @@ -3068,8 +3070,7 @@ IsoSpecial special; special = calloc(1, sizeof(IsoSpecial)); if (special == NULL) { - free(name); - {ret = ISO_OUT_OF_MEM; goto ex;} + ret = ISO_OUT_OF_MEM; goto ex; } special->dev = info.st_rdev; special->node.type = LIBISO_SPECIAL; @@ -3080,11 +3081,12 @@ new->refcount = 0; } break; + default: + ret = ISO_BAD_ISO_FILETYPE; goto ex; } - /* fill fields / new->refcount++; - new->name = name; + new->name = name; name = NULL; new->mode = info.st_mode; new->uid = info.st_uid; new->gid = info.st_gid; @@ -3099,7 +3101,7 @@ ret = src_aa_to_node(src, new, 0); if (ret < 0) { - goto failure; + goto ex; } / Attach ino as xinfo if valid and no IsoStream is involved / @@ -3107,18 +3109,17 @@ !fsdata->make_new_ino) { ret = iso_node_set_ino(new, info.st_ino, 0); if (ret < 0) - goto failure; + goto ex; } - node = new; + node = new; new = NULL; {ret = ISO_SUCCESS; goto ex;} -failure:; - / todo: stuff any possible memory leak here / +ex:; if (name != NULL) free(name); - free(new); -ex:; + if (new != NULL) + iso_node_unref(new); LIBISO_FREE_MEM(dest); return ret; } @@ -3568,6 +3569,8 @@ iso_image_set_copyright_file_id(image, data->copyright_file_id); iso_image_set_abstract_file_id(image, data->abstract_file_id); iso_image_set_biblio_file_id(image, data->biblio_file_id); + iso_image_set_pvd_times(image, data->creation_time, + data->modification_time, data->expiration_time, data->effective_time); if (features != NULL) { features = malloc(sizeof(IsoReadImageFeatures));
[-] [+]	Changed	xorriso-1.2.8.tar.bz2/libisofs/image.c ^
@@ -145,6 +145,10 @@ free(image->copyright_file_id); free(image->abstract_file_id); free(image->biblio_file_id); + free(image->creation_time); + free(image->modification_time); + free(image->expiration_time); + free(image->effective_time); if (image->used_inodes != NULL) free(image->used_inodes); if (image->system_area_data != NULL) @@ -335,6 +339,37 @@ return image->biblio_file_id; } +int iso_image_set_pvd_times(IsoImage image, + char creation_time, char modification_time, + char expiration_time, char effective_time) +{ + if (creation_time == NULL \|\| modification_time == NULL \|\| + expiration_time == NULL \|\| effective_time == NULL) + return ISO_NULL_POINTER; + image->creation_time = strdup(creation_time); + image->modification_time = strdup(modification_time); + image->expiration_time = strdup(expiration_time); + image->effective_time = strdup(effective_time); + if (image->creation_time == NULL \|\| image->modification_time == NULL \|\| + image->expiration_time == NULL \|\| image->effective_time == NULL) + return ISO_OUT_OF_MEM; + return ISO_SUCCESS; +} + +int iso_image_get_pvd_times(IsoImage image, + char creation_time, char modification_time, + char expiration_time, char effective_time) +{ + if (image->creation_time == NULL \|\| image->modification_time == NULL \|\| + image->expiration_time == NULL \|\| image->effective_time == NULL) + return ISO_NULL_POINTER; + creation_time = image->creation_time; + modification_time = image->modification_time; + expiration_time = image->expiration_time; + effective_time = image->effective_time; + return ISO_SUCCESS; +} + int iso_image_get_msg_id(IsoImage *image) { return image->id;
[-] [+]	Changed	xorriso-1.2.8.tar.bz2/libisofs/image.h ^
@@ -49,6 +49,10 @@ char copyright_file_id; char abstract_file_id; char biblio_file_id; + char creation_time; + char modification_time; + char expiration_time; + char effective_time; / el-torito boot catalog / struct el_torito_boot_catalog bootcat; @@ -234,4 +238,8 @@ uint32_t idx_count, int flag); +int iso_image_set_pvd_times(IsoImage image, + char creation_time, char modification_time, + char expiration_time, char effective_time); + #endif /LIBISO_IMAGE_H_*/
[-] [+]	Changed	xorriso-1.2.8.tar.bz2/libisofs/libisofs.h ^
@@ -4,7 +4,7 @@ /* * Copyright (c) 2007-2008 Vreixo Formoso, Mario Danic - * Copyright (c) 2009-2012 Thomas Schmitt + * Copyright (c) 2009-2013 Thomas Schmitt * * This file is part of the libisofs project; you can redistribute it and/or * modify it under the terms of the GNU General Public License version 2 @@ -84,7 +84,7 @@ / #define iso_lib_header_version_major 1 #define iso_lib_header_version_minor 2 -#define iso_lib_header_version_micro 6 +#define iso_lib_header_version_micro 8 /* * Get version of the libisofs library at runtime. @@ -3028,6 +3028,36 @@ const char iso_image_get_biblio_file_id(const IsoImage image); /** + * Get the four timestamps from the Primary Volume Descriptor of the imported + * ISO image. The timestamps are strings which are either empty or consist + * of 17 digits of the form YYYYMMDDhhmmsscc. + * None of the returned string pointers shall be used for altering or freeing + * data. They are just for reading. + * + * @param image + * The image to be inquired. + * @param vol_creation_time + * Returns a pointer to the Volume Creation time: + * When "the information in the volume was created." + * @param vol_modification_time + * Returns a pointer to Volume Modification time: + * When "the information in the volume was last modified." + * @param vol_expiration_time + * Returns a pointer to Volume Expiration time: + * When "the information in the volume may be regarded as obsolete." + * @param vol_effective_time + * Returns a pointer to Volume Expiration time: + * When "the information in the volume may be used." + * @return + * ISO_SUCCESS or error + * + * @since 1.2.8 + / +int iso_image_get_pvd_times(IsoImage image, + char creation_time, char modification_time, + char expiration_time, char effective_time); + +/** * Create a new set of El-Torito bootable images by adding a boot catalog * and the default boot image. * Further boot images may then be added by iso_image_add_boot_image(). @@ -7424,11 +7454,14 @@ /** Too many chained symbolic links (FAILURE, HIGH, -395) / #define ISO_DEEP_SYMLINK 0xE830FE75 +/* Unrecognized file type in ISO image (FAILURE, HIGH, -396) / +#define ISO_BAD_ISO_FILETYPE 0xE830FE74 + / Internal developer note: Place new error codes directly above this comment. Newly introduced errors must get a message entry in - libisofs/message.c, function iso_error_to_msg() + libisofs/messages.c, function iso_error_to_msg() / / ! PLACE NEW ERROR CODES ABOVE. NOT AFTER THIS LINE ! */
[-] [+]	Changed	xorriso-1.2.8.tar.bz2/libisofs/md5.c ^
@@ -1,5 +1,5 @@ /* - * Copyright (c) 2009 Thomas Schmitt + * Copyright (c) 2009 - 2013 Thomas Schmitt * * This file is part of the libisofs project; you can redistribute it and/or * modify it under the terms of the GNU General Public License version 2 @@ -527,18 +527,25 @@ if (md5_pt == NULL) return 0; - ret = iso_node_lookup_attr(node, "isofs.cx", &value_length, - &value, 0); - if (ret == 1 && value_length == 4) { - for (i = 0; i < 4; i++) - idx = (idx << 8) \| ((unsigned char ) value)[i]; - if (idx > 0 && idx <= target->checksum_idx_counter) { - memcpy(target->checksum_buffer + 16 idx, md5_pt, 16); + if (!target->will_cancel) { + ret = iso_node_lookup_attr(node, "isofs.cx", &value_length, + &value, 0); + if (ret == 1 && value_length == 4) { + for (i = 0; i < 4; i++) + idx = (idx << 8) \| ((unsigned char ) value)[i]; + if (idx > 0 && idx <= target->checksum_idx_counter) { + memcpy(target->checksum_buffer + 16 idx, md5_pt, 16); + } } + if (value != NULL) + free(value); + + /* ts B30114 : It is unclear why these are removed here. + At least with the opts->will_cancel runs, + this is not appropriate. + */ + iso_node_remove_xinfo(node, checksum_md5_xinfo_func); } - if (value != NULL) - free(value); - iso_node_remove_xinfo(node, checksum_md5_xinfo_func); iso_node_remove_xinfo(node, checksum_cx_xinfo_func); } } else if (node->type == LIBISO_DIR) {
[-] [+]	Changed	xorriso-1.2.8.tar.bz2/libisofs/messages.c ^
@@ -500,6 +500,8 @@ return "Symbolic link cannot be resolved"; case ISO_DEEP_SYMLINK: return "Too many chained symbolic links"; + case ISO_BAD_ISO_FILETYPE: + return "Unrecognized file type in ISO image"; default: return "Unknown error"; }
[-] [+]	Changed	xorriso-1.2.8.tar.bz2/libjte/jte.c ^
@@ -261,7 +261,7 @@ if (o->jtemplate_out == NULL) return 0; - memset(md5, 0, sizeof(md5)); + memset(md5, 0, 16); /* Cheaper to check file size first */ if (size < o->jte_min_size)
[-] [+]	Changed	xorriso-1.2.8.tar.bz2/libjte/md5.c ^
@@ -191,7 +191,7 @@ putu32(ctx->buf[1], digest + 4); putu32(ctx->buf[2], digest + 8); putu32(ctx->buf[3], digest + 12); - memset(ctx, 0, sizeof(ctx)); /* In case it's sensitive / + memset(ctx, 0, sizeof(ctx)); /* In case it's sensitive / } / The four core functions - F1 is optimized somewhat */
[-] [+]	Changed	xorriso-1.2.8.tar.bz2/libtool ^
@@ -1,7 +1,7 @@ #! /bin/sh # libtoolT - Provide generalized library-building support services. -# Generated automatically by (GNU libisoburn 1.2.5) +# Generated automatically by (GNU libisoburn 1.2.7) # NOTE: Changes made to this file will be lost: look at ltmain.sh. # # Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001
[-] [+]	Changed	xorriso-1.2.8.tar.bz2/xorriso/base_obj.c ^
@@ -134,6 +134,7 @@ strcpy(m->list_delimiter, "--"); m->ino_behavior= 7; m->iso_level= 3; + m->iso_level_is_default= 1; m->do_joliet= 0; m->do_hfsplus= 0; m->do_fat= 0; @@ -148,6 +149,7 @@ m->scdbackup_tag_written[0]= 0; m->scdbackup_tag_listname[0]= 0; m->relax_compliance= 0; + m->allow_dir_id_ext_dflt= 1; m->rr_reloc_dir[0]= 0; m->rr_reloc_flags= 1; m->untranslated_name_len= 0; @@ -241,6 +243,7 @@ m->boot_image_bin_path[0]= 0; m->boot_image_bin_form[0]= 0; m->boot_image_emul= 0; + m->boot_emul_default= 1; m->boot_image_load_size= 4 * 512; /* hearsay out of libisofs/demo/iso.c */ memset(m->boot_id_string, 0, sizeof(m->boot_id_string)); memset(m->boot_selection_crit, 0, sizeof(m->boot_selection_crit));
[-] [+]	Changed	xorriso-1.2.8.tar.bz2/xorriso/changelog.txt ^
@@ -14071,10 +14071,14 @@ libisoburn/libisoburn.h libisoburn.h was missing in commit 4941 - [] +2013.01.08.103001 [4944] Makefile.am Had to add xorriso-tcltk to EXTRA_DIST although it is in bin_SCRIPTS +2013.01.08.103001 [4945] +xorriso/xorriso_makefile_am.txt +Had to add xorriso-tcltk to EXTRA_DIST although it is in bin_SCRIPTS + ----------------------------------- release - xorriso-1.2.6 - 2013.01.08.103001 =============================================================================== * Bug fix: SIGSEGV by uninitialized local variable with @@ -14098,7 +14102,7 @@ * Proof-of-concept of a GUI frontend program: xorriso-tcltk written in Tcl/Tk. - [] +2013.01.08.151611 [4950] configure.ac README libisoburn/libisoburn.h @@ -14122,33 +14126,257 @@ xorriso/xorrecord.info Version leap to libisoburn-1.2.7 - [] +08 Jan 2013 [4951] ChangeLog xorriso/changelog.txt Documented changes and release timestamp - [] +08 Jan 2013 [4952] svn move -m Promoted branch to tag http://svn.libburnia-project.org/libisoburn/branches/1.2.6 http://svn.libburnia-project.org/libisoburn/tags/1.2.6 ------------------------------------- cycle - xorriso-1.2.7 - +------------------------------------ cycle - xorriso-1.2.7 - 2013.01.08.151611 - [] +09 Jan 2013 [4953] +frontend/xorriso-tcltk +For now only demanding xorriso >= 1.2.6 for xorriso-tcltk-1.2.7 + +11 Jan 2013 [4954] +xorriso/xorriso_eng.html +Presenting xorriso-tcltk on the GNU xorriso web page + +2013.01.13.093116 [4957] +xorriso/match.c +Curbed the number of wildcard warnings to 3 for iso and 3 for disk + +2013.01.13.102527 [4958] +configure.ac +libisoburn/libisoburn.h +Requiring libburn-1.2.7 + +2013.01.13.200742 [4959] +libisoburn/libisoburn.h +libisoburn/isoburn.h +libisoburn/burn_wrap.c +libisoburn/libisoburn.ver +New API call isoburn_toc_disc_get_incmpl_sess() + +2013.01.14.094419 [4960] +xorriso/drive_mgt.c +Making use of new libisoburn API call to show incomplete sessions + +2013.01.15.104804 [4962] +frontend/xorriso-tcltk +frontend/README-tcltk +New feature "Log non-essential commands" and --script_log_all_commands + +15 Jan 2013 [4963] +xorriso/xorriso.texi +xorriso/xorriso.1 +xorriso/xorriso.info +Clarified meaning of "After commit" prediction of -tell_media_space + +16 Jan 2013 [4964] +xorriso/xorriso_eng.html +ChangeLog +Updated change log and web page + +2013.01.16.181831 [4967] +xorriso/emulators.c +xorriso/opts_p_z.c +Updated copyright message of xorriso + +------------------------------------ cycle - xorriso-1.2.7 - 2013.01.16.181831 +* Bug fix: -print_size and -tell_media_space altered the pointers to MD5 + of data files which stem from a previous session. This produced + false mismatches with -check_md5_r. +* Bug fix: CD tracks were reported with the sizes of the tracks in the + first session. + + +12 Feb 2013 [4968] +doc/faq.wiki +Mentioned xorriso-tcltk in the online FAQ + +12 Feb 2013 [4969] +doc/faq.wiki +Improved mentioning of xorriso-tcltk in the online FAQ + +2013.02.18.104738 [4970] +xorriso/emulators.c +xorriso/xorrisofs.texi +xorriso/xorrisofs.info +xorriso/xorrisofs.1 +New -as mkisofs options -eltorito-id , -eltorito-selcrit + +18 Feb 2012 [4971] +xorriso/xorriso_eng.html +ChangeLog +Updated change log and web page + +------------------------------------ cycle - xorriso-1.2.7 - 2013.02.18.104738 +* New -as mkisofs options -eltorito-id , -eltorito-selcrit + + +2013.02.26.082331 [4973] +xorriso/check_media.c +Corrected wrong use of sizeof + +2013.02.26.103233 [4974] +xorriso/drive_mgt.c +Bug fix: -check_media use=outdev sector_map= stored TOC of input drive + +2013.03.06.164347 [4983] +xorriso/iso_manip.c +Bug fix: -hide hfsplus and -as mkisofs -hide-hfsplus had no effect. Thanks to Davy Ho. + +2013.03.06.164906 [4984] +xorriso/drive_mgt.c +With -list_speeds : reporting the effective speed 0 if it deviates from speed H + +2013.03.10.193344 [4985] +xorriso/xorriso_private.h +xorriso/base_obj.c +xorriso/opts_a_c.c +xorriso/emulators.c +xorriso/write_run.c +xorriso/xorriso.texi +xorriso/xorriso.info +xorriso/xorriso.1 +Improved interaction of -as mkisofs command with other commands + +10 Mar 2013 [4986] xorriso/xorriso_eng.html ChangeLog Updated change log and web page ------------------------------------- cycle - xorriso-1.2.7 - +------------------------------------ cycle - xorriso-1.2.7 - 2013.03.10.193344 +* Bug fix: -check_media use=outdev sector_map= stored TOC of input drive +* Bug fix: -hide hfsplus and -as mkisofs -hide-hfsplus had no effect. + Thanks to Davy Ho. + + +2013.03.12.124913 [4988] +configure.ac +libisoburn/libisoburn.h +Requiring libisofs-1.2.7 + +2013.03.12.194637 [4989] +xorriso/write_run.c +Prevented rollover of El Torito Sector Count of large EFI boot images + +2013.03.12.194842 [4990] +configure.ac +xorriso/misc_funct.c +xorriso/xorriso.texi +xorriso/xorriso.info +xorriso/xorriso.1 +Corrected the interpretation of user supplied ECMA-119 timestamp strings + +2013.03.12.195052 [4991] +xorriso/xorriso.h +xorriso/iso_img.c +xorriso/text_io.c +xorriso/xorriso.texi +xorriso/xorriso.info +xorriso/xorriso.1 +Reporting volume timestamps with -pvd_info + +2013.03.13.195851 [4992] +xorriso/xorriso.h +xorriso/parse_exec.c +xorriso/opts_d_h.c +xorriso/opts_i_o.c +xorriso/xorriso.texi +xorriso/xorriso.info +xorriso/xorriso.1 +libisoburn/libisoburn.ver +New command -move + +2013.03.17.110559 [4993] +configure.ac +Bug fix: ./configure did not abort if libburn.h or libisofs.h were missing + +18 Mar 2013 [5000] +svn copy -m Branching for libisoburn release 1.2.8 +http://svn.libburnia-project.org/libisoburn/trunk +http://svn.libburnia-project.org/libisoburn/branches/1.2.8 + +18 Mar 2013 [5001] +frontend/xorriso-tcltk +frontend/README-tcltk +Making use of command -move in xorriso-tcltk + +2013.03.18.093001 [5002] +configure.ac +README +libisoburn/libisoburn.h +xorriso/README_gnu_xorriso +xorriso/xorriso.h +xorriso/xorrisoburn.h +xorriso/xorriso_main.c +xorriso/xorriso_eng.html +xorriso/make_xorriso_standalone.sh +xorriso/configure_ac.txt +frontend/xorriso-tcltk +xorriso/xorriso_timestamp.h +xorriso/xorriso.texi +xorriso/xorriso.1 +xorriso/xorriso.info +xorriso/xorrisofs.texi +xorriso/xorrisofs.1 +xorriso/xorrisofs.info +xorriso/xorrecord.texi +xorriso/xorrecord.1 +xorriso/xorrecord.info +Version leap to libisoburn-1.2.8 + +18 Mar 2013 [5003] +ChangeLog +xorriso/changelog.txt +Documented changes and release timestamp + +----------------------------------- release - xorriso-1.2.8 - 2013.03.18.093001 +* Bug fix: -tell_media_space altered the pointers to MD5 of data files + which stem from a previous session. This produced false + mismatches with -check_md5_r. +* Bug fix: CD tracks were reported with the sizes of the tracks in the + first session. +* Bug fix: -check_media use=outdev sector_map= stored TOC of input drive +* Bug fix: -hide hfsplus and -as mkisofs -hide-hfsplus had no effect. + Thanks to Davy Ho. +* Bug fix: ./configure did not abort if libburn.h or libisofs.h were missing +* New command -move +* New -as mkisofs options -eltorito-id , -eltorito-selcrit + + +18 Mar 2013 [] +frontend/xorriso-tcltk +frontend/README-tcltk +Making use of command -move in xorriso-tcltk + + +------------------------------------ cycle - xorriso-1.2.9 - +* New command -move +* Bug fix: ./configure did not abort if libburn.h or libisofs.h were missing + + + [] +xorriso/xorriso_eng.html +ChangeLog +Updated change log and web page +------------------------------------ cycle - xorriso-1.2.9 - [] xorriso/xorriso_eng.html ChangeLog Updated change log and web page ------------------------------------- cycle - xorriso-1.2.7 - +------------------------------------ cycle - xorriso-1.2.9 - + ********************************************************************** @@ -14164,14 +14392,6 @@ - make optional use of ttk::treeview instead of BWidget (needs Tk 8.5) ->>> on BD-RE --as cdrecord -v dev='/dev/sr5' blank=as_needed --as cdrecord -v --grow_overwriteable_iso dev='/dev/sr5' '/dvdbuffer/mini.iso' -multi stream_recording=32s --as cdrecord -v --grow_overwriteable_iso dev='/dev/sr5' '/dvdbuffer/mini.iso' -multi stream_recording=32s -The second burn on appendable BD-RE does not activate the new session. - - ->>> Command -rename with unambigous semantics ? >>> The call of Xorriso_remake_hln_array() lasts long even after small
[-] [+]	Changed	xorriso-1.2.8.tar.bz2/xorriso/check_media.c ^
@@ -1,7 +1,7 @@ /* xorriso - creates, loads, manipulates and burns ISO 9660 filesystem images. - Copyright 2007-2011 Thomas Schmitt, <scdbackup@gmx.net> + Copyright 2007-2013 Thomas Schmitt, <scdbackup@gmx.net> Provided under GPL version 2 or later. @@ -282,11 +282,11 @@ int Sectorbitmap_from_file(struct SectorbitmaP *o, char path, char msg, int os_errno, int flag) { - int ret, fd= -1, sectors, sector_size, i, todo, map_size, skip; + int ret, fd= -1, sectors, sector_size, i, todo, map_size, skip, bufsize= 1024; unsigned char map; unsigned char buf; - buf= TSOB_FELD(unsigned char, 1024); + buf= TSOB_FELD(unsigned char, bufsize); if(buf == NULL) return(-1); @@ -320,8 +320,8 @@ sscanf(((char ) buf) + 25, "%d", &skip); if(skip < 0) {ret= 0; goto wrong_filetype;} - for(i= 0; i < skip; i+= sizeof(buf)) { - todo= sizeof(buf); + for(i= 0; i < skip; i+= bufsize) { + todo= bufsize; if(i + todo > skip) todo= skip - i; ret= read(fd, buf, todo); @@ -345,8 +345,8 @@ } map= (o)->map; map_size= (*o)->map_size; - for(i= 0; i < map_size; i+= sizeof(buf)) { - todo= sizeof(buf); + for(i= 0; i < map_size; i+= bufsize) { + todo= bufsize; if(i + todo > map_size) todo= map_size - i; ret= read(fd, buf, todo);
[-] [+]	Changed	xorriso-1.2.8.tar.bz2/xorriso/drive_mgt.c ^
@@ -769,7 +769,8 @@ } -/* @param flag bit2=do not try to read ISO heads +/* @param flag bit1=report about output drive rather than input drive + bit2=do not try to read ISO heads / int Xorriso_toc_to_string(struct XorrisO xorriso, char *toc_text, int flag) { @@ -780,7 +781,7 @@ ret= Xorriso_push_outlists(xorriso, &stack_handle, 1); if(ret <= 0) goto ex; - toc_ret= Xorriso_toc(xorriso, flag & 4); + toc_ret= Xorriso_toc(xorriso, flag & (2 \| 4)); ret= Xorriso_pull_outlists(xorriso, stack_handle, &results, &infos, 0); if(ret <= 0) goto ex; @@ -941,6 +942,7 @@ int last_track_start= 0, last_track_size= -1, num_data= 0, is_data= 0; int is_inout_drive= 0, drive_role, status, num_formats, emul_lba; int not_recognizable= 0, start_lba, end_lba; + int sessions_seen, open_sessions= 0, have_real_open_session= 0; char profile_name[80],respt,devadr, typetext= ""; struct burn_toc_entry toc_entry; struct burn_drive_info dinfo; @@ -1194,11 +1196,16 @@ } else { num_data= 0; sessions= isoburn_toc_disc_get_sessions(disc, &num_sessions); - for (session_no= 0; session_no<num_sessions && !(xorriso->request_to_abort); + open_sessions= isoburn_toc_disc_get_incmpl_sess(disc); + for (session_no= 0; + session_no < num_sessions + open_sessions && + !(xorriso->request_to_abort); session_no++) { tracks= isoburn_toc_session_get_tracks(sessions[session_no], &num_tracks); - if (tracks==NULL) + if (tracks == NULL \|\| num_tracks <= 0) continue; + if(session_no == num_sessions + open_sessions - 1 && open_sessions > 0) + have_real_open_session= 1; for(track_no= 0; track_no<num_tracks && !(xorriso->request_to_abort); track_no++) { track_count++; @@ -1236,7 +1243,12 @@ image_blocks= track_size; } } - if(ret>0 && track_no==0) { + if(session_no >= num_sessions && track_no == 0) { + if(ret <= 0) + volume_id[0]= 0; + sprintf(respt, "Incmp session: %3d , %9d , %9ds , %s\n", + session_no+1, lba, image_blocks, volume_id); + } else if(ret>0 && track_no==0) { sprintf(respt, "ISO session : %3d , %9d , %9ds , %s\n", session_no+1, lba, image_blocks , volume_id); } else if(ret>0) { @@ -1289,8 +1301,11 @@ / Sfile_scale(((double) num_data) * 2048.0, mem_text,5,1e4,1); + sessions_seen= num_sessions + open_sessions; + if(open_sessions > 0 && !have_real_open_session) + sessions_seen--; sprintf(respt, "Media summary: %d session%s, %d data blocks, %s data", - num_sessions, (num_sessions==1 ? "" : "s"), num_data, mem_text); + sessions_seen, (sessions_seen == 1 ? "" : "s"), num_data, mem_text); if(num_data_from_format) num_free= 0; else @@ -1309,10 +1324,15 @@ Xorriso_toc_line(xorriso, flag & 8); } } - if(profile_no == 0x41 && num_sessions >= 300) { + if(profile_no == 0x41 && sessions_seen >= 300) { sprintf(xorriso->info_text, "Sequential BD-R medium now contains %d sessions. It is likely to soon fail writing.", - num_sessions); + sessions_seen); + Xorriso_msgs_submit(xorriso, 0, xorriso->info_text, 0, "WARNING", 0); + } + + if(have_real_open_session) { + sprintf(xorriso->info_text, "Incomplete session encountered !"); Xorriso_msgs_submit(xorriso, 0, xorriso->info_text, 0, "WARNING", 0); } @@ -1682,6 +1702,14 @@ sprintf(respt + strlen(respt), " %5dk , %4.1fx%s\n", high, ((double) high) * 1000.0 / speed_factor, speed_unit); Xorriso_result(xorriso,0); + ret= burn_drive_get_best_speed(drive, 0, &item, 2); + if(ret > 0 && item != NULL) + if(item->write_speed != high) { + sprintf(respt, "Write speed 0: %5dk , %4.1fx%s\n", + item->write_speed, + ((double) item->write_speed) * 1000.0 / speed_factor, speed_unit); + Xorriso_result(xorriso,0); + } } else { sprintf(xorriso->info_text, "Could not get any write speed information from drive"); @@ -2886,7 +2914,8 @@ goto ex; } } - Xorriso_toc_to_string(xorriso, &toc_info, 4 * !job->map_with_volid); + Xorriso_toc_to_string(xorriso, &toc_info, + (2 * !!job->use_dev) \| (4 * !job->map_with_volid)); } ret= Xorriso_open_job_data_to(xorriso, job, 0); if(ret <= 0)
[-] [+]	Changed	xorriso-1.2.8.tar.bz2/xorriso/emulators.c ^
@@ -1,7 +1,7 @@ /* xorriso - creates, loads, manipulates and burns ISO 9660 filesystem images. - Copyright 2007-2012 Thomas Schmitt, <scdbackup@gmx.net> + Copyright 2007-2013 Thomas Schmitt, <scdbackup@gmx.net> Provided under GPL version 2 or later. @@ -397,7 +397,7 @@ /* Perform actions / Xorriso_option_report_about(xorriso, "NOTE", 0); if(do_version) { - sprintf(xorriso->result_line, "Cdrecord 2.01-Emulation Copyright (C) 2012 see libburnia-project.org xorriso\n"); + sprintf(xorriso->result_line, "Cdrecord 2.01-Emulation Copyright (C) 2013 see libburnia-project.org xorriso\n"); Xorriso_result(xorriso, 1); Xorriso_option_version(xorriso, 0); } @@ -589,7 +589,8 @@ static char arg1_options[][41]= { "-abstract", "-A", "-appid", "-biblio", "-b", "-B", "-boot-load-seg", "-boot-load-size", "-C", "-c", "-check-session", "-copyright", - "-dir-mode", "-file-mode", "-G", "-gid", "-hide", "-hide-list", + "-dir-mode", "-eltorito-id", "-eltorito-selcrit", + "-file-mode", "-G", "-gid", "-hide", "-hide-list", "-hidden", "-hidden-list", "-hide-joliet", "-hide-joliet-list", "-hide-hfsplus", "-hide-hfsplus-list", "-hide-udf", "-hide-udf-list", "-input-charset", "-output-charset", @@ -702,20 +703,13 @@ } -int Xorriso_genisofs_add_boot(struct XorrisO xorriso, char whom, - int option_b, int emul_boot, int flag) +int Xorriso_genisofs_add_boot(struct XorrisO xorriso, int flag) { int ret; - if(option_b) - xorriso->boot_image_emul= emul_boot; - else - xorriso->boot_image_emul= 0; ret= Xorriso_attach_boot_image(xorriso, 0); if(ret <= 0) xorriso->boot_image_bin_path[0]= 0; - option_b= 0; - emul_boot= 2; return(ret); } @@ -823,6 +817,8 @@ " -hard-disk-boot Boot image is a hard disk image", " -no-emul-boot Boot image is 'no emulation' image", " -boot-info-table Patch boot image with info table", +" -eltorito-id ID Set El Torito Id String", +" -eltorito-selcrit HEXBYTES Set El Torito Selection Criteria", " -isohybrid-gpt-basdat Mark El Torito boot image as Basic Data in GPT", " -isohybrid-gpt-hfsplus Mark El Torito boot image as HFS+ in GPT", " -isohybrid-apm-hfsplus Mark El Torito boot image as HFS+ in APM", @@ -1092,9 +1088,10 @@ int argc, char *argv, int flag) { int ret, i, j, was_path= 0, was_other_option= 0, mem_graft_points, mem; - int do_print_size= 0, fd, idx, iso_level= 1, emul_boot= 2; - int option_b= 0, was_failure= 0, fret, lower_r= 0, zero= 0; - int dir_mode= -1, file_mode= -1, count, partition_number, allow_dir_id_ext= 1; + int do_print_size= 0, fd, idx, iso_level= -1; + int was_failure= 0, fret, lower_r= 0, zero= 0; + int dir_mode= -1, file_mode= -1, count, partition_number; + int allow_dir_id_ext= -1; int root_seen= 0, do_md5_mem, option_d= 0, arg_count; mode_t mode_and, mode_or; int with_boot_image= 0, with_cat_path= 0, with_emul_toc= 0; @@ -1172,7 +1169,7 @@ continue; if(strcmp(argpt, "-version")==0) { sprintf(xorriso->result_line, -"mkisofs 2.01-Emulation Copyright (C) 2012 see libburnia-project.org xorriso\n" +"mkisofs 2.01-Emulation Copyright (C) 2013 see libburnia-project.org xorriso\n" ); fd= xorriso->dev_fd_1; if(fd<0) @@ -1695,6 +1692,8 @@ strcmp(argpt, "-c") == 0 \|\| strcmp(argpt, "-eltorito-catalog") == 0 \|\| strcmp(argpt, "-boot-load-size") == 0 \|\| + strcmp(argpt, "-eltorito-id") == 0 \|\| + strcmp(argpt, "-eltorito-selcrit") == 0 \|\| strcmp(argpt, "--embedded-boot")==0 \|\| strcmp(argpt, "-generic-boot")==0 \|\| strcmp(argpt, "-G") == 0 \|\| @@ -2070,10 +2069,14 @@ / Enforce odd mkisofs defaults on first pathspec / xorriso->pacifier_style= 1; + if(xorriso->allow_dir_id_ext_dflt && allow_dir_id_ext < 0) + allow_dir_id_ext= 1; if(allow_dir_id_ext == 1) { Xorriso_relax_compliance(xorriso, "allow_dir_id_ext", 0); allow_dir_id_ext= 2; } + if(xorriso->iso_level_is_default && iso_level < 0) + iso_level= 1; if(iso_level >= 1 && iso_level <= 3) { sprintf(sfe, "iso_9660_level=%d", iso_level); Xorriso_relax_compliance(xorriso, sfe, 0); @@ -2167,9 +2170,11 @@ else argpt= argv[i]; if(strcmp(argpt, "-no-emul-boot")==0) { - emul_boot= xorriso->boot_image_emul= 0; + xorriso->boot_image_emul= 0; + xorriso->boot_emul_default= 0; } else if(strcmp(argpt, "-hard-disk-boot")==0) { - emul_boot= xorriso->boot_image_emul= 1; + xorriso->boot_image_emul= 1; + xorriso->boot_emul_default= 0; } else if(strcmp(argpt, "-boot-info-table")==0) { xorriso->patch_isolinux_image= (xorriso->patch_isolinux_image & ~2) \| 1; } else if(strcmp(argpt, "-b") == 0 \|\| @@ -2179,14 +2184,14 @@ i++; if(strcmp(argpt, "--efi-boot") == 0) { if(xorriso->boot_image_bin_path[0]) { - ret= Xorriso_genisofs_add_boot(xorriso, whom, - &option_b, &emul_boot, 0); + ret= Xorriso_genisofs_add_boot(xorriso, 0); if(ret <= 0) goto problem_handler_boot; } boot_path= xorriso->boot_image_bin_path; xorriso->boot_efi_default= 1; - emul_boot= xorriso->boot_image_emul= 0; + xorriso->boot_image_emul= 0; + xorriso->boot_emul_default= 0; } else { boot_path= xorriso->boot_image_bin_path; @@ -2195,8 +2200,8 @@ else xorriso->boot_platform_id= 0x00; xorriso->boot_efi_default= 0; - option_b= 1; - xorriso->boot_image_emul= emul_boot; + if(xorriso->boot_emul_default) + xorriso->boot_image_emul= 2; } boot_path[0]= 0; if(argv[i][0] != '/') @@ -2205,10 +2210,7 @@ if(ret <= 0) goto ex; if(xorriso->boot_efi_default && xorriso->boot_image_bin_path[0]) { - option_b= 0; - emul_boot= 0; - ret= Xorriso_genisofs_add_boot(xorriso, whom, - &option_b, &emul_boot, 0); + ret= Xorriso_genisofs_add_boot(xorriso, 0); if(ret <= 0) goto problem_handler_boot; } @@ -2234,6 +2236,18 @@ i++; sscanf(argv[i], "%d", &ret); xorriso->boot_image_load_size= ret 512; + } else if(strcmp(argpt, "-eltorito-id") == 0 \|\| + strcmp(argpt, "-eltorito-selcrit") == 0) { + if(i+1>=argc) + goto not_enough_args; + i++; + if(strcmp(argpt, "-eltorito-id") == 0) + sprintf(sfe, "id_string=%s", argv[i]); + else + sprintf(sfe, "sel_crit=%s", argv[i]); + ret= Xorriso_option_boot_image(xorriso, "any", sfe, 0); + if(ret <= 0) + goto problem_handler_boot; } else if(strncmp(argpt, "isolinux_mbr=", 13)==0) { sprintf(sfe, "isohybrid=%s", argpt + 13); ret= Xorriso_option_boot_image(xorriso, "isolinux", sfe, 0); @@ -2248,8 +2262,7 @@ } else if(strcmp(argpt, "-isohybrid-apm-hfsplus") == 0) { xorriso->patch_isolinux_image = xorriso->patch_isolinux_image \| (1 << 8); } else if(strcmp(argpt, "-eltorito-alt-boot")==0) { - ret= Xorriso_genisofs_add_boot(xorriso, whom, - &option_b, &emul_boot, 0); + ret= Xorriso_genisofs_add_boot(xorriso, 0); if(ret <= 0) goto problem_handler_boot; } else if(strcmp(argpt, "--embedded-boot")==0 \|\| @@ -2341,11 +2354,6 @@ } if(with_boot_image && with_cat_path == 0) strcpy(xorriso->boot_image_cat_path, "/boot.catalog"); - if(xorriso->boot_image_bin_path[0]) { - ret= Xorriso_genisofs_add_boot(xorriso, whom, &option_b, &emul_boot, 0); - if(ret <= 0) - goto ex; - } /* The boot catalog has to be hidden separately */ if(xorriso->boot_image_cat_path[0]) { ret= Xorriso_path_is_hidden(xorriso, xorriso->boot_image_cat_path, 0);
[-] [+]	Changed	xorriso-1.2.8.tar.bz2/xorriso/iso_img.c ^
@@ -1,7 +1,7 @@ /* xorriso - creates, loads, manipulates and burns ISO 9660 filesystem images. - Copyright 2007-2012 Thomas Schmitt, <scdbackup@gmx.net> + Copyright 2007-2013 Thomas Schmitt, <scdbackup@gmx.net> Provided under GPL version 2 or later. @@ -243,7 +243,7 @@ IsoImage image; struct burn_drive_info dinfo; struct burn_drive drive; - char msg, block_head[8]; + char msg, block_head[8], crt, mdt, ext, *eft; off_t head_count; msg= xorriso->result_line; @@ -292,6 +292,19 @@ Xorriso_result(xorriso,0); sprintf(msg, "Biblio File : %s\n", xorriso->biblio_file); Xorriso_result(xorriso,0); + + ret= iso_image_get_pvd_times(image, &crt, &mdt, &ext, &eft); + if(ret != ISO_SUCCESS) + crt= mdt= ext= eft= ""; + sprintf(msg, "Creation Time: %s\n", crt); + Xorriso_result(xorriso,0); + sprintf(msg, "Modif. Time : %s\n", mdt); + Xorriso_result(xorriso,0); + sprintf(msg, "Expir. Time : %s\n", ext); + Xorriso_result(xorriso,0); + sprintf(msg, "Eff. Time : %s\n", eft); + Xorriso_result(xorriso,0); + return(1); }
[-] [+]	Changed	xorriso-1.2.8.tar.bz2/xorriso/iso_manip.c ^
@@ -1,7 +1,7 @@ /* xorriso - creates, loads, manipulates and burns ISO 9660 filesystem images. - Copyright 2007-2012 Thomas Schmitt, <scdbackup@gmx.net> + Copyright 2007-2013 Thomas Schmitt, <scdbackup@gmx.net> Provided under GPL version 2 or later. @@ -166,6 +166,7 @@ bit3= cut_out_node: offset and size are valid bit8= hide in iso_rr bit9= hide in joliet + bit10= hide in hfsplus / int Xorriso_tree_graft_node(struct XorrisO xorriso, IsoImage volume, IsoDir dir, char disk_path, char img_name, @@ -218,8 +219,8 @@ goto ex; } } - if(flag & (256 \| 512)) { - ret= Xorriso_set_hidden(xorriso, (void ) node, "", (flag >> 8) & 3, 0); + if(flag & (256 \| 512 \| 1024)) { + ret= Xorriso_set_hidden(xorriso, (void ) node, "", (flag >> 8) & 7, 0); if(ret <= 0) goto ex; }
[-] [+]	Changed	xorriso-1.2.8.tar.bz2/xorriso/man_1_xorrecord.html ^
@@ -1,5 +1,5 @@ <!-- Creator : groff version 1.18.1 --> -<!-- CreationDate: Tue Jan 8 12:05:25 2013 --> +<!-- CreationDate: Mon Mar 18 11:06:06 2013 --> <html> <head> <meta name="generator" content="groff -Thtml, via man -H, via xorriso/convert_man_to_html.sh"> @@ -1647,5 +1647,5 @@ </td> </table> <hr> -<BR><HR><FONT SIZE=-1><CENTER>(HTML generated from xorrecord.1 on Tue Jan 8 12:05:25 CET 2013 by man_xorrecord_to_html.sh )</CENTER></FONT></body> +<BR><HR><FONT SIZE=-1><CENTER>(HTML generated from xorrecord.1 on Mon Mar 18 11:06:06 CET 2013 by man_xorrecord_to_html.sh )</CENTER></FONT></body> </html>
[-] [+]	Changed	xorriso-1.2.8.tar.bz2/xorriso/man_1_xorriso.html ^
@@ -1,5 +1,5 @@ <!-- Creator : groff version 1.18.1 --> -<!-- CreationDate: Tue Jan 8 12:05:24 2013 --> +<!-- CreationDate: Mon Mar 18 11:06:06 2013 --> <html> <head> <meta name="generator" content="groff -Thtml, via man -H, via xorriso/convert_man_to_html.sh"> @@ -1582,7 +1582,8 @@ directories can only be replaced, not merged. Note that if the target directory exists, then -mv inserts the source objects into this directory rather than attempting to -replace it.</p> +replace it. Command -move, on the other hand, would +attempt to replace it.</p> <!-- INDENTATION --> <p>The commands in this section alter the ISO image and not the local filesystem.</p> @@ -2477,6 +2478,28 @@ <tr valign="top" align="left"> <td width="10%"></td> <td width="89%"> +<p><b>-move</b> iso_rr_path iso_rr_path</p></td> +</table> +<!-- INDENTATION --> +<table width="100%" border=0 rules="none" frame="void" + cols="2" cellspacing="0" cellpadding="0"> +<tr valign="top" align="left"> +<td width="21%"></td> +<td width="77%"> +<p>Rename the file given by the first (origin) iso_rr_path +to the second (destination) iso_rr_path. Deviate from rules +of shell command mv by not moving the origin file underneath +an existing destination directory. The origin file will +rather replace such a directory, if this is allowed by +command -overwrite.</p> +</td> +</table> +<!-- INDENTATION --> +<table width="100%" border=0 rules="none" frame="void" + cols="2" cellspacing="0" cellpadding="0"> +<tr valign="top" align="left"> +<td width="10%"></td> +<td width="89%"> <p><b>-mv</b> iso_rr_path [***] iso_rr_path</p></td> </table> <!-- INDENTATION --> @@ -2833,7 +2856,14 @@ scdbackup timestamps:<br> YYMMDD[.hhmm[ss]]<br> where "A0" is year 2000, "B0" is 2010, -etc.</p> +etc.<br> +ECMA-119 volume timestamps:<br> +YYYYMMDDhhmmsscc<br> +These are normally given as GMT. The suffix "LOC" +causes local timezone conversion. E.g. 2013010720574700, +2013010720574700LOC. The last two digits cc (centiseconds) +will be ignored, but must be present in order to make the +format recognizable.</p> </td> </table> <!-- INDENTATION --> @@ -3731,7 +3761,11 @@ "Write speed H" are the best guesses for lower and upper speed limit. "Write speed l" and "Write speed h" may appear only with CD and eventually -override the list of other speed offers.</p> +override the list of other speed offers.<br> +Only if the drive reports contradicting speed information +there will appear "Write speed 0", which tells the +outcome of speed selection by command -speed 0, if it +deviates from "Write speed H".</p> </td> </table> <!-- INDENTATION --> @@ -4221,8 +4255,8 @@ E.g. 2010040711405800 is 7 Apr 2010 11:40:58 (+0 centiseconds).<br> Timestrings for the other types may be given as with command --alter_date. They are prone to timezone computations. -The timestrings "default" or +-alter_date. Some of them are prone to timezone +computations. The timestrings "default" or "overridden" cause default settings: "c" and "m" will show the current time of image creation. "x" and "f" will be marked as @@ -5819,7 +5853,14 @@ <td width="77%"> <p>Print available space on the output medium and the free space after subtracting already foreseeable consumption by -next -commit.</p> +next -commit.<br> +Note that the title of the prediction "After commit +:" is misleading. It is rather the space that may still +be filled in this session without making the next +-commit fail from medium overflow.<br> +The free space after the next -commit might be smaller +by several MB. This depends on medium type, number of +recorded sessions, and drive habits.</p> </td> </table> <!-- INDENTATION --> @@ -5836,11 +5877,15 @@ <tr valign="top" align="left"> <td width="21%"></td> <td width="77%"> -<p>Print various ID strings which can be found in loaded ISO -images. Some of them may be changed by commands like --volid or -publisher. For these IDs --pvd_info reports what would be written with the next --commit.</p> +<p>Print various ID strings and timestamps which can be +found in loaded ISO images. Some of the IDs may be changed +by commands like -volid or -publisher. For these +IDs -pvd_info reports what would be written with the +next -commit. The timestamps get not automatically +propagated from loaded image to newly written image. The +ones for new images may be set by command +-volume_date. See there for the meaning of the +particular timestamps.</p> </td> </table> <!-- INDENTATION --> @@ -7090,9 +7135,15 @@ (= "UPDATE") and -quiet (= "SORRY") persist. The output file persists until things happen like -commit, -rollback, --dev, or end of <b>xorriso</b>. -pacifier gets -set to "mkisofs" if files are added to the -image.<br> +-dev, or end of <b>xorriso</b>.<br> +Options which affect all file objects in the ISO image, like +-r or -dir-mode, will be applied only to +files which are present in the ISO image when the command +-as ends. If you use several -as mkisofs +commands in the same run, then consider to put such options +into the last -as command.<br> +-pacifier gets set to "mkisofs" if files are +added to the image.<br> -graft-points is equivalent to -pathspecs on. Note that pathspecs without "=" are interpreted differently than with <b>xorriso</b> command @@ -9086,5 +9137,5 @@ </td> </table> <hr> -<BR><HR><FONT SIZE=-1><CENTER>(HTML generated from xorriso.1 on Tue Jan 8 12:05:24 CET 2013 by man_xorriso_to_html.sh )</CENTER></FONT></body> +<BR><HR><FONT SIZE=-1><CENTER>(HTML generated from xorriso.1 on Mon Mar 18 11:06:06 CET 2013 by man_xorriso_to_html.sh )</CENTER></FONT></body> </html>
[-] [+]	Changed	xorriso-1.2.8.tar.bz2/xorriso/man_1_xorrisofs.html ^
@@ -1,5 +1,5 @@ <!-- Creator : groff version 1.18.1 --> -<!-- CreationDate: Tue Jan 8 12:05:24 2013 --> +<!-- CreationDate: Mon Mar 18 11:06:06 2013 --> <html> <head> <meta name="generator" content="groff -Thtml, via man -H, via xorriso/convert_man_to_html.sh"> @@ -2520,6 +2520,49 @@ <tr valign="top" align="left"> <td width="10%"></td> <td width="89%"> +<p><b>-eltorito-id</b> text\|56_hexdigits</p></td> +</table> +<!-- INDENTATION --> +<table width="100%" border=0 rules="none" frame="void" + cols="2" cellspacing="0" cellpadding="0"> +<tr valign="top" align="left"> +<td width="21%"></td> +<td width="77%"> +<p>Define the ID string of the boot catalog section where +the boot image will be listed. If the value consists of 56 +characters [0-9A-Fa-f] then it is +converted into 28 bytes, else the first 28 characters become +the ID string. The ID string of the first boot image becomes +the overall catalog ID. It is limited to 24 characters. +Other id_strings become section IDs.</p> +</td> +</table> +<!-- INDENTATION --> +<table width="100%" border=0 rules="none" frame="void" + cols="2" cellspacing="0" cellpadding="0"> +<tr valign="top" align="left"> +<td width="10%"></td> +<td width="89%"> +<p><b>-eltorito-selcrit</b> hexdigits</p></td> +</table> +<!-- INDENTATION --> +<table width="100%" border=0 rules="none" frame="void" + cols="2" cellspacing="0" cellpadding="0"> +<tr valign="top" align="left"> +<td width="21%"></td> +<td width="77%"> +<p>Define the Selection Criteria of the boot image. Up to 20 +bytes get read from the given characters +[0-9A-Fa-f]. They get attributed to the +boot image entry in the catalog.</p> +</td> +</table> +<!-- INDENTATION --> +<table width="100%" border=0 rules="none" frame="void" + cols="2" cellspacing="0" cellpadding="0"> +<tr valign="top" align="left"> +<td width="10%"></td> +<td width="89%"> <p><b>-boot-info-table</b></p></td> </table> <!-- INDENTATION --> @@ -4281,5 +4324,5 @@ </td> </table> <hr> -<BR><HR><FONT SIZE=-1><CENTER>(HTML generated from xorrisofs.1 on Tue Jan 8 12:05:24 CET 2013 by man_xorrisofs_to_html.sh )</CENTER></FONT></body> +<BR><HR><FONT SIZE=-1><CENTER>(HTML generated from xorrisofs.1 on Mon Mar 18 11:06:06 CET 2013 by man_xorrisofs_to_html.sh )</CENTER></FONT></body> </html>
[-] [+]	Changed	xorriso-1.2.8.tar.bz2/xorriso/match.c ^
@@ -1,7 +1,7 @@ /* xorriso - creates, loads, manipulates and burns ISO 9660 filesystem images. - Copyright 2007-2010 Thomas Schmitt, <scdbackup@gmx.net> + Copyright 2007-2013 Thomas Schmitt, <scdbackup@gmx.net> Provided under GPL version 2 or later. @@ -753,8 +753,19 @@ / int Xorriso_warn_of_wildcards(struct XorrisO xorriso, char path, int flag) { + static int count_iso= 0, count_disk= 0, max_iso= 3, max_disk= 3; + if(strchr(path,'')!=NULL \|\| strchr(path,'?')!=NULL \|\| strchr(path,'[')!=NULL) { + if(flag & 2) { + count_disk++; + if(count_disk > max_disk) + return(1); + } else { + count_iso++; + if(count_iso > max_iso) + return(1); + } if(flag&1) { sprintf(xorriso->info_text, "Pattern expansion of wildcards \"*?[\" does not apply to this command");
[-] [+]	Changed	xorriso-1.2.8.tar.bz2/xorriso/misc_funct.c ^
@@ -457,14 +457,20 @@ int Decode_ecma119_format(struct tm erg, char text, int flag) -/* YYYYMMDDhhmmsscc / +/ YYYYMMDDhhmmsscc[LOC] / / 2010040711405800 / { - int i, l, num; + int i, l, num, utc= 1; memset(erg, 0, sizeof(erg)); erg->tm_isdst= -1; l= strlen(text); + if(l == 19) { + if(strcmp(text + 16, "LOC") != 0) + return(0); + utc= 0; + l= 16; + } if(l != 16) return(0); for(i= 0; i < l; i++) @@ -491,7 +497,7 @@ erg->tm_sec= 10(text[12]-'0')+text[13]-'0'; if(erg->tm_sec > 59) return(0); - return(1); + return(1 + !utc); } @@ -575,7 +581,7 @@ char scale_chr; double value,seconds; struct tm result_tm; - int seconds_valid= 0; + int seconds_valid= 0, ret; date= 0; if(code[0]=='-' \|\| code[0]=='+' \|\| code[0]=='=' \|\| code[0]=='@'){ @@ -627,10 +633,21 @@ seconds= mktime(&result_tm); seconds_valid= 1; goto completed; - } else if(Decode_ecma119_format(&result_tm, code, 0)>0) { - /* YYYYMMDDhhmmsscc / - / 2010040711405800 / + } else if((ret= Decode_ecma119_format(&result_tm, code, 0)) > 0) { + / YYYYMMDDhhmmsscc[UTC] / + / 2010040711405800UTC / seconds= mktime(&result_tm); + if(ret == 1) { + +#ifdef HAVE_TM_GMTOFF + seconds+= result_tm.tm_gmtoff; +#else + if(result_tm.tm_isdst < 0) + result_tm.tm_isdst = 0; + seconds-= timezone - result_tm.tm_isdst 3600; +#endif + + } seconds_valid= 1; goto completed; }
[-] [+]	Changed	xorriso-1.2.8.tar.bz2/xorriso/opts_a_c.c ^
@@ -998,11 +998,14 @@ if(strcmp(treatpt + 10, "none") == 0 \|\| strcmp(treatpt + 10, "no_emulation") == 0) { xorriso->boot_image_emul= 0; + xorriso->boot_emul_default= 0; } else if(strcmp(treatpt + 10, "hard_disk") == 0) { xorriso->boot_image_emul= 1; + xorriso->boot_emul_default= 0; } else if(strcmp(treatpt + 10, "floppy") == 0 \|\| strcmp(treatpt + 10, "diskette") == 0) { xorriso->boot_image_emul= 2; + xorriso->boot_emul_default= 0; } else { sprintf(xorriso->info_text, "-boot_image %s : Unknown media_type : %s",
[-] [+]	Changed	xorriso-1.2.8.tar.bz2/xorriso/opts_d_h.c ^
@@ -1738,8 +1738,12 @@ " Delete the given files from the ISO image.", " -rm_r iso_rr_path [*]", " Delete the given directory trees from ISO image.", +" -move iso_rr_path iso_rr_path", +" Rename the single file given by the first iso_rr_path to", +" the second iso_rr_path.", " -mv iso_rr_path [] iso_rr_path", -" Rename the given file objects in the ISO tree to iso_rr_path.", +" Like shell command mv rename the given file objects in the", +" ISO tree to the last of the iso_rr_path parameters.", " -chown uid iso_rr_path []", " Equivalent to chown in the ISO image.", " -chown_r uid iso_rr_path [*]",
[-] [+]	Changed	xorriso-1.2.8.tar.bz2/xorriso/opts_i_o.c ^
@@ -866,6 +866,33 @@ } +/* Command -move / +int Xorriso_option_move(struct XorrisO xorriso, char origin, char dest, + int flag) +{ + int ret; + char eff_origin= NULL, eff_dest= NULL; + + Xorriso_alloc_meM(eff_origin, char, SfileadrL); + Xorriso_alloc_meM(eff_dest, char, SfileadrL); + + ret= Xorriso_normalize_img_path(xorriso, xorriso->wdi, origin, eff_origin, 0); + if(ret <= 0) + goto ex; + ret= Xorriso_normalize_img_path(xorriso, xorriso->wdi, dest, eff_dest, 0); + if(ret <= 0) + goto ex; + ret= Xorriso_rename(xorriso, NULL, eff_origin, eff_dest, 0); + if(ret <= 0) + goto ex; + ret= 1; +ex:; + Xorriso_free_meM(eff_origin); + Xorriso_free_meM(eff_dest); + return(ret); +} + + /* Command -msg_op / int Xorriso_option_msg_op(struct XorrisO xorriso, char what, char arg, int flag)
[-] [+]	Changed	xorriso-1.2.8.tar.bz2/xorriso/opts_p_z.c ^
@@ -1,7 +1,7 @@ /* xorriso - creates, loads, manipulates and burns ISO 9660 filesystem images. - Copyright 2007-2012 Thomas Schmitt, <scdbackup@gmx.net> + Copyright 2007-2013 Thomas Schmitt, <scdbackup@gmx.net> Provided under GPL version 2 or later. @@ -1816,7 +1816,7 @@ sprintf(xorriso->result_line, "ISO 9660 Rock Ridge filesystem manipulator and CD/DVD/BD burn program\n"); sprintf(xorriso->result_line+strlen(xorriso->result_line), -"Copyright (C) 2012, Thomas Schmitt <scdbackup@gmx.net>, libburnia project.\n"); +"Copyright (C) 2013, Thomas Schmitt <scdbackup@gmx.net>, libburnia project.\n"); Xorriso_result(xorriso, 0); sprintf(xorriso->result_line, "xorriso version : %d.%d.%d%s\n",
[-] [+]	Changed	xorriso-1.2.8.tar.bz2/xorriso/parse_exec.c ^
@@ -529,7 +529,7 @@ "data_cache_size", "errfile_log","error_behavior","extract","extract_single", "jigdo","lns","lnsi","load","logfile", - "map","map_single","msg_op","page","return_with", + "map","map_single","move","msg_op","page","return_with", "scdbackup_tag","update","update_r","volume_date", "" }; @@ -684,7 +684,7 @@ "* File manipulations:", "iso_rr_pattern", - "rm", "rm_r", "rmdir", "mv", + "rm", "rm_r", "rmdir", "move", "mv", "chown", "chown_r", "chgrp", "chgrp_r", "chmod", "chmod_r", "setfacl", "setfacl_r", "setfacl_list", "setfattr", "setfattr_r", "setfattr_list", "alter_date", "alter_date_r", "hide", @@ -1446,6 +1446,10 @@ (idx)++; ret= Xorriso_option_mount_opts(xorriso, arg1, 0); + } else if(strcmp(cmd, "move")==0) { + (idx)+= 2; + ret= Xorriso_option_move(xorriso, arg1, arg2, 0); + } else if(strcmp(cmd,"msg_op") == 0) { (*idx)+= 2; ret= Xorriso_option_msg_op(xorriso, arg1, arg2, 0);
[-] [+]	Changed	xorriso-1.2.8.tar.bz2/xorriso/text_io.c ^
@@ -1737,12 +1737,18 @@ { 0, -1, -1, -1, -1, -1}, 1, 1}, {"CopyrightFile:", 3, "CopyrightFile: ", "", 1, { 0, -1, -1, -1, -1, -1}, 1, 1}, + {"Creation Time:", 3, "Creation Time: ", "", 1, { 0, -1, -1, -1, -1, -1}, + 1, 1}, {"DVD obs 64 kB:", 3, "DVD obs 64 kB:", "", 1, { 0, -1, -1, -1, -1, -1}, 1, 0}, {"Drive current:", 3, "Drive current:", "", 2, { 0, 1, -1, -1, -1, -1}, 2, 0}, {"Drive type :", 3, "Drive type :", "", 3, { 1, 3, 5, -1, -1, -1}, 2, 0}, + {"Eff. Time :", 3, "Eff. Time : ", "", 1, { 0, -1, -1, -1, -1, -1}, + 1, 1}, + {"Expir. Time :", 3, "Expir. Time : ", "", 1, { 0, -1, -1, -1, -1, -1}, + 1, 1}, {"Ext. filters :", 3, "Ext. filters : ", "", 1, { 0, -1, -1, -1, -1, -1}, 1, 1}, {"File damaged :", 3, "File damaged :", "", 4, { 0, 2, 4, 6, -1, -1}, @@ -1783,6 +1789,8 @@ 2, 1}, {"Media summary:", 3, "Media summary:", "", 4, { 0, 2, 5, 7, -1, -1}, 2, 0}, + {"Modif. Time :", 3, "Modif. Time : ", "", 1, { 0, -1, -1, -1, -1, -1}, + 1, 1}, {"PVD address :", 3, "PVD address :", "", 1, { 0, -1, -1, -1, -1, -1}, 1, 0}, {"Preparer Id :", 3, "Preparer Id : ", "", 1, { 0, -1, -1, -1, -1, -1},
[-] [+]	Changed	xorriso-1.2.8.tar.bz2/xorriso/write_run.c ^
@@ -2,7 +2,7 @@ /* xorriso - creates, loads, manipulates and burns ISO 9660 filesystem images. - Copyright 2007-2012 Thomas Schmitt, <scdbackup@gmx.net> + Copyright 2007-2013 Thomas Schmitt, <scdbackup@gmx.net> Provided under GPL version 2 or later. @@ -576,6 +576,12 @@ {ret= 0; goto ex;} } el_torito_set_boot_platform_id(bootimg, (uint8_t) platform_id); + if(load_size / 512 > 65535) { + sprintf(xorriso->info_text, + "Boot image load size exceeds 65535 blocks. Will record 65535 in El Torito."); + Xorriso_msgs_submit(xorriso, 0, xorriso->info_text, 0, "WARNING", 0); + load_size= 65535 * 512; + } el_torito_set_load_size(bootimg, load_size / 512); el_torito_set_id_string(bootimg, xorriso->boot_id_string); el_torito_set_selection_crit(bootimg, xorriso->boot_selection_crit); @@ -588,6 +594,7 @@ xorriso->boot_image_bin_path[0]= 0; xorriso->boot_image_bin_form[0]= 0; xorriso->boot_image_emul= 0; + xorriso->boot_emul_default= 1; xorriso->boot_image_load_size= 4 * 512; memset(xorriso->boot_id_string, 0, sizeof(xorriso->boot_id_string)); memset(xorriso->boot_selection_crit, 0, @@ -2077,8 +2084,10 @@ } else if((l == 16 && strncmp(cpt, "allow_dir_id_ext", l) == 0) \|\| (l == 19 && strncmp(cpt, "allow_dir_id_ext_on", l) == 0) ) { xorriso->relax_compliance\|= isoburn_igopt_allow_dir_id_ext; + xorriso->allow_dir_id_ext_dflt= 0; } else if((l == 20 && strncmp(cpt, "allow_dir_id_ext_off", l) == 0)) { xorriso->relax_compliance&= ~isoburn_igopt_allow_dir_id_ext; + xorriso->allow_dir_id_ext_dflt= 0; } else if((l == 12 && strncmp(cpt, "omit_version", l) == 0) \|\| (l == 15 && strncmp(cpt, "omit_version_on", l) == 0) ) { @@ -2207,10 +2216,12 @@ if(value == 1 \|\| value == 2) { limit= ((off_t) 4) * ((off_t) 102410241024) - ((off_t) 1); xorriso->iso_level= value; + xorriso->iso_level_is_default= 0; if(xorriso->file_size_limit > limit) xorriso->file_size_limit= limit; } else if(value == 3) { xorriso->iso_level= value; + xorriso->iso_level_is_default= 0; if(xorriso->file_size_limit < Xorriso_default_file_size_limiT) xorriso->file_size_limit= Xorriso_default_file_size_limiT; } else {
[-] [+]	Changed	xorriso-1.2.8.tar.bz2/xorriso/xorrecord.1 ^
@@ -9,7 +9,7 @@ .\" First parameter, NAME, should be all caps .\" Second parameter, SECTION, should be 1-8, maybe w/ subsection .\" other parameters are allowed: see man(7), man(1) -.TH XORRECORD 1 "Version 1.2.6, Jan 08, 2013" +.TH XORRECORD 1 "Version 1.2.8, Mar 18, 2013" .\" Please adjust this date whenever revising the manpage. .\" .\" Some roff macros, for reference:
[-] [+]	Changed	xorriso-1.2.8.tar.bz2/xorriso/xorrecord.info ^
@@ -15,7 +15,7 @@ File: xorrecord.info, Node: Top, Next: Overview, Up: (dir) -xorrecord 1.2.6 +xorrecord 1.2.8 *************** xorrecord - Emulation of CD/DVD/BD program cdrecord by program xorriso
[-] [+]	Changed	xorriso-1.2.8.tar.bz2/xorriso/xorrecord.texi ^
@@ -1,7 +1,7 @@ \input texinfo @c --texinfo-- @c %start of header @setfilename xorrecord.info -@settitle GNU xorrecord 1.2.6 +@settitle GNU xorrecord 1.2.8 @c %end of header @c @c man-ignore-lines begin @@ -50,7 +50,7 @@ @c man .\" First parameter, NAME, should be all caps @c man .\" Second parameter, SECTION, should be 1-8, maybe w/ subsection @c man .\" other parameters are allowed: see man(7), man(1) -@c man .TH XORRECORD 1 "Version 1.2.6, Jan 08, 2013" +@c man .TH XORRECORD 1 "Version 1.2.8, Mar 18, 2013" @c man .\" Please adjust this date whenever revising the manpage. @c man .\" @c man .\" Some roff macros, for reference: @@ -76,7 +76,7 @@ @end copying @c man-ignore-lines end @titlepage -@title Manual of GNU xorriso personality xorrecord 1.2.6 +@title Manual of GNU xorriso personality xorrecord 1.2.8 @author Thomas Schmitt @page @vskip 0pt plus 1filll @@ -85,7 +85,7 @@ @contents @ifnottex @node Top -@top xorrecord 1.2.6 +@top xorrecord 1.2.8 @c man-ignore-lines 1 @c man .SH NAME
[-] [+]	Changed	xorriso-1.2.8.tar.bz2/xorriso/xorriso.1 ^
@@ -9,7 +9,7 @@ .\" First parameter, NAME, should be all caps .\" Second parameter, SECTION, should be 1-8, maybe w/ subsection .\" other parameters are allowed: see man(7), man(1) -.TH XORRISO 1 "Version 1.2.6, Jan 08, 2013" +.TH XORRISO 1 "Version 1.2.8, Mar 18, 2013" .\" Please adjust this date whenever revising the manpage. .\" .\" Some roff macros, for reference: @@ -1013,7 +1013,7 @@ Renaming of files has similar collision handling, but directories can only be replaced, not merged. Note that if the target directory exists, then \-mv inserts the source objects into this directory rather than attempting -to replace it. +to replace it. Command \-move, on the other hand, would attempt to replace it. .PP The commands in this section alter the ISO image and not the local filesystem. .TP @@ -1438,6 +1438,13 @@ \fB\-rmdir\fR iso_rr_path [*] Delete empty directories. .TP +\fB\-move\fR iso_rr_path iso_rr_path +Rename the file given by the first (origin) iso_rr_path to the second +(destination) iso_rr_path. +Deviate from rules of shell command mv by not moving the origin file underneath +an existing destination directory. The origin file will rather replace such a +directory, if this is allowed by command \-overwrite. +.TP \fB\-mv\fR iso_rr_path [] iso_rr_path Rename the given file objects in the ISO tree to the last parameter in the list. Use the same rules as with shell command mv. @@ -1599,6 +1606,15 @@ YYMMDD[.hhmm[ss]] .br where "A0" is year 2000, "B0" is 2010, etc. +.br +ECMA\-119 volume timestamps: +.br + YYYYMMDDhhmmsscc +.br +These are normally given as GMT. The suffix "LOC" causes local timezone +conversion. E.g. 2013010720574700, 2013010720574700LOC. +The last two digits cc (centiseconds) will be ignored, but must be present +in order to make the format recognizable. .TP \fB\-alter_date_r\fR type timestring iso_rr_path [**] Like \-alter_date but affecting all files below eventual directories. @@ -2269,6 +2285,10 @@ are the best guesses for lower and upper speed limit. "Write speed l" and "Write speed h" may appear only with CD and eventually override the list of other speed offers. +.br +Only if the drive reports contradicting speed information there will appear +"Write speed 0", which tells the outcome of speed selection by command +\-speed 0, if it deviates from "Write speed H". .TP \fB\-close_damaged\fR "as_needed"\|"force" Try to close the upcomming track and session if the drive reported the medium @@ -2544,7 +2564,7 @@ E.g. 2010040711405800 is 7 Apr 2010 11:40:58 (+0 centiseconds). .br Timestrings for the other types may be given as with command \-alter_date. -They are prone to timezone computations. The timestrings "default" or +Some of them are prone to timezone computations. The timestrings "default" or "overridden" cause default settings: "c" and "m" will show the current time of image creation. "x" and "f" will be marked as insignificant. "uuid" will be deactivated. @@ -3493,11 +3513,21 @@ \fB\-tell_media_space\fR Print available space on the output medium and the free space after subtracting already foreseeable consumption by next \-commit. +.br +Note that the title of the prediction "After commit :" is misleading. +It is rather the space that may still be filled in this session without +making the next \-commit fail from medium overflow. +.br +The free space after the next \-commit might be smaller by several MB. +This depends on medium type, number of recorded sessions, and drive habits. .TP \fB\-pvd_info\fR -Print various ID strings which can be found in loaded ISO images. Some of -them may be changed by commands like \-volid or \-publisher. For these -IDs \-pvd_info reports what would be written with the next \-commit. +Print various ID strings and timestamps which can be found in loaded ISO +images. Some of the IDs may be changed by commands like \-volid or \-publisher. +For these IDs \-pvd_info reports what would be written with the next \-commit. +The timestamps get not automatically propagated from loaded image to newly +written image. The ones for new images may be set by command \-volume_date. +See there for the meaning of the particular timestamps. .TP .B Navigation in ISO image and disk filesystem: .TP @@ -4071,6 +4101,12 @@ \-quiet (= "SORRY") persist. The output file persists until things happen like \-commit, \-rollback, \-dev, or end of \fBxorriso\fR. +.br +Options which affect all file objects in the ISO image, like \-r or \-dir\-mode, +will be applied only to files which are present in the ISO image when +the command \-as ends. If you use several \-as mkisofs commands in the same +run, then consider to put such options into the last \-as command. +.br \-pacifier gets set to "mkisofs" if files are added to the image. .br \-graft\-points is equivalent to \-pathspecs on. Note that pathspecs without "="
[-] [+]	Changed	xorriso-1.2.8.tar.bz2/xorriso/xorriso.h ^
@@ -68,7 +68,7 @@ / #define Xorriso_header_version_majoR 1 #define Xorriso_header_version_minoR 2 -#define Xorriso_header_version_micrO 6 +#define Xorriso_header_version_micrO 8 /* If needed: Something like ".pl01" to indicate a bug fix. Normally empty. @@ -796,6 +796,9 @@ "CopyrightFile:" up to 1 result from -pvd_info argv[0]= file name (Note: prefix is "CopyrightFile: ") + "Creation Time:" up to 1 result from -pvd_info + argv[0]= YYYYMMDDhhmmsscc + (Note: prefix is "Creation Time: ") "DVD obs 64 kB:" up to 1 result from -list_extras argv[0]= "yes" or "no" "Drive current:" up to 2 results from -dev, -indev, -toc, others @@ -805,6 +808,12 @@ argv[0]= vendor argv[1]= product argv[2]= revision + "Eff. Time :" up to 1 result from -pvd_info + argv[0]= YYYYMMDDhhmmsscc + (Note: prefix is "EffectiveTime: ") + "Expir. Time :" up to 1 result from -pvd_info + argv[0]= YYYYMMDDhhmmsscc + (Note: prefix is "Expir. Time : ") "Ext. filters :" up to 1 result from -list_extras argv[0]= "yes" or "no" , possibly more info (Note: prefix is "Ext. filters : ") @@ -874,6 +883,9 @@ argv[1]= data blocks (full count) argv[2]= data (with unit letter k,m,g) argv[3]= free (with unit letter k,m,g) + "Modif. Time :" up to 1 result from -pvd_info + argv[0]= YYYYMMDDhhmmsscc + (Note: prefix is "Modif. Time : ") "PVD address :" up to 1 result from -pvd_info argv[0]= block address with "s" appended "Preparer Id :" up to 1 result from -pvd_info @@ -1627,6 +1639,10 @@ /* Command -mount_opts option[:...] / int Xorriso_option_mount_opts(struct XorrisO xorriso, char mode, int flag); +/ Command -move / +int Xorriso_option_move(struct XorrisO xorriso, char origin, char dest, + int flag); + /* Command -msg_op / int Xorriso_option_msg_op(struct XorrisO xorriso, char what, char arg, int flag);
[-] [+]	Changed	xorriso-1.2.8.tar.bz2/xorriso/xorriso.info ^
@@ -15,7 +15,7 @@ File: xorriso.info, Node: Top, Next: Overview, Up: (dir) -GNU xorriso 1.2.6 +GNU xorriso 1.2.8 *************** xorriso - creates, loads, manipulates and writes ISO 9660 filesystem @@ -942,7 +942,8 @@ Renaming of files has similar collision handling, but directories can only be replaced, not merged. Note that if the target directory exists, then -mv inserts the source objects into this directory rather than -attempting to replace it. +attempting to replace it. Command -move, on the other hand, would +attempt to replace it. The commands in this section alter the ISO image and not the local filesystem. @@ -1318,6 +1319,13 @@ -rmdir iso_rr_path [] Delete empty directories. +-move iso_rr_path iso_rr_path + Rename the file given by the first (origin) iso_rr_path to the + second (destination) iso_rr_path. Deviate from rules of shell + command mv by not moving the origin file underneath an existing + destination directory. The origin file will rather replace such a + directory, if this is allowed by command -overwrite. + -mv iso_rr_path [] iso_rr_path Rename the given file objects in the ISO tree to the last parameter in the list. Use the same rules as with shell command mv. @@ -1449,6 +1457,12 @@ scdbackup timestamps: YYMMDD[.hhmm[ss]] where "A0" is year 2000, "B0" is 2010, etc. + ECMA-119 volume timestamps: + YYYYMMDDhhmmsscc + These are normally given as GMT. The suffix "LOC" causes local + timezone conversion. E.g. 2013010720574700, 2013010720574700LOC. + The last two digits cc (centiseconds) will be ignored, but must be + present in order to make the format recognizable. -alter_date_r type timestring iso_rr_path [] Like -alter_date but affecting all files below eventual @@ -2013,6 +2027,9 @@ the best guesses for lower and upper speed limit. "Write speed l" and "Write speed h" may appear only with CD and eventually override the list of other speed offers. + Only if the drive reports contradicting speed information there + will appear "Write speed 0", which tells the outcome of speed + selection by command -speed 0, if it deviates from "Write speed H". -close_damaged "as_needed"\|"force" Try to close the upcomming track and session if the drive reported @@ -2254,7 +2271,7 @@ search --fs-uuid --set YYYY-MM-DD-hh-mm-ss-cc E.g. 2010040711405800 is 7 Apr 2010 11:40:58 (+0 centiseconds). Timestrings for the other types may be given as with command - -alter_date. They are prone to timezone computations. The + -alter_date. Some of them are prone to timezone computations. The timestrings "default" or "overridden" cause default settings: "c" and "m" will show the current time of image creation. "x" and "f" will be marked as insignificant. "uuid" will be deactivated. @@ -3060,12 +3077,22 @@ -tell_media_space Print available space on the output medium and the free space after subtracting already foreseeable consumption by next -commit. + Note that the title of the prediction "After commit :" is + misleading. It is rather the space that may still be filled in + this session without making the next -commit fail from medium + overflow. + The free space after the next -commit might be smaller by several + MB. This depends on medium type, number of recorded sessions, and + drive habits. -pvd_info - Print various ID strings which can be found in loaded ISO images. - Some of them may be changed by commands like -volid or -publisher. - For these IDs -pvd_info reports what would be written with the - next -commit. + Print various ID strings and timestamps which can be found in + loaded ISO images. Some of the IDs may be changed by commands like + -volid or -publisher. For these IDs -pvd_info reports what would + be written with the next -commit. The timestamps get not + automatically propagated from loaded image to newly written image. + The ones for new images may be set by command -volume_date. See + there for the meaning of the particular timestamps. File: xorriso.info, Node: Navigate, Next: Verify, Prev: Inquiry, Up: Commands @@ -3594,8 +3621,13 @@ -commit at the end of a "mkisofs" option list. Verbosity settings -v (= "UPDATE") and -quiet (= "SORRY") persist. The output file persists until things happen like -commit, -rollback, -dev, or end - of `xorriso'. -pacifier gets set to "mkisofs" if files are added - to the image. + of `xorriso'. + Options which affect all file objects in the ISO image, like -r or + -dir-mode, will be applied only to files which are present in the + ISO image when the command -as ends. If you use several -as + mkisofs commands in the same run, then consider to put such + options into the last -as command. + -pacifier gets set to "mkisofs" if files are added to the image. -graft-points is equivalent to -pathspecs on. Note that pathspecs without "=" are interpreted differently than with `xorriso' command -add. Directories get merged with the root directory of @@ -4668,10 +4700,10 @@ -abort_on controls abort on error: Exception. (line 27) * -abstract_file sets abstract file name: SetWrite. (line 233) * -acl controls handling of ACLs: Loading. (line 143) -* -add inserts one or more paths: Insert. (line 45) -* -add_plainly inserts one or more paths: Insert. (line 64) -* -alter_date sets timestamps in ISO image: Manip. (line 147) -* -alter_date_r sets timestamps in ISO image: Manip. (line 167) +* -add inserts one or more paths: Insert. (line 46) +* -add_plainly inserts one or more paths: Insert. (line 65) +* -alter_date sets timestamps in ISO image: Manip. (line 154) +* -alter_date_r sets timestamps in ISO image: Manip. (line 180) * -append_partition adds arbitrary file after image end: Bootable. (line 234) * -application_id sets application id: SetWrite. (line 192) @@ -4692,15 +4724,15 @@ * -check_md5_r verifies file tree checksums: Verify. (line 170) * -check_media reads media block by block: Verify. (line 21) * -check_media_defaults sets -check_media options: Verify. (line 41) -* -chgrp sets group in ISO image: Manip. (line 50) -* -chgrp_r sets group in ISO image: Manip. (line 55) -* -chmod sets permissions in ISO image: Manip. (line 58) -* -chmod_r sets permissions in ISO image: Manip. (line 70) -* -chown sets ownership in ISO image: Manip. (line 42) -* -chown_r sets ownership in ISO image: Manip. (line 47) -* -clone copies ISO directory tree: Insert. (line 179) +* -chgrp sets group in ISO image: Manip. (line 57) +* -chgrp_r sets group in ISO image: Manip. (line 62) +* -chmod sets permissions in ISO image: Manip. (line 65) +* -chmod_r sets permissions in ISO image: Manip. (line 77) +* -chown sets ownership in ISO image: Manip. (line 49) +* -chown_r sets ownership in ISO image: Manip. (line 54) +* -clone copies ISO directory tree: Insert. (line 180) * -close controls media closing: SetWrite. (line 335) -* -close_damaged closes damaged track and session: Writing. (line 155) +* -close_damaged closes damaged track and session: Writing. (line 158) * -close_filter_list bans filter registration: Filter. (line 52) * -commit writes pending ISO image: Writing. (line 29) * -commit_eject writes and ejects: Writing. (line 56) @@ -4709,19 +4741,19 @@ * -compare_r reports ISO/disk differences: Navigate. (line 159) * -compliance controls standard compliance: SetWrite. (line 58) * -copyright_file sets copyright file name: SetWrite. (line 227) -* -cp_clone copies ISO directory tree: Insert. (line 191) +* -cp_clone copies ISO directory tree: Insert. (line 192) * -cp_rx copies file trees to disk: Restore. (line 111) * -cpax copies files to disk: Restore. (line 107) -* -cpr inserts like with cp -r: Insert. (line 155) +* -cpr inserts like with cp -r: Insert. (line 156) * -cpx copies files to disk: Restore. (line 95) -* -cut_out inserts piece of data file: Insert. (line 129) +* -cut_out inserts piece of data file: Insert. (line 130) * -data_cache_size adjusts read cache size: Loading. (line 269) * -dev acquires one drive for input and output: AqDrive. (line 12) * -device_links gets list of drives: Inquiry. (line 18) * -devices gets list of drives: Inquiry. (line 7) * -dialog enables dialog mode: DialogCtl. (line 7) * -disk_dev_ino fast incremental backup: Loading. (line 190) -* -disk_pattern controls pattern expansion: Insert. (line 34) +* -disk_pattern controls pattern expansion: Insert. (line 35) * -displacement compensate altered image start address: Loading. (line 36) * -drive_class controls drive accessability: Loading. (line 54) @@ -4758,7 +4790,7 @@ * -hardlinks controls handling of hard links: Loading. (line 110) * -help prints help text: Scripting. (line 20) * -hfsplus enables production of HFS+ partition: SetWrite. (line 14) -* -hide excludes file names from directory trees: Manip. (line 171) +* -hide excludes file names from directory trees: Manip. (line 184) * -history brings text into readline history: Scripting. (line 44) * -in_charset sets input character set: Loading. (line 92) * -indev acquires a drive for input: AqDrive. (line 24) @@ -4772,9 +4804,9 @@ * -list_extras lists compile time extra features: Scripting. (line 26) * -list_formats lists available formats: Writing. (line 129) -* -list_profiles lists supported media: Writing. (line 169) +* -list_profiles lists supported media: Writing. (line 172) * -list_speeds lists available write speeds: Writing. (line 141) -* -lns creates ISO symbolic link: Insert. (line 174) +* -lns creates ISO symbolic link: Insert. (line 175) * -load addresses a particular session as input: Loading. (line 11) * -local_charset sets terminal character set: Charset. (line 47) * -logfile logs output channels to file: Frontend. (line 20) @@ -4786,17 +4818,18 @@ * -lsl lists files in ISO image: Navigate. (line 38) * -lslx lists files on disk: Navigate. (line 62) * -lsx lists files on disk: Navigate. (line 51) -* -map inserts path: Insert. (line 88) -* -map_l inserts paths from disk file: Insert. (line 97) -* -map_single inserts path: Insert. (line 93) +* -map inserts path: Insert. (line 89) +* -map_l inserts paths from disk file: Insert. (line 98) +* -map_single inserts path: Insert. (line 94) * -mark sets synchronizing message: Frontend. (line 25) * -md5 controls handling of MD5 sums: Loading. (line 156) -* -mkdir creates ISO directory: Insert. (line 169) +* -mkdir creates ISO directory: Insert. (line 170) * -mount issues mount command for ISO session: Restore. (line 129) * -mount_cmd composes mount command line: Inquiry. (line 52) * -mount_cmd controls mount command: Inquiry. (line 68) * -msg_op perform operations on program messages: Frontend. (line 30) -* -mv renames file in ISO image: Manip. (line 35) +* -mv renames files in ISO image: Manip. (line 42) +* -mv renames single file in ISO image: Manip. (line 35) * -no_rc disables startup files: Scripting. (line 7) * -not_leaf sets exclusion pattern: SetInsert. (line 62) * -not_list sets exclusions from disk file: SetInsert. (line 67) @@ -4807,11 +4840,11 @@ * -out_charset sets output character set: SetWrite. (line 258) * -outdev acquires a drive for output: AqDrive. (line 31) * -overwrite enables overwriting in ISO: SetInsert. (line 127) -* -pacifier controls pacifier text form: Emulation. (line 158) +* -pacifier controls pacifier text form: Emulation. (line 163) * -padding sets amount or mode of image padding: SetWrite. (line 349) * -page set terminal geometry: DialogCtl. (line 19) * -paste_in copies file into disk file: Restore. (line 124) -* -path_list inserts paths from disk file: Insert. (line 78) +* -path_list inserts paths from disk file: Insert. (line 79) * -pathspecs sets meaning of = with -add: SetInsert. (line 118) * -pkt_output consolidates text output: Frontend. (line 7) * -preparer_id sets preparer id: SetWrite. (line 246) @@ -4823,13 +4856,13 @@ * -prog_help prints help text: Frontend. (line 154) * -prompt prompts for enter key: Scripting. (line 110) * -publisher sets publisher id: SetWrite. (line 186) -* -pvd_info shows image id strings: Inquiry. (line 104) +* -pvd_info shows image id strings: Inquiry. (line 111) * -pwd tells working directory in ISO: Navigate. (line 20) * -pwdx tells working directory on disk: Navigate. (line 23) * -quoted_not_list sets exclusions: SetInsert. (line 72) -* -quoted_path_list inserts paths from disk file: Insert. (line 83) +* -quoted_path_list inserts paths from disk file: Insert. (line 84) * -read_mkisofsrc searches and reads .mkisofsrc file: Emulation. - (line 146) + (line 151) * -reassure enables confirmation question: DialogCtl. (line 32) * -report_about controls verbosity: Exception. (line 55) * -return_with controls exit value: Exception. (line 39) @@ -4843,18 +4876,18 @@ * -rom_toc_scan searches for sessions: Loading. (line 211) * -rr_reloc_dir sets name of relocation directory: SetWrite. (line 141) -* -scdbackup_tag enables scdbackup checksum tag: Emulation. (line 168) +* -scdbackup_tag enables scdbackup checksum tag: Emulation. (line 173) * -scsi_log reports SCSI commands: Scripting. (line 147) * -session_log logs written sessions: Scripting. (line 138) * -session_string composes session info line: Inquiry. (line 78) * -set_filter applies filter to file: Filter. (line 60) * -set_filter_r applies filter to file tree: Filter. (line 89) -* -setfacl sets ACL in ISO image: Manip. (line 73) -* -setfacl_list sets ACL in ISO image: Manip. (line 101) -* -setfacl_r sets ACL in ISO image: Manip. (line 98) -* -setfattr sets xattr in ISO image: Manip. (line 111) -* -setfattr_list sets xattr in ISO image: Manip. (line 127) -* -setfattr_r sets xattr in ISO image: Manip. (line 124) +* -setfacl sets ACL in ISO image: Manip. (line 80) +* -setfacl_list sets ACL in ISO image: Manip. (line 108) +* -setfacl_r sets ACL in ISO image: Manip. (line 105) +* -setfattr sets xattr in ISO image: Manip. (line 118) +* -setfattr_list sets xattr in ISO image: Manip. (line 134) +* -setfattr_r sets xattr in ISO image: Manip. (line 131) * -show_stream shows data source and filters: Navigate. (line 169) * -show_stream_r shows data source and filters: Navigate. (line 183) * -signal_handling controls handling of system signals: Exception. @@ -4872,9 +4905,9 @@ * -toc shows list of sessions: Inquiry. (line 28) * -toc_of shows list of sessions: Inquiry. (line 43) * -uid sets global ownership: SetWrite. (line 264) -* -update inserts path if different: Insert. (line 102) -* -update_l inserts paths if different: Insert. (line 124) -* -update_r inserts paths if different: Insert. (line 113) +* -update inserts path if different: Insert. (line 103) +* -update_l inserts paths if different: Insert. (line 125) +* -update_r inserts paths if different: Insert. (line 114) * -use_readline enables readline for dialog: DialogCtl. (line 28) * -version prints help text: Scripting. (line 23) * -volid sets volume id: SetWrite. (line 160) @@ -4897,9 +4930,9 @@ * ACL, _definition: Extras. (line 49) * ACL, control handling, -acl: Loading. (line 143) -* ACL, set in ISO image, -setfacl: Manip. (line 73) -* ACL, set in ISO image, -setfacl_list: Manip. (line 101) -* ACL, set in ISO image, -setfacl_r: Manip. (line 98) +* ACL, set in ISO image, -setfacl: Manip. (line 80) +* ACL, set in ISO image, -setfacl_list: Manip. (line 108) +* ACL, set in ISO image, -setfacl_r: Manip. (line 105) * ACL, show in ISO image, -getfacl: Navigate. (line 70) * ACL, show in ISO image, -getfacl_r: Navigate. (line 77) * APM block size: Bootable. (line 225) @@ -4910,12 +4943,12 @@ * Backslash Interpretation, _definition: Processing. (line 52) * Backup, enable fast incremental, -disk_dev_ino: Loading. (line 190) * Backup, enable features, -for_backup: Loading. (line 185) -* Backup, scdbackup checksum tag, -scdbackup: Emulation. (line 168) +* Backup, scdbackup checksum tag, -scdbackup: Emulation. (line 173) * Blank media, _definition: Media. (line 29) * Blind growing, _definition: Methods. (line 40) * Bootability, control, -boot_image: Bootable. (line 26) * Bugs, reporting: Bugreport. (line 6) -* cdrecord, Emulation: Emulation. (line 111) +* cdrecord, Emulation: Emulation. (line 116) * Character Set, _definition: Charset. (line 6) * Character Set, for input, -in_charset: Loading. (line 92) * Character Set, for input/output, -charset: Charset. (line 43) @@ -4929,7 +4962,7 @@ * Create, new ISO image, _definition: Methods. (line 6) * Cylinder alignment, _definition: Bootable. (line 188) * Cylinder size, _definition: Bootable. (line 177) -* Damaged track and session, close, -close_damaged: Writing. (line 155) +* Damaged track and session, close, -close_damaged: Writing. (line 158) * Delete, from ISO image, -rm: Manip. (line 21) * Delete, from ISO image, -rm_r: Manip. (line 28) * Delete, ISO directory, -rmdir: Manip. (line 32) @@ -4938,9 +4971,9 @@ * Dialog, enable dialog mode, -dialog: DialogCtl. (line 7) * Dialog, line editing, -use_readline: DialogCtl. (line 28) * Dialog, terminal geometry, -page: DialogCtl. (line 19) -* Directories, copy, -cp_clone: Insert. (line 191) -* Directory, copy, -clone: Insert. (line 179) -* Directory, create, -mkdir: Insert. (line 169) +* Directories, copy, -cp_clone: Insert. (line 192) +* Directory, copy, -clone: Insert. (line 180) +* Directory, create, -mkdir: Insert. (line 170) * Directory, delete, -rmdir: Manip. (line 32) * disk_path, _definition: Insert. (line 6) * Drive, _definition: Drives. (line 6) @@ -4953,7 +4986,7 @@ * Drive, for output, -outdev: AqDrive. (line 31) * Drive, get drive list, -device_links: Inquiry. (line 18) * Drive, get drive list, -devices: Inquiry. (line 7) -* Drive, list supported media, -list_profiles: Writing. (line 169) +* Drive, list supported media, -list_profiles: Writing. (line 172) * Drive, reduce activity, -calm_drive: Loading. (line 240) * Drive, report SCSI commands, -scsi_log: Scripting. (line 147) * Drive, write and eject, -commit_eject: Writing. (line 56) @@ -4962,10 +4995,10 @@ * EFI system partition, _definition: Bootable. (line 157) * El Torito, _definition: Extras. (line 19) * Emulation, -as: Emulation. (line 13) -* Emulation, .mkisofsrc, -read_mkisofsrc: Emulation. (line 146) -* Emulation, cdrecord, -as: Emulation. (line 111) +* Emulation, .mkisofsrc, -read_mkisofsrc: Emulation. (line 151) +* Emulation, cdrecord, -as: Emulation. (line 116) * Emulation, mkisofs, -as: Emulation. (line 16) -* Emulation, pacifier form, -pacifier: Emulation. (line 158) +* Emulation, pacifier form, -pacifier: Emulation. (line 163) * Examples: Examples. (line 6) * extattr, _definition: Extras. (line 65) * Filter, _definition: Filter. (line 6) @@ -4981,13 +5014,13 @@ (line 116) * GPT, _definition: Extras. (line 38) * Group, global in ISO image, -gid: SetWrite. (line 268) -* Group, in ISO image, -chgrp: Manip. (line 50) -* Group, in ISO image, -chgrp_r: Manip. (line 55) +* Group, in ISO image, -chgrp: Manip. (line 57) +* Group, in ISO image, -chgrp_r: Manip. (line 62) * Growing, _definition: Methods. (line 19) * Hard links, control handling, -hardlinks: Loading. (line 110) * HFS+ allocation block size: Bootable. (line 222) * HFS+ serial number: Bootable. (line 219) -* hidden, set in ISO image, -hide: Manip. (line 171) +* hidden, set in ISO image, -hide: Manip. (line 184) * Image reading, cache size, -data_cache_size: Loading. (line 269) * Image, _definition: Model. (line 9) * Image, demand volume ID, -assert_volid: Loading. (line 84) @@ -5003,29 +5036,29 @@ * Image, set volume id, -volid: SetWrite. (line 160) * Image, set volume set id, -volset_id: SetWrite. (line 181) * Image, set volume timestamp, -volume_date: SetWrite. (line 208) -* Image, show id strings, -pvd_info: Inquiry. (line 104) +* Image, show id strings, -pvd_info: Inquiry. (line 111) * Insert, enable overwriting, -overwrite: SetInsert. (line 127) * Insert, file exclusion absolute, -not_paths: SetInsert. (line 55) * Insert, file exclusion from file, -not_list: SetInsert. (line 67) * Insert, file exclusion pattern, -not_leaf: SetInsert. (line 62) * Insert, file exclusion, -not_mgt: SetInsert. (line 23) * Insert, file exclusion, -quoted_not_list: SetInsert. (line 72) -* Insert, if different, -update: Insert. (line 102) -* Insert, if different, -update_l: Insert. (line 124) -* Insert, if different, -update_r: Insert. (line 113) +* Insert, if different, -update: Insert. (line 103) +* Insert, if different, -update_l: Insert. (line 125) +* Insert, if different, -update_r: Insert. (line 114) * Insert, large file splitting, -split_size: SetInsert. (line 140) * Insert, limit data file size, -file_size_limit: SetInsert. (line 7) * Insert, links or mount points, -follow: SetInsert. (line 76) * Insert, meaning of = with -add, -pathspecs: SetInsert. (line 118) -* Insert, non-dashed arguments, -add_plainly: Insert. (line 64) -* Insert, path, -map: Insert. (line 88) -* Insert, path, -map_single: Insert. (line 93) -* Insert, paths from disk file, -map_l: Insert. (line 97) -* Insert, paths from disk file, -path_list: Insert. (line 78) -* Insert, paths from disk file, -quoted_path_list: Insert. (line 83) -* Insert, paths, -cpr: Insert. (line 155) -* Insert, pathspecs, -add: Insert. (line 45) -* Insert, piece of data file, -cut_out: Insert. (line 129) +* Insert, non-dashed arguments, -add_plainly: Insert. (line 65) +* Insert, path, -map: Insert. (line 89) +* Insert, path, -map_single: Insert. (line 94) +* Insert, paths from disk file, -map_l: Insert. (line 98) +* Insert, paths from disk file, -path_list: Insert. (line 79) +* Insert, paths from disk file, -quoted_path_list: Insert. (line 84) +* Insert, paths, -cpr: Insert. (line 156) +* Insert, pathspecs, -add: Insert. (line 46) +* Insert, piece of data file, -cut_out: Insert. (line 130) * ISO 9660, _definition: Model. (line 6) * iso_rr_path, _definition: Insert. (line 7) * Jigdo Template Extraction, -jigdo: Jigdo. (line 33) @@ -5062,16 +5095,16 @@ * Next writeable address, -grow_blindly: AqDrive. (line 46) * Overwriteable media, _definition: Media. (line 14) * Ownership, global in ISO image, -uid: SetWrite. (line 264) -* Ownership, in ISO image, -chown: Manip. (line 42) -* Ownership, in ISO image, -chown_r: Manip. (line 47) +* Ownership, in ISO image, -chown: Manip. (line 49) +* Ownership, in ISO image, -chown_r: Manip. (line 54) * Partition offset, _definition: Bootable. (line 167) * Partition table, _definition: Bootable. (line 128) * Pathspec, _definition: SetInsert. (line 120) * Pattern expansion, _definition: Processing. (line 24) -* Pattern expansion, for disk paths, -disk_pattern: Insert. (line 34) +* Pattern expansion, for disk paths, -disk_pattern: Insert. (line 35) * Pattern expansion, for ISO paths, -iso_rr_pattern: Manip. (line 10) -* Permissions, in ISO image, -chmod: Manip. (line 58) -* Permissions, in ISO image, -chmod_r: Manip. (line 70) +* Permissions, in ISO image, -chmod: Manip. (line 65) +* Permissions, in ISO image, -chmod_r: Manip. (line 77) * PReP partition, _definition: Bootable. (line 152) * Problems, reporting: Bugreport. (line 6) * Process, consolidate text output, -pkt_output: Frontend. (line 7) @@ -5107,7 +5140,8 @@ * Quoted input, _definition: Processing. (line 46) * Recovery, retrieve blocks, -check_media: Verify. (line 21) * Relocation directory, set name, -rr_reloc_dir: SetWrite. (line 141) -* Rename, in ISO image, -mv: Manip. (line 35) +* Rename, in ISO image, -move: Manip. (line 35) +* Rename, in ISO image, -mv: Manip. (line 42) * Restore, copy file into disk file, -paste_in: Restore. (line 124) * Restore, copy file piece to disk, -extract_cut: Restore. (line 84) * Restore, copy file to disk, -extract_single: Restore. (line 75) @@ -5129,12 +5163,12 @@ * Sorting order, for -x, -list_arg_sorting: ArgSort. (line 27) * SUN Disk Label, production: Bootable. (line 210) * SUN SPARC boot images, activation: Bootable. (line 255) -* Symbolic link, create, -lns: Insert. (line 174) +* Symbolic link, create, -lns: Insert. (line 175) * System area, _definition: Bootable. (line 121) * Table-of-content, search sessions, -rom_toc_scan: Loading. (line 211) * Table-of-content, show, -toc: Inquiry. (line 28) -* Timestamps, set in ISO image, -alter_date: Manip. (line 147) -* Timestamps, set in ISO image, -alter_date_r: Manip. (line 167) +* Timestamps, set in ISO image, -alter_date: Manip. (line 154) +* Timestamps, set in ISO image, -alter_date_r: Manip. (line 180) * Tree, disk, traverse, -findx: Navigate. (line 106) * Tree, ISO, traverse and alter, -find: CmdFind. (line 7) * Verify, check blocks, -check_media: Verify. (line 21) @@ -5165,9 +5199,9 @@ * Write, TAO or SAO/DAO, -write_type: SetWrite. (line 341) * xattr, _definition: Extras. (line 65) * xattr, control handling, -xattr: Loading. (line 151) -* xattr, set in ISO image, -setfattr: Manip. (line 111) -* xattr, set in ISO image, -setfattr_list: Manip. (line 127) -* xattr, set in ISO image, -setfattr_r: Manip. (line 124) +* xattr, set in ISO image, -setfattr: Manip. (line 118) +* xattr, set in ISO image, -setfattr_list: Manip. (line 134) +* xattr, set in ISO image, -setfattr_r: Manip. (line 131) * xattr, show in ISO image, -getfattr: Navigate. (line 81) * xattr, show in ISO image, -getfattr_r: Navigate. (line 85) @@ -5188,46 +5222,46 @@ Node: AqDrive27650 Node: Loading30695 Node: Insert46151 -Node: SetInsert56287 -Node: Manip64864 -Node: CmdFind73688 -Node: Filter88393 -Node: Writing92949 -Node: SetWrite102128 -Node: Bootable120871 -Node: Jigdo136265 -Node: Charset140512 -Node: Exception143274 -Node: DialogCtl149394 -Node: Inquiry151992 -Node: Navigate157452 -Node: Verify165750 -Node: Restore174782 -Node: Emulation181869 -Node: Scripting191681 -Node: Frontend198842 -Node: Examples206917 -Node: ExDevices208095 -Node: ExCreate208754 -Node: ExDialog210039 -Node: ExGrowing211304 -Node: ExModifying212109 -Node: ExBootable212613 -Node: ExCharset213165 -Node: ExPseudo213986 -Node: ExCdrecord214884 -Node: ExMkisofs215201 -Node: ExGrowisofs216541 -Node: ExException217676 -Node: ExTime218130 -Node: ExIncBackup218589 -Node: ExRestore222581 -Node: ExRecovery223541 -Node: Files224111 -Node: Seealso225410 -Node: Bugreport226133 -Node: Legal226714 -Node: CommandIdx227725 -Node: ConceptIdx243954 +Node: SetInsert56350 +Node: Manip64927 +Node: CmdFind74436 +Node: Filter89141 +Node: Writing93697 +Node: SetWrite103085 +Node: Bootable121836 +Node: Jigdo137230 +Node: Charset141477 +Node: Exception144239 +Node: DialogCtl150359 +Node: Inquiry152957 +Node: Navigate159035 +Node: Verify167333 +Node: Restore176365 +Node: Emulation183452 +Node: Scripting193576 +Node: Frontend200737 +Node: Examples208812 +Node: ExDevices209990 +Node: ExCreate210649 +Node: ExDialog211934 +Node: ExGrowing213199 +Node: ExModifying214004 +Node: ExBootable214508 +Node: ExCharset215060 +Node: ExPseudo215881 +Node: ExCdrecord216779 +Node: ExMkisofs217096 +Node: ExGrowisofs218436 +Node: ExException219571 +Node: ExTime220025 +Node: ExIncBackup220484 +Node: ExRestore224476 +Node: ExRecovery225436 +Node: Files226006 +Node: Seealso227305 +Node: Bugreport228028 +Node: Legal228609 +Node: CommandIdx229620 +Node: ConceptIdx245922 End Tag Table
[-] [+]	Changed	xorriso-1.2.8.tar.bz2/xorriso/xorriso.texi ^
@@ -1,7 +1,7 @@ \input texinfo @c --texinfo-- @c %start of header @setfilename xorriso.info -@settitle GNU xorriso 1.2.6 +@settitle GNU xorriso 1.2.8 @c %end of header @c @c man-ignore-lines begin @@ -50,7 +50,7 @@ @c man .\" First parameter, NAME, should be all caps @c man .\" Second parameter, SECTION, should be 1-8, maybe w/ subsection @c man .\" other parameters are allowed: see man(7), man(1) -@c man .TH XORRISO 1 "Version 1.2.6, Jan 08, 2013" +@c man .TH XORRISO 1 "Version 1.2.8, Mar 18, 2013" @c man .\" Please adjust this date whenever revising the manpage. @c man .\" @c man .\" Some roff macros, for reference: @@ -77,7 +77,7 @@ @end copying @c man-ignore-lines end @titlepage -@title Manual of GNU xorriso 1.2.6 +@title Manual of GNU xorriso 1.2.8 @author Thomas Schmitt @page @vskip 0pt plus 1filll @@ -86,7 +86,7 @@ @contents @ifnottex @node Top -@top GNU xorriso 1.2.6 +@top GNU xorriso 1.2.8 @c man-ignore-lines 1 @c man .SH NAME @@ -1271,7 +1271,7 @@ Renaming of files has similar collision handling, but directories can only be replaced, not merged. Note that if the target directory exists, then -mv inserts the source objects into this directory rather than attempting -to replace it. +to replace it. Command -move, on the other hand, would attempt to replace it. @c man .PP @sp 1 The commands in this section alter the ISO image and not the local filesystem. @@ -1773,8 +1773,17 @@ @cindex Directory, delete, -rmdir Delete empty directories. @c man .TP +@item -move iso_rr_path iso_rr_path +@kindex -mv renames single file in ISO image +@cindex Rename, in ISO image, -move +Rename the file given by the first (origin) iso_rr_path to the second +(destination) iso_rr_path. +Deviate from rules of shell command mv by not moving the origin file underneath +an existing destination directory. The origin file will rather replace such a +directory, if this is allowed by command -overwrite. +@c man .TP @item -mv iso_rr_path [**] iso_rr_path -@kindex -mv renames file in ISO image +@kindex -mv renames files in ISO image @cindex Rename, in ISO image, -mv Rename the given file objects in the ISO tree to the last parameter in the list. Use the same rules as with shell command mv. @@ -1962,6 +1971,15 @@ YYMMDD[.hhmm[ss]] @ where "A0" is year 2000, "B0" is 2010, etc. +@* +ECMA-119 volume timestamps: +@* + YYYYMMDDhhmmsscc +@* +These are normally given as GMT. The suffix "LOC" causes local timezone +conversion. E.g. 2013010720574700, 2013010720574700LOC. +The last two digits cc (centiseconds) will be ignored, but must be present +in order to make the format recognizable. @c man .TP @item -alter_date_r type timestring iso_rr_path [**] @kindex -alter_date_r sets timestamps in ISO image @@ -2703,6 +2721,10 @@ are the best guesses for lower and upper speed limit. "Write speed l" and "Write speed h" may appear only with CD and eventually override the list of other speed offers. +@ +Only if the drive reports contradicting speed information there will appear +"Write speed 0", which tells the outcome of speed selection by command +-speed 0, if it deviates from "Write speed H". @c man .TP @item -close_damaged "as_needed"\|"force" @kindex -close_damaged closes damaged track and session @@ -3011,7 +3033,7 @@ E.g. 2010040711405800 is 7 Apr 2010 11:40:58 (+0 centiseconds). @* Timestrings for the other types may be given as with command -alter_date. -They are prone to timezone computations. The timestrings "default" or +Some of them are prone to timezone computations. The timestrings "default" or "overridden" cause default settings: "c" and "m" will show the current time of image creation. "x" and "f" will be marked as insignificant. "uuid" will be deactivated. @@ -4091,13 +4113,23 @@ @cindex Write, free space, -tell_media_space Print available space on the output medium and the free space after subtracting already foreseeable consumption by next -commit. +@* +Note that the title of the prediction "After commit :" is misleading. +It is rather the space that may still be filled in this session without +making the next -commit fail from medium overflow. +@* +The free space after the next -commit might be smaller by several MB. +This depends on medium type, number of recorded sessions, and drive habits. @c man .TP @item -pvd_info @kindex -pvd_info shows image id strings @cindex Image, show id strings, -pvd_info -Print various ID strings which can be found in loaded ISO images. Some of -them may be changed by commands like -volid or -publisher. For these -IDs -pvd_info reports what would be written with the next -commit. +Print various ID strings and timestamps which can be found in loaded ISO +images. Some of the IDs may be changed by commands like -volid or -publisher. +For these IDs -pvd_info reports what would be written with the next -commit. +The timestamps get not automatically propagated from loaded image to newly +written image. The ones for new images may be set by command -volume_date. +See there for the meaning of the particular timestamps. @end table @c man .TP @c man .B Navigation in ISO image and disk filesystem: @@ -4784,6 +4816,12 @@ -quiet (= "SORRY") persist. The output file persists until things happen like -commit, -rollback, -dev, or end of @command{xorriso}. +@* +Options which affect all file objects in the ISO image, like -r or -dir-mode, +will be applied only to files which are present in the ISO image when +the command -as ends. If you use several -as mkisofs commands in the same +run, then consider to put such options into the last -as command. +@* -pacifier gets set to "mkisofs" if files are added to the image. @* -graft-points is equivalent to -pathspecs on. Note that pathspecs without "="
[-] [+]	Changed	xorriso-1.2.8.tar.bz2/xorriso/xorriso_eng.html ^
@@ -85,6 +85,8 @@ <DD>allow zisofs, gzip compression, and Jigdo file production.</DD> <DT>libbz2 and libbz2-devel</DT> <DD>allow bzip2 compression of Jigdo template files.</DD> +<DT>Tcl, Tk >= 8.4, Tcl/Tk package BWidget</DT> +<DD>enable the operation of GUI frontend script <KBD>xorriso-tcltk</KBD>.</DD> </DL> </P> @@ -158,6 +160,45 @@ </P> <P> +<H2>GUI Frontend:</H2> +xorriso itself is entirely controlled by text commands. In dialog mode, +xorriso reads them as text lines from standard input. +Together with some helpful xorriso commands, it is quite easy for frontend +programs to operate a separate xorriso process. +<BR> +Other than the usual batch programs, xorriso will take care of maintaining +the emerging ISO image model. Its state can be inquired by the frontend +at any time. The frontend is supposed to care for the display of the inquired +xorriso state and to send xorriso commands to manipulate the ISO image model. +<BR> +As a proof of concept, there is a Tcl/Tk script which can +be launched by shell command <KBD>xorriso-tcltk</KBD> +<BR> +Click on this image to see a screenshot: +<BR> +<A HREF="xorriso-tcltk-screen.gif"> +<IMG SRC="xorriso-tcltk-thumb.jpg" BORDER=1 + ALT="To screenshot of frontend script xorriso-tcltk"></A> +<BR> +See also file +<A HREF="http://svn.libburnia-project.org/libisoburn/trunk/frontend/README-tcltk"> +frontend/README-tcltk. +</A> +<BR> +The script <KBD>xorriso-tcltk</KBD> +is part of the tarball and gets installed by <KBD>make install</KBD>. If a +xorriso distro package does not install it, you may get it directly from +<A HREF="http://libburnia-project.org/export/head/libisoburn/trunk/frontend/xorriso-tcltk"> +libburnia SVN: frontend/xorriso-tcltk +</A> +You will probably have to give it x-permission after download. Some browsers +insist in adding ".htm" to the file name. +<BR> +Further you need xorriso >= 1.2.8, Tcl, Tk >= 8.4, +Tcl/Tk package "BWidget". +</P> + +<P> <H2>Command Examples:</H2> <DL> @@ -461,21 +502,21 @@ <P> <DL> <DT><H3>Download as source code (see README):</H3></DT> -<DD><A HREF="xorriso-1.2.6.tar.gz">xorriso-1.2.6.tar.gz</A> -(2315 KB). +<DD><A HREF="xorriso-1.2.8.tar.gz">xorriso-1.2.8.tar.gz</A> +(2325 KB). </DD> -<DD>(Released 08 Jan 2013)</DD> -<DD><A HREF="xorriso-1.2.6.tar.gz.sig">xorriso-1.2.6.tar.gz.sig</A></DD> +<DD>(Released 18 Mar 2013)</DD> +<DD><A HREF="xorriso-1.2.8.tar.gz.sig">xorriso-1.2.8.tar.gz.sig</A></DD> <DD> (detached GPG signature for verification by -<KBD>gpg --verify xorriso-1.2.6.tar.gz.sig xorriso-1.2.6.tar.gz</KBD> +<KBD>gpg --verify xorriso-1.2.8.tar.gz.sig xorriso-1.2.8.tar.gz</KBD> <BR> after <KBD>gpg --keyserver keys.gnupg.net --recv-keys ABC0A854</KBD>). </DD> <DD> Also on <A HREF="http://www.gnu.org/prep/ftp.html"> mirrors of ftp://ftp.gnu.org/gnu/ </A> -as xorriso/xorriso-1.2.6.tar.gz +as xorriso/xorriso-1.2.8.tar.gz </DD> </DL> </DD> @@ -512,11 +553,23 @@ <HR> <P> -Bug fixes towards previous stable version xorriso-1.2.4: +Bug fixes towards previous stable version xorriso-1.2.6: <UL> -<LI>SIGSEGV by uninitialized local variable with -check_media patch_lba0="on". Regression by version 1.0.6</LI> -<LI>-partition_offset 16 kept -isohybrid-gpt-basdat from writing MBR entries 0xef</LI> -<LI>-rollback did not work if indev and outdev were empty</LI> +<LI> +-tell_media_space altered the pointers to MD5 +of data files which stem from a previous session. This produced +false mismatches with -check_md5_r. +</LI> +<LI> +CD tracks were reported with the sizes of the tracks in the first session. +</LI> +<LI> +-check_media use=outdev sector_map= stored TOC of input drive +</LI> +<LI> +-hide hfsplus and -as mkisofs -hide-hfsplus had no effect. +</LI> +<LI>./configure did not abort if libburn.h or libisofs.h were missing</LI> <!-- <LI>- none -</LI> --> @@ -535,19 +588,10 @@ --> <P> -Enhancements towards previous stable version xorriso-1.2.4: +Enhancements towards previous stable version xorriso-1.2.6: <UL> -<LI>New -boot_image partition_cyl_align mode "all"</LI> -<LI>New -blank mode prefix "force:"</LI> -<LI>New -osirrox settings "blocked" and "unblock"</LI> -<LI>New command -lns for creating symbolic links</LI> -<LI>New command -toc_of</LI> -<LI>New command -msg_op</LI> -<LI>New command -launch_frontend</LI> -<LI> -Proof-of-concept of a GUI frontend program: xorriso-tcltk written in Tcl/Tk. -<A HREF="xorriso-tcltk-screen.gif">(See screenshot)</A> -</LI> +<LI>New command -move</LI> +<LI>New -as mkisofs options -eltorito-id , -eltorito-selcrit</LI> <!-- <LI>- none -</LI> --> @@ -570,16 +614,16 @@ <A HREF="http://www.fsf.org/"> FSF </A> match completely. </DT> <DD> </DD> -<DT>libburn-1.2.6</DT> +<DT>libburn-1.2.8</DT> <DD>reads and writes data from and to CD, DVD, BD.</DD> <DD>(founded by Derek Foreman and Ben Jansens, developed and maintained since August 2006 by Thomas Schmitt from team of libburnia-project.org)</DD> -<DT>libisofs-1.2.6</DT> +<DT>libisofs-1.2.8</DT> <DD>operates on ISO 9660 filesystem images.</DD> <DD>(By Vreixo Formoso, Mario Danic and Thomas Schmitt from team of libburnia-project.org. HFS+ code by Vladimir Serbinenko.)</DD> -<DT>libisoburn-1.2.6</DT> +<DT>libisoburn-1.2.8</DT> <DD>coordinates libburn and libisofs, emulates multi-session where needed, and hosts the original source code of program xorriso.</DD> <DD>It provides the complete functionality of xorriso via @@ -600,18 +644,20 @@ <P> <DL> -<DT><H3>Development snapshot, version 1.2.7 :</H3></DT> -<DD>Bug fixes towards xorriso-1.2.6: +<DT><H3>Development snapshot, version 1.2.9 :</H3></DT> +<DD>Bug fixes towards xorriso-1.2.8: <UL> <LI>- none yet -</LI> <!-- +<LI>- none yet -</LI> --> </UL> </DD> -<DD>Enhancements towards stable version 1.2.6: +<DD>Enhancements towards stable version 1.2.8: <UL> <LI>- none yet -</LI> <!-- +<LI>- none yet -</LI> --> </UL> @@ -619,13 +665,13 @@ <DD> </DD> -<DD><A HREF="README_xorriso_devel">README 1.2.7</A> -<DD><A HREF="xorriso_help_devel">xorriso-1.2.7 -help</A></DD> -<DD><A HREF="xorrisofs_help_devel">xorriso-1.2.7 -as mkisofs -help</A></DD> -<DD><A HREF="xorrecord_help_devel">xorriso-1.2.7 -as cdrecord -help</A></DD> -<DD><A HREF="man_1_xorriso_devel.html">man xorriso (as of 1.2.7)</A></DD> -<DD><A HREF="man_1_xorrisofs_devel.html">man xorrisofs (as of 1.2.7)</A></DD> -<DD><A HREF="man_1_xorrecord_devel.html">man xorrecord (as of 1.2.7)</A></DD> +<DD><A HREF="README_xorriso_devel">README 1.2.9</A> +<DD><A HREF="xorriso_help_devel">xorriso-1.2.9 -help</A></DD> +<DD><A HREF="xorrisofs_help_devel">xorriso-1.2.9 -as mkisofs -help</A></DD> +<DD><A HREF="xorrecord_help_devel">xorriso-1.2.9 -as cdrecord -help</A></DD> +<DD><A HREF="man_1_xorriso_devel.html">man xorriso (as of 1.2.9)</A></DD> +<DD><A HREF="man_1_xorrisofs_devel.html">man xorrisofs (as of 1.2.9)</A></DD> +<DD><A HREF="man_1_xorrecord_devel.html">man xorrecord (as of 1.2.9)</A></DD> <DD> </DD> <DT>If you want to distribute development versions of xorriso, then use this tarball which produces static linking between xorriso and the @@ -635,8 +681,8 @@ installation see README) </DD> <DD> -<A HREF="xorriso-1.2.7.tar.gz">xorriso-1.2.7.tar.gz</A> -(2315 KB). +<A HREF="xorriso-1.2.9.tar.gz">xorriso-1.2.9.tar.gz</A> +(2325 KB). </DD> <DT>A dynamically linked development version of xorriso can be obtained from repositories of @@ -711,12 +757,6 @@ <A HREF="http://www.webframe.org">www.webframe.org</A><BR> <A HREF="http://sourceforge.net">sourceforge.net</A><BR> -<!-- -Enjoying a FreeBSD shell account with the opportunity to -build, install and test xorriso at<BR> -<A HREF="http://www.en.free-shells.com.ar">free-shells.com.ar</A> ---> - </FONT></CENTER> </P>
[-] [+]	Changed	xorriso-1.2.8.tar.bz2/xorriso/xorriso_main.c ^
@@ -111,7 +111,7 @@ */ #define Xorriso_req_majoR 1 #define Xorriso_req_minoR 2 -#define Xorriso_req_micrO 6 +#define Xorriso_req_micrO 8 static void yell_xorriso()
[-] [+]	Changed	xorriso-1.2.8.tar.bz2/xorriso/xorriso_private.h ^
@@ -138,6 +138,7 @@ / int iso_level; + int iso_level_is_default; int do_joliet; int do_hfsplus; int do_fat; @@ -179,6 +180,7 @@ char scdbackup_tag_listname[SfileadrL]; int relax_compliance; / opaque bitfield to be set by xorrisoburn / + int allow_dir_id_ext_dflt; / -compliance allow_dir_id_ext still on default / char rr_reloc_dir[256]; int rr_reloc_flags; int untranslated_name_len; @@ -367,6 +369,7 @@ 1=emulation as hard disk 2=emulation as floppy / + int boot_emul_default; /* 1= boot_image_emul is still default */ off_t boot_image_load_size; unsigned char boot_id_string[29]; unsigned char boot_selection_crit[21];
[-] [+]	Changed	xorriso-1.2.8.tar.bz2/xorriso/xorriso_timestamp.h ^
@@ -1 +1 @@ -#define Xorriso_timestamP "2013.01.08.103001" +#define Xorriso_timestamP "2013.03.18.093001"
[-] [+]	Changed	xorriso-1.2.8.tar.bz2/xorriso/xorrisoburn.h ^
@@ -4,7 +4,7 @@ a command line oriented batch and dialog tool which creates, loads, manipulates and burns ISO 9660 filesystem images. - Copyright 2007-2012 Thomas Schmitt, <scdbackup@gmx.net> + Copyright 2007-2013 Thomas Schmitt, <scdbackup@gmx.net> Provided under GPL version 2 or later. @@ -19,7 +19,7 @@ / #define xorriso_libisoburn_req_major 1 #define xorriso_libisoburn_req_minor 2 -#define xorriso_libisoburn_req_micro 6 +#define xorriso_libisoburn_req_micro 8 struct SpotlisT; / List of intervals with different read qualities */
[-] [+]	Changed	xorriso-1.2.8.tar.bz2/xorriso/xorrisofs.1 ^
@@ -9,7 +9,7 @@ .\" First parameter, NAME, should be all caps .\" Second parameter, SECTION, should be 1-8, maybe w/ subsection .\" other parameters are allowed: see man(7), man(1) -.TH XORRISOFS 1 "Version 1.2.6, Jan 08, 2013" +.TH XORRISOFS 1 "Version 1.2.8, Mar 18, 2013" .\" Please adjust this date whenever revising the manpage. .\" .\" Some roff macros, for reference: @@ -901,6 +901,19 @@ boot image will be marked as emulating a floppy. (Not suitable for any known boot loader.) .TP +\fB\-eltorito-id\fR text\|56_hexdigits +Define the ID string of the boot catalog +section where the boot image will be listed. If the value consists of 56 +characters [0\-9A\-Fa\-f] then it is converted into 28 bytes, else the first +28 characters become the ID string. +The ID string of the first boot image becomes the overall catalog ID. +It is limited to 24 characters. Other id_strings become section IDs. +.TP +\fB\-eltorito-selcrit\fR hexdigits +Define the Selection Criteria of the boot image. +Up to 20 bytes get read from the given characters [0\-9A\-Fa\-f]. +They get attributed to the boot image entry in the catalog. +.TP \fB\-boot-info-table\fR Overwrite certain bytes in the current boot image. The information will be supplied by xorriso in the course of image production: Block address of
[-] [+]	Changed	xorriso-1.2.8.tar.bz2/xorriso/xorrisofs.info ^
@@ -14,7 +14,7 @@ File: xorrisofs.info, Node: Top, Next: Overview, Up: (dir) -xorrisofs 1.2.5 +xorrisofs 1.2.8 *************** xorrisofs - Emulation of ISO 9660 program mkisofs by program xorriso @@ -892,6 +892,19 @@ boot image will be marked as emulating a floppy. (Not suitable for any known boot loader.) +-eltorito-id text\|56_hexdigits + Define the ID string of the boot catalog section where the boot + image will be listed. If the value consists of 56 characters + [0-9A-Fa-f] then it is converted into 28 bytes, else the first 28 + characters become the ID string. The ID string of the first boot + image becomes the overall catalog ID. It is limited to 24 + characters. Other id_strings become section IDs. + +-eltorito-selcrit hexdigits + Define the Selection Criteria of the boot image. Up to 20 bytes + get read from the given characters [0-9A-Fa-f]. They get + attributed to the boot image entry in the catalog. + -boot-info-table Overwrite certain bytes in the current boot image. The information will be supplied by xorriso in the course of image production: @@ -1702,7 +1715,7 @@ * --acl Recording of ACLs: SetExtras. (line 71) * --boot-catalog-hide Hide El Torito boot catalog: Bootable. - (line 95) + (line 108) * --efi-boot El Torito EFI boot image: Bootable. (line 58) * --embedded-boot Fill System Area e.g. by MBR: SystemArea. (line 35) * --emul-toc enable table-of-content emulation: SetProduct. (line 35) @@ -1738,9 +1751,9 @@ * -b El Torito PC-BIOS boot image: Bootable. (line 32) * -B SUN SPARC boot images: SystemArea. (line 177) * -biblio set Biblio File path: ImageId. (line 72) -* -boot-info-table Patch El Torito boot image: Bootable. (line 80) +* -boot-info-table Patch El Torito boot image: Bootable. (line 93) * -boot-load-size El Torito boot image load size: Bootable. (line 63) -* -c El Torito boot catalog name: Bootable. (line 86) +* -c El Torito boot catalog name: Bootable. (line 99) * -C set load address and write address offset: Loading. (line 28) * -cdrecord-params set load address and write address offset: Loading. (line 50) @@ -1762,7 +1775,10 @@ * -eltorito-alt-boot begin next boot catalog entry: Bootable. (line 43) * -eltorito-boot El Torito PC-BIOS boot image: Bootable. (line 40) -* -eltorito-catalog El Torito boot catalog name: Bootable. (line 92) +* -eltorito-catalog El Torito boot catalog name: Bootable. (line 105) +* -eltorito-id El Torito boot section id string: Bootable. (line 80) +* -eltorito-selcrit El Torito boot selection criteria: Bootable. + (line 88) * -exclude exclude disk files from inserting: SetInsert. (line 42) * -exclude-list exclude disk files from inserting: SetInsert. (line 51) @@ -1905,21 +1921,25 @@ * Biblio File, set path, -biblio: ImageId. (line 72) * Block address, set sort weight, --sort-weight: SetProduct. (line 49) * Bootability, boot catalog hidden, --boot-catalog-hide: Bootable. - (line 95) + (line 108) * Bootability, boot catalog name, -c, -eltorito-catalog: Bootable. - (line 86) + (line 99) * Bootability, boot image emulation, -hard-disk-boot: Bootable. (line 68) * Bootability, boot image load size, -boot-load-size: Bootable. (line 63) * Bootability, boot image patching, -boot-info-table: Bootable. - (line 80) + (line 93) * Bootability, control, --efi-boot: Bootable. (line 58) * Bootability, control, -b, -eltorito-boot: Bootable. (line 32) * Bootability, control, -B, -sparc-boot: SystemArea. (line 177) * Bootability, control, -e: Bootable. (line 50) * Bootability, control, -mips-boot: SystemArea. (line 164) * Bootability, control, -mipsel-boot: SystemArea. (line 171) +* Bootability, El Torito section id string, -eltorito-id: Bootable. + (line 80) +* Bootability, El Torito selection criteria, -eltorito-selcrit: Bootable. + (line 88) * Bootability, fill System Area e.g. by MBR, -G, --embedded-boot, -generic-boot: SystemArea. (line 25) * Bootability, for CHRP, -chrp-boot-part: SystemArea. (line 149) @@ -2089,23 +2109,23 @@ Node: SetHide28860 Node: ImageId30168 Node: Bootable33673 -Node: SystemArea37738 -Node: Charset47381 -Node: Jigdo48407 -Node: Miscellaneous52674 -Node: Examples54047 -Node: ExSimple54533 -Node: ExGraft55012 -Node: ExMkisofs56259 -Node: ExGrowisofs57512 -Node: ExIncBackup58684 -Node: ExIncBckAcc61792 -Node: ExBootable63468 -Node: Files65560 -Node: Seealso66634 -Node: Bugreport67290 -Node: Legal67871 -Node: CommandIdx68766 -Node: ConceptIdx82400 +Node: SystemArea38383 +Node: Charset48026 +Node: Jigdo49052 +Node: Miscellaneous53319 +Node: Examples54692 +Node: ExSimple55178 +Node: ExGraft55657 +Node: ExMkisofs56904 +Node: ExGrowisofs58157 +Node: ExIncBackup59329 +Node: ExIncBckAcc62437 +Node: ExBootable64113 +Node: Files66205 +Node: Seealso67279 +Node: Bugreport67935 +Node: Legal68516 +Node: CommandIdx69411 +Node: ConceptIdx83258 End Tag Table
[-] [+]	Changed	xorriso-1.2.8.tar.bz2/xorriso/xorrisofs.texi ^
@@ -1,7 +1,7 @@ \input texinfo @c --texinfo-- @c %start of header @setfilename xorrisofs.info -@settitle GNU xorrisofs 1.2.6 +@settitle GNU xorrisofs 1.2.8 @c %end of header @c @c man-ignore-lines begin @@ -50,7 +50,7 @@ @c man .\" First parameter, NAME, should be all caps @c man .\" Second parameter, SECTION, should be 1-8, maybe w/ subsection @c man .\" other parameters are allowed: see man(7), man(1) -@c man .TH XORRISOFS 1 "Version 1.2.6, Jan 08, 2013" +@c man .TH XORRISOFS 1 "Version 1.2.8, Mar 18, 2013" @c man .\" Please adjust this date whenever revising the manpage. @c man .\" @c man .\" Some roff macros, for reference: @@ -76,7 +76,7 @@ @end copying @c man-ignore-lines end @titlepage -@title Manual of GNU xorriso personality xorrisofs 1.2.6 +@title Manual of GNU xorriso personality xorrisofs 1.2.8 @author Thomas Schmitt @page @vskip 0pt plus 1filll @@ -85,7 +85,7 @@ @contents @ifnottex @node Top -@top xorrisofs 1.2.5 +@top xorrisofs 1.2.8 @c man-ignore-lines 1 @c man .SH NAME @@ -1245,6 +1245,23 @@ boot image will be marked as emulating a floppy. (Not suitable for any known boot loader.) @c man .TP +@item -eltorito-id text\|56_hexdigits +@kindex -eltorito-id El Torito boot section id string +@cindex Bootability, El Torito section id string, -eltorito-id +Define the ID string of the boot catalog +section where the boot image will be listed. If the value consists of 56 +characters [0-9A-Fa-f] then it is converted into 28 bytes, else the first +28 characters become the ID string. +The ID string of the first boot image becomes the overall catalog ID. +It is limited to 24 characters. Other id_strings become section IDs. +@c man .TP +@item -eltorito-selcrit hexdigits +@kindex -eltorito-selcrit El Torito boot selection criteria +@cindex Bootability, El Torito selection criteria, -eltorito-selcrit +Define the Selection Criteria of the boot image. +Up to 20 bytes get read from the given characters [0-9A-Fa-f]. +They get attributed to the boot image entry in the catalog. +@c man .TP @item -boot-info-table @kindex -boot-info-table Patch El Torito boot image @cindex Bootability, boot image patching, -boot-info-table

Changes of Revision 43