libburnia/libisoburn
2
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Fixed spelling errors found by fossies.org with codespell

Browse Source
This commit is contained in:
Thomas Schmitt 2019-10-28 15:34:56 +01:00
parent 5903885d45
commit c8b9c9a244
46 changed files with 375 additions and 375 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
frontend/frontend_pipes_xorriso.c
View File

@ -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++) {

2
frontend/sh_on_named_pipes.sh
View File

@ -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

16
frontend/xorriso-tcltk
View File

@ -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

30
libisoburn/burn_wrap.c
View File

@ -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

2
libisoburn/isoburn.c
View File

@ -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;

18
libisoburn/isoburn.h
View File

@ -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 */

40
libisoburn/libisoburn.h
View File

@ -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

4
releng/README
View File

@ -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

2
releng/jigdo-gen-md5-list
View File

@ -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:

2
releng/jigdo-gen-md5-list.1
View File

@ -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

6
xorriso/README_gnu_xorriso
View File

@ -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.

2
xorriso/aux_objects.h
View File

@ -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);

2
xorriso/cmp_update.c
View File

@ -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);

12
xorriso/drive_mgt.c
View File

@ -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;
}

6
xorriso/emulators.c
View File

@ -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;

2
xorriso/findjob.c
View File

@ -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) {

4
xorriso/iso_img.c
View File

@ -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++)

4
xorriso/iso_manip.c
View File

@ -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)

4
xorriso/iso_tree.c
View File

@ -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,

2
xorriso/lib_mgt.c
View File

@ -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

2
xorriso/lib_mgt.h
View File

@ -22,7 +22,7 @@
/* The library which does MMC optical drive operations */
#include <libburn/libburn.h>
/* 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 <libisoburn/libisoburn.h>

2
xorriso/misc_funct.c
View File

@ -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)

2
xorriso/misc_funct.h
View File

@ -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);

10
xorriso/opts_d_h.c
View File

@ -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.",
"",

10
xorriso/opts_p_z.c
View File

@ -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\"");

2
xorriso/parse_exec.c
View File

@ -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;
}

2
xorriso/sfile.c
View File

@ -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)
*/

2
xorriso/sort_cmp.c
View File

@ -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++)

2
xorriso/text_io.c
View File

@ -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.

2
xorriso/text_io.h
View File

@ -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.

2
xorriso/write_run.c
View File

@ -1782,7 +1782,7 @@ int Xorriso_blank_media(struct XorrisO *xorriso, int flag)
burn_disc_get_profile(drive, &current_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)

16
xorriso/xorrecord.1
View File

@ -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.

76
xorriso/xorrecord.info
View File

@ -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