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

New -as mkisofs and -as cdrecord option --no_rc

Browse Source
This commit is contained in:
Thomas Schmitt 2011-03-05 09:04:23 +00:00
parent 27199bd942
commit 786e99b9f7
6 changed files with 52 additions and 34 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -62,6 +62,7 @@ int Xorriso_cdrskin_help(struct XorrisO *xorriso, int flag)
"\tstream_recording=on|number\ttry to get full speed on DVD-RAM, BD",
"\tdvd_obs=default|32k|64k\t\tbytes per DVD/BD write operation",
"\tstdio_sync=on|off|number\twhether to fsync output to \"stdio:\"",
"\t--no_rc\t\tDo not execute xorriso startup files",
"\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",
@ -259,6 +260,8 @@ no_volunteer:;
do_multi= 1;
} else if(strcmp(argv[i], "-nopad")==0) {
xorriso->padding= 0;
} else if(strcmp(argv[i], "--no_rc")==0) {
/* already performed in Xorriso_prescan_args */;
} else if(strcmp(argv[i], "-pad")==0) {
xorriso->padding= 15*2048;
} else if(strncmp(argv[i], "-padsize=", 9)==0 ||
@ -535,6 +538,7 @@ int Xorriso_genisofs_count_args(struct XorrisO *xorriso, int argc, char **argv,
"--protective-msdos-label", "--boot-catalog-hide", "--no-emul-toc",
"--emul-toc", "-disallow_dir_id_ext", "--old-empty",
"--old-root-no-md5", "--old-root-devno", "--old-root-no-ino",
"--no_rc",
""
};
static char arg1_options[][41]= {
@ -786,6 +790,7 @@ int Xorriso_genisofs_help(struct XorrisO *xorriso, int flag)
" --old-root-no-md5 Do not record and use MD5 with -old-root",
" --old-root-no-ino Do not use disk inode numbers with -old-root",
" --old-root-devno Use disk device numbers with -old-root",
" --no_rc Do not execute startup files",
" -v, -verbose Verbose",
" -version Print the current version",
"@End_of_helptexT@"
@ -1546,6 +1551,9 @@ not_enough_args:;
} else if(strcmp(argv[i], "-disallow_dir_id_ext")==0) {
/* was already handled in first argument scan */;
} else if(strcmp(argv[i], "--no_rc")==0) {
/* was already handled in Xorriso_prescan_args */;
} else if(argv[i][0]=='-' && argv[i][1]!=0) {
ret= Xorriso_genisofs_count_args(xorriso, argc - i, argv + i, &count, 1);
if(ret > 0) {

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

@ -1576,7 +1576,9 @@ int Xorriso_prescan_args(struct XorrisO *xorriso, int argc, char **argv,
ret= Xorriso_option_no_rc(xorriso, 0);
if(ret<=0)
goto ex;
} else if(xorriso->argument_emulation >= 1 &&
xorriso->argument_emulation <= 2) {
{ret= 1; goto ex;}
} else if((strcmp(cmd,"dev")==0 || strcmp(cmd,"outdev")==0 ||
strcmp(cmd,"indev")==0) &&
(strcmp(arg1,"stdio:/dev/fd/1")==0 || strcmp(arg1,"-")==0) &&

3
libisoburn/trunk/xorriso/xorriso.1
View File

@ -3656,6 +3656,9 @@ The options of genisoimage Jigdo Template Extraction are recognized and
performed via xorriso option -jigdo. See the "Alias:" names there for the
meaning of the genisoimage options.
.br
--no_rc as first argument prevents interpretation of
startup files. See section FILES below.
.br
Personalites "\fBxorrisofs\fR", "\fBgenisoimage\fR",
and "\fBgenisofs\fR" are aliases for "mkisofs".

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

@ -3247,6 +3247,8 @@ programs trigger comparable actions.
The options of genisoimage Jigdo Template Extraction are
recognized and performed via xorriso option -jigdo. See the
"Alias:" names there for the meaning of the genisoimage options.
--no_rc as first argument prevents interpretation of startup
files. See section FILES below.
Personalites "*xorrisofs*", "*genisoimage*", and "*genisofs*" are
aliases for "mkisofs".
@ -4185,7 +4187,7 @@ File: xorriso.info, Node: CommandIdx, Next: ConceptIdx, Prev: Legal, Up: Top
* -out_charset sets output character set: SetWrite. (line 183)
* -outdev aquires a drive for output: AqDrive. (line 29)
* -overwrite enables overwriting in ISO: SetInsert. (line 127)
* -pacifier controls pacifier text form: Emulation. (line 151)
* -pacifier controls pacifier text form: Emulation. (line 153)
* -padding sets amount or mode of image padding: SetWrite. (line 266)
* -page set terminal geometry: DialogCtl. (line 19)
* -paste_in copies file into disk file: Restore. (line 117)
@ -4205,7 +4207,7 @@ File: xorriso.info, Node: CommandIdx, Next: ConceptIdx, Prev: Legal, Up: Top
* -quoted_not_list sets exclusions: SetInsert. (line 72)
* -quoted_path_list inserts paths from disk file: Insert. (line 80)
* -read_mkisofsrc searches and reads .mkisofsrc file: Emulation.
(line 139)
(line 141)
* -reassure enables confirmation question: DialogCtl. (line 32)
* -report_about controls verbosity: Exception. (line 55)
* -return_with controls exit value: Exception. (line 39)
@ -4215,7 +4217,7 @@ File: xorriso.info, Node: CommandIdx, Next: ConceptIdx, Prev: Legal, Up: Top
* -rollback discards pending changes: Writing. (line 9)
* -rollback_end ends program without writing: Scripting. (line 125)
* -rom_toc_scan searches for sessions: Loading. (line 203)
* -scdbackup_tag enables scdbackup checksum tag: Emulation. (line 161)
* -scdbackup_tag enables scdbackup checksum tag: Emulation. (line 163)
* -scsi_log reports SCSI commands: Scripting. (line 113)
* -session_log logs written sessions: Scripting. (line 104)
* -session_string composes session info line: Inquiry. (line 56)
@ -4272,11 +4274,11 @@ File: xorriso.info, Node: ConceptIdx, Prev: CommandIdx, Up: Top
* Backslash Interpretation, _definition: Processing. (line 49)
* Backup, enable fast incremental, -disk_dev_ino: Loading. (line 182)
* Backup, enable features, -for_backup: Loading. (line 177)
* Backup, scdbackup checksum tag, -scdbackup: Emulation. (line 161)
* Backup, scdbackup checksum tag, -scdbackup: Emulation. (line 163)
* Blank media, _definition: Media. (line 29)
* Blind growing, _definition: Methods. (line 40)
* Bootability, control, -boot_image: Bootable. (line 26)
* cdrecord, Emulation: Emulation. (line 106)
* cdrecord, Emulation: Emulation. (line 108)
* Character Set, _definition: Charset. (line 6)
* Character Set, for input, -in_charset: Loading. (line 92)
* Character Set, for input/output, -charset: Charset. (line 43)
@ -4315,10 +4317,10 @@ File: xorriso.info, Node: ConceptIdx, Prev: CommandIdx, Up: Top
* Drive, write and eject, -commit_eject: Writing. (line 40)
* El Torito, _definiton: Extras. (line 19)
* Emulation, -as: Emulation. (line 13)
* Emulation, .mkisofsrc, -read_mkisofsrc: Emulation. (line 139)
* Emulation, cdrecord, -as: Emulation. (line 106)
* Emulation, .mkisofsrc, -read_mkisofsrc: Emulation. (line 141)
* Emulation, cdrecord, -as: Emulation. (line 108)
* Emulation, mkisofs, -as: Emulation. (line 16)
* Emulation, pacifier form, -pacifier: Emulation. (line 151)
* Emulation, pacifier form, -pacifier: Emulation. (line 153)
* Examples: Examples. (line 6)
* Filter, _definition: Filter. (line 6)
* Filter, apply to file tree, -set_filter_r: Filter. (line 84)
@ -4532,29 +4534,29 @@ Node: Navigate135431
Node: Verify143371
Node: Restore151960
Node: Emulation158616
Node: Scripting167987
Node: Frontend173549
Node: Examples174844
Node: ExDevices176013
Node: ExCreate176647
Node: ExDialog177921
Node: ExGrowing179183
Node: ExModifying179985
Node: ExBootable180486
Node: ExCharset181033
Node: ExPseudo181861
Node: ExCdrecord182755
Node: ExMkisofs183070
Node: ExGrowisofs184073
Node: ExException185197
Node: ExTime185651
Node: ExIncBackup186110
Node: ExRestore190031
Node: ExRecovery191000
Node: Files191566
Node: Seealso192794
Node: Legal193318
Node: CommandIdx194240
Node: ConceptIdx208547
Node: Scripting168091
Node: Frontend173653
Node: Examples174948
Node: ExDevices176117
Node: ExCreate176751
Node: ExDialog178025
Node: ExGrowing179287
Node: ExModifying180089
Node: ExBootable180590
Node: ExCharset181137
Node: ExPseudo181965
Node: ExCdrecord182859
Node: ExMkisofs183174
Node: ExGrowisofs184177
Node: ExException185301
Node: ExTime185755
Node: ExIncBackup186214
Node: ExRestore190135
Node: ExRecovery191104
Node: Files191670
Node: Seealso192898
Node: Legal193422
Node: CommandIdx194344
Node: ConceptIdx208651

End Tag Table

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

@ -4313,6 +4313,9 @@ The options of genisoimage Jigdo Template Extraction are recognized and
performed via xorriso option -jigdo. See the "Alias:" names there for the
meaning of the genisoimage options.
@*
@minus{}@minus{}no_rc as first argument prevents interpretation of
startup files. See section FILES below.
@*
@sp 1
Personalites "@strong{xorrisofs}", "@strong{genisoimage}",

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

@ -1 +1 @@
#define Xorriso_timestamP "2011.03.03.181850"
#define Xorriso_timestamP "2011.03.05.090434"