diff --git a/libisofs/ecma119.c b/libisofs/ecma119.c
index e49ad8c..1dd2a58 100644
--- a/libisofs/ecma119.c
+++ b/libisofs/ecma119.c
@@ -1,9 +1,9 @@
 /*
  * Copyright (c) 2007 Vreixo Formoso
  * Copyright (c) 2007 Mario Danic
- * 
- * 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 as 
+ *
+ * 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 as
  * published by the Free Software Foundation. See COPYING file for details.
  */
 
@@ -90,10 +90,10 @@ 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
- * 
+ *
  * This also take into account the size needed for RR entries and
  * SUSP continuation areas (SUSP, 5.1).
- * 
+ *
  * @param ce
  *      Will be filled with the size needed for Continuation Areas
  * @return
@@ -131,10 +131,10 @@ size_t calc_dir_size(Ecma119Image *t, Ecma119Node *dir, size_t *ce)
             len += dirent_len;
         }
     }
-    
+
     /*
-     * The size of a dir is always a multiple of block size, as we must add 
-     * the size of the unused space after the last directory record 
+     * The size of a dir is always a multiple of block size, as we must add
+     * the size of the unused space after the last directory record
      * (ECMA-119, 6.8.1.3)
      */
     len = ROUND_UP(len, BLOCK_SIZE);
@@ -222,24 +222,26 @@ int ecma119_writer_compute_data_blocks(IsoImageWriter *writer)
 
 /**
  * Write a single directory record (ECMA-119, 9.1)
- * 
+ *
  * @param file_id
  *     if >= 0, we use it instead of the filename (for "." and ".." entries).
  * @param len_fi
  *     Computed length of the file identifier. Total size of the directory
  *     entry will be len + 33 + padding if needed (ECMA-119, 9.1.12)
  * @param info
- *     SUSP entries for the given directory record. It will be NULL for the 
- *     root directory record in the PVD (ECMA-119, 8.4.18) (in order to 
+ *     SUSP entries for the given directory record. It will be NULL for the
+ *     root directory record in the PVD (ECMA-119, 8.4.18) (in order to
  *     distinguish it from the "." entry in the root directory)
  */
 static
 void write_one_dir_record(Ecma119Image *t, Ecma119Node *node, int file_id,
-                          uint8_t *buf, size_t len_fi, struct susp_info *info)
+                          uint8_t *buf, size_t len_fi, struct susp_info *info,
+                          int extent)
 {
     uint32_t len;
     uint32_t block;
     uint8_t len_dr; /*< size of dir entry without SUSP fields */
+	int multi_extend = 0;
     uint8_t *name = (file_id >= 0) ? (uint8_t*)&file_id
             : (uint8_t*)node->iso_name;
 
@@ -260,12 +262,21 @@ void write_one_dir_record(Ecma119Image *t, Ecma119Node *node, int file_id,
         len = node->info.dir->len;
         block = node->info.dir->block;
     } else if (node->type == ECMA119_FILE) {
-        len = iso_file_src_get_size(node->info.file);
-        block = node->info.file->block;
+        off_t size = iso_file_src_get_size(node->info.file)
+                     - ((off_t)0xFFFFF800) * (off_t)extent; /* bytes in another extent */
+        if (size > (off_t) 0xffffffff) {
+            /* 2097151 is the number of blocks needed to store 4 GB - 2048 */
+            block = node->info.file->block + extent * 2097151;
+            len = 0xFFFFF800;
+            multi_extend = 1;
+        } else {
+            len = (uint32_t) size;
+            block = node->info.file->block;
+        }
     } else {
-        /* 
-         * for nodes other than files and dirs, we set both 
-         * len and block to 0 
+        /*
+         * for nodes other than files and dirs, we set both
+         * len and block to 0
          */
         len = 0;
         block = 0;
@@ -281,7 +292,7 @@ void write_one_dir_record(Ecma119Image *t, Ecma119Node *node, int file_id,
     iso_bb(rec->block, block, 4);
     iso_bb(rec->length, len, 4);
     iso_datetime_7(rec->recording_time, t->now, t->always_gmt);
-    rec->flags[0] = (node->type == ECMA119_DIR) ? 2 : 0;
+    rec->flags[0] = ((node->type == ECMA119_DIR) ? 2 : 0) | (multi_extend ? 0x80 : 0);
     iso_bb(rec->vol_seq_number, 1, 2);
     rec->len_fi[0] = len_fi;
 
@@ -365,7 +376,7 @@ int ecma119_writer_write_vol_desc(IsoImageWriter *writer)
     iso_lsb(vol.l_path_table_pos, t->l_path_table_pos, 4);
     iso_msb(vol.m_path_table_pos, t->m_path_table_pos, 4);
 
-    write_one_dir_record(t, t->root, 0, vol.root_dir_record, 1, NULL);
+    write_one_dir_record(t, t->root, 0, vol.root_dir_record, 1, NULL, 0);
 
     strncpy_pad((char*)vol.vol_set_id, volset_id, 128);
     strncpy_pad((char*)vol.publisher_id, pub_id, 128);
@@ -410,14 +421,14 @@ int write_one_dir(Ecma119Image *t, Ecma119Node *dir)
     /* initialize buffer with 0s */
     memset(buffer, 0, BLOCK_SIZE);
 
-    /* 
+    /*
      * set susp_info to 0's, this way code for both plain ECMA-119 and
      * RR is very similar
      */
     memset(&info, 0, sizeof(struct susp_info));
     if (t->rockridge) {
         /* initialize the ce_block, it might be needed */
-        info.ce_block = dir->info.dir->block + DIV_UP(dir->info.dir->len, 
+        info.ce_block = dir->info.dir->block + DIV_UP(dir->info.dir->len,
                                                       BLOCK_SIZE);
     }
 
@@ -429,7 +440,7 @@ int write_one_dir(Ecma119Image *t, Ecma119Node *dir)
         }
     }
     len = 34 + info.suf_len;
-    write_one_dir_record(t, dir, 0, buf, 1, &info);
+    write_one_dir_record(t, dir, 0, buf, 1, &info, 0);
     buf += len;
 
     if (t->rockridge) {
@@ -439,40 +450,57 @@ int write_one_dir(Ecma119Image *t, Ecma119Node *dir)
         }
     }
     len = 34 + info.suf_len;
-    write_one_dir_record(t, dir, 1, buf, 1, &info);
+    write_one_dir_record(t, dir, 1, buf, 1, &info, 0);
     buf += len;
 
     for (i = 0; i < dir->info.dir->nchildren; i++) {
         Ecma119Node *child = dir->info.dir->children[i];
 
-        /* compute len of directory entry */
-        fi_len = strlen(child->iso_name);
-        len = fi_len + 33 + (fi_len % 2 ? 0 : 1);
-        if (need_version_number(t, child)) {
-            len += 2;
-        }
+        int extent = 0;
+        do {
 
-        /* get the SUSP fields if rockridge is enabled */
-        if (t->rockridge) {
-            ret = rrip_get_susp_fields(t, child, 0, 255 - len, &info);
-            if (ret < 0) {
-                return ret;
+            /* compute len of directory entry */
+            fi_len = strlen(child->iso_name);
+            len = fi_len + 33 + (fi_len % 2 ? 0 : 1);
+            if (need_version_number(t, child)) {
+                len += 2;
             }
-            len += info.suf_len;
-        }
 
-        if ( (buf + len - buffer) > BLOCK_SIZE) {
-            /* dir doesn't fit in current block */
-            ret = iso_write(t, buffer, BLOCK_SIZE);
-            if (ret < 0) {
-                return ret;
+            /* get the SUSP fields if rockridge is enabled */
+            if (t->rockridge) {
+                ret = rrip_get_susp_fields(t, child, 0, 255 - len, &info);
+                if (ret < 0) {
+                    return ret;
+                }
+                len += info.suf_len;
             }
-            memset(buffer, 0, BLOCK_SIZE);
-            buf = buffer;
-        }
-        /* write the directory entry in any case */
-        write_one_dir_record(t, child, -1, buf, fi_len, &info);
-        buf += len;
+
+            if ( (buf + len - buffer) > BLOCK_SIZE) {
+                /* dir doesn't fit in current block */
+                ret = iso_write(t, buffer, BLOCK_SIZE);
+                if (ret < 0) {
+                    return ret;
+                }
+                memset(buffer, 0, BLOCK_SIZE);
+                buf = buffer;
+            }
+            /* write the directory entry in any case */
+            write_one_dir_record(t, child, -1, buf, fi_len, &info, extent);
+            buf += len;
+
+            if (child->type == ECMA119_FILE) {
+                /* check if file is too big and need more extents */
+                off_t size = iso_file_src_get_size(child->info.file)
+                             - ((off_t)0xFFFFF800) * (off_t)extent;
+                if (size > (off_t) 0xffffffff) {
+                    extent++;
+                } else {
+                    break;
+                }
+            } else {
+                break; /* we only have a single extent */
+            }
+        } while(1); /* loop for each extend */
     }
 
     /* write the last block */
@@ -709,7 +737,7 @@ int pad_writer_write_data(IsoImageWriter *writer)
         return ISO_ASSERT_FAILURE;
     }
     t = writer->target;
-    
+
     if (t->pad_blocks == 0) {
         return ISO_SUCCESS;
     }
@@ -820,7 +848,7 @@ void *write_function(void *arg)
         iso_msg_submit(target->image->id, ISO_IMAGE_WRITE_CANCELED, 0, NULL);
     } else {
         /* image write error */
-        iso_msg_submit(target->image->id, ISO_WRITE_ERROR, res, 
+        iso_msg_submit(target->image->id, ISO_WRITE_ERROR, res,
                    "Image write error");
     }
     iso_ring_buffer_writer_close(target->buffer, 1);
@@ -855,7 +883,7 @@ int ecma119_image_new(IsoImage *src, IsoWriteOpts *opts, Ecma119Image **img)
     target->iso1999 = opts->iso1999;
     target->always_gmt = opts->always_gmt;
     target->ino = 0;
-    target->omit_version_numbers = opts->omit_version_numbers 
+    target->omit_version_numbers = opts->omit_version_numbers
                                  | opts->max_37_char_filenames;
     target->allow_deep_paths = opts->allow_deep_paths;
     target->allow_longer_paths = opts->allow_longer_paths;
@@ -882,7 +910,7 @@ int ecma119_image_new(IsoImage *src, IsoWriteOpts *opts, Ecma119Image **img)
     target->appendable = opts->appendable;
 
     target->replace_timestamps = opts->replace_timestamps ? 1 : 0;
-    target->timestamp = opts->replace_timestamps == 2 ? 
+    target->timestamp = opts->replace_timestamps == 2 ?
                         opts->timestamp : target->now;
 
     /* el-torito? */
@@ -909,10 +937,10 @@ int ecma119_image_new(IsoImage *src, IsoWriteOpts *opts, Ecma119Image **img)
         return ISO_OUT_OF_MEM;
     }
 
-    /* 
+    /*
      * 2. Based on those options, create needed writers: iso, joliet...
      * Each writer inits its structures and stores needed info into
-     * target. 
+     * target.
      * If the writer needs an volume descriptor, it increments image
      * current block.
      * Finally, create Writer for files.
@@ -944,7 +972,7 @@ int ecma119_image_new(IsoImage *src, IsoWriteOpts *opts, Ecma119Image **img)
     if (ret < 0) {
         goto target_cleanup;
     }
-    
+
     /* create writer for El-Torito */
     if (target->eltorito) {
         ret = eltorito_writer_create(target);
@@ -952,7 +980,7 @@ int ecma119_image_new(IsoImage *src, IsoWriteOpts *opts, Ecma119Image **img)
             goto target_cleanup;
         }
     }
-    
+
     /* create writer for Joliet structure */
     if (target->joliet) {
         ret = joliet_writer_create(target);
@@ -960,7 +988,7 @@ int ecma119_image_new(IsoImage *src, IsoWriteOpts *opts, Ecma119Image **img)
             goto target_cleanup;
         }
     }
-    
+
     /* create writer for ISO 9660:1999 structure */
     if (target->iso1999) {
         ret = iso1999_writer_create(target);
@@ -970,11 +998,11 @@ int ecma119_image_new(IsoImage *src, IsoWriteOpts *opts, Ecma119Image **img)
     }
 
     voldesc_size = target->curblock - target->ms_block - 16;
-    
+
     /* Volume Descriptor Set Terminator */
     target->curblock++;
 
-    /* 
+    /*
      * Create the writer for possible padding to ensure that in case of image
      * growing we can safety overwrite the first 64 KiB of image.
      */
@@ -990,7 +1018,7 @@ int ecma119_image_new(IsoImage *src, IsoWriteOpts *opts, Ecma119Image **img)
     }
 
     /*
-     * 3. 
+     * 3.
      * Call compute_data_blocks() in each Writer.
      * That function computes the size needed by its structures and
      * increments image current block propertly.
@@ -1130,14 +1158,14 @@ static void bs_free_data(struct burn_source *bs)
     if (st < 4) {
         /* forces writer to stop if it is still running */
         iso_ring_buffer_reader_close(target->buffer, 0);
-    
+
         /* wait until writer thread finishes */
         pthread_join(target->wthread, NULL);
         iso_msg_debug(target->image->id, "Writer thread joined");
     }
