Updated changelog.

Version leap to 1.4.8.
Updated changelog.
2017-09-12 12:05:32 +02:00 · 2017-09-12 11:58:56 +02:00 · 2017-09-12 11:51:16 +02:00 · 2017-09-09 16:36:43 +02:00 · 2017-08-26 11:47:14 +02:00 · 2017-08-24 12:19:54 +02:00
38 changed files with 1180 additions and 320 deletions
--- a/4
+++ b/4
@ -1,7 +1,9 @@
 Vreixo Formoso <metalpain2002@yahoo.es>,
 Mario Danic <mario.danic@gmail.com>, 
+Vladimir Serbinenko <phcoder@gmail.com>
 Thomas Schmitt <scdbackup@gmx.net>
-Copyright (C) 2007-2015 Vreixo Formoso, Mario Danic, Thomas Schmitt
+Copyright (C) 2007-2016
+Vreixo Formoso, Mario Danic, Vladimir Serbinenko, Thomas Schmitt


    This program is free software; you can redistribute it and/or modify
--- a/27
+++ b/27
@ -1,3 +1,30 @@
+libisofs-1.4.8.tar.gz Tue Sep 12 2017
+===============================================================================
+* Bug fix: iso_read_opts_set_no_rockridge() did not prevent reading of root
+           SUSP.
+* Bug fix: Non-SUSP data in System Use Area prevented image loading if
+           Rock Ridge was enabled. Thanks to Jonathan Dowland.
+* Bug fix: Protective MBR for GPT could emerge with boot flag set.
+* Bug fix: Appended partitions of size >= 4 GiB led to abort with error message
+           "FATAL : ISO overwrite". Thanks to Sven Haardiek.
+* Bug fix: Bit 15 of iso_write_opts_set_system_area did not work with generic
+           MBR.
+* Bug fix: Keeping and patching of loaded boot images failed.
+           Regression by version 1.4.4.
+* Bug fix: Program crashes by intentionally wrong ISO image input.
+           Found by American Fuzzy Lop and Jakub Wilk.
+           Debian bug reports: 872372, 872475, 872545, 872590, 872761.
+* New API calls el_torito_set_full_load(), el_torito_get_full_load().
+* New API call iso_write_opts_set_iso_mbr_part_type().
+
+
+libisofs-1.4.6.tar.gz Fri Sep 16 2016
+===============================================================================
+* Bug fix: SIGSEGV by NULL when a data file was larger than ISO level allows.
+* Bug fix: Interpretation of 17 digit timestamps was wrong.
+* New API calls iso_generate_gpt_guid() and iso_write_opts_set_gpt_guid().
+* Made several pseudo-random ids reproducible by overriding volume modification
+  time.

 libisofs-1.4.4.tar.gz Fri Jul 01 2016
 ===============================================================================
--- a/4
+++ b/4
@ -4,7 +4,7 @@

 Released under GPL (see COPYING file for details).

-Copyright (C) 2008 - 2015 Vreixo Formoso,
+Copyright (C) 2008 - 2016 Vreixo Formoso,
                          Mario Danic,
                          Vladimir Serbinenko,
                          Thomas Schmitt
@ -14,7 +14,7 @@ libisofs is part of the libburnia project (libburnia-project.org)

                        Download, Build and Installation

