New option -list_extras

This commit is contained in:
Thomas Schmitt 2011-08-18 15:19:27 +00:00
parent 0400400178
commit a8de5f38e4
11 changed files with 248 additions and 64 deletions

View File

@ -187,6 +187,7 @@ Xorriso_option_jigdo;
Xorriso_option_joliet;
Xorriso_option_list_delimiter;
Xorriso_option_list_formats;
Xorriso_option_list_formats;
Xorriso_option_list_profiles;
Xorriso_option_list_speeds;
Xorriso_option_load;

View File

@ -770,3 +770,94 @@ jte_failed:
}
int Xorriso_list_extras_result(struct XorrisO *xorriso, char *mode,
char *what, int flag)
{
if(mode[0] != 0 && strcmp(mode, "all") != 0) {
if(strcmp(mode, what) != 0 &&
(mode[0] != '-' || strcmp(mode + 1, what) != 0))
return(2);
}
Xorriso_result(xorriso, 0);
return(1);
}
int Xorriso_list_extras(struct XorrisO *xorriso, char *mode, int flag)
{
int ret;
if(strcmp(mode, "codes") == 0) {
sprintf(xorriso->result_line,
"List of xorriso extra feature codes. Usable with or without dash.\n");
Xorriso_result(xorriso, 0);
sprintf(xorriso->result_line, "Local ACL : -acl\n");
Xorriso_result(xorriso, 0);
sprintf(xorriso->result_line, "Local xattr : -xattr\n");
Xorriso_result(xorriso, 0);
sprintf(xorriso->result_line, "Jigdo files : -jigdo\n");
Xorriso_result(xorriso, 0);
sprintf(xorriso->result_line, "zisofs : -zisofs\n");
Xorriso_result(xorriso, 0);
sprintf(xorriso->result_line, "Ext. filters : -external_filter\n");
Xorriso_result(xorriso, 0);
sprintf(xorriso->result_line, "DVD obs 64 kB: -dvd_obs\n");
Xorriso_result(xorriso, 0);
sprintf(xorriso->result_line, "Readline : -use_readline\n");
Xorriso_result(xorriso, 0);
return(1);
}
sprintf(xorriso->result_line,
"List of xorriso extra features. yes = enabled , no = disabled\n");
Xorriso_list_extras_result(xorriso, mode, "list_extras", 0);
ret= iso_local_attr_support(3);
sprintf(xorriso->result_line, "Local ACL : %s\n", ret & 1 ? "yes" : "no");
Xorriso_list_extras_result(xorriso, mode, "acl", 0);
sprintf(xorriso->result_line, "Local xattr : %s\n", ret & 2 ? "yes" : "no");
Xorriso_list_extras_result(xorriso, mode, "xattr", 0);
sprintf(xorriso->result_line, "Jigdo files : %s\n",
#ifdef Xorriso_with_libjtE
"yes");
#else
"no");
#endif
Xorriso_list_extras_result(xorriso, mode, "jigdo", 0);
ret= iso_file_add_zisofs_filter(NULL, 4);
sprintf(xorriso->result_line, "zisofs : %s\n", ret == 2 ? "yes" : "no");
Xorriso_list_extras_result(xorriso, mode, "zisofs", 0);
sprintf(xorriso->result_line, "Ext. filters : %s\n",
#ifdef Xorriso_allow_external_filterS
#ifdef Xorriso_allow_extf_suiD
"yes , setuid allowed");
#else
"yes , setuid banned");
#endif
#else
"no");
#endif
Xorriso_list_extras_result(xorriso, mode, "external_filter", 0);
sprintf(xorriso->result_line, "DVD obs 64 kB: %s\n",
#ifdef Xorriso_dvd_obs_default_64K
"yes");
#else
"no");
#endif
Xorriso_list_extras_result(xorriso, mode, "dvd_obs", 0);
sprintf(xorriso->result_line, "Readline : %s\n",
#ifdef Xorriso_with_readlinE
"yes");
#else
"no");
#endif
Xorriso_list_extras_result(xorriso, mode, "use_readline", 0);
return(1);
}

View File

