From c8b9c9a2443fcf9278b980ff5abcc3a1479bc7d7 Mon Sep 17 00:00:00 2001 From: Thomas Schmitt Date: Mon, 28 Oct 2019 15:34:56 +0100 Subject: [PATCH] Fixed spelling errors found by fossies.org with codespell --- frontend/frontend_pipes_xorriso.c | 2 +- frontend/sh_on_named_pipes.sh | 2 +- frontend/xorriso-tcltk | 16 +-- libisoburn/burn_wrap.c | 30 ++--- libisoburn/isoburn.c | 2 +- libisoburn/isoburn.h | 18 +-- libisoburn/libisoburn.h | 40 +++--- releng/README | 4 +- releng/jigdo-gen-md5-list | 2 +- releng/jigdo-gen-md5-list.1 | 2 +- xorriso/README_gnu_xorriso | 6 +- xorriso/aux_objects.h | 2 +- xorriso/cmp_update.c | 2 +- xorriso/drive_mgt.c | 12 +- xorriso/emulators.c | 6 +- xorriso/findjob.c | 2 +- xorriso/iso_img.c | 4 +- xorriso/iso_manip.c | 4 +- xorriso/iso_tree.c | 4 +- xorriso/lib_mgt.c | 2 +- xorriso/lib_mgt.h | 2 +- xorriso/misc_funct.c | 2 +- xorriso/misc_funct.h | 2 +- xorriso/opts_d_h.c | 10 +- xorriso/opts_p_z.c | 10 +- xorriso/parse_exec.c | 2 +- xorriso/sfile.c | 2 +- xorriso/sort_cmp.c | 2 +- xorriso/text_io.c | 2 +- xorriso/text_io.h | 2 +- xorriso/write_run.c | 2 +- xorriso/xorrecord.1 | 16 +-- xorriso/xorrecord.info | 76 ++++++------ xorriso/xorrecord.texi | 24 ++-- xorriso/xorriso.1 | 60 ++++----- xorriso/xorriso.h | 6 +- xorriso/xorriso.info | 199 +++++++++++++++--------------- xorriso/xorriso.texi | 64 +++++----- xorriso/xorriso_eng.html | 2 +- xorriso/xorriso_main.c | 4 +- xorriso/xorriso_private.h | 9 +- xorriso/xorriso_timestamp.h | 2 +- xorriso/xorrisoburn.h | 4 +- xorriso/xorrisofs.1 | 8 +- xorriso/xorrisofs.info | 64 +++++----- xorriso/xorrisofs.texi | 12 +- 46 files changed, 375 insertions(+), 375 deletions(-) diff --git a/frontend/frontend_pipes_xorriso.c b/frontend/frontend_pipes_xorriso.c index 9ffe642e..e7732492 100644 --- a/frontend/frontend_pipes_xorriso.c +++ b/frontend/frontend_pipes_xorriso.c @@ -295,7 +295,7 @@ static int await_all_replies(struct boss_state *boss) return(-1); } if (count == 0) { - fprintf(stderr, "+++ EOF encounterd by Master process\n"); + fprintf(stderr, "+++ EOF encountered by Master process\n"); return(-2); } for (npt = buf + remainder; npt < buf + count; npt++) { diff --git a/frontend/sh_on_named_pipes.sh b/frontend/sh_on_named_pipes.sh index 3f35700c..8419e1a2 100755 --- a/frontend/sh_on_named_pipes.sh +++ b/frontend/sh_on_named_pipes.sh @@ -43,7 +43,7 @@ export normal_end=0 # ---------------- An interpreter for quoted xorriso replies ---------------- # xorriso commands like -lsl wrap filenames into quotation marks in order -# to unambigously represent any character byte except the 0-byte. +# to unambiguously represent any character byte except the 0-byte. # This piece of code parses input strings into words by letting xorriso # command -msg_op "parse_silently" do the hard work. # The input strings should be composed by concatenating input lines with diff --git a/frontend/xorriso-tcltk b/frontend/xorriso-tcltk index 2ef82ab8..17418dfb 100755 --- a/frontend/xorriso-tcltk +++ b/frontend/xorriso-tcltk @@ -108,7 +108,7 @@ set reply_pipe_adr "" # The command to send (or the command most recently sent) set cmdline "" -# Wether to clear the cmdline after sending +# Whether to clear the cmdline after sending set cmdline_clear true # Command counter set cmd_sent 0 @@ -182,7 +182,7 @@ set pre_msglist "" # Whether overwriting of files in the ISO model is allowed set overwrite_iso_files 1 -# If overwrite_iso_files is 1: Wether overwriting of ISO directories is allowed +# If overwrite_iso_files is 1: Whether overwriting of ISO directories is allowed set overwrite_iso_dirs 0 # Whether overwriting of files on disk is allowed @@ -248,7 +248,7 @@ proc init_frontend_named_pipes {cmd_pipe reply_pipe} { set cmd_conn [open $cmd_pipe w] set reply_conn [open $reply_pipe r] - # Note: disencouraged flags would be necessary for opening idle fifo + # Note: dissuaded flags would be necessary for opening idle fifo # set reply_conn [open $reply_pipe {RDONLY NONBLOCK}] } @@ -920,7 +920,7 @@ proc effectuate_permission_policy {} { # and implement the quoting rules of xorriso input and output. # Lines which are supposed to consist of several words get sent to # xorriso command -msg_op. The result lines of this command encode -# the words unambigously in one or more text lines. +# the words unambiguously in one or more text lines. # This is supposed to be safe for even the weirdest file names. # Only NUL characters cannot be part of names. @@ -3519,7 +3519,7 @@ set isolist_lines 8 # Whether the message box shall export its selection to the whole X display set export_msg_selection true -# Wether the item lists shall export their selection +# Whether the item lists shall export their selection set export_selection false # The number of lines in the display of the help texts @@ -4333,7 +4333,7 @@ proc bind_help {to_what help_name} { } -# Create a "/" button and wire it with variable, fileystem type, and help text. +# Create a "/" button and wire it with variable, filesystem type,and help text. # proc create_browser_button {button_name var_name which_fs help_name} { global have_bwidget @@ -4609,7 +4609,7 @@ standard error. Else it must not yet exist or be a writable data file. The \"Log pipes\" switch controls whether all xorriso commands and replies shall be logged to standard error or to the file that has been given with program argument --pipe_log_file. -Caution: This log is verbous. +Caution: This log is verbose. The item \"Set pipe log address\" pops up a file tree browser window which asks for the target of pipe logging . Address \"-\" means @@ -5396,7 +5396,7 @@ proc make_text_shellsafe {text} { } -# Count the number of newline chracters in text. +# Count the number of newline characters in text. # proc count_newlines {text} { set rest $text diff --git a/libisoburn/burn_wrap.c b/libisoburn/burn_wrap.c index 2ac35e54..f08fec9d 100644 --- a/libisoburn/burn_wrap.c +++ b/libisoburn/burn_wrap.c @@ -99,7 +99,7 @@ int isoburn_initialize(char msg[1024], int flag) error: 'INTENTIONAL_ABORT_OF_COMPILATION__HEADERFILE_libisofs_dot_h_TOO_OLD__SEE_libisoburn_dot_h_AND_burn_wrap_dot_h' undeclared (first use in this function) error: 'LIBISOFS_MISCONFIGURATION_' undeclared (first use in this function) */ -/* The indendation is an advise of man gcc to help old compilers ignoring */ +/* The indentation is an advise of man gcc to help old compilers ignoring */ #if isoburn_libisofs_req_major > iso_lib_header_version_major #define Isoburn_libisofs_dot_h_too_olD 1 #endif @@ -136,7 +136,7 @@ LIBISOFS_MISCONFIGURATION_ = 0; error: 'LIBBURN_MISCONFIGURATION_' undeclared (first use in this function) */ -/* The indendation is an advise of man gcc to help old compilers ignoring */ +/* The indentation is an advise of man gcc to help old compilers ignoring */ #if isoburn_libburn_req_major > burn_header_version_major #define Isoburn_libburn_dot_h_too_olD 1 #endif @@ -161,7 +161,7 @@ LIBBURN_MISCONFIGURATION_ = 0; So the requirement is defined in libisofs/libisofs.h : iso_libjte_req_major , iso_libjte_req_minor , iso_libjte_req_micro */ - /* The indendation is an advise of man gcc to help old compilers ignoring */ + /* The indentation is an advise of man gcc to help old compilers ignoring */ #if iso_libjte_req_major > LIBJTE_VERSION_MAJOR #define Libisofs_libjte_dot_h_too_olD 1 #endif @@ -333,10 +333,10 @@ int isoburn_is_intermediate_dvd_rw(struct burn_drive *d, int flag) /** Examines the medium and sets appropriate emulation if needed. - @param flag bit0= pretent blank on overwriteable media + @param flag bit0= pretent blank on overwritable media bit3= if the drive reports a -ROM profile then try to read table of content by scanning for ISO image headers. - bit4= do not emulate TOC on overwriteable media + bit4= do not emulate TOC on overwritable media bit5= ignore ACL from external filesystems bit6= ignore POSIX Extended Attributes from external filesystems bit7= pretend -ROM and scan for table of content @@ -401,7 +401,7 @@ static int isoburn_welcome_media(struct isoburn **o, struct burn_drive *d, random_access= caps->start_adr || role == 4; if(random_access) (*o)->emulation_mode= 1; - if(random_access && !readonly) { /* set emulation to overwriteable */ + if(random_access && !readonly) { /* set emulation to overwritable */ ret= isoburn_is_intermediate_dvd_rw(d, 0); if(ret>0) { (*o)->min_start_byte= 0; @@ -437,14 +437,14 @@ static int isoburn_welcome_media(struct isoburn **o, struct burn_drive *d, */ (*o)->fabricated_disc_status= BURN_DISC_FULL; - /* This might be an overwriteable medium in a -ROM drive. + /* This might be an overwritable medium in a -ROM drive. Pitfall: - Multi-session media which bear a xorriso image for overwriteables + Multi-session media which bear a xorriso image for overwritables in their first session would get a TOC of that first image rather than of the medium. It is not possible to distinguish a BD-RE from a single session - BD-R with an image for overwriteables. But as soon as the medium - bears 2 logical tracks it cannot be overwriteable. + BD-R with an image for overwritables. But as soon as the medium + bears 2 logical tracks it cannot be overwritable. So count the number of tracks first. */ disc= isoburn_toc_drive_get_disc(d); @@ -463,7 +463,7 @@ static int isoburn_welcome_media(struct isoburn **o, struct burn_drive *d, isoburn_msgs_submit(*o, 0x00060000, msg, 0, "DEBUG", 0); if((flag & 16) || track_count >= 2) { - ret= 0; /* toc emulation off, or not overwriteable */ + ret= 0; /* toc emulation off, or not overwritable */ } else { ret= isoburn_start_emulation(*o, 1); if(ret<=0) { @@ -524,14 +524,14 @@ ex: /** @param flag bit0= load - bit1= regard overwriteable media as blank + bit1= regard overwritable media as blank bit2= if the drive is a regular disk file: truncate it to the write start address bit3= if the drive reports a -ROM profile then try to read table of content by scanning for ISO image headers. (depending on media type and drive state this might help or it might make the resulting toc even worse) - bit4= do not emulate TOC on overwriteable media + bit4= do not emulate TOC on overwritable media bit5= ignore ACL from external filesystems bit6= ignore POSIX Extended Attributes from external filesystems bit7= pretend -ROM profile and scan for table of content @@ -1473,8 +1473,8 @@ int isoburn_emulate_toc(struct burn_drive *d, int flag) read_flag|= (1<<15)|((session_count>0)<<14); else { - /* growisofs aligns to 16 rather than 32. Overwriteable TOC emulation - relies on not accidentially seeing inter-session trash data. + /* growisofs aligns to 16 rather than 32. Overwritable TOC emulation + relies on not accidentally seeing inter-session trash data. But one can safely access 16 blocks earlier because a xorriso header would have been overwritten with the unused 16 blocks at its start. If libisoburn alignment would increase, then this would not be diff --git a/libisoburn/isoburn.c b/libisoburn/isoburn.c index cb5731b7..c9e971c1 100644 --- a/libisoburn/isoburn.c +++ b/libisoburn/isoburn.c @@ -689,7 +689,7 @@ int isoburn_prepare_disc_aux(struct burn_drive *in_d, struct burn_drive *out_d, if(ret > 0 && data_start <= 0x7FFFFFFF) opts->data_start_lba= data_start; - /* TODO check return values for failure. propertly clean-up on error */ + /* TODO check return values for failure. properly clean-up on error */ out_o->iso_source= wsrc; diff --git a/libisoburn/isoburn.h b/libisoburn/isoburn.h index 21e5972d..1aba5561 100644 --- a/libisoburn/isoburn.h +++ b/libisoburn/isoburn.h @@ -21,7 +21,7 @@ #endif #endif -/* For emulated TOC of overwriteable media. +/* For emulated TOC of overwritable media. Provides minimal info for faking a struct burn_toc_entry. */ struct isoburn_toc_entry { @@ -29,7 +29,7 @@ struct isoburn_toc_entry { int track_no; /* point */ int start_lba; int track_blocks; - char *volid; /* For caching a volume id from emulated toc on overwriteables */ + char *volid; /* For caching a volume id from emulated toc on overwritables */ struct isoburn_toc_entry *next; }; @@ -92,7 +92,7 @@ struct isoburn { int fabricated_msc2; - /* The nwa to be used for a first session on the present kind of overwriteable + /* The nwa to be used for a first session on the present kind of overwritable media (usually Libisoburn_overwriteable_starT, but might be forced to 0) */ int zero_nwa; @@ -118,11 +118,11 @@ struct isoburn { int media_read_error; /* Eventual emulated table of content read from the chain of ISO headers - on overwriteable media. + on overwritable media. */ struct isoburn_toc_entry *toc; - /* Indicator wether the most recent burn run worked : + /* Indicator whether the most recent burn run worked : -1 = undetermined, ask libburn , 0 = failure , 1 = success To be inquired by isoburn_drive_wrote_well() */ @@ -427,7 +427,7 @@ struct isoburn_imgen_opts { */ unsigned int file_md5 :2; - /* On overwriteable media or random access files do not write the first + /* On overwritable media or random access files do not write the first session to LBA 32, but rather to LBA 0 directly. */ unsigned int no_emul_toc :1; @@ -693,7 +693,7 @@ struct isoburn_imgen_opts { int efi_boot_part_flag; /* Disk file paths of prepared images which shall be appended - after the ISO image and described by partiton table entries in a MBR. + after the ISO image and described by partition table entries in a MBR. NULL means unused. */ char *appended_partitions[Libisoburn_max_appended_partitionS]; @@ -764,7 +764,7 @@ struct isoburn_imgen_opts { }; -/* Alignment for session starts on overwriteable media. +/* Alignment for session starts on overwritable media. (Increased from 16 to 32 blocks for aligning to BD-RE clusters.) */ #define Libisoburn_nwa_alignemenT 32 @@ -804,7 +804,7 @@ struct isoburn_imgen_opts { ((off_t) (Libisoburn_target_head_sizE/2048)) -/* Wrappers for emulation of TOC on overwriteable media */ +/* Wrappers for emulation of TOC on overwritable media */ struct isoburn_toc_track { /* Either track or toc_entry are supposed to be NULL */ diff --git a/libisoburn/libisoburn.h b/libisoburn/libisoburn.h index df886b64..ac530058 100644 --- a/libisoburn/libisoburn.h +++ b/libisoburn/libisoburn.h @@ -93,13 +93,13 @@ the setup for several alternative image generation strategies. Growing: If input and output drive are the same, then isoburn_prepare_disc() is to -be used. It will lead to an add-on session on appendable or overwriteable +be used. It will lead to an add-on session on appendable or overwritable media with existing ISO image. With blank media it will produce a first session. Modifying: If the output drive is not the input drive, and if it bears blank media -or overwriteable without a valid ISO image, then one may produce a consolidated +or overwritable without a valid ISO image, then one may produce a consolidated image with old and new data. This will copy file data from an eventual input drive with valid image, add any newly introduced data from the local filesystem, and produce a first session on output media. @@ -206,7 +206,7 @@ int isoburn_initialize(char msg[1024], int flag); @param flag Bitfield for control purposes. Unused yet. Submit 0. @return 1= library can work for caller 0= library is not usable in some aspects. Caller must restrict - itself to an earlier API version or must not use this libray + itself to an earlier API version or must not use this library at all. */ int isoburn_is_compatible(int major, int minor, int micro, int flag); @@ -322,7 +322,7 @@ int isoburn_libburn_req(int *major, int *minor, int *micro); /** Usage discussion: Some developers of the libburnia project have differing -opinions how to ensure the compatibility of libaries +opinions how to ensure the compatibility of libraries and applications. It is about whether to use at compile time and at runtime @@ -429,7 +429,7 @@ int isoburn_drive_scan_and_grab(struct burn_drive_info *drive_infos[], to a file object. @param flag bit0= attempt to load the disc tray. Else: failure if not loaded. - bit1= regard overwriteable media as blank + bit1= regard overwritable media as blank bit2= if the drive is a regular disk file: truncate it to the write start address when writing begins @@ -437,7 +437,7 @@ int isoburn_drive_scan_and_grab(struct burn_drive_info *drive_infos[], table of content by scanning for ISO image headers. (depending on media type and drive this might help or it might make the resulting toc even worse) - bit4= do not emulate table of content on overwriteable media + bit4= do not emulate table of content on overwritable media bit5= ignore ACL from external filesystems bit6= ignore POSIX Extended Attributes from external filesystems (xattr) @@ -568,9 +568,9 @@ int isoburn_set_msc1(struct burn_drive *d, int adr_mode, char *adr_value, /* ----------------------------------------------------------------------- */ /* - Wrappers for emulation of TOC on overwriteable media + Wrappers for emulation of TOC on overwritable media - Media which match the overwriteable usage model lack of a history of sessions + Media which match the overwritable usage model lack of a history of sessions and tracks. libburn will not even hand out a burn_disc object for them and always declare them blank. libisoburn checks for a valid ISO filesystem header at LBA 0 and eventually declares them appendable. @@ -579,7 +579,7 @@ int isoburn_set_msc1(struct burn_drive *d, int adr_mode, char *adr_value, and their LBAs, as it is possible with true multi-session media. The following wrappers add the capability to obtain a session and track TOC - from emulated multi-session images on overwriteables if the first session + from emulated multi-session images on overwritables if the first session was written by libisoburn-0.1.6 or later (i.e. with a header copy at LBA 32). Be aware that the structs emitted by these isoburn calls are not compatible @@ -950,7 +950,7 @@ int isoburn_ropt_get_default_perms(struct isoburn_read_opts *o, gets loaded. Above call isoburn_ropt_set_default_perms() automatically adds x-permissions to r-permissions for directories. This call here may - be done afterwards to set independend permissions for directories, + be done afterwards to set independent permissions for directories, especially to override the automatically added x-permissions. @since 0.1.0 @param o The option set to work on @@ -1005,9 +1005,9 @@ int isoburn_ropt_get_auto_incharset(struct isoburn_read_opts *o, int *mode); @since 0.6.6 @param o The option set to work on @param displacement 0 or a positive number - @param displacement_sign Determines wether to add or subtract displacement - to block addresses before applying them to the - storage object for reading: + @param displacement_sign Determines whether to add or subtract + displacement to block addresses before applying + them to the storage object for reading: +1 = add , -1= subtract , else keep unaltered */ int isoburn_ropt_set_displacement(struct isoburn_read_opts *o, @@ -1048,7 +1048,7 @@ int isoburn_ropt_get_truncate_mode(struct isoburn_read_opts *o, int *mode, int *length); -/** After calling function isoburn_read_image() there are informations +/** After calling function isoburn_read_image() there are information available in the option set. This info can be obtained as bits in parameter has_what. Like: joliet_available = (has_what & isoburn_ropt_has_joliet); @@ -1172,7 +1172,7 @@ int isoburn_igopt_get_level(struct isoburn_imgen_opts *o, int *level); See also libisofs.h iso_write_opts_set_record_md5() bit9= no_emul_toc @since 0.5.8 - On overwriteable media or random access files do not write + On overwritable media or random access files do not write the first session to LBA 32 and do not copy the first 64kB of the first session to LBA 0, but rather write the first session to LBA 0 directly. @@ -1472,7 +1472,7 @@ int isoburn_igopt_get_over_ugid(struct isoburn_imgen_opts *o, int *replace_uid, int *replace_gid, uid_t *uid, gid_t *gid); -/** Set the charcter set to use for representing RR filenames in the image. +/** Set the character set to use for representing RR filenames in the image. @since 0.1.0 @param o The option set to work on @param output_charset Set this to NULL to use the default output charset. @@ -1963,7 +1963,7 @@ int isoburn_igopt_set_part_type_guid(struct isoburn_imgen_opts *opts, 16 flag bits of the images of the corresponding partition. @param valids The array elements 0 to num_entries - 1 will get filled by 1 or 0 - to indicate whether the corresponding type_guids elemet is valid. + to indicate whether the corresponding type_guids element is valid. @return <0 = error 0 = no partition image set @@ -2482,7 +2482,7 @@ int isoburn_disc_track_lba_nwa(struct burn_drive *d, struct burn_write_opts *o, /** Obtain the size which was attributed to an emulated appendable on actually - overwriteable media. This value is supposed to be <= 2048 * nwa as of + overwritable media. This value is supposed to be <= 2048 * nwa as of isoburn_disc_track_lba_nwa(). @since 0.1.0 @param d The drive holding the medium. @@ -2628,7 +2628,7 @@ int isoburn_set_truncate(struct burn_drive *drive, int flag); /** Start writing of the new session. - This call is asynchrounous. I.e. it returns quite soon and the progress has + This call is asynchronous. I.e. it returns quite soon and the progress has to be watched by a loop with call burn_drive_get_status() until BURN_DRIVE_IDLE is returned. Wrapper for: burn_disc_write() @@ -2727,7 +2727,7 @@ void isoburn_finish(void); */ -/** Inquire wether the medium needs emulation or would be suitable for +/** Inquire whether the medium needs emulation or would be suitable for generic multi-session via libburn. @since 0.1.0 @param d The drive to inquire diff --git a/releng/README b/releng/README index a80e266c..84fe5693 100644 --- a/releng/README +++ b/releng/README @@ -33,7 +33,7 @@ can be configured and built. It is not mandatory that libisoburn is already installed. The tests may use an installed xorriso program as well as a freshly built one. -The test scripts explicitely demand /bin/bash as interpreter, although they +The test scripts explicitly demand /bin/bash as interpreter, although they would run on certain other shells too. If you get an error message like ./run_all_auto: not found then consider to install /bin/bash. @@ -188,7 +188,7 @@ Known to be suitable are the following shells Solaris: /bin/bash , /bin/i86/ksh93 In general, the shell should have Bourne shell ancestry. -The script does not choose an interpreter explicitely and is safe to be run +The script does not choose an interpreter explicitly and is safe to be run inline: . ./change_shell_to_use One may set any interpreter path by running a sub shell and changing its diff --git a/releng/jigdo-gen-md5-list b/releng/jigdo-gen-md5-list index 381c441b..9f843409 100755 --- a/releng/jigdo-gen-md5-list +++ b/releng/jigdo-gen-md5-list @@ -5,7 +5,7 @@ # This script is distributed according to the terms of the GNU GPL v2. # This should be better rewritten in C at some future point. Ref: pwd code. -# Create a list of MD5sums encoded in hexidecimal format and print to standard output +# Create a list of MD5sums encoded in hexadecimal format and print to standard output # Format Description # A line in the emerging file is to be composed as follows: diff --git a/releng/jigdo-gen-md5-list.1 b/releng/jigdo-gen-md5-list.1 index ae6ff061..3d1ff314 100644 --- a/releng/jigdo-gen-md5-list.1 +++ b/releng/jigdo-gen-md5-list.1 @@ -1,7 +1,7 @@ .\" DO NOT MODIFY THIS FILE! It was generated by help2man 1.38.2. .TH JIGDO-GEN-MD5-LIST "1" "October 2010" "jigdo-gen-md5-list 0.1" "User Commands" .SH NAME -jigdo-gen-md5-list \- create a list of MD5sums encoded in hexidecimal format and print to standard output +jigdo-gen-md5-list \- create a list of MD5sums encoded in hexadecimal format and print to standard output .SH DESCRIPTION usage: jigdo\-gen\-md5\-list [option] DIR FILE ... .TP diff --git a/xorriso/README_gnu_xorriso b/xorriso/README_gnu_xorriso index 6560e2fb..2697c86f 100644 --- a/xorriso/README_gnu_xorriso +++ b/xorriso/README_gnu_xorriso @@ -99,7 +99,7 @@ Both conditional dependencies can be avoided by running ./configure --prefix=/usr --disable-libreadline make clean ; make Never omit the "make clean" command after switching enabling of libreadline. -If you want to explictely allow only the use of libedit, then do +If you want to explicitly allow only the use of libedit, then do ./configure --prefix=/usr --disable-libreadline --enable-libedit Other deliberate dependency reduction options of ./configure are: @@ -342,7 +342,7 @@ Tag_id distinguishes the following tag types "libisofs_checksum_tag_v1" Session end tag A relocated superblock may appear at LBA 0 of an image which was produced for -being stored in a disk file or on overwriteable media (e.g. DVD+RW, BD-RE). +being stored in a disk file or on overwritable media (e.g. DVD+RW, BD-RE). xorriso records the first session at LBA 32. A follow-up session begins at the next block address which is divisible by 32 and higher than the address of the previous session's end tag. Normally no session starts after the @@ -366,7 +366,7 @@ are accessed via libisoburn, which is closely related to xorriso. libisoburn provides several services: - Encapsulation of coordination between libisofs and libburn. -- Emulation of ISO 9660 multi-session on overwriteable media +- Emulation of ISO 9660 multi-session on overwritable media or random access files. - Implementation of the xorriso API. diff --git a/xorriso/aux_objects.h b/xorriso/aux_objects.h index 38cce337..3841a787 100644 --- a/xorriso/aux_objects.h +++ b/xorriso/aux_objects.h @@ -116,7 +116,7 @@ int Xorriso_lst_append_binary(struct Xorriso_lsT **entry, /** Destroy a single list item and connect its eventual list neighbors. @param lstring pointer to the pointer to be freed and set to NULL @param flag unused yet, submit 0 - @return 0= *lstring was alredy NULL, 1= ok + @return 0= *lstring was already NULL, 1= ok */ int Xorriso_lst_destroy(struct Xorriso_lsT **lstring, int flag); diff --git a/xorriso/cmp_update.c b/xorriso/cmp_update.c index 021c8820..fccf3fe7 100644 --- a/xorriso/cmp_update.c +++ b/xorriso/cmp_update.c @@ -337,7 +337,7 @@ int Xorriso_compare_2_files(struct XorrisO *xorriso, char *disk_adr, if(ret>0) { strcpy(respt, "? "); Text_shellsafe(disk_adr, respt, 1); - sprintf(respt + strlen(respt), " (DISK) : exluded by %s\n", + sprintf(respt + strlen(respt), " (DISK) : excluded by %s\n", (ret==1 ? "-not_paths" : "-not_leaf")); if(! (flag & ((1u << 31) | (1 << 26)))) Xorriso_result(xorriso,0); diff --git a/xorriso/drive_mgt.c b/xorriso/drive_mgt.c index dc4ca477..492546d5 100644 --- a/xorriso/drive_mgt.c +++ b/xorriso/drive_mgt.c @@ -204,14 +204,14 @@ ex:; } -/* @param flag bit0= aquire as isoburn input drive - bit1= aquire as libburn output drive (as isoburn drive if bit0) - bit2= regard overwriteable media as blank +/* @param flag bit0= acquire as isoburn input drive + bit1= acquire as libburn output drive (as isoburn drive if bit0) + bit2= regard overwritable media as blank bit3= if the drive is a regular disk file: truncate it to the write start address bit5= do not print toc - bit6= do not calm down drive after aquiring it - bit7= re-assess rather than aquire: + bit6= do not calm down drive after acquiring it + bit7= re-assess rather than acquire: Do not give up drives, use isoburn_drive_aquire() with re-assessment bit @return <=0 failure , 1= ok @@ -3260,7 +3260,7 @@ int Xorriso_check_media(struct XorrisO *xorriso, struct SpotlisT **spotlist, ret= burn_disc_get_multi_caps(drive, BURN_WRITE_NONE, &caps, 0); if(ret > 0) { if(caps->start_adr) { - /* block 0 to 31 are the overall mount entry of overwriteable */ + /* block 0 to 31 are the overall mount entry of overwritable */ track_lba= 0; track_blocks+= 32; } diff --git a/xorriso/emulators.c b/xorriso/emulators.c index cb4ebb1d..388e7510 100644 --- a/xorriso/emulators.c +++ b/xorriso/emulators.c @@ -93,7 +93,7 @@ int Xorriso_cdrskin_help(struct XorrisO *xorriso, int flag) "\t-help\t\tprint this text to stderr and exit emulation", "Actually this is the integrated ISO RockRidge filesystem manipulator xorriso", "lending its libburn capabilities to a very limited cdrecord emulation. Only", -"a single data track can be burnt to blank, appendable or overwriteable media.", +"a single data track can be burnt to blank, appendable or overwritable media.", "A much more elaborate cdrecord emulator is cdrskin from the same project.", "@End_of_helptexT@" }; @@ -494,7 +494,7 @@ no_volunteer:; if(dev_adr[0]) { hflag= 2 | 64; /* ts B11201 no more: | 32 */ if(!do_grow) - hflag|= 8; /* consider overwriteables as blank */ + hflag|= 8; /* consider overwritables as blank */ ret= Xorriso_option_dev(xorriso, dev_adr, hflag); if(ret<=0) goto ex; @@ -1650,7 +1650,7 @@ problem_handler_1:; ret= 0; goto ex; } } - /* Regard overwriteable as blank, truncate regular files on write start */ + /* Regard overwritable as blank, truncate regular files on write start */ ret= Xorriso_option_dev(xorriso, adr, 2|8|16); if(ret<=0) goto ex; diff --git a/xorriso/findjob.c b/xorriso/findjob.c index da0b8a3e..3e8dbd74 100644 --- a/xorriso/findjob.c +++ b/xorriso/findjob.c @@ -753,7 +753,7 @@ int Findjob_endif(struct FindjoB *job, int flag) } if(job->cursor->up==NULL) goto improper_range; - /* test wether parent node is -if */ + /* test whether parent node is -if */ job->cursor= job->cursor->up; Exprnode_get_branch(job->cursor, &true_branch, 0); if(!Exprnode_is_if(job->cursor,0) || true_branch == NULL) { diff --git a/xorriso/iso_img.c b/xorriso/iso_img.c index 2d86f5b1..16c17301 100644 --- a/xorriso/iso_img.c +++ b/xorriso/iso_img.c @@ -1099,7 +1099,7 @@ int Xorriso_mount(struct XorrisO *xorriso, char *dev, int adr_mode, ret= 0; goto ex; } - /* Aquire drive as direct libburn address or via stdio: prefix */ + /* Acquire drive as direct libburn address or via stdio: prefix */ if(strncmp(dev, "mmc:", 4) == 0) ret= burn_drive_convert_fs_adr(dev + 4, libburn_adr); else @@ -2557,7 +2557,7 @@ static int Xorriso_scan_report_lines(struct XorrisO *xorriso, } if(et_imgs[idx].path[0] == 0) { - /* >>> need way to eploit El Torito img blks : */; + /* >>> need way to exploit El Torito img blks : */; /* Check whether appended partition */; for(i= 0; i < mbr_count; i++) diff --git a/xorriso/iso_manip.c b/xorriso/iso_manip.c index 20e01733..1815a8ee 100644 --- a/xorriso/iso_manip.c +++ b/xorriso/iso_manip.c @@ -285,7 +285,7 @@ ex:; /* @param boss_iter Opaque handle to be forwarded to actions in ISO image Set to NULL if calling this function without having - a boss iterator objetc. + a boss iterator object. @param node Pointer to pointer to existing node, *node is set to NULL, if the node gets removed. @param flag bit0= source is directory @@ -1694,7 +1694,7 @@ int Xorriso_rename(struct XorrisO *xorriso, void *boss_iter, {ret= 0; goto ex;} } - /* Check whether destination exists and may be not overwriteable */ + /* Check whether destination exists and may be not overwritable */ ret= Xorriso_overwrite_dest(xorriso, boss_iter, eff_dest, dest_ret, "Renaming", 0); if(ret <= 0) diff --git a/xorriso/iso_tree.c b/xorriso/iso_tree.c index 6977653b..fac9656d 100644 --- a/xorriso/iso_tree.c +++ b/xorriso/iso_tree.c @@ -303,7 +303,7 @@ int Xorriso_fake_stbuf(struct XorrisO *xorriso, char *path, struct stat *stbuf, /* >>> With directories this should be : number of subdirs + 2 */ /* >>> ??? How to obtain RR hardlink number for other types ? */ - /* This may get overriden farther down */ + /* This may get overridden farther down */ stbuf->st_nlink= 1; stbuf->st_uid= iso_node_get_uid(*node); @@ -2078,7 +2078,7 @@ ex:; /* @param flag bit0= a match count !=1 is a FAILURE event bit1= with bit0 tolerate 0 matches if pattern is a constant - bit2= do not issue debug messages about temporay memory needs + bit2= do not issue debug messages about temporary memory needs bit3= do not add unresolved pattern to filev */ int Xorriso_expand_pattern(struct XorrisO *xorriso, diff --git a/xorriso/lib_mgt.c b/xorriso/lib_mgt.c index 0dc093ba..e7a847f4 100644 --- a/xorriso/lib_mgt.c +++ b/xorriso/lib_mgt.c @@ -145,7 +145,7 @@ int Xorriso_startup_libraries(struct XorrisO *xorriso, int flag) error: 'INTENTIONAL_ABORT_OF_COMPILATION__HEADERFILE_libisoburn_dot_h_TOO_OLD__SEE_xorrisoburn_dot_c' undeclared (first use in this function) error: 'LIBISOBURN_MISCONFIGURATION_' undeclared (first use in this function) */ -/* The indendation is an advise of man gcc to help old compilers ignoring */ +/* The indentation is an advise of man gcc to help old compilers ignoring */ #if xorriso_libisoburn_req_major > isoburn_header_version_major #define Isoburn_libisoburn_dot_h_too_olD 1 #endif diff --git a/xorriso/lib_mgt.h b/xorriso/lib_mgt.h index 1912df00..9be0b3a6 100644 --- a/xorriso/lib_mgt.h +++ b/xorriso/lib_mgt.h @@ -22,7 +22,7 @@ /* The library which does MMC optical drive operations */ #include -/* The library which enhances overwriteable media with ISO 9660 multi-session +/* The library which enhances overwritable media with ISO 9660 multi-session capabilities via the method invented by Andy Polyakov for growisofs */ #include diff --git a/xorriso/misc_funct.c b/xorriso/misc_funct.c index 1d91a86a..4898d9a1 100644 --- a/xorriso/misc_funct.c +++ b/xorriso/misc_funct.c @@ -176,7 +176,7 @@ ex:; (Also accepts capital letters.) @param text Input like "42", "2k", "3.14m" or "-1g" @param flag Bitfield for control purposes: - bit0= return -1 rathern than 0 on failure + bit0= return -1 rather than 0 on failure @return The derived double value */ double Scanf_io_size(char *text, int flag) diff --git a/xorriso/misc_funct.h b/xorriso/misc_funct.h index 34f64080..5b8c41e1 100644 --- a/xorriso/misc_funct.h +++ b/xorriso/misc_funct.h @@ -42,7 +42,7 @@ int System_uname(char **sysname, char **release, char **version, [kmgtpe] (2^10 to 2^60) or [s] (2048). (Also accepts capital letters.) @param text Input like "42", "2k", "3.14m" or "-1g" @param flag Bitfield for control purposes: - bit0= return -1 rathern than 0 on failure + bit0= return -1 rather than 0 on failure @return The derived double value */ double Scanf_io_size(char *text, int flag); diff --git a/xorriso/opts_d_h.c b/xorriso/opts_d_h.c index 01e482b1..0fa3812c 100644 --- a/xorriso/opts_d_h.c +++ b/xorriso/opts_d_h.c @@ -62,11 +62,11 @@ int Xorriso_option_data_cache_size(struct XorrisO *xorriso, char *num_tiles, /** @param flag bit0= use as indev bit1= use as outdev bit2= do not -reassure - bit3= regard overwriteable media as blank + bit3= regard overwritable media as blank bit4= if the drive is a regular disk file: truncate it to the write start address bit5= do not print toc of acquired drive - bit6= do not calm down drive after aquiring it + bit6= do not calm down drive after acquiring it @return <=0 error , 1 success, 2 revoked by -reassure */ int Xorriso_option_dev(struct XorrisO *xorriso, char *in_adr, int flag) @@ -1796,7 +1796,7 @@ int Xorriso_option_help(struct XorrisO *xorriso, int flag) " -rom_toc_scan \"on\"|\"force\"|\"off\"[:\"emul_on\"|\"emul_off\"]", " [:\"emul_wide\"|\"emul_narrow\"]", " Enable scanning for ISO sessions on read-only drives/media", -" and on overwriteable media with emulated TOC.", +" and on overwritable media with emulated TOC.", " -calm_drive \"in\"|\"out\"|\"all\"|\"on\"|\"off\"", " Reduce drive noise until it gets actually used again.", " -assert_volid pattern severity", @@ -1989,7 +1989,7 @@ int Xorriso_option_help(struct XorrisO *xorriso, int flag) "", " -list_delimiter text Set the list delimiter to be used instead of \"--\"", " It has to be a single word, must not be empty, not longer", -" than 80 characters, may mot contain quotation marks.", +" than 80 characters, may not contain quotation marks.", "", "Manipulation commands:", "disk_path is a path to an object in the local filesystem tree.", @@ -2362,7 +2362,7 @@ int Xorriso_option_help(struct XorrisO *xorriso, int flag) " -as cdrecord [-help|-v|dev=|speed=|blank=|fs=|-eject|-atip|padsize=|-multi]", " path|-", " Perform some cdrecord gestures, eventually write at most one", -" data track to blank, appendable or overwriteable media.", +" data track to blank, appendable or overwritable media.", " -pacifier \"xorriso\"|\"cdrecord\"|\"mkisofs\"", " Choose format of UPDATE pacifier during write operations.", "", diff --git a/xorriso/opts_p_z.c b/xorriso/opts_p_z.c index 8d2cbff4..23eb8f91 100644 --- a/xorriso/opts_p_z.c +++ b/xorriso/opts_p_z.c @@ -1533,18 +1533,18 @@ int Xorriso_option_status_history_max(struct XorrisO *xorriso, int num, /* Option -stdio_sync "on"|"off"|"end"|size */ -int Xorriso_option_stdio_sync(struct XorrisO *xorriso, char *rythm, int flag) +int Xorriso_option_stdio_sync(struct XorrisO *xorriso, char *rhythm, int flag) { double num; - if(strcmp(rythm, "default") == 0 || strcmp(rythm, "on") == 0) { + if(strcmp(rhythm, "default") == 0 || strcmp(rhythm, "on") == 0) { num= 0; - } else if(strcmp(rythm, "off") == 0) { + } else if(strcmp(rhythm, "off") == 0) { num= -1; - } else if(strcmp(rythm, "end") == 0) { + } else if(strcmp(rhythm, "end") == 0) { num= 1; } else { - num = Scanf_io_size(rythm, 0) / 2048; + num = Scanf_io_size(rhythm, 0) / 2048; if(num < 32 || num > 512 * 1024) { sprintf(xorriso->info_text, "-stdio_sync : Bad size. Use: 64k to 1g, \"on\", \"off\", \"end\""); diff --git a/xorriso/parse_exec.c b/xorriso/parse_exec.c index ae93efd0..1ca7656a 100644 --- a/xorriso/parse_exec.c +++ b/xorriso/parse_exec.c @@ -1929,7 +1929,7 @@ if (0) { fprintf(stderr, " stop\n"); fprintf(stderr, " perform Xorriso_stop_msg_watcher()\n"); } else { - fprintf(stderr, "xorriso -test: unknwon mode: %s\n", arg1); + fprintf(stderr, "xorriso -test: unknown mode: %s\n", arg1); } ret= 0; } diff --git a/xorriso/sfile.c b/xorriso/sfile.c index 77700509..1f353ff6 100644 --- a/xorriso/sfile.c +++ b/xorriso/sfile.c @@ -330,7 +330,7 @@ char *Sfile_datestr(time_t tim, short int flag) int Sfile_scale(double value, char *result, int siz, double thresh, int flag) /* - bit0= eventually ommit 'b' + bit0= omit 'b' if it would elsewise be appended bit1= make text as short as possible bit2= no fraction (if it would fit at all) */ diff --git a/xorriso/sort_cmp.c b/xorriso/sort_cmp.c index 5d0912a5..b1ca1767 100644 --- a/xorriso/sort_cmp.c +++ b/xorriso/sort_cmp.c @@ -105,7 +105,7 @@ int Xorriso__search_node(void *node_array[], int n, break; p+= l; - /* NULL elements may indicate invalid nodes. Their first valid right neigbor + /* NULL elements may indicate invalid nodes.Their first valid right neighbor will serve as proxy. If none exists, then the test pushes leftwards. */ for(pos= p - 1; pos < n; pos++) diff --git a/xorriso/text_io.c b/xorriso/text_io.c index 3ff15c29..9154bf2f 100644 --- a/xorriso/text_io.c +++ b/xorriso/text_io.c @@ -3916,7 +3916,7 @@ int Xorriso_pacifier_reset(struct XorrisO *xorriso, int flag) /* This call is to be issued by long running workers in short intervals. It will check whether enough time has elapsed since the last pacifier message and eventually issue an update message. - @param what_done A sparse description of the action, preferrably in past + @param what_done A sparse description of the action, preferably in past tense. E.g. "done" , "files added". @param count The number of objects processed so far. Is ignored if <=0. diff --git a/xorriso/text_io.h b/xorriso/text_io.h index a09d48ee..9726aff3 100644 --- a/xorriso/text_io.h +++ b/xorriso/text_io.h @@ -58,7 +58,7 @@ int Xorriso_pacifier_reset(struct XorrisO *xorriso, int flag); /* This call is to be issued by long running workers in short intervals. It will check whether enough time has elapsed since the last pacifier message and eventually issue an update message. - @param what_done A sparse description of the action, preferrably in past + @param what_done A sparse description of the action, preferably in past tense. E.g. "done" , "files added". @param count The number of objects processed so far. Is ignored if <=0. diff --git a/xorriso/write_run.c b/xorriso/write_run.c index 2b66ee69..f9960a91 100644 --- a/xorriso/write_run.c +++ b/xorriso/write_run.c @@ -1782,7 +1782,7 @@ int Xorriso_blank_media(struct XorrisO *xorriso, int flag) burn_disc_get_profile(drive, ¤t_profile, current_profile_name); disc_state = isoburn_disc_get_status(drive); - if(current_profile == 0x13) { /* overwriteable DVD-RW */ + if(current_profile == 0x13) { /* overwritable DVD-RW */ /* Depending on flag bit1 formatted DVD-RW will get blanked to sequential state or pseudo blanked by invalidating an eventual ISO image. */ if(flag&2) diff --git a/xorriso/xorrecord.1 b/xorriso/xorrecord.1 index bf73d38b..ba5f816d 100644 --- a/xorriso/xorrecord.1 +++ b/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.5.3, Oct 27, 2019" +.TH XORRECORD 1 "Version 1.5.3, Oct 28, 2019" .\" Please adjust this date whenever revising the manpage. .\" .\" Some roff macros, for reference: @@ -232,7 +232,7 @@ with non\-zero exit value. .B Settings for the burn run: .PP A burn run requires exactly one track source address argument, which -tells from where to read the data which shall be put into the upcomming +tells from where to read the data which shall be put into the upcoming session. The medium state must be either blank or appendable. .br Track source may be "\-" for standard input or the address of a readable @@ -289,7 +289,7 @@ Minimally blank an entire CD\-RW or blank an unformatted DVD\-RW. .br deformat .br -Like blank=all but with the additional ability to blank overwriteable DVD\-RW. +Like blank=all but with the additional ability to blank overwritable DVD\-RW. This will destroy their formatting and make them sequentially recordable. .br (Note: blank=deformat is not an original cdrecord options) @@ -299,7 +299,7 @@ deformat_quickest .br Like blank=deformat but blanking DVD\-RW only minimally. This is faster than full blanking but yields media incapable of -writing tracks of unpredicatable size. +writing tracks of unpredictable size. Multi\-session will not be possible either. .br (Note: blank=deformat_quickest is not an original cdrecord option.) @@ -346,7 +346,7 @@ session needs to be prepared in a special way by the filesystem formatter program. mkisofs, genisoimage, and xorrisofs expect particular info about the situation which can be retrieved by \fBxorrecord\fR option \-msinfo. .br -With overwriteable DVD or BD media, \-multi cannot mark the end of the session. +With overwritable DVD or BD media, \-multi cannot mark the end of the session. So when adding a new session, this end has to be determined from the payload. Currently only ISO\-9660 filesystems can be used that way. See option \fB\-\-grow_overwriteable_iso\fR. @@ -561,7 +561,7 @@ drive_scsi_dev_family="sg". The drive addresses may then well be given as /dev/sr* but will nevertheless get used as /dev/sg*. .TP \fB--grow_overwriteable_iso\fR -Enable emulation of multi\-session writing on overwriteable media which +Enable emulation of multi\-session writing on overwritable media which contain an ISO 9660 filesystem. This emulation is learned from growisofs \-M but adapted to the usage model of .br @@ -578,10 +578,10 @@ and to achieve similar results if ISO 9660 filesystem images are to be written. This option implies option \-isosize and therefore demands that the track source is a ISO 9660 filesystem image. .br -With overwriteable media and no option blank=fast|all present it expands an +With overwritable media and no option blank=fast|all present it expands an eventual ISO 9660 filesystem on media. It is assumed that this image's inner size description points to the end of the valuable data. -Overwriteable media with a recognizable ISO 9660 size will be regarded as +Overwritable media with a recognizable ISO 9660 size will be regarded as appendable rather than as blank. I.e. options \-msinfo and \-toc will work. \-toc will always show a single session with its size increasing with every added ISO 9660 image. diff --git a/xorriso/xorrecord.info b/xorriso/xorrecord.info index d6c0065b..8ef5c34d 100644 --- a/xorriso/xorrecord.info +++ b/xorriso/xorrecord.info @@ -148,7 +148,7 @@ File: xorrecord.info, Node: Options, Next: Examples, Prev: Xorriso, Up: Top * DriveAddr:: Drive addressing * Inquire:: Inquiring drive and media * SetBurn:: Settings for the burn run -* Verbous:: Program version and verbosity +* Verbose:: Program version and verbosity * NonCdrecord:: Options not compatible to cdrecord  @@ -241,14 +241,14 @@ File: xorrecord.info, Node: Inquire, Next: SetBurn, Prev: DriveAddr, Up: Opt with non-zero exit value.  -File: xorrecord.info, Node: SetBurn, Next: Verbous, Prev: Inquire, Up: Options +File: xorrecord.info, Node: SetBurn, Next: Verbose, Prev: Inquire, Up: Options 5.3 Settings for the burn run ============================= A burn run requires exactly one track source address argument, which tells from where to read the data which shall be put into the - upcomming session. The medium state must be either blank or + upcoming session. The medium state must be either blank or appendable. Track source may be "-" for standard input or the address of a readable file of any type except directories. Nearly all media @@ -296,7 +296,7 @@ blank=mode deformat Like blank=all but with the additional ability to blank - overwriteable DVD-RW. This will destroy their formatting and make + overwritable DVD-RW. This will destroy their formatting and make them sequentially recordable. (Note: blank=deformat is not an original cdrecord options) @@ -304,7 +304,7 @@ blank=mode deformat_quickest Like blank=deformat but blanking DVD-RW only minimally. This is faster than full blanking but yields media incapable of writing - tracks of unpredicatable size. Multi-session will not be possible + tracks of unpredictable size. Multi-session will not be possible either. (Note: blank=deformat_quickest is not an original cdrecord option.) @@ -341,7 +341,7 @@ blank=mode a special way by the filesystem formatter program. mkisofs, genisoimage, and xorrisofs expect particular info about the situation which can be retrieved by 'xorrecord' option -msinfo. - With overwriteable DVD or BD media, -multi cannot mark the end of + With overwritable DVD or BD media, -multi cannot mark the end of the session. So when adding a new session, this end has to be determined from the payload. Currently only ISO-9660 filesystems can be used that way. See option *-grow_overwriteable_iso*. @@ -457,7 +457,7 @@ minbuf=percentage Eject the drive tray after alll other work is done.  -File: xorrecord.info, Node: Verbous, Next: NonCdrecord, Prev: SetBurn, Up: Options +File: xorrecord.info, Node: Verbose, Next: NonCdrecord, Prev: SetBurn, Up: Options 5.4 Program version and verbosity ================================= @@ -491,7 +491,7 @@ File: xorrecord.info, Node: Verbous, Next: NonCdrecord, Prev: SetBurn, Up: O Afterwards end emulation without performing any drive operation.  -File: xorrecord.info, Node: NonCdrecord, Next: ExDevices, Prev: Verbous, Up: Options +File: xorrecord.info, Node: NonCdrecord, Next: ExDevices, Prev: Verbose, Up: Options 5.5 Options not compatible to cdrecord ====================================== @@ -527,7 +527,7 @@ drive_scsi_dev_family=sr|scd|sg|default well be given as /dev/sr* but will nevertheless get used as /dev/sg*. --grow_overwriteable_iso - Enable emulation of multi-session writing on overwriteable media + Enable emulation of multi-session writing on overwritable media which contain an ISO 9660 filesystem. This emulation is learned from growisofs -M but adapted to the usage model of xorrecord -msinfo @@ -539,10 +539,10 @@ drive_scsi_dev_family=sr|scd|sg|default results if ISO 9660 filesystem images are to be written. This option implies option -isosize and therefore demands that the track source is a ISO 9660 filesystem image. - With overwriteable media and no option blank=fast|all present it + With overwritable media and no option blank=fast|all present it expands an eventual ISO 9660 filesystem on media. It is assumed that this image's inner size description points to the end of the - valuable data. Overwriteable media with a recognizable ISO 9660 + valuable data. Overwritable media with a recognizable ISO 9660 size will be regarded as appendable rather than as blank. I.e. options -msinfo and -toc will work. -toc will always show a single session with its size increasing with every added ISO 9660 image. @@ -914,7 +914,7 @@ File: xorrecord.info, Node: CommandIdx, Next: ConceptIdx, Prev: Legal, Up: T * -data explicitly announce a data track: SetBurn. (line 157) * -dummy control write simulation: SetBurn. (line 106) * -eject finally eject drive tray: SetBurn. (line 214) -* -help print sparse overview of options: Verbous. (line 30) +* -help print sparse overview of options: Verbose. (line 30) * -immed keep drive buffer hungry: SetBurn. (line 208) * -inq inquire drive identifiers: Inquire. (line 8) * -isosize obtain track size from ISO 9660 superblock: SetBurn. @@ -927,9 +927,9 @@ File: xorrecord.info, Node: CommandIdx, Next: ConceptIdx, Prev: Legal, Up: T * -sao explicitly set write type SAO/DAO: SetBurn. (line 168) * -tao explicitly set write type TAO: SetBurn. (line 162) * -toc inquire medium content: Inquire. (line 22) -* -v increase program verbosity: Verbous. (line 16) -* -V log SCSI command transactions to stderr: Verbous. (line 20) -* -version report emulation and xorriso version: Verbous. (line 8) +* -v increase program verbosity: Verbose. (line 16) +* -V log SCSI command transactions to stderr: Verbose. (line 20) +* -version report emulation and xorriso version: Verbose. (line 8) * -waiti access drive only after stdin delivers data: SetBurn. (line 113) * blank= make media re-usabable or format media: SetBurn. (line 28) @@ -988,13 +988,13 @@ File: xorrecord.info, Node: ConceptIdx, Prev: CommandIdx, Up: Top * multi-session info, retrieve, -msinfo: Inquire. (line 43) * Multi-session, emulate ISO 9660, --grow_overwriteable_iso: NonCdrecord. (line 37) -* Options, overview, -help: Verbous. (line 30) +* Options, overview, -help: Verbose. (line 30) * Overwritable media, _definiton: Standards. (line 30) * Padding, at end of track, padsize=: SetBurn. (line 144) * Padding, disable, -nopad: SetBurn. (line 151) * Padding, insufficient old, -pad: SetBurn. (line 153) * Problems, reporting: Bugreport. (line 6) -* SCSI commands, log, -V: Verbous. (line 20) +* SCSI commands, log, -V: Verbose. (line 20) * Sequentially recordable media, _definiton: Standards. (line 25) * Session, _definiton: Standards. (line 12) * Speed, set for writing, speed=: SetBurn. (line 189) @@ -1004,9 +1004,9 @@ File: xorrecord.info, Node: ConceptIdx, Prev: CommandIdx, Up: Top * Track, _definiton: Standards. (line 13) * Transaction size, set, dvd_obs=: NonCdrecord. (line 74) * Tray, eject, -eject: SetBurn. (line 214) -* Verbosity, increase, -v: Verbous. (line 16) -* Verbosity, SCSI commands, -V: Verbous. (line 20) -* Version, report, -version: Verbous. (line 8) +* Verbosity, increase, -v: Verbose. (line 16) +* Verbosity, SCSI commands, -V: Verbose. (line 20) +* Version, report, -version: Verbose. (line 8) * Write simulation , control, -dummy: SetBurn. (line 106) * Write start address, set, write_start_address=: NonCdrecord. (line 127) @@ -1032,23 +1032,23 @@ Node: Options5885 Node: DriveAddr6253 Node: Inquire7618 Node: SetBurn10487 -Node: Verbous21115 -Node: NonCdrecord22665 -Node: Examples30478 -Node: ExDevices31139 -Node: ExMedium31357 -Node: ExBlank31620 -Node: ExFormat31841 -Node: ExDeformat32359 -Node: ExIsoSingle32626 -Node: ExIsoMulti32910 -Node: ExIsoFly34654 -Node: ExAfio35846 -Node: Files36844 -Node: Seealso37400 -Node: Bugreport37763 -Node: Legal38354 -Node: CommandIdx39283 -Node: ConceptIdx42846 +Node: Verbose21111 +Node: NonCdrecord22661 +Node: Examples30471 +Node: ExDevices31132 +Node: ExMedium31350 +Node: ExBlank31613 +Node: ExFormat31834 +Node: ExDeformat32352 +Node: ExIsoSingle32619 +Node: ExIsoMulti32903 +Node: ExIsoFly34647 +Node: ExAfio35839 +Node: Files36837 +Node: Seealso37393 +Node: Bugreport37756 +Node: Legal38347 +Node: CommandIdx39276 +Node: ConceptIdx42839  End Tag Table diff --git a/xorriso/xorrecord.texi b/xorriso/xorrecord.texi index 9da764bb..f55a08bc 100644 --- a/xorriso/xorrecord.texi +++ b/xorriso/xorrecord.texi @@ -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.5.3, Oct 27, 2019" +@c man .TH XORRECORD 1 "Version 1.5.3, Oct 28, 2019" @c man .\" Please adjust this date whenever revising the manpage. @c man .\" @c man .\" Some roff macros, for reference: @@ -240,7 +240,7 @@ run ends or before cdrecord emulation ends. * DriveAddr:: Drive addressing * Inquire:: Inquiring drive and media * SetBurn:: Settings for the burn run -* Verbous:: Program version and verbosity +* Verbose:: Program version and verbosity * NonCdrecord:: Options not compatible to cdrecord @end menu @c man .PP @@ -364,12 +364,12 @@ with non-zero exit value. @end table @c man .TP @c man .B Settings for the burn run: -@node SetBurn, Verbous, Inquire, Options +@node SetBurn, Verbose, Inquire, Options @section Settings for the burn run @table @asis @c man .PP A burn run requires exactly one track source address argument, which -tells from where to read the data which shall be put into the upcomming +tells from where to read the data which shall be put into the upcoming session. The medium state must be either blank or appendable. @* Track source may be "-" for standard input or the address of a readable @@ -435,7 +435,7 @@ Minimally blank an entire CD-RW or blank an unformatted DVD-RW. @* deformat @* -Like blank=all but with the additional ability to blank overwriteable DVD-RW. +Like blank=all but with the additional ability to blank overwritable DVD-RW. This will destroy their formatting and make them sequentially recordable. @* (Note: blank=deformat is not an original cdrecord options) @@ -446,7 +446,7 @@ deformat_quickest @* Like blank=deformat but blanking DVD-RW only minimally. This is faster than full blanking but yields media incapable of -writing tracks of unpredicatable size. +writing tracks of unpredictable size. Multi-session will not be possible either. @* (Note: blank=deformat_quickest is not an original cdrecord option.) @@ -497,7 +497,7 @@ session needs to be prepared in a special way by the filesystem formatter program. mkisofs, genisoimage, and xorrisofs expect particular info about the situation which can be retrieved by @command{xorrecord} option -msinfo. @* -With overwriteable DVD or BD media, -multi cannot mark the end of the session. +With overwritable DVD or BD media, -multi cannot mark the end of the session. So when adding a new session, this end has to be determined from the payload. Currently only ISO-9660 filesystems can be used that way. See option @strong{--grow_overwriteable_iso}. @@ -674,7 +674,7 @@ Eject the drive tray after alll other work is done. @end table @c man .TP @c man .B Program version and verbosity: -@node Verbous, NonCdrecord, SetBurn, Options +@node Verbose, NonCdrecord, SetBurn, Options @section Program version and verbosity @table @asis @sp 1 @@ -725,7 +725,7 @@ Afterwards end emulation without performing any drive operation. @end table @c man .TP @c man .B Options not compatible to cdrecord: -@node NonCdrecord, ExDevices, Verbous, Options +@node NonCdrecord, ExDevices, Verbose, Options @section Options not compatible to cdrecord @table @asis @sp 1 @@ -772,7 +772,7 @@ drive_scsi_dev_family="sg". The drive addresses may then well be given as @item @minus{}@minus{}grow_overwriteable_iso @kindex @minus{}@minus{}grow_overwriteable_iso emulate ISO 9660 multi-session @cindex Multi-session, emulate ISO 9660, @minus{}@minus{}grow_overwriteable_iso -Enable emulation of multi-session writing on overwriteable media which +Enable emulation of multi-session writing on overwritable media which contain an ISO 9660 filesystem. This emulation is learned from growisofs -M but adapted to the usage model of @* @@ -789,10 +789,10 @@ and to achieve similar results if ISO 9660 filesystem images are to be written. This option implies option -isosize and therefore demands that the track source is a ISO 9660 filesystem image. @* -With overwriteable media and no option blank=fast|all present it expands an +With overwritable media and no option blank=fast|all present it expands an eventual ISO 9660 filesystem on media. It is assumed that this image's inner size description points to the end of the valuable data. -Overwriteable media with a recognizable ISO 9660 size will be regarded as +Overwritable media with a recognizable ISO 9660 size will be regarded as appendable rather than as blank. I.e. options -msinfo and -toc will work. -toc will always show a single session with its size increasing with every added ISO 9660 image. diff --git a/xorriso/xorriso.1 b/xorriso/xorriso.1 index 67c1534f..8244a368 100644 --- a/xorriso/xorriso.1 +++ b/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.5.3, Oct 27, 2019" +.TH XORRISO 1 "Version 1.5.3, Oct 28, 2019" .\" Please adjust this date whenever revising the manpage. .\" .\" Some roff macros, for reference: @@ -78,7 +78,7 @@ Can check media for damages and copy readable blocks to disk. .br Can attach MD5 checksums to each data file and the whole session. .br -Scans for optical drives, blanks re\-useable optical media. +Scans for optical drives, blanks re\-usable optical media. .br Reads its instructions from command line arguments, dialog, and files. .br @@ -141,7 +141,7 @@ Adding a session to an existing ISO image is in this text referred as .br The multi\-session model of the MMC standard does not apply to all media types. But program growisofs by Andy Polyakov showed how to extend this -functionality to overwriteable media or disk files which carry valid ISO 9660 +functionality to overwritable media or disk files which carry valid ISO 9660 filesystems. .PP \fBxorriso\fR provides growing as well as an own method named @@ -180,7 +180,7 @@ Similar to multi\-session media are DVD\-R DL and minimally blanked DVD\-RW. They record only a single session of which the size must be known in advance. \fBxorriso\fR will write onto them only if command \-close is set to "on". .br -\fBOverwriteable media\fR are DVD\-RAM, DVD+RW, BD\-RE, and formatted DVD\-RW. +\fBOverwritable media\fR are DVD\-RAM, DVD+RW, BD\-RE, and formatted DVD\-RW. They offer random write access but do not provide information about their session history. If they contain one or more ISO 9660 sessions and if the first session was written by \fBxorriso\fR, then a table of content can @@ -189,7 +189,7 @@ be emulated. Else only a single overall session will be visible. DVD\-RW media can be formatted by \-format "full". They can be made unformatted by \-blank "deformat". .br -Regular files and block devices are handled as overwriteable media. +Regular files and block devices are handled as overwritable media. Pipes and other writeable file types are handled as blank multi\-session media. .PP These media can assume several states in which they offer different @@ -200,13 +200,13 @@ suitable for \fBxorriso\fR. .br Blank is the state of newly purchased optical media. With used CD\-RW and DVD\-RW it can be achieved by action \-blank "as_needed". -Overwriteable media are considered blank if they are new or if they have +Overwritable media are considered blank if they are new or if they have been marked as blank by \fBxorriso\fR. -Action \-blank "as_needed" can be used to do this marking on overwriteable +Action \-blank "as_needed" can be used to do this marking on overwritable media, or to apply mandatory formatting to new media if necessary. .br \fBAppendable\fR media accept further sessions. Either they are MMC -multi\-session media in appendable state, or they are overwriteable media +multi\-session media in appendable state, or they are overwritable media which contain an ISO image suitable for \fBxorriso\fR. .br Appendable is the state after writing a session with command \-close off. @@ -218,7 +218,7 @@ Closed is the state of DVD\-ROM media and of multi\-session media which were written with command \-close on. If the drive is read\-only hardware then it will probably show any media as closed CD\-ROM or DVD\-ROM. .br -Overwriteable media assume this state in such read\-only drives or if they +Overwritable media assume this state in such read\-only drives or if they contain unrecognizable data in the first 32 data blocks. .br Read\-only drives may or may not show session histories of multi\-session @@ -289,7 +289,7 @@ of modifying and blind growing. They all are suitable for newly created images. .PP All drive file objects have to offer rw\-permission to the user of \fBxorriso\fR. -Even those which will not be useable for reading an ISO image. +Even those which will not be usable for reading an ISO image. .br With any type of drive object, the data are considered to be organized in blocks of 2 KiB. Access happens in terms of Logical Block Address @@ -414,7 +414,7 @@ hard\-disk\-like media. Several options install a \fBMBR\fR intended boot firmware and the involved boot loaders, e.g. GRUB2 or ISOLINUX. A MBR contains boot code and a partition table. The new MBR of a follow\-up session can get in effect -only on overwriteable media. +only on overwritable media. .br MBR is read by PC\-BIOS when booting from USB stick or hard disk, and by PowerPC CHRP or PReP when booting. @@ -1115,7 +1115,7 @@ Else just avoid names longer than 253 characters. Read\-only drives do not tell the actual media type but show any media as ROM (e.g. as DVD\-ROM). The session history of MMC multi\-session media might be truncated to first and last session or even be completely false. -(The emulated history of overwriteable media is not affected by this.) +(The emulated history of overwritable media is not affected by this.) .br To have in case of failure a chance of getting the session history and especially the address of the last session, there is a scan for ISO 9660 @@ -1129,11 +1129,11 @@ multi\-session DVD or BD. If on such a system \fBxorriso\fR has no own MMC capabilities then it may still find that session from a scanned table of content. Setting "force" handles any media like a ROM medium with setting "on". .br -On the other hand the emulation of session history on overwriteable media +On the other hand the emulation of session history on overwritable media can hamper reading of partly damaged media. Setting "off:emul_off" disables the elsewise trustworthy table\-of\-content scan for those media. .br -The table\-of\-content scan on overwriteable media normally searches only up to +The table\-of\-content scan on overwritable media normally searches only up to the end of the session that is pointed to by the superblock at block 0. Setting "on:emul_wide" lets the scan continue up to the end of the medium. This may be useful after copying a medium with \-check_media patch_lba0=on @@ -1162,7 +1162,7 @@ effective access permissions. This implies to try opening those files for writing, which otherwise will happen only later and only if actual writing is desired. .br -The test result is used for classifying the pseudo drives as overwriteable, +The test result is used for classifying the pseudo drives as overwritable, read\-only, write\-only, or uselessly empty. This may lead to earlier detection of severe problems, and may avoid some less severe error events. .br @@ -2526,16 +2526,16 @@ then this command leads to a FAILURE event. Defined modes are: as_needed, fast, all, deformat, deformat_quickest .br -"as_needed" cares for used CD\-RW, DVD\-RW and for used overwriteable media +"as_needed" cares for used CD\-RW, DVD\-RW and for used overwritable media by applying \-blank "fast". It applies \-format "full" to yet unformatted DVD\-RAM and BD\-RE. Other media in blank state are gracefully ignored. Media which cannot be made ready for writing from scratch cause a FAILURE event. .br "fast" makes CD\-RW and unformatted DVD\-RW re\-usable, or invalidates -overwriteable ISO images. "all" might work more thoroughly and need more time. +overwritable ISO images. "all" might work more thoroughly and need more time. .br -"deformat" converts overwriteable DVD\-RW into unformatted ones. +"deformat" converts overwritable DVD\-RW into unformatted ones. .br "deformat_quickest" is a faster way to deformat or blank DVD\-RW but produces media which are only suitable for a single session. @@ -2555,7 +2555,7 @@ Blanking will nevertheless only succeed if the drive is willing to do it. .br .TP \fB\-format\fR mode -Convert unformatted DVD\-RW into overwriteable ones, "de\-ice" DVD+RW, format +Convert unformatted DVD\-RW into overwritable ones, "de\-ice" DVD+RW, format newly purchased BD\-RE or BD\-R, re\-format DVD\-RAM or BD\-RE. .br Defined modes are: @@ -2811,7 +2811,7 @@ Default is "old_rr" which uses Rock Ridge version 1.10. This implies also "aaip_susp_1_10" allows AAIP to be written as unofficial extension of RRIP rather than as official extension under SUSP\-1.12. .br -"no_emul_toc" saves 64 kB with the first session on overwriteable media +"no_emul_toc" saves 64 kB with the first session on overwritable media but makes the image incapable of displaying its session history. .br "iso_9660_1999" causes the production of an additional directory tree @@ -3201,7 +3201,7 @@ The same effect is achieved by \-padding mode "included". .PP Contrary to published specifications many BIOSes will load an El Torito record from the first session on media and not from the last one, which -gets mounted by default. This makes no problems with overwriteable media, +gets mounted by default. This makes no problems with overwritable media, because they appear to inadverted readers as one single session. .br But with multi\-session media CD\-R[W], DVD\-R[W], DVD+R, it implies that the @@ -3213,7 +3213,7 @@ If a boot image from ISOLINUX or GRUB is known to be present on media then it is advised to patch it when a follow\-up session gets written. But one should not rely on the capability to influence the bootability of the existing sessions, unless one -can assume overwriteable media. +can assume overwritable media. .br Normally the boot images are data files inside the ISO filesystem. By special path "\-\-interval:appended_partition_NNN:all::" it is possible to @@ -4165,9 +4165,9 @@ Precedence is: "dvdrw", "cdrw", "dvd", "cdrom", "cd". Show media specific tables of content. This is the session history of the medium, not the ISO image directory tree. .br -In case of overwriteable media holding a valid ISO image, it may happen that +In case of overwritable media holding a valid ISO image, it may happen that only a single session gets shown. But if the first session on the -overwriteable media was written by \fBxorriso\fR then a complete +overwritable media was written by \fBxorriso\fR then a complete session history can be emulated. .br A drive which is incapable of writing may show any media as CD\-ROM or DVD\-ROM @@ -5002,7 +5002,7 @@ same name and hardcoded parameter "on", e.g. \-acl "on". Explicit parameters are expected by \-\-stdio_sync and \-\-scdbackup_tag. .br -The capability to preserve multi\-session history on overwriteable media +The capability to preserve multi\-session history on overwritable media gets disabled by default. It can be enabled by using \-\-emul\-toc with the first session. See \-compliance no_emul_toc. .br @@ -5074,7 +5074,7 @@ It ignores most other options of cdrecord and cdrskin but refuses on \-audio, \-scanbus, and on blanking modes unknown to \fBxorriso\fR. .br The scope is only a single data track per session to be written -to blank, overwriteable, or appendable media. The medium gets closed if +to blank, overwritable, or appendable media. The medium gets closed if closing is applicable and not option \-multi is present. .br If an input drive was acquired, then it is given up. @@ -5087,7 +5087,7 @@ If a track source is given, then an automatic \-commit happens at the end of the "cdrecord" option list. .br \-\-grow_overwriteable_iso -enables emulation of multi\-session on overwriteable +enables emulation of multi\-session on overwritable media. To enable emulation of a TOC, the first session needs \-C 0,32 with \-as mkisofs (but no \-M) and \-\-grow_overwriteable_iso write_start_address=32s with \-as cdrecord. @@ -5899,7 +5899,7 @@ If this does not help, insert a run of "sleep 10" between xorriso and dd. This example works for multi\-session media only. Add cdrskin option \-\-grow_overwriteable_iso to all \-as cdrecord runs -in order to enable multi\-session emulation on overwriteable media. +in order to enable multi\-session emulation on overwritable media. .SS .B Let xorriso work underneath growisofs growisofs expects an ISO formatter program which understands options \-C and @@ -5930,7 +5930,7 @@ $ growisofs \-Z /dev/dvd \-\- outdev \- \-update_r /my/files /files $ growisofs \-M /dev/dvd \-\- outdev \- \-update_r /my/files /files .br growisofs has excellent burn capabilities with DVD and BD. -It does not emulate session history on overwriteable media, though. +It does not emulate session history on overwritable media, though. .SS .B Adjust thresholds for verbosity, exit value and program abort Be quite verbose, exit 32 if severity "FAILURE" was encountered, @@ -6034,7 +6034,7 @@ it is possible to access the session trees which represent the older backup versions. With CD media, GNU/Linux mount accepts session numbers directly by its option "session=". .br -Multi\-session media and most overwriteable media written by \fBxorriso\fR +Multi\-session media and most overwritable media written by \fBxorriso\fR can tell the sbsectors of their sessions by \fBxorriso\fR command \-toc. Used after \-commit the following command prints the matching mount command for the newly written session (here for mount point /mnt): diff --git a/xorriso/xorriso.h b/xorriso/xorriso.h index 9a431829..b4e45e1d 100644 --- a/xorriso/xorriso.h +++ b/xorriso/xorriso.h @@ -207,8 +207,8 @@ int Xorriso_startup_libraries(struct XorrisO *xorriso, int flag); functions from the Command API. Wenn all desired activities are done, you may check whether there are - uncommited changes pending, compute an exit value, destroy the XorrisO - object, and exit your program. + uncommitted changes pending, compute an exit value, destroy the + XorrisO object, and exit your program. */ @@ -2096,7 +2096,7 @@ int Xorriso_option_status_history_max(struct XorrisO *xorriso, int num1, /* Command -stdio_sync "on"|"off"|"end"|size */ /* @since 0.4.6 */ -int Xorriso_option_stdio_sync(struct XorrisO *xorriso, char *rythm, int flag); +int Xorriso_option_stdio_sync(struct XorrisO *xorriso, char *rhythm, int flag); /* Command -stream_recording */ /* @since 0.1.8 */ diff --git a/xorriso/xorriso.info b/xorriso/xorriso.info index 5ef419dd..77ce31e5 100644 --- a/xorriso/xorriso.info +++ b/xorriso/xorriso.info @@ -77,7 +77,7 @@ Content may get zisofs compressed or filtered by external processes. Can issue commands to mount older sessions on GNU/Linux or FreeBSD. Can check media for damages and copy readable blocks to disk. Can attach MD5 checksums to each data file and the whole session. -Scans for optical drives, blanks re-useable optical media. +Scans for optical drives, blanks re-usable optical media. Reads its instructions from command line arguments, dialog, and files. Provides navigation commands for interactive ISO image manipulation. Adjustable thresholds for abort, exit value, and problem reporting. @@ -118,7 +118,7 @@ Adding a session to an existing ISO image is in this text referred as *growing*. The multi-session model of the MMC standard does not apply to all media types. But program growisofs by Andy Polyakov showed how to extend this -functionality to overwriteable media or disk files which carry valid ISO +functionality to overwritable media or disk files which carry valid ISO 9660 filesystems. 'xorriso' provides growing as well as an own method named *modifying* @@ -159,7 +159,7 @@ Similar to multi-session media are DVD-R DL and minimally blanked DVD-RW. They record only a single session of which the size must be known in advance. 'xorriso' will write onto them only if command -close is set to "on". -*Overwriteable media* are DVD-RAM, DVD+RW, BD-RE, and formatted DVD-RW. +*Overwritable media* are DVD-RAM, DVD+RW, BD-RE, and formatted DVD-RW. They offer random write access but do not provide information about their session history. If they contain one or more ISO 9660 sessions and if the first session was written by 'xorriso', then a table of @@ -167,7 +167,7 @@ content can be emulated. Else only a single overall session will be visible. DVD-RW media can be formatted by -format "full". They can be made unformatted by -blank "deformat". -Regular files and block devices are handled as overwriteable media. +Regular files and block devices are handled as overwritable media. Pipes and other writeable file types are handled as blank multi-session media. @@ -178,13 +178,13 @@ capabilities. suitable for 'xorriso'. Blank is the state of newly purchased optical media. With used CD-RW and DVD-RW it can be achieved by action -blank "as_needed". -Overwriteable media are considered blank if they are new or if they have +Overwritable media are considered blank if they are new or if they have been marked as blank by 'xorriso'. Action -blank "as_needed" can be -used to do this marking on overwriteable media, or to apply mandatory +used to do this marking on overwritable media, or to apply mandatory formatting to new media if necessary. *Appendable* media accept further sessions. Either they are MMC -multi-session media in appendable state, or they are overwriteable media +multi-session media in appendable state, or they are overwritable media which contain an ISO image suitable for 'xorriso'. Appendable is the state after writing a session with command -close off. @@ -194,8 +194,8 @@ suitable for 'xorriso'. Closed is the state of DVD-ROM media and of multi-session media which were written with command -close on. If the drive is read-only hardware then it will probably show any media as closed CD-ROM or DVD-ROM. -Overwriteable media assume this state in such read-only drives or if -they contain unrecognizable data in the first 32 data blocks. +Overwritable media assume this state in such read-only drives or if they +contain unrecognizable data in the first 32 data blocks. Read-only drives may or may not show session histories of multi-session media. Often only the first and the last session are visible. Sometimes not even that. Command -rom_toc_scan might or might not help @@ -267,7 +267,7 @@ modifying and blind growing. They all are suitable for newly created images. All drive file objects have to offer rw-permission to the user of -'xorriso'. Even those which will not be useable for reading an ISO +'xorriso'. Even those which will not be usable for reading an ISO image. With any type of drive object, the data are considered to be organized in blocks of 2 KiB. Access happens in terms of Logical Block Address @@ -369,7 +369,7 @@ hard-disk-like media. Several options install a *MBR* (Master Boot Record), It may get adjusted according to the needs of the intended boot firmware and the involved boot loaders, e.g. GRUB2 or ISOLINUX. A MBR contains boot code and a partition table. The new MBR of a follow-up -session can get in effect only on overwriteable media. +session can get in effect only on overwritable media. MBR is read by PC-BIOS when booting from USB stick or hard disk, and by PowerPC CHRP or PReP when booting. An MBR partition with type 0xee indicates the presence of GPT. @@ -1000,7 +1000,7 @@ activate them only after image loading. Read-only drives do not tell the actual media type but show any media as ROM (e.g. as DVD-ROM). The session history of MMC multi-session media might be truncated to first and last session or - even be completely false. (The emulated history of overwriteable + even be completely false. (The emulated history of overwritable media is not affected by this.) To have in case of failure a chance of getting the session history and especially the address of the last session, there is a scan for @@ -1014,11 +1014,11 @@ activate them only after image loading. has no own MMC capabilities then it may still find that session from a scanned table of content. Setting "force" handles any media like a ROM medium with setting "on". - On the other hand the emulation of session history on overwriteable + On the other hand the emulation of session history on overwritable media can hamper reading of partly damaged media. Setting "off:emul_off" disables the elsewise trustworthy table-of-content scan for those media. - The table-of-content scan on overwriteable media normally searches + The table-of-content scan on overwritable media normally searches only up to the end of the session that is pointed to by the superblock at block 0. Setting "on:emul_wide" lets the scan continue up to the end of the medium. This may be useful after @@ -1044,7 +1044,7 @@ activate them only after image loading. those files for writing, which otherwise will happen only later and only if actual writing is desired. The test result is used for classifying the pseudo drives as - overwriteable, read-only, write-only, or uselessly empty. This may + overwritable, read-only, write-only, or uselessly empty. This may lead to earlier detection of severe problems, and may avoid some less severe error events. Mode "appendable_wo" is like "on" with the additional property that @@ -2157,15 +2157,15 @@ File: xorriso.info, Node: Writing, Next: SetWrite, Prev: Filter, Up: Command the same and if the ISO image was altered then this command leads to a FAILURE event. Defined modes are: as_needed, fast, all, deformat, deformat_quickest - "as_needed" cares for used CD-RW, DVD-RW and for used overwriteable + "as_needed" cares for used CD-RW, DVD-RW and for used overwritable media by applying -blank "fast". It applies -format "full" to yet unformatted DVD-RAM and BD-RE. Other media in blank state are gracefully ignored. Media which cannot be made ready for writing from scratch cause a FAILURE event. "fast" makes CD-RW and unformatted DVD-RW re-usable, or invalidates - overwriteable ISO images. "all" might work more thoroughly and - need more time. - "deformat" converts overwriteable DVD-RW into unformatted ones. + overwritable ISO images. "all" might work more thoroughly and need + more time. + "deformat" converts overwritable DVD-RW into unformatted ones. "deformat_quickest" is a faster way to deformat or blank DVD-RW but produces media which are only suitable for a single session. Some drives announce this state by not offering feature 21h, but some @@ -2181,9 +2181,8 @@ File: xorriso.info, Node: Writing, Next: SetWrite, Prev: Filter, Up: Command Blanking will nevertheless only succeed if the drive is willing to do it. -format mode - Convert unformatted DVD-RW into overwriteable ones, "de-ice" - DVD+RW, format newly purchased BD-RE or BD-R, re-format DVD-RAM or - BD-RE. + Convert unformatted DVD-RW into overwritable ones, "de-ice" DVD+RW, + format newly purchased BD-RE or BD-R, re-format DVD-RAM or BD-RE. Defined modes are: as_needed, full, fast, by_index_, fast_by_index_, by_size_, fast_by_size_, without_spare @@ -2404,7 +2403,7 @@ according to the setting of command -acl. "aaip_susp_1_10_off". "aaip_susp_1_10" allows AAIP to be written as unofficial extension of RRIP rather than as official extension under SUSP-1.12. - "no_emul_toc" saves 64 kB with the first session on overwriteable + "no_emul_toc" saves 64 kB with the first session on overwritable media but makes the image incapable of displaying its session history. "iso_9660_1999" causes the production of an additional directory @@ -2720,7 +2719,7 @@ File: xorriso.info, Node: Bootable, Next: Jigdo, Prev: SetWrite, Up: Command Contrary to published specifications many BIOSes will load an El Torito record from the first session on media and not from the last one, which -gets mounted by default. This makes no problems with overwriteable +gets mounted by default. This makes no problems with overwritable media, because they appear to inadverted readers as one single session. But with multi-session media CD-R[W], DVD-R[W], DVD+R, it implies that the whole bootable system has to reside already in the first session and @@ -2729,7 +2728,7 @@ system expects after mounting the ISO image. If a boot image from ISOLINUX or GRUB is known to be present on media then it is advised to patch it when a follow-up session gets written. But one should not rely on the capability to influence the bootability -of the existing sessions, unless one can assume overwriteable media. +of the existing sessions, unless one can assume overwritable media. Normally the boot images are data files inside the ISO filesystem. By special path "-interval:appended_partition_NNN:all::" it is possible to refer to an appended partition. The number NNN gives the partition @@ -3502,9 +3501,9 @@ File: xorriso.info, Node: Inquiry, Next: Navigate, Prev: DialogCtl, Up: Comm Show media specific tables of content. This is the session history of the medium, not the ISO image directory tree. - In case of overwriteable media holding a valid ISO image, it may + In case of overwritable media holding a valid ISO image, it may happen that only a single session gets shown. But if the first - session on the overwriteable media was written by 'xorriso' then a + session on the overwritable media was written by 'xorriso' then a complete session history can be emulated. A drive which is incapable of writing may show any media as CD-ROM or DVD-ROM with only one or two sessions on it. The last of these @@ -4219,7 +4218,7 @@ said programs trigger comparable actions. 'xorriso' commands with the same name and hardcoded parameter "on", e.g. -acl "on". Explicit parameters are expected by --stdio_sync and --scdbackup_tag. - The capability to preserve multi-session history on overwriteable + The capability to preserve multi-session history on overwritable media gets disabled by default. It can be enabled by using --emul-toc with the first session. See -compliance no_emul_toc. --sort-weight gets as parameters a number and an iso_rr_path. The @@ -4270,7 +4269,7 @@ said programs trigger comparable actions. It ignores most other options of cdrecord and cdrskin but refuses on -audio, -scanbus, and on blanking modes unknown to 'xorriso'. The scope is only a single data track per session to be written to - blank, overwriteable, or appendable media. The medium gets closed + blank, overwritable, or appendable media. The medium gets closed if closing is applicable and not option -multi is present. If an input drive was acquired, then it is given up. This is only allowed if no image changes are pending. @@ -4279,7 +4278,7 @@ said programs trigger comparable actions. If a track source is given, then an automatic -commit happens at the end of the "cdrecord" option list. --grow_overwriteable_iso enables emulation of multi-session on - overwriteable media. To enable emulation of a TOC, the first + overwritable media. To enable emulation of a TOC, the first session needs -C 0,32 with -as mkisofs (but no -M) and --grow_overwriteable_iso write_start_address=32s with -as cdrecord. @@ -4950,7 +4949,7 @@ xorriso and dd. This example works for multi-session media only. Add cdrskin option --grow_overwriteable_iso to all -as cdrecord runs in order to enable -multi-session emulation on overwriteable media. +multi-session emulation on overwritable media.  File: xorriso.info, Node: ExGrowisofs, Next: ExException, Prev: ExMkisofs, Up: Examples @@ -4981,7 +4980,7 @@ but -outdev must be set to "-". So use "outdev" instead: $ growisofs -M /dev/dvd -- outdev - -update_r /my/files /files growisofs has excellent burn capabilities with DVD and BD. It does -not emulate session history on overwriteable media, though. +not emulate session history on overwritable media, though.  File: xorriso.info, Node: ExException, Next: ExTime, Prev: ExGrowisofs, Up: Examples @@ -5075,10 +5074,10 @@ With *mount* option *-o "sbsector="* on GNU/Linux or *-s* on FreeBSD or NetBSD it is possible to access the session trees which represent the older backup versions. With CD media, GNU/Linux mount accepts session numbers directly by its option "session=". -Multi-session media and most overwriteable media written by 'xorriso' -can tell the sbsectors of their sessions by 'xorriso' command -toc. -Used after -commit the following command prints the matching mount -command for the newly written session (here for mount point /mnt): +Multi-session media and most overwritable media written by 'xorriso' can +tell the sbsectors of their sessions by 'xorriso' command -toc. Used +after -commit the following command prints the matching mount command +for the newly written session (here for mount point /mnt): -mount_cmd "indev" "auto" "auto" /mnt @@ -5339,7 +5338,7 @@ File: xorriso.info, Node: CommandIdx, Next: ConceptIdx, Prev: Legal, Up: Top * -chown_r sets ownership in ISO image: Manip. (line 47) * -clone copies ISO directory tree: Insert. (line 185) * -close controls media closing: SetWrite. (line 401) -* -close_damaged closes damaged track and session: Writing. (line 164) +* -close_damaged closes damaged track and session: Writing. (line 163) * -close_filter_list bans filter registration: Filter. (line 50) * -commit writes pending ISO image: Writing. (line 27) * -commit_eject writes and ejects: Writing. (line 53) @@ -5398,7 +5397,7 @@ File: xorriso.info, Node: CommandIdx, Next: ConceptIdx, Prev: Legal, Up: Top * -getfattr shows xattr in ISO image: Navigate. (line 69) * -getfattr_r shows xattr in ISO image: Navigate. (line 75) * -gid sets global ownership: SetWrite. (line 287) -* -grow_blindly overides next writeable address: AqDrive. (line 112) +* -grow_blindly overrides next writeable address: AqDrive. (line 112) * -hardlinks controls handling of hard links: Loading. (line 107) * -help prints help text: Scripting. (line 19) * -hfsplus enables production of HFS+ partition: SetWrite. (line 14) @@ -5416,9 +5415,9 @@ File: xorriso.info, Node: CommandIdx, Next: ConceptIdx, Prev: Legal, Up: Top * -list_arg_sorting prints sorting order of -x: ArgSort. (line 26) * -list_delimiter replaces '--': Scripting. (line 55) * -list_extras lists compile time extra features: Scripting. (line 24) -* -list_formats lists available formats: Writing. (line 129) -* -list_profiles lists supported media: Writing. (line 177) -* -list_speeds lists available write speeds: Writing. (line 140) +* -list_formats lists available formats: Writing. (line 128) +* -list_profiles lists supported media: Writing. (line 176) +* -list_speeds lists available write speeds: Writing. (line 139) * -lns creates ISO symbolic link: Insert. (line 181) * -load addresses a particular session as input: Loading. (line 33) * -local_charset sets terminal character set: Charset. (line 57) @@ -5588,7 +5587,7 @@ File: xorriso.info, Node: ConceptIdx, Prev: CommandIdx, Up: Top * Create, new ISO image, _definition: Methods. (line 7) * Cylinder alignment, _definition: Bootable. (line 338) * Cylinder size, _definition: Bootable. (line 323) -* Damaged track and session, close, -close_damaged: Writing. (line 164) +* Damaged track and session, close, -close_damaged: Writing. (line 163) * DEC Alpha SRM boot sector, production: Bootable. (line 398) * Delete, from ISO image, -rm: Manip. (line 20) * Delete, from ISO image, -rm_r: Manip. (line 26) @@ -5614,7 +5613,7 @@ File: xorriso.info, Node: ConceptIdx, Prev: CommandIdx, Up: Top * Drive, for output, -outdev: AqDrive. (line 29) * Drive, get drive list, -devices: Inquiry. (line 7) * Drive, get drive list, -device_links: Inquiry. (line 17) -* Drive, list supported media, -list_profiles: Writing. (line 177) +* Drive, list supported media, -list_profiles: Writing. (line 176) * Drive, reduce activity, -calm_drive: Loading. (line 303) * Drive, report SCSI commands, -scsi_log: Scripting. (line 143) * Drive, write and eject, -commit_eject: Writing. (line 53) @@ -5717,8 +5716,8 @@ File: xorriso.info, Node: ConceptIdx, Prev: CommandIdx, Up: Top * MD5, control handling, -md5: Loading. (line 163) * Media, erase, -blank: Writing. (line 57) * Media, format, -format: Writing. (line 87) -* Media, list formats, -list_formats: Writing. (line 129) -* Media, list write speeds, -list_speeds: Writing. (line 140) +* Media, list formats, -list_formats: Writing. (line 128) +* Media, list write speeds, -list_speeds: Writing. (line 139) * MIPS boot file, activation: Bootable. (line 360) * mkisofs, Emulation: Emulation. (line 17) * Modifying, _definition: Methods. (line 28) @@ -5742,7 +5741,7 @@ File: xorriso.info, Node: ConceptIdx, Prev: CommandIdx, Up: Top * Navigate, tell ISO working directory, -pwd: Navigate. (line 19) * Next writeable address, -grow_blindly: AqDrive. (line 112) * Output Character Set, _definition: Charset. (line 26) -* Overwriteable media, _definition: Media. (line 14) +* Overwritable media, _definition: Media. (line 14) * Ownership, global in ISO image, -uid: SetWrite. (line 284) * Ownership, in ISO image, -chown: Manip. (line 43) * Ownership, in ISO image, -chown_r: Manip. (line 47) @@ -5865,59 +5864,59 @@ File: xorriso.info, Node: ConceptIdx, Prev: CommandIdx, Up: Top Tag Table: Node: Top415 Node: Overview1405 -Node: Model3442 -Node: Media6346 -Node: Methods9033 -Node: Drives11619 -Node: Extras15561 -Node: Processing20274 -Node: Dialog23909 -Node: Commands25598 -Node: ArgSort27275 -Node: AqDrive28769 -Node: Loading35926 -Node: Insert55883 -Node: SetInsert67386 -Node: Manip76818 -Node: CmdFind86918 -Node: Filter105847 -Node: Writing110469 -Node: SetWrite120625 -Node: Bootable145384 -Node: Jigdo172341 -Node: Charset176600 -Node: Exception179929 -Node: DialogCtl186058 -Node: Inquiry188660 -Node: Navigate197544 -Node: Verify206001 -Node: Restore216472 -Node: Emulation225149 -Node: Scripting235608 -Node: Frontend243391 -Node: Examples253017 -Node: ExDevices254195 -Node: ExCreate254856 -Node: ExDialog256156 -Node: ExGrowing257427 -Node: ExModifying258236 -Node: ExBootable258746 -Node: ExCharset259301 -Node: ExPseudo260197 -Node: ExCdrecord261124 -Node: ExMkisofs261444 -Node: ExGrowisofs263342 -Node: ExException264496 -Node: ExTime264954 -Node: ExIncBackup265412 -Node: ExRestore269438 -Node: ExRecovery270384 -Node: Files270956 -Node: Environ272290 -Node: Seealso273038 -Node: Bugreport273755 -Node: Legal274346 -Node: CommandIdx275358 -Node: ConceptIdx292901 +Node: Model3441 +Node: Media6344 +Node: Methods9025 +Node: Drives11611 +Node: Extras15552 +Node: Processing20264 +Node: Dialog23899 +Node: Commands25588 +Node: ArgSort27265 +Node: AqDrive28759 +Node: Loading35916 +Node: Insert55869 +Node: SetInsert67372 +Node: Manip76804 +Node: CmdFind86904 +Node: Filter105833 +Node: Writing110455 +Node: SetWrite120602 +Node: Bootable145360 +Node: Jigdo172315 +Node: Charset176574 +Node: Exception179903 +Node: DialogCtl186032 +Node: Inquiry188634 +Node: Navigate197516 +Node: Verify205973 +Node: Restore216444 +Node: Emulation225121 +Node: Scripting235577 +Node: Frontend243360 +Node: Examples252986 +Node: ExDevices254164 +Node: ExCreate254825 +Node: ExDialog256125 +Node: ExGrowing257396 +Node: ExModifying258205 +Node: ExBootable258715 +Node: ExCharset259270 +Node: ExPseudo260166 +Node: ExCdrecord261093 +Node: ExMkisofs261413 +Node: ExGrowisofs263310 +Node: ExException264463 +Node: ExTime264921 +Node: ExIncBackup265379 +Node: ExRestore269405 +Node: ExRecovery270351 +Node: Files270923 +Node: Environ272257 +Node: Seealso273005 +Node: Bugreport273722 +Node: Legal274313 +Node: CommandIdx275325 +Node: ConceptIdx292868  End Tag Table diff --git a/xorriso/xorriso.texi b/xorriso/xorriso.texi index 570a29d9..3fc2c856 100644 --- a/xorriso/xorriso.texi +++ b/xorriso/xorriso.texi @@ -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.5.3, Oct 27, 2019" +@c man .TH XORRISO 1 "Version 1.5.3, Oct 28, 2019" @c man .\" Please adjust this date whenever revising the manpage. @c man .\" @c man .\" Some roff macros, for reference: @@ -168,7 +168,7 @@ Can check media for damages and copy readable blocks to disk. @* Can attach MD5 checksums to each data file and the whole session. @* -Scans for optical drives, blanks re-useable optical media. +Scans for optical drives, blanks re-usable optical media. @* Reads its instructions from command line arguments, dialog, and files. @* @@ -241,7 +241,7 @@ Adding a session to an existing ISO image is in this text referred as @* The multi-session model of the MMC standard does not apply to all media types. But program growisofs by Andy Polyakov showed how to extend this -functionality to overwriteable media or disk files which carry valid ISO 9660 +functionality to overwritable media or disk files which carry valid ISO 9660 filesystems. @c man .PP @sp 1 @@ -287,8 +287,8 @@ Similar to multi-session media are DVD-R DL and minimally blanked DVD-RW. They record only a single session of which the size must be known in advance. @command{xorriso} will write onto them only if command -close is set to "on". @* -@cindex Overwriteable media, _definition -@strong{Overwriteable media} are DVD-RAM, DVD+RW, BD-RE, and formatted DVD-RW. +@cindex Overwritable media, _definition +@strong{Overwritable media} are DVD-RAM, DVD+RW, BD-RE, and formatted DVD-RW. They offer random write access but do not provide information about their session history. If they contain one or more ISO 9660 sessions and if the first session was written by @command{xorriso}, then a table of content can @@ -297,7 +297,7 @@ be emulated. Else only a single overall session will be visible. DVD-RW media can be formatted by -format "full". They can be made unformatted by -blank "deformat". @* -Regular files and block devices are handled as overwriteable media. +Regular files and block devices are handled as overwritable media. Pipes and other writeable file types are handled as blank multi-session media. @c man .PP @sp 1 @@ -311,15 +311,15 @@ suitable for @command{xorriso}. @* Blank is the state of newly purchased optical media. With used CD-RW and DVD-RW it can be achieved by action -blank "as_needed". -Overwriteable media are considered blank if they are new or if they have +Overwritable media are considered blank if they are new or if they have been marked as blank by @command{xorriso}. -Action -blank "as_needed" can be used to do this marking on overwriteable +Action -blank "as_needed" can be used to do this marking on overwritable media, or to apply mandatory formatting to new media if necessary. @* @sp 1 @cindex Appendable media, _definition @strong{Appendable} media accept further sessions. Either they are MMC -multi-session media in appendable state, or they are overwriteable media +multi-session media in appendable state, or they are overwritable media which contain an ISO image suitable for @command{xorriso}. @* Appendable is the state after writing a session with command -close off. @@ -333,7 +333,7 @@ Closed is the state of DVD-ROM media and of multi-session media which were written with command -close on. If the drive is read-only hardware then it will probably show any media as closed CD-ROM or DVD-ROM. @* -Overwriteable media assume this state in such read-only drives or if they +Overwritable media assume this state in such read-only drives or if they contain unrecognizable data in the first 32 data blocks. @* Read-only drives may or may not show session histories of multi-session @@ -418,7 +418,7 @@ of modifying and blind growing. They all are suitable for newly created images. @sp 1 All drive file objects have to offer rw-permission to the user of @command{xorriso}. -Even those which will not be useable for reading an ISO image. +Even those which will not be usable for reading an ISO image. @* @cindex LBA, _definition With any type of drive object, the data are considered to be organized in @@ -555,7 +555,7 @@ hard-disk-like media. Several options install a @strong{MBR} intended boot firmware and the involved boot loaders, e.g. GRUB2 or ISOLINUX. A MBR contains boot code and a partition table. The new MBR of a follow-up session can get in effect -only on overwriteable media. +only on overwritable media. @* MBR is read by PC-BIOS when booting from USB stick or hard disk, and by PowerPC CHRP or PReP when booting. @@ -989,7 +989,7 @@ If you decide so, consider to put the command into a global startup file like /etc/opt/xorriso/rc. @c man .TP @item -grow_blindly "off"|predicted_nwa -@kindex -grow_blindly overides next writeable address +@kindex -grow_blindly overrides next writeable address @cindex Next writeable address, -grow_blindly If predicted_nwa is a non-negative number then perform blind growing rather than modifying if -indev and -outdev are set to different drives. @@ -1375,7 +1375,7 @@ Else just avoid names longer than 253 characters. Read-only drives do not tell the actual media type but show any media as ROM (e.g. as DVD-ROM). The session history of MMC multi-session media might be truncated to first and last session or even be completely false. -(The emulated history of overwriteable media is not affected by this.) +(The emulated history of overwritable media is not affected by this.) @* To have in case of failure a chance of getting the session history and especially the address of the last session, there is a scan for ISO 9660 @@ -1389,11 +1389,11 @@ multi-session DVD or BD. If on such a system @command{xorriso} has no own MMC capabilities then it may still find that session from a scanned table of content. Setting "force" handles any media like a ROM medium with setting "on". @* -On the other hand the emulation of session history on overwriteable media +On the other hand the emulation of session history on overwritable media can hamper reading of partly damaged media. Setting "off:emul_off" disables the elsewise trustworthy table-of-content scan for those media. @* -The table-of-content scan on overwriteable media normally searches only up to +The table-of-content scan on overwritable media normally searches only up to the end of the session that is pointed to by the superblock at block 0. Setting "on:emul_wide" lets the scan continue up to the end of the medium. This may be useful after copying a medium with -check_media patch_lba0=on @@ -1428,7 +1428,7 @@ effective access permissions. This implies to try opening those files for writing, which otherwise will happen only later and only if actual writing is desired. @* -The test result is used for classifying the pseudo drives as overwriteable, +The test result is used for classifying the pseudo drives as overwritable, read-only, write-only, or uselessly empty. This may lead to earlier detection of severe problems, and may avoid some less severe error events. @* @@ -2979,16 +2979,16 @@ then this command leads to a FAILURE event. Defined modes are: as_needed, fast, all, deformat, deformat_quickest @* -"as_needed" cares for used CD-RW, DVD-RW and for used overwriteable media +"as_needed" cares for used CD-RW, DVD-RW and for used overwritable media by applying -blank "fast". It applies -format "full" to yet unformatted DVD-RAM and BD-RE. Other media in blank state are gracefully ignored. Media which cannot be made ready for writing from scratch cause a FAILURE event. @* "fast" makes CD-RW and unformatted DVD-RW re-usable, or invalidates -overwriteable ISO images. "all" might work more thoroughly and need more time. +overwritable ISO images. "all" might work more thoroughly and need more time. @* -"deformat" converts overwriteable DVD-RW into unformatted ones. +"deformat" converts overwritable DVD-RW into unformatted ones. @* "deformat_quickest" is a faster way to deformat or blank DVD-RW but produces media which are only suitable for a single session. @@ -3010,7 +3010,7 @@ Blanking will nevertheless only succeed if the drive is willing to do it. @item -format mode @kindex -format formats media @cindex Media, format, -format -Convert unformatted DVD-RW into overwriteable ones, "de-ice" DVD+RW, format +Convert unformatted DVD-RW into overwritable ones, "de-ice" DVD+RW, format newly purchased BD-RE or BD-R, re-format DVD-RAM or BD-RE. @* Defined modes are: @@ -3290,7 +3290,7 @@ Default is "old_rr" which uses Rock Ridge version 1.10. This implies also "aaip_susp_1_10" allows AAIP to be written as unofficial extension of RRIP rather than as official extension under SUSP-1.12. @* -"no_emul_toc" saves 64 kB with the first session on overwriteable media +"no_emul_toc" saves 64 kB with the first session on overwritable media but makes the image incapable of displaying its session history. @* "iso_9660_1999" causes the production of an additional directory tree @@ -3737,7 +3737,7 @@ The same effect is achieved by -padding mode "included". @c man .PP Contrary to published specifications many BIOSes will load an El Torito record from the first session on media and not from the last one, which -gets mounted by default. This makes no problems with overwriteable media, +gets mounted by default. This makes no problems with overwritable media, because they appear to inadverted readers as one single session. @* But with multi-session media CD-R[W], DVD-R[W], DVD+R, it implies that the @@ -3749,7 +3749,7 @@ If a boot image from ISOLINUX or GRUB is known to be present on media then it is advised to patch it when a follow-up session gets written. But one should not rely on the capability to influence the bootability of the existing sessions, unless one -can assume overwriteable media. +can assume overwritable media. @* Normally the boot images are data files inside the ISO filesystem. By special path "--interval:appended_partition_NNN:all::" it is possible to @@ -4798,9 +4798,9 @@ Precedence is: "dvdrw", "cdrw", "dvd", "cdrom", "cd". Show media specific tables of content. This is the session history of the medium, not the ISO image directory tree. @* -In case of overwriteable media holding a valid ISO image, it may happen that +In case of overwritable media holding a valid ISO image, it may happen that only a single session gets shown. But if the first session on the -overwriteable media was written by @command{xorriso} then a complete +overwritable media was written by @command{xorriso} then a complete session history can be emulated. @* A drive which is incapable of writing may show any media as CD-ROM or DVD-ROM @@ -5771,7 +5771,7 @@ same name and hardcoded parameter "on", e.g. -acl "on". Explicit parameters are expected by @minus{}@minus{}stdio_sync and @minus{}@minus{}scdbackup_tag. @* -The capability to preserve multi-session history on overwriteable media +The capability to preserve multi-session history on overwritable media gets disabled by default. It can be enabled by using @minus{}@minus{}emul-toc with the first session. See -compliance no_emul_toc. @* @@ -5847,7 +5847,7 @@ It ignores most other options of cdrecord and cdrskin but refuses on -audio, -scanbus, and on blanking modes unknown to @command{xorriso}. @* The scope is only a single data track per session to be written -to blank, overwriteable, or appendable media. The medium gets closed if +to blank, overwritable, or appendable media. The medium gets closed if closing is applicable and not option -multi is present. @* If an input drive was acquired, then it is given up. @@ -5860,7 +5860,7 @@ If a track source is given, then an automatic -commit happens at the end of the "cdrecord" option list. @* @minus{}@minus{}grow_overwriteable_iso -enables emulation of multi-session on overwriteable +enables emulation of multi-session on overwritable media. To enable emulation of a TOC, the first session needs -C 0,32 with -as mkisofs (but no -M) and @minus{}@minus{}grow_overwriteable_iso write_start_address=32s with -as cdrecord. @@ -6845,7 +6845,7 @@ If this does not help, insert a run of "sleep 10" between xorriso and dd. This example works for multi-session media only. Add cdrskin option @minus{}@minus{}grow_overwriteable_iso to all -as cdrecord runs -in order to enable multi-session emulation on overwriteable media. +in order to enable multi-session emulation on overwritable media. @c man .SS @c man .B Let xorriso work underneath growisofs @node ExGrowisofs, ExException, ExMkisofs, Examples @@ -6884,7 +6884,7 @@ $ growisofs -M /dev/dvd @minus{}@minus{} outdev - -update_r /my/files /files @* @sp 1 growisofs has excellent burn capabilities with DVD and BD. -It does not emulate session history on overwriteable media, though. +It does not emulate session history on overwritable media, though. @c man .SS @c man .B Adjust thresholds for verbosity, exit value and program abort @node ExException, ExTime, ExGrowisofs, Examples @@ -7021,7 +7021,7 @@ it is possible to access the session trees which represent the older backup versions. With CD media, GNU/Linux mount accepts session numbers directly by its option "session=". @* -Multi-session media and most overwriteable media written by @command{xorriso} +Multi-session media and most overwritable media written by @command{xorriso} can tell the sbsectors of their sessions by @command{xorriso} command -toc. Used after -commit the following command prints the matching mount command for the newly written session (here for mount point /mnt): diff --git a/xorriso/xorriso_eng.html b/xorriso/xorriso_eng.html index 8b2bd66d..ca1b36ef 100644 --- a/xorriso/xorriso_eng.html +++ b/xorriso/xorriso_eng.html @@ -759,7 +759,7 @@ Many thanks to Derek Foreman and Ben Jansens for starting libburn. Very special thanks to Andy Polyakov whose dvd+rw-tools provide the libburnia project with invaluable examples on how to deal -with DVD media and how to emulate multi-session on overwriteable media. +with DVD media and how to emulate multi-session on overwritable media.

diff --git a/xorriso/xorriso_main.c b/xorriso/xorriso_main.c index 3801733a..3a4fd923 100644 --- a/xorriso/xorriso_main.c +++ b/xorriso/xorriso_main.c @@ -135,7 +135,7 @@ static void check_compatibility() int lib_major, lib_minor, lib_micro; /* First an ugly compile time check for header version compatibility. - If everthing matches, then no C code is produced. In case of mismatch, + If everything matches, then no C code is produced. In case of mismatch, intentionally faulty C code will be inserted. */ /* The minimum requirement of xorriso towards the libisoburn header @@ -155,7 +155,7 @@ static void check_compatibility() error: 'INTENTIONAL_ABORT_OF_COMPILATION__HEADERFILE_xorriso_dot_h_TOO_OLD__SEE_xorriso_main_dot_c' undeclared (first use in this function) error: 'XORRISO_MISCONFIGURATION_' undeclared (first use in this function) */ -/* The indendation is an advise of man gcc to help old compilers ignoring */ +/* The indentation is an advise of man gcc to help old compilers ignoring */ #if Xorriso_req_majoR > Xorriso_header_version_majoR #define Xorriso_dot_h_too_olD 1 #endif diff --git a/xorriso/xorriso_private.h b/xorriso/xorriso_private.h index c65d0fc3..fd9c6a61 100644 --- a/xorriso/xorriso_private.h +++ b/xorriso/xorriso_private.h @@ -175,7 +175,7 @@ struct XorrisO { /* the global context of xorriso */ bit5= with bit0: do not check tags of superblock,tree,session */ - int no_emul_toc; /* bit0= On overwriteables: + int no_emul_toc; /* bit0= On overwritables: write first session to LBA 0 rather than 32. */ @@ -258,7 +258,7 @@ struct XorrisO { /* the global context of xorriso */ int toc_emulation_flag; /* bit0= bit3 for isoburn_drive_aquire() scan -ROM profiles for ISO sessions bit1= bit4 for isoburn_drive_aquire() - do not emulate TOC on overwriteable media + do not emulate TOC on overwritable media bit2= bit7 for isoburn_drive_aquire() pretend any media to be -ROM bit3= bit9 for isoburn_drive_aquire() @@ -425,7 +425,8 @@ struct XorrisO { /* the global context of xorriso */ int boot_image_isohybrid; /* 0=off , deprecated: 1=auto , 2=on , 3=force */ int boot_efi_default; /* 0= no effect , - 1= appy --efi-boot parameters when attaching to img */ + 1= apply --efi-boot parameters when attaching to img + */ char system_area_disk_path[SfileadrL]; int system_area_clear_loaded; @@ -670,7 +671,7 @@ struct XorrisO { /* the global context of xorriso */ struct ExclusionS *disk_exclusions; int disk_excl_mode; /* bit0= on (else off) - bit1= parameter too (else rekursion only) + bit1= parameter too (else recursion only) bit2= whole subtree banned (else only exact path) bit3= when comparing ignore excluded files rather than to treat them as truly missing on disk diff --git a/xorriso/xorriso_timestamp.h b/xorriso/xorriso_timestamp.h index a7d1622c..f1cefc2b 100644 --- a/xorriso/xorriso_timestamp.h +++ b/xorriso/xorriso_timestamp.h @@ -1 +1 @@ -#define Xorriso_timestamP "2019.10.27.154326" +#define Xorriso_timestamP "2019.10.28.143339" diff --git a/xorriso/xorrisoburn.h b/xorriso/xorrisoburn.h index 079b69e6..1e04948f 100644 --- a/xorriso/xorrisoburn.h +++ b/xorriso/xorrisoburn.h @@ -34,8 +34,8 @@ int Xorriso_detach_libraries(struct XorrisO *xorriso, int flag); int Xorriso_create_empty_iso(struct XorrisO *xorriso, int flag); -/* @param flag bit0=aquire as isoburn input drive - bit1=aquire as libburn output drive (as isoburn drive if bit0) +/* @param flag bit0=acquire as isoburn input drive + bit1=acquire as libburn output drive (as isoburn drive if bit0) @return <=0 failure , 1=success , 2=neither readable or writeable */ int Xorriso_aquire_drive(struct XorrisO *xorriso, char *adr, char *show_adr, diff --git a/xorriso/xorrisofs.1 b/xorriso/xorrisofs.1 index 7420ec14..ed2af636 100644 --- a/xorriso/xorrisofs.1 +++ b/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.5.3, Oct 27, 2019" +.TH XORRISOFS 1 "Version 1.5.3, Oct 28, 2019" .\" Please adjust this date whenever revising the manpage. .\" .\" Some roff macros, for reference: @@ -167,7 +167,7 @@ If they are missing then a new image is composed from scratch. .TP \fB\-M\fR disk_path Set the path from which to load the existing ISO image directory tree -on which to base the upcomming directory tree as add\-on session. +on which to base the upcoming directory tree as add\-on session. The path must lead to a random\-access readable file object. On GNU/Linux: regular data files or block device files. .br @@ -1737,7 +1737,7 @@ This example works for multi\-session media only: CD\-R[W], DVD\-R[W], DVD+R, BD\-R. Add cdrskin option \-\-grow_overwriteable_iso to all \-as cdrecord runs -in order to enable multi\-session emulation on overwriteable media. +in order to enable multi\-session emulation on overwritable media. .br The first session is written like this: .br @@ -1882,7 +1882,7 @@ it is possible to access the session trees which represent the older backup versions. With CD media, GNU/Linux mount accepts session numbers directly by its option "session=". .br -Multi\-session media and most overwriteable media written by xorriso can tell +Multi\-session media and most overwritable media written by xorriso can tell the sbsectors of their sessions by xorriso option \-toc: .br $ xorriso \-dev /dev/sr0 \-toc diff --git a/xorriso/xorrisofs.info b/xorriso/xorrisofs.info index 10e4fed4..57216b7f 100644 --- a/xorriso/xorrisofs.info +++ b/xorriso/xorrisofs.info @@ -184,7 +184,7 @@ then a new image is composed from scratch. -M disk_path Set the path from which to load the existing ISO image directory - tree on which to base the upcomming directory tree as add-on + tree on which to base the upcoming directory tree as add-on session. The path must lead to a random-access readable file object. On GNU/Linux: regular data files or block device files. A special kind of pseudo disk_path has the form "/dev/fd/"number. @@ -1531,8 +1531,8 @@ File: xorrisofs.info, Node: ExMkisofs, Next: ExGrowisofs, Prev: ExGraft, Up: This example works for multi-session media only: CD-R[W], DVD-R[W], DVD+R, BD-R. Add cdrskin option --grow_overwriteable_iso to all -as -cdrecord runs in order to enable multi-session emulation on -overwriteable media. +cdrecord runs in order to enable multi-session emulation on overwritable +media. The first session is written like this: $ xorrisofs -graft-points \ @@ -1650,7 +1650,7 @@ MD5 sums against the current file content on hard disk. or NetBSD it is possible to access the session trees which represent the older backup versions. With CD media, GNU/Linux mount accepts session numbers directly by its option "session=". -Multi-session media and most overwriteable media written by xorriso can +Multi-session media and most overwritable media written by xorriso can tell the sbsectors of their sessions by xorriso option -toc: $ xorriso -dev /dev/sr0 -toc @@ -2017,11 +2017,11 @@ File: xorrisofs.info, Node: CommandIdx, Next: ConceptIdx, Prev: Legal, Up: T * -chrp-boot CHRP partition: SystemArea. (line 267) * -chrp-boot-part CHRP partition: SystemArea. (line 258) * -copyright set Copyright File path: ImageId. (line 66) -* -D allow deep directory hierachies: SetExtras. (line 60) +* -D allow deep directory hierarchies: SetExtras. (line 60) * -d omit trailing dot in ISO file names: SetCompl. (line 50) * -dev set path for loading existing ISO image: Loading. (line 23) * -dir-mode permissions for all directories: SetProduct. (line 87) -* -disable-deep-relocation allow deep directory hierachies: SetExtras. +* -disable-deep-relocation allow deep directory hierarchies: SetExtras. (line 72) * -disallow_dir_id_ext enforce ISO level 1 directory names: SetCompl. (line 23) @@ -2408,31 +2408,31 @@ Node: Insert3770 Node: Xorriso5616 Node: Options6762 Node: Loading7489 -Node: SetInsert9531 -Node: SetProduct13940 -Node: SetCompl19511 -Node: SetExtras22103 -Node: SetHide33398 -Node: ImageId34702 -Node: Bootable38984 -Node: SystemArea45270 -Node: Charset63502 -Node: Jigdo64527 -Node: Miscellaneous68804 -Node: Examples70449 -Node: ExSimple70943 -Node: ExGraft71426 -Node: ExMkisofs72726 -Node: ExGrowisofs74535 -Node: ExIncBackup75725 -Node: ExIncBckAcc78902 -Node: ExBootable80607 -Node: Files84789 -Node: Environ85884 -Node: Seealso86757 -Node: Bugreport87408 -Node: Legal88001 -Node: CommandIdx88898 -Node: ConceptIdx104765 +Node: SetInsert9530 +Node: SetProduct13939 +Node: SetCompl19510 +Node: SetExtras22102 +Node: SetHide33397 +Node: ImageId34701 +Node: Bootable38983 +Node: SystemArea45269 +Node: Charset63501 +Node: Jigdo64526 +Node: Miscellaneous68803 +Node: Examples70448 +Node: ExSimple70942 +Node: ExGraft71425 +Node: ExMkisofs72725 +Node: ExGrowisofs74533 +Node: ExIncBackup75723 +Node: ExIncBckAcc78899 +Node: ExBootable80604 +Node: Files84786 +Node: Environ85881 +Node: Seealso86754 +Node: Bugreport87405 +Node: Legal87998 +Node: CommandIdx88895 +Node: ConceptIdx104763  End Tag Table diff --git a/xorriso/xorrisofs.texi b/xorriso/xorrisofs.texi index e9070301..71c49291 100644 --- a/xorriso/xorrisofs.texi +++ b/xorriso/xorrisofs.texi @@ -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.5.3, Oct 27, 2019" +@c man .TH XORRISOFS 1 "Version 1.5.3, Oct 28, 2019" @c man .\" Please adjust this date whenever revising the manpage. @c man .\" @c man .\" Some roff macros, for reference: @@ -294,7 +294,7 @@ If they are missing then a new image is composed from scratch. @kindex -M set path for loading existing ISO image @cindex Session, select path, -M, -prev-session, -dev Set the path from which to load the existing ISO image directory tree -on which to base the upcomming directory tree as add-on session. +on which to base the upcoming directory tree as add-on session. The path must lead to a random-access readable file object. On GNU/Linux: regular data files or block device files. @* @@ -844,7 +844,7 @@ If you expect such names in or under disk_paths and plan to mount the ISO by such Linux kernels, consider to set -file_name_limit 253. @c man .TP @item -D -@kindex -D allow deep directory hierachies +@kindex -D allow deep directory hierarchies @cindex Deep directories, allow, -D, -disable-deep-relocation The standard ECMA-119 demands that no path in the image shall have more than 8 name components or 255 characters. Therefore it would be necessary @@ -860,7 +860,7 @@ xorrisofs has -D set by default. If given explicitly then it overrides the options -rr_reloc_dir and -hide-rr-moved. @c man .TP @item -disable-deep-relocation -@kindex -disable-deep-relocation allow deep directory hierachies +@kindex -disable-deep-relocation allow deep directory hierarchies Alias of -D. @c man .TP @item -rr_reloc_dir name @@ -2292,7 +2292,7 @@ This example works for multi-session media only: CD-R[W], DVD-R[W], DVD+R, BD-R. Add cdrskin option @minus{}@minus{}grow_overwriteable_iso to all -as cdrecord runs -in order to enable multi-session emulation on overwriteable media. +in order to enable multi-session emulation on overwritable media. @* The first session is written like this: @* @@ -2456,7 +2456,7 @@ it is possible to access the session trees which represent the older backup versions. With CD media, GNU/Linux mount accepts session numbers directly by its option "session=". @* -Multi-session media and most overwriteable media written by xorriso can tell +Multi-session media and most overwritable media written by xorriso can tell the sbsectors of their sessions by xorriso option -toc: @* @sp 1