-libisofs code is mantained in a Bazaar repository at Launchpad 
+libisofs code is maintained in a Bazaar repository at Launchpad 
 (https://launchpad.net/libisofs/). You can download it with:

 $ bzr branch lp:libisofs/for-libisoburn
--- a/configure.ac
+++ b/configure.ac
@ -1,4 +1,4 @@
-AC_INIT([libisofs], [1.4.4], [http://libburnia-project.org])
+AC_INIT([libisofs], [1.4.8], [http://libburnia-project.org])
 AC_PREREQ([2.50])
 dnl AC_CONFIG_HEADER([config.h])	

@ -41,7 +41,7 @@ dnl If LIBISOFS_*_VERSION changes, be sure to change AC_INIT above to match.
 dnl
 LIBISOFS_MAJOR_VERSION=1
 LIBISOFS_MINOR_VERSION=4
-LIBISOFS_MICRO_VERSION=4
+LIBISOFS_MICRO_VERSION=8
 LIBISOFS_VERSION=$LIBISOFS_MAJOR_VERSION.$LIBISOFS_MINOR_VERSION.$LIBISOFS_MICRO_VERSION

 AC_SUBST(LIBISOFS_MAJOR_VERSION)
@ -51,10 +51,10 @@ AC_SUBST(LIBISOFS_VERSION)

 dnl Libtool versioning
 LT_RELEASE=$LIBISOFS_MAJOR_VERSION.$LIBISOFS_MINOR_VERSION
-# 2016.07.01 development jump has not yet happened
-# SONAME = 86 - 80 = 6 . Library name = libisofs.6.80.0
-LT_CURRENT=86
-LT_AGE=80
+# 2017.09.12 development jump has not yet happened
+# SONAME = 90 - 84 = 6 . Library name = libisofs.6.84.0
+LT_CURRENT=90
+LT_AGE=84
 LT_REVISION=0
 LT_CURRENT_MINUS_AGE=`expr $LT_CURRENT - $LT_AGE`

@ -92,7 +92,7 @@ LIBBURNIA_ASSERT_ICONV

 AC_PROG_LIBTOOL
 AC_SUBST(LIBTOOL_DEPS)
-dnl LIBTOOL="$LIBTOOL --silent"
+# LIBTOOL="$LIBTOOL --silent"

 AC_PROG_INSTALL

--- a/demo/demo.c
+++ b/demo/demo.c
@ -1,6 +1,6 @@

 /*
- * Copyright (c) 2007 - 2015 Vreixo Formoso, Thomas Schmitt
+ * Copyright (c) 2007 - 2016 Vreixo Formoso, Thomas Schmitt
 * 
 * This file is part of the libisofs project; you can redistribute it and/or 
 * modify it under the terms of the GNU General Public License version 2 
@ -375,7 +375,7 @@ int gesture_iso(int argc, char **argv)

    result = iso_write_opts_new(&opts, 0);
    if (result < 0) {
-        printf ("Cant create write opts, error %d\n", result);
+        printf ("Cannot create write opts, error %d\n", result);
        goto ex;
    }
    iso_write_opts_set_iso_level(opts, level);
@ -385,7 +385,7 @@ int gesture_iso(int argc, char **argv)

    result = iso_image_create_burn_source(image, opts, &burn_src);
    if (result < 0) {
-        printf ("Cant create image, error %d\n", result);
+        printf ("Cannot create image, error %d\n", result);
        goto ex;
    }

@ -904,7 +904,7 @@ int gesture_iso_ms(int argc, char **argv)

    result = iso_image_create_burn_source(image, opts, &burn_src);
    if (result < 0) {
-        printf ("Cant create image, error %d\n", result);
+        printf ("Cannot create image, error %d\n", result);
        goto ex;
    }
    iso_write_opts_free(opts);
--- a/doc/boot_sectors.txt
+++ b/doc/boot_sectors.txt
@ -301,28 +301,44 @@ Byte Range | Value      | Meaning

 Sources:
    http://en.wikipedia.org/wiki/Master_boot_record
+    https://en.wikipedia.org/wiki/INT_13H
    Mailing list conversations with H. Peter Anvin and Vladimir Serbinenko.
+    Mail conversations with Natalia Portillo.


 The candidates for MBR booting will normally use El Torito rather than MBR
 if the ISO image is presented on CD, DVD, or BD media.
-The eventual MBR comes into effect if the image is on a media that is
-interpreted by the BIOS as some kind of hard disk. Usually real hard disks,
-floppy disks, USB sticks, memory cards.
+The MBR comes into effect if the image is on a media that is interpreted by
+the BIOS as some kind of hard disk. Usually real hard disks, floppy disks,
+USB sticks, memory cards.

 An important part of an MBR is the DOS style partition table. It describes up
 to four primary partitions. There are two formats used for block address:
 Cylinder/Head/Sector (C/H/S) and Logical Block Address (LBA). Both are based
 on units of 512 bytes. So MBR_LBA = ISO_LBA * 4.

+Contemporary x86 BIOS normally supports LBA addressing directly.
+If INT 0x13 AH 0x41 returns with CX bit0 set, then INT 0x13 AH 0x42 may be used
+for reading. (Sometimes even if the bit is not set to indicate the capability.)
+
 For C/H/S, the sector address is broken up into whole cylinders, remaining
 heads, and remaining sectors + 1. The nomenclature seems to stem from antique
 drum storage.
 There are two parameters, sectors_per_head and heads_per_cylinder which are not
-stored in the MBR. So it is more or less arbitray how to convert a LBA into
-a C/H/S address and vice versa. For maximum range of C/H/S addresses one
-may use sectors_per_head = 63 , heads_per_cylinder = 255.
+stored in the MBR. So at ISO production time it is more or less arbitray how
+to convert a LBA into a C/H/S address and vice versa.
+At boot time the x86 BIOS decides about the two parameters. The boot loader may
+inquire these values by INT 0x13 AH 0x08 and use them to convert LBA to C/H/S
+for the read operation INT 0x13 AH 0x02. So the C/H/S values in an ISO's
+partition table are quite fictional and of few impact on boot loaders.

+More important seems to align partition ends to a consistent cylinder size,
+because some partition editors deduce their idea of disk geometry from there
+and raise protest if they deem it inconsistent.
+For maximum range of C/H/S addresses one may use sectors_per_head = 63 ,
+heads_per_cylinder = 255. But that is not divisible by 4 and imposes alignment
+problems with ISO 9660 filesystems. So (32,64) for images up to 1 GiB
+or (63,252) for larger images are better.

 Words are composed little-endian style.

@ -331,8 +347,9 @@ Byte Range | Value      | Meaning
   0 - 439 | = opaque = | Code Area filled with bytes for some boot system,
           |            | typically machine code.
           |            |
- 440 - 443 | disk_sgntr | Disc signature, an individual disk id of obscure
-           |            | usability.
+ 440 - 443 | disk_sgntr | Disc signature: An individual disk id. Some software
+           |            | might use it to recognize the same storage medium
+           |            | at different device addresses.
           |            | (The Code Area might extend up to this field.)
           |            |
 444 - 445 |          0 | "usually nulls"
@ -340,8 +357,11 @@ Byte Range | Value      | Meaning
           |            |
 446 - 461 | ========== | Partition Table Entry for partition 1
           |            |
- 446 - 446 |     status | Governs bootability:
-           |            | 0x80 = bootable/active , 0x00 non-bootable/inactive
+ 446 - 446 |     status | For some generic MBRs this marks the one partition
+           |            | from which the MBR should load and run more code.
+           |            | 0x80 = bootflag/active , 0x00 = noboot/inactive
+           |            | Some BIOSes ignore MBRs with no bootflag in any of
+           |            | their partition table entries.
           |            |
 447 - 449 | ========== | C/H/S address of partition start
 447 - 447 | start_head | Heads part of start address.
@ -404,6 +424,8 @@ Sources:
    http://www.informit.com/articles/article.aspx?p=376123&seqNum=3
    syslinux-4.05/utils/isohybrid.c
    Mail conversations with Vladimir Serbinenko.
+    Mail conversations with Natalia Portillo of DiskImageChef,
+                            who quoted "Inside Macintosh" Volumes IV and V.


 APM has an adjustable block size. Because the ISO images shall always work
@ -412,11 +434,19 @@ additional GPT, only block size 2048 is considered here.
 The role of APM in the boot process is to guide the firmware to a
 HFS+ filesystem.

-Block0 of an APM begins at byte 0 of the medium. Thus it collides with MBR and
-other boot sector formats. By lucky coincidence it is possible to compose
-a mock-up of a Block0 which is acceptable to firmware which expects APM,
-and is also harmless x86 machine code with no negative side effects.
-So it is possible to combine APM with an especially prepared MBR.
+Block0 (aka Driver Descriptor Map) of an APM begins at byte 0 of the medium.
+Thus it collides with MBR and other boot sector formats. By lucky coincidence
+it is possible to compose a mock-up of a Block0 which is acceptable to firmware
+which expects APM, and is also harmless x86 machine code with no negative
+side effects. So it is possible to combine APM with an especially prepared MBR.
+
+Block0 is optional. But in the context of bootable hybrid ISOs it is not only
+needed to announce block size 2048, but also it is much better suited for
+staging as harmless x86 machine code than is an APM partition entry.
+
+Usually there is no Device Partition Map block (signature "TS"), although it
+is demanded by the book "Inside Macintosh". It would sit where GPT has its
+header block. So DPM is not described here.

 The layout of a Block0 of an APM is:

@ -427,13 +457,17 @@ Byte Range | Value      | Meaning (all numbers are stored big endian)
   4 -   7 | block_count| Number of blocks covered by APM
           |            | Often some x86-harmless dummy. E.g. 0x9090 = 37008
           |            | or 0xeb02ffff = 3,942,842,367                         
-   8 -   9 | dev_type   | obscure: "device type"
-  10 -  11 | dev_id     | obscure: "device id"
-  12 -  15 | drv_data   | obscure: "driver data"
-  16 -  17 | drv_count  | obscure: "driver descriptor count"
-  18 -  81 | drv_map    | obscure: "driver descriptor table"
-           |            |          with 8 entries of 16 bytes each
-  82 - 511 | reserved   |
+   8 -   9 | dev_type   | Device type: The id of the Mac driver which is in
+           |            | charge of the storage device.
+  10 -  11 | dev_id     | Device id: Address in an i/o bus system.
+  12 -  15 | drv_data   | Driver data: Not used.
+  16 -  17 | drv_count  | Driver count: Count of entries in drv_map.
+  18 - 505 | drv_map    | Driver descriptor table:
+           |            | Up to 61 entries of 8 bytes each.
+           |            | They contain the 32 bit 512-byte LBA of the driver's
+           |            | storage location, its 16 bit size in 512-byte blocks,
+           |            | and value 0x0001.
+ 506 - 511 | reserved   |
 ---------- | ---------- | ----------------------------------------------------

 The SYSLINUX program isohybrid.c overwrites the first 32 bytes of this
@ -463,9 +497,12 @@ Byte Range | Value      | Meaning (all numbers are stored big endian)
  84 -  87 | lb_count   | Logical block count (same as block_count)
  88 -  91 | flags      | Status flags
           |            | bit0= entry is valid
-           |            | bit1= entry is allocated
+           |            | bit1= partition is allocated
+           |            | bit2= partition is in use
+           |            | bit3= partition contains valid boot information
           |            | bit4= partition is readable
           |            | bit5= partition is writable
+           |            | bit7= boot code is position independent
           |            | bit30= automatic mount (legacy Mac)
  92 -  95 | boot_block | Logical start block number of boot code = 0
  96 -  99 | boot_bytes | Number of bytes in boot code = 0
@ -649,6 +686,7 @@ Sources:
      There are traces in the web which relate this to specs by
               MIPS Computer Systems, Inc. , 1985
               Silicon Graphics Computer Systems, Inc. , 2000
+   Mail conversations with Natalia Portillo.


 The first 512 bytes of the media constitute the Volume Header.
@ -659,7 +697,11 @@ Byte Range | Value      | Meaning
   0 -   3 | 0x0be5a941 | Magic number
   4 -   5 |          0 | Root partition number
   6 -   7 |          0 | Swap partition number
-   8 -  23 |          0 | Name of file to boot (unclear what this means)
+   8 -  23 |          0 | One of the boot_name items from the Volume Directory
+           |            | may be put here to choose for booting the entry with
+           |            | that name.
+           |            | (Obviously it may be empty if only one non-zero entry
+           |            |  exists in the Volume Directory.)
           |            |
  24 -  71 | ========== | Device Parameters
           |            |
--- a/doc/checksums.txt
+++ b/doc/checksums.txt
@ -189,7 +189,7 @@ With tag type 2:

 Keep the original MD5 context of the data blocks and clone one for obtaining
 the MD5 bytes.
-If the MD5s match, then compute the checksum block and all folowing ones into
+If the MD5s match, then compute the checksum block and all following ones into
 the kept MD5 context and go on with reading and computing for the tree checksum
 tag. This will be found at block address next_tag, verified and parsed by:
  iso_util_decode_md5_tag(block, &tag_type, &pos,
@ -211,7 +211,7 @@ next_tag. Go on by looking for tag type 2 and follow above prescription.

                      Checking the Data Part of the Session

-In order to check the trustworthyness of a whole session, continue reading
+In order to check the trustworthiness of a whole session, continue reading
 and checksumming after the tree was verified. 

 Read and checksum the blocks. When reaching block address next_tag (from the
--- a/doc/doxygen.conf.in
+++ b/doc/doxygen.conf.in
@ -394,12 +394,6 @@ MAX_INITIALIZER_LINES  = 30

 SHOW_USED_FILES        = YES

-# If the sources in your project are distributed over multiple directories 
-# then setting the SHOW_DIRECTORIES tag to YES will show the directory hierarchy 
-# in the documentation. The default is NO.
-
-SHOW_DIRECTORIES       = NO
-
 # The FILE_VERSION_FILTER tag can be used to specify a program or script that 
 # doxygen should invoke to get the current version for each file (typically from the 
 # version control system). Doxygen will invoke the program by executing (via 
@ -527,7 +521,7 @@ EXCLUDE_SYMBOLS        =
 # directories that contain example code fragments that are included (see 
 # the \include command).

-EXAMPLE_PATH           = test
+EXAMPLE_PATH           = demo/demo.c

 # If the value of the EXAMPLE_PATH tag contains directories, you can use the 
 # EXAMPLE_PATTERNS tag to specify one or more wildcard pattern (like *.cpp 
@ -698,12 +692,6 @@ HTML_FOOTER            =

 HTML_STYLESHEET        = 

-# If the HTML_ALIGN_MEMBERS tag is set to YES, the members of classes, 
-# files or namespaces will be aligned in HTML using tables. If set to 
-# NO a bullet list will be used.
-
-HTML_ALIGN_MEMBERS     = YES
-
 # If the GENERATE_HTMLHELP tag is set to YES, additional index files 
 # will be generated that can be used as input for tools like the 
 # Microsoft HTML help workshop to generate a compressed HTML help file (.chm) 
@ -938,18 +926,6 @@ GENERATE_XML           = NO

 XML_OUTPUT             = xml

-# The XML_SCHEMA tag can be used to specify an XML schema, 
-# which can be used by a validating XML parser to check the 
-# syntax of the XML files.
-
-XML_SCHEMA             = 
-
-# The XML_DTD tag can be used to specify an XML DTD, 
-# which can be used by a validating XML parser to check the 
-# syntax of the XML files.
-
-XML_DTD                = 
-
 # If the XML_PROGRAMLISTING tag is set to YES Doxygen will 
 # dump the program listings (including syntax highlighting 
 # and cross-referencing information) to the XML output. Note that 
--- a/doc/susp_aaip_2_0.txt
+++ b/doc/susp_aaip_2_0.txt
@ -235,7 +235,7 @@ An eventually needed qualifier is stored in one or more Qualifier Records.
  [b] "BP 2 - Qualifier Record Head" shall be present only if QUALIFIER is set
      to 1. It shall give the number of Qualifier Bytes and eventually
      indicate that the qualifier continues in a Qualifier Record which comes
-      imediately after this record.
+      immediately after this record.
          0 to 127   Q_LENGTH, the qualifier is complete by this record
        128 to 255   Q_LENGTH+128, the qualifier is continued by next record
      So a Qualifier Record can contain at most 127 Qualifier Bytes.
--- a/doc/susp_aaip_isofs_names.txt
+++ b/doc/susp_aaip_isofs_names.txt
@ -4,7 +4,7 @@
                      Directory of Namespace "isofs."

          by Thomas Schmitt    - mailto:scdbackup@gmx.net
-          Libburnia project    - mailto:libburn-hackers@pykix.org
+          Libburnia project    - mailto:bug-xorriso@gnu.org


 The following names are defined for AAIP namespace "isofs." as mentioned in
@ -227,7 +227,7 @@ This text is under
 Copyright (c) 2009 - 2011 Thomas Schmitt <scdbackup@gmx.net>
 It shall only be modified in sync with libisofs and other software which
 makes use of AAIP. Please mail change requests to mailing list
-<libburn-hackers@pykix.org> or to the copyright holder in private.
+<bug-xorriso@gnu.org> or to the copyright holder in private.
 Only if you cannot reach the copyright holder for at least one month it is
 permissible to modify this text under the same license as the affected
 copy of libisofs.
--- a/libisofs/aaip-os-freebsd.c
+++ b/libisofs/aaip-os-freebsd.c
@ -5,9 +5,9 @@
 Arbitrary Attribute Interchange Protocol , system adapter for getting and
 setting of ACLs and xattr.

- To be included by aaip_0_2.c for FreeBSD and NetBSD
+ To be included by aaip_0_2.c for FreeBSD, NetBSD, and OpenBSD

- Copyright (c) 2009 - 2014 Thomas Schmitt, libburnia project, GPLv2+
+ Copyright (c) 2009 - 2016 Thomas Schmitt, libburnia project, GPLv2+

 */

--- a/libisofs/aaip-os-linux.c
+++ b/libisofs/aaip-os-linux.c
@ -7,7 +7,7 @@

 To be included by aaip_0_2.c for Linux

- Copyright (c) 2009 - 2011 Thomas Schmitt, libburnia project, GPLv2+
+ Copyright (c) 2009 - 2016 Thomas Schmitt, libburnia project, GPLv2+

 */

@ -443,7 +443,7 @@ ex:
                              I.e. those with a name which does not begin
                              by "user."
                        bit5= in case of symbolic link: manipulate link target
-                        bit6= tolerate inappropriate presence or absense of
+                        bit6= tolerate inappropriate presence or absence of
                              directory default ACL
   @return              1 success
                       -1 error memory allocation
--- a/libisofs/aaip_0_2.c
+++ b/libisofs/aaip_0_2.c
@ -7,7 +7,7 @@
 See libisofs/aaip_0_2.h
     http://libburnia-project.org/wiki/AAIP

- Copyright (c) 2009 - 2015 Thomas Schmitt, libburnia project, GPLv2+
+ Copyright (c) 2009 - 2016 Thomas Schmitt, libburnia project, GPLv2+

 */

@ -648,7 +648,7 @@ ex:;
     mission bits.

 */
-/* Analyze occurence of ACL tag types in long text form. If not disabled by
+/* Analyze occurrence of ACL tag types in long text form. If not disabled by
   parameter flag remove the entries of type "user::" , "group::" , "other::" ,
   or "other:" from an ACL in long text form if they match the bits in st_mode
   as described by man 2 stat and man 5 acl.
@ -2213,6 +2213,11 @@ ex:;

 #include "aaip-os-freebsd.c"

+#else
+#ifdef __OpenBSD__
+
+#include "aaip-os-freebsd.c"
+
 #else
 #ifdef __linux

@ -2230,6 +2235,7 @@ ex:;
 #include "aaip-os-dummy.c"

 #endif /* ! __linux */
+#endif /* ! __OpenBSD__ */
 #endif /* ! __NetBSD__ */
 #endif /* ! __FreeBSD_kernel__ */
 #endif /* ! __FreeBSD__ */
--- a/libisofs/aaip_0_2.h
+++ b/libisofs/aaip_0_2.h
@ -9,7 +9,7 @@

 test/aaip_0_2.h - Public declarations

- Copyright (c) 2009 Thomas Schmitt, libburnia project, GPLv2+
+ Copyright (c) 2009 - 2016 Thomas Schmitt, libburnia project, GPLv2+

 */

@ -93,7 +93,7 @@ int aaip_encode_both_acl(char *a_acl_text, char *d_acl_text, mode_t st_mode,
                         size_t *result_len, unsigned char **result, int flag);


-/* Analyze occurence of ACL tag types in long text form. If not disabled by
+/* Analyze occurrence of ACL tag types in long text form. If not disabled by
   parameter flag remove the entries of type "user::" , "group::" , "other::" ,
   or "other:" from an ACL in long text form if they match the bits in st_mode
   as described by man 2 stat and man 5 acl.
--- a/libisofs/changelog.txt
+++ b/libisofs/changelog.txt
@ -0,0 +1,234 @@
+------------------------------------------------------------------------------
+       libburnia-project.org / dev.lovelyhq.com    libisofs
+------------------------------------------------------------------------------
+
+------------------------------------------------------------------------------
+                                  Changelog
+------------------------------------------------------------------------------
+
+13 Nov 2016  [8bf32d8] [1340]
+doc/susp_aaip_isofs_names.txt
+Prepared some of the documentation for move to dev.lovelyhq.com
+
+13 Nov 2016  [c51efce] [1341]
+libisofs/fs_image.c
+Bug fix: iso_read_opts_set_no_rockridge() did not prevent reading of root SUSP
+
+13 Nov 2016  [dc6cd94] [1342]
+libisofs/libisofs.h
+libisofs/eltorito.c
+libisofs/libisofs.ver
+New API calls el_torito_set_full_load(), el_torito_get_full_load()
+
+13 Nov 2016  [ed209e0] [1343]
+COPYRIGHT
+Mentioned Vladimir Serbinenko in libisofs copyright list
+
+13 Nov 2016  [2961bde] [1344]
+ChangeLog
+ libisofs/changelog.txt
+Updated change log
+
+23 Nov 2016  [01020ef] [1345]
+libisofs/eltorito.h
+Committed missing part of rev dc6cd94/1342
+
+23 Nov 2016  [8ec75ee] [1346]
+libisofs/fs_image.c
+libisofs/rockridge.h
+libisofs/rockridge_read.c
+Bug fix: Non-SUSP data in System Use Area prevented image loading if Rock Ridge was enabled. Thanks to Jonathan Dowland.
+
+25 Dec 2016  [76181d0] [1347]
+libisofs/ecma119.c
+Restricted volume size of PVD with non-zero partition offset to filesystem
+size even if the first PVD claims the whole output size
+
+25 Dec 2016  [afb10aa] [1348]
+libisofs/eltorito.c
+Claiming full output size in first PVD if partition offset is non-zero
+
+25 Dec 2016  [3043b5f] [1349]
+libisofs/fs_image.c
+Enabled recognition of partition offset of grub-mkrescue-sed.sh mode "gpt_appended"
+
+03 Jan 2017  [2152804] [1350]
+libisofs/system_area.c
+Bug fix: Protective MBR for GPT could emerge with boot flag set.
+
+24 Jan 2014  [5c1c5cd] [1351]
+libisofs/system_area.c
+Bug fix: Appended partitions of size >= 4 GiB led to abort with error message
+         "FATAL : ISO overwrite". Thanks to Sven Haardiek.
+
+24 Jan 2014  [094b3f7] [1352]
+libisofs/system_area.c
+Updated copyright year in system_area.c
+
+27 Feb 2014  [e66b9bf] [1353]
+libisofs/libisofs.h
+libisofs/ecma119.h
+libisofs/ecma119.c
+libisofs/system_area.c
+libisofs/libisofs.ver
+New API call iso_write_opts_set_iso_mbr_part_type()
+
+27 Feb 2014  [5600f3d] [1354]
+libisofs/system_area.c
+When deciding boot flag, consider MBR partition slot empty only if entirely 0
+
+19 Mar 2017  [86f6ffc] [1355]
+libisofs/system_area.c
+Let iso_mbr_part_type 0xee override ban on 0xee without GPT
+
+09 Apr 2017  [94e4bfb] [1356]
+libisofs/fs_image.c
+Adapted recognizing of partition offset to the changes of rev afb10aa / 1348
+
+10 Apr 2017  [0e7300b] [1357]
+doc/boot_sectors.txt
+Clarified meaning of MBR partition boot flag
+
+25 Apr 2017  [fb86970] [1358]
+libisofs/system_area.c
+Reacted on harmless compiler warning about uninitialized variable.
+
+03 Jun 2017  [d7737e3] []
+libisofs/fs_image.c
+Removed ban on reading El Torito platform ids other than 0 and 0xef
+
+29 Jun 2017  [6282bbc]
+libisofs/system_area.c
+Bug fix: Bit 15 of iso_write_opts_set_system_area did not work with generic MBR
+
+01 Jul 2017  [18ab601]
+libisofs/eltorito.c
+libisofs/system_area.c
+Let ISO size cover appended partitions if --protective-msdos-label or nonzero -partition_offset is given
+
+13 Aug 2017  [c6e4035]
+doc/boot_sectors.txt
+Added boot sector knowledge gained from Natalia Portillo
+
+13 Aug 2017  [e19a338]
+doc/boot_sectors.txt
+Re-added two empty lines which were lost by previous commit
+
+14 Aug 2014  [1e40ed3]
+libisofs/fs_image.c
+Bug fix: Keeping and patching of loaded boot images failed. Regression by version 1.4.4.
+
+14 Aug 2017  [280108d]
+ChangeLog
+libisofs/changelog.txt
+Updated change log
+
+17 Aug 2017  [860a91d]
+libisofs/libisofs.h
+libisofs/fs_image.c
+libisofs/messages.c
+Preventing NULL dereference if root directory bears a RRIP RE entry
+
+18 Aug 2017  [36c8800]
+libisofs/rockridge_read.c
+Preventing buffer underread with empty RRIP SL component.
+Debian bug 872475. Thanks Jakub Wilk and American Fuzzy Lop.
+
+18 Aug 2017  [16bde11]
+libisofs/fs_image.c
+Preventing memory leak caused by RRIP SL entry without PX entry that marks
+the file as symbolic link
+
+18 Aug 2017  [661b68c]
+libisofs/rockridge_read.c
+Preventing buffer overflow with AAIP AL entry of insufficient size.
+Debian bug 872545. Thanks Jakub Wilk and American Fuzzy Lop.
+
+19 Aug 2017  [91490d5]
+libisofs/libisofs.h
+libisofs/messages.c
+libisofs/rockridge_read.c
+Preventing use of zero sized SUSP CE entry which causes SIGSEGV.
+Debian bug 872590. Thanks Jakub Wilk and American Fuzzy Lop.
+
+19 Aug 2017  [31088d9]
+libisofs/rockridge_read.c
+Avoid to read blocks from start of CE area which do not belong to the given file
+
+19 Aug 2017  [2a64d89]
+libisofs/libisofs.h
+libisofs/rockridge.h
+libisofs/fs_image.c
+libisofs/rockridge_read.c
+libisofs/messages.c
+Refuse to read CE data blocks from after the end of ISO filesystem
+
+21 Aug 2017  [a7152f5]
+libisofs/fs_image.c
+Correcting previous commit for supporting multi-session
+
+21 Aug 2017  [78b0a7b]
+libisofs/fs_image.c
+Disallowed RRIP CL chaining in order to break any endless loops.
+Debian bug 872761. Thanks Jakub Wilk and American Fuzzy Lop.
+
+21 Aug 2017  [e599a57]
+libisofs/fs_image.c
+Closed a memory leak about RRIP CL following
+
+24 Aug 2017  [cace41e]
+libisofs/ecma119.h
+libisofs/ecma119.c
+libisofs/system_area.c
+Enabled partition intervals with source "imported_iso" with ISO growing
+
+26 Aug 2017  [028f927]
+libisofs/libisofs.h
+libisofs/ecma119.c
+libisofs/system_area.c
+libisofs/messages.c
+Throw error if imported_iso interval would be overwritten by multi-session
+
+09 Sep 2017  [4e5a54c]
+libisofs/fs_image.c
+Swapped at recognition time the precendence of MBR properties "isohybrid"
+and "protective-msdos-label"
+
+12 Sep 2017  [7234425]
+ChangeLog
+Updated change log
+
+  []
+configure.ac
+libisofs/libisofs.h
+Version leap to 1.4.8.
+
+  []
+libisofs/changelog.txt
+Updated change log
+
+------------------------------------ release - libisofs-1.4.8 - 12 Sep 2017
+* Bug fix: iso_read_opts_set_no_rockridge() did not prevent reading of root SUSP
+* Bug fix: Non-SUSP data in System Use Area prevented image loading if
+           Rock Ridge was enabled. Thanks to Jonathan Dowland.
+* Bug fix: Protective MBR for GPT could emerge with boot flag set.
+* Bug fix: Appended partitions of size >= 4 GiB led to abort with error message
+           "FATAL : ISO overwrite". Thanks to Sven Haardiek.
+* Bug fix: Bit 15 of iso_write_opts_set_system_area did not work with
+           generic MBR.
+* Bug fix: Keeping and patching of loaded boot images failed.
+           Regression by version 1.4.4.
+* Bug fix: Program crashes by intentionally wrong ISO image input.
+           Found by American Fuzzy Lop and Jakub Wilk.
+           Debian bug reports: 872372, 872475, 872545, 872590, 872761.
+* New API calls el_torito_set_full_load(), el_torito_get_full_load().
+* New API call iso_write_opts_set_iso_mbr_part_type().
+
+
+  []
+ChangeLog
+libisofs/changelog.txt
+Updated change log
+
+------------------------------------ release - libisofs-1.5.0 -
+
--- a/libisofs/data_source.c
+++ b/libisofs/data_source.c
@ -145,7 +145,7 @@ void ds_free_data(IsoDataSource *src)

 /**
 * Create a new IsoDataSource from a local file. This is suitable for
- * accessing regular .iso images, or to acces drives via its block device
+ * accessing regular .iso images, or to access drives via its block device
 * and standard POSIX I/O calls.
 * 
 * @param path
--- a/libisofs/ecma119.c
+++ b/libisofs/ecma119.c
@ -1,7 +1,7 @@
 /*
 * Copyright (c) 2007 Vreixo Formoso
 * Copyright (c) 2007 Mario Danic
- * Copyright (c) 2009 - 2015 Thomas Schmitt
+ * Copyright (c) 2009 - 2017 Thomas Schmitt
 *
 * This file is part of the libisofs project; you can redistribute it and/or
 * modify it under the terms of the GNU General Public License version 2 
@ -193,7 +193,7 @@ size_t calc_dirent_len(Ecma119Image *t, Ecma119Node *n)

 /**
 * Computes the total size of all directory entries of a single dir,
- * acording to ECMA-119 6.8.1.1
+ * according to ECMA-119 6.8.1.1
 *
 * This also take into account the size needed for RR entries and
 * SUSP continuation areas (SUSP, 5.1).
@ -1417,6 +1417,7 @@ int write_head_part2(Ecma119Image *target, int *write_count, int flag)
      target->partiton_offset from any LBA pointer.
    */
    target->eff_partition_offset = target->opts->partition_offset;
+    target->pvd_size_is_total_size = 0;
    for (i = 0; i < (int) target->nwriters; ++i) {
        writer = target->writers[i];
        /* Not all writers have an entry in the partion volume descriptor set.
@ -1497,9 +1498,6 @@ static int finish_libjte(Ecma119Image *target)
 }


-/* >>> need opportunity to just mark a partition in the older sessions
-*/
-

 struct iso_interval_zeroizer {
    int z_type; /* 0= $zero_start"-"$zero_end ,
@ -2000,6 +1998,50 @@ process_pending:;
 }


+/* Tells whether ivr is a reader from imported_iso in a multi-session
+   add-on situation, and thus to be kept in place.
+*/
+int iso_interval_reader_keep(Ecma119Image *target, 
+                             struct iso_interval_reader *ivr,
+                             int flag)
+{
+    /* Source must be "imported_iso" */
+    if (!(ivr->flags & 1))
+        return 0;
+
+    /* It must not be a new ISO */
+    if (!target->opts->appendable)
+        return 0;
+
+    /* --- From here on return either 1 or <0 --- */
+
+    /* multi-session write offset must be larger than interval end */
+    if (target->opts->ms_block <= ivr->end_byte / BLOCK_SIZE)
+        return ISO_MULTI_OVER_IMPORTED;
+
+    return 1;
+}
+
+
+int iso_interval_reader_start_size(Ecma119Image *t, char *path,
+                                   off_t *start_byte, off_t *byte_count,
+                                   int flag)
+{
+    struct iso_interval_reader *ivr;
+    int keep, ret;
+
+    ret = iso_interval_reader_new(t->image, path, &ivr, byte_count, 0);
+    if (ret < 0)
+        return ret;
+    *start_byte = ivr->start_byte;
+    keep = iso_interval_reader_keep(t, ivr, 0);
+    if (keep < 0)
+        return(keep);
+    iso_interval_reader_destroy(&ivr, 0);
+    return ISO_SUCCESS + (keep > 0);
+}
+
+
 int iso_write_partition_file(Ecma119Image *target, char *path,
                             uint32_t prepad, uint32_t blocks, int flag)
 {
@ -2025,6 +2067,14 @@ int iso_write_partition_file(Ecma119Image *target, char *path,
                                      &ivr, &byte_count, 0);
        if (ret < 0)
            goto ex;
+        ret = iso_interval_reader_keep(target, ivr, 0);
+        if (ret < 0)
+            goto ex;
+        if (ret > 0) {
+            /* From imported_iso and for add-on session. Leave it in place. */
+            ret = ISO_SUCCESS;
+            goto ex;
+        }
        for (i = 0; i < blocks; i++) {
            ret = iso_interval_reader_read(ivr, buf, &buf_fill, 0);
            if (ret < 0)
@ -2320,6 +2370,73 @@ ex:;
    return ret;
 }

+/* Determine the alleged time of image production by predicting the volume
+   creation and modification timestamps and taking the maximum of both.
+*/
+static
+void ecma119_determine_now_time(Ecma119Image *target)
+{
+    IsoWriteOpts *o;
+    time_t now = 0, t, t0;
+    uint8_t time_text[18];
+    int i;
+
+    t0 = time(NULL);
+    o = target->opts;
+    if (o->vol_uuid[0]) {
+        for(i = 0; i < 16; i++)
+            if(o->vol_uuid[i] < '0' || o->vol_uuid[i] > '9')
+        break;
+            else
+                time_text[i] = o->vol_uuid[i];
+        for(; i < 16; i++)
+            time_text[i] = '1';
+        time_text[16] = time_text[17] = 0;
+        t = iso_datetime_read_17(time_text);
+        if (t > now)
+            now = t;
+    } else {
+        if (o->vol_creation_time > 0) {
+            if (o->vol_creation_time > now)
+                now = o->vol_creation_time;
+        } else if (t0 > now) {
+            now = t0;
+        }
+        if (o->vol_modification_time > 0) {
+            if (o->vol_modification_time > now)
+                now = o->vol_modification_time;
+        } else if (t0 > now) {
+            now = t0;
+        }
+    } 
+    target->now = now;
+}
+
+static
+int gpt_disk_guid_setup(Ecma119Image *target)
+{
+    if (target->opts->gpt_disk_guid_mode == 0) {
+        /* Random UUID production delayed until really needed */
+        return ISO_SUCCESS;
+    } else if (target->opts->gpt_disk_guid_mode == 1) {
+        memcpy(target->gpt_uuid_base, target->opts->gpt_disk_guid, 16);
+    } else if (target->opts->gpt_disk_guid_mode == 2) {
+        if (target->opts->vol_uuid[0] == 0)
+            return ISO_GPT_NO_VOL_UUID;
+        /* Move centi-seconds part to byte 9 and 10 */
+        memcpy(target->gpt_uuid_base, target->opts->vol_uuid, 9);
+        memcpy(target->gpt_uuid_base + 9, target->opts->vol_uuid + 14, 2);
+        memcpy(target->gpt_uuid_base + 11, target->opts->vol_uuid + 9, 5);
+        iso_mark_guid_version_4(target->gpt_uuid_base);
+    } else {
+        return ISO_BAD_GPT_GUID_MODE;
+    }
+    memcpy(target->gpt_disk_guid, target->gpt_uuid_base, 16);
+    target->gpt_disk_guid_set = 1;
+    target->gpt_uuid_counter = 1;
+    return ISO_SUCCESS;
+}
+
 static
 int ecma119_image_new(IsoImage *src, IsoWriteOpts *in_opts, Ecma119Image **img)
 {
@ -2338,7 +2455,7 @@ int ecma119_image_new(IsoImage *src, IsoWriteOpts *in_opts, Ecma119Image **img)
    if (target == NULL) {
        return ISO_OUT_OF_MEM;
    }
-    /* This reference will be transfered to the burn_source and released by
+    /* This reference will be transferred to the burn_source and released by
       bs_free_data.
    */
    target->refcount = 1;
@ -2375,7 +2492,7 @@ int ecma119_image_new(IsoImage *src, IsoWriteOpts *in_opts, Ecma119Image **img)
    target->dir_mode = opts->replace_dir_mode == 2 ? opts->dir_mode : 0555;
    target->file_mode = opts->replace_file_mode == 2 ? opts->file_mode : 0444;

-    target->now = time(NULL);
+    ecma119_determine_now_time(target);

    target->replace_timestamps = opts->replace_timestamps ? 1 : 0;
    target->timestamp = opts->replace_timestamps == 2 ?
@ -2406,6 +2523,16 @@ int ecma119_image_new(IsoImage *src, IsoWriteOpts *in_opts, Ecma119Image **img)
            target->boot_intvl_start[i] = 0;
            target->boot_intvl_size[i] = 0;
        }
+        /* It is not easy to predict when the node gets created and can be
+           manipulated. So it is better for reproducibility to derive its
+           timestamps from the well controllable now-time.
+        */
+        if (target->catalog->node != NULL) {
+            iso_node_set_mtime((IsoNode *) target->catalog->node, target->now);
+            iso_node_set_atime((IsoNode *) target->catalog->node, target->now);
+            iso_node_set_ctime((IsoNode *) target->catalog->node, target->now);
+        }
+
    } else {
        target->num_bootsrc = 0;
        target->bootsrc = NULL;
@ -2545,7 +2672,12 @@ int ecma119_image_new(IsoImage *src, IsoWriteOpts *in_opts, Ecma119Image **img)
    target->gpt_req_count = 0;
    target->gpt_req_flags = 0;
    target->gpt_backup_outside = 0;
+    memset(target->gpt_uuid_base, 0, 16);
+    target->gpt_uuid_counter = 0;
    target->gpt_disk_guid_set = 0;
+    ret = gpt_disk_guid_setup(target);
+    if (ret < 0)
+        goto target_cleanup;
    target->gpt_part_start = 0;
    target->gpt_backup_end = 0;
    target->gpt_backup_size = 0;
@ -3378,7 +3510,7 @@ int iso_write_opts_new(IsoWriteOpts **opts, int profile)
    wopts->vol_modification_time = 0;
    wopts->vol_expiration_time = 0;
    wopts->vol_effective_time = 0;
-    wopts->vol_uuid[0] = 0;
+    memset(wopts->vol_uuid, 0, 17);
    wopts->partition_offset = 0;
    wopts->partition_secs_per_head = 0;
    wopts->partition_heads_per_cyl = 0;
@ -3400,6 +3532,7 @@ int iso_write_opts_new(IsoWriteOpts **opts, int profile)
    wopts->appended_as_gpt = 0;
    wopts->appended_as_apm = 0;
    wopts->part_like_isohybrid = 0;
+    wopts->iso_mbr_part_type = -1;
    wopts->ascii_disc_label[0] = 0;
    wopts->will_cancel = 0;
    wopts->allow_dir_id_ext = 0;
@ -3409,6 +3542,8 @@ int iso_write_opts_new(IsoWriteOpts **opts, int profile)
        wopts->hfsp_serial_number[i] = 0;
    wopts->apm_block_size = 0;
    wopts->hfsp_block_size = 0;
+    memset(wopts->gpt_disk_guid, 0, 16);
+    wopts->gpt_disk_guid_mode = 0;

    *opts = wopts;
    return ISO_SUCCESS;
@ -4133,6 +4268,14 @@ int iso_write_opts_set_part_like_isohybrid(IsoWriteOpts *opts, int alike)
    return ISO_SUCCESS;
 }

+int iso_write_opts_set_iso_mbr_part_type(IsoWriteOpts *opts, int part_type)
+{
+    if (part_type < -1 || part_type > 255)
+        part_type = -1;
+    opts->iso_mbr_part_type = part_type;
+    return ISO_SUCCESS;
+}
+
 int iso_write_opts_set_disc_label(IsoWriteOpts *opts, char *label)
 {
    strncpy(opts->ascii_disc_label, label, ISO_DISC_LABEL_SIZE - 1);
@ -4160,6 +4303,16 @@ int iso_write_opts_set_hfsp_block_size(IsoWriteOpts *opts,
    return ISO_SUCCESS;
 }

+int iso_write_opts_set_gpt_guid(IsoWriteOpts *opts, uint8_t guid[16], int mode)
+{
+    if (mode < 0 || mode > 2)
+        return ISO_BAD_GPT_GUID_MODE;
+    opts->gpt_disk_guid_mode = mode;
+    if (opts->gpt_disk_guid_mode == 1)
+        memcpy(opts->gpt_disk_guid, guid, 16);
+    return ISO_SUCCESS;
+}
+

 /*
 * @param flag
--- a/libisofs/ecma119.h
+++ b/libisofs/ecma119.h
@ -1,6 +1,6 @@
 /*
 * Copyright (c) 2007 Vreixo Formoso
- * Copyright (c) 2009 - 2015 Thomas Schmitt
+ * Copyright (c) 2009 - 2017 Thomas Schmitt
 *
 * This file is part of the libisofs project; you can redistribute it and/or
 * modify it under the terms of the GNU General Public License version 2 
@ -59,7 +59,7 @@
 #define ISO_DISC_LABEL_SIZE 129


-/* The maximum lenght of an specs violating ECMA-119 file identifier.
+/* The maximum length of an specs violating ECMA-119 file identifier.
   The theoretical limit is  254 - 34 - 28 (len of SUSP CE entry) = 192
   Currently the practical limit is 254 - 34 - 96 (non-CE RR entries) - 28 (CE)
 */
@ -223,7 +223,7 @@ struct iso_write_opts {
    /**
     * Write AAIP as extension according to SUSP 1.10 rather than SUSP 1.12.
     * I.e. without announcing it by an ER field and thus without the need
-     * to preceed the RRIP fields by an ES and to preceed the AA field by ES.
+     * to precede the RRIP fields by an ES and to precede the AA field by ES.
     * This saves bytes and might avoid problems with readers which dislike
     * ER fields other than the ones for RRIP.
     * On the other hand, SUSP 1.12 frowns on such unannounced extensions
@ -496,6 +496,14 @@ struct iso_write_opts {
     */
    int part_like_isohybrid;

+    /* The type to use for the mountable ISO partition if there is any and if
+       the type is not mandatorily determined for particular circumstances like
+       compliant GPT, CHRP, or PReP.
+       -1 = use the default value (e.g. 0xcd, 0x83, 0x17)
+       0x00 to 0xff = value to use if possible 
+    */
+    int iso_mbr_part_type;
+
    /* Eventual name of the non-ISO aspect of the image. E.g. SUN ASCII label.
     */
    char ascii_disc_label[ISO_DISC_LABEL_SIZE];
@ -513,6 +521,13 @@ struct iso_write_opts {
     */
    int apm_block_size;

+    /* User defined GUID for GPT header and base of reproducible partition
+       GUIDs. (Not to be confused with volume "UUID", which is actually a
+       timestamp.)
+       See API call iso_write_opts_set_gpt_guid().
+     */
+    uint8_t gpt_disk_guid[16];
+    int gpt_disk_guid_mode;
 };

 typedef struct ecma119_image Ecma119Image;
@ -844,6 +859,11 @@ struct ecma119_image
    /* Whether the eventual backup GPT is not part of the ISO filesystem */
    int gpt_backup_outside;

+    /* The base UUID for the generated GPT UUIDs */
+    uint8_t gpt_uuid_base[16];
+    /* The counter which distinguishes the GPT UUIDs */
+    uint32_t gpt_uuid_counter;
+
    uint32_t efi_boot_part_size;
    IsoFileSrc *efi_boot_part_filesrc; /* Just a pointer. Do not free. */

@ -1012,5 +1032,18 @@ int iso_write_partition_file(Ecma119Image *target, char *path,

 void issue_ucs2_warning_summary(size_t failures);

+/* Tells whether ivr is a reader from imported_iso in a multi-session
+   add-on situation, and thus to be kept in place.
+*/
+int iso_interval_reader_keep(Ecma119Image *target,
+                             struct iso_interval_reader *ivr,
+                             int flag);
+
+/* @return: ISO_SUCCESS = ok, ISO_SUCCESS + 1 = keep , < 0 = error */
+int iso_interval_reader_start_size(Ecma119Image *t, char *path,
+                                   off_t *start_byte, off_t *byte_count,
+                                   int flag);
+
+

 #endif /*LIBISO_ECMA119_H_*/
--- a/libisofs/ecma119_tree.c
+++ b/libisofs/ecma119_tree.c
@ -1,6 +1,6 @@
 /*
 * Copyright (c) 2007 Vreixo Formoso
- * Copyright (c) 2009 - 2014 Thomas Schmitt
+ * Copyright (c) 2009 - 2016 Thomas Schmitt
 *
 * This file is part of the libisofs project; you can redistribute it and/or
 * modify it under the terms of the GNU General Public License version 2 
@ -241,11 +241,11 @@ int create_file_src(Ecma119Image *img, IsoFile *iso, IsoFileSrc **src)
    size = iso_stream_get_size(iso->stream);
    if (size > (off_t)MAX_ISO_FILE_SECTION_SIZE && img->opts->iso_level != 3) {
        char *ipath = iso_tree_get_node_path(ISO_NODE(iso));
-        ret = iso_msg_submit(img->image->id, ISO_FILE_TOO_BIG, 0,
-                              "File \"%s\" can't be added to image because "
-                              "is greater than 4GB", ipath);
+        iso_msg_submit(img->image->id, ISO_FILE_TOO_BIG, 0,
+                              "File \"%s\" cannot be added to image because "
+                              "its size is 4 GiB or larger", ipath);
        free(ipath);
-        return ret;
+        return ISO_FILE_TOO_BIG;
    }
    ret = iso_file_src_create(img, iso, src);
    if (ret < 0) {
@ -597,7 +597,7 @@ int cmp_node_name(const void *f1, const void *f2)

 /**
 * Sorts a the children of each directory in the ECMA-119 tree represented
- * by \p root, acording to the order specified in ECMA-119, section 9.3.
+ * by \p root, according to the order specified in ECMA-119, section 9.3.
 */
 static
 void sort_tree(Ecma119Node *root)
@ -1270,7 +1270,7 @@ int ecma119_tree_create(Ecma119Image *img)

    if (img->opts->rockridge && !img->opts->allow_deep_paths) {

-        /* Relocate deep directories, acording to RRIP, 4.1.5 */
+        /* Relocate deep directories, according to RRIP, 4.1.5 */
        ret = reorder_tree(img, root, 1, 0);
        if (ret < 0) {
            return ret;
--- a/libisofs/eltorito.c
+++ b/libisofs/eltorito.c
@ -1,6 +1,6 @@
 /*
 * Copyright (c) 2007 Vreixo Formoso
- * Copyright (c) 2010 - 2015 Thomas Schmitt
+ * Copyright (c) 2010 - 2016 Thomas Schmitt
 *
 * This file is part of the libisofs project; you can redistribute it and/or
 * modify it under the terms of the GNU General Public License version 2 
@ -113,9 +113,24 @@ void el_torito_set_load_size(ElToritoBootImage *bootimg, short sectors)
 /* API */
 int el_torito_get_load_size(ElToritoBootImage *bootimg)
 {
-   return (int) bootimg->load_size;
+    return (int) bootimg->load_size;
 }

+/* API */
+void el_torito_set_full_load(ElToritoBootImage *bootimg, int mode)
+{
+    if (bootimg->type != 0)
+        return;
+    bootimg->load_size_full= !!mode;
+}
+
+/* API */
+int el_torito_get_full_load(ElToritoBootImage *bootimg)
+{
+    return bootimg->load_size_full;
+}
+
+
 /**
 * Marks the specified boot image as not bootable
 */
@ -290,7 +305,7 @@ int iso_tree_add_boot_node(IsoDir *parent, const char *name, IsoBoot **boot)
    node->size = 0;
    node->content = NULL;

-    /* atributes from parent */
+    /* attributes from parent */
    node->node.mode = S_IFREG | (parent->node.mode & 0444);
    node->node.uid = parent->node.uid;
    node->node.gid = parent->node.gid;
@ -513,6 +528,7 @@ int create_image(IsoImage *image, const char *image_path,
    boot->partition_type = partition_type;
    boot->load_seg = 0;
    boot->load_size = load_sectors;
+    boot->load_size_full = 0;
    boot->platform_id = 0; /* 80x86 */
    memset(boot->id_string, 0, sizeof(boot->id_string));
    memset(boot->selection_crit, 0, sizeof(boot->selection_crit));
@ -887,6 +903,32 @@ write_section_header(uint8_t *buf, Ecma119Image *t, int idx, int num_entries)
           sizeof(e->id_string));
 }

+static int
+write_section_load_size(struct el_torito_boot_image *img,
+                        struct el_torito_section_entry *se,
+                        uint16_t load_size, off_t full_byte_size, int flag)
+{
+    uint16_t size;
+    off_t blocks;
+
+    size= load_size;
+    if(img->type == 0 && img->load_size_full) {
+        blocks= ((full_byte_size + 2047) / 2048) * 4;
+        if (blocks > 65535) {
+            if (img->platform_id == 0xef)
+                size= 0;
+            else
+                size= 65535;
+        } else if(blocks <= 0) {
+            size= 1;
+        } else {
+            size= blocks;
+        }
+    }
+    iso_lsb(se->sec_count, size, 2);
+    return(1);
+}
+
 /**
 * Write one section entry.
 * Usable for the Default Entry
@ -930,6 +972,8 @@ int write_section_entry(uint8_t *buf, Ecma119Image *t, int idx)
            return ISO_BOOT_IMAGE_NOT_VALID;
        }

+        /* >>> check for non-automatic load size */;
+
        if (t->boot_intvl_size[idx] > 65535) {
            if (img->platform_id == 0xef)
                iso_lsb(se->sec_count, 0, 2);
@ -946,6 +990,9 @@ int write_section_entry(uint8_t *buf, Ecma119Image *t, int idx)
        iso_lsb(se->block, t->boot_intvl_start[idx], 4);
    } else if (mode == 2) {
        app_idx = t->boot_appended_idx[idx];
+
+        /* >>> check for non-automatic load size */;
+
        if (t->appended_part_size[app_idx] * 4 > 65535) {
            if (img->platform_id == 0xef)
                iso_lsb(se->sec_count, 0, 2);
@ -956,7 +1003,8 @@ int write_section_entry(uint8_t *buf, Ecma119Image *t, int idx)
        }
        iso_lsb(se->block, t->appended_part_start[app_idx], 4);
    } else {
-        iso_lsb(se->sec_count, img->load_size, 2);
+        write_section_load_size(img, se, (uint16_t) img->load_size,
+                                (off_t) t->bootsrc[idx]->sections[0].size, 0);
        iso_lsb(se->block, t->bootsrc[idx]->sections[0].block, 4);
    }

@ -1457,11 +1505,6 @@ int eltorito_writer_create(Ecma119Image *target)
                              target->catalog->bootimages[idx]->appended_start;
            target->boot_intvl_size[idx] =
                               target->catalog->bootimages[idx]->appended_size;
-            if (((target->system_area_options >> 2) & 0x3f) == 0 &&
-                (target->system_area_options & 3) == 1) {
-                /* ISO will not be a partition. It can span the whole image. */
-                target->pvd_size_is_total_size = 1;
-            }
    continue;
        }

--- a/libisofs/eltorito.h
+++ b/libisofs/eltorito.h
@ -85,6 +85,7 @@ struct el_torito_boot_image {
    unsigned char partition_type; /**< type of partition for HD-emul images */
    uint16_t load_seg; /**< Load segment for the initial boot image. */
    uint16_t load_size; /**< Number of sectors to load. */
+    int load_size_full; /* 1= override load_size by image size */

    /* Byte 1 of Validation Entry or Section Header Entry:
       0= 80x86, 1= PowerPC, 2= Mac, 0xef= EFI */
--- a/libisofs/fs_image.c
+++ b/libisofs/fs_image.c
@ -1,6 +1,6 @@
 /*
 * Copyright (c) 2007 Vreixo Formoso
- * Copyright (c) 2009 - 2015 Thomas Schmitt
+ * Copyright (c) 2009 - 2016 Thomas Schmitt
 *
 * This file is part of the libisofs project; you can redistribute it and/or
 * modify it under the terms of the GNU General Public License version 2 
@ -325,6 +325,11 @@ typedef struct
     */
    int aaip_version;

+    /**
+     * Start block of loaded session.
+     */
+    uint32_t session_lba;
+
    /**
     * Number of blocks of the volume, as reported in the PVM.
     */
@ -371,7 +376,7 @@ typedef struct
       bit3= Invalid NM entry
       bit4= New SL entry found without previous CONTINUE flag
       bit5= Invalid SL entry
-       bit6= Invalid SL entry, no child location
+       bit6= Invalid CL entry, no child location / found in CL target
       bit7= Invalid PN entry
       bit8= Sparse files not supported
       bit9= SP entry found in a directory entry other than '.' entry of root
@ -384,6 +389,7 @@ typedef struct
      bit16= Incomplete SL
      bit17= Charset conversion error
      bit18= Link without destination
+      bit19= SL with a non-link file
    */
    int rr_err_reported;
    int rr_err_repeated;
@ -1415,6 +1421,7 @@ int iso_rr_msg_submit(_ImageFsData *fsdata, int rr_err_bit,
 * @param flag
 *      bit0= this is the root node attribute load call
 *            (parameter parent is not reliable for this)
+ *      bit1= this is a call caused by CL. Do not obey CL again.
 * @return
 *      2 node is still incomplete (multi-extent)
 *      1 success, 0 record ignored (not an error, can be a relocated dir),
@ -1576,13 +1583,14 @@ int iso_file_source_new_ifs(IsoImageFilesystem *fs, IsoFileSource *parent,
        SuspIterator *iter;


-        iter = susp_iter_new(fsdata->src, record, fsdata->len_skp,
-                             fsdata->msgid);
+        iter = susp_iter_new(fsdata->src, record,
+                             fsdata->session_lba + fsdata->nblocks,
+                             fsdata->len_skp, fsdata->msgid);
        if (iter == NULL) {
            {ret = ISO_OUT_OF_MEM; goto ex;}
        }

-        while ((ret = susp_iter_next(iter, &sue)) > 0) {
+        while ((ret = susp_iter_next(iter, &sue, 0)) > 0) {

            /* ignore entries from different version */
            if (sue->version[0] != 1)
@ -1699,7 +1707,17 @@ if (name != NULL && !namecont) {
                 */
                susp_iter_free(iter);
                free(name);
+                if (flag & 1) {
+                    ret = iso_rr_msg_submit(fsdata, 3, ISO_NO_ROOT_DIR, 0,
+                           "Root directory is marked by RRIP RE as relocated");
+                    ret= ISO_NO_ROOT_DIR;
+                    goto ex;
+                }
                {ret = 0; goto ex;} /* it's not an error */
+            } else if (SUSP_SIG(sue, 'C', 'L') && (flag & 2)) {
+                ret = iso_rr_msg_submit(fsdata, 6, ISO_WRONG_RR, 0,
+                                       "Invalid CL entry, found in CL target");
+
            } else if (SUSP_SIG(sue, 'C', 'L')) {
                /*
                 * This entry is a placeholder for a relocated dir.
@ -1710,7 +1728,7 @@ if (name != NULL && !namecont) {
                relocated_dir = iso_read_bb(sue->data.CL.child_loc, 4, NULL);
                if (relocated_dir == 0) {
                    ret = iso_rr_msg_submit(fsdata, 6, ISO_WRONG_RR, 0,
-                                  "Invalid SL entry, no child location");
+                                  "Invalid CL entry, no child location");
                    break;
                }
            } else if (SUSP_SIG(sue, 'P', 'N')) {
@ -1979,14 +1997,17 @@ if (name != NULL && !namecont) {
            goto ex;
        }

+        /* Call with flag bit1 to prevent further CL relocation */
        ret = iso_file_source_new_ifs(fs, parent, (struct ecma119_dir_record*)
-                                      buffer, src, 0);
+                                      buffer, src, flag | 2);
        if (ret <= 0) {
            goto ex;
        }

        /* but the real name is the name of the placeholder */
        ifsdata = (ImageFileSourceData*) (*src)->data;
+        if (ifsdata->name != NULL)
+            free(ifsdata->name);
        ifsdata->name = name;

        {ret = ISO_SUCCESS; goto ex;}
@ -2087,6 +2108,11 @@ if (name != NULL && !namecont) {

    if (S_ISLNK(atts.st_mode)) {
        ifsdata->data.content = linkdest;
+    } else if (linkdest != NULL) {
+        ret = iso_rr_msg_submit(fsdata, 19, ISO_WRONG_RR_WARN, 0,
+                     "RRIP SL link destination with file that is not a link.");
+        free(linkdest);
+        linkdest = NULL;
    }

    ifsrc->class = &ifs_class;
@ -2392,13 +2418,14 @@ int read_root_susp_entries(_ImageFsData *data, uint32_t block)
     * In that case, we need to set info->len_skp to 15!!
     */

-    iter = susp_iter_new(data->src, record, data->len_skp, data->msgid);
+    iter = susp_iter_new(data->src, record, data->session_lba + data->nblocks,
+                         data->len_skp, data->msgid);
    if (iter == NULL) {
        ret = ISO_OUT_OF_MEM; goto ex;
    }

    /* first entry must be an SP system use entry */
-    ret = susp_iter_next(iter, &sue);
+    ret = susp_iter_next(iter, &sue, 1);
    if (ret < 0) {
        /* error */
        susp_iter_free(iter);
@ -2442,7 +2469,7 @@ int read_root_susp_entries(_ImageFsData *data, uint32_t block)
     * no?), but if we finally need it, it can be easily implemented in
     * the iterator, transparently for the rest of the code.
     */
-    while ((ret = susp_iter_next(iter, &sue)) > 0) {
+    while ((ret = susp_iter_next(iter, &sue, 0)) > 0) {

        /* ignore entries from different version */
        if (sue->version[0] != 1)
@ -2589,6 +2616,9 @@ int read_pvm(_ImageFsData *data, uint32_t block)
    data->effective_time =
            iso_util_strcopy_untail((char*) pvm->vol_effective_time, 17);

+    data->session_lba = 0;
+    if (block >= 16) /* The session begins 16 blocks before the PVD */
+        data->session_lba = block - 16;
    data->nblocks = iso_read_bb(pvm->vol_space_size, 4, NULL);

    rootdr = (struct ecma119_dir_record*) pvm->root_dir_record;
@ -2641,14 +2671,6 @@ int read_el_torito_boot_catalog(_ImageFsData *data, uint32_t block)
        {ret = ISO_WRONG_EL_TORITO; goto ex;}
    }

-    /* check for a valid platform */
-    if (ve->platform_id[0] != 0 && ve->platform_id[0] != 0xef) {
-        iso_msg_submit(data->msgid, ISO_UNSUPPORTED_EL_TORITO, 0,
-                     "Unsupported El-Torito platform. Only 80x86 and EFI are "
-                     "supported. El-Torito info will be ignored.");
-        {ret = ISO_UNSUPPORTED_EL_TORITO; goto ex;}
-    }
-
    /* ok, once we are here we assume it is a valid catalog */

    /* parse the default entry */
@ -3017,15 +3039,14 @@ int iso_image_filesystem_new(IsoDataSource *src, struct iso_read_opts *opts,
    } while (buffer[0] != 255);

    /* 4. check if RR extensions are being used */
-    ret = read_root_susp_entries(data, data->pvd_root_block);
-    if (ret < 0) {
-        goto fs_cleanup;
-    }
-
-    /* user doesn't want to read RR extensions */
    if (opts->norock) {
+        /* user doesn't want to read RR extensions */
        data->rr = RR_EXT_NO;
    } else {
+        ret = read_root_susp_entries(data, data->pvd_root_block);
+        if (ret < 0) {
+            goto fs_cleanup;
+        }
        data->rr = data->rr_version;
    }

@ -3598,7 +3619,7 @@ int iso_image_eval_boot_info_table(IsoImage *image, struct iso_read_opts *opts,
        boot_pvd_found = iso_read_lsb(boot_info_found, 4);
        image_pvd = (uint32_t) (opts->block + 16);

-        /* Accomodate to eventually relocated superblock */
+        /* Accommodate to eventually relocated superblock */
        if (image_pvd != boot_pvd_found &&
            image_pvd == 16 && boot_pvd_found < iso_image_size) {
            /* Check whether there is a PVD at boot_pvd_found
@ -3906,10 +3927,12 @@ try_grub2_mbr:;

 static
 int iso_analyze_partition_offset(IsoImage *image, IsoDataSource *src,
-                                 uint64_t start_block, int flag)
+                                 uint64_t start_block, uint64_t block_count,
+                                 int flag)
 {
    int ret;
    uint8_t *buf = NULL;
+    uint32_t iso_size;
    off_t p_offset;
    struct ecma119_pri_vol_desc *pvm;
    struct iso_imported_sys_area *sai;
@ -3922,11 +3945,14 @@ int iso_analyze_partition_offset(IsoImage *image, IsoDataSource *src,
    ret = src->read_block(src, p_offset + 16, buf);
    if (ret > 0) {
        pvm = (struct ecma119_pri_vol_desc *) buf;
+        iso_size = iso_read_lsb(pvm->vol_space_size, 4);
        if (strncmp((char*) pvm->std_identifier, "CD001", 5) == 0 &&
            pvm->vol_desc_type[0] == 1 &&
            pvm->vol_desc_version[0] == 1 &&
            pvm->file_structure_version[0] == 1 &&
-            iso_read_lsb(pvm->vol_space_size, 4) + p_offset == sai->image_size)
+            (iso_size + p_offset == sai->image_size ||
+             iso_size == block_count / 4))
+
            sai->partition_offset = p_offset;
    }
    ret = 1;
@ -3993,7 +4019,7 @@ int iso_analyze_mbr(IsoImage *image, IsoDataSource *src, int flag)
    }
    if (sai->mbr_req_count >= 1 &&
        (sai->mbr_req[0]->type_byte == 0xee || !is_isohybrid) &&
-        !sai->prep_part_start > 0) {
+        !(sai->prep_part_start > 0)) {
        part = sai->mbr_req[0];
        part2_start = 0;
        if (sai->mbr_req_count >= 2)
@ -4035,10 +4061,10 @@ int iso_analyze_mbr(IsoImage *image, IsoDataSource *src, int flag)
            part->start_block >= 64 && part->block_count >= 72 &&
            part->start_block <= 2048 &&
            part->start_block % 4 == 0 && part->block_count % 4 == 0 &&
-            (part->start_block + part->block_count) / 4 == sai->image_size) {
+            (part->start_block + part->block_count) / 4 <= sai->image_size) {

            ret = iso_analyze_partition_offset(image, src, part->start_block,
-                                               0);
+                                               part->block_count, 0);
            if (ret < 0)
                goto ex;
        }
@ -4343,10 +4369,10 @@ int iso_analyze_gpt(IsoImage *image, IsoDataSource *src, int flag)
            block_count = sai->gpt_req[0]->block_count;
            if (start_block >= 64 && block_count >= 72 &&
                start_block <= 2048 && start_block % 4 == 0 &&
-                block_count % 4 == 0 &&
-                (start_block + block_count) / 4 == sai->image_size) {
+                block_count % 4 == 0) {

-                ret = iso_analyze_partition_offset(image, src, start_block, 0);
+                ret = iso_analyze_partition_offset(image, src, start_block,
+                                                   block_count, 0);
                if (ret < 0)
                    return ret;
            }
@ -4975,12 +5001,13 @@ int iso_impsysa_report(IsoImage *image, struct iso_impsysa_result *target,
    if (sa_type == 0) {
        if ((sao & 3) || sa_sub == 1 || sa_sub == 2) {
            strcat(msg, " MBR");
-            if (sao & 1)
-                strcat(msg, " protective-msdos-label");
-            else if (sao & 2)
+            if (sao & 2)
                strcat(msg, " isohybrid");
-            else if (sa_sub == 1)
+            else if (sao & 1)
+                strcat(msg, " protective-msdos-label");
+            else if (sa_sub == 1) {
                strcat(msg, " CHRP");
+            }
            if ((sao & (1 << 14)) && !(sao & 2))
                strcat(msg, " grub2-mbr");
            sprintf(msg + strlen(msg), " cyl-align-%s",
@ -5738,6 +5765,10 @@ int iso_image_import(IsoImage *image, IsoDataSource *src,
        iso_filesystem_unref(fs);
        return ret;
    }
+    if (newroot == NULL) {
+        iso_filesystem_unref(fs);
+        return ISO_NO_ROOT_DIR;
+    }

    /* Lookup character set even if no AAIP loading is enabled */
    ret = iso_file_source_get_aa_string(newroot, &aa_string, 2);
@ -5853,6 +5884,7 @@ int iso_image_import(IsoImage *image, IsoDataSource *src,
            boot_image->platform_id = data->platform_ids[idx];
            memcpy(boot_image->id_string, data->id_strings[idx], 28);
            memcpy(boot_image->selection_crit, data->selection_crits, 20);
+            boot_image->appended_idx = -1;

            catalog->bootimages[catalog->num_bootimages] = boot_image;
            boot_image = NULL;
--- a/libisofs/fsource.h
+++ b/libisofs/fsource.h
@ -1,6 +1,6 @@
 /*
 * Copyright (c) 2007 Vreixo Formoso
- * Copyright (c) 2009 - 2015 Thomas Schmitt
+ * Copyright (c) 2009 - 2016 Thomas Schmitt
 * 
 * This file is part of the libisofs project; you can redistribute it and/or 
 * modify it under the terms of the GNU General Public License version 2 
@ -28,7 +28,7 @@
 * Create a new IsoFilesystem to deal with local filesystem.
 * 
 * @return
- *     1 sucess, < 0 error
+ *     1 success, < 0 error
 */
 int iso_local_filesystem_new(IsoFilesystem **fs);

--- a/libisofs/image.h
+++ b/libisofs/image.h
@ -1,6 +1,6 @@
 /*
 * Copyright (c) 2007 Vreixo Formoso
- * Copyright (c) 2009 - 2015 Thomas Schmitt
+ * Copyright (c) 2009 - 2016 Thomas Schmitt
 * 
 * This file is part of the libisofs project; you can redistribute it and/or 
 * modify it under the terms of the GNU General Public License version 2 
@ -31,7 +31,7 @@
 * Global objects such as the message_queues must belogn to that
 * context. Thus we will have, for example, a msg queue per image,
 * so images are completelly independent and can be managed together.
- * (Usefull, for example, in Multiple-Document-Interface GUI apps.
+ * (Useful, for example, in Multiple-Document-Interface GUI apps.
 * [The stuff we have in init belongs really to image!]
 */

--- a/libisofs/libiso_msgs.h
+++ b/libisofs/libiso_msgs.h
@ -1,7 +1,7 @@

 /* libiso_msgs   (generated from libdax_msgs : Fri Feb 22 19:42:52 CET 2008)
   Message handling facility of libisofs.
-   Copyright (C) 2006-2008 Thomas Schmitt <scdbackup@gmx.net>,
+   Copyright (C) 2006-2016 Thomas Schmitt <scdbackup@gmx.net>,
   provided under GPL version 2 or later
 */

@ -266,8 +266,9 @@ int libiso_msgs_new(struct libiso_msgs **m, int flag);

 /** Destroy a message handling facility and all its eventual messages.
    The submitted pointer gets set to NULL.
-    Actually only the last destroy call of all offical references to the object
-    will really dispose it. All others just decrement the reference counter.
+    Actually only the last destroy call of all official references to the
+    object will really dispose it. All others just decrement the reference
+    counter.
    Call this function only with official reference pointers obtained by
    libiso_msgs_new() or libiso_msgs_refer(), and only once per such pointer.
    @param flag Bitfield for control purposes (unused yet, submit 0)
--- a/libisofs/libisofs.h
+++ b/libisofs/libisofs.h
@ -4,7 +4,7 @@

 /*
 * Copyright (c) 2007-2008 Vreixo Formoso, Mario Danic
- * Copyright (c) 2009-2016 Thomas Schmitt
+ * Copyright (c) 2009-2017 Thomas Schmitt
 *
 * This file is part of the libisofs project; you can redistribute it and/or
 * modify it under the terms of the GNU General Public License version 2 
@ -94,7 +94,7 @@ extern "C" {
 */
 #define iso_lib_header_version_major  1
 #define iso_lib_header_version_minor  4
-#define iso_lib_header_version_micro  4
+#define iso_lib_header_version_micro  8

 /**
 * Get version of the libisofs library at runtime.
@ -167,7 +167,7 @@ typedef struct Iso_Image IsoImage;
 * A node in the iso tree, i.e. a file that will be written to image.
 *
 * It can represent any kind of files. When needed, you can get the type with
- * iso_node_get_type() and cast it to the appropiate subtype. Useful macros
+ * iso_node_get_type() and cast it to the appropriate subtype. Useful macros
 * are provided, see below.
 *
 * @since 0.6.2
@ -1257,7 +1257,7 @@ char *iso_get_local_charset(int flag);
 * @param image
 *     Location where the image pointer will be stored.
 * @return
- *     1 sucess, < 0 error
+ *     1 success, < 0 error
 *
 * @since 0.6.2
 */
@ -1376,7 +1376,7 @@ int iso_write_opts_set_iso_level(IsoWriteOpts *opts, int level);
 * resulting image will have long filenames (up to 255 characters), deeper
 * directory structure, POSIX permissions and owner info on files and
 * directories, support for symbolic links or special files... All that
- * attributes can be modified/setted with the appropiate function.
+ * attributes can be modified/set with the appropriate function.
 *
 * @param opts
 *      The option set to be manipulated.
@ -1485,7 +1485,7 @@ int iso_write_opts_set_hfsp_serial_number(IsoWriteOpts *opts,
 * @param hfsp_block_size
 *      The allocation block size to be used by the HFS+ fileystem.
 *      0, 512, or 2048
- * @param hfsp_block_size
+ * @param apm_block_size
 *      The block size to be used for and within the Apple Partition Map.
 *      0, 512, or 2048.
 *      Size 512 is not compatible with options which produce GPT.
@ -1670,7 +1670,7 @@ int iso_write_opts_set_allow_deep_paths(IsoWriteOpts *opts, int allow);
 *      The name given by this call will be compared with iso_node_get_name()
 *      of the directories in the root directory, not with the final ECMA-119
 *      names of those directories.
- * @parm flags
+ * @param flags
 *      Bitfield for control purposes.
 *      bit0= Mark the relocation directory by a Rock Ridge RE entry, if it
 *            gets created during iso_image_create_burn_source(). This will
@ -1812,7 +1812,7 @@ int iso_write_opts_set_rrip_1_10_px_ino(IsoWriteOpts *opts, int enable);
 /**
 * Write AAIP as extension according to SUSP 1.10 rather than SUSP 1.12.
 * I.e. without announcing it by an ER field and thus without the need
- * to preceed the RRIP fields and the AAIP field by ES fields.
+ * to precede the RRIP fields and the AAIP field by ES fields.
 * This saves 5 to 10 bytes per file and might avoid problems with readers
 * which dislike ER fields other than the ones for RRIP.
 * On the other hand, SUSP 1.12 frowns on such unannounced extensions 
@ -2358,7 +2358,7 @@ int iso_write_opts_set_part_offset(IsoWriteOpts *opts,
 #define iso_libjte_req_micro 0

 /** 
- * Associate a libjte environment object to the upcomming write run.
+ * Associate a libjte environment object to the upcoming write run.
 * libjte implements Jigdo Template Extraction as of Steve McIntyre and
 * Richard Atterer.
 * The call will fail if no libjte support was enabled at compile time.
@ -2498,6 +2498,8 @@ int iso_interval_reader_new(IsoImage *img, char *path,
 *
 * @param ivr
 *        The reader object to be disposed. *ivr will be set to NULL.
+ * @param flag
+ *        Unused yet. Submit 0.
 * @return
 *        ISO_SUCCESS or error (which is < 0)
 * 
@ -2595,6 +2597,52 @@ int iso_write_opts_set_prep_img(IsoWriteOpts *opts, char *image_path,
 int iso_write_opts_set_efi_bootp(IsoWriteOpts *opts, char *image_path, 
                                 int flag);

+/**
+ * Control whether the emerging GPT gets a pseudo-randomly generated disk GUID
+ * or whether it gets a user supplied GUID.
+ * The partition GUIDs will be generated in a reproducible way by exoring the
+ * little-endian 32 bit partion number with the disk GUID beginning at byte
+ * offset 9.
+ *
+ * @param opts
+ *        The option set to be manipulated.
+ * @param guid
+ *        16 bytes of user supplied GUID. Readily byte-swapped as prescribed by
+ *        UEFI specs: 4 byte, 2 byte, 2 byte as little-endian. The rest as
+ *        big-endian.
+ *        The upper 4 bit of guid[7] should bear the value 4 to express the
+ *        RFC 4122 version 4. Bit 7 of byte[8] should  be set to 1 and bit 6
+ *        be set to 0, in order to express the RFC 4122 variant of UUID,
+ *        where version 4 means "pseudo-random uuid".
+ * @param mode
+ *        0 = ignore parameter guid and produce the GPT disk GUID by a
+ *            pseudo-random algorithm. This is the default setting.
+ *        1 = use parameter guid as GPT disk GUID
+ *        2 = ignore parameter guid and derive the GPT disk GUID from
+ *            parameter vol_uuid of iso_write_opts_set_pvd_times().
+ *            The 16 bytes of vol_uuid get copied and bytes 7, 8 get their
+ *            upper bits changed to comply to RFC 4122 and UEFI.
+ *            Error ISO_GPT_NO_VOL_UUID will occur if image production begins
+ *            before vol_uuid was set.
+ *
+ * @return
+ *        ISO_SUCCESS or ISO_BAD_GPT_GUID_MODE
+ *
+ * @since 1.4.6
+ */
+int iso_write_opts_set_gpt_guid(IsoWriteOpts *opts, uint8_t guid[16],
+                                int mode);
+
+/**
+ * Generate a pseudo-random GUID suitable for iso_write_opts_set_gpt_guid().
+ *
+ * @param guid
+ *        Will be filled by 16 bytes of generated GUID.
+ *
+ * @since 1.4.6
+ */
+void iso_generate_gpt_guid(uint8_t guid[16]);
+
 /**
 * Cause an arbitrary data file to be appended to the ISO image and to be
 * described by a partition table entry in an MBR or SUN Disk Label at the
@ -2613,15 +2661,15 @@ int iso_write_opts_set_efi_bootp(IsoWriteOpts *opts, char *image_path,
 *        Range with MBR: 1 to 4. 1 will cause the whole ISO image to be
 *                        unclaimable space before partition 1.
 *        Range with SUN Disk Label: 2 to 8.
+ * @param partition_type
+ *        The MBR partition type. E.g. FAT12 = 0x01 , FAT16 = 0x06, 
+ *        Linux Native Partition = 0x83. See fdisk command L.
+ *        This parameter is ignored with SUN Disk Label.
 * @param image_path
 *        File address in the local file system or instructions for interval
 *        reader. See flag bit0.
 *        With SUN Disk Label: an empty name causes the partition to become
 *        a copy of the next lower partition.
- * @param image_type
- *        The MBR partition type. E.g. FAT12 = 0x01 , FAT16 = 0x06, 
- *        Linux Native Partition = 0x83. See fdisk command L.
- *        This parameter is ignored with SUN Disk Label.
 * @param flag
 *        bit0= The path contains instructions for the interval reader
 *              See above.
@ -2701,6 +2749,21 @@ int iso_write_opts_set_appended_as_apm(IsoWriteOpts *opts, int apm);
 */
 int iso_write_opts_set_part_like_isohybrid(IsoWriteOpts *opts, int alike);

+/**
+ * Set the partition type of the MBR partition which represents the ISO
+ * filesystem or at least protects it.
+ * This is without effect if no such partition emerges by other settings or
+ * if the partition type is prescribed mandatorily like 0xee for GPT protective
+ * MBR or 0x96 for CHRP.
+ * @param opts
+ *        The option set to be manipulated.
+ * @param part_type
+ *        0x00 to 0xff as desired partition type.
+ *        Any other value (e.g. -1) enables the default types of the various
+ *        occasions.
+ * @since 1.4.8
+ */
+int iso_write_opts_set_iso_mbr_part_type(IsoWriteOpts *opts, int part_type);

 /**
 * Inquire the start address of the file data blocks after having used
@ -3176,7 +3239,7 @@ void *iso_image_get_attached_data(IsoImage *image);
 * effect if both, the truncate mode value from "isofs.nt" and the current
 * truncate mode of the IsoImage are 1, and the length is between 64 and 255.
 * 
- * @param image
+ * @param img
 *      The image which shall be manipulated.
 * @param mode
 *      0= Do not truncate but throw error ISO_RR_NAME_TOO_LONG if a file name
@ -3200,7 +3263,7 @@ int iso_image_set_truncate_mode(IsoImage *img, int mode, int length);
 /**
 * Inquire the current setting of iso_image_set_truncate_mode().
 *
- * @param image
+ * @param img
 *      The image which shall be inquired.
 * @param mode
 *      Returns the mode value.
@ -3429,16 +3492,16 @@ const char *iso_image_get_app_use(IsoImage *image);
 *
 * @param image
 *        The image to be inquired.
- * @param vol_creation_time
+ * @param creation_time
 *        Returns a pointer to the Volume Creation time:
 *        When "the information in the volume was created."
- * @param vol_modification_time
+ * @param modification_time
 *        Returns a pointer to Volume Modification time:
 *        When "the information in the volume was last modified."
- * @param vol_expiration_time
+ * @param expiration_time
 *        Returns a pointer to Volume Expiration time:
 *        When "the information in the volume may be regarded as obsolete."
- * @param vol_effective_time
+ * @param effective_time
 *        Returns a pointer to Volume Expiration time:
 *        When "the information in the volume may be used."
 * @return
@ -3459,17 +3522,22 @@ int iso_image_get_pvd_times(IsoImage *image,
 *      The image to make bootable. If it was already bootable this function
 *      returns an error and the image remains unmodified.
 * @param image_path
- *      The absolute path of a IsoFile to be used as default boot image.
-
->>> or  --interval:appended_partition_$number_start_$start_size_$size:...
-
+ *      The absolute path of a IsoFile to be used as default boot image or
+ *      --interval:appended_partition_$number[_start_$start_size_$size]:...
+ *      if type is ELTORITO_NO_EMUL. $number gives the partition number.
+ *      If _start_$start_size_$size is present, then it overrides the 2 KiB
+ *      start block of the partition and the partition size counted in
+ *      blocks of 512 bytes.
 * @param type
 *      The boot media type. This can be one of 3 types:
- *             - Floppy emulation: Boot image file must be exactly
- *               1200 kB, 1440 kB or 2880 kB.
- *             - Hard disc emulation: The image must begin with a master
+ *             - ELTORITO_FLOPPY_EMUL.
+ *               Floppy emulation: Boot image file must be exactly
+ *               1200 KiB, 1440 KiB or 2880 KiB.
+ *             - ELTORITO_HARD_DISC_EMUL.
+ *               Hard disc emulation: The image must begin with a master
 *               boot record with a single image.
- *             - No emulation. You should specify load segment and load size
+ *             - ELTORITO_NO_EMUL.
+ *               No emulation. You should specify load segment and load size
 *               of image.
 * @param catalog_path
 *      The absolute path in the image tree where the catalog will be stored.
@ -3504,12 +3572,11 @@ int iso_image_set_boot_image(IsoImage *image, const char *image_path,
 *      The image to which the boot image shall be added.
 *      returns an error and the image remains unmodified.
 * @param image_path
- *      The absolute path of a IsoFile to be used as boot image.
-
->>> or  --interval:appended_partition_${number}s_start_${start}d_size_$size:...
-
+ *      The absolute path of a IsoFile to be used as boot image or
+ *      --interval:appended_partition_$number[_start_$start_size_$size]:...
+ *      if type is ELTORITO_NO_EMUL. See iso_image_set_boot_image.
 * @param type
- *      The boot media type. See iso_image_set_boot_image
+ *      The boot media type. See iso_image_set_boot_image.
 * @param flag
 *      Bitfield for control purposes. Unused yet. Submit 0.
 * @param boot
@ -3552,9 +3619,7 @@ int iso_image_add_boot_image(IsoImage *image, const char *image_path,
 * @param imgnode
 *      When not NULL, it will be filled with the image tree node. No extra ref
 *      is added, you can use iso_node_ref() to get one if you need it.
-
->>> The returned value is NULL if the boot image source is no IsoFile.
-
+ *      The returned value is NULL if the boot image source is no IsoFile.
 * @param catnode
 *      When not NULL, it will be filled with the catnode tree node. No extra
 *      ref is added, you can use iso_node_ref() to get one if you need it.
@ -3612,8 +3677,7 @@ int iso_image_get_bootcat(IsoImage *image, IsoBoot **catnode, uint32_t *lba,
 * @param bootnodes
 *      Returns NULL or an allocated array of pointers to the IsoFile nodes
 *      which bear the content of the boot images in boots.
-
->>> An array entry is NULL if the boot image source is no IsoFile.
+ *      An array entry is NULL if the boot image source is no IsoFile.

 >>> Need getter for partition index

@ -3787,6 +3851,26 @@ void el_torito_set_load_size(ElToritoBootImage *bootimg, short sectors);
 */
 int el_torito_get_load_size(ElToritoBootImage *bootimg);

+/**
+ * State that the load size shall be the size of the boot image automatically.
+ * This overrides el_torito_set_load_size().
+ * @param bootimg
+ *      The image to to manipulate
+ * @param mode
+ *      0= use value of el_torito_set_load_size()
+ *      1= determine value from boot image
+ */
+void el_torito_set_full_load(ElToritoBootImage *bootimg, int mode);
+
+/**
+ * Inquire the setting of el_torito_set_full_load().
+ * @param bootimg
+ *      The image to inquire
+ * @return
+ *      The mode set with el_torito_set_full_load().
+ */
+int el_torito_get_full_load(ElToritoBootImage *bootimg);
+
 /**
 * Marks the specified boot image as not bootable
 *
@ -3868,7 +3952,7 @@ int el_torito_set_selection_crit(ElToritoBootImage *bootimg, uint8_t crit[20]);
 *
 * @param bootimg
 *      The image to inquire
- * @param id_string
+ * @param crit
 *      Returns 20 bytes of type and data
 * @return
 *      1 = ok , <0 = error
@ -4255,7 +4339,7 @@ int iso_image_get_system_area(IsoImage *img, char data[32768],
 * Else it will consist of lines as described in ISO_SYSAREA_REPORT_DOC above.
 *
 * File paths and other long texts are reported as "(too long to show here)"
- * if their length plus preceeding text plus trailing 0-byte exceeds the
+ * if their length plus preceding text plus trailing 0-byte exceeds the
 * line length limit of ISO_MAX_SYSAREA_LINE_LENGTH bytes.
 * Texts which may contain whitespace or unprintable characters will start
 * at fixed positions and extend to the end of the line.
@ -4411,7 +4495,7 @@ uint32_t iso_crc32_gpt(unsigned char *data, int count, int flag);
 * the first added file gets into effect with this system area type.
 * The data files which shall serve as MIPS boot files have to be brought into
 * the image by the normal means.
- * @param img
+ * @param image
 *        The image to be manipulated.
 * @param path
 *        Absolute path of the boot file in the ISO 9660 Rock Ridge tree.
@ -4426,7 +4510,7 @@ int iso_image_add_mips_boot_file(IsoImage *image, char *path, int flag);
 /**
 * Obtain the number of added MIPS Big Endian boot files and pointers to
 * their paths in the ISO 9660 Rock Ridge tree.
- * @param img
+ * @param image
 *        The image to be inquired.
 * @param paths
 *        An array of pointers to be set to the registered boot file paths.
@ -4442,7 +4526,7 @@ int iso_image_get_mips_boot_files(IsoImage *image, char *paths[15], int flag);

 /**
 * Clear the list of MIPS Big Endian boot file paths.
- * @param img
+ * @param image
 *        The image to be manipulated.
 * @param flag
 *        Bitfield for control purposes, unused yet, submit 0
@ -4570,7 +4654,7 @@ int iso_image_set_alpha_boot(IsoImage *img, char *boot_loader_path, int flag);
 *
 * @param img
 *        The image to be inquired.
- * @param cmdline
+ * @param boot_loader_path
 *        Will return the path. NULL if none is currently submitted.
 * @return
 *        1 is success , <0 means error
@ -5237,7 +5321,7 @@ int iso_dir_iter_take(IsoDirIter *iter);
 * The node removed will be the one returned by the previous iteration.
 *
 * It is not allowed to call this function twice without calling
- * iso_dir_iter_next inbetween.
+ * iso_dir_iter_next between the calls.
 *
 * @return
 *     1 on succes, < 0 error
@ -5256,8 +5340,9 @@ int iso_dir_iter_remove(IsoDirIter *iter);
 *
 * @param node
 *      The node to be removed.
- * @param iter
- *      If not NULL, then the node will be removed by iso_dir_iter_remove(iter)
+ * @param boss_iter
+ *      If not NULL, then the node will be removed by
+ *      iso_dir_iter_remove(boss_iter)
 *      else it will be removed by iso_node_remove(node).
 * @return
 *      1 is success, <0 indicates error
@ -5461,10 +5546,10 @@ int iso_dir_find_children(IsoDir* dir, IsoFindCondition *cond,
 const char *iso_symlink_get_dest(const IsoSymlink *link);

 /**
- * Set the destination of a link.
+ * Set the destination of a symbolic 
 *
- * @param opts
- *     The option set to be manipulated
+ * @param link
+ *     The link node to be manipulated
 * @param dest
 *     New destination for the link. It must be a non-empty string, otherwise
 *     this function doesn't modify previous destination.
@ -5485,7 +5570,7 @@ int iso_symlink_set_dest(IsoSymlink *link, const char *dest);
 *      or regular files, this function has no effect.
 * @param w
 *      The weight as a integer number, the greater this value is, the
- *      closer from the begining of image the file will be written.
+ *      closer from the beginning of image the file will be written.
 *      Default value at IsoNode creation is 0.
 *
 * @since 0.6.2
@ -5718,7 +5803,7 @@ int iso_tree_add_new_file(IsoDir *parent, const char *name, IsoStream *stream,
 *
 * @param buf
 *     The dynamically allocated memory buffer with the stream content.
- * @parm size
+ * @param size
 *     The number of bytes which may be read from buf.
 * @param stream
 *     Will return a reference to the newly created stream.
@ -6239,7 +6324,7 @@ int iso_tree_clone(IsoNode *node,
 * Add the contents of a dir to a given directory of the iso tree.
 *
 * There are several options to control what files are added or how they are
- * managed. Take a look at iso_tree_set_* functions to see diferent options
+ * managed. Take a look at iso_tree_set_* functions to see different options
 * for recursive directory addition.
 *
 * TODO comment Builder and Filesystem related issues when exposing both
@ -6432,7 +6517,7 @@ int iso_set_msgs_severities(char *queue_severity, char *print_severity,
 * will discard the whole queue.
 *
 * @param minimum_severity
- *     Threshhold
+ *     Threshold
 * @param error_code
 *     Will become a unique error code as listed at the end of this header
 * @param imgid
@ -6882,7 +6967,7 @@ void iso_filesystem_unref(IsoFilesystem *fs);
 * @param fs
 *      Will be filled with a pointer to the filesystem that can be used
 *      to access image contents.
- * @param
+ * @return
 *      1 on success, < 0 on error
 *
 * @since 0.6.2
@ -7260,7 +7345,7 @@ mode_t iso_node_get_perms_wo_acl(const IsoNode *node);
 * @param names
 *      Will return an array of pointers to 0-terminated names
 * @param value_lengths
- *      Will return an arry with the lenghts of values
+ *      Will return an array with the lengths of values
 * @param values
 *      Will return an array of pointers to strings of 8-bit bytes
 * @param flag
@ -7286,7 +7371,7 @@ int iso_node_get_attrs(IsoNode *node, size_t *num_attrs,
 * @param name
 *      The xattr name that shall be looked up.
 * @param value_length
- *      Will return the lenght of value
+ *      Will return the length of value
 * @param value
 *      Will return a string of 8-bit bytes. free() it when no longer needed.
 * @param flag
@ -7469,7 +7554,7 @@ int iso_local_get_perms_wo_acl(char *disk_path, mode_t *st_mode, int flag);
 * @param names
 *      Will return an array of pointers to 0-terminated names
 * @param value_lengths
- *      Will return an arry with the lenghts of values
+ *      Will return an array with the lengths of values
 * @param values
 *      Will return an array of pointers to 8-bit values
 * @param flag
@ -8169,7 +8254,7 @@ enum IsoHfsplusBlessings {
 * Issue a blessing to a particular IsoNode. If the blessing is already issued
 * to some file, then it gets revoked from that one.
 * 
- * @param image
+ * @param img
 *     The image to manipulate.
 * @param blessing
 *      The kind of blessing to be issued.
@ -8203,7 +8288,7 @@ int iso_image_hfsplus_bless(IsoImage *img, enum IsoHfsplusBlessings blessing,
 *
 * Several usage restrictions apply. See parameter blessed_nodes.
 *
- * @param image
+ * @param img
 *     The image to inquire.
 * @param blessed_nodes
 *     Will return a pointer to an internal node array of image.
@ -8398,8 +8483,8 @@ int iso_conv_name_chars(IsoWriteOpts *opts, char *name, size_t name_len,
 /** File not supported in ECMA-119 tree and thus ignored (WARNING,MEDIUM, -139) */
 #define ISO_FILE_IGNORED                0xD020FF75

-/* A file is bigger than supported by used standard  (WARNING,MEDIUM, -140) */
-#define ISO_FILE_TOO_BIG                0xD020FF74
+/* A file is bigger than supported by used standard  (FAILURE,HIGH, -140) */
+#define ISO_FILE_TOO_BIG                0xE830FF74

 /* File read error during image creation (MISHAP,HIGH, -141) */
 #define ISO_FILE_CANT_WRITE             0xE430FF73
@ -8787,6 +8872,26 @@ int iso_conv_name_chars(IsoWriteOpts *opts, char *name, size_t name_len,
 /** Unrecognized file type of IsoFileSrc object          (SORRY, HIGH, -415) */
 #define ISO_BAD_FSRC_FILETYPE       0xE030FE61

+/** Cannot derive GPT GUID from undefined pseudo-UUID volume timestamp
+                                                       (FAILURE, HIGH, -416) */
+#define ISO_GPT_NO_VOL_UUID         0xE830FE60
+
+/** Unrecognized GPT disk GUID setup mode
+                                                       (FAILURE, HIGH, -417) */
+#define ISO_BAD_GPT_GUID_MODE       0xE830FE5F
+
+/** Unable to obtain root directory                       (FATAL,HIGH, -418) */
+#define ISO_NO_ROOT_DIR             0xF030FE5E
+
+/** Zero sized, oversized, or mislocated SUSP CE area found
+                                                       (FAILURE, HIGH, -419) */
+#define ISO_SUSP_WRONG_CE_SIZE      0xE830FE5D
+
+/** Multi-session would overwrite imported_iso interval
+                                                       (FAILURE, HIGH, -420) */
+#define ISO_MULTI_OVER_IMPORTED     0xE830FE5C
+
+
 /* Internal developer note: 
   Place new error codes directly above this comment. 
   Newly introduced errors must get a message entry in
--- a/libisofs/libisofs.ver
+++ b/libisofs/libisofs.ver
@ -5,6 +5,7 @@ aaip_xinfo_func;
 el_torito_get_bootable;
 el_torito_get_boot_media_type;
 el_torito_get_boot_platform_id;
+el_torito_get_full_load;
 el_torito_get_id_string;
 el_torito_get_isolinux_options;
 el_torito_get_load_seg;
@ -13,6 +14,7 @@ el_torito_get_selection_crit;
 el_torito_patch_isolinux_image;
 el_torito_seems_boot_info_table;
 el_torito_set_boot_platform_id;
+el_torito_set_full_load;
 el_torito_set_id_string;
 el_torito_set_isolinux_options;
 el_torito_set_load_seg;
@ -68,6 +70,7 @@ iso_filesystem_ref;
 iso_filesystem_unref;
 iso_finish;
 iso_fs_global_id;
+iso_generate_gpt_guid;
 iso_get_local_charset;
 iso_get_messenger;
 iso_gzip_get_refcounts;
@ -320,12 +323,14 @@ iso_write_opts_set_disc_label;
 iso_write_opts_set_efi_bootp;
 iso_write_opts_set_fat;
 iso_write_opts_set_fifo_size;
+iso_write_opts_set_gpt_guid;
 iso_write_opts_set_hardlinks;
 iso_write_opts_set_hfsp_block_size;
 iso_write_opts_set_hfsp_serial_number;
 iso_write_opts_set_hfsplus;
 iso_write_opts_set_iso1999;
 iso_write_opts_set_iso_level;
+iso_write_opts_set_iso_mbr_part_type;
 iso_write_opts_set_joliet;
 iso_write_opts_set_joliet_long_names;
 iso_write_opts_set_joliet_longer_paths;
--- a/libisofs/make_isohybrid_mbr.c
+++ b/libisofs/make_isohybrid_mbr.c
@ -604,8 +604,28 @@ static int gpt_images_as_mbr_partitions(Ecma119Image *t, char *wpt,
 }


+/* For generating a weak random number */
+static uint32_t iso_make_mbr_id(Ecma119Image *t, int flag)
+{
+    uint32_t id;
+    struct timeval tv;
+
+    if(t->opts->vol_uuid[0]) {
+        id = iso_crc32_gpt((unsigned char *) t->opts->vol_uuid, 16, 0);
+    } else if(t->opts->vol_modification_time > 0) {
+        id = iso_crc32_gpt((unsigned char *) &(t->opts->vol_modification_time),
+                           sizeof(time_t), 0);
+    } else {
+        gettimeofday(&tv, NULL);
+        id = 0xffffffff & (tv.tv_sec ^ (tv.tv_usec * 2000));
+    }
+    return id;
+}
+
+
 /*
 * @param flag  bit0= make own random MBR Id from current time
+ *                    >>> or from overridden modification time
 *              bit1= create protective MBR as of UEFI/GPT specs
 */
 int make_isolinux_mbr(uint32_t *img_blocks, Ecma119Image *t,
@ -618,8 +638,6 @@ int make_isolinux_mbr(uint32_t *img_blocks, Ecma119Image *t,
    uint32_t boot_lba;
    int head_count, sector_count, ret;
    int gpt_count = 0, gpt_idx[128], apm_count = 0, gpt_cursor, i;
-    /* For generating a weak random number */
-    struct timeval tv;

    if (t->bootsrc[0] == NULL)
        return iso_msg_submit(t->image->id, ISO_BOOT_IMAGE_NOT_VALID, 0,
@ -668,8 +686,7 @@ int make_isolinux_mbr(uint32_t *img_blocks, Ecma119Image *t,
       (here some 32-bit random value with no crypto strength)
    */
    if (flag & 1) {
-        gettimeofday(&tv, NULL);
-        id = 0xffffffff & (tv.tv_sec ^ (tv.tv_usec * 2000));
+        id = iso_make_mbr_id(t, 0);
        lsb_to_buf(&wpt, id, 32, 0);
    } else {
        wpt+= 4;
--- a/libisofs/messages.c
+++ b/libisofs/messages.c
@ -1,6 +1,6 @@
 /*
 * Copyright (c) 2007 Vreixo Formoso
- * Copyright (c) 2009 - 2015 Thomas Schmitt
+ * Copyright (c) 2009 - 2016 Thomas Schmitt
 *
 * This file is part of the libisofs project; you can redistribute it and/or
 * modify it under the terms of the GNU General Public License version 2 
@ -157,7 +157,7 @@ int iso_init_with_flag(int flag)
 #ifdef Libisofs_with_libjtE

 /* Ugly compile time check for header version compatibility.
-    If everthing matches, then it produces no C code. In case of mismatch,
+    If everything matches, then it produces no C code. In case of mismatch,
    intentionally faulty C code will be inserted.
 */ 
 /* The indendation is an advise of man gcc to help old compilers ignoring */
@ -543,6 +543,16 @@ const char *iso_error_to_msg(int errcode)
        return "A general note message was issued";
    case ISO_BAD_FSRC_FILETYPE:
        return "Unrecognized file type of IsoFileSrc object";
+    case ISO_GPT_NO_VOL_UUID:
+        return "Cannot derive GPT GUID from undefined pseudo-UUID volume timestamp";
+    case ISO_BAD_GPT_GUID_MODE:
+        return "Unrecognized GPT disk GUID setup mode";
+    case ISO_NO_ROOT_DIR:
+        return "Unable to obtain root directory";
+    case ISO_SUSP_WRONG_CE_SIZE:
+        return "Zero sized, oversized, or mislocated SUSP CE area found";
+    case ISO_MULTI_OVER_IMPORTED:
+        return "Multi-session would overwrite imported_iso interval";
    default:
        return "Unknown error";
    }
--- a/libisofs/node.c
+++ b/libisofs/node.c
@ -1,6 +1,6 @@
 /*
 * Copyright (c) 2007 Vreixo Formoso
- * Copyright (c) 2009 - 2015 Thomas Schmitt
+ * Copyright (c) 2009 - 2016 Thomas Schmitt
 *
 * This file is part of the libisofs project; you can redistribute it and/or
 * modify it under the terms of the GNU General Public License version 2 
@ -1114,7 +1114,7 @@ int iso_symlink_set_dest(IsoSymlink *link, const char *dest)
 *      or regular files, this function has no effect.
 * @param w
 *      The weight as a integer number, the greater this value is, the
- *      closer from the begining of image the file will be written.
+ *      closer from the beginning of image the file will be written.
 */
 void iso_node_set_sort_weight(IsoNode *node, int w)
 {
@ -1818,7 +1818,7 @@ int attr_enlarge_list(char ***names, size_t **value_lengths, char ***values,

 /* Merge attribute list of node and given new attribute list into
   attribute list returned by  m_* parameters.
-   The m_* paramters have finally to be freed by a call with bit15 set.
+   The m_* parameters have finally to be freed by a call with bit15 set.
   @param flag          Bitfield for control purposes
                        bit0= delete all old names which begin by "user."     
                              (but not if bit2 is set)
--- a/libisofs/node.h
+++ b/libisofs/node.h
@ -1,6 +1,6 @@
 /*
 * Copyright (c) 2007 Vreixo Formoso
- * Copyright (c) 2009 - 2011 Thomas Schmitt
+ * Copyright (c) 2009 - 2016 Thomas Schmitt
 *
 * This file is part of the libisofs project; you can redistribute it and/or
 * modify it under the terms of the GNU General Public License version 2 
@ -487,7 +487,7 @@ int iso_node_cmp_flag(IsoNode *n1, IsoNode *n2, int flag);


 /**
- * Set the checksum index (typically comming from IsoFileSrc.checksum_index)
+ * Set the checksum index (typically coming from IsoFileSrc.checksum_index)
 * of a regular file node. The index is encoded as xattr "isofs.cx" with
 * four bytes of value.
 */
--- a/libisofs/rockridge.h
+++ b/libisofs/rockridge.h
@ -254,7 +254,7 @@ typedef struct susp_iterator SuspIterator;

 SuspIterator *
 susp_iter_new(IsoDataSource *src, struct ecma119_dir_record *record, 
-              uint8_t len_skp, int msgid);
+              uint32_t fs_blocks, uint8_t len_skp, int msgid);

 /**
 * Get the next SUSP System User Entry using given iterator.
@ -266,7 +266,8 @@ susp_iter_new(IsoDataSource *src, struct ecma119_dir_record *record,
 * @return
 *      1 on success, 0 if no more entries, < 0 error
 */
-int susp_iter_next(SuspIterator *iter, struct susp_sys_user_entry **sue);
+int susp_iter_next(SuspIterator *iter, struct susp_sys_user_entry **sue,
+                   int flag);

 /**
 * Free a given susp iterator.
--- a/libisofs/rockridge_read.c
+++ b/libisofs/rockridge_read.c
@ -35,6 +35,9 @@ struct susp_iterator
    IsoDataSource *src;
    int msgid;

+    /* Number of blocks in the ISO 9660 filesystem */
+    uint32_t fs_blocks;
+
    /* block and offset for next continuation area */
    uint32_t ce_block;
    uint32_t ce_off;
@ -47,7 +50,7 @@ struct susp_iterator

 SuspIterator*
 susp_iter_new(IsoDataSource *src, struct ecma119_dir_record *record,
-              uint8_t len_skp, int msgid)
+              uint32_t fs_blocks, uint8_t len_skp, int msgid)
 {
    int pad = (record->len_fi[0] + 1) % 2;
    struct susp_iterator *iter = malloc(sizeof(struct susp_iterator));
@ -60,6 +63,7 @@ susp_iter_new(IsoDataSource *src, struct ecma119_dir_record *record,
    iter->size = record->len_dr[0] - record->len_fi[0] - 33 - pad;
    iter->src = src;
    iter->msgid = msgid;
+    iter->fs_blocks = fs_blocks;

    iter->ce_len = 0;
    iter->buffer = NULL;
@ -67,12 +71,30 @@ susp_iter_new(IsoDataSource *src, struct ecma119_dir_record *record,
    return iter;
 }

-int susp_iter_next(SuspIterator *iter, struct susp_sys_user_entry **sue)
+/* More than 1 MiB in a single file's CE area is suspicious */
+#define ISO_SUSP_MAX_CE_BYTES (1024 * 1024)
+
+
+/* @param flag bit0 = First call on root:
+                      Not yet clear whether this is SUSP at all
+*/
+int susp_iter_next(SuspIterator *iter, struct susp_sys_user_entry **sue,
+                   int flag)
 {
    struct susp_sys_user_entry *entry;

    entry = (struct susp_sys_user_entry*)(iter->base + iter->pos);

+    if (flag & 1) {
+        /* Yet unclear whether it is SUSP at all */
+        if (iter->size < 7)
+            return 0;
+        if (!SUSP_SIG(entry, 'S', 'P'))
+            return 0;
+        if (entry->len_sue[0] < 7)
+            return 0;
+        /* Looks like SUSP enough to pass the further processing here. */
+    }
    if ( (iter->pos + 4 > iter->size) || (SUSP_SIG(entry, 'S', 'T'))) {

        /* 
@ -81,22 +103,31 @@ int susp_iter_next(SuspIterator *iter, struct susp_sys_user_entry **sue)
         * (IEEE 1281, SUSP. section 4) 
         */
        if (iter->ce_len) {
-            uint32_t block, nblocks;
+            uint32_t block, nblocks, skipped_blocks, skipped_bytes;

-            /* A CE has found, there is another continuation area */
-            nblocks = DIV_UP(iter->ce_off + iter->ce_len, BLOCK_SIZE);
+            /* A CE was found, there is another continuation area */
+            skipped_blocks = iter->ce_off / BLOCK_SIZE;
+            skipped_bytes = skipped_blocks * BLOCK_SIZE;
+            nblocks = DIV_UP(iter->ce_off - skipped_bytes + iter->ce_len,
+                             BLOCK_SIZE);
+            if (nblocks <= 0 || iter->ce_len > ISO_SUSP_MAX_CE_BYTES)
+                return ISO_SUSP_WRONG_CE_SIZE;
+            if (((uint64_t) iter->ce_block) + skipped_blocks + nblocks >
+                (uint64_t) iter->fs_blocks)
+                return ISO_SUSP_WRONG_CE_SIZE;
            iter->buffer = realloc(iter->buffer, nblocks * BLOCK_SIZE);

-            /* read all blocks needed to cache the full CE */
+            /* Read blocks needed to cache the given CE area range */
            for (block = 0; block < nblocks; ++block) {
                int ret;
-                ret = iter->src->read_block(iter->src, iter->ce_block + block,
-                                            iter->buffer + block * BLOCK_SIZE);
+                ret = iter->src->read_block(iter->src,
+                                       iter->ce_block + skipped_blocks + block,
+                                       iter->buffer + block * BLOCK_SIZE);
                if (ret < 0) {
                    return ret;
                }
            }
-            iter->base = iter->buffer + iter->ce_off;
+            iter->base = iter->buffer + (iter->ce_off - skipped_bytes);
            iter->pos = 0;
            iter->size = iter->ce_len;
            iter->ce_len = 0;
@ -134,10 +165,10 @@ int susp_iter_next(SuspIterator *iter, struct susp_sys_user_entry **sue)
        }

        /* we don't want to return CE entry to the user */
-        return susp_iter_next(iter, sue);
+        return susp_iter_next(iter, sue, 0);
    } else if (SUSP_SIG(entry, 'P', 'D')) {
        /* skip padding */
-        return susp_iter_next(iter, sue);
+        return susp_iter_next(iter, sue, 0);
    }

    *sue = entry;
@ -374,12 +405,18 @@ int read_rr_SL(struct susp_sys_user_entry *sl, char **dest, int *cont)
        if (*cont == 1) {
            /* new component */
            size_t size = strlen(*dest);
+            int has_slash;
+
            *dest = realloc(*dest, strlen(*dest) + len + 2);
            if (*dest == NULL) {
                return ISO_OUT_OF_MEM;
            }
            /* it is a new compoenent, add the '/' */
-            if ((*dest)[size-1] != '/') {
+            has_slash = 0;
+            if (size > 0)
+                if ((*dest)[size - 1] == '/')
+                    has_slash = 1;
+            if (!has_slash) {
                (*dest)[size] = '/';
                (*dest)[size+1] = '\0';
            }
@ -462,24 +499,27 @@ int read_aaip_AA(struct susp_sys_user_entry *sue,
     if (*is_done) {

         /* To coexist with Apple ISO :
-            Gracefully react on eventually trailing Apple AA
+            Gracefully react on possibly trailing Apple AA
         */
         if (sue->version[0] != 1 || sue->len_sue[0] == 7)
             return ISO_SUCCESS;

         return ISO_WRONG_RR;
     }
-
-
-     /* Eventually create or grow storage */
     if (*aa_size == 0 || *aa_string == NULL) {
-
-         /* Gracefully react on eventually leading Apple AA
+         /* Gracefully react on possibly leading Apple AA
         */
-         if (sue->version[0] != 1 || sue->len_sue[0] < 9) {
+         if (sue->version[0] != 1 || sue->len_sue[0] < 9)
             return ISO_SUCCESS;
-         }
+     }

+     /* A valid AAIP AA entry has 5 header bytes and at least 1 component byte
+      */
+     if (sue->len_sue[0] < 6)
+         return ISO_WRONG_RR;
+
+     /* Possibly create or grow storage */
+     if (*aa_size == 0 || *aa_string == NULL) {
         *aa_size = *aa_len + sue->len_sue[0];
         *aa_string = calloc(*aa_size, 1);
         *aa_len = 0;
@ -535,7 +575,12 @@ int read_aaip_AL(struct susp_sys_user_entry *sue,
     if (sue->version[0] != 1)
         return ISO_WRONG_RR;

-     /* Eventually create or grow storage */
+     /* A valid AL entry has 5 header bytes and at least 1 component byte
+      */
+     if (sue->len_sue[0] < 6)
+         return ISO_WRONG_RR;
+
+     /* Possibly create or grow storage */
     if (*aa_size == 0 || *aa_string == NULL) {
         *aa_size = *aa_len + sue->len_sue[0];
         *aa_string = calloc(*aa_size, 1);
--- a/libisofs/stream.h
+++ b/libisofs/stream.h
@ -1,6 +1,6 @@
 /*
 * Copyright (c) 2007 Vreixo Formoso
- * Copyright (c) 2009 - 2011 Thomas Schmitt
+ * Copyright (c) 2009 - 2016 Thomas Schmitt
 *
 * This file is part of the libisofs project; you can redistribute it and/or
 * modify it under the terms of the GNU General Public License version 2 
@ -41,7 +41,7 @@ void iso_stream_get_file_name(IsoStream *stream, char *name);
 * take an extra ref.
 *
 * @return
- *      1 sucess, < 0 error
+ *      1 success, < 0 error
 *      Possible errors:
 *
 */
@ -52,7 +52,7 @@ int iso_file_source_stream_new(IsoFileSource *src, IsoStream **stream);
 * The stream will add a ref. to the IsoFileSource.
 *
 * @return
- *      1 sucess, < 0 error
+ *      1 success, < 0 error
 */
 int iso_cut_out_stream_new(IsoFileSource *src, off_t offset, off_t size,
                           IsoStream **stream);
--- a/libisofs/system_area.c
+++ b/libisofs/system_area.c
@ -1,6 +1,6 @@
 /*
 * Copyright (c) 2008 Vreixo Formoso
- * Copyright (c) 2010 - 2016 Thomas Schmitt
+ * Copyright (c) 2010 - 2017 Thomas Schmitt
 *
 * This file is part of the libisofs project; you can redistribute it and/or
 * modify it under the terms of the GNU General Public License version 2 
@ -108,11 +108,14 @@ void iso_compute_cyl_head_sec(uint64_t img_blocks, int hpc, int sph,
 }

 /* @param flag bit0= The path contains instructions for the interval reader
+   @return ISO_SUCCESS     = ok, partition will be written
+           ISO_SUCCESS + 1 = interval which shall be kept in place
+           else : error code
 */
 static int compute_partition_size(Ecma119Image *t, char *disk_path,
                                  uint32_t *size, int flag)
 {
-    int ret;
+    int ret, keep;
    off_t num;
    struct stat stbuf;
    struct iso_interval_reader *ivr;
@ -124,8 +127,11 @@ static int compute_partition_size(Ecma119Image *t, char *disk_path,
        if (ret < 0)
            return ret;
        *size = (byte_count + BLOCK_SIZE - 1) / BLOCK_SIZE;
+        keep = iso_interval_reader_keep(t, ivr, 0);
        iso_interval_reader_destroy(&ivr, 0);
-        return ISO_SUCCESS;
+        if (keep < 0)
+            return keep;
+        return ISO_SUCCESS + (keep > 0);
    }

    *size = 0;
@ -148,6 +154,7 @@ int iso_compute_append_partitions(Ecma119Image *t, int flag)
 {
    int ret, i, sa_type, cyl_align, cyl_size = 0;
    uint32_t pos, size, add_pos = 0;
+    off_t start_byte, byte_count;

    sa_type = (t->system_area_options >> 2) & 0x3f;
    cyl_align = (t->system_area_options >> 8) & 0x3;
@ -168,6 +175,20 @@ int iso_compute_append_partitions(Ecma119Image *t, int flag)
                                     t->opts->appended_part_flags[i]);
        if (ret < 0)
            return ret;
+        if (ret == ISO_SUCCESS + 1) {
+            /* Interval from imported_iso in add-on session */
+            t->appended_part_prepad[i] = 0;
+            ret = iso_interval_reader_start_size(t,
+                                               t->opts->appended_partitions[i],
+                                               &start_byte, &byte_count, 0);
+            if (ret < 0)
+                return ret;
+            t->appended_part_start[i] = start_byte / 2048;
+            t->appended_part_size[i] = size;
+            t->opts->iso_mbr_part_type = 0;
+    continue;
+        }
+
        add_pos = 0;
        if (sa_type == 3 && (pos % ISO_SUN_CYL_SIZE)) {
            add_pos = ISO_SUN_CYL_SIZE - (pos % ISO_SUN_CYL_SIZE);
@ -184,7 +205,7 @@ int iso_compute_append_partitions(Ecma119Image *t, int flag)
        }
        t->appended_part_size[i] = size;
        pos += add_pos + size;
-        t->total_size += (add_pos + size) * 2048;
+        t->total_size += (((off_t) add_pos) + size) * 2048;
        if (flag & 1)
            t->curblock = pos;
    }
@ -192,6 +213,19 @@ int iso_compute_append_partitions(Ecma119Image *t, int flag)
 }


+static int mbr_part_slot_is_unused(uint8_t *slot)
+{
+    int i;
+
+    for (i = 0; i < 16; i++)
+        if (slot[i] != 0)
+    break;
+    if (i >= 16)
+        return 1;
+    return 0;
+}
+
+
 /* @param flag
                bit1= partition_offset and partition_size are counted in
                      blocks of 512 rather than 2048
@ -287,7 +321,7 @@ int make_grub_msdos_label(uint32_t img_blocks, int sph, int hpc,
        buf[510] = 0x55;
        buf[511] = 0xAA;
    }
-    if (!(flag & 2)) {
+    if ((!(flag & 2)) && part_type != 0xee && part_type != 0xef) {
      /* 3) Put 0x80 (for bootable partition), */
      *(wpt++) = 0x80;
    } else {
@ -1476,8 +1510,12 @@ static void iso_write_gpt_entry(Ecma119Image *t, uint8_t *buf,
    for (i = 0; i < 16; i++)
        if (part_uuid[i])
    break;
-    if (i == 16)
-        iso_random_uuid(t, part_uuid);
+    if (i == 16) {
+        if (!t->gpt_disk_guid_set)
+            iso_gpt_uuid(t, t->gpt_disk_guid);
+        t->gpt_disk_guid_set = 1;
+        iso_gpt_uuid(t, part_uuid);
+    }
    memcpy(wpt, part_uuid, 16);
    wpt += 16;
    iso_lsb_to_buf(&wpt, start_lba & 0xffffffff, 4, 0);
@ -1538,9 +1576,8 @@ int iso_write_gpt_header_block(Ecma119Image *t, uint32_t img_blocks,
                   (uint32_t) ((back_lba - max_entries / 4 - 1) >> 32), 4, 1);

    /* Disk GUID */
-    /* >>> Make adjustable */
    if (!t->gpt_disk_guid_set)
-        iso_random_uuid(t, t->gpt_disk_guid);
+        iso_gpt_uuid(t, t->gpt_disk_guid);
    t->gpt_disk_guid_set = 1;
    memcpy(wpt, t->gpt_disk_guid, 16);
    wpt += 16;
@ -1774,7 +1811,7 @@ static void iso_dummy_mbr_partition(uint8_t *buf, int mode)
                              0x00, 0x00, 0x00, 0x00, 0x01, 0x00, 0x00, 0x00 };

    for (i = 0; i < 4; i++) {
-        if (buf[446 + 16 * i + 4] == 0x00) {
+        if (mbr_part_slot_is_unused(buf + 446 + 16 * i)) {
            memcpy(buf + 446 + 16 * i, dummy_entry, 16);
            return;
        }
@ -1915,6 +1952,9 @@ int iso_write_system_area(Ecma119Image *t, uint8_t *buf)
                pml_blocks = gpt_blocks;
            } else {
                part_type = 0xcd;
+                if (t->opts->iso_mbr_part_type >= 0 &&
+                    t->opts->iso_mbr_part_type <= 255)
+                    part_type= t->opts->iso_mbr_part_type;
                pml_blocks = img_blocks;
            }
            ret = make_grub_msdos_label(pml_blocks, t->partition_secs_per_head,
@ -1939,8 +1979,12 @@ int iso_write_system_area(Ecma119Image *t, uint8_t *buf)

        if (gpt_count > 0 || apm_count > 0)
            part_type = 0x00;
-        else
+        else {
            part_type = 0x17;
+            if (t->opts->iso_mbr_part_type >= 0 &&
+                t->opts->iso_mbr_part_type <= 255)
+                part_type= t->opts->iso_mbr_part_type;
+        }

        if (t->opts->appended_as_gpt && t->have_appended_partitions) {
            part_type = 0xee;
@ -1982,9 +2026,13 @@ int iso_write_system_area(Ecma119Image *t, uint8_t *buf)
    } else if ((t->opts->partition_offset > 0 || will_append) &&
               sa_type == 0 && t->mbr_req_count == 0) {
        /* Write a simple partition table. */
+        part_type = 0xcd;
+        if (t->opts->iso_mbr_part_type >= 0 &&
+            t->opts->iso_mbr_part_type <= 255)
+            part_type= t->opts->iso_mbr_part_type;
        ret = make_grub_msdos_label(img_blocks, t->partition_secs_per_head,
                                    t->partition_heads_per_cyl,
-                                    (uint8_t) 0xcd, buf, 2);
+                                    (uint8_t) part_type, buf, 2);
        if (ret != ISO_SUCCESS) /* error should never happen */
            return ISO_ASSERT_FAILURE;
        risk_of_ee = 1;
@ -2004,7 +2052,11 @@ int iso_write_system_area(Ecma119Image *t, uint8_t *buf)
        } else if (t->opts->partition_offset == 0) {
            /* Re-write partion entry 1 : start at 0, type Linux */
            blk = ((uint64_t) img_blocks) * 4 - t->post_iso_part_pad / 512;
-            ret = write_mbr_partition_entry(1, 0x83, (uint64_t) 0, blk,
+            part_type = 0x83;
+            if (t->opts->iso_mbr_part_type >= 0 &&
+                t->opts->iso_mbr_part_type <= 255)
+                part_type= t->opts->iso_mbr_part_type;
+            ret = write_mbr_partition_entry(1, part_type, (uint64_t) 0, blk,
                        t->partition_secs_per_head, t->partition_heads_per_cyl,
                        buf, 2);
            if (ret < 0)
@ -2078,13 +2130,18 @@ int iso_write_system_area(Ecma119Image *t, uint8_t *buf)
    /* >>> ??? check for GPT magic number at byte 512 ff. ? */;

    if (sa_type == 0 && ((t->system_area_options & 3) || risk_of_ee) &&
-        (t->opts->part_like_isohybrid || t->gpt_req_count == 0)) {
+        (t->opts->part_like_isohybrid || t->gpt_req_count == 0) &&
+        t->opts->iso_mbr_part_type != 0xee) {
        for (i = 0; i < 4; i++) {
            if (buf[446 + 16 * i + 4] == 0xee) {
                iso_msgs_submit(0,
                            "Prevented partition type 0xEE in MBR without GPT",
                            0, "WARNING", 0);
-                buf[446 + 16 * i + 4] = 0xcd;
+                part_type = 0xcd;
+                if (t->opts->iso_mbr_part_type >= 0 &&
+                    t->opts->iso_mbr_part_type <= 255)
+                    part_type= t->opts->iso_mbr_part_type;
+                buf[446 + 16 * i + 4] = (uint8_t) part_type;
            }
        }
    }
@ -2092,7 +2149,7 @@ int iso_write_system_area(Ecma119Image *t, uint8_t *buf)
    if (sa_type == 0 && (
        (t->system_area_options & 3) ||
        (t->system_area_options & (1 << 14)) ||
-        (((t->system_area_options >> 2) & 0x3f) == 2 &&
+        (((t->system_area_options >> 10) & 15) != 1 &&
         (t->system_area_options & (1 << 15)))
        )) {
        /* This is an MBR which shall have a bootable/active flag
@ -2103,7 +2160,7 @@ int iso_write_system_area(Ecma119Image *t, uint8_t *buf)
        break;
        if (i >= 4) { /* no bootable/active flag set yet */
            for (i = 0; i < 4; i++) {
-                if (buf[446 + 16 * i + 4] != 0x00 &&
+                if ((!mbr_part_slot_is_unused(buf + 446 + 16 * i)) &&
                    buf[446 + 16 * i + 4] != 0xee &&
                    buf[446 + 16 * i + 4] != 0xef) {
                    buf[446 + 16 * i] |= 0x80;
@ -2117,6 +2174,14 @@ int iso_write_system_area(Ecma119Image *t, uint8_t *buf)
        }
    }

+    if ((((t->system_area_options >> 2) & 0x3f) == 0 &&
+         (t->system_area_options & 3) == 1) ||
+        t->opts->partition_offset > 0) {
+        /* Protective MBR || partition offset */
+        /* ISO will not be a partition. It can span the whole image. */
+        t->pvd_size_is_total_size = 1;
+    }
+
    return ISO_SUCCESS;
 }

@ -2357,67 +2422,69 @@ uint32_t iso_crc32_gpt(unsigned char *data, int count, int flag)
    return result ^ 0xffffffff;
 }

-
-void iso_random_uuid(Ecma119Image *t, uint8_t uuid[16])
+void iso_mark_guid_version_4(uint8_t *u)
 {
+    /* Mark as UUID version 4. RFC 4122 says u[6], but UEFI prescribes
+       bytes 6 and 7 to be swapped.
+    */
+    u[7] = (u[7] & 0x0f) | 0x40;
+
+    /* Variant is "1 0 x" as described in RFC 4122.
+    */
+    u[8] = (u[8] & 0x3f) | 0x80;
+
+    return;
+}
+
+void iso_generate_gpt_guid(uint8_t guid[16])
+{
+
 #ifdef Libisofs_with_uuid_generatE
+
    uuid_t u;
+
+    uuid_generate(u);
+    swap_uuid((void *) u);
+    memcpy(guid, u, 16);
+
 #else
-    uint8_t u[16];
-    /* produced by uuid_generate() and byte-swapped to isohybrid.c habits */
+
+    uint8_t *u;
+    /* produced by uuid_generate() and byte-swapped to UEFI specs */
    static uint8_t uuid_template[16] = {
        0xee, 0x29, 0x9d, 0xfc, 0x65, 0xcc, 0x7c, 0x40,
        0x92, 0x61, 0x5b, 0xcd, 0x6f, 0xed, 0x08, 0x34
    };
-    static uint8_t uuid_urandom[16];
    uint32_t rnd, salt;
    struct timeval tv;
    pid_t pid;
-    static int counter = 0, use_urandom = 0;
    int i, ret, fd;
-#endif

-#ifdef Libisofs_with_uuid_generatE
+    u = guid;

-    uuid_generate(u);
-    swap_uuid((void *) u);
-    memcpy(uuid, u, 16);
-
-#else
-
-    /* First try /dev/urandom.
-       (Weakening the result by 8 bit saves a lot of pool entropy.)
+    /* First try /dev/urandom
    */
-    if ((counter & 0xff) == 0) {
-        fd = open("/dev/urandom", O_RDONLY | O_BINARY);
-        if (fd == -1)
-            goto fallback;
-        ret = read(fd, uuid_urandom, 16);
-        if (ret != 16) {
-            close(fd);
-            goto fallback;
-        }
-        /* Mark as UUID version 4 */
-        uuid_urandom[7] = (uuid_urandom[7] & 0x0f) | 0x40;
-        uuid_urandom[8] = (uuid_urandom[8] & 0x3f) | 0x80;
-        close(fd);
-        use_urandom = 1;
-    }
-    if (!use_urandom)
+    fd = open("/dev/urandom", O_RDONLY | O_BINARY);
+    if (fd == -1)
        goto fallback;
-    memcpy(uuid, uuid_urandom, 16);
-    uuid[9] ^= counter & 0xff;
-    counter++;
+    ret = read(fd, u, 16);
+    if (ret != 16) {
+        close(fd);
+        goto fallback;
+    }
+    close(fd);
+    iso_mark_guid_version_4(u);
    return;

+
 fallback:;
    pid = getpid();
-    salt = iso_crc32_gpt((unsigned char *) t, sizeof(Ecma119Image), 0) ^ pid; 
+    salt = iso_crc32_gpt((unsigned char *) &guid, sizeof(uint8_t *), 0) ^ pid; 

    /* This relies on the uniqueness of the template and the rareness of
-       bootable ISO image production via libisofs. Estimated 53 bits of
+       bootable ISO image production via libisofs. Estimated 48 bits of
       entropy should influence the production of a single day. 
-       So first collisions are to be expected with about 100 million images
+       So first collisions are to be expected with about 16 million images
       per day.
    */
    memcpy(u, uuid_template, 16);
@ -2429,19 +2496,36 @@ fallback:;
    u[6] = ((salt >> 8) ^ (pid >> 16)) & 0xff;
    rnd = ((0xffffff & tv.tv_sec) << 8) |
          (((tv.tv_usec >> 16) ^ (salt & 0xf0)) & 0xff);
-    u[9] ^= counter & 0xff;
    for (i = 0; i < 4; i++)
        u[10 + i] ^= (rnd >> (8 * i)) & 0xff;
    u[14] ^= (tv.tv_usec >> 8) & 0xff;
    u[15] ^= tv.tv_usec & 0xff;
-    counter++;

-    memcpy(uuid, u, 16);
+    iso_mark_guid_version_4(u);
+    return;

 #endif /* ! Libisofs_with_uuid_generatE */    

 }

+void iso_gpt_uuid(Ecma119Image *t, uint8_t uuid[16])
+{
+    if (t->gpt_uuid_counter == 0)
+        iso_generate_gpt_guid(t->gpt_uuid_base);
+
+    memcpy(uuid, t->gpt_uuid_base, 16);
+
+    /* Previous implementation changed only byte 9. So i expand it by applying
+       the counter in little-endian style.
+    */
+    uuid[9] ^= t->gpt_uuid_counter & 0xff;
+    uuid[10] ^= (t->gpt_uuid_counter >> 8) & 0xff;
+    uuid[11] ^= (t->gpt_uuid_counter >> 16) & 0xff;
+    uuid[12] ^= (t->gpt_uuid_counter >> 24) & 0xff;
+    t->gpt_uuid_counter++;
+    return;
+}
+
 int assess_appended_gpt(Ecma119Image *t, int flag)
 {
    static uint8_t basic_data_uuid[16] = {
@ -2453,7 +2537,7 @@ int assess_appended_gpt(Ecma119Image *t, int flag)
       0xba, 0x4b, 0x00, 0xa0, 0xc9, 0x3e, 0xc9, 0x3b
    };
    static uint8_t zero_uuid[16] = {0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0};
-    int i, ret, do_apm = 0, do_gpt = 0, index, already_in_gpt;
+    int i, ret, do_apm = 0, do_gpt = 0, index, already_in_gpt = 0;
    uint8_t gpt_name[72], *type_uuid;

 #ifndef Libisofs_appended_partitions_inlinE
@ -2799,10 +2883,12 @@ static int partprepend_writer_compute_data_blocks(IsoImageWriter *writer)
 {
    Ecma119Image *t;
    IsoFileSrc *src;
-    int ret, will_have_gpt = 0, with_chrp = 0, i;
+    int ret, will_have_gpt = 0, with_chrp = 0, i, part_type, keep;
    static uint8_t zero_uuid[16] = {0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0};
    static uint64_t gpt_flags = (((uint64_t) 1) << 60) | 1;
    uint8_t gpt_name[72];
+    uint64_t part_start;
+    off_t start_byte, byte_count;

    /* <<< ??? Move to system_area.h and publish as macro ? */
    static uint8_t efi_sys_uuid[16] = {
@ -2820,6 +2906,7 @@ static int partprepend_writer_compute_data_blocks(IsoImageWriter *writer)
        will_have_gpt = 1;

    if (t->opts->efi_boot_partition != NULL) {
+        keep = 0;
        if (t->efi_boot_part_filesrc != NULL) {
            /* A file in the emerging ISO image shall store its content
               as prepended partition.
@ -2831,23 +2918,35 @@ static int partprepend_writer_compute_data_blocks(IsoImageWriter *writer)
                src->sections[i].block = t->curblock + t->efi_boot_part_size;
                t->efi_boot_part_size += (src->sections[i].size + 2047) / 2048;
            }
+            part_start = t->curblock * 4;
        } else {
            ret = compute_partition_size(t, t->opts->efi_boot_partition,
                                         &(t->efi_boot_part_size),
                                         t->opts->efi_boot_part_flag & 1);
            if (ret < 0)
                return ret;
+            part_start = t->curblock * 4;
+            if (ret == ISO_SUCCESS + 1) {
+                /* Interval from imported_iso in add-on session will be kept */
+                ret = iso_interval_reader_start_size(t,
+                                                  t->opts->efi_boot_partition,
+                                                  &start_byte, &byte_count, 0);
+                if (ret < 0)
+                    return ret;
+                part_start = start_byte / 512;
+                keep = 1;
+            }
        }
        memset(gpt_name, 0, 72);
        strcpy((char *) gpt_name, "EFI boot partition");
        iso_ascii_utf_16le(gpt_name);
-        ret = iso_quick_gpt_entry(t->gpt_req, &(t->gpt_req_count),
-                                 ((uint64_t) t->curblock) * 4,
+        ret = iso_quick_gpt_entry(t->gpt_req, &(t->gpt_req_count), part_start,
                                 ((uint64_t) t->efi_boot_part_size) * 4,
                                 efi_sys_uuid, zero_uuid, gpt_flags, gpt_name);
        if (ret < 0)
            return ret;
-        t->curblock += t->efi_boot_part_size;
+        if (!keep)
+            t->curblock += t->efi_boot_part_size;
    }

    if (with_chrp) {
@ -2862,36 +2961,59 @@ static int partprepend_writer_compute_data_blocks(IsoImageWriter *writer)
        return ISO_SUCCESS;
    }

+    part_start = t->curblock * 4;
+    keep = 0;
    if (t->opts->prep_partition != NULL) {
        ret = compute_partition_size(t, t->opts->prep_partition,
                                     &(t->prep_part_size),
                                     t->opts->prep_part_flag & 1);
        if (ret < 0)
            return ret;
+        if (ret == ISO_SUCCESS + 1) {
+            /* Interval from imported_iso in add-on session will be kept */
+            ret = iso_interval_reader_start_size(t,
+                                                 t->opts->prep_partition,
+                                                 &start_byte, &byte_count, 0);
+            if (ret < 0)
+                return ret;
+            part_start = start_byte / 512;
+            keep = 1;
+        }
    }
    if (t->prep_part_size > 0 || t->opts->fat || will_have_gpt) {
        /* Protecting MBR entry for ISO start or whole ISO */
+        part_type = 0xcd;
+        if (t->opts->iso_mbr_part_type >= 0 &&
+            t->opts->iso_mbr_part_type <= 255)
+            part_type= t->opts->iso_mbr_part_type;
+        if (will_have_gpt)
+            part_type = 0xee;
        ret = iso_quick_mbr_entry(t->mbr_req, &(t->mbr_req_count),
                                  will_have_gpt ? (uint64_t) 1 :
                                  ((uint64_t) t->opts->partition_offset) * 4,
-                                  (uint64_t) 0,
-                                  will_have_gpt ? 0xee : 0xcd, 0, 0);
+                                  (uint64_t) 0, part_type, 0, 0);
        if (ret < 0)
            return ret;
    }
    if (t->prep_part_size > 0) {
-        ret = iso_quick_mbr_entry(t->mbr_req, &(t->mbr_req_count),
-                                  ((uint64_t) t->curblock) * 4,
+        ret = iso_quick_mbr_entry(t->mbr_req, &(t->mbr_req_count), part_start,
                                  ((uint64_t) t->prep_part_size) * 4,
                                  0x41, 0, 0);
        if (ret < 0)
            return ret;
-        t->curblock += t->prep_part_size;
+        if (!keep) {
+            t->curblock += t->prep_part_size;
+            part_start = t->curblock * 4;
+        } else {
+            part_start += t->prep_part_size * 4;
+        }
+    } else {
+        part_start = t->curblock * 4;
    }
    if (t->prep_part_size > 0 || t->opts->fat) {
        /* FAT partition or protecting MBR entry for ISO end */
        ret = iso_quick_mbr_entry(t->mbr_req, &(t->mbr_req_count),
-                                  ((uint64_t) t->curblock) * 4, (uint64_t) 0,
+                                  part_start, (uint64_t) 0,
                                  t->opts->fat ? 0x0c : 0xcd, 0, 0);
        if (ret < 0)
            return ret;
--- a/libisofs/system_area.h
+++ b/libisofs/system_area.h
@ -182,10 +182,15 @@ int iso_quick_apm_entry(struct iso_apm_partition_request **req_array,
   run on other machines with the same process number at the same time.
 */

-/* Produces a weakly random variation of a hardcoded real random uuid
+/* Produces a GPT disk or partition GUID.
+   Pseudo-random by iso_generate_gpt_guid() if t->gpt_uuid_counter is 0.
+   Else derived reproducibly by counter number from t->gpt_uuid_base.
 */
-void iso_random_uuid(Ecma119Image *t, uint8_t uuid[16]);
+void iso_gpt_uuid(Ecma119Image *t, uint8_t uuid[16]);

+/* Mark a given byte string as UUID version 4, RFC 4122.
+*/
+void iso_mark_guid_version_4(uint8_t *u);

 /* The parameter struct for production of a single GPT entry.
   See also the partial GPT description in doc/boot_sectors.txt.
--- a/libisofs/util.c
+++ b/libisofs/util.c
@ -1823,7 +1823,7 @@ time_t iso_datetime_read_17(const uint8_t *buf)
    tm.tm_mon -= 1;
    tm.tm_isdst = 0;

-    return timegm(&tm) - ((int8_t)buf[6]) * 60 * 15;
+    return timegm(&tm) - ((int8_t)buf[16]) * 60 * 15;
 }

 /**
--- a/libisofs/writer.h
+++ b/libisofs/writer.h
@ -29,13 +29,13 @@ struct Iso_Image_Writer
 };

 /**
- * This is the function all Writers shoudl call to write data to image.
+ * This is the function all Writers should call to write data to image.
 * Currently, it is just a wrapper for write(2) Unix system call. 
 * 
 * It is implemented in ecma119.c
 * 
 * @return
- *      1 on sucess, < 0 error
+ *      1 on success, < 0 error
 */
 int iso_write(Ecma119Image *target, void *buf, size_t count);
Author	SHA1	Message	Date
Thomas Schmitt	bdfd4c4a37	Updated changelog.	2017-09-12 12:05:32 +02:00
Thomas Schmitt	dfc6de9f79	Version leap to 1.4.8.	2017-09-12 11:58:56 +02:00
Thomas Schmitt	7234425502	Updated changelog.	2017-09-12 11:51:16 +02:00
Thomas Schmitt	4e5a54c2f9	Swapped at recognition time the precendence of MBR properties "isohybrid" and "protective-msdos-label"	2017-09-09 16:36:43 +02:00
Thomas Schmitt	028f9275d3	Throw error if imported_iso interval would be overwritten by multi-session	2017-08-26 11:47:14 +02:00
Thomas Schmitt	cace41ec16	Enabled partition intervals with source "imported_iso" with ISO growing	2017-08-24 12:19:54 +02:00
Thomas Schmitt	e599a575dc	Closed a memory leak about RRIP CL following	2017-08-21 19:43:19 +02:00
Thomas Schmitt	78b0a7b111	Disallowed RRIP CL chaining in order to break any endless loops. Debian bug 872761. Thanks Jakub Wilk and American Fuzzy Lop.	2017-08-21 19:41:20 +02:00
Thomas Schmitt	a7152f5794	Correcting previous commit for supporting multi-session	2017-08-21 12:34:13 +02:00
Thomas Schmitt	2a64d89e6e	Refuse to read CE data blocks from after the end of ISO filesystem	2017-08-19 16:55:08 +02:00
Thomas Schmitt	31088d9acc	Avoid to read blocks from start of CE area which do not belong to the given file	2017-08-19 14:54:23 +02:00
Thomas Schmitt	91490d5f34	Preventing use of zero sized SUSP CE entry which causes SIGSEGV. Debian bug 872590. Thanks Jakub Wilk and American Fuzzy Lop.	2017-08-19 11:08:02 +02:00
Thomas Schmitt	661b68ce8c	Preventing buffer overflow with AAIP AL entry of insufficient size. Debian bug 872545. Thanks Jakub Wilk and American Fuzzy Lop.	2017-08-18 14:56:50 +02:00
Thomas Schmitt	16bde11076	Preventing memory leak caused by RRIP SL entry without PX entry that marks the file as symbolic link	2017-08-18 11:11:05 +02:00
Thomas Schmitt	36c8800ff3	Preventing buffer underread with empty RRIP SL component. Debian bug 872475. Thanks Jakub Wilk and American Fuzzy Lop.	2017-08-18 10:56:59 +02:00
Thomas Schmitt	860a91dd2f	Preventing NULL dereference if root directory bears a RRIP RE entry	2017-08-17 08:49:28 +02:00
Thomas Schmitt	280108d2d5	Updated change log	2017-08-14 18:08:48 +02:00
Thomas Schmitt	1e40ed3fab	Bug fix: Keeping and patching of loaded boot images failed. Regression by version 1.4.4.	2017-08-14 17:51:05 +02:00
Thomas Schmitt	e19a338a09	Re-added two empty lines which were lost by previous commit	2017-08-13 14:51:39 +02:00
Thomas Schmitt	c6e4035918	Added boot sector knowledge gained from Natalia Portillo	2017-08-13 13:34:53 +02:00
Thomas Schmitt	18ab6019bc	Let ISO size cover appended partitions if --protective-msdos-label or nonzero -partition_offset is given	2017-07-02 15:11:20 +02:00
Thomas Schmitt	6282bbc0bc	Bug fix: Bit 15 of iso_write_opts_set_system_area did not work with generic MBR	2017-06-29 23:06:07 +02:00
Thomas Schmitt	d7737e3ed5	Removed ban on reading El Torito platform ids other than 0 and 0xef	2017-06-03 20:23:54 +02:00
Thomas Schmitt	fb8697081b	Reacted on harmless compiler warning about uninitialized variable.	2017-04-25 12:11:33 +02:00
Thomas Schmitt	0e7300b1a8	Clarified meaning of MBR partition boot flag	2017-04-10 10:02:05 +02:00
Thomas Schmitt	94e4bfb42b	Adapted recognizing of partition offset to the changes of rev `afb10aa` / 1348	2017-04-09 20:58:45 +02:00
Thomas Schmitt	86f6ffc9c9	Let iso_mbr_part_type 0xee override ban on 0xee without GPT	2017-03-19 11:14:49 +01:00
Thomas Schmitt	5600f3d726	When deciding boot flag, consider MBR partition slot empty only if entirely 0	2017-02-27 18:27:59 +01:00
Thomas Schmitt	e66b9bfe0c	New API call iso_write_opts_set_iso_mbr_part_type()	2017-02-27 09:59:34 +01:00
Thomas Schmitt	094b3f7546	Updated copyright year in system_area.c	2017-01-24 13:00:11 +01:00
Thomas Schmitt	5c1c5cd964	Bug fix: Appended partitions of size >= 4 GiB led to abort with error message "FATAL : ISO overwrite". Thanks to Sven Haardiek.	2017-01-24 10:43:10 +01:00
Thomas Schmitt	215280448f	Bug fix: Protective MBR for GPT could emerge with boot flag set.	2017-01-03 12:54:54 +01:00
Thomas Schmitt	3043b5f660	Enabled recognition of partition offset of grub-mkrescue-sed.sh mode "gpt_appended"	2016-12-25 15:46:11 +01:00
Thomas Schmitt	afb10aac3b	Claiming full output size in first PVD if partition offset is non-zero	2016-12-25 10:05:26 +01:00
Thomas Schmitt	76181d0aa3	Restricted volume size of PVD with non-zero partition offset to filesystem size even if the first PVD claims the whole output size	2016-12-25 10:00:07 +01:00
Thomas Schmitt	8ec75eea6a	Bug fix: Non-SUSP data in System Use Area prevented image loading if Rock Ridge was enabled. Thanks to Jonathan Dowland.	2016-11-23 22:52:11 +01:00
Thomas Schmitt	01020ef544	Committed missing part of rev dc6cd94/1342	2016-11-23 22:07:21 +01:00
Thomas Schmitt	2961bdef9f	Updated change log	2016-11-13 10:20:24 +01:00
Thomas Schmitt	ed209e0b6e	Mentioned Vladimir Serbinenko in libisofs copyright list	2016-11-13 10:13:47 +01:00
Thomas Schmitt	dc6cd946ba	New API calls el_torito_set_full_load(), el_torito_get_full_load()	2016-11-13 10:05:18 +01:00
Thomas Schmitt	c51efce8d1	Bug fix: iso_read_opts_set_no_rockridge() did not prevent reading of root SUSP	2016-11-13 09:52:25 +01:00
Thomas Schmitt	8bf32d8d14	Prepared some of the documentation for move to dev.lovelyhq.com	2016-11-13 09:39:53 +01:00
Thomas Schmitt	561e2a6aaa	Version leap to 1.4.7	2016-09-16 20:58:19 +02:00
Thomas Schmitt	e7dd325ff6	Version leap to 1.4.6.	2016-09-16 11:45:12 +02:00
Thomas Schmitt	0447496710	Updated changelog.	2016-09-16 11:07:20 +02:00
Thomas Schmitt	496b8051c5	Bug fix: Interpretation of 17 digit timestamps was wrong.	2016-09-13 20:10:17 +02:00
Thomas Schmitt	63c074b0aa	Changed severity of ISO_FILE_TOO_BIG from WARNING to FAILURE.	2016-09-12 18:01:14 +02:00
Thomas Schmitt	2be47f9af8	Bug fix: SIGSEGV by NULL when a data file was larger than ISO level allows.	2016-09-12 17:58:13 +02:00
Thomas Schmitt	bf5678c6d4	Removed obsoleted doxygen.conf tags XML_SCHEMA, XML_DTD, SHOW_DIRECTORIES, HTML_ALIGN_MEMBERS. Corrected EXAMPLE_PATH. Corrected a few comments which caused valid doxygen complaints.	2016-08-29 17:00:32 +02:00
Thomas Schmitt	9d64318502	Corrected understanding of relation of RFC 4122 and UEFI GUID. Thanks Andrei Borzenkov.	2016-08-14 22:24:53 +02:00
Thomas Schmitt	866f647fad	New API calls iso_generate_gpt_guid() and +iso_write_opts_set_gpt_guid().	2016-08-12 18:18:47 +02:00
Thomas Schmitt	2f134dcdcb	Eased re-enabling of libtool --silent at bootstrap time	2016-08-11 12:08:18 +02:00
Thomas Schmitt	b14ee71d51	Setting El torito boot catalog file timestamps to Ecma119Image.now.	2016-08-07 21:11:08 +02:00
Thomas Schmitt	c5c9d4e7bf	Setting Ecma119Image.now to maximum of effective olume creation date and volume modification date.	2016-08-07 10:48:03 +02:00
Thomas Schmitt	6321ed4d97	Made isohybrid MBR id reproducible if vol_modification_time or vol_uuid are set	2016-08-05 20:59:17 +02:00
Thomas Schmitt	188e36178b	Reacted on some of the complaints of codespell	2016-07-22 16:03:51 +02:00
Thomas Schmitt	cbfa9afcf1	Treating OpenBSD like NetBSD. Thanks to SASANO Takayoshi.	2016-07-21 11:44:49 +02:00
Thomas Schmitt	cb519b3692	Reacted on compiler warning of Debian Sid. (By accident the wrong code was equivalent to the correct code.)	2016-07-03 18:06:40 +02:00
Thomas Schmitt	8407d9e936	Updated ChangeLog	2016-07-01 21:19:19 +02:00
Thomas Schmitt	d482eb4c96	Version leap to 1.4.5	2016-07-01 19:58:26 +02:00