-    
-    iso_msg_debug(target->image->id, 
-                  "Ring buffer was %d times full and %d times empty", 
+
+    iso_msg_debug(target->image->id,
+                  "Ring buffer was %d times full and %d times empty",
                   iso_ring_buffer_get_times_full(target->buffer),
                   iso_ring_buffer_get_times_empty(target->buffer));
 
@@ -1153,9 +1181,9 @@ int bs_cancel(struct burn_source *bs)
     Ecma119Image *target = (Ecma119Image*)bs->data;
 
     st = iso_ring_buffer_get_status(bs, &cap, &free);
-    
+
     if (free == cap && (st == 2 || st == 3)) {
-        /* image was already consumed */ 
+        /* image was already consumed */
         iso_ring_buffer_reader_close(target->buffer, 0);
     } else {
         iso_msg_debug(target->image->id, "Reader thread being cancelled");
@@ -1176,7 +1204,7 @@ int bs_set_size(struct burn_source *bs, off_t size)
 {
     Ecma119Image *target = (Ecma119Image*)bs->data;
 
-    /* 
+    /*
      * just set the value to be returned by get_size. This is not used at
      * all by libisofs, it is here just for helping libburn to correctly pad
      * the image if needed.
@@ -1235,12 +1263,12 @@ int iso_write(Ecma119Image *target, void *buf, size_t count)
     if (ret > 0 && (target->total_size != (off_t) 0)){
         unsigned int kbw, kbt;
         int percent;
-        
+
         target->bytes_written += (off_t) count;
         kbw = (unsigned int) (target->bytes_written >> 10);
         kbt = (unsigned int) (target->total_size >> 10);
         percent = (kbw * 100) / kbt;
-        
+
         /* only report in 5% chunks */
         if (percent >= target->percent_written + 5) {
             iso_msg_debug(target->image->id, "Processed %u of %u KB (%d %%)",
@@ -1248,26 +1276,26 @@ int iso_write(Ecma119Image *target, void *buf, size_t count)
             target->percent_written = percent;
         }
     }
-    
+
     return ret;
 }
 
 int iso_write_opts_new(IsoWriteOpts **opts, int profile)
 {
     IsoWriteOpts *wopts;
-    
+
     if (opts == NULL) {
         return ISO_NULL_POINTER;
     }
     if (profile < 0 || profile > 2) {
         return ISO_WRONG_ARG_VALUE;
     }
-    
+
     wopts = calloc(1, sizeof(IsoWriteOpts));
     if (wopts == NULL) {
         return ISO_OUT_OF_MEM;
     }
-    
+
     switch (profile) {
     case 0:
         wopts->level = 1;
@@ -1305,7 +1333,7 @@ void iso_write_opts_free(IsoWriteOpts *opts)
     if (opts == NULL) {
         return;
     }
-    
+
     free(opts->output_charset);
     free(opts);
 }
@@ -1315,7 +1343,7 @@ int iso_write_opts_set_iso_level(IsoWriteOpts *opts, int level)
     if (opts == NULL) {
         return ISO_NULL_POINTER;
     }
-    if (level != 1 && level != 2) {
+    if (level != 1 && level != 2 && level != 3) {
         return ISO_WRONG_ARG_VALUE;
     }
     opts->level = level;
diff --git a/libisofs/ecma119_tree.c b/libisofs/ecma119_tree.c
index 943fa0a..a787d7c 100644
--- a/libisofs/ecma119_tree.c
+++ b/libisofs/ecma119_tree.c
@@ -1,8 +1,8 @@
 /*
  * Copyright (c) 2007 Vreixo Formoso
- * 
- * 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 as 
+ *
+ * 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 as
  * published by the Free Software Foundation. See COPYING file for details.
  */
 
@@ -61,18 +61,18 @@ int get_iso_name(Ecma119Image *img, IsoNode *iso, char **name)
         }
     } else {
         if (img->max_37_char_filenames) {
-            isoname = iso_r_fileid(ascii_name, 36, relaxed, 
+            isoname = iso_r_fileid(ascii_name, 36, relaxed,
                                    img->no_force_dots ? 0 : 1);
         } else if (img->iso_level == 1) {
             if (relaxed) {
-                isoname = iso_r_fileid(ascii_name, 11, relaxed, 
+                isoname = iso_r_fileid(ascii_name, 11, relaxed,
                                        img->no_force_dots ? 0 : 1);
             } else {
                 isoname = iso_1_fileid(ascii_name);
             }
         } else {
             if (relaxed) {
-                isoname = iso_r_fileid(ascii_name, 30, relaxed, 
+                isoname = iso_r_fileid(ascii_name, 30, relaxed,
                                        img->no_force_dots ? 0 : 1);
             } else {
                 isoname = iso_2_fileid(ascii_name);
@@ -84,7 +84,7 @@ int get_iso_name(Ecma119Image *img, IsoNode *iso, char **name)
         *name = isoname;
         return ISO_SUCCESS;
     } else {
-        /* 
+        /*
          * only possible if mem error, as check for empty names is done
          * in public tree
          */
@@ -129,7 +129,7 @@ int create_dir(Ecma119Image *img, IsoDir *iso, Ecma119Node **node)
     if (children == NULL) {
         return ISO_OUT_OF_MEM;
     }
-    
+
     dir_info = calloc(1, sizeof(struct ecma119_dir_info));
     if (dir_info == NULL) {
         free(children);
@@ -161,7 +161,7 @@ int create_file(Ecma119Image *img, IsoFile *iso, Ecma119Node **node)
     off_t size;
 
     size = iso_stream_get_size(iso->stream);
-    if (size > (off_t)0xffffffff) {
+    if (size > (off_t)0xffffffff && img->iso_level != 3) {
         return iso_msg_submit(img->image->id, ISO_FILE_TOO_BIG, 0,
                               "File \"%s\" can't be added to image because "
                               "is greater than 4GB", iso->node.name);
@@ -174,9 +174,9 @@ int create_file(Ecma119Image *img, IsoFile *iso, Ecma119Node **node)
 
     ret = create_ecma119_node(img, (IsoNode*)iso, node);
     if (ret < 0) {
-        /* 
+        /*
          * the src doesn't need to be freed, it is free together with
-         * the Ecma119Image 
+         * the Ecma119Image
          */
         return ret;
     }
@@ -203,9 +203,9 @@ int create_boot_cat(Ecma119Image *img, IsoBoot *iso, Ecma119Node **node)
 
     ret = create_ecma119_node(img, (IsoNode*)iso, node);
     if (ret < 0) {
-        /* 
+        /*
          * the src doesn't need to be freed, it is free together with
-         * the Ecma119Image 
+         * the Ecma119Image
          */
         return ret;
     }
@@ -267,10 +267,10 @@ void ecma119_node_free(Ecma119Node *node)
 }
 
 /**
- * 
- * @return 
+ *
+ * @return
  *      1 success, 0 node ignored,  < 0 error
- * 
+ *
  */
 static
 int create_tree(Ecma119Image *image, IsoNode *iso, Ecma119Node **tree,
@@ -318,7 +318,7 @@ int create_tree(Ecma119Image *image, IsoNode *iso, Ecma119Node **tree,
         } else {
             /* symlinks are only supported when RR is enabled */
             ret = iso_msg_submit(image->image->id, ISO_FILE_IGNORED, 0,
-                "File \"%s\" ignored. Symlinks need RockRidge extensions.", 
+                "File \"%s\" ignored. Symlinks need RockRidge extensions.",
                 iso->name);
         }
         break;
@@ -328,7 +328,7 @@ int create_tree(Ecma119Image *image, IsoNode *iso, Ecma119Node **tree,
         } else {
             /* symlinks are only supported when RR is enabled */
             ret = iso_msg_submit(image->image->id, ISO_FILE_IGNORED, 0,
-                "File \"%s\" ignored. Special files need RockRidge extensions.", 
+                "File \"%s\" ignored. Special files need RockRidge extensions.",
                 iso->name);
         }
         break;
@@ -338,7 +338,7 @@ int create_tree(Ecma119Image *image, IsoNode *iso, Ecma119Node **tree,
         } else {
             /* log and ignore */
             ret = iso_msg_submit(image->image->id, ISO_FILE_IGNORED, 0,
-                "El-Torito catalog found on a image without El-Torito.", 
+                "El-Torito catalog found on a image without El-Torito.",
                 iso->name);
         }
         break;
@@ -430,9 +430,9 @@ int mangle_single_dir(Ecma119Image *img, Ecma119Node *dir, int max_file_len,
 
     nchildren = dir->info.dir->nchildren;
     children = dir->info.dir->children;
-    
+
     /* a hash table will temporary hold the names, for fast searching */
-    ret = iso_htable_create((nchildren * 100) / 80, iso_str_hash, 
+    ret = iso_htable_create((nchildren * 100) / 80, iso_str_hash,
                             (compare_function_t)strcmp, &table);
     if (ret < 0) {
         return ret;
@@ -463,7 +463,7 @@ int mangle_single_dir(Ecma119Image *img, Ecma119Node *dir, int max_file_len,
         }
 
         /*
-         * A max of 7 characters is good enought, it allows handling up to 
+         * A max of 7 characters is good enought, it allows handling up to
          * 9,999,999 files with same name. We can increment this to
          * max_name_len, but the int_pow() function must then be modified
          * to return a bigger integer.
@@ -480,8 +480,8 @@ int mangle_single_dir(Ecma119Image *img, Ecma119Node *dir, int max_file_len,
             dot = strrchr(full_name, '.');
             if (dot != NULL && children[i]->type != ECMA119_DIR) {
 
-                /* 
-                 * File (not dir) with extension 
+                /*
+                 * File (not dir) with extension
                  * Note that we don't need to check for placeholders, as
                  * tree reparent happens later, so no placeholders can be
                  * here at this time.
@@ -491,26 +491,26 @@ int mangle_single_dir(Ecma119Image *img, Ecma119Node *dir, int max_file_len,
                 name = full_name;
                 ext = dot + 1;
 
-                /* 
+                /*
                  * For iso level 1 we force ext len to be 3, as name
-                 * can't grow on the extension space 
+                 * can't grow on the extension space
                  */
                 extlen = (max_file_len == 12) ? 3 : strlen(ext);
                 max = max_file_len - extlen - 1 - digits;
                 if (max <= 0) {
                     /* this can happen if extension is too long */
                     if (extlen + max > 3) {
-                        /* 
+                        /*
                          * reduce extension len, to give name an extra char
-                         * note that max is negative or 0 
+                         * note that max is negative or 0
                          */
                         extlen = extlen + max - 1;
                         ext[extlen] = '\0';
                         max = max_file_len - extlen - 1 - digits;
                     } else {
-                        /* 
+                        /*
                          * error, we don't support extensions < 3
-                         * This can't happen with current limit of digits. 
+                         * This can't happen with current limit of digits.
                          */
                         ret = ISO_ERROR;
                         goto mangle_cleanup;
@@ -572,7 +572,7 @@ int mangle_single_dir(Ecma119Image *img, Ecma119Node *dir, int max_file_len,
                     children[k]->iso_name = new;
                     iso_htable_add(table, new, new);
 
-                    /* 
+                    /*
                      * if we change a name we need to sort again children
                      * at the end
                      */
@@ -603,7 +603,7 @@ int mangle_single_dir(Ecma119Image *img, Ecma119Node *dir, int max_file_len,
     }
 
     ret = ISO_SUCCESS;
-    
+
 mangle_cleanup : ;
     iso_htable_destroy(table, NULL);
     return ret;
@@ -658,7 +658,7 @@ int mangle_tree(Ecma119Image *img, int recurse)
 /**
  * Create a new ECMA-119 node representing a placeholder for a relocated
  * dir.
- * 
+ *
  * See IEEE P1282, section 4.1.5 for details
  */
 static
@@ -672,10 +672,10 @@ int create_placeholder(Ecma119Node *parent, Ecma119Node *real,
         return ISO_OUT_OF_MEM;
     }
 
-    /* 
+    /*
      * TODO
-     * If real is a dir, while placeholder is a file, ISO name restricctions 
-     * are different, what to do? 
+     * If real is a dir, while placeholder is a file, ISO name restricctions
+     * are different, what to do?
      */
     ret->iso_name = strdup(real->iso_name);
     if (ret->iso_name == NULL) {
@@ -708,10 +708,10 @@ size_t max_child_name_len(Ecma119Node *dir)
 }
 
 /**
- * Relocates a directory, as specified in Rock Ridge Specification 
+ * Relocates a directory, as specified in Rock Ridge Specification
  * (see IEEE P1282, section 4.1.5). This is needed when the number of levels
  * on a directory hierarchy exceeds 8, or the length of a path is higher
- * than 255 characters, as specified in ECMA-119, section 6.8.2.1 
+ * than 255 characters, as specified in ECMA-119, section 6.8.2.1
  */
 static
 int reparent(Ecma119Node *child, Ecma119Node *parent)
@@ -743,7 +743,7 @@ int reparent(Ecma119Node *child, Ecma119Node *parent)
     /* add the child to its new parent */
     child->parent = parent;
     parent->info.dir->nchildren++;
-    parent->info.dir->children = realloc(parent->info.dir->children, 
+    parent->info.dir->children = realloc(parent->info.dir->children,
                                  sizeof(void*) * parent->info.dir->nchildren);
     parent->info.dir->children[parent->info.dir->nchildren - 1] = child;
     return ISO_SUCCESS;
@@ -754,7 +754,7 @@ int reparent(Ecma119Node *child, Ecma119Node *parent)
  *  - the depth is at most 8
  *  - each path length is at most 255 characters
  * This restriction is imposed by ECMA-119 specification (ECMA-119, 6.8.2.1).
- * 
+ *
  * @param dir
  *      Dir we are currently processing
  * @param level
@@ -778,9 +778,9 @@ int reorder_tree(Ecma119Image *img, Ecma119Node *dir, int level, int pathlen)
             return ret;
         }
 
-        /* 
+        /*
          * we are appended to the root's children now, so there is no
-         * need to recurse (the root will hit us again) 
+         * need to recurse (the root will hit us again)
          */
     } else {
         size_t i;
@@ -831,7 +831,7 @@ int ecma119_tree_create(Ecma119Image *img)
             return ret;
         }
 
-        /* 
+        /*
          * and we need to remangle the root directory, as the function
          * above could insert new directories into the root.
          * Note that recurse = 0, as we don't need to recurse.
diff --git a/libisofs/filesrc.c b/libisofs/filesrc.c
index 2c57ce5..32a1e25 100644
--- a/libisofs/filesrc.c
+++ b/libisofs/filesrc.c
@@ -1,8 +1,8 @@
 /*
  * Copyright (c) 2007 Vreixo Formoso
- * 
- * 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 as 
+ *
+ * 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 as
  * published by the Free Software Foundation. See COPYING file for details.
  */
 
@@ -84,12 +84,12 @@ int iso_file_src_create(Ecma119Image *img, IsoFile *file, IsoFileSrc **src)
 
 /**
  * Add a given IsoFileSrc to the given image target.
- * 
- * The IsoFileSrc will be cached in a tree to prevent the same file for 
+ *
+ * The IsoFileSrc will be cached in a tree to prevent the same file for
  * being written several times to image. If you call again this function
  * with a node that refers to the same source file, the previously
  * created one will be returned.
- * 
+ *
  * @param img
  *      The image where this file is to be written
  * @param new
@@ -97,7 +97,7 @@ int iso_file_src_create(Ecma119Image *img, IsoFile *file, IsoFileSrc **src)
  * @param src
  *      Will be filled with a pointer to the IsoFileSrc really present in
  *      the tree. It could be different than new if the same file already
- *      exists in the tree. 
+ *      exists in the tree.
  * @return
  *      1 on success, 0 if file already exists on tree, < 0 error
  */
@@ -108,7 +108,7 @@ int iso_file_src_add(Ecma119Image *img, IsoFileSrc *new, IsoFileSrc **src)
     if (img == NULL || new == NULL || src == NULL) {
         return ISO_NULL_POINTER;
     }
-    
+
     /* insert the filesrc in the tree */
     ret = iso_rbtree_insert(img->files, new, (void**)src);
     return ret;
@@ -160,7 +160,7 @@ int filesrc_writer_compute_data_blocks(IsoImageWriter *writer)
     } else {
         inc_item = NULL;
     }
-    
+
     /* store the filesrcs in a array */
     filelist = (IsoFileSrc**)iso_rbtree_to_array(t->files, inc_item, &size);
     if (filelist == NULL) {
@@ -259,22 +259,17 @@ int filesrc_writer_write_data(IsoImageWriter *writer)
     i = 0;
     while ((file = filelist[i++]) != NULL) {
 
-        /*
-         * TODO WARNING
-         * when we allow files greater than 4GB, current DIV_UP implementation
-         * can overflow!!
-         */
         uint32_t nblocks = DIV_UP(iso_file_src_get_size(file), BLOCK_SIZE);
 
         res = filesrc_open(file);
         iso_stream_get_file_name(file->stream, name);
         if (res < 0) {
-            /* 
+            /*
              * UPS, very ugly error, the best we can do is just to write
              * 0's to image
              */
             iso_report_errfile(name, ISO_FILE_CANT_WRITE, 0, 0);
-            res = iso_msg_submit(t->image->id, ISO_FILE_CANT_WRITE, res, 
+            res = iso_msg_submit(t->image->id, ISO_FILE_CANT_WRITE, res,
                       "File \"%s\" can't be opened. Filling with 0s.", name);
             if (res < 0) {
                 return res; /* aborted due to error severity */
@@ -290,7 +285,7 @@ int filesrc_writer_write_data(IsoImageWriter *writer)
             continue;
         } else if (res > 1) {
             iso_report_errfile(name, ISO_FILE_CANT_WRITE, 0, 0);
-            res = iso_msg_submit(t->image->id, ISO_FILE_CANT_WRITE, 0, 
+            res = iso_msg_submit(t->image->id, ISO_FILE_CANT_WRITE, 0,
                       "Size of file \"%s\" has changed. It will be %s", name,
                       (res == 2 ? "truncated" : "padded with 0's"));
             if (res < 0) {
@@ -338,7 +333,7 @@ int filesrc_writer_write_data(IsoImageWriter *writer)
             if (res < 0) {
                 return res; /* aborted due error severity */
             }
-            
+
             /* fill with 0s */
             iso_msg_submit(t->image->id, ISO_FILE_CANT_WRITE, 0,
                            "Filling with 0");
diff --git a/libisofs/libisofs.h b/libisofs/libisofs.h
index 6c827c0..3a32744 100644
--- a/libisofs/libisofs.h
+++ b/libisofs/libisofs.h
@@ -1,8 +1,8 @@
 /*
  * Copyright (c) 2007-2008 Vreixo Formoso, Mario Danic
- * 
- * 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 as 
+ *
+ * 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 as
  * published by the Free Software Foundation. See COPYING file for details.
  */
 #ifndef LIBISO_LIBISOFS_H_
@@ -24,8 +24,8 @@ 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 
+ *
+ * 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
  * are provided, see below.
  *
@@ -58,7 +58,7 @@ typedef struct Iso_Symlink IsoSymlink;
 typedef struct Iso_File IsoFile;
 
 /**
- * An special file in the iso tree. This is used to represent any POSIX file 
+ * An special file in the iso tree. This is used to represent any POSIX file
  * other that regular files, directories or symlinks, i.e.: socket, block and
  * character devices, and fifos.
  * It is an special type of IsoNode and can be casted to it in any case.
@@ -69,11 +69,11 @@ typedef struct Iso_Special IsoSpecial;
 
 /**
  * The type of an IsoNode.
- * 
+ *
  * When an user gets an IsoNode from an image, (s)he can use
  * iso_node_get_type() to get the current type of the node, and then
  * cast to the appropriate subtype. For example:
- * 
+ *
  * ...
  * IsoNode *node;
  * res = iso_dir_iter_next(iter, &node);
@@ -132,7 +132,7 @@ typedef struct Iso_Boot IsoBoot;
 
 /**
  * Flag used to hide a file in the RR/ISO or Joliet tree.
- * 
+ *
  * @see iso_node_set_hidden
  * @since 0.6.2
  */
@@ -165,7 +165,7 @@ enum eltorito_boot_media_type {
  */
 enum iso_replace_mode {
     /**
-     * Never replace an existing node, and instead fail with 
+     * Never replace an existing node, and instead fail with
      * ISO_NODE_NAME_NOT_UNIQUE.
      */
     ISO_REPLACE_NEVER,
@@ -208,7 +208,7 @@ typedef struct iso_read_opts IsoReadOpts;
 
 /**
  * Source for image reading.
- * 
+ *
  * @see struct iso_data_source
  * @since 0.6.2
  */
@@ -216,14 +216,14 @@ typedef struct iso_data_source IsoDataSource;
 
 /**
  * Data source used by libisofs for reading an existing image.
- * 
+ *
  * It offers homogeneous read access to arbitrary blocks to different sources
- * for images, such as .iso files, CD/DVD drives, etc... 
- * 
+ * for images, such as .iso files, CD/DVD drives, etc...
+ *
  * To create a multisession image, libisofs needs a IsoDataSource, that the
- * user must provide. The function iso_data_source_new_from_file() constructs 
- * an IsoDataSource that uses POSIX I/O functions to access data. You can use 
- * it with regular .iso images, and also with block devices that represent a 
+ * user must provide. The function iso_data_source_new_from_file() constructs
+ * an IsoDataSource that uses POSIX I/O functions to access data. You can use
+ * it with regular .iso images, and also with block devices that represent a
  * drive.
  *
  * @since 0.6.2
@@ -234,7 +234,7 @@ struct iso_data_source
     /* reserved for future usage, set to 0 */
     int version;
 
-    /** 
+    /**
      * Reference count for the data source. Should be 1 when a new source
      * is created. Don't access it directly, but with iso_data_source_ref()
      * and iso_data_source_unref() functions.
@@ -243,9 +243,9 @@ struct iso_data_source
 
     /**
      * Opens the given source. You must open() the source before any attempt
-     * to read data from it. The open is the right place for grabbing the 
+     * to read data from it. The open is the right place for grabbing the
      * underlying resources.
-     * 
+     *
      * @return
      *      1 if success, < 0 on error
      */
@@ -254,28 +254,28 @@ struct iso_data_source
     /**
      * Close a given source, freeing all system resources previously grabbed in
      * open().
-     * 
+     *
      * @return
      *      1 if success, < 0 on error
      */
     int (*close)(IsoDataSource *src);
 
-    /** 
+    /**
      * Read an arbitrary block (2048 bytes) of data from the source.
-     * 
-     * @param lba 
+     *
+     * @param lba
      *     Block to be read.
-     * @param buffer 
-     *     Buffer where the data will be written. It should have at least 
+     * @param buffer
+     *     Buffer where the data will be written. It should have at least
      *     2048 bytes.
      * @return
      *      1 if success, < 0 on error
      */
     int (*read_block)(IsoDataSource *src, uint32_t lba, uint8_t *buffer);
 
-    /** 
+    /**
      * Clean up the source specific data. Never call this directly, it is
-     * automatically called by iso_data_source_unref() when refcount reach 
+     * automatically called by iso_data_source_unref() when refcount reach
      * 0.
      */
     void (*free_data)(IsoDataSource *);
@@ -296,7 +296,7 @@ typedef struct iso_read_image_features IsoReadImageFeatures;
 
 /**
  * POSIX abstraction for source files.
- * 
+ *
  * @see struct iso_file_source
  * @since 0.6.2
  */
@@ -304,16 +304,16 @@ typedef struct iso_file_source IsoFileSource;
 
 /**
  * Abstract for source filesystems.
- * 
+ *
  * @see struct iso_filesystem
  * @since 0.6.2
  */
 typedef struct iso_filesystem IsoFilesystem;
 
 /**
- * Interface that defines the operations (methods) available for an 
+ * Interface that defines the operations (methods) available for an
  * IsoFileSource.
- * 
+ *
  * @see struct IsoFileSource_Iface
  * @since 0.6.2
  */
@@ -321,7 +321,7 @@ typedef struct IsoFileSource_Iface IsoFileSourceIface;
 
 /**
  * IsoFilesystem implementation to deal with ISO images, and to offer a way to
- * access specific information of the image, such as several volume attributes, 
+ * access specific information of the image, such as several volume attributes,
  * extensions being used, El-Torito artifacts...
  *
  * @since 0.6.2
@@ -335,10 +335,10 @@ typedef IsoFilesystem IsoImageFilesystem;
 extern unsigned int iso_fs_global_id;
 
 /**
- * An IsoFilesystem is a handler for a source of files, or a "filesystem". 
- * That is defined as a set of files that are organized in a hierarchical 
- * structure. 
- * 
+ * An IsoFilesystem is a handler for a source of files, or a "filesystem".
+ * That is defined as a set of files that are organized in a hierarchical
+ * structure.
+ *
  * A filesystem allows libisofs to access files from several sources in
  * an homogeneous way, thus abstracting the underlying operations needed to
  * access and read file contents. Note that this doesn't need to be tied
@@ -347,7 +347,7 @@ extern unsigned int iso_fs_global_id;
  * using standard Linux functions. It is also legal, of course, to implement
  * an IsoFilesystem to deal with a specific filesystem over raw partitions.
  * That is what we do, for example, to access an ISO Image.
- * 
+ *
  * Each file inside an IsoFilesystem is represented as an IsoFileSource object,
  * that defines POSIX-like interface for accessing files.
  *
@@ -356,7 +356,7 @@ extern unsigned int iso_fs_global_id;
 struct iso_filesystem
 {
     /**
-     * Type of filesystem. 
+     * Type of filesystem.
      * "file" -> local filesystem
      * "iso " -> iso image filesystem
      */
@@ -367,7 +367,7 @@ struct iso_filesystem
 
     /**
      * Get the root of a filesystem.
-     * 
+     *
      * @return
      *    1 on success, < 0 on error
      */
@@ -375,7 +375,7 @@ struct iso_filesystem
 
     /**
      * Retrieve a file from its absolute path inside the filesystem.
-     * 
+     *
      * @return
      *     1 success, < 0 error
      *      Error codes:
@@ -390,15 +390,15 @@ struct iso_filesystem
                        IsoFileSource **file);
 
     /**
-     * Get filesystem identifier. 
-     * 
+     * Get filesystem identifier.
+     *
      * If the filesystem is able to generate correct values of the st_dev
      * and st_ino fields for the struct stat of each file, this should
-     * return an unique number, greater than 0. 
-     * 
-     * To get a identifier for your filesystem implementation you should 
+     * return an unique number, greater than 0.
+     *
+     * To get a identifier for your filesystem implementation you should
      * use iso_fs_global_id, incrementing it by one each time.
-     * 
+     *
      * Otherwise, if you can't ensure values in the struct stat are valid,
      * this should return 0.
      */
@@ -406,21 +406,21 @@ struct iso_filesystem
 
     /**
      * Opens the filesystem for several read operations. Calling this funcion
-     * is not needed at all, each time that the underlying system resource 
-     * needs to be accessed, it is openned propertly. 
-     * However, if you plan to execute several operations on the filesystem, 
-     * it is a good idea to open it previously, to prevent several open/close 
-     * operations to occur. 
-     * 
+     * is not needed at all, each time that the underlying system resource
+     * needs to be accessed, it is openned propertly.
+     * However, if you plan to execute several operations on the filesystem,
+     * it is a good idea to open it previously, to prevent several open/close
+     * operations to occur.
+     *
      * @return 1 on success, < 0 on error
      */
     int (*open)(IsoFilesystem *fs);
 
     /**
-     * Close the filesystem, thus freeing all system resources. You should 
+     * Close the filesystem, thus freeing all system resources. You should
      * call this function if you have previously open() it.
      * Note that you can open()/close() a filesystem several times.
-     * 
+     *
      * @return 1 on success, < 0 on error
      */
     int (*close)(IsoFilesystem *fs);
@@ -449,16 +449,16 @@ struct IsoFileSource_Iface
 
     /**
      * Get the path, relative to the filesystem this file source belongs to.
-     * 
+     *
      * @return
-     *     the path of the FileSource inside the filesystem, it should be 
+     *     the path of the FileSource inside the filesystem, it should be
      *     freed when no more needed.
      */
     char* (*get_path)(IsoFileSource *src);
 
     /**
-     * Get the name of the file, with the dir component of the path. 
-     * 
+     * Get the name of the file, with the dir component of the path.
+     *
      * @return
      *     the name of the file, it should be freed when no more needed.
      */
@@ -466,7 +466,7 @@ struct IsoFileSource_Iface
 
     /**
      * Get information about the file. It is equivalent to lstat(2).
-     * 
+     *
      * @return
      *    1 success, < 0 error
      *      Error codes:
@@ -482,7 +482,7 @@ struct IsoFileSource_Iface
     /**
      * Get information about the file. If the file is a symlink, the info
      * returned refers to the destination. It is equivalent to stat(2).
-     * 
+     *
      * @return
      *    1 success, < 0 error
      *      Error codes:
@@ -502,7 +502,7 @@ struct IsoFileSource_Iface
      * read access to the image it will be able to read all files inside it,
      * despite of the particular permission of each file in the RR tree, that
      * are what the above functions return.
-     * 
+     *
      * @return
      *     1 if process has read access, < 0 on error
      *      Error codes:
@@ -542,12 +542,12 @@ struct IsoFileSource_Iface
     /**
      * Attempts to read up to count bytes from the given source into
      * the buffer starting at buf.
-     * 
-     * The file src must be open() before calling this, and close() when no 
+     *
+     * The file src must be open() before calling this, and close() when no
      * more needed. Not valid for dirs. On symlinks it reads the destination
      * file.
-     * 
-     * @return 
+     *
+     * @return
      *     number of bytes read, 0 if EOF, < 0 on error
      *      Error codes:
      *         ISO_FILE_ERROR
@@ -561,19 +561,19 @@ struct IsoFileSource_Iface
     int (*read)(IsoFileSource *src, void *buf, size_t count);
 
     /**
-     * Read a directory. 
-     * 
+     * Read a directory.
+     *
      * Each call to this function will return a new children, until we reach
      * the end of file (i.e, no more children), in that case it returns 0.
-     * 
+     *
      * The dir must be open() before calling this, and close() when no more
-     * needed. Only valid for dirs. 
-     * 
+     * needed. Only valid for dirs.
+     *
      * Note that "." and ".." children MUST NOT BE returned.
-     * 
+     *
      * @param child
      *     pointer to be filled with the given child. Undefined on error or OEF
-     * @return 
+     * @return
      *     1 on success, 0 if EOF (no more children), < 0 on error
      *      Error codes:
      *         ISO_FILE_ERROR
@@ -587,14 +587,14 @@ struct IsoFileSource_Iface
     /**
      * Read the destination of a symlink. You don't need to open the file
      * to call this.
-     * 
-     * @param buf 
-     *     allocated buffer of at least bufsiz bytes. 
+     *
+     * @param buf
+     *     allocated buffer of at least bufsiz bytes.
      *     The dest. will be copied there, and it will be NULL-terminated
      * @param bufsiz
      *     characters to be copied. Destination link will be truncated if
      *     it is larger than given size. This include the \0 character.
-     * @return 
+     * @return
      *     1 on success, < 0 on error
      *      Error codes:
      *         ISO_FILE_ERROR
@@ -604,14 +604,14 @@ struct IsoFileSource_Iface
      *         ISO_OUT_OF_MEM
      *         ISO_FILE_BAD_PATH
      *         ISO_FILE_DOESNT_EXIST
-     * 
+     *
      */
     int (*readlink)(IsoFileSource *src, char *buf, size_t bufsiz);
 
     /**
      * Get the filesystem for this source. No extra ref is added, so you
      * musn't unref the IsoFilesystem.
-     * 
+     *
      * @return
      *     The filesystem, NULL on error
      */
@@ -622,23 +622,23 @@ struct IsoFileSource_Iface
      * Use iso_file_source_unref() instead.
      */
     void (*free)(IsoFileSource *src);
-    
+
     /**
-     * Repositions the offset of the IsoFileSource (must be opened) to the 
+     * Repositions the offset of the IsoFileSource (must be opened) to the
      * given offset according to the value of flag.
-     * 
+     *
      * @param offset
-     *      in bytes 
+     *      in bytes
      * @param flag
      *      0 The offset is set to offset bytes (SEEK_SET)
-     *      1 The offset is set to its current location plus offset bytes 
+     *      1 The offset is set to its current location plus offset bytes
      *        (SEEK_CUR)
-     *      2 The offset is set to the size of the file plus offset bytes 
+     *      2 The offset is set to the size of the file plus offset bytes
      *        (SEEK_END).
      * @return
      *      Absolute offset posistion on the file, or < 0 on error. Cast the
      *      returning value to int to get a valid libisofs error.
-     * 
+     *
      * @since 0.6.4
      */
     off_t (*lseek)(IsoFileSource *src, off_t offset, int flag);
@@ -664,25 +664,25 @@ struct iso_file_source
 /**
  * Representation of file contents. It is an stream of bytes, functionally
  * like a pipe.
- * 
+ *
  * @since 0.6.4
  */
 typedef struct iso_stream IsoStream;
 
 /**
- * Interface that defines the operations (methods) available for an 
+ * Interface that defines the operations (methods) available for an
  * IsoStream.
- * 
+ *
  * @see struct IsoStream_Iface
  * @since 0.6.4
  */
 typedef struct IsoStream_Iface IsoStreamIface;
 
-/** 
+/**
  * Serial number to be used when you can't get a valid id for a Stream by other
  * means. If you use this, both fs_id and dev_id should be set to 0.
  * This must be incremented each time you get a reference to it.
- * 
+ *
  * @see IsoStreamIface->get_id()
  * @since 0.6.4
  */
@@ -690,7 +690,7 @@ extern ino_t serial_id;
 
 /**
  * Interface definition for IsoStream methods.
- * 
+ *
  * @since 0.6.4
  */
 struct IsoStream_Iface
@@ -699,7 +699,7 @@ struct IsoStream_Iface
     int version;
 
     /**
-     * Type of Stream. 
+     * Type of Stream.
      * "fsrc" -> Read from file source
      * "mem " -> Read from memory
      * "boot" -> Boot catalog
@@ -709,8 +709,8 @@ struct IsoStream_Iface
 
     /**
      * Opens the stream.
-     * 
-     * @return 
+     *
+     * @return
      *     1 on success, 2 file greater than expected, 3 file smaller than
      *     expected, < 0 on error
      */
@@ -723,7 +723,7 @@ struct IsoStream_Iface
     int (*close)(IsoStream *stream);
 
     /**
-     * Get the size (in bytes) of the stream. This function should always 
+     * Get the size (in bytes) of the stream. This function should always
      * return the same size, even if the underlying source size changes.
      */
     off_t (*get_size)(IsoStream *stream);
@@ -731,23 +731,23 @@ struct IsoStream_Iface
     /**
      * Attempts to read up to count bytes from the given stream into
      * the buffer starting at buf.
-     * 
-     * The stream must be open() before calling this, and close() when no 
-     * more needed. 
-     * 
-     * @return 
+     *
+     * The stream must be open() before calling this, and close() when no
+     * more needed.
+     *
+     * @return
      *     number of bytes read, 0 if EOF, < 0 on error
      */
     int (*read)(IsoStream *stream, void *buf, size_t count);
 
     /**
-     * Whether this IsoStream can be read several times, with the same results. 
+     * Whether this IsoStream can be read several times, with the same results.
      * For example, a regular file is repeatable, you can read it as many
-     * times as you want. However, a pipe isn't. 
-     * 
+     * times as you want. However, a pipe isn't.
+     *
      * This function doesn't take into account if the file has been modified
-     * between the two reads. 
-     * 
+     * between the two reads.
+     *
      * @return
      *     1 if stream is repeatable, 0 if not, < 0 on error
      */
@@ -768,7 +768,7 @@ struct IsoStream_Iface
 
 /**
  * Representation of file contents as a stream of bytes.
- * 
+ *
  * @since 0.6.4
  */
 struct iso_stream
@@ -780,7 +780,7 @@ struct iso_stream
 
 /**
  * Initialize libisofs. You must call this before any usage of the library.
- * @return 1 on success, < 0 on error 
+ * @return 1 on success, < 0 on error
  *
  * @since 0.6.2
  */
@@ -795,9 +795,9 @@ void iso_finish();
 
 /**
  * Create a new image, empty.
- * 
+ *
  * The image will be owned by you and should be unref() when no more needed.
- * 
+ *
  * @param name
  *     Name of the image. This will be used as volset_id and volume_id.
  * @param image
@@ -810,7 +810,7 @@ void iso_finish();
 int iso_image_new(const char *name, IsoImage **image);
 
 
-/** 
+/**
  * The following two functions three macros are utilities to help ensuring
  * version match of application, compile time header, and runtime library.
  */
@@ -823,8 +823,8 @@ void iso_lib_version(int *major, int *minor, int *micro);
 
 /**
  * Check at runtime if the library is ABI compatible with the given version.
- * 
- * @return 
+ *
+ * @return
  *      1 lib is compatible, 0 is not.
  *
  * @since 0.6.2
@@ -832,7 +832,7 @@ void iso_lib_version(int *major, int *minor, int *micro);
 int iso_lib_is_compatible(int major, int minor, int micro);
 
 
-/** 
+/**
  * These three release version numbers tell the revision of this header file
  * and of the API it describes. They are memorized by applications at
  * compile time.
@@ -842,8 +842,8 @@ int iso_lib_is_compatible(int major, int minor, int micro);
  *     LIBISOFS_MICRO_VERSION=...
  * Note to anybody who does own work inside libisofs:
  * Any change of configure.ac or libisofs.h has to keep up this equality !
- * 
- * Before usage of these macros on your code, please read the usage discussion 
+ *
+ * Before usage of these macros on your code, please read the usage discussion
  * below.
  *
  * @since 0.6.2
@@ -852,41 +852,41 @@ int iso_lib_is_compatible(int major, int minor, int micro);
 #define iso_lib_header_version_minor  6
 #define iso_lib_header_version_micro  3
 
-/** 
+/**
  * Usage discussion:
- * 
- * Some developers of the libburnia project have differing opinions how to 
+ *
+ * Some developers of the libburnia project have differing opinions how to
  * ensure the compatibility of libaries and applications.
- * 
- * It is about whether to use at compile time and at runtime the version 
- * numbers provided here. Thomas Schmitt advises to use them. Vreixo Formoso 
+ *
+ * It is about whether to use at compile time and at runtime the version
+ * numbers provided here. Thomas Schmitt advises to use them. Vreixo Formoso
  * advises to use other means.
- * 
+ *
  * At compile time:
- * 
- * Vreixo Formoso advises to leave proper version matching to properly 
- * programmed checks in the the application's build system, which will 
+ *
+ * Vreixo Formoso advises to leave proper version matching to properly
+ * programmed checks in the the application's build system, which will
  * eventually refuse compilation.
- * 
- * Thomas Schmitt advises to use the macros defined here for comparison with 
- * the application's requirements of library revisions and to eventually 
+ *
+ * Thomas Schmitt advises to use the macros defined here for comparison with
+ * the application's requirements of library revisions and to eventually
  * break compilation.
- * 
- * Both advises are combinable. I.e. be master of your build system and have 
+ *
+ * Both advises are combinable. I.e. be master of your build system and have
  * #if checks in the source code of your application, nevertheless.
- * 
+ *
  * At runtime (via iso_lib_is_compatible()):
- * 
- * Vreixo Formoso advises to compare the application's requirements of 
- * library revisions with the runtime library. This is to allow runtime 
+ *
+ * Vreixo Formoso advises to compare the application's requirements of
+ * library revisions with the runtime library. This is to allow runtime
  * libraries which are young enough for the application but too old for
  * the lib*.h files seen at compile time.
- * 
- * Thomas Schmitt advises to compare the header revisions defined here with 
- * the runtime library. This is to enforce a strictly monotonous chain of 
+ *
+ * Thomas Schmitt advises to compare the header revisions defined here with
+ * the runtime library. This is to enforce a strictly monotonous chain of
  * revisions from app to header to library, at the cost of excluding some older
  * libraries.
- * 
+ *
  * These two advises are mutually exclusive.
  */
 
@@ -894,10 +894,10 @@ int iso_lib_is_compatible(int major, int minor, int micro);
 /**
  * Creates an IsoWriteOpts for writing an image. You should set the options
  * desired with the correspondent setters.
- * 
+ *
  * Options by default are determined by the selected profile. Fifo size is set
  * by default to 2 MB.
- * 
+ *
  * @param opts
  *     Pointer to the location where the newly created IsoWriteOpts will be
  *     stored. You should free it with iso_write_opts_free() when no more
@@ -905,7 +905,7 @@ int iso_lib_is_compatible(int major, int minor, int micro);
  * @param profile
  *     Default profile for image creation. For now the following values are
  *     defined:
- *     ---> 0 [BASIC] 
+ *     ---> 0 [BASIC]
  *        No extensions are enabled, and ISO level is set to 1. Only suitable
  *        for usage for very old and limited systems (like MS-DOS), or by a
  *        start point from which to set your custom options.
@@ -931,12 +931,13 @@ int iso_write_opts_new(IsoWriteOpts **opts, int profile);
 void iso_write_opts_free(IsoWriteOpts *opts);
 
 /**
- * Set the ISO-9960 level to write at. 
- * 
+ * Set the ISO-9960 level to write at.
+ *
  * @param level
- *      -> 1 for higher compatibility with old systems. With this level 
+ *      -> 1 for higher compatibility with old systems. With this level
  *      filenames are restricted to 8.3 characters.
  *      -> 2 to allow up to 31 filename characters.
+ *      -> 3 to allow files greater than 4GB
  * @return
  *      1 success, < 0 error
  *
@@ -945,16 +946,16 @@ void iso_write_opts_free(IsoWriteOpts *opts);
 int iso_write_opts_set_iso_level(IsoWriteOpts *opts, int level);
 
 /**
- * Whether to use or not Rock Ridge extensions. 
- * 
+ * Whether to use or not Rock Ridge extensions.
+ *
  * This are standard extensions to ECMA-119, intended to add POSIX filesystem
  * features to ECMA-119 images. Thus, usage of this flag is highly recommended
- * for images used on GNU/Linux systems. With the usage of RR extension, the 
- * 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. 
- * 
+ * for images used on GNU/Linux systems. With the usage of RR extension, the
+ * 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.
+ *
  * @param enable
  *      1 to enable RR extension, 0 to not add them
  * @return
@@ -965,13 +966,13 @@ int iso_write_opts_set_iso_level(IsoWriteOpts *opts, int level);
 int iso_write_opts_set_rockridge(IsoWriteOpts *opts, int enable);
 
 /**
- * Whether to add the non-standard Joliet extension to the image. 
- * 
- * This extensions are heavily used in Microsoft Windows systems, so if you 
- * plan to use your disc on such a system you should add this extension. 
- * Usage of Joliet supplies longer filesystem length (up to 64 unicode 
+ * Whether to add the non-standard Joliet extension to the image.
+ *
+ * This extensions are heavily used in Microsoft Windows systems, so if you
+ * plan to use your disc on such a system you should add this extension.
+ * Usage of Joliet supplies longer filesystem length (up to 64 unicode
  * characters), and deeper directory structure.
- * 
+ *
  * @param enable
  *      1 to enable Joliet extension, 0 to not add them
  * @return
@@ -983,10 +984,10 @@ int iso_write_opts_set_joliet(IsoWriteOpts *opts, int enable);
 
 /**
  * Whether to use newer ISO-9660:1999 version.
- * 
+ *
  * This is the second version of ISO-9660. It allows longer filenames and has
  * less restrictions than old ISO-9660. However, nobody is using it so there
- * are no much reasons to enable this. 
+ * are no much reasons to enable this.
  *
  * @since 0.6.2
  */
@@ -994,16 +995,16 @@ int iso_write_opts_set_iso1999(IsoWriteOpts *opts, int enable);
 
 /**
  * Omit the version number (";1") at the end of the ISO-9660 identifiers.
- * This breaks ECMA-119 specification, but version numbers are usually not 
- * used, so it should work on most systems. Use with caution. 
+ * This breaks ECMA-119 specification, but version numbers are usually not
+ * used, so it should work on most systems. Use with caution.
  *
  * @since 0.6.2
  */
 int iso_write_opts_set_omit_version_numbers(IsoWriteOpts *opts, int omit);
 
 /**
- * Allow ISO-9660 directory hierarchy to be deeper than 8 levels. 
- * This breaks ECMA-119 specification. Use with caution. 
+ * Allow ISO-9660 directory hierarchy to be deeper than 8 levels.
+ * This breaks ECMA-119 specification. Use with caution.
  *
  * @since 0.6.2
  */
@@ -1011,7 +1012,7 @@ int iso_write_opts_set_allow_deep_paths(IsoWriteOpts *opts, int allow);
 
 /**
  * Allow path in the ISO-9660 tree to have more than 255 characters.
- * This breaks ECMA-119 specification. Use with caution. 
+ * This breaks ECMA-119 specification. Use with caution.
  *
  * @since 0.6.2
  */
@@ -1031,18 +1032,18 @@ int iso_write_opts_set_max_37_char_filenames(IsoWriteOpts *opts, int allow);
 
 /**
  * ISO-9660 forces filenames to have a ".", that separates file name from
- * extension. libisofs adds it if original filename doesn't has one. Set 
+ * extension. libisofs adds it if original filename doesn't has one. Set
  * this to 1 to prevent this behavior.
- * This breaks ECMA-119 specification. Use with caution. 
+ * This breaks ECMA-119 specification. Use with caution.
  *
  * @since 0.6.2
  */
 int iso_write_opts_set_no_force_dots(IsoWriteOpts *opts, int no);
 
 /**
- * Allow lowercase characters in ISO-9660 filenames. By default, only 
- * uppercase characters, numbers and a few other characters are allowed. 
- * This breaks ECMA-119 specification. Use with caution. 
+ * Allow lowercase characters in ISO-9660 filenames. By default, only
+ * uppercase characters, numbers and a few other characters are allowed.
+ * This breaks ECMA-119 specification. Use with caution.
  *
  * @since 0.6.2
  */
@@ -1051,7 +1052,7 @@ int iso_write_opts_set_allow_lowercase(IsoWriteOpts *opts, int allow);
 /**
  * Allow all ASCII characters to be appear on an ISO-9660 filename. Note
  * that "/" and "\0" characters are never allowed, even in RR names.
- * This breaks ECMA-119 specification. Use with caution. 
+ * This breaks ECMA-119 specification. Use with caution.
  *
  * @since 0.6.2
  */
@@ -1068,7 +1069,7 @@ int iso_write_opts_set_relaxed_vol_atts(IsoWriteOpts *opts, int allow);
 
 /**
  * Allow paths in the Joliet tree to have more than 240 characters.
- * This breaks Joliet specification. Use with caution. 
+ * This breaks Joliet specification. Use with caution.
  *
  * @since 0.6.2
  */
@@ -1076,24 +1077,24 @@ int iso_write_opts_set_joliet_longer_paths(IsoWriteOpts *opts, int allow);
 
 /**
  * Whether to sort files based on their weight.
- * 
+ *
  * @see iso_node_set_sort_weight
  * @since 0.6.2
  */
 int iso_write_opts_set_sort_files(IsoWriteOpts *opts, int sort);
 
 /**
- * Whether to set default values for files and directory permissions, gid and 
+ * Whether to set default values for files and directory permissions, gid and
  * uid. All these take one of three values: 0, 1 or 2.
- * 
+ *
  * If 0, the corresponding attribute will be kept as setted in the IsoNode.
  * Unless you have changed it, it corresponds to the value on disc, so it
  * is suitable for backup purposes. If set to 1, the corresponding attrib.
- * will be changed by a default suitable value. Finally, if you set it to 
+ * will be changed by a default suitable value. Finally, if you set it to
  * 2, the attrib. will be changed with the value specified by the functioins
  * below. Note that for mode attributes, only the permissions are set, the
  * file type remains unchanged.
- * 
+ *
  * @see iso_write_opts_set_default_dir_mode
  * @see iso_write_opts_set_default_file_mode
  * @see iso_write_opts_set_default_uid
@@ -1105,7 +1106,7 @@ int iso_write_opts_set_replace_mode(IsoWriteOpts *opts, int dir_mode,
 
 /**
  * Set the mode to use on dirs when you set the replace_mode of dirs to 2.
- * 
+ *
  * @see iso_write_opts_set_replace_mode
  * @since 0.6.2
  */
@@ -1113,7 +1114,7 @@ int iso_write_opts_set_default_dir_mode(IsoWriteOpts *opts, mode_t dir_mode);
 
 /**
  * Set the mode to use on files when you set the replace_mode of files to 2.
- * 
+ *
  * @see iso_write_opts_set_replace_mode
  * @since 0.6.2
  */
@@ -1121,7 +1122,7 @@ int iso_write_opts_set_default_file_mode(IsoWriteOpts *opts, mode_t file_mode);
 
 /**
  * Set the uid to use when you set the replace_uid to 2.
- * 
+ *
  * @see iso_write_opts_set_replace_mode
  * @since 0.6.2
  */
@@ -1129,7 +1130,7 @@ int iso_write_opts_set_default_uid(IsoWriteOpts *opts, uid_t uid);
 
 /**
  * Set the gid to use when you set the replace_gid to 2.
- * 
+ *
  * @see iso_write_opts_set_replace_mode
  * @since 0.6.2
  */
@@ -1139,7 +1140,7 @@ int iso_write_opts_set_default_gid(IsoWriteOpts *opts, gid_t gid);
  * 0 to use IsoNode timestamps, 1 to use recording time, 2 to use
  * values from timestamp field. This has only meaning if RR extensions
  * are enabled.
- * 
+ *
  * @see iso_write_opts_set_default_timestamp
  * @since 0.6.2
  */
@@ -1147,7 +1148,7 @@ int iso_write_opts_set_replace_timestamps(IsoWriteOpts *opts, int replace);
 
 /**
  * Set the timestamp to use when you set the replace_timestamps to 2.
- * 
+ *
  * @see iso_write_opts_set_replace_timestamps
  * @since 0.6.2
  */
@@ -1155,22 +1156,22 @@ int iso_write_opts_set_default_timestamp(IsoWriteOpts *opts, time_t timestamp);
 
 /**
  * Whether to always record timestamps in GMT.
- * 
- * By default, libisofs stores local time information on image. You can set 
+ *
+ * By default, libisofs stores local time information on image. You can set
  * this to always store timestamps in GMT. This is useful if you want to hide
  * your timezone, or you live in a timezone that can't be represented in
- * ECMA-119. These are timezones whose offset from GMT is greater than +13 
- * hours, lower than -12 hours, or not a multiple of 15 minutes. 
+ * ECMA-119. These are timezones whose offset from GMT is greater than +13
+ * hours, lower than -12 hours, or not a multiple of 15 minutes.
  *
  * @since 0.6.2
  */
 int iso_write_opts_set_always_gmt(IsoWriteOpts *opts, int gmt);
 
 /**
- * Set the charset to use for the RR names of the files that will be created 
+ * Set the charset to use for the RR names of the files that will be created
  * on the image.
  * NULL to use default charset, that is the locale charset.
- * You can obtain the list of charsets supported on your system executing 
+ * You can obtain the list of charsets supported on your system executing
  * "iconv -l" in a shell.
  *
  * @since 0.6.2
@@ -1178,27 +1179,27 @@ int iso_write_opts_set_always_gmt(IsoWriteOpts *opts, int gmt);
 int iso_write_opts_set_output_charset(IsoWriteOpts *opts, const char *charset);
 
 /**
- * Set the type of the image to create. Libisofs support two kind of images: 
- * stand-alone and appendable. 
- * 
+ * Set the type of the image to create. Libisofs support two kind of images:
+ * stand-alone and appendable.
+ *
  * A stand-alone image is an image that is valid alone, and that can be
  * mounted by its own. This is the kind of image you will want to create
  * in most cases. A stand-alone image can be burned in an empty CD or DVD,
  * or write to an .iso file for future burning or distribution.
- * 
+ *
  * On the other side, an appendable image is not self contained, it refers
  * to serveral files that are stored outside the image. Its usage is for
- * multisession discs, where you add data in a new session, while the 
- * previous session data can still be accessed. In those cases, the old 
+ * multisession discs, where you add data in a new session, while the
+ * previous session data can still be accessed. In those cases, the old
  * data is not written again. Instead, the new image refers to it, and thus
  * it's only valid when appended to the original. Note that in those cases
  * the image will be written after the original, and thus you will want
- * to use a ms_block greater than 0. 
- * 
- * Note that if you haven't import a previous image (by means of 
+ * to use a ms_block greater than 0.
+ *
+ * Note that if you haven't import a previous image (by means of
  * iso_image_import()), the image will always be a stand-alone image, as
  * there is no previous data to refer to.
- * 
+ *
  * @param appendable
  *      1 to create an appendable image, 0 for an stand-alone one.
  *
@@ -1207,17 +1208,17 @@ int iso_write_opts_set_output_charset(IsoWriteOpts *opts, const char *charset);
 int iso_write_opts_set_appendable(IsoWriteOpts *opts, int appendable);
 
 /**
- * Set the start block of the image. It is supposed to be the lba where the 
+ * Set the start block of the image. It is supposed to be the lba where the
  * first block of the image will be written on disc. All references inside the
  * ISO image will take this into account, thus providing a mountable image.
- * 
- * For appendable images, that are written to a new session, you should 
+ *
+ * For appendable images, that are written to a new session, you should
  * pass here the lba of the next writable address on disc.
- * 
- * In stand alone images this is usually 0. However, you may want to 
+ *
+ * In stand alone images this is usually 0. However, you may want to
  * provide a different ms_block if you don't plan to burn the image in the
  * first session on disc, such as in some CD-Extra disc whether the data
- * image is written in a new session after some audio tracks. 
+ * image is written in a new session after some audio tracks.
  *
  * @since 0.6.2
  */
@@ -1225,26 +1226,26 @@ int iso_write_opts_set_ms_block(IsoWriteOpts *opts, uint32_t ms_block);
 
 /**
  * Sets the buffer where to store the descriptors that need to be written
- * at the beginning of a overwriteable media to grow the image. 
- * 
+ * at the beginning of a overwriteable media to grow the image.
+ *
  * @param overwrite
- *      When not NULL, it should point to a buffer of at least 64KiB, where 
- *      libisofs will write the contents that should be written at the 
- *      beginning of a overwriteable media, to grow the image. The growing 
+ *      When not NULL, it should point to a buffer of at least 64KiB, where
+ *      libisofs will write the contents that should be written at the
+ *      beginning of a overwriteable media, to grow the image. The growing
  *      of an image is a way, used by first time in growisofs by Andy Polyakov,
- *      to allow the appending of new data to non-multisession media, such 
- *      as DVD+RW, in the same way you append a new session to a multisession 
- *      disc, i.e., without need to write again the contents of the previous 
- *      image.   
- * 
+ *      to allow the appending of new data to non-multisession media, such
+ *      as DVD+RW, in the same way you append a new session to a multisession
+ *      disc, i.e., without need to write again the contents of the previous
+ *      image.
+ *
  * Note that if you want this kind of image growing, you will also need to
  * set appendable to "1" and provide a valid ms_block after the previous
  * image.
- * 
- * You should initialize the buffer either with 0s, or with the contents of 
- * the first blocks of the image you're growing. In most cases, 0 is good 
- * enought. 
- * 
+ *
+ * You should initialize the buffer either with 0s, or with the contents of
+ * the first blocks of the image you're growing. In most cases, 0 is good
+ * enought.
+ *
  * If you don't need this information, for example because you're creating a
  * new image from scratch of because you will create an image for a true
  * multisession media, just don't set this buffer or set it to NULL.
@@ -1254,8 +1255,8 @@ int iso_write_opts_set_ms_block(IsoWriteOpts *opts, uint32_t ms_block);
 int iso_write_opts_set_overwrite_buf(IsoWriteOpts *opts, uint8_t *overwrite);
 
 /**
- * Set the size, in number of blocks, of the FIFO buffer used between the 
- * writer thread and the burn_source. You have to provide at least a 32 
+ * Set the size, in number of blocks, of the FIFO buffer used between the
+ * writer thread and the burn_source. You have to provide at least a 32
  * blocks buffer. Default value is set to 2MB, if that is ok for you, you
  * don't need to call this function.
  *
@@ -1264,18 +1265,18 @@ int iso_write_opts_set_overwrite_buf(IsoWriteOpts *opts, uint8_t *overwrite);
 int iso_write_opts_set_fifo_size(IsoWriteOpts *opts, size_t fifo_size);
 
 /**
- * Create a burn_source to actually write the image. That burn_source can be 
+ * Create a burn_source to actually write the image. That burn_source can be
  * used with libburn as a data source for a track.
- * 
+ *
  * @param image
  *     The image to write.
  * @param opts
- *     The options for image generation. All needed data will be copied, so 
+ *     The options for image generation. All needed data will be copied, so
  *     you can free the given struct once this function returns.
  * @param burn_src
  *     Location where the pointer to the burn_source will be stored
  * @return
- *     1 on success, < 0 on error 
+ *     1 on success, < 0 on error
  *
  * @since 0.6.2
  */
@@ -1283,12 +1284,12 @@ int iso_image_create_burn_source(IsoImage *image, IsoWriteOpts *opts,
                                  struct burn_source **burn_src);
 
 /**
- * Creates an IsoReadOpts for reading an existent image. You should set the 
+ * Creates an IsoReadOpts for reading an existent image. You should set the
  * options desired with the correspondent setters. Note that you may want to
  * set the start block value.
- * 
+ *
  * Options by default are determined by the selected profile.
- * 
+ *
  * @param opts
  *     Pointer to the location where the newly created IsoReadOpts will be
  *     stored. You should free it with iso_read_opts_free() when no more
@@ -1298,7 +1299,7 @@ int iso_image_create_burn_source(IsoImage *image, IsoWriteOpts *opts,
  *     defined:
  *     ---> 0 [STANDARD]
  *         Suitable for most situations. All extension are read. When both
- *         Joliet and RR extension are present, RR is used. 
+ *         Joliet and RR extension are present, RR is used.
  * @return
  *      1 success, < 0 error
  *
@@ -1313,8 +1314,8 @@ int iso_read_opts_new(IsoReadOpts **opts, int profile);
  */
 void iso_read_opts_free(IsoReadOpts *opts);
 
-/** 
- * Set the block where the image begins. It is usually 0, but may be different 
+/**
+ * Set the block where the image begins. It is usually 0, but may be different
  * on a multisession disc.
  *
  * @since 0.6.2
@@ -1322,7 +1323,7 @@ void iso_read_opts_free(IsoReadOpts *opts);
 int iso_read_opts_set_start_block(IsoReadOpts *opts, uint32_t block);
 
 /**
- * Do not read Rock Ridge extensions. 
+ * Do not read Rock Ridge extensions.
  * In most cases you don't want to use this. It could be useful if RR info
  * is damaged, or if you want to use the Joliet tree.
  *
@@ -1348,7 +1349,7 @@ int iso_read_opts_set_no_iso1999(IsoReadOpts *opts, int noiso1999);
  * Whether to prefer Joliet over RR. libisofs usually prefers RR over
  * Joliet, as it give us much more info about files. So, if both extensions
  * are present, RR is used. You can set this if you prefer Joliet, but
- * note that this is not very recommended. This doesn't mean than RR 
+ * note that this is not very recommended. This doesn't mean than RR
  * extensions are not read: if no Joliet is present, libisofs will read
  * RR tree.
  *
@@ -1372,7 +1373,7 @@ int iso_read_opts_set_default_gid(IsoReadOpts *opts, gid_t gid);
 
 /**
  * Set default permissions for files when RR extensions are not present.
- * 
+ *
  * @param file_perm
  *      Permissions for files.
  * @param dir_perm
@@ -1388,7 +1389,7 @@ int iso_read_opts_set_default_permissions(IsoReadOpts *opts, mode_t file_perm,
  * charset. You have to specify a charset if the image filenames are encoded
  * in a charset different that the local one. This could happen, for example,
  * if the image was created on a system with different charset.
- * 
+ *
  * @param charset
  *      The charset to use as input charset.  You can obtain the list of
  *      charsets supported on your system executing "iconv -l" in a shell.
@@ -1399,11 +1400,11 @@ int iso_read_opts_set_input_charset(IsoReadOpts *opts, const char *charset);
 
 /**
  * Import a previous session or image, for growing or modify.
- * 
+ *
  * @param image
  *     The image context to which old image will be imported. Note that all
  *     files added to image, and image attributes, will be replaced with the
- *     contents of the old image. 
+ *     contents of the old image.
  *     TODO #00025 support for merging old image files
  * @param src
  *     Data Source from which old image will be read. A extra reference is
@@ -1412,9 +1413,9 @@ int iso_read_opts_set_input_charset(IsoReadOpts *opts, const char *charset);
  *     Options for image import. All needed data will be copied, so you
  *     can free the given struct once this function returns.
  * @param features
- *     If not NULL, a new IsoReadImageFeatures will be allocated and filled 
- *     with the features of the old image. It should be freed with 
- *     iso_read_image_features_destroy() when no more needed. You can pass 
+ *     If not NULL, a new IsoReadImageFeatures will be allocated and filled
+ *     with the features of the old image. It should be freed with
+ *     iso_read_image_features_destroy() when no more needed. You can pass
  *     NULL if you're not interested on them.
  * @return
  *     1 on success, < 0 on error
@@ -1432,7 +1433,7 @@ int iso_image_import(IsoImage *image, IsoDataSource *src, IsoReadOpts *opts,
 void iso_read_image_features_destroy(IsoReadImageFeatures *f);
 
 /**
- * Get the size (in 2048 byte block) of the image, as reported in the PVM. 
+ * Get the size (in 2048 byte block) of the image, as reported in the PVM.
  *
  * @since 0.6.2
  */
@@ -1454,7 +1455,7 @@ int iso_read_image_features_has_joliet(IsoReadImageFeatures *f);
 
 /**
  * Whether the image is recorded according to ISO 9660:1999, i.e. it has
- * a version 2 Enhanced Volume Descriptor. 
+ * a version 2 Enhanced Volume Descriptor.
  *
  * @since 0.6.2
  */
@@ -1476,7 +1477,7 @@ void iso_image_ref(IsoImage *image);
 
 /**
  * Decrements the reference couting of the given image.
- * If it reaches 0, the image is free, together with its tree nodes (whether 
+ * If it reaches 0, the image is free, together with its tree nodes (whether
  * their refcount reach 0 too, of course).
  *
  * @since 0.6.2
@@ -1487,7 +1488,7 @@ void iso_image_unref(IsoImage *image);
  * Attach user defined data to the image. Use this if your application needs
  * to store addition info together with the IsoImage. If the image already
  * has data attached, the old data will be freed.
- * 
+ *
  * @param data
  *      Pointer to application defined data that will be attached to the
  *      image. You can pass NULL to remove any already attached data.
@@ -1525,8 +1526,8 @@ IsoDir *iso_image_get_root(const IsoImage *image);
  */
 void iso_image_set_volset_id(IsoImage *image, const char *volset_id);
 
-/** 
- * Get the volset identifier. 
+/**
+ * Get the volset identifier.
  * The returned string is owned by the image and should not be freed nor
  * changed.
  *
@@ -1541,8 +1542,8 @@ const char *iso_image_get_volset_id(const IsoImage *image);
  */
 void iso_image_set_volume_id(IsoImage *image, const char *volume_id);
 
-/** 
- * Get the volume identifier. 
+/**
+ * Get the volume identifier.
  * The returned string is owned by the image and should not be freed nor
  * changed.
  *
@@ -1557,8 +1558,8 @@ const char *iso_image_get_volume_id(const IsoImage *image);
  */
 void iso_image_set_publisher_id(IsoImage *image, const char *publisher_id);
 
-/** 
- * Get the publisher of a image. 
+/**
+ * Get the publisher of a image.
  * The returned string is owned by the image and should not be freed nor
  * changed.
  *
@@ -1574,8 +1575,8 @@ const char *iso_image_get_publisher_id(const IsoImage *image);
 void iso_image_set_data_preparer_id(IsoImage *image,
                                     const char *data_preparer_id);
 
-/** 
- * Get the data preparer of a image. 
+/**
+ * Get the data preparer of a image.
  * The returned string is owned by the image and should not be freed nor
  * changed.
  *
@@ -1590,8 +1591,8 @@ const char *iso_image_get_data_preparer_id(const IsoImage *image);
  */
 void iso_image_set_system_id(IsoImage *image, const char *system_id);
 
-/** 
- * Get the system id of a image. 
+/**
+ * Get the system id of a image.
  * The returned string is owned by the image and should not be freed nor
  * changed.
  *
@@ -1606,8 +1607,8 @@ const char *iso_image_get_system_id(const IsoImage *image);
  */
 void iso_image_set_application_id(IsoImage *image, const char *application_id);
 
-/** 
- * Get the application id of a image. 
+/**
+ * Get the application id of a image.
  * The returned string is owned by the image and should not be freed nor
  * changed.
  *
@@ -1624,8 +1625,8 @@ const char *iso_image_get_application_id(const IsoImage *image);
 void iso_image_set_copyright_file_id(IsoImage *image,
                                      const char *copyright_file_id);
 
-/** 
- * Get the copyright information of a image. 
+/**
+ * Get the copyright information of a image.
  * The returned string is owned by the image and should not be freed nor
  * changed.
  *
@@ -1642,8 +1643,8 @@ const char *iso_image_get_copyright_file_id(const IsoImage *image);
 void iso_image_set_abstract_file_id(IsoImage *image,
                                     const char *abstract_file_id);
 
-/** 
- * Get the abstract information of a image. 
+/**
+ * Get the abstract information of a image.
  * The returned string is owned by the image and should not be freed nor
  * changed.
  *
@@ -1659,8 +1660,8 @@ const char *iso_image_get_abstract_file_id(const IsoImage *image);
  */
 void iso_image_set_biblio_file_id(IsoImage *image, const char *biblio_file_id);
 
-/** 
- * Get the biblio information of a image. 
+/**
+ * Get the biblio information of a image.
  * The returned string is owned by the image and should not be freed nor
  * changed.
  *
@@ -1670,16 +1671,16 @@ const char *iso_image_get_biblio_file_id(const IsoImage *image);
 
 /**
  * Create a bootable image by adding a El-Torito boot image.
- * 
+ *
  * This also add a catalog boot node to the image filesystem tree.
- * 
- * @param image 
+ *
+ * @param 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 path on the image tree of a regular file to use as default boot 
+ * @param image_path
+ *      The path on the image tree of a regular file to use as default boot
  *      image.
- * @param type 
+ * @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.
@@ -1689,19 +1690,19 @@ const char *iso_image_get_biblio_file_id(const IsoImage *image);
  *               of image.
  * @param catalog_path
  *      The path on the image tree where the catalog will be stored. The
- *      directory component of this path must be a directory existent on the 
- *      image tree, and the filename component must be unique among all 
+ *      directory component of this path must be a directory existent on the
+ *      image tree, and the filename component must be unique among all
  *      children of that directory on image. Otherwise a correspodent error
- *      code will be returned. This function will add an IsoBoot node that acts 
- *      as a placeholder for the real catalog, that will be generated at image 
- *      creation time. 
+ *      code will be returned. This function will add an IsoBoot node that acts
+ *      as a placeholder for the real catalog, that will be generated at image
+ *      creation time.
  * @param boot
- *      Location where a pointer to the added boot image will be stored. That 
+ *      Location where a pointer to the added boot image will be stored. That
  *      object is owned by the IsoImage and should not be freed by the user,
  *      nor dereferenced once the last reference to the IsoImage was disposed
  *      via iso_image_unref(). A NULL value is allowed if you don't need a
- *      reference to the boot image. 
- * @return 
+ *      reference to the boot image.
+ * @return
  *      1 on success, < 0 on error
  *
  * @since 0.6.2
@@ -1715,32 +1716,32 @@ int iso_image_set_boot_image(IsoImage *image, const char *image_path,
 
 /**
  * Get El-Torito boot image of an ISO image, if any.
- * 
+ *
  * This can be useful, for example, to check if a volume read from a previous
  * session or an existing image is bootable. It can also be useful to get
- * the image and catalog tree nodes. An application would want those, for 
+ * the image and catalog tree nodes. An application would want those, for
  * example, to prevent the user removing it.
- * 
+ *
  * Both nodes are owned by libisofs and should not be freed. You can get your
- * own ref with iso_node_ref(). You can can also check if the node is already 
- * on the tree by getting its parent (note that when reading El-Torito info 
- * from a previous image, the nodes might not be on the tree even if you haven't 
- * removed them). Remember that you'll need to get a new ref 
- * (with iso_node_ref()) before inserting them again to the tree, and probably 
+ * own ref with iso_node_ref(). You can can also check if the node is already
+ * on the tree by getting its parent (note that when reading El-Torito info
+ * from a previous image, the nodes might not be on the tree even if you haven't
+ * removed them). Remember that you'll need to get a new ref
+ * (with iso_node_ref()) before inserting them again to the tree, and probably
  * you will also need to set the name or permissions.
- * 
+ *
  * @param image
  *      The image from which to get the boot image.
  * @param boot
- *      If not NULL, it will be filled with a pointer to the boot image, if 
- *      any. That  object is owned by the IsoImage and should not be freed by 
+ *      If not NULL, it will be filled with a pointer to the boot image, if
+ *      any. That  object is owned by the IsoImage and should not be freed by
  *      the user, nor dereferenced once the last reference to the IsoImage was
  *      disposed via iso_image_unref().
- * @param imgnode 
+ * @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.
- * @param catnode 
- *      When not NULL, it will be filled with the catnode tree node. No extra 
+ * @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.
  * @return
  *      1 on success, 0 is the image is not bootable (i.e., it has no El-Torito
@@ -1752,8 +1753,8 @@ int iso_image_get_boot_image(IsoImage *image, ElToritoBootImage **boot,
                              IsoFile **imgnode, IsoBoot **catnode);
 
 /**
- * Removes the El-Torito bootable image. 
- * 
+ * Removes the El-Torito bootable image.
+ *
  * The IsoBoot node that acts as placeholder for the catalog is also removed
  * for the image tree, if there.
  * If the image is not bootable (don't have el-torito boot image) this function
@@ -1824,11 +1825,11 @@ enum IsoNodeType iso_node_get_type(IsoNode *node);
  * Function to handle particular extended information. The function
  * pointer acts as an identifier for the type of the information. Structs
  * with same information type must use the same function.
- * 
+ *
  * @param data
  *     Attached data
  * @param flag
- *     What to do with the data. At this time the following values are 
+ *     What to do with the data. At this time the following values are
  *     defined:
  *      -> 1 the data must be freed
  * @return
@@ -1839,17 +1840,17 @@ enum IsoNodeType iso_node_get_type(IsoNode *node);
 typedef int (*iso_node_xinfo_func)(void *data, int flag);
 
 /**
- * Add extended information to the given node. Extended info allows 
+ * Add extended information to the given node. Extended info allows
  * applications (and libisofs itself) to add more information to an IsoNode.
  * You can use this facilities to associate new information with a given
  * node.
- * 
+ *
  * Each node keeps a list of added extended info, meaning you can add several
  * extended info data to each node. Each extended info you add is identified
  * by the proc parameter, a pointer to a function that knows how to manage
  * the external info data. Thus, in order to add several types of extended
  * info, you need to define a "proc" function for each type.
- * 
+ *
  * @param node
  *      The node where to add the extended info
  * @param proc
@@ -1868,8 +1869,8 @@ int iso_node_add_xinfo(IsoNode *node, iso_node_xinfo_func proc, void *data);
 /**
  * Remove the given extended info (defined by the proc function) from the
  * given node.
- * 
- * @return 
+ *
+ * @return
  *      1 on success, 0 if node does not have extended info of the requested
  *      type, < 0 on error
  *
@@ -1880,11 +1881,11 @@ int iso_node_remove_xinfo(IsoNode *node, iso_node_xinfo_func proc);
 /**
  * Get the given extended info (defined by the proc function) from the
  * given node.
- * 
+ *
  * @param data
  *      Will be filled with the extended info corresponding to the given proc
  *      function
- * @return 
+ * @return
  *      1 on success, 0 if node does not have extended info of the requested
  *      type, < 0 on error
  *
@@ -1895,15 +1896,15 @@ int iso_node_get_xinfo(IsoNode *node, iso_node_xinfo_func proc, void **data);
 /**
  * Set the name of a node. Note that if the node is already added to a dir
  * this can fail if dir already contains a node with the new name.
- * 
+ *
  * @param node
  *      The node whose name you want to change. Note that you can't change
  *      the name of the root.
- * @param name 
- *      The name for the node. If you supply an empty string or a 
+ * @param name
+ *      The name for the node. If you supply an empty string or a
  *      name greater than 255 characters this returns with failure, and
  *      node name is not modified.
- * @return 
+ * @return
  *      1 on success, < 0 on error
  *
  * @since 0.6.2
@@ -1920,10 +1921,10 @@ int iso_node_set_name(IsoNode *node, const char *name);
 const char *iso_node_get_name(const IsoNode *node);
 
 /**
- * Set the permissions for the node. This attribute is only useful when 
+ * Set the permissions for the node. This attribute is only useful when
  * Rock Ridge extensions are enabled.
- * 
- * @param mode 
+ *
+ * @param mode
  *     bitmask with the permissions of the node, as specified in 'man 2 stat'.
  *     The file type bitfields will be ignored, only file permissions will be
  *     modified.
@@ -1932,14 +1933,14 @@ const char *iso_node_get_name(const IsoNode *node);
  */
 void iso_node_set_permissions(IsoNode *node, mode_t mode);
 
-/** 
- * Get the permissions for the node 
+/**
+ * Get the permissions for the node
  *
  * @since 0.6.2
  */
 mode_t iso_node_get_permissions(const IsoNode *node);
 
-/** 
+/**
  * Get the mode of the node, both permissions and file type, as specified in
  * 'man 2 stat'.
  *
@@ -1948,7 +1949,7 @@ mode_t iso_node_get_permissions(const IsoNode *node);
 mode_t iso_node_get_mode(const IsoNode *node);
 
 /**
- * Set the user id for the node. This attribute is only useful when 
+ * Set the user id for the node. This attribute is only useful when
  * Rock Ridge extensions are enabled.
  *
  * @since 0.6.2
@@ -1963,7 +1964,7 @@ void iso_node_set_uid(IsoNode *node, uid_t uid);
 uid_t iso_node_get_uid(const IsoNode *node);
 
 /**
- * Set the group id for the node. This attribute is only useful when 
+ * Set the group id for the node. This attribute is only useful when
  * Rock Ridge extensions are enabled.
  *
  * @since 0.6.2
@@ -1977,43 +1978,43 @@ void iso_node_set_gid(IsoNode *node, gid_t gid);
  */
 gid_t iso_node_get_gid(const IsoNode *node);
 
-/** 
+/**
  * Set the time of last modification of the file
  *
  * @since 0.6.2
  */
 void iso_node_set_mtime(IsoNode *node, time_t time);
 
-/** 
+/**
  * Get the time of last modification of the file
  *
  * @since 0.6.2
  */
 time_t iso_node_get_mtime(const IsoNode *node);
 
-/** 
+/**
  * Set the time of last access to the file
  *
  * @since 0.6.2
  */
 void iso_node_set_atime(IsoNode *node, time_t time);
 
-/** 
- * Get the time of last access to the file 
+/**
+ * Get the time of last access to the file
  *
  * @since 0.6.2
  */
 time_t iso_node_get_atime(const IsoNode *node);
 
-/** 
- * Set the time of last status change of the file 
+/**
+ * Set the time of last status change of the file
  *
  * @since 0.6.2
  */
 void iso_node_set_ctime(IsoNode *node, time_t time);
 
-/** 
- * Get the time of last status change of the file 
+/**
+ * Get the time of last status change of the file
  *
  * @since 0.6.2
  */
@@ -2021,19 +2022,19 @@ time_t iso_node_get_ctime(const IsoNode *node);
 
 /**
  * Set if the node will be hidden in RR/ISO tree, Joliet tree or both.
- * 
+ *
  * If the file is setted as hidden in one tree, it won't be included there, so
  * it won't be visible in a OS accessing CD using that tree. For example,
  * GNU/Linux systems access to Rock Ridge / ISO9960 tree in order to see
  * what is recorded on CD, while MS Windows make use of the Joliet tree. If a
  * file is hidden only in Joliet, it won't be visible in Windows systems,
  * while still visible in Linux.
- * 
+ *
  * If a file is hidden in both trees, it won't be written to image.
- * 
- * @param node 
+ *
+ * @param node
  *      The node that is to be hidden.
- * @param hide_attrs 
+ * @param hide_attrs
  *      IsoHideNodeFlag's to set the trees in which file will be hidden.
  *
  * @since 0.6.2
@@ -2045,22 +2046,22 @@ void iso_node_set_hidden(IsoNode *node, int hide_attrs);
  * the node, so you don't need to free it, it will be automatically freed
  * when the dir is deleted. Of course, if you want to keep using the node
  * after the dir life, you need to iso_node_ref() it.
- * 
- * @param dir 
+ *
+ * @param dir
  *     the dir where to add the node
- * @param child 
+ * @param child
  *     the node to add. You must ensure that the node hasn't previously added
  *     to other dir, and that the node name is unique inside the child.
  *     Otherwise this function will return a failure, and the child won't be
  *     inserted.
  * @param replace
  *     if the dir already contains a node with the same name, whether to
- *     replace or not the old node with this. 
+ *     replace or not the old node with this.
  * @return
  *     number of nodes in dir if succes, < 0 otherwise
  *     Possible errors:
  *         ISO_NULL_POINTER, if dir or child are NULL
- *         ISO_NODE_ALREADY_ADDED, if child is already added to other dir 
+ *         ISO_NODE_ALREADY_ADDED, if child is already added to other dir
  *         ISO_NODE_NAME_NOT_UNIQUE, a node with same name already exists
  *         ISO_WRONG_ARG_VALUE, if child == dir, or replace != (0,1)
  *
@@ -2071,19 +2072,19 @@ int iso_dir_add_node(IsoDir *dir, IsoNode *child,
 
 /**
  * Locate a node inside a given dir.
- * 
+ *
  * @param dir
  *     The dir where to look for the node.
  * @param name
  *     The name of the node
  * @param node
- *     Location for a pointer to the node, it will filled with NULL if the dir 
+ *     Location for a pointer to the node, it will filled with NULL if the dir
  *     doesn't have a child with the given name.
  *     The node will be owned by the dir and shouldn't be unref(). Just call
  *     iso_node_ref() to get your own reference to the node.
  *     Note that you can pass NULL is the only thing you want to do is check
  *     if a node with such name already exists on dir.
- * @return 
+ * @return
  *     1 node found, 0 child has no such node, < 0 error
  *     Possible errors:
  *         ISO_NULL_POINTER, if dir or name are NULL
@@ -2094,7 +2095,7 @@ int iso_dir_get_node(IsoDir *dir, const char *name, IsoNode **node);
 
 /**
  * Get the number of children of a directory.
- * 
+ *
  * @return
  *     >= 0 number of items, < 0 error
  *     Possible errors:
@@ -2109,8 +2110,8 @@ int iso_dir_get_children_count(IsoDir *dir);
  * The child is not freed, so you will become the owner of the node. Later
  * you can add the node to another dir (calling iso_dir_add_node), or free
  * it if you don't need it (with iso_node_unref).
- * 
- * @return 
+ *
+ * @return
  *     1 on success, < 0 error
  *     Possible errors:
  *         ISO_NULL_POINTER, if node is NULL
@@ -2125,8 +2126,8 @@ int iso_node_take(IsoNode *node);
  * If you want to keep the child alive, you need to iso_node_ref() it
  * before this call, but in that case iso_node_take() is a better
  * alternative.
- * 
- * @return 
+ *
+ * @return
  *     1 on success, < 0 error
  *
  * @since 0.6.2
@@ -2137,10 +2138,10 @@ int iso_node_remove(IsoNode *node);
  * Get the parent of the given iso tree node. No extra ref is added to the
  * returned directory, you must take your ref. with iso_node_ref() if you
  * need it.
- * 
+ *
  * If node is the root node, the same node will be returned as its parent.
- * 
- * This returns NULL if the node doesn't pertain to any tree 
+ *
+ * This returns NULL if the node doesn't pertain to any tree
  * (it was removed/take).
  *
  * @since 0.6.2
@@ -2149,15 +2150,15 @@ IsoDir *iso_node_get_parent(IsoNode *node);
 
 /**
  * Get an iterator for the children of the given dir.
- * 
+ *
  * You can iterate over the children with iso_dir_iter_next. When finished,
  * you should free the iterator with iso_dir_iter_free.
  * You musn't delete a child of the same dir, using iso_node_take() or
- * iso_node_remove(), while you're using the iterator. You can use 
+ * iso_node_remove(), while you're using the iterator. You can use
  * iso_dir_iter_take() or iso_dir_iter_remove() instead.
- * 
+ *
  * You can use the iterator in the way like this
- * 
+ *
  * IsoDirIter *iter;
  * IsoNode *node;
  * if ( iso_dir_get_children(dir, &iter) != 1 ) {
@@ -2167,11 +2168,11 @@ IsoDir *iso_node_get_parent(IsoNode *node);
  *     // do something with the child
  * }
  * iso_dir_iter_free(iter);
- * 
+ *
  * An iterator is intended to be used in a single iteration over the
  * children of a dir. Thus, it should be treated as a temporary object,
- * and free as soon as possible. 
- *  
+ * and free as soon as possible.
+ *
  * @return
  *     1 success, < 0 error
  *     Possible errors:
@@ -2187,7 +2188,7 @@ int iso_dir_get_children(const IsoDir *dir, IsoDirIter **iter);
  * Take care that the node is owned by its parent, and will be unref() when
  * the parent is freed. If you want your own ref to it, call iso_node_ref()
  * on it.
- * 
+ *
  * @return
  *     1 success, 0 if dir has no more elements, < 0 error
  *     Possible errors:
@@ -2201,7 +2202,7 @@ int iso_dir_iter_next(IsoDirIter *iter, IsoNode **node);
 
 /**
  * Check if there're more children.
- * 
+ *
  * @return
  *     1 dir has more elements, 0 no, < 0 error
  *     Possible errors:
@@ -2211,7 +2212,7 @@ int iso_dir_iter_next(IsoDirIter *iter, IsoNode **node);
  */
 int iso_dir_iter_has_next(IsoDirIter *iter);
 
-/** 
+/**
  * Free a dir iterator.
  *
  * @since 0.6.2
@@ -2222,10 +2223,10 @@ void iso_dir_iter_free(IsoDirIter *iter);
  * Removes a child from a directory during an iteration, without freeing it.
  * It's like iso_node_take(), but to be used during a directory iteration.
  * The node removed will be the last returned by the iteration.
- * 
- * If you call this function twice without calling iso_dir_iter_next between 
- * them is not allowed and you will get an ISO_ERROR in second call. 
- * 
+ *
+ * If you call this function twice without calling iso_dir_iter_next between
+ * them is not allowed and you will get an ISO_ERROR in second call.
+ *
  * @return
  *     1 on succes, < 0 error
  *     Possible errors:
@@ -2241,10 +2242,10 @@ int iso_dir_iter_take(IsoDirIter *iter);
  * Removes a child from a directory during an iteration and unref() it.
  * It's like iso_node_remove(), but to be used during a directory iteration.
  * The node removed will be the last returned by the iteration.
- * 
- * If you call this function twice without calling iso_dir_iter_next between 
- * them is not allowed and you will get an ISO_ERROR in second call. 
- * 
+ *
+ * If you call this function twice without calling iso_dir_iter_next between
+ * them is not allowed and you will get an ISO_ERROR in second call.
+ *
  * @return
  *     1 on succes, < 0 error
  *     Possible errors:
@@ -2265,11 +2266,11 @@ typedef struct iso_find_condition IsoFindCondition;
 /**
  * Create a new condition that checks if the node name matches the given
  * wildcard.
- * 
+ *
  * @param wildcard
  * @result
  *      The created IsoFindCondition, NULL on error.
- * 
+ *
  * @since 0.6.4
  */
 IsoFindCondition *iso_new_find_conditions_name(const char *wildcard);
@@ -2277,49 +2278,49 @@ IsoFindCondition *iso_new_find_conditions_name(const char *wildcard);
 /**
  * Create a new condition that checks the node mode against a mode mask. It
  * can be used to check both file type and permissions.
- * 
+ *
  * For example:
- * 
+ *
  * iso_new_find_conditions_mode(S_IFREG) : search for regular files
- * iso_new_find_conditions_mode(S_IFCHR | S_IWUSR) : search for character 
+ * iso_new_find_conditions_mode(S_IFCHR | S_IWUSR) : search for character
  *     devices where owner has write permissions.
- * 
+ *
  * @param mask
  *      Mode mask to AND against node mode.
  * @result
  *      The created IsoFindCondition, NULL on error.
- * 
+ *
  * @since 0.6.4
  */
 IsoFindCondition *iso_new_find_conditions_mode(mode_t mask);
 
 /**
  * Create a new condition that checks the node gid.
- * 
+ *
  * @param gid
  *      Desired Group Id.
  * @result
  *      The created IsoFindCondition, NULL on error.
- * 
+ *
  * @since 0.6.4
  */
 IsoFindCondition *iso_new_find_conditions_gid(gid_t gid);
 
 /**
  * Create a new condition that checks the node uid.
- * 
+ *
  * @param uid
  *      Desired User Id.
  * @result
  *      The created IsoFindCondition, NULL on error.
- * 
+ *
  * @since 0.6.4
  */
 IsoFindCondition *iso_new_find_conditions_uid(uid_t uid);
 
 /**
  * Possible comparison between IsoNode and given conditions.
- * 
+ *
  * @since 0.6.4
  */
 enum iso_find_comparisons {
@@ -2332,7 +2333,7 @@ enum iso_find_comparisons {
 
 /**
  * Create a new condition that checks the time of last access.
- * 
+ *
  * @param time
  *      Time to compare against IsoNode atime.
  * @param comparison
@@ -2341,15 +2342,15 @@ enum iso_find_comparisons {
  *      time is greater than the submitted time.
  * @result
  *      The created IsoFindCondition, NULL on error.
- * 
+ *
  * @since 0.6.4
  */
-IsoFindCondition *iso_new_find_conditions_atime(time_t time, 
+IsoFindCondition *iso_new_find_conditions_atime(time_t time,
                       enum iso_find_comparisons comparison);
 
 /**
  * Create a new condition that checks the time of last modification.
- * 
+ *
  * @param time
  *      Time to compare against IsoNode mtime.
  * @param comparison
@@ -2358,15 +2359,15 @@ IsoFindCondition *iso_new_find_conditions_atime(time_t time,
  *      time is greater than the submitted time.
  * @result
  *      The created IsoFindCondition, NULL on error.
- * 
+ *
  * @since 0.6.4
  */
-IsoFindCondition *iso_new_find_conditions_mtime(time_t time, 
+IsoFindCondition *iso_new_find_conditions_mtime(time_t time,
                       enum iso_find_comparisons comparison);
 
 /**
  * Create a new condition that checks the time of last status change.
- * 
+ *
  * @param time
  *      Time to compare against IsoNode ctime.
  * @param comparison
@@ -2375,56 +2376,56 @@ IsoFindCondition *iso_new_find_conditions_mtime(time_t time,
  *      time is greater than the submitted time.
  * @result
  *      The created IsoFindCondition, NULL on error.
- * 
+ *
  * @since 0.6.4
  */
-IsoFindCondition *iso_new_find_conditions_ctime(time_t time, 
+IsoFindCondition *iso_new_find_conditions_ctime(time_t time,
                       enum iso_find_comparisons comparison);
 
 /**
  * Create a new condition that check if the two given conditions are
  * valid.
- * 
+ *
  * @param a
  * @param b
  *      IsoFindCondition to compare
  * @result
  *      The created IsoFindCondition, NULL on error.
- * 
+ *
  * @since 0.6.4
  */
-IsoFindCondition *iso_new_find_conditions_and(IsoFindCondition *a, 
+IsoFindCondition *iso_new_find_conditions_and(IsoFindCondition *a,
                                               IsoFindCondition *b);
 
 /**
- * Create a new condition that check if at least one the two given conditions 
+ * Create a new condition that check if at least one the two given conditions
  * is valid.
- * 
+ *
  * @param a
  * @param b
  *      IsoFindCondition to compare
  * @result
  *      The created IsoFindCondition, NULL on error.
- * 
+ *
  * @since 0.6.4
  */
-IsoFindCondition *iso_new_find_conditions_or(IsoFindCondition *a, 
+IsoFindCondition *iso_new_find_conditions_or(IsoFindCondition *a,
                                               IsoFindCondition *b);
 
 /**
  * Create a new condition that check if the given conditions is false.
- * 
+ *
  * @param negate
  * @result
  *      The created IsoFindCondition, NULL on error.
- * 
+ *
  * @since 0.6.4
  */
 IsoFindCondition *iso_new_find_conditions_not(IsoFindCondition *negate);
 
 /**
  * Find all directory children that match the given condition.
- * 
+ *
  * @param dir
  *      Directory where we will search children.
  * @param cond
@@ -2435,10 +2436,10 @@ IsoFindCondition *iso_new_find_conditions_not(IsoFindCondition *negate);
  *      Iterator that returns only the children that match condition.
  * @return
  *      1 on success, < 0 on error
- * 
+ *
  * @since 0.6.4
  */
-int iso_dir_find_children(IsoDir* dir, IsoFindCondition *cond, 
+int iso_dir_find_children(IsoDir* dir, IsoFindCondition *cond,
                           IsoDirIter **iter);
 
 /**
@@ -2452,7 +2453,7 @@ const char *iso_symlink_get_dest(const IsoSymlink *link);
 
 /**
  * Set the destination of a link.
- * 
+ *
  * @param dest
  *     New destination for the link. It must be a non-empty string, otherwise
  *     this function doesn't modify previous destination.
@@ -2466,13 +2467,13 @@ int iso_symlink_set_dest(IsoSymlink *link, const char *dest);
 /**
  * Sets the order in which a node will be written on image. High weihted files
  * will be written first, so in a disc them will be written near the center.
- * 
- * @param node 
- *      The node which weight will be changed. If it's a dir, this function 
- *      will change the weight of all its children. For nodes other that dirs 
+ *
+ * @param node
+ *      The node which weight will be changed. If it's a dir, this function
+ *      will change the weight of all its children. For nodes other that dirs
  *      or regular files, this function has no effect.
- * @param w 
- *      The weight as a integer number, the greater this value is, the 
+ * @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.
  *
  * @since 0.6.2
@@ -2486,8 +2487,8 @@ void iso_node_set_sort_weight(IsoNode *node, int w);
  */
 int iso_file_get_sort_weight(IsoFile *file);
 
-/** 
- * Get the size of the file, in bytes 
+/**
+ * Get the size of the file, in bytes
  *
  * @since 0.6.2
  */
@@ -2495,9 +2496,9 @@ off_t iso_file_get_size(IsoFile *file);
 
 /**
  * Get the IsoStream that represents the contents of the given IsoFile.
- * 
+ *
  * If you open() the stream, it should be close() before image generation.
- * 
+ *
  * @return
  *      The IsoStream. No extra ref is added, so the IsoStream belong to the
  *      IsoFile, and it may be freed together with it. Add your own ref with
@@ -2509,7 +2510,7 @@ IsoStream *iso_file_get_stream(IsoFile *file);
 
 /**
  * Get the block lba of a file node, if it was imported from an old image.
- * 
+ *
  * @param file
  *      The file
  * @param lba
@@ -2518,7 +2519,7 @@ IsoStream *iso_file_get_stream(IsoFile *file);
  *      Reserved for future usage, submit 0
  * @return
  *      1 if lba is valid (file comes from old image), 0 if file was newly
- *      added, i.e. it does not come from an old image, < 0 error 
+ *      added, i.e. it does not come from an old image, < 0 error
  *
  * @since 0.6.4
  */
@@ -2526,10 +2527,10 @@ int iso_file_get_old_image_lba(IsoFile *file, uint32_t *lba, int flag);
 
 /*
  * Like iso_file_get_old_image_lba(), but take an IsoNode.
- * 
+ *
  * @return
  *      1 if lba is valid (file comes from old image), 0 if file was newly
- *      added, i.e. it does not come from an old image, 2 node type has no 
+ *      added, i.e. it does not come from an old image, 2 node type has no
  *      LBA (no regular file), < 0 error
  *
  * @since 0.6.4
@@ -2539,8 +2540,8 @@ int iso_node_get_old_image_lba(IsoNode *node, uint32_t *lba, int flag);
 /**
  * Add a new directory to the iso tree. Permissions, owner and hidden atts
  * are taken from parent, you can modify them later.
- * 
- * @param parent 
+ *
+ * @param parent
  *      the dir where the new directory will be created
  * @param name
  *      name for the new dir. If a node with same name already exists on
@@ -2562,11 +2563,11 @@ int iso_node_get_old_image_lba(IsoNode *node, uint32_t *lba, int flag);
 int iso_tree_add_new_dir(IsoDir *parent, const char *name, IsoDir **dir);
 
 /**
- * Add a new regular file to the iso tree. Permissions are set to 0444, 
- * owner and hidden atts are taken from parent. You can modify any of them 
+ * Add a new regular file to the iso tree. Permissions are set to 0444,
+ * owner and hidden atts are taken from parent. You can modify any of them
  * later.
- *  
- * @param parent 
+ *
+ * @param parent
  *      the dir where the new file will be created
  * @param name
  *      name for the new file. If a node with same name already exists on
@@ -2586,18 +2587,18 @@ int iso_tree_add_new_dir(IsoDir *parent, const char *name, IsoDir **dir);
  *         ISO_NULL_POINTER, if parent, name or dest are NULL
  *         ISO_NODE_NAME_NOT_UNIQUE, a node with same name already exists
  *         ISO_OUT_OF_MEM
- * 
+ *
  * @since 0.6.4
  */
-int iso_tree_add_new_file(IsoDir *parent, const char *name, IsoStream *stream, 
+int iso_tree_add_new_file(IsoDir *parent, const char *name, IsoStream *stream,
                           IsoFile **file);
 
 /**
- * Add a new symlink to the directory tree. Permissions are set to 0777, 
- * owner and hidden atts are taken from parent. You can modify any of them 
+ * Add a new symlink to the directory tree. Permissions are set to 0777,
+ * owner and hidden atts are taken from parent. You can modify any of them
  * later.
- *  
- * @param parent 
+ *
+ * @param parent
  *      the dir where the new symlink will be created
  * @param name
  *      name for the new symlink. If a node with same name already exists on
@@ -2626,30 +2627,30 @@ int iso_tree_add_new_symlink(IsoDir *parent, const char *name,
  * an special file is a block device, a character device, a FIFO (named pipe)
  * or a socket. You can choose the specific kind of file you want to add
  * by setting mode propertly (see man 2 stat).
- * 
- * Note that special files are only written to image when Rock Ridge 
+ *
+ * Note that special files are only written to image when Rock Ridge
  * extensions are enabled. Moreover, a special file is just a directory entry
  * in the image tree, no data is written beyond that.
- * 
- * Owner and hidden atts are taken from parent. You can modify any of them 
+ *
+ * Owner and hidden atts are taken from parent. You can modify any of them
  * later.
- * 
+ *
  * @param parent
  *      the dir where the new special file will be created
  * @param name
- *      name for the new special file. If a node with same name already exists 
+ *      name for the new special file. If a node with same name already exists
  *      on parent, this functions fails with ISO_NODE_NAME_NOT_UNIQUE.
  * @param mode
  *      file type and permissions for the new node. Note that you can't
  *      specify any kind of file here, only special types are allowed. i.e,
- *      S_IFSOCK, S_IFBLK, S_IFCHR and S_IFIFO are valid types; S_IFLNK, 
+ *      S_IFSOCK, S_IFBLK, S_IFCHR and S_IFIFO are valid types; S_IFLNK,
  *      S_IFREG and S_IFDIR aren't.
  * @param dev
  *      device ID, equivalent to the st_rdev field in man 2 stat.
  * @param special
- *      place where to store a pointer to the newly created special file. No 
- *      extra ref is addded, so you will need to call iso_node_ref() if you 
- *      really need it. You can pass NULL in this parameter if you don't need 
+ *      place where to store a pointer to the newly created special file. No
+ *      extra ref is addded, so you will need to call iso_node_ref() if you
+ *      really need it. You can pass NULL in this parameter if you don't need
  *      the pointer.
  * @return
  *     number of nodes in parent if success, < 0 otherwise
@@ -2674,7 +2675,7 @@ void iso_tree_set_follow_symlinks(IsoImage *image, int follow);
 
 /**
  * Get current setting for follow_symlinks.
- * 
+ *
  * @see iso_tree_set_follow_symlinks
  * @since 0.6.2
  */
@@ -2690,7 +2691,7 @@ void iso_tree_set_ignore_hidden(IsoImage *image, int skip);
 
 /**
  * Get current setting for ignore_hidden.
- * 
+ *
  * @see iso_tree_set_ignore_hidden
  * @since 0.6.2
  */
@@ -2698,7 +2699,7 @@ int iso_tree_get_ignore_hidden(IsoImage *image);
 
 /**
  * Set the replace mode, that defines the behavior of libisofs when adding
- * a node whit the same name that an existent one, during a recursive 
+ * a node whit the same name that an existent one, during a recursive
  * directory addition.
  *
  * @since 0.6.2
@@ -2707,7 +2708,7 @@ void iso_tree_set_replace_mode(IsoImage *image, enum iso_replace_mode mode);
 
 /**
  * Get current setting for replace_mode.
- * 
+ *
  * @see iso_tree_set_replace_mode
  * @since 0.6.2
  */
@@ -2717,8 +2718,8 @@ enum iso_replace_mode iso_tree_get_replace_mode(IsoImage *image);
  * Set whether to skip or not special files. Default behavior is to not skip
  * them. Note that, despite of this setting, special files won't never be added
  * to an image unless RR extensions were enabled.
- * 
- * @param skip 
+ *
+ * @param skip
  *      Bitmask to determine what kind of special files will be skipped:
  *          bit0: ignore FIFOs
  *          bit1: ignore Sockets
@@ -2731,7 +2732,7 @@ void iso_tree_set_ignore_special(IsoImage *image, int skip);
 
 /**
  * Get current setting for ignore_special.
- * 
+ *
  * @see iso_tree_set_ignore_special
  * @since 0.6.2
  */
@@ -2740,48 +2741,48 @@ int iso_tree_get_ignore_special(IsoImage *image);
 /**
  * Add a excluded path. These are paths that won't never added to image,
  * and will be excluded even when adding recursively its parent directory.
- * 
+ *
  * For example, in
- * 
+ *
  *   iso_tree_add_exclude(image, "/home/user/data/private");
  *   iso_tree_add_dir_rec(image, root, "/home/user/data");
- * 
- * the directory /home/user/data/private won't be added to image. 
- * 
+ *
+ * the directory /home/user/data/private won't be added to image.
+ *
  * However, if you explicity add a deeper dir, it won't be excluded. i.e.,
  * in the following example.
- * 
+ *
  *   iso_tree_add_exclude(image, "/home/user/data");
  *   iso_tree_add_dir_rec(image, root, "/home/user/data/private");
- * 
+ *
  * the directory /home/user/data/private is added. On the other, side, and
  * foollowing the the example above,
- * 
+ *
  *   iso_tree_add_dir_rec(image, root, "/home/user");
- * 
+ *
  * will exclude the directory "/home/user/data".
- * 
+ *
  * Absolute paths are not mandatory, you can, for example, add a relative
  * path such as:
- * 
+ *
  *   iso_tree_add_exclude(image, "private");
  *   iso_tree_add_exclude(image, "user/data");
- * 
+ *
  * to excluve, respectively, all files or dirs named private, and also all
  * files or dirs named data that belong to a folder named "user". Not that the
  * above rule about deeper dirs is still valid. i.e., if you call
- * 
+ *
  *   iso_tree_add_dir_rec(image, root, "/home/user/data/music");
- * 
+ *
  * it is included even containing "user/data" string. However, a possible
  * "/home/user/data/music/user/data" is not added.
- * 
+ *
  * Usual wildcards, such as * or ? are also supported, with the usual meaning
  * as stated in "man 7 glob". For example
- * 
+ *
  * // to exclude backup text files
  * iso_tree_add_exclude(image, "*.~");
- * 
+ *
  * @return
  *      1 on success, < 0 on error
  *
@@ -2791,7 +2792,7 @@ int iso_tree_add_exclude(IsoImage *image, const char *path);
 
 /**
  * Remove a previously added exclude.
- * 
+ *
  * @see iso_tree_add_exclude
  * @return
  *      1 on success, 0 exclude do not exists, < 0 on error
@@ -2804,28 +2805,28 @@ int iso_tree_remove_exclude(IsoImage *image, const char *path);
  * Set a callback function that libisofs will call for each file that is
  * added to the given image by a recursive addition function. This includes
  * image import.
- *  
+ *
  * @param report
- *      pointer to a function that will be called just before a file will be 
- *      added to the image. You can control whether the file will be in fact 
+ *      pointer to a function that will be called just before a file will be
+ *      added to the image. You can control whether the file will be in fact
  *      added or ignored.
- *      This function should return 1 to add the file, 0 to ignore it and 
+ *      This function should return 1 to add the file, 0 to ignore it and
  *      continue, < 0 to abort the process
  *      NULL is allowed if you don't want any callback.
  *
  * @since 0.6.2
  */
-void iso_tree_set_report_callback(IsoImage *image, 
+void iso_tree_set_report_callback(IsoImage *image,
                                   int (*report)(IsoImage*, IsoFileSource*));
 
 /**
- * Add a new node to the image tree, from an existing file. 
- * 
+ * Add a new node to the image tree, from an existing file.
+ *
  * TODO comment Builder and Filesystem related issues when exposing both
- * 
+ *
  * All attributes will be taken from the source file. The appropriate file
  * type will be created.
- * 
+ *
  * @param image
  *      The image
  * @param parent
@@ -2833,9 +2834,9 @@ void iso_tree_set_report_callback(IsoImage *image,
  * @param path
  *      The path of the file to add in the filesystem.
  * @param node
- *      place where to store a pointer to the newly added file. No 
- *      extra ref is addded, so you will need to call iso_node_ref() if you 
- *      really need it. You can pass NULL in this parameter if you don't need 
+ *      place where to store a pointer to the newly added file. No
+ *      extra ref is addded, so you will need to call iso_node_ref() if you
+ *      really need it. You can pass NULL in this parameter if you don't need
  *      the pointer.
  * @return
  *     number of nodes in parent if success, < 0 otherwise
@@ -2852,7 +2853,7 @@ int iso_tree_add_node(IsoImage *image, IsoDir *parent, const char *path,
 /**
  * Add a new node to the image tree, from an existing file, and with the
  * given name, that must not exist on dir.
- * 
+ *
  * @param image
  *      The image
  * @param parent
@@ -2862,9 +2863,9 @@ int iso_tree_add_node(IsoImage *image, IsoDir *parent, const char *path,
  * @param path
  *      The path of the file to add in the filesystem.
  * @param node
- *      place where to store a pointer to the newly added file. No 
- *      extra ref is addded, so you will need to call iso_node_ref() if you 
- *      really need it. You can pass NULL in this parameter if you don't need 
+ *      place where to store a pointer to the newly added file. No
+ *      extra ref is addded, so you will need to call iso_node_ref() if you
+ *      really need it. You can pass NULL in this parameter if you don't need
  *      the pointer.
  * @return
  *     number of nodes in parent if success, < 0 otherwise
@@ -2872,10 +2873,10 @@ int iso_tree_add_node(IsoImage *image, IsoDir *parent, const char *path,
  *         ISO_NULL_POINTER, if image, parent or path are NULL
  *         ISO_NODE_NAME_NOT_UNIQUE, a node with same name already exists
  *         ISO_OUT_OF_MEM
- * 
+ *
  * @since 0.6.4
  */
-int iso_tree_add_new_node(IsoImage *image, IsoDir *parent, const char *name, 
+int iso_tree_add_new_node(IsoImage *image, IsoDir *parent, const char *name,
                           const char *path, IsoNode **node);
 
 /**
@@ -2883,7 +2884,7 @@ int iso_tree_add_new_node(IsoImage *image, IsoDir *parent, const char *name,
  * given name, that must not exist on dir. The node will be cut-out to the
  * submitted size, and its contents will be read from the given offset. This
  * function is thus suitable for adding only a piece of a file to the image.
- * 
+ *
  * @param image
  *      The image
  * @param parent
@@ -2898,9 +2899,9 @@ int iso_tree_add_new_node(IsoImage *image, IsoDir *parent, const char *name,
  * @param size
  *      Max size of the file.
  * @param node
- *      place where to store a pointer to the newly added file. No 
- *      extra ref is addded, so you will need to call iso_node_ref() if you 
- *      really need it. You can pass NULL in this parameter if you don't need 
+ *      place where to store a pointer to the newly added file. No
+ *      extra ref is addded, so you will need to call iso_node_ref() if you
+ *      really need it. You can pass NULL in this parameter if you don't need
  *      the pointer.
  * @return
  *     number of nodes in parent if success, < 0 otherwise
@@ -2908,30 +2909,30 @@ int iso_tree_add_new_node(IsoImage *image, IsoDir *parent, const char *name,
  *         ISO_NULL_POINTER, if image, parent or path are NULL
  *         ISO_NODE_NAME_NOT_UNIQUE, a node with same name already exists
  *         ISO_OUT_OF_MEM
- * 
+ *
  * @since 0.6.4
  */
-int iso_tree_add_new_cut_out_node(IsoImage *image, IsoDir *parent, 
-                                  const char *name, const char *path, 
+int iso_tree_add_new_cut_out_node(IsoImage *image, IsoDir *parent,
+                                  const char *name, const char *path,
                                   off_t offset, off_t size,
                                   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
  * for recursive directory addition.
- * 
+ *
  * TODO comment Builder and Filesystem related issues when exposing both
- * 
+ *
  * @param image
  *      The image to which the directory belong.
  * @param parent
  *      Directory on the image tree where to add the contents of the dir
  * @param dir
  *      Path to a dir in the filesystem
- * @return 
+ * @return
  *     number of nodes in parent if success, < 0 otherwise
  *
  * @since 0.6.2
@@ -2940,9 +2941,9 @@ int iso_tree_add_dir_rec(IsoImage *image, IsoDir *parent, const char *dir);
 
 /**
  * Locate a node by its path on image.
- * 
+ *
  * @param node
- *     Location for a pointer to the node, it will filled with NULL if the 
+ *     Location for a pointer to the node, it will filled with NULL if the
  *     given path does not exists on image.
  *     The node will be owned by the image and shouldn't be unref(). Just call
  *     iso_node_ref() to get your own reference to the node.
@@ -2956,8 +2957,8 @@ int iso_tree_add_dir_rec(IsoImage *image, IsoDir *parent, const char *dir);
 int iso_tree_path_to_node(IsoImage *image, const char *path, IsoNode **node);
 
 /**
- * Get the path on image of the given node. 
- * 
+ * Get the path on image of the given node.
+ *
  * @return
  *      The path on the image, that must be freed when no more needed. If the
  *      given node is not added to any image, this returns NULL.
@@ -2984,7 +2985,7 @@ void iso_data_source_unref(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
  * and standard POSIX I/O calls.
- * 
+ *
  * @param path
  *     The path of the file
  * @param src
@@ -2998,9 +2999,9 @@ int iso_data_source_new_from_file(const char *path, IsoDataSource **src);
 
 /**
  * Get the status of the buffer used by a burn_source.
- * 
+ *
  * @param b
- *      A burn_source previously obtained with 
+ *      A burn_source previously obtained with
  *      iso_image_create_burn_source().
  * @param size
  *      Will be filled with the total size of the buffer, in bytes
@@ -3022,11 +3023,11 @@ int iso_ring_buffer_get_status(struct burn_source *b, size_t *size,
 
 #define ISO_MSGS_MESSAGE_LEN 4096
 
-/** 
+/**
  * Control queueing and stderr printing of messages from libisofs.
  * Severity may be one of "NEVER", "FATAL", "SORRY", "WARNING", "HINT",
  * "NOTE", "UPDATE", "DEBUG", "ALL".
- * 
+ *
  * @param queue_severity Gives the minimum limit for messages to be queued.
  *                       Default: "NEVER". If you queue messages then you
  *                       must consume them by iso_msgs_obtain().
@@ -3040,25 +3041,25 @@ int iso_ring_buffer_get_status(struct burn_source *b, size_t *size,
 int iso_set_msgs_severities(char *queue_severity, char *print_severity,
                             char *print_id);
 
-/** 
+/**
  * Obtain the oldest pending libisofs message from the queue which has at
  * least the given minimum_severity. This message and any older message of
  * lower severity will get discarded from the queue and is then lost forever.
- * 
+ *
  * Severity may be one of "NEVER", "FATAL", "SORRY", "WARNING", "HINT",
  * "NOTE", "UPDATE", "DEBUG", "ALL". To call with minimum_severity "NEVER"
  * will discard the whole queue.
- * 
- * @param error_code 
+ *
+ * @param error_code
  *     Will become a unique error code as listed at the end of this header
  * @param imgid
  *     Id of the image that was issued the message.
  * @param msg_text
  *     Must provide at least ISO_MSGS_MESSAGE_LEN bytes.
  * @param severity
- *     Will become the severity related to the message and should provide at 
+ *     Will become the severity related to the message and should provide at
  *     least 80 bytes.
- * @return 
+ * @return
  *     1 if a matching item was found, 0 if not, <0 for severe errors
  *
  * @since 0.6.2
@@ -3067,57 +3068,57 @@ int iso_obtain_msgs(char *minimum_severity, int *error_code, int *imgid,
                     char msg_text[], char severity[]);
 
 
-/** 
+/**
  * Submit a message to the libisofs queueing system. It will be queued or
  * printed as if it was generated by libisofs itself.
- * 
- * @param error_code 
+ *
+ * @param error_code
  *      The unique error code of your message.
- *      Submit 0 if you do not have reserved error codes within the libburnia 
+ *      Submit 0 if you do not have reserved error codes within the libburnia
  *      project.
- * @param msg_text 
+ * @param msg_text
  *      Not more than ISO_MSGS_MESSAGE_LEN characters of message text.
- * @param os_errno 
- *      Eventual errno related to the message. Submit 0 if the message is not 
+ * @param os_errno
+ *      Eventual errno related to the message. Submit 0 if the message is not
  *      related to a operating system error.
- * @param severity 
+ * @param severity
  *      One of "ABORT", "FATAL", "FAILURE", "SORRY", "WARNING", "HINT", "NOTE",
  *      "UPDATE", "DEBUG". Defaults to "FATAL".
  * @param origin
  *      Submit 0 for now.
- * @return 
+ * @return
  *      1 if message was delivered, <=0 if failure
- * 
+ *
  * @since 0.6.4
  */
 int iso_msgs_submit(int error_code, char msg_text[], int os_errno,
                     char severity[], int origin);
 
 
-/** 
+/**
  * Convert a severity name into a severity number, which gives the severity
  * rank of the name.
- * 
- * @param severity_name 
+ *
+ * @param severity_name
  *      A name as with iso_msgs_submit(), e.g. "SORRY".
- * @param severity_number 
+ * @param severity_number
  *      The rank number: the higher, the more severe.
- * @return 
+ * @return
  *      >0 success, <=0 failure
- * 
+ *
  * @since 0.6.4
  */
 int iso_text_to_sev(char *severity_name, int *severity_number);
 
-    
-/** 
+
+/**
  * Convert a severity number into a severity name
- * 
- * @param severity_number 
+ *
+ * @param severity_number
  *      The rank number: the higher, the more severe.
- * @param severity_name 
+ * @param severity_name
  *      A name as with iso_msgs_submit(), e.g. "SORRY".
- * 
+ *
  * @since 0.6.4
  */
 int iso_sev_to_text(int severity_number, char **severity_name);
@@ -3152,7 +3153,7 @@ const char *iso_error_to_msg(int errcode);
  *       0x68000000 -> FAILURE
  *       0x70000000 -> FATAL
  *       0x71000000 -> ABORT
- * 
+ *
  * @since 0.6.2
  */
 int iso_error_get_severity(int e);
@@ -3164,7 +3165,7 @@ int iso_error_get_severity(int e);
  *      0x10000000 -> LOW
  *      0x20000000 -> MEDIUM
  *      0x30000000 -> HIGH
- * 
+ *
  * @since 0.6.2
  */
 int iso_error_get_priority(int e);
@@ -3175,15 +3176,15 @@ int iso_error_get_priority(int e);
 int iso_error_get_code(int e);
 
 /**
- * Set the minimum error severity that causes a libisofs operation to 
+ * Set the minimum error severity that causes a libisofs operation to
  * be aborted as soon as possible.
- * 
+ *
  * @param severity
- *      one of "FAILURE", "MISHAP", "SORRY", "WARNING", "HINT", "NOTE".  
- *      Severities greater or equal than FAILURE always cause program to abort. 
+ *      one of "FAILURE", "MISHAP", "SORRY", "WARNING", "HINT", "NOTE".
+ *      Severities greater or equal than FAILURE always cause program to abort.
  *      Severities under NOTE won't never cause function abort.
- * @return 
- *      Previous abort priority on success, < 0 on error. 
+ * @return
+ *      Previous abort priority on success, < 0 on error.
  *
  * @since 0.6.2
  */
@@ -3194,7 +3195,7 @@ int iso_set_abort_severity(char *severity);
  * may be used by related libraries to  their own compatible
  * messenger objects and thus to direct their messages to the libisofs
  * message queue. See also: libburn, API function burn_set_messenger().
- * 
+ *
  * @return the handle. Do only use with compatible
  *
  * @since 0.6.2
@@ -3216,16 +3217,16 @@ void iso_file_source_ref(IsoFileSource *src);
  */
 void iso_file_source_unref(IsoFileSource *src);
 
-/* 
+/*
  * this are just helpers to invoque methods in class
  */
 
 /**
  * Get the path, relative to the filesystem this file source
  * belongs to.
- * 
+ *
  * @return
- *     the path of the FileSource inside the filesystem, it should be 
+ *     the path of the FileSource inside the filesystem, it should be
  *     freed when no more needed.
  *
  * @since 0.6.2
@@ -3233,8 +3234,8 @@ void iso_file_source_unref(IsoFileSource *src);
 char* iso_file_source_get_path(IsoFileSource *src);
 
 /**
- * Get the name of the file, with the dir component of the path. 
- * 
+ * Get the name of the file, with the dir component of the path.
+ *
  * @return
  *     the name of the file, it should be freed when no more needed.
  *
@@ -3265,7 +3266,7 @@ int iso_file_source_lstat(IsoFileSource *src, struct stat *info);
  * read access to the image it will be able to read all files inside it,
  * despite of the particular permission of each file in the RR tree, that
  * are what the above functions return.
- * 
+ *
  * @return
  *     1 if process has read access, < 0 on error
  *      Error codes:
@@ -3283,7 +3284,7 @@ int iso_file_source_access(IsoFileSource *src);
 /**
  * Get information about the file. If the file is a symlink, the info
  * returned refers to the destination.
- * 
+ *
  * @return
  *    1 success, < 0 error
  *      Error codes:
@@ -3329,11 +3330,11 @@ int iso_file_source_close(IsoFileSource *src);
 /**
  * Attempts to read up to count bytes from the given source into
  * the buffer starting at buf.
- * 
- * The file src must be open() before calling this, and close() when no 
+ *
+ * The file src must be open() before calling this, and close() when no
  * more needed. Not valid for dirs. On symlinks it reads the destination
  * file.
- * 
+ *
  * @param src
  *     The given source
  * @param buf
@@ -3341,7 +3342,7 @@ int iso_file_source_close(IsoFileSource *src);
  *     stored
  * @param count
  *     Bytes to read
- * @return 
+ * @return
  *     number of bytes read, 0 if EOF, < 0 on error
  *      Error codes:
  *         ISO_FILE_ERROR
@@ -3357,16 +3358,16 @@ int iso_file_source_close(IsoFileSource *src);
 int iso_file_source_read(IsoFileSource *src, void *buf, size_t count);
 
 /**
- * Repositions the offset of the given IsoFileSource (must be opened) to the 
+ * Repositions the offset of the given IsoFileSource (must be opened) to the
  * given offset according to the value of flag.
- * 
+ *
  * @param offset
- *      in bytes 
+ *      in bytes
  * @param flag
  *      0 The offset is set to offset bytes (SEEK_SET)
- *      1 The offset is set to its current location plus offset bytes 
+ *      1 The offset is set to its current location plus offset bytes
  *        (SEEK_CUR)
- *      2 The offset is set to the size of the file plus offset bytes 
+ *      2 The offset is set to the size of the file plus offset bytes
  *        (SEEK_END).
  * @return
  *      Absolute offset posistion on the file, or < 0 on error. Cast the
@@ -3376,19 +3377,19 @@ int iso_file_source_read(IsoFileSource *src, void *buf, size_t count);
 off_t iso_file_source_lseek(IsoFileSource *src, off_t offset, int flag);
 
 /**
- * Read a directory. 
- * 
+ * Read a directory.
+ *
  * Each call to this function will return a new children, until we reach
  * the end of file (i.e, no more children), in that case it returns 0.
- * 
+ *
  * The dir must be open() before calling this, and close() when no more
- * needed. Only valid for dirs. 
- * 
+ * needed. Only valid for dirs.
+ *
  * Note that "." and ".." children MUST NOT BE returned.
- * 
+ *
  * @param child
  *     pointer to be filled with the given child. Undefined on error or OEF
- * @return 
+ * @return
  *     1 on success, 0 if EOF (no more children), < 0 on error
  *      Error codes:
  *         ISO_FILE_ERROR
@@ -3404,16 +3405,16 @@ int iso_file_source_readdir(IsoFileSource *src, IsoFileSource **child);
 /**
  * Read the destination of a symlink. You don't need to open the file
  * to call this.
- * 
+ *
  * @param src
  *     An IsoFileSource corresponding to a symbolic link.
- * @param buf 
- *     allocated buffer of at least bufsiz bytes. 
+ * @param buf
+ *     allocated buffer of at least bufsiz bytes.
  *     The dest. will be copied there, and it will be NULL-terminated
  * @param bufsiz
  *     characters to be copied. Destination link will be truncated if
  *     it is larger than given size. This include the '\0' character.
- * @return 
+ * @return
  *     1 on success, < 0 on error
  *      Error codes:
  *         ISO_FILE_ERROR
@@ -3431,7 +3432,7 @@ int iso_file_source_readlink(IsoFileSource *src, char *buf, size_t bufsiz);
 /**
  * Get the filesystem for this source. No extra ref is added, so you
  * musn't unref the IsoFilesystem.
- * 
+ *
  * @return
  *     The filesystem, NULL on error
  *
@@ -3447,7 +3448,7 @@ IsoFilesystem* iso_file_source_get_filesystem(IsoFileSource *src);
 void iso_filesystem_ref(IsoFilesystem *fs);
 
 /**
- * Drop your ref to the given IsoFilesystem, evetually freeing associated 
+ * Drop your ref to the given IsoFilesystem, evetually freeing associated
  * resources.
  *
  * @since 0.6.2
@@ -3456,7 +3457,7 @@ void iso_filesystem_unref(IsoFilesystem *fs);
 
 /**
  * Create a new IsoFilesystem to access a existent ISO image.
- * 
+ *
  * @param src
  *      Data source to access data.
  * @param opts
@@ -3494,7 +3495,7 @@ const char *iso_image_fs_get_volset_id(IsoImageFilesystem *fs);
 const char *iso_image_fs_get_volume_id(IsoImageFilesystem *fs);
 
 /**
- * Get the publisher identifier for an existent image. The returned string 
+ * Get the publisher identifier for an existent image. The returned string
  * belong to the IsoImageFilesystem and shouldn't be free() nor modified.
  *
  * @since 0.6.2
@@ -3502,7 +3503,7 @@ const char *iso_image_fs_get_volume_id(IsoImageFilesystem *fs);
 const char *iso_image_fs_get_publisher_id(IsoImageFilesystem *fs);
 
 /**
- * Get the data preparer identifier for an existent image. The returned string 
+ * Get the data preparer identifier for an existent image. The returned string
  * belong to the IsoImageFilesystem and shouldn't be free() nor modified.
  *
  * @since 0.6.2
@@ -3518,7 +3519,7 @@ const char *iso_image_fs_get_data_preparer_id(IsoImageFilesystem *fs);
 const char *iso_image_fs_get_system_id(IsoImageFilesystem *fs);
 
 /**
- * Get the application identifier for an existent image. The returned string 
+ * Get the application identifier for an existent image. The returned string
  * belong to the IsoImageFilesystem and shouldn't be free() nor modified.
  *
  * @since 0.6.2
@@ -3542,7 +3543,7 @@ const char *iso_image_fs_get_copyright_file_id(IsoImageFilesystem *fs);
 const char *iso_image_fs_get_abstract_file_id(IsoImageFilesystem *fs);
 
 /**
- * Get the biblio file identifier for an existent image. The returned string 
+ * Get the biblio file identifier for an existent image. The returned string
  * belong to the IsoImageFilesystem and shouldn't be free() nor modified.
  *
  * @since 0.6.2
@@ -3551,7 +3552,7 @@ const char *iso_image_fs_get_biblio_file_id(IsoImageFilesystem *fs);
 
 /**
  * Increment reference count of an IsoStream.
- * 
+ *
  * @since 0.6.4
  */
 void iso_stream_ref(IsoStream *stream);
@@ -3559,7 +3560,7 @@ void iso_stream_ref(IsoStream *stream);
 /**
  * Decrement reference count of an IsoStream, and eventually free it if
  * refcount reach 0.
- * 
+ *
  * @since 0.6.4
  */
 void iso_stream_unref(IsoStream *stream);
@@ -3567,32 +3568,32 @@ void iso_stream_unref(IsoStream *stream);
 /**
  * Opens the given stream. Remember to close the Stream before writing the
  * image.
- * 
- * @return 
+ *
+ * @return
  *     1 on success, 2 file greater than expected, 3 file smaller than
  *     expected, < 0 on error
- * 
+ *
  * @since 0.6.4
  */
 int iso_stream_open(IsoStream *stream);
 
 /**
  * Close a previously openned IsoStream.
- * 
- * @return 
+ *
+ * @return
  *      1 on success, < 0 on error
- * 
+ *
  * @since 0.6.4
  */
 int iso_stream_close(IsoStream *stream);
 
 /**
- * Get the size of a given stream. This function should always return the same 
+ * Get the size of a given stream. This function should always return the same
  * size, even if the underlying source size changes.
- * 
- * @return 
+ *
+ * @return
  *      IsoStream size in bytes
- * 
+ *
  * @since 0.6.4
  */
 off_t iso_stream_get_size(IsoStream *stream);
@@ -3600,49 +3601,49 @@ off_t iso_stream_get_size(IsoStream *stream);
 /**
  * Attempts to read up to count bytes from the given stream into
  * the buffer starting at buf.
- * 
- * The stream must be open() before calling this, and close() when no 
- * more needed. 
- * 
- * @return 
+ *
+ * The stream must be open() before calling this, and close() when no
+ * more needed.
+ *
+ * @return
  *     number of bytes read, 0 if EOF, < 0 on error
- * 
+ *
  * @since 0.6.4
  */
 int iso_stream_read(IsoStream *stream, void *buf, size_t count);
 
 /**
- * Whether the given IsoStream can be read several times, with the same 
- * results. 
+ * Whether the given IsoStream can be read several times, with the same
+ * results.
  * For example, a regular file is repeatable, you can read it as many
- * times as you want. However, a pipe isn't. 
- * 
+ * times as you want. However, a pipe isn't.
+ *
  * This function doesn't take into account if the file has been modified
- * between the two reads. 
- * 
+ * between the two reads.
+ *
  * @return
  *     1 if stream is repeatable, 0 if not, < 0 on error
- * 
+ *
  * @since 0.6.4
  */
 int iso_stream_is_repeatable(IsoStream *stream);
 
 /**
  * Get an unique identifier for a given IsoStream.
- * 
+ *
  * @since 0.6.4
  */
 void iso_stream_get_id(IsoStream *stream, unsigned int *fs_id, dev_t *dev_id,
                       ino_t *ino_id);
-    
+
 /************ Error codes and return values for libisofs ********************/
 
 /** successfully execution */
 #define ISO_SUCCESS                     1
 
-/** 
- * special return value, it could be or not an error depending on the 
- * context. 
+/**
+ * special return value, it could be or not an error depending on the
+ * context.
  */
 #define ISO_NONE                        0
 
@@ -3658,7 +3659,7 @@ void iso_stream_get_id(IsoStream *stream, unsigned int *fs_id, dev_t *dev_id,
 /** Internal programming error. Please report this bug (FATAL,HIGH, -4) */
 #define ISO_ASSERT_FAILURE              0xF030FFFC
 
-/** 
+/**
  * NULL pointer as value for an arg. that doesn't allow NULL (FAILURE,HIGH, -5)
  */
 #define ISO_NULL_POINTER                0xE830FFFB
@@ -3693,7 +3694,7 @@ void iso_stream_get_id(IsoStream *stream, unsigned int *fs_id, dev_t *dev_id,
 /** A requested node does not exist  (FAILURE,HIGH, -66) */
 #define ISO_NODE_DOESNT_EXIST           0xE830FFBD
 
-/** 
+/**
  * Try to set the boot image of an already bootable image (FAILURE,HIGH, -67)
  */
 #define ISO_IMAGE_ALREADY_BOOTABLE      0xE830FFBC
@@ -3701,8 +3702,8 @@ void iso_stream_get_id(IsoStream *stream, unsigned int *fs_id, dev_t *dev_id,
 /** Trying to use an invalid file as boot image (FAILURE,HIGH, -68) */
 #define ISO_BOOT_IMAGE_NOT_VALID        0xE830FFBB
 
-/** 
- * Error on file operation (FAILURE,HIGH, -128) 
+/**
+ * Error on file operation (FAILURE,HIGH, -128)
  * (take a look at more specified error codes below)
  */
 #define ISO_FILE_ERROR                  0xE830FF80
@@ -3758,14 +3759,14 @@ void iso_stream_get_id(IsoStream *stream, unsigned int *fs_id, dev_t *dev_id,
 /* File can't be added to the tree (SORRY,HIGH, -143) */
 #define ISO_FILE_CANT_ADD               0xE030FF71
 
-/** 
- * File path break specification constraints and will be ignored 
- * (HINT,MEDIUM, -144) 
+/**
+ * File path break specification constraints and will be ignored
+ * (HINT,MEDIUM, -144)
  */
 #define ISO_FILE_IMGPATH_WRONG          0xC020FF70
 
-/** 
- * Offset greater than file size (FAILURE,HIGH, -145) 
+/**
+ * Offset greater than file size (FAILURE,HIGH, -145)
  * @since 0.6.4
  */
 #define ISO_FILE_OFFSET_TOO_BIG         0xE830FF6A
@@ -3773,17 +3774,17 @@ void iso_stream_get_id(IsoStream *stream, unsigned int *fs_id, dev_t *dev_id,
 /** Charset conversion error (FAILURE,HIGH, -256) */
 #define ISO_CHARSET_CONV_ERROR          0xE830FF00
 
-/** 
- * Too much files to mangle, i.e. we cannot guarantee unique file names 
- * (FAILURE,HIGH, -257) 
+/**
+ * Too much files to mangle, i.e. we cannot guarantee unique file names
+ * (FAILURE,HIGH, -257)
  */
 #define ISO_MANGLE_TOO_MUCH_FILES       0xE830FEFF
 
 /* image related errors */
 
-/** 
+/**
  * Wrong or damaged Primary Volume Descriptor (FAILURE,HIGH, -320)
- * This could mean that the file is not a valid ISO image. 
+ * This could mean that the file is not a valid ISO image.
  */
 #define ISO_WRONG_PVD                   0xE830FEC0