From 20cddac861d2588f17345df717b4b7e7542ebb62 Mon Sep 17 00:00:00 2001 From: Thomas Schmitt Date: Sun, 4 Aug 2013 10:23:14 +0000 Subject: [PATCH] New -as mkisofs option --application_use --- libisoburn/trunk/xorriso/emulators.c | 7 ++- libisoburn/trunk/xorriso/xorriso_timestamp.h | 2 +- libisoburn/trunk/xorriso/xorrisofs.1 | 15 +++++- libisoburn/trunk/xorriso/xorrisofs.info | 54 +++++++++++++------- libisoburn/trunk/xorriso/xorrisofs.texi | 17 +++++- 5 files changed, 72 insertions(+), 23 deletions(-) diff --git a/libisoburn/trunk/xorriso/emulators.c b/libisoburn/trunk/xorriso/emulators.c index 85c405d3..473867f9 100644 --- a/libisoburn/trunk/xorriso/emulators.c +++ b/libisoburn/trunk/xorriso/emulators.c @@ -587,7 +587,8 @@ int Xorriso_genisofs_count_args(struct XorrisO *xorriso, int argc, char **argv, "" }; static char arg1_options[][41]= { - "-abstract", "-A", "-appid", "-biblio", "-b", "-B", "-boot-load-seg", + "-abstract", "-A", "-appid", "--application_use", + "-biblio", "-b", "-B", "-boot-load-seg", "-boot-load-size", "-C", "-c", "-check-session", "-copyright", "-dir-mode", "-eltorito-id", "-eltorito-selcrit", "-file-mode", "-G", "-gid", "-hide", "-hide-list", @@ -793,6 +794,7 @@ int Xorriso_genisofs_help(struct XorrisO *xorriso, int flag) " -abstract FILE Set Abstract filename", " -biblio FILE Set Bibliographic filename", " -copyright FILE Set Copyright filename", +" --application_use CHAR|PATH Set content of Application Use field", " -jigdo-jigdo FILE Produce a jigdo .jigdo file as well as the .iso", " -jigdo-template FILE Produce a jigdo .template file as well as the .iso", " -jigdo-min-file-size SIZE Minimum size for a file to be listed in the jigdo file", @@ -1665,6 +1667,7 @@ not_enough_args:; strcmp(argpt, "-p")==0 || strcmp(argpt, "-preparer")==0 || strcmp(argpt, "-P")==0 || strcmp(argpt, "-publisher")==0 || strcmp(argpt, "-A")==0 || strcmp(argpt, "-appid")==0 || + strcmp(argpt, "--application_use")==0 || strcmp(argpt, "-sysid")==0 || strcmp(argpt, "-biblio")==0 || strcmp(argpt, "-copyright")==0 || @@ -1693,6 +1696,8 @@ not_enough_args:; ret= Xorriso_option_copyright_file(xorriso, argv[i], 0); else if(strcmp(argpt, "-abstract")==0) ret= Xorriso_option_abstract_file(xorriso, argv[i], 0); + else if(strcmp(argpt, "--application_use")==0) + ret= Xorriso_option_application_use(xorriso, argv[i], 0); if(ret<=0) goto problem_handler_2; } else if(strcmp(argpt, "-m")==0 || strcmp(argpt, "-exclude")==0 || diff --git a/libisoburn/trunk/xorriso/xorriso_timestamp.h b/libisoburn/trunk/xorriso/xorriso_timestamp.h index 4bc8aafb..4085e8b8 100644 --- a/libisoburn/trunk/xorriso/xorriso_timestamp.h +++ b/libisoburn/trunk/xorriso/xorriso_timestamp.h @@ -1 +1 @@ -#define Xorriso_timestamP "2013.08.04.102038" +#define Xorriso_timestamP "2013.08.04.102243" diff --git a/libisoburn/trunk/xorriso/xorrisofs.1 b/libisoburn/trunk/xorriso/xorrisofs.1 index 78d0a1d7..8a9c9980 100644 --- a/libisoburn/trunk/xorriso/xorrisofs.1 +++ b/libisoburn/trunk/xorriso/xorrisofs.1 @@ -9,7 +9,7 @@ .\" First parameter, NAME, should be all caps .\" Second parameter, SECTION, should be 1-8, maybe w/ subsection .\" other parameters are allowed: see man(7), man(1) -.TH XORRISOFS 1 "Version 1.3.1, Jun 02, 2013" +.TH XORRISOFS 1 "Version 1.3.1, Aug 04, 2013" .\" Please adjust this date whenever revising the manpage. .\" .\" Some roff macros, for reference: @@ -848,6 +848,19 @@ It is supposed to match this GRUB line: .br E.g. 2010040711405800 is 7 Apr 2010 11:40:58 (+0 centiseconds). .TP +\fB--application_use\fR character|0xXY|disk_path +Specify the content of the Application Use field which can take at most +512 bytes. +.br +If the parameter of this command is empty, then the field is filled +with 512 0\-bytes. If it is a single character, then it gets repeated 512 times. +If it begins by "0x" followed by two hex digits [0\-9a\-fA\-F], then the digits +are read as byte value which gets repeated 512 times. +.br +Any other parameter text is used as disk_path to open a data file and to +read up to 512 bytes from it. If the file is smaller than 512 bytes, then the +remaining bytes in the field get set to binary 0. +.TP .B El Torito Bootable ISO images: .PP The precondition for a bootable ISO image is to have in the ISO image diff --git a/libisoburn/trunk/xorriso/xorrisofs.info b/libisoburn/trunk/xorriso/xorrisofs.info index 4bdaf3c8..6f71d2e3 100644 --- a/libisoburn/trunk/xorriso/xorrisofs.info +++ b/libisoburn/trunk/xorriso/xorrisofs.info @@ -838,6 +838,19 @@ characters from at most 3 characters. search --fs-uuid --set YYYY-MM-DD-hh-mm-ss-cc E.g. 2010040711405800 is 7 Apr 2010 11:40:58 (+0 centiseconds). +--application_use character|0xXY|disk_path + Specify the content of the Application Use field which can take at + most 512 bytes. + If the parameter of this command is empty, then the field is filled + with 512 0-bytes. If it is a single character, then it gets + repeated 512 times. If it begins by "0x" followed by two hex + digits [0-9a-fA-F], then the digits are read as byte value which + gets repeated 512 times. + Any other parameter text is used as disk_path to open a data file + and to read up to 512 bytes from it. If the file is smaller than + 512 bytes, then the remaining bytes in the field get set to binary + 0. +  File: xorrisofs.info, Node: Bootable, Next: SystemArea, Prev: ImageId, Up: Options @@ -1766,6 +1779,7 @@ File: xorrisofs.info, Node: CommandIdx, Next: ConceptIdx, Prev: Legal, Up: T * Menu: * --acl Recording of ACLs: SetExtras. (line 71) +* --application_use set Application Use field: ImageId. (line 90) * --boot-catalog-hide Hide El Torito boot catalog: Bootable. (line 114) * --efi-boot El Torito EFI boot image: Bootable. (line 58) @@ -2095,6 +2109,8 @@ File: xorrisofs.info, Node: ConceptIdx, Prev: CommandIdx, Up: Top * ISO file names, very relaxed rules, -U, -untranslated-filenames: SetCompl. (line 29) * ISO image size, predict, -print-size: Miscellaneous. (line 8) +* ISO image, set Application Use field, --application_use: ImageId. + (line 90) * ISO image, set timestamps, --modification-date=: ImageId. (line 82) * ISO level 1, enforce directory names, -disallow_dir_id_ext: SetCompl. (line 24) @@ -2181,24 +2197,24 @@ Node: SetCompl19092 Node: SetExtras21688 Node: SetHide30097 Node: ImageId31405 -Node: Bootable34910 -Node: SystemArea39904 -Node: Charset50201 -Node: Jigdo51227 -Node: Miscellaneous55494 -Node: Examples57138 -Node: ExSimple57624 -Node: ExGraft58103 -Node: ExMkisofs59350 -Node: ExGrowisofs60603 -Node: ExIncBackup61775 -Node: ExIncBckAcc64883 -Node: ExBootable66559 -Node: Files68651 -Node: Seealso69725 -Node: Bugreport70381 -Node: Legal70962 -Node: CommandIdx71857 -Node: ConceptIdx86413 +Node: Bootable35573 +Node: SystemArea40567 +Node: Charset50864 +Node: Jigdo51890 +Node: Miscellaneous56157 +Node: Examples57801 +Node: ExSimple58287 +Node: ExGraft58766 +Node: ExMkisofs60013 +Node: ExGrowisofs61266 +Node: ExIncBackup62438 +Node: ExIncBckAcc65546 +Node: ExBootable67222 +Node: Files69314 +Node: Seealso70388 +Node: Bugreport71044 +Node: Legal71625 +Node: CommandIdx72520 +Node: ConceptIdx87149  End Tag Table diff --git a/libisoburn/trunk/xorriso/xorrisofs.texi b/libisoburn/trunk/xorriso/xorrisofs.texi index c533e675..28ff1931 100644 --- a/libisoburn/trunk/xorriso/xorrisofs.texi +++ b/libisoburn/trunk/xorriso/xorrisofs.texi @@ -50,7 +50,7 @@ @c man .\" First parameter, NAME, should be all caps @c man .\" Second parameter, SECTION, should be 1-8, maybe w/ subsection @c man .\" other parameters are allowed: see man(7), man(1) -@c man .TH XORRISOFS 1 "Version 1.3.1, Jun 02, 2013" +@c man .TH XORRISOFS 1 "Version 1.3.1, Aug 04, 2013" @c man .\" Please adjust this date whenever revising the manpage. @c man .\" @c man .\" Some roff macros, for reference: @@ -1172,6 +1172,21 @@ It is supposed to match this GRUB line: search @minus{}@minus{}fs-uuid @minus{}@minus{}set YYYY-MM-DD-hh-mm-ss-cc @* E.g. 2010040711405800 is 7 Apr 2010 11:40:58 (+0 centiseconds). +@c man .TP +@item @minus{}@minus{}application_use character|0xXY|disk_path +@kindex @minus{}@minus{}application_use set Application Use field +@cindex ISO image, set Application Use field, @minus{}@minus{}application_use +Specify the content of the Application Use field which can take at most +512 bytes. +@* +If the parameter of this command is empty, then the field is filled +with 512 0-bytes. If it is a single character, then it gets repeated 512 times. +If it begins by "0x" followed by two hex digits [0-9a-fA-F], then the digits +are read as byte value which gets repeated 512 times. +@* +Any other parameter text is used as disk_path to open a data file and to +read up to 512 bytes from it. If the file is smaller than 512 bytes, then the +remaining bytes in the field get set to binary 0. @end table @c man .TP @c man .B El Torito Bootable ISO images: