New options -copright_file , -biblio_file , -abstract_file

xorriso/base_obj.c

@@ -129,6 +129,9 @@ int Xorriso_new(struct XorrisO ** xorriso,char *progname, int flag)
  m->application_id[0]= 0;
  m->system_id[0]= 0;
  m->volset_id[0]= 0;
+ m->copyright_file[0]= 0;
+ m->biblio_file[0]= 0;
+ m->abstract_file[0]= 0;
  m->session_logfile[0]= 0;
  m->session_lba= -1;
  m->session_blocks= 0;

xorriso/drive_mgt.c

@@ -436,22 +436,14 @@ int Xorriso_aquire_drive(struct XorrisO *xorriso, char *adr, int flag)
  xorriso->system_id[32]= 0;
  strncpy(xorriso->volset_id, un0(iso_image_get_volset_id(volset)), 128);
  xorriso->volset_id[128]= 0;
-
+ strncpy(xorriso->copyright_file,
- /* <<< can be removed as soon as libisofs-0.6.24 is mandatory
+         un0(iso_image_get_copyright_file_id(volset)), 37);
- */
+ xorriso->copyright_file[37]= 0;
- if(strcmp(un0(iso_image_get_copyright_file_id(volset)), "_") == 0 &&
+ strncpy(xorriso->biblio_file, un0(iso_image_get_biblio_file_id(volset)), 37);
-    strcmp(un0(iso_image_get_abstract_file_id(volset)), "_") == 0 &&
+ xorriso->biblio_file[37]= 0;
-    strcmp(un0(iso_image_get_biblio_file_id(volset)), "_") == 0) {
+ strncpy(xorriso->abstract_file,
-   /* This is bug output from libisofs <= 0.6.23 . The texts mean file names
+         un0(iso_image_get_abstract_file_id(volset)), 37);
-      and should have been empty to indicate that there are no such files.
+ xorriso->abstract_file[37]= 0;
-      It is obvious that not all three roles can be fulfilled by one file "_"
-      so that one cannot spoil anything by assuming them empty now.
-      Modern versions of libisofs are supposed to do this themselves.
-    */
-   iso_image_set_copyright_file_id(volset, "");
-   iso_image_set_abstract_file_id(volset, "");
-   iso_image_set_biblio_file_id(volset, "");
- }
 
  if(xorriso->out_drive_handle != NULL &&
     xorriso->out_drive_handle != xorriso->in_drive_handle) {

xorriso/iso_img.c

@@ -285,13 +285,11 @@ int Xorriso_pvd_info(struct XorrisO *xorriso, int flag)
  Xorriso_result(xorriso,0);
  sprintf(msg, "System Id    : %s\n", xorriso->system_id);
  Xorriso_result(xorriso,0);
- sprintf(msg, "Copyright Id : %s\n",
+ sprintf(msg, "CopyrightFile: %s\n", xorriso->copyright_file);
-         un0(iso_image_get_copyright_file_id(image)));
  Xorriso_result(xorriso,0);
- sprintf(msg, "Abstract Id  : %s\n",
+ sprintf(msg, "Abstract File: %s\n", xorriso->abstract_file);
-         un0(iso_image_get_abstract_file_id(image)));
  Xorriso_result(xorriso,0);
- sprintf(msg, "Biblio Id    : %s\n", un0(iso_image_get_biblio_file_id(image)));
+ sprintf(msg, "Biblio File  : %s\n", xorriso->biblio_file);
  Xorriso_result(xorriso,0);
  return(1);
 }

xorriso/opts_a_c.c

@@ -57,6 +57,18 @@ int Xorriso_option_abort_on(struct XorrisO *xorriso, char *severity, int flag)
 }
 
 
+/* Option -abstract_file */
+int Xorriso_option_abstract_file(struct XorrisO *xorriso, char *name, int flag)
+{
+ if(Xorriso_check_name_len(xorriso, name,
+                           (int) sizeof(xorriso->abstract_file),
+                           "-abstract_file", 0) <= 0)
+   return(0);
+ strcpy(xorriso->abstract_file, name);
+ Xorriso_set_change_pending(xorriso, 1);
+ return(1);
+}
+
 /* Option -acl "on"|"off" */
 int Xorriso_option_acl(struct XorrisO *xorriso, char *mode, int flag)
 {
@@ -427,6 +439,18 @@ int Xorriso_option_ban_stdio_write(struct XorrisO *xorriso, int flag)
 }
 
 
+/* Option -biblio_file */
+int Xorriso_option_biblio_file(struct XorrisO *xorriso, char *name, int flag)
+{
+ if(Xorriso_check_name_len(xorriso, name, (int) sizeof(xorriso->biblio_file),
+                           "-biblio_file", 0) <= 0)
+   return(0);
+ strcpy(xorriso->biblio_file, name);
+ Xorriso_set_change_pending(xorriso, 1);
+ return(1);
+}
+
+
 /* Option -blank and -format */
 /* @param flag bit0= format rather than blank
    @return <=0 error , 1 success, 2 revoked by -reassure 
@@ -1680,6 +1704,19 @@ int Xorriso_option_compliance(struct XorrisO *xorriso, char *mode,
 }
 
 
+/* Option -copyright_file */
+int Xorriso_option_copyright_file(struct XorrisO *xorriso, char *name, int flag)
+{
+ if(Xorriso_check_name_len(xorriso, name,
+                           (int) sizeof(xorriso->copyright_file),
+                           "-copyright_file", 0) <= 0)
+   return(0);
+ strcpy(xorriso->copyright_file, name);
+ Xorriso_set_change_pending(xorriso, 1);
+ return(1);
+}
+
+
 /* Option -cpr alias -cpri */
 int Xorriso_option_cpri(struct XorrisO *xorriso, int argc, char **argv,
                          int *idx, int flag)

xorriso/opts_d_h.c

@@ -1368,6 +1368,12 @@ int Xorriso_option_help(struct XorrisO *xorriso, int flag)
 "                 Specifies the system id for the System Area. (32 chars)",
 "  -volume_date type timestring",
 "                 Specifies volume timestamps. [\"c\",\"m\",\"x\",\"f\",\"uuid\"]", 
+"  -copyright_file name",
+"                 Specifies the name of the Copyright File. (37 chars)",
+"  -biblio_file name",
+"                 Specifies the name of the Bibliographic File. (37 chars)",
+"  -abstract_file name",
+"                 Specifies the name of the Abstract File. (37 chars)",
 "  -joliet \"on\"|\"off\"",
 "                 Generate Joliet info additional to Rock Ridge info.",
 "  -compliance rule[:rule...]",

xorriso/parse_exec.c

@@ -455,9 +455,10 @@ int Xorriso_count_args(struct XorrisO *xorriso, int argc, char **argv,
  };
  static char arg1_commands[][40]= {
     "abort_on","acl","add_plainly","application_id","auto_charset",
-    "backslash_codes","blank",
+    "abstract_file",
+    "backslash_codes","blank","biblio_file",
     "calm_drive","cd","cdi","cdx","charset","close",
-    "commit_eject","compliance",
+    "commit_eject","compliance","copyright_file",
     "dev","dialog","disk_dev_ino","disk_pattern","dummy","dvd_obs","eject",
     "iso_rr_pattern","follow","format","fs","gid","grow_blindly","hardlinks",
     "history","indev","in_charset","joliet",
@@ -626,6 +627,10 @@ next_command:;
    (*idx)++;
    ret= Xorriso_option_abort_on(xorriso, arg1, 0);
 
+ } else if(strcmp(cmd,"abstract_file")==0) { 
+   (*idx)++;
+   Xorriso_option_abstract_file(xorriso, arg1, 0);
+
  } else if(strcmp(cmd,"acl")==0) {
    (*idx)++;
    ret= Xorriso_option_acl(xorriso, arg1, 0);
@@ -664,6 +669,10 @@ next_command:;
  } else if(strcmp(cmd,"ban_stdio_write")==0) {
    ret= Xorriso_option_ban_stdio_write(xorriso, 0);
 
+ } else if(strcmp(cmd,"biblio_file")==0) { 
+   (*idx)++;
+   Xorriso_option_biblio_file(xorriso, arg1, 0);
+
  } else if(strcmp(cmd,"blank")==0) {
    (*idx)++;
    ret= Xorriso_option_blank(xorriso, arg1, 0);
@@ -753,6 +762,10 @@ next_command:;
    (*idx)++;
    Xorriso_option_compliance(xorriso, arg1, 0);
 
+ } else if(strcmp(cmd,"copyright_file")==0) { 
+   (*idx)++;
+   Xorriso_option_copyright_file(xorriso, arg1, 0);
+
  } else if(strcmp(cmd,"cpr")==0 || strcmp(cmd,"cpri")==0) {
    ret= Xorriso_option_cpri(xorriso, argc, argv, idx, 0);
 
@@ -1649,22 +1662,13 @@ int Xorriso_read_as_mkisofsrc(struct XorrisO *xorriso, char *path, int flag)
    if(strcmp(line, "APPI") == 0) {
      ret= Xorriso_option_application_id(xorriso, cpt, 0);
    } else if(strcmp(line, "COPY") == 0) {
-
+     ret= Xorriso_option_copyright_file(xorriso, cpt, 0);
-     /* >>> to come: -copyright_file */;
-
-     ret= 1;
    } else if(strcmp(line, "ABST") == 0) {
-
+     ret= Xorriso_option_abstract_file(xorriso, cpt, 0);
-     /* >>> to come: -abstract_file */;
-
-     ret= 1;
    } else if(strcmp(line, "BIBL") == 0) {
-
+     ret= Xorriso_option_biblio_file(xorriso, cpt, 0);
-     /* >>> to come: -biblio_file */;
-
-     ret= 1;
    } else if(strcmp(line, "PREP") == 0) {
-     /* Not planned to come */
+     /* Not planned to be implemented. Preparer is xorriso. */
      ret= 1;
    } else if(strcmp(line, "PUBL") == 0) {
      ret= Xorriso_option_publisher(xorriso, cpt, 0);
@@ -1675,10 +1679,10 @@ int Xorriso_read_as_mkisofsrc(struct XorrisO *xorriso, char *path, int flag)
    } else if(strcmp(line, "VOLS") == 0) {
      ret= Xorriso_option_volset_id(xorriso, cpt, 0);
    } else if(strcmp(line, "HFS_TYPE") == 0) {
-     /* Not planned to come */
+     /* Not planned to be implemented */
      ret= 1;
    } else if(strcmp(line, "HFS_CREATOR") == 0) {
-     /* Not planned to come */
+     /* Not planned to be implemented */
      ret= 1;
    } else {
 

xorriso/text_io.c

@@ -1438,6 +1438,23 @@ 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->copyright_file[0] == 0);
+ sprintf(line,"-copyright_file %s\n",
+        Text_shellsafe(xorriso->copyright_file,sfe,0));
+ if(!(is_default && no_defaults))
+   Xorriso_status_result(xorriso,filter,fp,flag&2);
+
+ is_default= (xorriso->biblio_file[0]==0);
+ sprintf(line,"-biblio_file %s\n",Text_shellsafe(xorriso->biblio_file,sfe,0));
+ if(!(is_default && no_defaults))
+   Xorriso_status_result(xorriso,filter,fp,flag&2);
+
+ is_default= (xorriso->abstract_file[0]==0);
+ sprintf(line,"-abstract_file %s\n",
+         Text_shellsafe(xorriso->abstract_file,sfe,0));
+ if(!(is_default && no_defaults))
+   Xorriso_status_result(xorriso,filter,fp,flag&2);
+
  is_default= (xorriso->do_joliet==0);
  sprintf(line,"-joliet %s\n", (xorriso->do_joliet == 1 ? "on" : "off"));
  if(!(is_default && no_defaults))

xorriso/write_run.c

@@ -566,6 +566,9 @@ int Xorriso_write_session(struct XorrisO *xorriso, int flag)
    iso_image_set_publisher_id(image, xorriso->publisher);
    iso_image_set_system_id(image, xorriso->system_id);
    iso_image_set_volset_id(image, xorriso->volset_id);
+   iso_image_set_copyright_file_id(image, xorriso->copyright_file);
+   iso_image_set_biblio_file_id(image, xorriso->biblio_file);
+   iso_image_set_abstract_file_id(image, xorriso->abstract_file);
  }
 
  if((xorriso->do_aaip & 256) && out_cs != NULL) {

xorriso/xorriso.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 XORRISO 1 "Jun 25, 2010"
+.TH XORRISO 1 "Jun 26, 2010"
 .\" Please adjust this date whenever revising the manpage.
 .\"
 .\" Some roff macros, for reference:
@@ -2078,6 +2078,27 @@ They are prone to timezone computations. The timestrings "default" or
 of image creation. "x" and "f" will be marked as insignificant.
 "uuid" will be deactivated.
 .TP
+\fB\-copyright_file\fR text
+Set the copyright file name to be written with the next -commit. This should
+be the ISO 9660 path of a file in the image which contains a copyright
+statement.
+Permissible are up to 37 characters. This setting gets overridden by
+image loading.
+.TP
+\fB\-abstract_file\fR text
+Set the abstract file name to be written with the next -commit. This should
+be the ISO 9660 path of a file in the image which contains an abstract
+statement about the image content.
+Permissible are up to 37 characters. This setting gets overridden by
+image loading.
+.TP
+\fB\-biblio_file\fR text
+Set the biblio file name to be written with the next -commit. This should
+be the ISO 9660 path of a file in the image which contains bibliographic
+records.
+Permissible are up to 37 characters. This setting gets overridden by
+image loading.
+.TP
 \fB\-out_charset\fR character_set_name
 Set the character set to which file names get converted when writing an
 image. See paragraph "Character sets" for more explanations.
@@ -2662,7 +2683,7 @@ subtracting already foreseeable consumption by next -commit.
 .TP
 \fB\-pvd_info\fR 
 Print various id strings which can be found in loaded ISO images. Some of
-them may be changed by options -volid, -publisher, -application_id. For these
+them may be changed by options like -volid or -publisher. For these
 ids -pvd_info reports what would be written with the next -commit.
 .TP
 .B Navigation in ISO image and disk filesystem:
@@ -3246,11 +3267,11 @@ Personalites "\fBxorrisofs\fR", "\fBgenisoimage\fR",
 and "\fBgenisofs\fR" are aliases for "mkisofs".
 .br
 If xorriso is started with one of the leafnames "xorrisofs", "genisofs",
-"mkisofs", or "genisoimage", then it automatically prepends -as "genisofs"
+"mkisofs", or "genisoimage", then it performs -read_mkisofsrc and prepends
-to the command line arguments. I.e. all arguments will be interpreted mkisofs
+-as "genisofs" to the command line arguments.
-style until "--" is encountered.
+I.e. all arguments will be interpreted mkisofs style until "--"
-From then on, options are interpreted
+is encountered. 
-as xorriso options.
+From then on, options are interpreted as xorriso options.
 .br
 
 Personality "\fBcdrecord\fR" accepts the options listed with:
@@ -4036,6 +4057,10 @@ to read and execute lines from the following files:
 .br
 The files are read in the sequence given above, but none of them is required
 to exist.
+.br
+If mkisofs emulation was enabled by program name "xorrisofs", "mkisofs",
+"genisoimage", or "genisofs", then afterwards -read_mkisofsrc is performed,
+which reads .mkisofsrc files. See there.
 .SS
 .B Runtime control files:
 .br

xorriso/xorriso.h

@@ -570,11 +570,13 @@ int Xorriso_lst_destroy_all(struct Xorriso_lsT **lstring, int flag);
 /* Option -abort_on */
 int Xorriso_option_abort_on(struct XorrisO *xorriso, char *severity, int flag);
 
+/* Option -abstract_file */
+int Xorriso_option_abstract_file(struct XorrisO *xorriso, char *name,
+                                 int flag);
 
 /* Option -acl "on"|"off" */
 int Xorriso_option_acl(struct XorrisO *xorriso, char *mode, int flag);
 
-
 /* Option -add */
 /* @param flag bit0=do not report the added item
                bit1=do not reset pacifier, no final pacifier message
@@ -619,6 +621,9 @@ int Xorriso_option_backslash_codes(struct XorrisO *xorriso, char *mode,
 /* Option -ban_stdio_write */
 int Xorriso_option_ban_stdio_write(struct XorrisO *xorriso, int flag);
 
+/* Option -biblio_file */
+int Xorriso_option_biblio_file(struct XorrisO *xorriso, char *name, int flag);
+
 /* Option -blank and -format */
 /* @param flag bit0= format rather than blank
    @return <=0 error , 1 success, 2 revoked by -reassure
@@ -710,6 +715,10 @@ int Xorriso_option_compare(struct XorrisO *xorriso, char *disk_path,
 /* Option -compliance */
 int Xorriso_option_compliance(struct XorrisO *xorriso, char *mode, int flag);
 
+/* Option -copyright_file */
+int Xorriso_option_copyright_file(struct XorrisO *xorriso, char *name,
+                                  int flag);
+
 /* Option -cpr alias -cpri */
 int Xorriso_option_cpri( struct XorrisO *xorriso, int argc, char **argv,
                          int *idx, int flag);

xorriso/xorriso.info

@@ -1857,6 +1857,25 @@ will be written according to the setting of option -acl.
      and "m" will show the current time of image creation. "x" and "f"
      will be marked as insignificant.  "uuid" will be deactivated.
 
+-copyright_file text
+     Set the copyright file name to be written with the next -commit.
+     This should be the ISO 9660 path of a file in the image which
+     contains a copyright statement.  Permissible are up to 37
+     characters. This setting gets overridden by image loading.
+
+-abstract_file text
+     Set the abstract file name to be written with the next -commit.
+     This should be the ISO 9660 path of a file in the image which
+     contains an abstract statement about the image content.
+     Permissible are up to 37 characters. This setting gets overridden
+     by image loading.
+
+-biblio_file text
+     Set the biblio file name to be written with the next -commit. This
+     should be the ISO 9660 path of a file in the image which contains
+     bibliographic records.  Permissible are up to 37 characters. This
+     setting gets overridden by image loading.
+
 -out_charset character_set_name
      Set the character set to which file names get converted when
      writing an image. See paragraph "Character sets" for more
@@ -2358,9 +2377,9 @@ File: xorriso.info,  Node: Inquiry,  Next: Navigate,  Prev: DialogCtl,  Up: Opti
 
 -pvd_info
      Print various id strings which can be found in loaded ISO images.
-     Some of them may be changed by options -volid, -publisher,
+     Some of them may be changed by options like -volid or -publisher.
-     -application_id. For these ids -pvd_info reports what would be
+     For these ids -pvd_info reports what would be written with the
-     written with the next -commit.
+     next -commit.
 
 
 File: xorriso.info,  Node: Navigate,  Next: Verify,  Prev: Inquiry,  Up: Options
@@ -2898,11 +2917,11 @@ programs trigger comparable actions.
      Personalites "*xorrisofs*", "*genisoimage*", and "*genisofs*" are
      aliases for "mkisofs".
      If xorriso is started with one of the leafnames "xorrisofs",
-     "genisofs", "mkisofs", or "genisoimage", then it automatically
+     "genisofs", "mkisofs", or "genisoimage", then it performs
-     prepends -as "genisofs" to the command line arguments. I.e. all
+     -read_mkisofsrc and prepends -as "genisofs" to the command line
-     arguments will be interpreted mkisofs style until "--" is
+     arguments.  I.e. all arguments will be interpreted mkisofs style
-     encountered.  From then on, options are interpreted as xorriso
+     until "--" is encountered.  From then on, options are interpreted
-     options.
+     as xorriso options.
 
      Personality "*cdrecord*" accepts the options listed with:
      -as cdrecord -help --
@@ -3618,6 +3637,9 @@ $HOME/.xorrisorc
 
 The files are read in the sequence given above, but none of them is
 required to exist.
+If mkisofs emulation was enabled by program name "xorrisofs", "mkisofs",
+"genisoimage", or "genisofs", then afterwards -read_mkisofsrc is
+performed, which reads .mkisofsrc files. See there.
 
 11.3 Runtime control files
 ==========================
@@ -3691,6 +3713,7 @@ File: xorriso.info,  Node: CommandIdx,  Next: ConceptIdx,  Prev: Legal,  Up: Top
 
 * #   starts a comment line:             Scripting.           (line 128)
 * -abort_on   controls abort on error:   Exception.           (line  27)
+* -abstract_file   sets abstract file name: SetWrite.         (line 128)
 * -acl   controls handling of ACLs:      Loading.             (line 123)
 * -add   inserts one or more paths:      Insert.              (line  42)
 * -add_plainly   inserts one or more paths: Insert.           (line  61)
@@ -3702,6 +3725,7 @@ File: xorriso.info,  Node: CommandIdx,  Next: ConceptIdx,  Prev: Legal,  Up: Top
 * -auto_charset   learns character set from image: Loading.   (line  80)
 * -backslash_codes   enables backslash conversion: Scripting. (line  45)
 * -ban_stdio_write   demands real drive: Loading.             (line 220)
+* -biblio_file   sets biblio file name:  SetWrite.            (line 135)
 * -blank   erases media:                 Writing.             (line  45)
 * -boot_image   controls bootability:    Bootable.            (line  20)
 * -calm_drive   reduces drive activity:  Loading.             (line 209)
@@ -3718,7 +3742,7 @@ File: xorriso.info,  Node: CommandIdx,  Next: ConceptIdx,  Prev: Legal,  Up: Top
 * -chmod_r   sets permissions in ISO image: Manip.            (line  70)
 * -chown   sets ownership in ISO image:  Manip.               (line  42)
 * -chown_r   sets ownership in ISO image: Manip.              (line  47)
-* -close   controls media closing:       SetWrite.            (line 199)
+* -close   controls media closing:       SetWrite.            (line 218)
 * -close_filter_list   bans filter registration: Filter.      (line  52)
 * -commit   writes pending ISO image:    Writing.             (line  13)
 * -commit_eject    writes and ejects:    Writing.             (line  40)
@@ -3726,6 +3750,7 @@ File: xorriso.info,  Node: CommandIdx,  Next: ConceptIdx,  Prev: Legal,  Up: Top
 * -compare_l   reports ISO/disk differences: Navigate.        (line 154)
 * -compare_r   reports ISO/disk differences: Navigate.        (line 149)
 * -compliance   controls standard compliance: SetWrite.       (line  14)
+* -copyright_file   sets copyright file name: SetWrite.       (line 122)
 * -cp_rx   copies file trees to disk:    Restore.             (line 104)
 * -cpax   copies files to disk:          Restore.             (line 100)
 * -cpr   inserts like with cp -r:        Insert.              (line 152)
@@ -3738,11 +3763,11 @@ File: xorriso.info,  Node: CommandIdx,  Next: ConceptIdx,  Prev: Legal,  Up: Top
 * -disk_pattern   controls pattern expansion: Insert.         (line  31)
 * -drive_class   controls drive accessability: Loading.       (line  35)
 * -du   show directory size in ISO image: Navigate.           (line  90)
-* -dummy   controls write simulation:    SetWrite.            (line 188)
+* -dummy   controls write simulation:    SetWrite.            (line 207)
 * -dus   show directory size in ISO image: Navigate.          (line  94)
 * -dusx   show directory size on disk:   Navigate.            (line 103)
 * -dux   show directory size on disk:    Navigate.            (line  98)
-* -dvd_obs   set write block size:       SetWrite.            (line 175)
+* -dvd_obs   set write block size:       SetWrite.            (line 194)
 * -eject    ejects drive tray:           Writing.             (line  36)
 * -end   writes pending session and ends program: Scripting.  (line 122)
 * -errfile_log   logs problematic disk files: Scripting.      (line  84)
@@ -3759,12 +3784,12 @@ File: xorriso.info,  Node: CommandIdx,  Next: ConceptIdx,  Prev: Legal,  Up: Top
 * -follow   softlinks and mount points:  SetInsert.           (line  76)
 * -for_backup    -acl,-xattr,-hardlinks,-md5: Loading.        (line 158)
 * -format   formats media:               Writing.             (line  69)
-* -fs   sets size of fifo:               SetWrite.            (line 192)
+* -fs   sets size of fifo:               SetWrite.            (line 211)
 * -getfacl   shows ACL in ISO image:     Navigate.            (line  71)
 * -getfacl_r   shows ACL in ISO image:   Navigate.            (line  78)
 * -getfattr   shows xattr in ISO image:  Navigate.            (line  82)
 * -getfattr_r   shows xattr in ISO image: Navigate.           (line  86)
-* -gid   sets global ownership:          SetWrite.            (line 132)
+* -gid   sets global ownership:          SetWrite.            (line 151)
 * -grow_blindly   overides next writeable address: AqDrive.   (line  44)
 * -hardlinks   controls handling of hard links: Loading.      (line  91)
 * -help   prints help text:              Scripting.           (line  16)
@@ -3805,11 +3830,11 @@ File: xorriso.info,  Node: CommandIdx,  Next: ConceptIdx,  Prev: Legal,  Up: Top
 * -not_paths   sets absolute exclusion paths: SetInsert.      (line  55)
 * -options_from_file   reads commands from file: Scripting.   (line  12)
 * -osirrox   enables ISO-to-disk copying: Restore.            (line  18)
-* -out_charset   sets output character set: SetWrite.         (line 122)
+* -out_charset   sets output character set: SetWrite.         (line 141)
 * -outdev   aquires a drive for output:  AqDrive.             (line  29)
 * -overwrite   enables overwriting in ISO: SetInsert.         (line 127)
 * -pacifier   controls pacifier text form: Emulation.         (line 119)
-* -padding   sets amount of image padding: SetWrite.          (line 205)
+* -padding   sets amount of image padding: SetWrite.          (line 224)
 * -page   set terminal geometry:         DialogCtl.           (line  15)
 * -paste_in   copies file into disk file: Restore.            (line 117)
 * -path_list   inserts paths from disk file: Insert.          (line  75)
@@ -3851,17 +3876,17 @@ File: xorriso.info,  Node: CommandIdx,  Next: ConceptIdx,  Prev: Legal,  Up: Top
 * -setfattr_r   sets xattr in ISO image: Manip.               (line 123)
 * -show_stream   shows data source and filters: Navigate.     (line 159)
 * -show_stream_r   shows data source and filters: Navigate.   (line 174)
-* -speed   set write speed:              SetWrite.            (line 148)
+* -speed   set write speed:              SetWrite.            (line 167)
 * -split_size   enables large file splitting: SetInsert.      (line 140)
 * -status   shows current settings:      Scripting.           (line  25)
 * -status_history_max   curbs -status history: Scripting.     (line  34)
-* -stdio_sync   controls stdio buffer:   SetWrite.            (line 182)
+* -stdio_sync   controls stdio buffer:   SetWrite.            (line 201)
-* -stream_recording   controls defect management: SetWrite.   (line 163)
+* -stream_recording   controls defect management: SetWrite.   (line 182)
 * -system_id   sets system id:           SetWrite.            (line  96)
 * -tell_media_space   reports free space: Inquiry.            (line  74)
 * -temp_mem_limit   curbs memory consumption: Scripting.      (line  70)
 * -toc   shows list of sessions:         Inquiry.             (line  18)
-* -uid   sets global ownership:          SetWrite.            (line 128)
+* -uid   sets global ownership:          SetWrite.            (line 147)
 * -update   inserts path if different:   Insert.              (line  99)
 * -update_l   inserts paths if different: Insert.             (line 121)
 * -update_r   inserts paths if different: Insert.             (line 110)
@@ -3871,7 +3896,7 @@ File: xorriso.info,  Node: CommandIdx,  Next: ConceptIdx,  Prev: Legal,  Up: Top
 * -volset_id   sets volume set id:       SetWrite.            (line  79)
 * -volume_date   sets volume timestamp:  SetWrite.            (line 103)
 * -xattr   controls handling of xattr (EA): Loading.          (line 131)
-* -zisofs   controls zisofs production:  SetWrite.            (line 136)
+* -zisofs   controls zisofs production:  SetWrite.            (line 155)
 
 
 File: xorriso.info,  Node: ConceptIdx,  Prev: CommandIdx,  Up: Top
@@ -3901,7 +3926,7 @@ File: xorriso.info,  Node: ConceptIdx,  Prev: CommandIdx,  Up: Top
 * Character Set, _definition:            Charset.             (line   6)
 * Character Set, for input, -in_charset: Loading.             (line  73)
 * Character Set, for input/output, -charset: Charset.         (line  43)
-* Character Set, for output, -out_charset: SetWrite.          (line 122)
+* Character Set, for output, -out_charset: SetWrite.          (line 141)
 * Character set, learn from image, -auto_charset: Loading.    (line  80)
 * Character Set, of terminal, -local_charset: Charset.        (line  47)
 * Closed media, _definition:             Media.               (line  39)
@@ -3945,8 +3970,8 @@ File: xorriso.info,  Node: ConceptIdx,  Prev: CommandIdx,  Up: Top
 * Filter, show chain, -show_stream:      Navigate.            (line 159)
 * Filter, show chains of tree, -show_stream_r: Navigate.      (line 174)
 * Filter, unregister, -unregister_filter: Filter.             (line  48)
-* Filter, zisofs parameters, -zisofs:    SetWrite.            (line 136)
+* Filter, zisofs parameters, -zisofs:    SetWrite.            (line 155)
-* Group, global in ISO image, -gid:      SetWrite.            (line 132)
+* Group, global in ISO image, -gid:      SetWrite.            (line 151)
 * Group, in ISO image, -chgrp:           Manip.               (line  50)
 * Group, in ISO image, -chgrp_r:         Manip.               (line  55)
 * Growing, _definition:                  Methods.             (line  19)
@@ -3955,7 +3980,10 @@ File: xorriso.info,  Node: ConceptIdx,  Prev: CommandIdx,  Up: Top
 * Image, _definition:                    Model.               (line   9)
 * Image, demand volume id, -assert_volid: Loading.            (line  65)
 * Image, discard pending changes, -rollback: Writing.         (line   9)
+* Image, set abstract file name, -abstract_file: SetWrite.    (line 128)
 * Image, set application id, -application_id: SetWrite.       (line  90)
+* Image, set biblio file name, -biblio_file: SetWrite.        (line 135)
+* Image, set copyright file name, -copyright_file: SetWrite.  (line 122)
 * Image, set publisher id, -publisher:   SetWrite.            (line  84)
 * Image, set system id, -system_id:      SetWrite.            (line  96)
 * Image, set volume id, -volid:          SetWrite.            (line  60)
@@ -4014,7 +4042,7 @@ File: xorriso.info,  Node: ConceptIdx,  Prev: CommandIdx,  Up: Top
 * Navigate, tell ISO working directory, -pwd: Navigate.       (line  20)
 * Next writeable address, -grow_blindly: AqDrive.             (line  44)
 * Overwriteable media, _definition:      Media.               (line  10)
-* Ownership, global in ISO image, -uid:  SetWrite.            (line 128)
+* Ownership, global in ISO image, -uid:  SetWrite.            (line 147)
 * Ownership, in ISO image, -chown:       Manip.               (line  42)
 * Ownership, in ISO image, -chown_r:     Manip.               (line  47)
 * Partition table, _definiton:           Bootable.            (line 119)
@@ -4082,22 +4110,22 @@ File: xorriso.info,  Node: ConceptIdx,  Prev: CommandIdx,  Up: Top
 * Verify, file checksum, -check_md5:     Verify.              (line 144)
 * Verify, file tree checksums, -check_md5_r: Verify.          (line 160)
 * Verify, preset -check_media, -check_media_defaults: Verify. (line  40)
-* Write, block size, -dvd_obs:           SetWrite.            (line 175)
+* Write, block size, -dvd_obs:           SetWrite.            (line 194)
 * Write, bootability, -boot_image:       Bootable.            (line  20)
-* Write, buffer syncing, -stdio_sync:    SetWrite.            (line 182)
+* Write, buffer syncing, -stdio_sync:    SetWrite.            (line 201)
-* Write, close media, -close:            SetWrite.            (line 199)
+* Write, close media, -close:            SetWrite.            (line 218)
 * Write, compliance to specs, -compliance: SetWrite.          (line  14)
-* Write, defect management, -stream_recording: SetWrite.      (line 163)
+* Write, defect management, -stream_recording: SetWrite.      (line 182)
 * Write, enable Joliet, -joliet:         SetWrite.            (line  10)
-* Write, fifo size, -fs:                 SetWrite.            (line 192)
+* Write, fifo size, -fs:                 SetWrite.            (line 211)
 * Write, free space, -tell_media_space:  Inquiry.             (line  74)
 * Write, log problematic disk files, -errfile_log: Scripting. (line  84)
 * Write, log written sessions, -session_log: Scripting.       (line 104)
-* Write, padding image, -padding:        SetWrite.            (line 205)
+* Write, padding image, -padding:        SetWrite.            (line 224)
 * Write, pending ISO image, -commit:     Writing.             (line  13)
 * Write, predict image size, -print_size: Inquiry.            (line  69)
-* Write, set speed, -speed:              SetWrite.            (line 148)
+* Write, set speed, -speed:              SetWrite.            (line 167)
-* Write, simulation, -dummy:             SetWrite.            (line 188)
+* Write, simulation, -dummy:             SetWrite.            (line 207)
 * xattr, _definiton:                     Extras.              (line  51)
 * xattr, control handling, -xattr:       Loading.             (line 131)
 * xattr, set in ISO image, -setfattr:    Manip.               (line 110)
@@ -4128,38 +4156,38 @@ Node: CmdFind65210
 Node: Filter75161
 Node: Writing79510
 Node: SetWrite85799
-Node: Bootable96083
+Node: Bootable96961
-Node: Charset104035
+Node: Charset104913
-Node: Exception106789
+Node: Exception107667
-Node: DialogCtl111304
+Node: DialogCtl112182
-Node: Inquiry113649
+Node: Inquiry114527
-Node: Navigate117789
+Node: Navigate118657
-Node: Verify125510
+Node: Verify126378
-Node: Restore133930
+Node: Restore134798
-Node: Emulation140586
+Node: Emulation141454
-Node: Scripting148168
+Node: Scripting149052
-Node: Frontend153730
+Node: Frontend154614
-Node: Examples154931
+Node: Examples155815
-Node: ExDevices156100
+Node: ExDevices156984
-Node: ExCreate156734
+Node: ExCreate157618
-Node: ExDialog158008
+Node: ExDialog158892
-Node: ExGrowing159270
+Node: ExGrowing160154
-Node: ExModifying160072
+Node: ExModifying160956
-Node: ExBootable160573
+Node: ExBootable161457
-Node: ExCharset161120
+Node: ExCharset162004
-Node: ExPseudo161948
+Node: ExPseudo162832
-Node: ExCdrecord162842
+Node: ExCdrecord163726
-Node: ExMkisofs163157
+Node: ExMkisofs164041
-Node: ExGrowisofs164160
+Node: ExGrowisofs165044
-Node: ExException165284
+Node: ExException166168
-Node: ExTime165738
+Node: ExTime166622
-Node: ExIncBackup166197
+Node: ExIncBackup167081
-Node: ExRestore169669
+Node: ExRestore170553
-Node: ExRecovery170638
+Node: ExRecovery171522
-Node: Files171204
+Node: Files172088
-Node: Seealso172242
+Node: Seealso173316
-Node: Legal172766
+Node: Legal173840
-Node: CommandIdx173688
+Node: CommandIdx174762
-Node: ConceptIdx187202
+Node: ConceptIdx188495
 
 End Tag Table

xorriso/xorriso.texi

@@ -44,7 +44,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 "Jun 25, 2010"
+@c man .TH XORRISO 1 "Jun 26, 2010"
 @c man .\" Please adjust this date whenever revising the manpage.
 @c man .\"
 @c man .\" Some roff macros, for reference:
@@ -2500,6 +2500,33 @@ They are prone to timezone computations. The timestrings "default" or
 of image creation. "x" and "f" will be marked as insignificant.
 "uuid" will be deactivated.
 @c man .TP
+@item -copyright_file text
+@kindex -copyright_file   sets copyright file name
+@cindex Image, set copyright file name, -copyright_file
+Set the copyright file name to be written with the next -commit. This should
+be the ISO 9660 path of a file in the image which contains a copyright
+statement.
+Permissible are up to 37 characters. This setting gets overridden by
+image loading.
+@c man .TP
+@item -abstract_file text
+@kindex -abstract_file   sets abstract file name
+@cindex Image, set abstract file name, -abstract_file
+Set the abstract file name to be written with the next -commit. This should
+be the ISO 9660 path of a file in the image which contains an abstract
+statement about the image content.
+Permissible are up to 37 characters. This setting gets overridden by
+image loading.
+@c man .TP
+@item -biblio_file text
+@kindex -biblio_file   sets biblio file name
+@cindex Image, set biblio file name, -biblio_file
+Set the biblio file name to be written with the next -commit. This should
+be the ISO 9660 path of a file in the image which contains bibliographic
+records.
+Permissible are up to 37 characters. This setting gets overridden by
+image loading.
+@c man .TP
 @item -out_charset character_set_name
 @kindex -out_charset   sets output character set
 @cindex Character Set, for output, -out_charset
@@ -3177,7 +3204,7 @@ subtracting already foreseeable consumption by next -commit.
 @kindex -pvd_info   shows image id strings
 @cindex Image, show id strings, -pvd_info
 Print various id strings which can be found in loaded ISO images. Some of
-them may be changed by options -volid, -publisher, -application_id. For these
+them may be changed by options like -volid or -publisher. For these
 ids -pvd_info reports what would be written with the next -commit.
 @end table
 @c man .TP

xorriso/xorriso_private.h

@@ -174,6 +174,10 @@ struct XorrisO { /* the global context of xorriso */
  char system_id[33];
  char volset_id[129];
 
+ char copyright_file[38];
+ char biblio_file[38];
+ char abstract_file[38];
+
  char session_logfile[SfileadrL];
  int session_lba;
  int session_blocks;

xorriso/xorriso_timestamp.h

@@ -1 +1 @@
-#define Xorriso_timestamP "2010.06.25.175810"
+#define Xorriso_timestamP "2010.06.26.113947"