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

New command -modesty_on_drive, new -as cdrecord -immed, minbuf=, modesty_on_drive=

Browse Source
This commit is contained in:
Thomas Schmitt 2015-07-31 16:23:08 +00:00
parent a29ed10c14
commit e65ab7648a
16 changed files with 2936 additions and 2722 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
libisoburn/trunk/xorriso/base_obj.c
View File

@ -242,6 +242,12 @@ int Xorriso_new(struct XorrisO ** xorriso,char *progname, int flag)
m->alignment= 0;
m->do_stream_recording= 0;
m->dvd_obs= 0;
m->modesty_on_drive= 0;
m->min_buffer_usec= -1;
m->max_buffer_usec= -1;
m->buffer_timeout_sec= -1;
m->min_buffer_percent= 65;
m->max_buffer_percent= 95;
m->stdio_sync= 0;
m->stdio_sync_is_default= 1;
m->keep_boot_image= 0;

18
libisoburn/trunk/xorriso/emulators.c
View File

@ -78,6 +78,9 @@ int Xorriso_cdrskin_help(struct XorrisO *xorriso, int flag)
"\t-isosize\tUse iso9660 file system size for next data track",
"\t-pad\t\tpadsize=30k",
"\t-nopad\t\tDo not pad",
"\tminbuf=\t\tKeep drive buffer hungry",
"\tmodesty_on_drive=\tLike minbuf=, but with more parameters",
"\t-immed\t\tEquivalent to minbuf=75",
"\t--grow_overwriteable_iso\temulate multi-session on DVD+RW, BD-RE",
"\twrite_start_address=#\t\twrite to byte address on DVD+RW, BD-RE",
"\tstream_recording=on|number\ttry to get full speed on DVD-RAM, BD",
@ -120,10 +123,10 @@ int Xorriso_cdrskin(struct XorrisO *xorriso, char *whom, int argc, char **argv,
"timeout=", "debug=", "kdebug=", "kd=", "driver=", "ts=",
"pregap=", "defpregap=", "mcn=", "isrc=", "index=", "textfile=",
"pktsize=", "cuefile=",
"gracetime=", "minbuf=",
"gracetime=",
"assert_write_lba=", "fifo_start_at=", "dev_translation=",
"drive_scsi_dev_family=", "fallback_program=", "modesty_on_drive=",
"drive_scsi_dev_family=", "fallback_program=",
"tao_to_sao_tsize=",
"direct_write_amount=", "msifile=",
@ -332,6 +335,17 @@ no_volunteer:;
strncmp(argpt, "stream_recording=", 17)==0) {
cpt= strchr(argpt, '=')+1;
Xorriso_option_stream_recording(xorriso, cpt, 0);
} else if(strcmp(argpt, "-immed") == 0) {
Xorriso_option_modesty_on_drive(xorriso, "75", 0);
} else if(strncmp(argpt, "-minbuf=", 8) == 0 ||
strncmp(argpt, "minbuf=", 7) == 0 ||
strncmp(argpt, "-modesty_on_drive=", 18) == 0 ||
strncmp(argpt, "modesty_on_drive=", 17) == 0) {
cpt= strchr(argpt, '=') + 1;
Xorriso_option_modesty_on_drive(xorriso, cpt, 0);
} else if(strncmp(argpt, "-stdio_sync=", 12)==0 ||
strncmp(argpt, "stdio_sync=", 11)==0) {
cpt= strchr(argpt, '=') + 1;

30
libisoburn/trunk/xorriso/opts_d_h.c
View File

@ -1644,7 +1644,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",
" resp. on overwriteable media with emulated TOC.",
" and on overwriteable media with emulated TOC.",
" -calm_drive \"in\"|\"out\"|\"all\"|\"on\"|\"off\"",
" Reduce drive noise until it gets actually used again.",
" -assert_volid pattern severity",
@ -1660,21 +1660,21 @@ int Xorriso_option_help(struct XorrisO *xorriso, int flag)
" -local_charset name",
" Override system assumption of the local character set name.",
" -hardlinks mode[:mode ...]",
" Enable resp. disable recording and restoring of hard links.",
" Enable or disable recording and restoring of hard links.",
" Modes are \"on\", \"off\", \"perform_update\",",
" \"without_update\", \"discard_extract\",",
" \"cheap_sorted_extract\", \"normal_extract\"",
" -acl \"on\"|\"off\"",
" Enable resp. disable reading and writing of ACLs.",
" Enable or disable reading and writing of ACLs.",
" -xattr \"on\"|\"off\"",
" Enable resp. disable reading and writing of xattr.",
" Enable or disable reading and writing of xattr.",
" -for_backup",
" Shortcut for: -hardlinks on -acl on -xattr on -md5 on",
" -disk_dev_ino \"on\"|\"ino_only\"|\"off\"",
" Enable resp. disable recording of disk file dev_t and ino_t",
" Enable or disable recording of disk file dev_t and ino_t",
" and their use in file comparison.",
" -md5 \"on\"|\"all\"|\"off\"",
" Enable resp. disable processing of MD5 checksums.",
" Enable or disable processing of MD5 checksums.",
" -scdbackup_tag list_path record_name",
" Enable production of scdbackup tag with -md5 on",
" -ban_stdio_write",
@ -1684,7 +1684,7 @@ int Xorriso_option_help(struct XorrisO *xorriso, int flag)
" -data_cache_size number_of_tiles blocks_per_tile",
" Adjust size and granularity of the data read cache.",
" -blank [\"force:\"]\"fast\"|\"all\"|\"deformat\"|\"deformat_quickest\"",
" Blank medium resp. invalidate ISO image on medium.",
" Blank medium or invalidate ISO image on medium.",
" Prefix \"force:\" overrides medium evaluation.",
" -close_damaged \"as_needed\"|\"force\"",
" Close track and session of damaged medium.",
@ -1794,7 +1794,7 @@ int Xorriso_option_help(struct XorrisO *xorriso, int flag)
" -list_speeds Show media specific list of write speed descriptors.",
"",
" -list_profiles \"in\"|\"out\"|\"all\"",
" Show list of media types supported by indev resp. outdev.",
" Show list of media types supported by indev and/or outdev.",
" -print_size Print the foreseeable consumption by next -commit.",
"",
" -tell_media_space",
@ -1827,7 +1827,7 @@ int Xorriso_option_help(struct XorrisO *xorriso, int flag)
"iso_rr_path is the Rock Ridge name of a file object in the ISO image.",
"pathspec is either a disk_path or (if allowed) a pair: iso_rr_path=disk_path",
"Commands marked by [***] have variable length parameter lists and perform",
"pattern expansion if enabled by -iso_rr_pattern resp. -disk_pattern.",
"pattern expansion if enabled by -iso_rr_pattern or -disk_pattern.",
"",
" -pathspecs \"on\"|\"off\" Allow or disallow pathspecs of form ",
" iso_rr_path=disk_path . Only \"off\" allows eventual",
@ -1836,7 +1836,7 @@ int Xorriso_option_help(struct XorrisO *xorriso, int flag)
" Insert the given files or directory trees from",
" filesystem into the ISO image. Much like mkisofs.",
" -add_plainly \"none\"|\"unknown\"|\"dashed\"|\"any\"",
" Whether to add lonely arguments as pathspec resp. disk_path.",
" Whether to add lonely arguments as pathspec or disk_path.",
" -path_list disk_path",
" Like -add but read the pathspecs from file disk_path.",
" -quoted_path_list disk_path",
@ -2028,6 +2028,11 @@ int Xorriso_option_help(struct XorrisO *xorriso, int flag)
" Set the burn speed. Default is \"max\" = maximum speed.",
" -stream_recording \"on\"|\"off\"",
" Try to circumvent slow checkread on DVD-RAM, BD-RE, BD-R.",
" -modesty_on_drive [\"on\"|\"off\"|min_percent_number]",
" [:\"min_percent=\"number][:\"max_percent=\"number]",
" [:\"min_usec=\"number][:\"max_usec\"=number]",
" [:\"timeout_sec=\"number]",
" Keep drive buffer hungry to ease concurrent burn run.",
" -dvd_obs \"default\"|\"32k\"|\"64k\"",
" Set number of bytes per DVD/BD write operation.",
" -stdio_sync \"on\"|\"off\"|\"end\"|number",
@ -2036,8 +2041,7 @@ int Xorriso_option_help(struct XorrisO *xorriso, int flag)
" -fs number[\"k\"|\"m\"]",
" Set the size of the fifo buffer. (Default is 4m)",
" -eject \"in\"|\"out\"|\"all\"",
" Immediately eject the medium in -indev, resp. -outdev,",
" resp. both.",
" Immediately eject the medium in -indev, -outdev, or both.",
"",
"Navigation commands:",
"",
@ -2273,7 +2277,7 @@ int Xorriso_option_help(struct XorrisO *xorriso, int flag)
" -print_mark text",
" Print a text to mark channel.",
" -prompt text",
" Wait for Enter key resp. for a line of input at stdin.",
" Wait for Enter key or for a line of input at stdin.",
" -sleep number",
" Do nothing during the given number of seconds.",
" -errfile_log mode path|channel",

94
libisoburn/trunk/xorriso/opts_i_o.c
View File

@ -1,7 +1,7 @@
/* xorriso - creates, loads, manipulates and burns ISO 9660 filesystem images.
Copyright 2007-2013 Thomas Schmitt, <scdbackup@gmx.net>
Copyright 2007-2015 Thomas Schmitt, <scdbackup@gmx.net>
Provided under GPL version 2 or later.
@ -799,6 +799,94 @@ ex:;
}
int Xorriso_option_modesty_on_drive(struct XorrisO *xorriso, char *mode,
int flag)
{
char *npt, *cpt, *ppt;
int l, num, set_min;
npt= cpt= mode;
for(; npt!=NULL; cpt= npt+1) {
npt= strchr(cpt,':');
if(npt==NULL)
l= strlen(cpt);
else
l= npt-cpt;
if(l == 0)
continue;
if(l == 3 && strncmp(cpt, "off", l) == 0) {
xorriso->modesty_on_drive= 0;
} else if(l == 1 && strncmp(cpt, "0", l) == 0) {
xorriso->modesty_on_drive= 0;
} else if(l == 2 && strncmp(cpt, "on", l) == 0) {
xorriso->modesty_on_drive= 1;
} else if(l == 1 && strncmp(cpt, "1", l) == 0) {
xorriso->modesty_on_drive= 1;
} else if(l == 2 && strncmp(cpt, "-1", l) == 0) {
;
} else if(*cpt >= '1' && *cpt <= '9') {
ppt= cpt;
set_min= 2;
set_size_percent:;
sscanf(ppt, "%d", &num);
if(num == -1) {
;
} else if(num < 25) {
bad_percent:;
sprintf(xorriso->info_text, "-modesty_on_drive: percentage out of range [25 to 100]");
Text_shellsafe(cpt, xorriso->info_text, 1);
Xorriso_msgs_submit(xorriso, 0, xorriso->info_text, 0, "FAILURE", 0);
return(0);
} else if(num > 100) {
goto bad_percent;
}
if(set_min == 2) {
xorriso->modesty_on_drive= 1;
}
if(set_min)
xorriso->min_buffer_percent= num;
else
xorriso->max_buffer_percent= num;
} else if(l >= 12 && strncmp(cpt, "min_percent=", 12) == 0) {
ppt= cpt + 12;
set_min= 1;
goto set_size_percent;
} else if(l >= 12 && strncmp(cpt, "max_percent=", 12) == 0) {
ppt= cpt + 12;
set_min= 0;
goto set_size_percent;
} else if(l >= 8 && strncmp(cpt, "min_usec=", 8) == 0) {
ppt= cpt + 8;
set_min= 1;
set_sec:;
sscanf(ppt, "%d", &num);
if(num < 0)
num= 0;
if(set_min == 1)
xorriso->min_buffer_usec= num;
else if(set_min == 0)
xorriso->max_buffer_percent= num;
else
xorriso->buffer_timeout_sec= num;
} else if(l >= 8 && strncmp(cpt, "max_usec=", 8) == 0) {
ppt= cpt + 8;
set_min= 0;
goto set_sec;
} else if(l >= 11 && strncmp(cpt, "timeout_sec=", 11) == 0) {
ppt= cpt + 11;
set_min= -1;
goto set_sec;
} else {
sprintf(xorriso->info_text, "-modesty_on_drive: unknown mode ");
Text_shellsafe(cpt, xorriso->info_text, 1);
Xorriso_msgs_submit(xorriso, 0, xorriso->info_text, 0, "FAILURE", 0);
return(0);
}
}
return(1);
}
/* Options -mount , -mount_cmd , -session_string */
/* @param bit0= -mount_cmd: print mount command to result channel rather
than performing it
@ -1151,7 +1239,7 @@ int Xorriso_option_no_rc(struct XorrisO *xorriso, int flag)
}
/* Option -not_leaf , (-hide_disk_leaf resp. -as mkisofs -hide) */
/* Option -not_leaf , (-hide_disk_leaf , -as mkisofs -hide) */
/* @param flag bit0-bit5= hide rather than adding to disk_exclusions
bit0= add to iso_rr_hidings
bit1= add to joliet_hidings
@ -1323,7 +1411,7 @@ ex:;
}
/* Option -not_paths , (-hide_disk_paths resp. -as mkisofs -hide) */
/* Option -not_paths , (-hide_disk_paths , -as mkisofs -hide) */
/* @param flag bit0= add to iso_rr_hidings rather than disk_exclusions
bit1= add to joliet_hidings rather than disk_exclusions
bit2= enable disk pattern expansion regardless of -disk_pattern

16
libisoburn/trunk/xorriso/parse_exec.c
View File

@ -1,7 +1,7 @@
/* xorriso - creates, loads, manipulates and burns ISO 9660 filesystem images.
Copyright 2007-2013 Thomas Schmitt, <scdbackup@gmx.net>
Copyright 2007-2015 Thomas Schmitt, <scdbackup@gmx.net>
Provided under GPL version 2 or later.
@ -526,7 +526,8 @@ int Xorriso_count_args(struct XorrisO *xorriso, int argc, char **argv,
"iso_rr_pattern","follow","format","fs","gid","grow_blindly","hardlinks",
"hfsplus","history","indev","in_charset","joliet",
"list_delimiter","list_extras","list_profiles","local_charset",
"mark","md5","mount_opts","not_leaf","not_list","not_mgt",
"mark","md5","mount_opts","modesty_on_drive",
"not_leaf","not_list","not_mgt",
"options_from_file","osirrox","outdev","out_charset","overwrite",
"pacifier","padding","path_list","pathspecs","pkt_output",
"preparer_id","print","print_info","print_mark","prompt",
@ -728,6 +729,7 @@ int Xorriso_cmd_sorting_rank(struct XorrisO *xorriso,
"abstract_file", "biblio_file", "preparer_id", "application_use",
"out_charset", "read_mkisofsrc",
"uid", "gid", "zisofs", "speed", "stream_recording", "dvd_obs",
"modesty_on_drive",
"stdio_sync", "dummy", "fs", "close", "padding", "write_type",
"grow_blindly", "pacifier", "scdbackup_tag",
@ -1456,6 +1458,13 @@ next_command:;
(*idx)++;
ret= Xorriso_option_md5(xorriso, arg1, 0);
} else if(strcmp(cmd,"mkdir")==0 || strcmp(cmd,"mkdiri")==0) {
ret= Xorriso_option_mkdiri(xorriso, argc, argv, idx, 0);
} else if(strcmp(cmd, "modesty_on_drive")==0) {
(*idx)++;
ret= Xorriso_option_modesty_on_drive(xorriso, arg1, 0);
} else if(strcmp(cmd, "mount") == 0 || strcmp(cmd, "mount_cmd") == 0) {
(*idx)+= 4;
if((*idx)>argc) {
@ -1484,9 +1493,6 @@ next_command:;
} else if(strcmp(cmd,"mv")==0 || strcmp(cmd,"mvi")==0) {
ret= Xorriso_option_mvi(xorriso, argc, argv, idx, 0);
} else if(strcmp(cmd,"mkdir")==0 || strcmp(cmd,"mkdiri")==0) {
ret= Xorriso_option_mkdiri(xorriso, argc, argv, idx, 0);
} else if(strcmp(cmd,"named_pipe_loop")==0) {
if((*idx) + 3 < argc)
arg4= argv[(*idx) + 3];

24
libisoburn/trunk/xorriso/text_io.c
View File

@ -3349,6 +3349,30 @@ int Xorriso_status(struct XorrisO *xorriso, char *filter, FILE *fp, int flag)
if(!(is_default && no_defaults))
Xorriso_status_result(xorriso,filter,fp,flag&2);
is_default= (xorriso->modesty_on_drive == 0 &&
xorriso->min_buffer_usec == -1 &&
xorriso->max_buffer_usec == -1 &&
xorriso->buffer_timeout_sec == -1 &&
xorriso->min_buffer_percent == 65 &&
xorriso->max_buffer_percent == 95);
if(xorriso->modesty_on_drive == 0)
strcpy(mode, "off");
else if(xorriso->modesty_on_drive == 1)
strcpy(mode, "on");
else
sprintf(mode, "%d", xorriso->modesty_on_drive);
sprintf(mode + strlen(mode), ":min_percent=%d", xorriso->min_buffer_percent);
sprintf(mode + strlen(mode), ":max_percent=%d", xorriso->max_buffer_percent);
if(xorriso->buffer_timeout_sec >= 0)
sprintf(mode + strlen(mode), ":timeout_sec=%d", xorriso->buffer_timeout_sec);
if(xorriso->min_buffer_usec >= 0)
sprintf(mode + strlen(mode), ":min_usec=%d", xorriso->min_buffer_usec);
if(xorriso->max_buffer_usec >= 0)
sprintf(mode + strlen(mode), ":max_usec=%d", xorriso->max_buffer_usec);
sprintf(line,"-modesty_on_drive %s\n", mode);
if(!(is_default && no_defaults))
Xorriso_status_result(xorriso,filter,fp,flag&2);
is_default= (xorriso->dvd_obs == 0);
strcpy(mode, "default");
if(xorriso->dvd_obs == 32768 || xorriso->dvd_obs == 65536)

6
libisoburn/trunk/xorriso/write_run.c
View File

@ -165,6 +165,12 @@ int Xorriso_make_write_options(
if(xorriso->write_speed != -2)
burn_drive_set_speed(drive, 0, xorriso->write_speed);
burn_drive_set_buffer_waiting(drive, xorriso->modesty_on_drive,
xorriso->min_buffer_usec,
xorriso->max_buffer_usec,
xorriso->buffer_timeout_sec,
xorriso->min_buffer_percent,
xorriso->max_buffer_percent);
if(xorriso->do_stream_recording == 1)
stream_mode= 1;
else if(xorriso->do_stream_recording == 2)

60
libisoburn/trunk/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.4.1, May 17, 2015"
.TH XORRECORD 1 "Version 1.4.1, Jul 30, 2015"
.\" Please adjust this date whenever revising the manpage.
.\"
.\" Some roff macros, for reference:
@ -100,8 +100,8 @@ device file.
On Solaris, the user needs r\-permission and privilege "sys_devices",
which is usually gained by running \fBxorrecord\fR via command pfexec.
.br
These permissions resp. privileges are needed already for listing a drive.
So it might be necessary to get the overview as superuser resp. via pfexec.
These permissions or privileges are needed already for listing a drive.
So it might be necessary to get the overview as superuser or via pfexec.
.br
\fBxorrecord\fR does not perform cdrecord option \-scanbus and does
not accept the addresses of form Bus,Target,Lun which are told by \-scanbus.
@ -128,7 +128,7 @@ to generic xorriso command mode. See \fBman xorriso\fR for its description.
Other than in xorriso command mode, the sequence of the cdrecord emulation
options does not matter.
All pending actions get performed in a fixed sequence before the program
run ends resp. before cdrecord emulation ends.
run ends or before cdrecord emulation ends.
.SS
.br
.SH OPTIONS
@ -471,6 +471,16 @@ MMC drives usually activate their own idea of speed and take
the speed value given by the burn program only as a hint
for their own decision.
.TP
\fBminbuf=percentage\fR
Equivalent to:
.br
modesty_on_drive=<percentage>
.TP
\fB\-immed\fR
Equivalent to:
.br
modesty_on_drive=75
.TP
\fB\-eject\fR
Eject the drive tray after alll other work is done.
.TP
@ -490,7 +500,7 @@ Afterwards end emulation without performing any drive operation.
\fB\-v\fR
Increase program verbosity by one level. There are four verbosity levels
from nearly silent to debugging verbosity. The both highest levels can
be enabled by repeated \-v or by \-vv resp. \-vvv.
be enabled by repeated \-v or by \-vv or by \-vvv.
.TP
\fB\-V\fR
Log SCSI commands and drive replies to standard error.
@ -569,6 +579,44 @@ size. A number of 64 KB may improve throughput with bus systems which
show latency problems. The default depends on media type, option
stream_recording=, and on compile time options.
.TP
\fBmodesty_on_drive=parameter[:parameters]\fR
Control whether the drive buffer shall be kept from getting completely filled.
Parameter "on" (or "1") keeps the program from trying to write to the burner
drive while its buffer is in danger to be filled over a given limit.
If this filling is exceeded then the program will wait until the filling
reaches a given low percentage value.
.br
This can ease the load on operating system and drive controller and thus help
with achieving better input bandwidth if disk and burner are not on independent
controllers (like hda and hdb). It may also help with simultaneous burns on
different burners with Linux kernels like 3.16. On the other hand it increases
the risk of buffer underflow and thus reduced write speed.
.br
Some burners are not suitable because they
report buffer fill with granularity too coarse in size or time,
or expect their buffer to be filled to the top before they go to full speed.
.br
Parameters "off" or "0" disable this feature.
.br
The threshhold for beginning to wait is given by parameter "max_percent=".
Parameter "min_percent=" defines the threshhold for resuming transmission.
Percentages are permissible in the range of 25 to 100. Numbers in this
range without a prepended name are interpreted as "on:min_percent=".
.br
E.g.: modesty_on_drive=75
.br
The optimal values depend on the buffer behavior of the drive.
.br
There are also timing parameters "timeout_sec=", "min_usec=", "max_usec=".
Read the description of burn_drive_set_buffer_waiting() in libburn.h,
before setting them to non\-default values.
.br
Parameters, which are not mentioned with a modesty_on_drive= option,
stay unchanged.
Default is:
.br
modesty_on_drive=off:min_percent=65:max_percent=95
.TP
\fBwrite_start_address=value\fR
Set the block address on overwritable media where to start writing the track.
With DVD+RW, DVD\-RAM or BD\-RE, byte_offset must be aligned to 2 kiB blocks,
@ -759,7 +807,7 @@ please send electronic mail to the public list <bug\-xorriso@gnu.org>.
If more privacy is desired, mail to <scdbackup@gmx.net>.
.br
Please describe what you expect \fBxorriso\fR to do,
the program arguments resp. commands by which you tried to achieve it,
the program arguments or dialog commands by which you tried to achieve it,
the messages of \fBxorriso\fR, and the undesirable outcome of your
program run.
.br

688
libisoburn/trunk/xorriso/xorrecord.info
View File

File diff suppressed because it is too large Load Diff

66
libisoburn/trunk/xorriso/xorrecord.texi
View File

@ -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.4.1, May 17, 2015"
@c man .TH XORRECORD 1 "Version 1.4.1, Jul 30, 2015"
@c man .\" Please adjust this date whenever revising the manpage.
@c man .\"
@c man .\" Some roff macros, for reference:
@ -196,8 +196,8 @@ device file.
On Solaris, the user needs r-permission and privilege "sys_devices",
which is usually gained by running @command{xorrecord} via command pfexec.
@*
These permissions resp. privileges are needed already for listing a drive.
So it might be necessary to get the overview as superuser resp. via pfexec.
These permissions or privileges are needed already for listing a drive.
So it might be necessary to get the overview as superuser or via pfexec.
@*
@command{xorrecord} does not perform cdrecord option -scanbus and does
not accept the addresses of form Bus,Target,Lun which are told by -scanbus.
@ -228,7 +228,7 @@ to generic xorriso command mode. See @strong{man xorriso} for its description.
Other than in xorriso command mode, the sequence of the cdrecord emulation
options does not matter.
All pending actions get performed in a fixed sequence before the program
run ends resp. before cdrecord emulation ends.
run ends or before cdrecord emulation ends.
@c man .SS
@node Options, Examples, Xorriso, Top
@chapter Options
@ -648,6 +648,20 @@ MMC drives usually activate their own idea of speed and take
the speed value given by the burn program only as a hint
for their own decision.
@c man .TP
@item minbuf=percentage
@kindex minbuf= keep drive buffer hungry
@cindex Write, drive buffer, minbuf=
Equivalent to:
@*
modesty_on_drive=<percentage>
@c man .TP
@item -immed
@kindex -immed keep drive buffer hungry
@cindex Write, drive buffer, -immed
Equivalent to:
@*
modesty_on_drive=75
@c man .TP
@item -eject
@kindex -eject finally eject drive tray
@cindex Eject, the tray, -eject
@ -679,7 +693,7 @@ Afterwards end emulation without performing any drive operation.
@cindex Verbosity, increase, -v
Increase program verbosity by one level. There are four verbosity levels
from nearly silent to debugging verbosity. The both highest levels can
be enabled by repeated -v or by -vv resp. -vvv.
be enabled by repeated -v or by -vv or by -vvv.
@c man .TP
@item -V
@kindex -V log SCSI command transactions to stderr
@ -779,6 +793,46 @@ size. A number of 64 KB may improve throughput with bus systems which
show latency problems. The default depends on media type, option
stream_recording=, and on compile time options.
@c man .TP
@item modesty_on_drive=parameter[:parameters]
@kindex -modesty_on_drive keep drive buffer hungry
@cindex Write, drive buffer, modesty_on_drive=
Control whether the drive buffer shall be kept from getting completely filled.
Parameter "on" (or "1") keeps the program from trying to write to the burner
drive while its buffer is in danger to be filled over a given limit.
If this filling is exceeded then the program will wait until the filling
reaches a given low percentage value.
@*
This can ease the load on operating system and drive controller and thus help
with achieving better input bandwidth if disk and burner are not on independent
controllers (like hda and hdb). It may also help with simultaneous burns on
different burners with Linux kernels like 3.16. On the other hand it increases
the risk of buffer underflow and thus reduced write speed.
@*
Some burners are not suitable because they
report buffer fill with granularity too coarse in size or time,
or expect their buffer to be filled to the top before they go to full speed.
@*
Parameters "off" or "0" disable this feature.
@*
The threshhold for beginning to wait is given by parameter "max_percent=".
Parameter "min_percent=" defines the threshhold for resuming transmission.
Percentages are permissible in the range of 25 to 100. Numbers in this
range without a prepended name are interpreted as "on:min_percent=".
@*
E.g.: modesty_on_drive=75
@*
The optimal values depend on the buffer behavior of the drive.
@*
There are also timing parameters "timeout_sec=", "min_usec=", "max_usec=".
Read the description of burn_drive_set_buffer_waiting() in libburn.h,
before setting them to non-default values.
@*
Parameters, which are not mentioned with a modesty_on_drive= option,
stay unchanged.
Default is:
@*
modesty_on_drive=off:min_percent=65:max_percent=95
@c man .TP
@item write_start_address=value
@kindex write_start_address= set block address for write start
@cindex Write start address, set, write_start_address=
@ -1057,7 +1111,7 @@ If more privacy is desired, mail to @email{scdbackup@@gmx.net}.
@*
@sp 1
Please describe what you expect @command{xorriso} to do,
the program arguments resp. commands by which you tried to achieve it,
the program arguments or dialog commands by which you tried to achieve it,
the messages of @command{xorriso}, and the undesirable outcome of your
program run.
@*

102
libisoburn/trunk/xorriso/xorriso.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 XORRISO 1 "Version 1.4.1, Mai 17, 2015"
.TH XORRISO 1 "Version 1.4.1, Jul 30, 2015"
.\" Please adjust this date whenever revising the manpage.
.\"
.\" Some roff macros, for reference:
@ -216,7 +216,7 @@ for \fBxorriso\fR.
.br
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 resp. DVD\-ROM.
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
contain unrecognizable data in the first 32 data blocks.
@ -778,7 +778,7 @@ If an ISO image was written onto a partition with offset of 640000 blocks of
512 bytes, then it can be loaded from the base device by \-displacement 160000.
.br
In both cases, the ISO sessions should be self contained, i.e. not add\-on
sessions to an ISO image outside their track resp. partition.
sessions to an ISO image outside their track or partition.
.TP
\fB\-drive_class\fR "harmless"|"banned"|"caution"|"clear_list" disk_pattern
Add a drive path pattern to one of the safety lists or make those lists empty.
@ -991,7 +991,8 @@ for substantial time after they have been used for reading. This reduces
the startup time for the next drive operation but can be loud and waste
energy if no i/o with the drive is expected to happen soon.
.br
Modes "in", "out", "all" immediately calm down \-indev, \-outdev, resp. both.
Modes "in", "out", "all" immediately calm down \-indev, \-outdev, or both,
respectively.
Mode "revoke" immediately alerts both.
Mode "on" causes \-calm_drive to be performed automatically after each \-dev,
\-indev, and \-outdev. Mode "off" disables this.
@ -1121,7 +1122,7 @@ as files to add, if they are not parameters to appropriate commands.
\fB\-path_list\fR disk_path
Like \-add but read the parameter words from file disk_path
or standard input if disk_path is "\-".
The list must contain exactly one pathspec resp. disk_path pattern per line.
The list must contain exactly one pathspec or disk_path pattern per line.
.TP
\fB\-quoted_path_list\fR disk_path
Like \-path_list but with quoted input reading rules. Lines get split into
@ -1248,7 +1249,7 @@ In case of collision merge directories with existing ones, but do not overwrite
existing ISO file objects.
.br
The rules for generating the copy addresses are the same as with
command \-cpr (see above) resp. shell command cp \-r. Other than with \-cpr,
command \-cpr (see above) or shell command cp \-r. Other than with \-cpr,
relative iso_rr_path_original will get prepended the \-cd path and not
the \-cdx path. Consider to \-mkdir iso_rr_path_dest before \-cp_clone
so the copy address does not depend on the number of iso_rr_path_original
@ -1333,7 +1334,7 @@ if they contain a / character, or as \-not_leaf pattern.
.TP
\fB\-quoted_not_list\fR disk_path
Like \-not_list but with quoted input reading rules. Each word is
handled as one parameter for \-not_paths resp. \-not_leaf.
handled as one parameter for \-not_paths or \-not_leaf.
.TP
\fB\-follow\fR occasion[:occasion[...]]
Enable or disable resolution of symbolic links and mountpoints under
@ -1426,7 +1427,7 @@ Set the threshold for automatic splitting of regular files. Such splitting
maps a large disk file onto a ISO directory with several part files in it.
This is necessary if the size of the disk file exceeds \-file_size_limit.
Older operating systems can handle files in mounted ISO 9660 filesystems
only if they are smaller than 2 GiB resp. 4 GiB.
only if they are smaller than 2 GiB or in other cases 4 GiB.
.br
Default is 0 which will exclude files larger than \-file_size_limit by a
FAILURE event.
@ -1558,8 +1559,8 @@ ACL entries are separated by comma or newline. If an entry is empty text or
begins with "#" then it will be ignored. A valid entry has to begin
by a letter out of {ugom} for "user", "group", "other", "mask". It has to
contain two colons ":". A non\-empty text between those ":" gives a user id
resp. group id. After the second ":" there may be letters out of {rwx\- #}.
The first three give read, write resp. execute permission.
or group id. After the second ":" there may be letters out of {rwx\- #}.
The first three give read, write, or execute permission.
Letters "\-", " " and TAB are ignored. "#" causes the rest of the entry to
be ignored. Letter "X" or any other letters are not supported. Examples:
.br
@ -1812,7 +1813,7 @@ All applicable \-compliance rules are taken into respect.
Rule "omit_version" is always enabled, because else
namespaces "joliet" and "ecma119" would cause changes with every
non\-directory name.
Consider to also enable rules "no_force_dots" resp. "no_j_force_dots".
Consider to also enable rules "no_force_dots" and "no_j_force_dots".
.br
The namespaces use different character sets and apply further restrictions
to name length, permissible characters, and mandatory name components.
@ -1840,7 +1841,7 @@ If this test is reached then the evaluation ends immediately and action
is performed if the decision is "yes" or "true". See operator \-if.
.br
\fB\-true\fR and \fB\-false\fR :
Always match resp. match not. Evaluation goes on.
Always match or match not, respectively. Evaluation goes on.
.br
\fB\-sort_lba\fR :
Always match. This causes \-find to perform its action in a sequence sorted by
@ -2288,7 +2289,7 @@ burn programs but you may well try some of those listed below
under SEE ALSO.
.TP
\fB\-eject\fR "in"|"out"|"all"
Eject the medium in \-indev, resp. \-outdev, resp. both drives.
Eject the medium in \-indev, \-outdev, or both drives, respectively.
Note: It is not possible yet to effectively eject disk files.
.TP
\fB\-commit_eject\fR "in"|"out"|"all"|"none"
@ -2424,9 +2425,9 @@ Only if the drive reports contradicting speed information there will appear
\-speed 0, if it deviates from "Write speed H".
.br
"Read speed L" and "Read speed H" tell the minimum and maximum read speeds,
as reported by the drive. They would be chosen by \-read_speed "min" resp.
"max" if they undercut resp. surpass the built\-in limits. These are "1x"
resp. "52xCD", "24xDVD", "20xBD".
as reported by the drive. They would be chosen by \-read_speed "min" or
"max" if they undercut or surpass the built\-in limits. These are "1x",
"52xCD", "24xDVD", "20xBD".
.TP
\fB\-close_damaged\fR "as_needed"|"force"
Try to close the upcomming track and session if the drive reported the medium
@ -2445,7 +2446,8 @@ No image changes are allowed to be pending before this command is performed.
After closing was attempted, both drives are given up.
.TP
\fB\-list_profiles\fR "in"|"out"|"all"
Put out a list of media types supported by \-indev, resp. \-outdev, resp. both.
Put out a list of media types supported by \-indev, \-outdev, or both,
respectively.
The currently recognized type is marked by text "(current)".
.TP
.B Settings for result writing:
@ -2837,6 +2839,44 @@ or BD media. A number of 64 KB may improve throughput with bus systems which
show latency problems. The default depends on media type, on command
\-stream_recording , and on compile time options.
.TP
\fB\-modesty_on_drive\fR parameter[:parameters]
Control whether the drive buffer shall be kept from getting completely filled.
Parameter "on" (or "1") keeps the program from trying to write to the burner
drive while its buffer is in danger to be filled over a given limit.
If this limit is exceeded then the program will wait until the filling
reaches a given low percentage value.
.br
This can ease the load on operating system and drive controller and thus help
with achieving better input bandwidth if disk and burner are not on independent
controllers (like hda and hdb). It may also help with simultaneous burns on
different burners with Linux kernels like 3.16. On the other hand it increases
the risk of buffer underflow and thus reduced write speed.
.br
Some burners are not suitable because they
report buffer fill with granularity too coarse in size or time,
or expect their buffer to be filled to the top before they go to full speed.
.br
Parameters "off" or "0" disable this feature.
.br
The threshhold for beginning to wait is given by parameter "max_percent=".
Parameter "min_percent=" defines the threshhold for resuming transmission.
Percentages are permissible in the range of 25 to 100. Numbers in this
range without a prepended name are interpreted as "on:min_percent=".
.br
E.g.: \-modesty_on_drive 75
.br
The optimal values depend on the buffer behavior of the drive.
.br
There are also timing parameters "timeout_sec=", "min_usec=", "max_usec=".
Read the description of burn_drive_set_buffer_waiting() in libburn.h,
before setting them to non\-default values.
.br
Parameters, which are not mentioned with a \-modesty_on_drive command,
stay unchanged.
Default is:
.br
\-modesty_on_drive off:min_percent=65:max_percent=95
.TP
\fB\-stdio_sync\fR "on"|"off"|"end"|number
Set the number of bytes after which to force output to stdio: pseudo drives.
This forcing keeps the memory from being clogged with lots of
@ -3306,8 +3346,8 @@ This is mutually exclusive with production of other boot blocks like MBR.
.br
\fBmips_discard\fR, \fBsparc_discard\fR, \fBhppa_discard\fR,
\fBalpha_discard\fR
revoke any boot file declarations made for mips, mipsel, sparc, hppa,
resp. alpha.
revoke any boot file declarations made for mips/mipsel, sparc, hppa,
or alpha, respectively.
This removes the ban on production of other boot blocks.
.br
\fBhfsplus_serial=\fRhexstring sets a string of 16 digits "0" to "9"
@ -3726,7 +3766,7 @@ before ending the program.
With setting "tree" the reassuring prompt will appear for an eventual
directory only once and not for each file in its whole subtree.
.br
Setting "off" silently kills any kind of image file object resp. performs
Setting "off" silently kills any kind of image file object and performs
above irrevocable actions.
.br
To really produce user prompts, command \-dialog needs to be set to "on".
@ -3842,7 +3882,7 @@ address.
"%sbsector%" will be substituted by the session start sector.
.br
"%track%", "%session%", "%volid%" will be substituted by track number,
session number, resp. volume id of the depicted session.
session number, or volume id of the depicted session.
.TP
\fB\-print_size\fR
Print the foreseeable consumption of 2048 byte blocks
@ -3966,8 +4006,8 @@ File type 'e' indicates the El Torito boot catalog.
.br
If the file has non\-trivial ACL, then a '+' is appended to the permission info.
If the file is hidden, then 'I' for "iso_rr", 'J' for "joliet", 'A'
for "hfsplus", resp. 'H' for multiple hiding gets appended.
Together with ACL it is 'i', 'j', 'a', resp. 'h'.
for "hfsplus", 'H' for multiple hiding gets appended.
Together with ACL it is 'i', 'j', 'a', 'h'.
.TP
\fB\-lsdl\fR iso_rr_pattern [***]
Like \-lsd but also list some of the file attributes.
@ -4578,7 +4618,7 @@ commands \-mkdir, \-cp_clone, \-find update_merge, and \-find rm_merge.
\-root and \-old\-root set command \-disk_dev_ino to "ino_only" and \-md5 to "on",
by default.
\-disk_dev_ino can be set to "off" by \-\-old\-root\-no\-ino
resp. to "on" by \-\-old\-root\-devno .
or to "on" by \-\-old\-root\-devno .
\-md5 can be set to "off" by \-\-old\-root\-no\-md5 .
.br
Not original mkisofs options are \-\-quoted_path_list ,
@ -4741,7 +4781,7 @@ character device.
If list_path is not empty then the record will also be appended to the
data file given by this path.
.br
Program scdbackup_verify will recognize and verify tag resp. record.
Program scdbackup_verify will recognize and verify tag and file record.
.TP
.B Scripting, dialog and program control features:
.TP
@ -4886,7 +4926,7 @@ result and info channel. An empty text will cause no output at all.
\fB\-prompt\fR text
Show text at beginning of output line and
wait for the user to hit the Enter key
resp. to send a line via stdin.
or to send a line via stdin.
.TP
\fB\-sleep\fR seconds
Wait for the given number of seconds before perfoming the next command.
@ -4916,7 +4956,7 @@ This transport becomes visible with \-report_about "ALL".
If path is not empty it gives the address of a plain text file where
a log record gets appended after each session. This log can be used to
determine the start_lba of a session for mount options \-o sbsector=
resp. \-s from date or volume ID.
(on GNU/Linux) or \-s (on FreeBSD) from date or volume ID.
.br
Record format is: timestamp start_lba size volume\-id
.br
@ -5115,7 +5155,7 @@ or be "\-" to leave the according standard i/o channel unreplaced.
.br
xorriso will open the stdin pipe, read and execute dialog lines from it
until the sender closes the pipe. The output pipes get opened depending on
mode "buffered" resp. "direct". After all lines are executed, xorriso will
mode "buffered" or "direct". After all lines are executed, xorriso will
close its side of the pipes and enter a new cycle of opening, reading and
executing.
.br
@ -5602,7 +5642,7 @@ sums against the current file content on hard disk. This is usually much faster
than the default which compares both contents directly.
.br
With \fBmount\fR option \fB\-o "sbsector="\fR on GNU/Linux
resp. \fB\-s\fR on FreeBSD or NetBSD
or \fB\-s\fR 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=".
@ -5690,7 +5730,7 @@ $ xorriso \-abort_on NEVER \-indev /dev/sr0 \\
This can be repeated several times, if necessary with \-eject or with other
\-indev drives. See the human readable part of "$HOME"/dvd_copy.map for
addresses which can be used on "$HOME"/dvd_copy with mount option \-o sbsector=
resp. \-s.
or \-s.
.SH FILES
.SS
.B Program alias names:
@ -5775,7 +5815,7 @@ please send electronic mail to the public list <bug\-xorriso@gnu.org>.
If more privacy is desired, mail to <scdbackup@gmx.net>.
.br
Please describe what you expect \fBxorriso\fR to do,
the program arguments resp. commands by which you tried to achieve it,
the program arguments or dialog commands by which you tried to achieve it,
the messages of \fBxorriso\fR, and the undesirable outcome of your
program run.
.br

18
libisoburn/trunk/xorriso/xorriso.h
View File

@ -418,7 +418,7 @@ int Xorriso_execute_option(struct XorrisO *xorriso, char *line, int flag);
0= off
1= in_double_quotes
2= in_quotes
3= with_quoted_input resp. on
3= with_quoted_input
bit5= Prepend the program name as (*argv)[0], so that
*argv is suitable for Xorriso_interpreter()
and other calls which expect this.
@ -992,7 +992,7 @@ struct Xorriso_lsT;
the redirection is ended by a call to Xorriso_pull_outlists() with the
stack_handle value returned by this call.
If Xorriso_option_pkt_output() is set to "on", then it will consolidate
output in the result_list of Xorriso_fetch_outlists() resp.
output in the result_list of Xorriso_fetch_outlists() and
Xorriso_pull_outlists().
@param xorriso The environment handle
@param stack_handle returns an id number which is unique as long as
@ -1068,8 +1068,8 @@ int Xorriso_peek_outlists(struct XorrisO *xorriso, int stack_handle,
/** Disable the redirection given by stack_handle. If it was the current
receiver of messages then switch output to the next older redirection
resp. to the normal channels if no redirections are stacked any more.
receiver of messages then switch output to the next older redirection,
or to the normal channels if no redirections are stacked any more.
The messages collected by the disabled redirection are handed out as
two lists. Both lists have to be disposed via Xorriso_lst_destroy_all()
when they are no longer needed.
@ -1097,7 +1097,7 @@ int Xorriso_pull_outlists(struct XorrisO *xorriso, int stack_handle,
@param xorriso The environment handle
@param result_handler Pointer to the function which shall be called with
each result message. A NULL pointer causes output
to be directed to stdout resp. to be interpreted
to be directed to stdout or to be interpreted
as -pkt_output format if this is enabled by
Xorriso_option_pkt_output().
The function should return 1. A return value of -1
@ -1108,7 +1108,7 @@ int Xorriso_pull_outlists(struct XorrisO *xorriso, int stack_handle,
Submit NULL if result_handler is NULL.
@param info_handler Pointer to the function which shall be called with
each info message. A NULL pointer causes output to
be directed to stderr resp. to -as mkisofs -log-file.
be directed to stderr or to -as mkisofs -log-file.
The function should return 1. A return value of -1
urges not to call again with further lines.
@param info_handle The first argument of (*info_handler)(). It shall
@ -1151,7 +1151,7 @@ char *Xorriso_lst_get_text(struct Xorriso_lsT *entry, int flag);
/** Obtain the address of the next item in the chain of messages.
An iteration over the output of Xorriso_pull_outlists() starts at the
returned result_list resp. info_list and ends when this function returns
returned result_list or info_list and ends when this function returns
NULL.
@param entry The current list item
@param flag unused yet, submit 0
@ -1650,6 +1650,10 @@ int Xorriso_option_md5(struct XorrisO *xorriso, char *mode, int flag);
int Xorriso_option_mkdiri(struct XorrisO *xorriso, int argc, char **argv,
int *idx, int flag);
/* Command -modesty_on_drive */
int Xorriso_option_modesty_on_drive(struct XorrisO *xorriso, char *mode,
int flag);
/* Command -mount , -mount_cmd , -session_string */
/* @param bit0= -mount_cmd: print mount command to result channel rather
than performing it

4414
libisoburn/trunk/xorriso/xorriso.info
View File

File diff suppressed because it is too large Load Diff

104
libisoburn/trunk/xorriso/xorriso.texi
View File

@ -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.4.1, Mai 17, 2015"
@c man .TH XORRISO 1 "Version 1.4.1, Jul 30, 2015"
@c man .\" Please adjust this date whenever revising the manpage.
@c man .\"
@c man .\" Some roff macros, for reference:
@ -330,7 +330,7 @@ for @command{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 resp. DVD-ROM.
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.
@ -1003,7 +1003,7 @@ If an ISO image was written onto a partition with offset of 640000 blocks of
512 bytes, then it can be loaded from the base device by -displacement 160000.
@*
In both cases, the ISO sessions should be self contained, i.e. not add-on
sessions to an ISO image outside their track resp. partition.
sessions to an ISO image outside their track or partition.
@c man .TP
@item -drive_class "harmless"|"banned"|"caution"|"clear_list" disk_pattern
@kindex -drive_class controls drive accessability
@ -1240,7 +1240,8 @@ for substantial time after they have been used for reading. This reduces
the startup time for the next drive operation but can be loud and waste
energy if no i/o with the drive is expected to happen soon.
@*
Modes "in", "out", "all" immediately calm down -indev, -outdev, resp. both.
Modes "in", "out", "all" immediately calm down -indev, -outdev, or both,
respectively.
Mode "revoke" immediately alerts both.
Mode "on" causes -calm_drive to be performed automatically after each -dev,
-indev, and -outdev. Mode "off" disables this.
@ -1394,7 +1395,7 @@ as files to add, if they are not parameters to appropriate commands.
@cindex Insert, paths from disk file, -path_list
Like -add but read the parameter words from file disk_path
or standard input if disk_path is "-".
The list must contain exactly one pathspec resp. disk_path pattern per line.
The list must contain exactly one pathspec or disk_path pattern per line.
@c man .TP
@item -quoted_path_list disk_path
@kindex -quoted_path_list inserts paths from disk file
@ -1547,7 +1548,7 @@ In case of collision merge directories with existing ones, but do not overwrite
existing ISO file objects.
@*
The rules for generating the copy addresses are the same as with
command -cpr (see above) resp. shell command cp -r. Other than with -cpr,
command -cpr (see above) or shell command cp -r. Other than with -cpr,
relative iso_rr_path_original will get prepended the -cd path and not
the -cdx path. Consider to -mkdir iso_rr_path_dest before -cp_clone
so the copy address does not depend on the number of iso_rr_path_original
@ -1648,7 +1649,7 @@ if they contain a / character, or as -not_leaf pattern.
@kindex -quoted_not_list sets exclusions
@cindex Insert, file exclusion, -quoted_not_list
Like -not_list but with quoted input reading rules. Each word is
handled as one parameter for -not_paths resp. -not_leaf.
handled as one parameter for -not_paths or -not_leaf.
@c man .TP
@item -follow occasion[:occasion[...]]
@kindex -follow softlinks and mount points
@ -1751,7 +1752,7 @@ Set the threshold for automatic splitting of regular files. Such splitting
maps a large disk file onto a ISO directory with several part files in it.
This is necessary if the size of the disk file exceeds -file_size_limit.
Older operating systems can handle files in mounted ISO 9660 filesystems
only if they are smaller than 2 GiB resp. 4 GiB.
only if they are smaller than 2 GiB or in other cases 4 GiB.
@*
Default is 0 which will exclude files larger than -file_size_limit by a
FAILURE event.
@ -1915,8 +1916,8 @@ ACL entries are separated by comma or newline. If an entry is empty text or
begins with "#" then it will be ignored. A valid entry has to begin
by a letter out of @{ugom@} for "user", "group", "other", "mask". It has to
contain two colons ":". A non-empty text between those ":" gives a user id
resp. group id. After the second ":" there may be letters out of @{rwx- #@}.
The first three give read, write resp. execute permission.
or group id. After the second ":" there may be letters out of @{rwx- #@}.
The first three give read, write, or execute permission.
Letters "-", " " and TAB are ignored. "#" causes the rest of the entry to
be ignored. Letter "X" or any other letters are not supported. Examples:
@*
@ -2193,7 +2194,7 @@ All applicable -compliance rules are taken into respect.
Rule "omit_version" is always enabled, because else
namespaces "joliet" and "ecma119" would cause changes with every
non-directory name.
Consider to also enable rules "no_force_dots" resp. "no_j_force_dots".
Consider to also enable rules "no_force_dots" and "no_j_force_dots".
@*
The namespaces use different character sets and apply further restrictions
to name length, permissible characters, and mandatory name components.
@ -2223,7 +2224,7 @@ is performed if the decision is "yes" or "true". See operator -if.
@c man \fB\-true\fR and \fB\-false\fR :
@c man-ignore-lines 1
@item -true and -false :
Always match resp. match not. Evaluation goes on.
Always match or match not, respectively. Evaluation goes on.
@*
@item -sort_lba :
Always match. This causes -find to perform its action in a sequence sorted by
@ -2718,7 +2719,7 @@ under SEE ALSO.
@item -eject "in"|"out"|"all"
@kindex -eject ejects drive tray
@cindex Drive, eject tray, -eject
Eject the medium in -indev, resp. -outdev, resp. both drives.
Eject the medium in -indev, -outdev, or both drives, respectively.
Note: It is not possible yet to effectively eject disk files.
@c man .TP
@item -commit_eject "in"|"out"|"all"|"none"
@ -2864,9 +2865,9 @@ Only if the drive reports contradicting speed information there will appear
-speed 0, if it deviates from "Write speed H".
@*
"Read speed L" and "Read speed H" tell the minimum and maximum read speeds,
as reported by the drive. They would be chosen by -read_speed "min" resp.
"max" if they undercut resp. surpass the built-in limits. These are "1x"
resp. "52xCD", "24xDVD", "20xBD".
as reported by the drive. They would be chosen by -read_speed "min" or
"max" if they undercut or surpass the built-in limits. These are "1x",
"52xCD", "24xDVD", "20xBD".
@c man .TP
@item -close_damaged "as_needed"|"force"
@kindex -close_damaged closes damaged track and session
@ -2889,7 +2890,8 @@ After closing was attempted, both drives are given up.
@item -list_profiles "in"|"out"|"all"
@kindex -list_profiles lists supported media
@cindex Drive, list supported media, -list_profiles
Put out a list of media types supported by -indev, resp. -outdev, resp. both.
Put out a list of media types supported by -indev, -outdev, or both,
respectively.
The currently recognized type is marked by text "(current)".
@end table
@c man .TP
@ -3335,6 +3337,46 @@ or BD media. A number of 64 KB may improve throughput with bus systems which
show latency problems. The default depends on media type, on command
-stream_recording , and on compile time options.
@c man .TP
@item -modesty_on_drive parameter[:parameters]
@kindex -modesty_on_drive keep drive buffer hungry
@cindex Write, drive buffer, -modesty_on_drive
Control whether the drive buffer shall be kept from getting completely filled.
Parameter "on" (or "1") keeps the program from trying to write to the burner
drive while its buffer is in danger to be filled over a given limit.
If this limit is exceeded then the program will wait until the filling
reaches a given low percentage value.
@*
This can ease the load on operating system and drive controller and thus help
with achieving better input bandwidth if disk and burner are not on independent
controllers (like hda and hdb). It may also help with simultaneous burns on
different burners with Linux kernels like 3.16. On the other hand it increases
the risk of buffer underflow and thus reduced write speed.
@*
Some burners are not suitable because they
report buffer fill with granularity too coarse in size or time,
or expect their buffer to be filled to the top before they go to full speed.
@*
Parameters "off" or "0" disable this feature.
@*
The threshhold for beginning to wait is given by parameter "max_percent=".
Parameter "min_percent=" defines the threshhold for resuming transmission.
Percentages are permissible in the range of 25 to 100. Numbers in this
range without a prepended name are interpreted as "on:min_percent=".
@*
E.g.: -modesty_on_drive 75
@*
The optimal values depend on the buffer behavior of the drive.
@*
There are also timing parameters "timeout_sec=", "min_usec=", "max_usec=".
Read the description of burn_drive_set_buffer_waiting() in libburn.h,
before setting them to non-default values.
@*
Parameters, which are not mentioned with a -modesty_on_drive command,
stay unchanged.
Default is:
@*
-modesty_on_drive off:min_percent=65:max_percent=95
@c man .TP
@item -stdio_sync "on"|"off"|"end"|number
@kindex -stdio_sync controls stdio buffer
@cindex Write, buffer syncing, -stdio_sync
@ -3845,8 +3887,8 @@ This is mutually exclusive with production of other boot blocks like MBR.
@*
@strong{mips_discard}, @strong{sparc_discard}, @strong{hppa_discard},
@strong{alpha_discard}
revoke any boot file declarations made for mips, mipsel, sparc, hppa,
resp. alpha.
revoke any boot file declarations made for mips/mipsel, sparc, hppa,
or alpha, respectively.
This removes the ban on production of other boot blocks.
@*
@cindex HFS+ serial number
@ -4322,7 +4364,7 @@ before ending the program.
With setting "tree" the reassuring prompt will appear for an eventual
directory only once and not for each file in its whole subtree.
@*
Setting "off" silently kills any kind of image file object resp. performs
Setting "off" silently kills any kind of image file object and performs
above irrevocable actions.
@*
To really produce user prompts, command -dialog needs to be set to "on".
@ -4455,7 +4497,7 @@ address.
"%sbsector%" will be substituted by the session start sector.
@*
"%track%", "%session%", "%volid%" will be substituted by track number,
session number, resp. volume id of the depicted session.
session number, or volume id of the depicted session.
@c man .TP
@item -print_size
@kindex -print_size predicts image size
@ -4607,8 +4649,8 @@ File type 'e' indicates the El Torito boot catalog.
@*
If the file has non-trivial ACL, then a '+' is appended to the permission info.
If the file is hidden, then 'I' for "iso_rr", 'J' for "joliet", 'A'
for "hfsplus", resp. 'H' for multiple hiding gets appended.
Together with ACL it is 'i', 'j', 'a', resp. 'h'.
for "hfsplus", 'H' for multiple hiding gets appended.
Together with ACL it is 'i', 'j', 'a', 'h'.
@c man .TP
@item -lsdl iso_rr_pattern [***]
@kindex -lsdl lists files in ISO image
@ -5320,7 +5362,7 @@ commands -mkdir, -cp_clone, -find update_merge, and -find rm_merge.
-root and -old-root set command -disk_dev_ino to "ino_only" and -md5 to "on",
by default.
@minus{}disk_dev_ino can be set to "off" by @minus{}@minus{}old-root-no-ino
resp. to "on" by @minus{}@minus{}old-root-devno .
or to "on" by @minus{}@minus{}old-root-devno .
@minus{}md5 can be set to "off" by @minus{}@minus{}old-root-no-md5 .
@*
Not original mkisofs options are @minus{}@minus{}quoted_path_list ,
@ -5493,7 +5535,7 @@ character device.
If list_path is not empty then the record will also be appended to the
data file given by this path.
@*
Program scdbackup_verify will recognize and verify tag resp. record.
Program scdbackup_verify will recognize and verify tag and file record.
@end table
@c man .TP
@c man .B Scripting, dialog and program control features:
@ -5674,7 +5716,7 @@ result and info channel. An empty text will cause no output at all.
@cindex Program, prompt for enter key, -prompt
Show text at beginning of output line and
wait for the user to hit the Enter key
resp. to send a line via stdin.
or to send a line via stdin.
@c man .TP
@item -sleep seconds
@kindex -sleep waits for a given time span
@ -5711,7 +5753,7 @@ This transport becomes visible with -report_about "ALL".
If path is not empty it gives the address of a plain text file where
a log record gets appended after each session. This log can be used to
determine the start_lba of a session for mount options -o sbsector=
resp. -s from date or volume ID.
(on GNU/Linux) or -s (on FreeBSD) from date or volume ID.
@*
Record format is: timestamp start_lba size volume-id
@*
@ -5934,7 +5976,7 @@ or be "-" to leave the according standard i/o channel unreplaced.
@*
xorriso will open the stdin pipe, read and execute dialog lines from it
until the sender closes the pipe. The output pipes get opened depending on
mode "buffered" resp. "direct". After all lines are executed, xorriso will
mode "buffered" or "direct". After all lines are executed, xorriso will
close its side of the pipes and enter a new cycle of opening, reading and
executing.
@*
@ -6562,7 +6604,7 @@ sums against the current file content on hard disk. This is usually much faster
than the default which compares both contents directly.
@*
With @strong{mount} option @strong{-o "sbsector="} on GNU/Linux
resp. @strong{-s} on FreeBSD or NetBSD
or @strong{-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=".
@ -6666,7 +6708,7 @@ $ xorriso -abort_on NEVER -indev /dev/sr0 \
This can be repeated several times, if necessary with -eject or with other
-indev drives. See the human readable part of "$HOME"/dvd_copy.map for
addresses which can be used on "$HOME"/dvd_copy with mount option -o sbsector=
resp. -s.
or -s.
@c man .SH FILES
@node Files, Seealso, Examples, Top
@chapter Files
@ -6798,7 +6840,7 @@ If more privacy is desired, mail to @email{scdbackup@@gmx.net}.
@*
@sp 1
Please describe what you expect @command{xorriso} to do,
the program arguments resp. commands by which you tried to achieve it,
the program arguments or dialog commands by which you tried to achieve it,
the messages of @command{xorriso}, and the undesirable outcome of your
program run.
@*

10
libisoburn/trunk/xorriso/xorriso_private.h
View File

@ -365,6 +365,16 @@ struct XorrisO { /* the global context of xorriso */
int dvd_obs; /* DVD write chunk size: 0, 32k or 64k */
int modesty_on_drive; /* "enable" of burn_drive_set_buffer_waiting()
0= disable , 1= enable waiting ,
(-1 = do not change setting)
*/
int min_buffer_usec; /* The other parameters for this function */
int max_buffer_usec;
int buffer_timeout_sec;
int min_buffer_percent;
int max_buffer_percent;
int stdio_sync; /* stdio fsync interval: -1, 0, >=32 */
int stdio_sync_is_default; /* 1= is still default , 0= has been set */

2
libisoburn/trunk/xorriso/xorriso_timestamp.h
View File

@ -1 +1 @@
#define Xorriso_timestamP "2015.07.04.094919"
#define Xorriso_timestamP "2015.07.31.162206"