@ -1963,6 +1963,10 @@ int Xorriso_option_help(struct XorrisO *xorriso, int flag)
" Enable or disable logging of SCSI commands to stderr.",
" # any text Is ignored. In dialog mode the input line will be stored in",
" the eventual readline history, nevertheless.",
" -list_extras code",
" Tell whether certain extra features were enabled at compile",
" time. Code \"all\" lists all features and a headline. Other",
" codes pick a single feature. \"codes\" lists the known codes.",
" -version Tell program and version number",
" -end End program. Commit eventual pending changes.",
" -rollback_end",

View File

@ -115,6 +115,16 @@ int Xorriso_option_list_delimiter(struct XorrisO *xorriso, char *text,
}
/* Option -list_extras */
int Xorriso_option_list_extras(struct XorrisO *xorriso, char *mode, int flag)
{
int ret;
ret= Xorriso_list_extras(xorriso, mode, 0);
return(ret);
}
/* Option -list_formats */
int Xorriso_option_list_formats(struct XorrisO *xorriso, int flag)
{

View File

@ -466,7 +466,7 @@ int Xorriso_count_args(struct XorrisO *xorriso, int argc, char **argv,
"dummy","dvd_obs","early_stdio_test", "eject",
"iso_rr_pattern","follow","format","fs","gid","grow_blindly","hardlinks",
"history","indev","in_charset","joliet",
"list_delimiter","list_profiles","local_charset",
"list_delimiter","list_extras","list_profiles","local_charset",
"mark","md5","mount_opts","not_leaf","not_list","not_mgt",
"options_from_file","osirrox","outdev","out_charset","overwrite",
"pacifier","padding","path_list","pathspecs","pkt_output",
@ -1023,6 +1023,10 @@ next_command:;
(*idx)++;
ret= Xorriso_option_list_delimiter(xorriso, arg1, 0);
} else if(strcmp(cmd, "list_extras") == 0) {
(*idx)++;
ret= Xorriso_option_list_extras(xorriso, arg1, 0);
} else if(strcmp(cmd,"list_formats")==0) {
ret= Xorriso_option_list_formats(xorriso, 0);

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.1.5, Aug 8, 2011"
.TH XORRISO 1 "Version 1.1.5, Aug 18, 2011"
.\" Please adjust this date whenever revising the manpage.
.\"
.\" Some roff macros, for reference:
@ -3924,6 +3924,29 @@ Print helptext.
\fB\-version\fR
Print program name and version, component versions, license.
.TP
\fB\-list_extras\fR code
Tell whether certain extra features were enabled at compile time.
Code "all" lists all features and a headline.
Other codes pick a single feature.
Code "codes" lists them. They share names with related commands
(see also there):
.br
"acl" tells whether xorriso has an adapter for local filesystems ACLs.
.br
"xattr" tells whether xorriso has an adapter for local filesystems EA.
.br
"jigdo" tells whether production of Jigdo files is possible.
.br
"zisofs" tells whether zisofs and built\-in gzip filters are enabled.
.br
"external_filter" tells whether external filter processes are allowed
and whether they are allowed if real user id and effective user id differ.
.br
"dvd_obs" tells whether 64 kB output to DVD media is default.
.br
"use_readline" tells whether readline may be enabled in dialog mode.
.br
.TP
\fB\-history\fR textline
Copy textline into libreadline history.
.TP

View File

@ -920,6 +920,9 @@ int Xorriso_option_joliet(struct XorrisO *xorriso, char *mode, int flag);
int Xorriso_option_list_delimiter(struct XorrisO *xorriso, char *text,
int flag);
/* Option -list_extras */
int Xorriso_option_list_extras(struct XorrisO *xorriso, char *mode, int flag);
/* Option -list_formats */
int Xorriso_option_list_formats(struct XorrisO *xorriso, int flag);

View File

@ -3447,6 +3447,24 @@ File: xorriso.info, Node: Scripting, Next: Frontend, Prev: Emulation, Up: Op
-version
Print program name and version, component versions, license.
-list_extras code
Tell whether certain extra features were enabled at compile time.
Code "all" lists all features and a headline. Other codes pick a
single feature. Code "codes" lists them. They share names with
related commands (see also there):
"acl" tells whether xorriso has an adapter for local filesystems
ACLs.
"xattr" tells whether xorriso has an adapter for local filesystems
EA.
"jigdo" tells whether production of Jigdo files is possible.
"zisofs" tells whether zisofs and built-in gzip filters are
enabled.
"external_filter" tells whether external filter processes are
allowed and whether they are allowed if real user id and effective
user id differ.
"dvd_obs" tells whether 64 kB output to DVD media is default.
"use_readline" tells whether readline may be enabled in dialog
mode.
-history textline
Copy textline into libreadline history.
@ -4194,7 +4212,7 @@ File: xorriso.info, Node: CommandIdx, Next: ConceptIdx, Prev: Legal, Up: Top
[index]
* Menu:
* # starts a comment line: Scripting. (line 140)
* # starts a comment line: Scripting. (line 158)
* -abort_on controls abort on error: Exception. (line 27)
* -abstract_file sets abstract file name: SetWrite. (line 160)
* -acl controls handling of ACLs: Loading. (line 142)
@ -4208,7 +4226,7 @@ File: xorriso.info, Node: CommandIdx, Next: ConceptIdx, Prev: Legal, Up: Top
* -as emulates mkisofs or cdrecord: Emulation. (line 13)
* -assert_volid rejects undesired images: Loading. (line 83)
* -auto_charset learns character set from image: Loading. (line 97)
* -backslash_codes enables backslash conversion: Scripting. (line 49)
* -backslash_codes enables backslash conversion: Scripting. (line 67)
* -ban_stdio_write demands real drive: Loading. (line 246)
* -biblio_file sets biblio file name: SetWrite. (line 167)
* -blank erases media: Writing. (line 45)
@ -4261,8 +4279,8 @@ File: xorriso.info, Node: CommandIdx, Next: ConceptIdx, Prev: Legal, Up: Top
* -dvd_obs set write block size: SetWrite. (line 238)
* -early_stdio_test classifies stdio drives: Loading. (line 251)
* -eject ejects drive tray: Writing. (line 36)
* -end writes pending session and ends program: Scripting. (line 134)
* -errfile_log logs problematic disk files: Scripting. (line 96)
* -end writes pending session and ends program: Scripting. (line 152)
* -errfile_log logs problematic disk files: Scripting. (line 114)
* -error_behavior controls error workarounds: Exception. (line 96)
* -external_filter registers data filter: Filter. (line 20)
* -external_filter unregisters data filter: Filter. (line 48)
@ -4286,13 +4304,15 @@ File: xorriso.info, Node: CommandIdx, Next: ConceptIdx, Prev: Legal, Up: Top
* -hardlinks controls handling of hard links: Loading. (line 109)
* -help prints help text: Scripting. (line 20)
* -hide excludes file names from directory trees: Manip. (line 171)
* -history brings text into readline history: Scripting. (line 26)
* -history brings text into readline history: Scripting. (line 44)
* -in_charset sets input character set: Loading. (line 91)
* -indev aquires a drive for input: AqDrive. (line 24)
* -iso_rr_pattern controls pattern expansion: Manip. (line 10)
* -jigdo clears JTE or or adds parameter to JTE: Jigdo. (line 33)
* -joliet enables production of Joliet tree: SetWrite. (line 10)
* -list_delimiter replaces '--': Scripting. (line 42)
* -list_delimiter replaces '--': Scripting. (line 60)
* -list_extras lists compile time extra features: Scripting.
(line 26)
* -list_formats lists available formats: Writing. (line 110)
* -list_profiles lists supported media: Writing. (line 150)
* -list_speeds lists available write speeds: Writing. (line 122)
@ -4335,13 +4355,13 @@ File: xorriso.info, Node: CommandIdx, Next: ConceptIdx, Prev: Legal, Up: Top
* -pathspecs sets meaning of = with -add: SetInsert. (line 118)
* -pkt_output consolidates text output: Frontend. (line 7)
* -preparer_id sets preparer id: SetWrite. (line 173)
* -print prints result text line: Scripting. (line 81)
* -print_info prints message text line: Scripting. (line 84)
* -print_mark prints synchronizing text line: Scripting. (line 87)
* -print prints result text line: Scripting. (line 99)
* -print_info prints message text line: Scripting. (line 102)
* -print_mark prints synchronizing text line: Scripting. (line 105)
* -print_size predicts image size: Inquiry. (line 79)
* -prog sets program name: Frontend. (line 30)
* -prog_help prints help text: Frontend. (line 33)
* -prompt prompts for enter key: Scripting. (line 92)
* -prompt prompts for enter key: Scripting. (line 110)
* -publisher sets publisher id: SetWrite. (line 113)
* -pvd_info shows image id strings: Inquiry. (line 92)
* -pwd tells working directory in ISO: Navigate. (line 20)
@ -4357,11 +4377,11 @@ File: xorriso.info, Node: CommandIdx, Next: ConceptIdx, Prev: Legal, Up: Top
* -rm_r deletes trees from ISO image: Manip. (line 28)
* -rmdir deletes ISO directory: Manip. (line 32)
* -rollback discards pending changes: Writing. (line 9)
* -rollback_end ends program without writing: Scripting. (line 137)
* -rollback_end ends program without writing: Scripting. (line 155)
* -rom_toc_scan searches for sessions: Loading. (line 210)
* -scdbackup_tag enables scdbackup checksum tag: Emulation. (line 168)
* -scsi_log reports SCSI commands: Scripting. (line 125)
* -session_log logs written sessions: Scripting. (line 116)
* -scsi_log reports SCSI commands: Scripting. (line 143)
* -session_log logs written sessions: Scripting. (line 134)
* -session_string composes session info line: Inquiry. (line 66)
* -set_filter applies filter to file: Filter. (line 60)
* -set_filter_r applies filter to file tree: Filter. (line 85)
@ -4377,13 +4397,13 @@ File: xorriso.info, Node: CommandIdx, Next: ConceptIdx, Prev: Legal, Up: Top
(line 69)
* -speed set write speed: SetWrite. (line 211)
* -split_size enables large file splitting: SetInsert. (line 140)
* -status shows current settings: Scripting. (line 29)
* -status_history_max curbs -status history: Scripting. (line 38)
* -status shows current settings: Scripting. (line 47)
* -status_history_max curbs -status history: Scripting. (line 56)
* -stdio_sync controls stdio buffer: SetWrite. (line 245)
* -stream_recording controls defect management: SetWrite. (line 226)
* -system_id sets system id: SetWrite. (line 128)
* -tell_media_space reports free space: Inquiry. (line 88)
* -temp_mem_limit curbs memory consumption: Scripting. (line 74)
* -temp_mem_limit curbs memory consumption: Scripting. (line 92)
* -toc shows list of sessions: Inquiry. (line 28)
* -uid sets global ownership: SetWrite. (line 191)
* -update inserts path if different: Insert. (line 99)
@ -4431,7 +4451,7 @@ File: xorriso.info, Node: ConceptIdx, Prev: CommandIdx, Up: Top
* Character set, learn from image, -auto_charset: Loading. (line 97)
* Character Set, of terminal, -local_charset: Charset. (line 47)
* Closed media, _definition: Media. (line 43)
* Comment, #: Scripting. (line 140)
* Comment, #: Scripting. (line 158)
* Control, signal handling, -signal_handling: Exception. (line 69)
* Create, new ISO image, _definiton: Methods. (line 6)
* Cylinder alignment, _definiton: Bootable. (line 167)
@ -4440,7 +4460,7 @@ File: xorriso.info, Node: ConceptIdx, Prev: CommandIdx, Up: Top
* Delete, from ISO image, -rm: Manip. (line 21)
* Delete, from ISO image, -rm_r: Manip. (line 28)
* Delete, ISO directory, -rmdir: Manip. (line 32)
* Dialog, bring text into history, -history: Scripting. (line 26)
* Dialog, bring text into history, -history: Scripting. (line 44)
* Dialog, confirmation question, -reassure: DialogCtl. (line 32)
* Dialog, enable dialog mode, -dialog: DialogCtl. (line 7)
* Dialog, line editing, -use_readline: DialogCtl. (line 28)
@ -4462,7 +4482,7 @@ File: xorriso.info, Node: ConceptIdx, Prev: CommandIdx, Up: Top
* Drive, get drive list, -devices: Inquiry. (line 7)
* Drive, list supported media, -list_profiles: Writing. (line 150)
* Drive, reduce activity, -calm_drive: Loading. (line 235)
* Drive, report SCSI commands, -scsi_log: Scripting. (line 125)
* Drive, report SCSI commands, -scsi_log: Scripting. (line 143)
* Drive, write and eject, -commit_eject: Writing. (line 40)
* El Torito, _definiton: Extras. (line 19)
* Emulation, -as: Emulation. (line 13)
@ -4573,28 +4593,29 @@ File: xorriso.info, Node: ConceptIdx, Prev: CommandIdx, Up: Top
* Process, control exit value, -return_with: Exception. (line 39)
* Process, control verbosity, -report_about: Exception. (line 55)
* Process, disable startup files, -no_rc: Scripting. (line 7)
* Process, end program and write, -end: Scripting. (line 134)
* Process, end program, no writing, -rollback_end: Scripting. (line 137)
* Process, end program and write, -end: Scripting. (line 152)
* Process, end program, no writing, -rollback_end: Scripting. (line 155)
* Process, error workarounds, -error_behavior: Exception. (line 96)
* Process, log output channels to file, -logfile: Frontend. (line 20)
* Process, read command file, -options_from_file: Scripting. (line 12)
* Process, set synchronizing message, -mark: Frontend. (line 25)
* Program, backslash conversion, -backslash_codes: Scripting. (line 49)
* Program, curb memory, -temp_mem_limit: Scripting. (line 74)
* Program, end and write, -end: Scripting. (line 134)
* Program, end without writing, -rollback_end: Scripting. (line 137)
* Program, backslash conversion, -backslash_codes: Scripting. (line 67)
* Program, curb memory, -temp_mem_limit: Scripting. (line 92)
* Program, end and write, -end: Scripting. (line 152)
* Program, end without writing, -rollback_end: Scripting. (line 155)
* Program, list extra features, -list_extras: Scripting. (line 26)
* Program, print help text, -help: Scripting. (line 20)
* Program, print help text, -prog_help: Frontend. (line 33)
* Program, print message text line, -print_info: Scripting. (line 84)
* Program, print result text line, -print: Scripting. (line 81)
* Program, print message text line, -print_info: Scripting. (line 102)
* Program, print result text line, -print: Scripting. (line 99)
* Program, print synchronizing text line, -print_mark: Scripting.
(line 87)
(line 105)
* Program, print version, -version: Scripting. (line 23)
* Program, prompt for enter key, -prompt: Scripting. (line 92)
* Program, replace --, -list_delimiter: Scripting. (line 42)
* Program, prompt for enter key, -prompt: Scripting. (line 110)
* Program, replace --, -list_delimiter: Scripting. (line 60)
* Program, set name, -prog: Frontend. (line 30)
* Program, show current settings, -status: Scripting. (line 29)
* Program, status history, -status_history_max: Scripting. (line 38)
* Program, show current settings, -status: Scripting. (line 47)
* Program, status history, -status_history_max: Scripting. (line 56)
* Quoted input, _definiton: Processing. (line 42)
* Recovery, retrieve blocks, -check_media: Verify. (line 21)
* Rename, in ISO image, -mv: Manip. (line 35)
@ -4612,7 +4633,7 @@ File: xorriso.info, Node: ConceptIdx, Prev: CommandIdx, Up: Top
* Session, altered start address, -displacement: Loading. (line 35)
* Session, info string, -session_string: Inquiry. (line 66)
* Session, issue mount command, -mount: Restore. (line 122)
* Session, log when written, -session_log: Scripting. (line 116)
* Session, log when written, -session_log: Scripting. (line 134)
* Session, mount command line, -mount_cmd: Inquiry. (line 41)
* Session, mount parameters, -mount_opts: Inquiry. (line 57)
* Session, select as input, -load: Loading. (line 11)
@ -4641,8 +4662,8 @@ File: xorriso.info, Node: ConceptIdx, Prev: CommandIdx, Up: Top
* Write, enable Joliet, -joliet: SetWrite. (line 10)
* Write, fifo size, -fs: SetWrite. (line 255)
* Write, free space, -tell_media_space: Inquiry. (line 88)
* Write, log problematic disk files, -errfile_log: Scripting. (line 96)
* Write, log written sessions, -session_log: Scripting. (line 116)
* Write, log problematic disk files, -errfile_log: Scripting. (line 114)
* Write, log written sessions, -session_log: Scripting. (line 134)
* Write, padding image, -padding: SetWrite. (line 268)
* Write, pending ISO image, -commit: Writing. (line 13)
* Write, predict image size, -print_size: Inquiry. (line 79)
@ -4689,29 +4710,29 @@ Node: Verify148560
Node: Restore157225
Node: Emulation163885
Node: Scripting173688
Node: Frontend179816
Node: Examples181115
Node: ExDevices182286
Node: ExCreate182945
Node: ExDialog184219
Node: ExGrowing185481
Node: ExModifying186283
Node: ExBootable186784
Node: ExCharset187333
Node: ExPseudo188153
Node: ExCdrecord189051
Node: ExMkisofs189366
Node: ExGrowisofs190704
Node: ExException191839
Node: ExTime192293
Node: ExIncBackup192752
Node: ExRestore196676
Node: ExRecovery197634
Node: Files198202
Node: Seealso199500
Node: Bugreport200088
Node: Legal200669
Node: CommandIdx201599
Node: ConceptIdx216486
Node: Frontend180698
Node: Examples181997
Node: ExDevices183168
Node: ExCreate183827
Node: ExDialog185101
Node: ExGrowing186363
Node: ExModifying187165
Node: ExBootable187666
Node: ExCharset188215
Node: ExPseudo189035
Node: ExCdrecord189933
Node: ExMkisofs190248
Node: ExGrowisofs191586
Node: ExException192721
Node: ExTime193175
Node: ExIncBackup193634
Node: ExRestore197558
Node: ExRecovery198516
Node: Files199084
Node: Seealso200382
Node: Bugreport200970
Node: Legal201551
Node: CommandIdx202481
Node: ConceptIdx217504

End Tag Table

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.1.5, Aug 8, 2011"
@c man .TH XORRISO 1 "Version 1.1.5, Aug 18, 2011"
@c man .\" Please adjust this date whenever revising the manpage.
@c man .\"
@c man .\" Some roff macros, for reference:
@ -4620,6 +4620,31 @@ Print helptext.
@cindex Program, print version, -version
Print program name and version, component versions, license.
@c man .TP
@item -list_extras code
@kindex -list_extras lists compile time extra features
@cindex Program, list extra features, -list_extras
Tell whether certain extra features were enabled at compile time.
Code "all" lists all features and a headline.
Other codes pick a single feature.
Code "codes" lists them. They share names with related commands
(see also there):
@*
"acl" tells whether xorriso has an adapter for local filesystems ACLs.
@*
"xattr" tells whether xorriso has an adapter for local filesystems EA.
@*
"jigdo" tells whether production of Jigdo files is possible.
@*
"zisofs" tells whether zisofs and built-in gzip filters are enabled.
@*
"external_filter" tells whether external filter processes are allowed
and whether they are allowed if real user id and effective user id differ.
@*
"dvd_obs" tells whether 64 kB output to DVD media is default.
@*
"use_readline" tells whether readline may be enabled in dialog mode.
@*
@c man .TP
@item -history textline
@kindex -history brings text into readline history
@cindex Dialog, bring text into history, -history

View File

@ -1 +1 @@
#define Xorriso_timestamP "2011.08.18.132218"
#define Xorriso_timestamP "2011.08.18.151913"

View File

@ -584,5 +584,7 @@ int Xorriso_set_signal_handling(struct XorrisO *xorriso, int flag);
*/
int Xorriso_close_damaged(struct XorrisO *xorriso, int flag);
int Xorriso_list_extras(struct XorrisO *xorriso, char *mode, int flag);
#endif /* Xorrisoburn_includeD */