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

Fixed spelling errors found by fossies.org with codespell

Browse Source
This commit is contained in:
Thomas Schmitt 2019-10-28 15:56:58 +01:00
parent 560c11617e
commit dc3d82cf36
36 changed files with 155 additions and 150 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
doc/boot_sectors.txt
View File

@ -123,7 +123,7 @@ Optional:
| | Entries | | Entries
---------- | ---------- | ---------------------------------------------------- ---------- | ---------- | ----------------------------------------------------
An architecture is refered by a Platform Id number. An architecture is referred by a Platform Id number.
Defined by El Torito are: Defined by El Torito are:
0 = "80x86" which is used for standard PCs with Intel x86 or compatible CPU 0 = "80x86" which is used for standard PCs with Intel x86 or compatible CPU
1 = "PowerPC" (possibly for IBM machines with PowerPC CPU) 1 = "PowerPC" (possibly for IBM machines with PowerPC CPU)
@ -328,7 +328,7 @@ For C/H/S, the sector address is broken up into whole cylinders, remaining
heads, and remaining sectors + 1. The nomenclature seems to stem from antique heads, and remaining sectors + 1. The nomenclature seems to stem from antique
drum storage. drum storage.
There are two parameters, sectors_per_head and heads_per_cylinder which are not There are two parameters, sectors_per_head and heads_per_cylinder which are not
stored in the MBR. So at ISO production time it is more or less arbitray how stored in the MBR. So at ISO production time it is more or less arbitrary how
to convert a LBA into a C/H/S address and vice versa. to convert a LBA into a C/H/S address and vice versa.
At boot time the x86 BIOS decides about the two parameters. The boot loader may At boot time the x86 BIOS decides about the two parameters. The boot loader may
inquire these values by INT 0x13 AH 0x08 and use them to convert LBA to C/H/S inquire these values by INT 0x13 AH 0x08 and use them to convert LBA to C/H/S
@ -382,7 +382,7 @@ Byte Range | Value | Meaning
| | Bits 6 to 7 : Bits 8 to 9 of cylinders part. | | Bits 6 to 7 : Bits 8 to 9 of cylinders part.
453 - 453 | end_cyl | Lower 8 bits of cylinders part of end address 453 - 453 | end_cyl | Lower 8 bits of cylinders part of end address
| | | |
454 - 457 | start_lba | LBA of first absolute sector in partiton. 454 - 457 | start_lba | LBA of first absolute sector in partition.
| | Block size is 512. Counting starts at 0. | | Block size is 512. Counting starts at 0.
| | | |
458 - 461 | num_blocks | Number of sectors in partition. 458 - 461 | num_blocks | Number of sectors in partition.
@ -739,7 +739,7 @@ Byte Range | Value | Meaning
72 - 311 | ========== | Volume Directory with 15 entries of 16 bytes each 72 - 311 | ========== | Volume Directory with 15 entries of 16 bytes each
| | | |
72 - 87 | ========== | Volume Directory Entry 1 72 - 87 | ========== | Volume Directory Entry 1
72 - 79 | boot_name | Boot file basename, eventually padded by 0 to lenght 8 72 - 79 | boot_name | Boot file basename, eventually padded by 0 to length 8
80 - 83 | boot_block | ISO 9660 LBA of boot file * 4, i.e. in blocks of 512 80 - 83 | boot_block | ISO 9660 LBA of boot file * 4, i.e. in blocks of 512
84 - 87 | boot_bytes | File length in bytes 84 - 87 | boot_bytes | File length in bytes
| | | |
@ -1310,7 +1310,7 @@ intentionally non-essential:
90 90 90 90 90 90 90 90 90 90 90 90 90 90 90 90 90 90 90 90 90 90 90 90 90 90 90 90 90 90 90 90
They may be overwritten by other bytes which must not produce errors or They may be overwritten by other bytes which must not produce errors or
undesirable side effects when executed as x86 machine code. undesirable side effects when executed as x86 machine code.
The following 32 bytes from block 0 of an Apple Partiton Map (APM) are such The following 32 bytes from block 0 of an Apple Partition Map (APM) are such
harmless code. They stem from Fedora-LiveCD.iso by Matthew Garrett: harmless code. They stem from Fedora-LiveCD.iso by Matthew Garrett:
45 52 08 00 00 00 90 90 00 00 00 00 00 00 00 00 45 52 08 00 00 00 90 90 00 00 00 00 00 00 00 00
00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00

8
doc/checksums.txt
View File

@ -79,7 +79,7 @@ Tag_id distinguishes the following tag types
"libisofs_checksum_tag_v1" Session tag "libisofs_checksum_tag_v1" Session tag
A relocated superblock may appear at LBA 0 of an image which was produced for A relocated superblock may appear at LBA 0 of an image which was produced for
being stored in a disk file or on overwriteable media (e.g. DVD+RW, BD-RE). being stored in a disk file or on overwritable media (e.g. DVD+RW, BD-RE).
Typically there is a first session recorded with a superblock at LBA 32 and Typically there is a first session recorded with a superblock at LBA 32 and
the next session may follow shortly after its session tag. (Typically at the the next session may follow shortly after its session tag. (Typically at the
next block address which is divisible by 32.) Normally no session starts after next block address which is divisible by 32.) Normally no session starts after
@ -131,10 +131,10 @@ checksums as strings of 32 hex digits.
range_start= range_start=
The block address where the session is supposed to start. If this does not The block address where the session is supposed to start. If this does not
match the session start on media then the volume descriptors of the match the session start on media then the volume descriptors of the
image have been relocated. (This can happen with overwriteable media. If image have been relocated. (This can happen with overwritable media. If
checksumming started at LBA 0 and finds range_start=32, then one has to checksumming started at LBA 0 and finds range_start=32, then one has to
restart checksumming at LBA 32. See libburn/doc/cookbook.txt restart checksumming at LBA 32. See libburn/doc/cookbook.txt
"ISO 9660 multi-session emulation on overwriteable media" for background "ISO 9660 multi-session emulation on overwritable media" for background
information.) information.)
range_size= range_size=
@ -232,7 +232,7 @@ If the media is sequentially recordable, obtain a table of content and check
the first track of each session as prescribed above in Checking Before Image the first track of each session as prescribed above in Checking Before Image
Tree Loading and in Checking the Data Part of the Session. Tree Loading and in Checking the Data Part of the Session.
With disk files or overwriteable media, look for a relocated superblock tag With disk files or overwritable media, look for a relocated superblock tag
but do not hop to address next_tag (given by session_start=). Instead look at but do not hop to address next_tag (given by session_start=). Instead look at
LBA 32 for the first session and check it as prescribed above. LBA 32 for the first session and check it as prescribed above.
After reaching its end, round up the read address to the next multiple of 32 After reaching its end, round up the read address to the next multiple of 32

4
doc/susp_aaip_2_0.txt
View File

@ -45,7 +45,7 @@ more data bytes than with SL, though, and any of the 256 possible byte values.
The reader shall be prepared to detect and handle oversized data. The reader shall be prepared to detect and handle oversized data.
One or more AL entries form the Attribute List of a file object with One or more AL entries form the Attribute List of a file object with
an even number of components. Each two consequtive components form a pair of an even number of components. Each two consecutive components form a pair of
Name and Value. Name and Value.
The empty name indicates that the value is a compact representation of ACLs. The empty name indicates that the value is a compact representation of ACLs.
@ -359,7 +359,7 @@ SUSP-1.10 does not specify ES entries at all and allows to have extension
entries without announcing them by an ER entry. So if a second ER entry is entries without announcing them by an ER entry. So if a second ER entry is
not bearable, then the SUSP-1.10 downgrade of AAIP allows to omit the not bearable, then the SUSP-1.10 downgrade of AAIP allows to omit the
AAIP ER and the ES entries. But if there is the AAIP ER then there must be ES AAIP ER and the ES entries. But if there is the AAIP ER then there must be ES
at the appropriate places. Else the format would explicitely violate SUSP-1.12. at the appropriate places. Else the format would explicitly violate SUSP-1.12.
------------------------------------------------------------------------------- -------------------------------------------------------------------------------
Model Relations: Model Relations:

4
libisofs/aaip-os-freebsd.c
View File

@ -377,7 +377,7 @@ static int get_single_attr(char *path, char *name, size_t *value_length,
@param path Path to the file @param path Path to the file
@param num_attrs Will return the number of name-value pairs @param num_attrs Will return the number of name-value pairs
@param names Will return an array of pointers to 0-terminated names @param names Will return an array of pointers to 0-terminated names
@param value_lengths Will return an arry with the lenghts of values @param value_lengths Will return an array with the lengths of values
@param values Will return an array of pointers to 8-bit values @param values Will return an array of pointers to 8-bit values
@param flag Bitfield for control purposes @param flag Bitfield for control purposes
bit0= obtain ACL (access and eventually default) bit0= obtain ACL (access and eventually default)
@ -591,7 +591,7 @@ ex:;
@param path Path to the file @param path Path to the file
@param num_attrs Will return the number of name-value pairs @param num_attrs Will return the number of name-value pairs
@param names Will return an array of pointers to 0-terminated names @param names Will return an array of pointers to 0-terminated names
@param value_lengths Will return an arry with the lenghts of values @param value_lengths Will return an array with the lengths of values
@param values Will return an array of pointers to 8-bit values @param values Will return an array of pointers to 8-bit values
@param flag Bitfield for control purposes @param flag Bitfield for control purposes
bit0= obtain ACL (access and eventually default) bit0= obtain ACL (access and eventually default)

2
libisofs/aaip-os-linux.c
View File

@ -208,7 +208,7 @@ static int get_single_attr(char *path, char *name, size_t *value_length,
@param path Path to the file @param path Path to the file
@param num_attrs Will return the number of name-value pairs @param num_attrs Will return the number of name-value pairs
@param names Will return an array of pointers to 0-terminated names @param names Will return an array of pointers to 0-terminated names
@param value_lengths Will return an arry with the lenghts of values @param value_lengths Will return an array with the lengths of values
@param values Will return an array of pointers to 8-bit values @param values Will return an array of pointers to 8-bit values
@param flag Bitfield for control purposes @param flag Bitfield for control purposes
bit0= obtain ACL (access and eventually default) bit0= obtain ACL (access and eventually default)

8
libisofs/aaip_0_2.c
View File

@ -281,7 +281,7 @@ static ssize_t aaip_encode_acl_text(char *acl_text, mode_t st_mode,
bit2= this is a default ACL, prepend SWITCH_MARK bit2= this is a default ACL, prepend SWITCH_MARK
bit3= check for completeness of list and eventually bit3= check for completeness of list and eventually
fill up with entries deduced from st_mode fill up with entries deduced from st_mode
bit4= be verbous about failure causes bit4= be verbose about failure causes
@return >0 means ok @return >0 means ok
<=0 means error <=0 means error
-1= out of memory -1= out of memory
@ -364,11 +364,11 @@ static int aaip_make_aaip_perms(int r, int w, int x)
bit2= this is a default ACL, prepend SWITCH_MARK 1 bit2= this is a default ACL, prepend SWITCH_MARK 1
bit3= check for completeness of list and eventually bit3= check for completeness of list and eventually
fill up with entries deduced from st_mode fill up with entries deduced from st_mode
bit4= be verbous about failure causes bit4= be verbose about failure causes
@return >=0 number of bytes produced resp. counted @return >=0 number of bytes produced resp. counted
<0 means error <0 means error
-1: result size overflow -1: result size overflow
-2: conversion errror with user name or group name -2: conversion error with user name or group name
ISO_AAIP_ACL_MULT_OBJ: multiple entries of user::, group::, other:: ISO_AAIP_ACL_MULT_OBJ: multiple entries of user::, group::, other::
*/ */
static ssize_t aaip_encode_acl_text(char *acl_text, mode_t st_mode, static ssize_t aaip_encode_acl_text(char *acl_text, mode_t st_mode,
@ -1960,7 +1960,7 @@ int aaip_decode_attrs(struct aaip_state **handle,
@param handle The decoding context created by aaip_decode_attrs() @param handle The decoding context created by aaip_decode_attrs()
@param num_attrs Will return the number of name-value pairs @param num_attrs Will return the number of name-value pairs
@param names Will return an array of pointers to 0-terminated names @param names Will return an array of pointers to 0-terminated names
@param value_lengths Will return an arry with the lenghts of values @param value_lengths Will return an array with the lengths of values
@param values Will return an array of pointers to 8-bit values @param values Will return an array of pointers to 8-bit values
@param flag Bitfield for control purposes @param flag Bitfield for control purposes
bit15= free memory of names, value_lengths, values bit15= free memory of names, value_lengths, values

4
libisofs/aaip_0_2.h
View File

@ -199,7 +199,7 @@ int aaip_get_acl_text(char *path, char **text, int flag);
@param path Path to the file @param path Path to the file
@param num_attrs Will return the number of name-value pairs @param num_attrs Will return the number of name-value pairs
@param names Will return an array of pointers to 0-terminated names @param names Will return an array of pointers to 0-terminated names
@param value_lengths Will return an arry with the lenghts of values @param value_lengths Will return an array with the lengths of values
@param values Will return an array of pointers to 8-bit values @param values Will return an array of pointers to 8-bit values
@param flag Bitfield for control purposes @param flag Bitfield for control purposes
bit0= obtain ACLs (access and eventually default) via bit0= obtain ACLs (access and eventually default) via
@ -435,7 +435,7 @@ int aaip_decode_attrs(struct aaip_state **handle,
@param handle The decoding context created by aaip_decode_attrs() @param handle The decoding context created by aaip_decode_attrs()
@param num_attrs Will return the number of name-value pairs @param num_attrs Will return the number of name-value pairs
@param names Will return an array of pointers to 0-terminated names @param names Will return an array of pointers to 0-terminated names
@param value_lengths Will return an arry with the lenghts of values @param value_lengths Will return an array with the lengths of values
@param values Will return an array of pointers to 8-bit values @param values Will return an array of pointers to 8-bit values
@param flag Bitfield for control purposes @param flag Bitfield for control purposes
bit15= free memory of names, value_lengths, values bit15= free memory of names, value_lengths, values

8
libisofs/buffer.c
View File

@ -12,7 +12,7 @@
* *
* TODO #00010 : optimize ring buffer * TODO #00010 : optimize ring buffer
* - write/read at the end of buffer requires a second mutex_lock, even if * - write/read at the end of buffer requires a second mutex_lock, even if
* there's enought space/data at the beginning * there's enough space/data at the beginning
* - pre-buffer for writes < BLOCK_SIZE * - pre-buffer for writes < BLOCK_SIZE
* *
*/ */
@ -145,7 +145,7 @@ void iso_ring_buffer_free(IsoRingBuffer *buf)
* @param * @param
* Number of bytes to write * Number of bytes to write
* @return * @return
* 1 succes, 0 read finished, < 0 error * 1 success, 0 read finished, < 0 error
*/ */
int iso_ring_buffer_write(IsoRingBuffer *buf, uint8_t *data, size_t count) int iso_ring_buffer_write(IsoRingBuffer *buf, uint8_t *data, size_t count)
{ {
@ -165,7 +165,7 @@ int iso_ring_buffer_write(IsoRingBuffer *buf, uint8_t *data, size_t count)
/* /*
* Note. There's only a writer, so we have no race conditions. * Note. There's only a writer, so we have no race conditions.
* Thus, the while(buf->size == buf->cap) is used here * Thus, the while(buf->size == buf->cap) is used here
* only to propertly detect the reader has been cancelled * only to properly detect the reader has been cancelled
*/ */
if (buf->rend) { if (buf->rend) {
@ -219,7 +219,7 @@ int iso_ring_buffer_read(IsoRingBuffer *buf, uint8_t *dest, size_t count)
/* /*
* Note. There's only a reader, so we have no race conditions. * Note. There's only a reader, so we have no race conditions.
* Thus, the while(buf->size == 0) is used here just to ensure * Thus, the while(buf->size == 0) is used here just to ensure
* a reader detects the EOF propertly if the writer has been * a reader detects the EOF properly if the writer has been
* canceled while the reader was waiting * canceled while the reader was waiting
*/ */

6
libisofs/buffer.h
View File

@ -55,13 +55,13 @@ void iso_ring_buffer_free(IsoRingBuffer *buf);
* @param * @param
* Number of bytes to write * Number of bytes to write
* @return * @return
* 1 succes, 0 read finished, < 0 error * 1 success, 0 read finished, < 0 error
*/ */
int iso_ring_buffer_write(IsoRingBuffer *buf, uint8_t *data, size_t count); int iso_ring_buffer_write(IsoRingBuffer *buf, uint8_t *data, size_t count);
/** /**
* Read count bytes from the buffer into dest. It blocks until the desired * Read count bytes from the buffer into dest. It blocks until the desired
* bytes has been read. If the writer finishes before outputting enought * bytes has been read. If the writer finishes before outputting enough
* bytes, 0 (EOF) is returned, the number of bytes already read remains * bytes, 0 (EOF) is returned, the number of bytes already read remains
* unknown. * unknown.
* *
@ -94,7 +94,7 @@ int iso_ring_buffer_get_buf_status(IsoRingBuffer *buf, size_t *size,
/** /**
* Close the buffer (to be called by the writer). * Close the buffer (to be called by the writer).
* You have to explicity close the buffer when you don't have more data to * You have to explicitly close the buffer when you don't have more data to
* write, otherwise reader will be waiting forever. * write, otherwise reader will be waiting forever.
* *
* @param error * @param error

2
libisofs/builder.h
View File

@ -34,7 +34,7 @@ struct Iso_Node_Builder
* always be created, even if src is another kind of file. * always be created, even if src is another kind of file.
* *
* In that case, if the implementation can't do the conversion, it * In that case, if the implementation can't do the conversion, it
* should fail propertly. * should fail properly.
* *
* Note that the src is never unref, so you need to free it. * Note that the src is never unref, so you need to free it.
* *

8
libisofs/ecma119.c
View File

@ -758,7 +758,7 @@ static
int write_path_table(Ecma119Image *t, Ecma119Node **pathlist, int l_type) int write_path_table(Ecma119Image *t, Ecma119Node **pathlist, int l_type)
{ {
size_t i, len; size_t i, len;
uint8_t buf[64]; /* 64 is just a convenient size larger enought */ uint8_t buf[64]; /* 64 is just a convenient size larger enough */
struct ecma119_path_table_record *rec; struct ecma119_path_table_record *rec;
void (*write_int)(uint8_t*, uint32_t, int); void (*write_int)(uint8_t*, uint32_t, int);
Ecma119Node *dir; Ecma119Node *dir;
@ -1464,7 +1464,7 @@ int write_head_part2(Ecma119Image *target, int *write_count, int flag)
target->pvd_size_is_total_size = 0; target->pvd_size_is_total_size = 0;
for (i = 0; i < (int) target->nwriters; ++i) { for (i = 0; i < (int) target->nwriters; ++i) {
writer = target->writers[i]; writer = target->writers[i];
/* Not all writers have an entry in the partion volume descriptor set. /* Not all writers have an entry in the partition volume descriptor set.
It must be guaranteed that they write exactly one block. It must be guaranteed that they write exactly one block.
*/ */
@ -3015,7 +3015,7 @@ int ecma119_image_new(IsoImage *src, IsoWriteOpts *in_opts, Ecma119Image **img)
* 3. * 3.
* Call compute_data_blocks() in each Writer. * Call compute_data_blocks() in each Writer.
* That function computes the size needed by its structures and * That function computes the size needed by its structures and
* increments image current block propertly. * increments image current block properly.
*/ */
for (i = 0; i < (int) target->nwriters; ++i) { for (i = 0; i < (int) target->nwriters; ++i) {
IsoImageWriter *writer = target->writers[i]; IsoImageWriter *writer = target->writers[i];
@ -4408,7 +4408,7 @@ int iso_write_opts_set_gpt_guid(IsoWriteOpts *opts, uint8_t guid[16], int mode)
* 0= generic (to_charset is valid, no reserved characters, * 0= generic (to_charset is valid, no reserved characters,
* no length limits) * no length limits)
* 1= Rock Ridge (to_charset is valid) * 1= Rock Ridge (to_charset is valid)
* 2= Joliet (to_charset gets overriden by UCS-2 or UTF-16) * 2= Joliet (to_charset gets overridden by UCS-2 or UTF-16)
* 3= ECMA-119 (dull ISO 9660 character set) * 3= ECMA-119 (dull ISO 9660 character set)
* 4= HFS+ (to_charset gets overridden by UTF-16BE) * 4= HFS+ (to_charset gets overridden by UTF-16BE)
* bit8= Treat input text as directory name * bit8= Treat input text as directory name

16
libisofs/ecma119.h
View File

@ -33,7 +33,7 @@
#define MAX_ISO_FILE_SECTION_SIZE 0xffffffff #define MAX_ISO_FILE_SECTION_SIZE 0xffffffff
/* /*
* When a file need to be splitted in several sections, the maximum size * When a file need to be split in several sections, the maximum size
* of such sections, but the last one. Set to a multiple of BLOCK_SIZE. * of such sections, but the last one. Set to a multiple of BLOCK_SIZE.
* Default to 4GB - 2048 = 0xFFFFF800 * Default to 4GB - 2048 = 0xFFFFF800
*/ */
@ -88,7 +88,7 @@
/* How many warnings to issue about writing Joliet names which cannot be /* How many warnings to issue about writing Joliet names which cannot be
properly represented in UCS-2 and thus had to be defaultet to '_'. properly represented in UCS-2 and thus had to be defaulted to '_'.
*/ */
#define ISO_JOLIET_UCS2_WARN_MAX 3 #define ISO_JOLIET_UCS2_WARN_MAX 3
@ -111,7 +111,7 @@ struct iso_write_opts {
unsigned int aaip :1; /* whether to write eventual ACL and EAs */ unsigned int aaip :1; /* whether to write eventual ACL and EAs */
/* allways write timestamps in GMT */ /* always write timestamps in GMT */
unsigned int always_gmt :1; unsigned int always_gmt :1;
/* /*
@ -183,7 +183,7 @@ struct iso_write_opts {
/** /**
* Allow all characters to be part of Volume and Volset identifiers on * Allow all characters to be part of Volume and Volset identifiers on
* the Primary Volume Descriptor. This breaks ISO-9660 contraints, but * the Primary Volume Descriptor. This breaks ISO-9660 constraints, but
* should work on modern systems. * should work on modern systems.
*/ */
unsigned int relaxed_vol_atts :1; unsigned int relaxed_vol_atts :1;
@ -287,7 +287,7 @@ struct iso_write_opts {
/** /**
* The following options set the default values for files and directory * The following options set the default values for files and directory
* permissions, gid and uid. All these take one of three values: 0, 1 or 2. * 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. * If 0, the corresponding attribute will be kept as set in the IsoNode.
* Unless you have changed it, it corresponds to the value on disc, so it * 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. * 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
@ -349,7 +349,7 @@ struct iso_write_opts {
* or write to an .iso file for future burning or distribution. * or write to an .iso file for future burning or distribution.
* *
* On the other side, an appendable image is not self contained, it refers * 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 * to several files that are stored outside the image. Its usage is for
* multisession discs, where you add data in a new session, while the * multisession discs, where you add data in a new session, while the
* previous session data can still be accessed. In those cases, the old * 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 * data is not written again. Instead, the new image refers to it, and thus
@ -381,7 +381,7 @@ struct iso_write_opts {
/** /**
* When not NULL, it should point to a buffer of at least 64KiB, where * 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 * 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 * of a overwritable 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 * 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 * 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 * same way you append a new session to a multisession disc, i.e., without
@ -393,7 +393,7 @@ struct iso_write_opts {
* *
* You should initialize the buffer either with 0s, or with the contents of * 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 * the first blocks of the image you're growing. In most cases, 0 is good
* enought. * enough.
*/ */
uint8_t *overwrite; uint8_t *overwrite;

2
libisofs/ecma119_tree.c
View File

@ -682,7 +682,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 enough, it allows handling up to
* 9,999,999 files with same name. We can increment this 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 * max_name_len, but the int_pow() function must then be modified
* to return a bigger integer. * to return a bigger integer.

2
libisofs/eltorito.c
View File

@ -571,7 +571,7 @@ int iso_image_set_boot_image(IsoImage *image, const char *image_path,
return ISO_WRONG_ARG_VALUE; return ISO_WRONG_ARG_VALUE;
} }
if (catname == catdir) { if (catname == catdir) {
/* we are apending catalog to root node */ /* we are appending catalog to root node */
parent = image->root; parent = image->root;
} else { } else {
IsoNode *p; IsoNode *p;

2
libisofs/find.c
View File

@ -65,7 +65,7 @@ int get_next(struct find_iter_data *iter, IsoNode **n)
iter->itersec = NULL; iter->itersec = NULL;
} }
if (ret != 0) { if (ret != 0) {
/* succes or error */ /* success or error */
return ret; return ret;
} }
} }

20
libisofs/fs_image.c
View File

@ -212,7 +212,7 @@ typedef struct
unsigned int id; unsigned int id;
/** /**
* Counter of the times the filesystem has been openned still pending of * Counter of the times the filesystem has been opened still pending of
* close. It is used to keep track of when we need to actually open or * close. It is used to keep track of when we need to actually open or
* close the IsoDataSource. * close the IsoDataSource.
*/ */
@ -598,7 +598,7 @@ int read_dir(ImageFileSourceData *data)
record = (struct ecma119_dir_record *)(buffer + pos); record = (struct ecma119_dir_record *)(buffer + pos);
if (pos == 2048 || record->len_dr[0] == 0) { if (pos == 2048 || record->len_dr[0] == 0) {
/* /*
* The directory entries are splitted in several blocks * The directory entries are split in several blocks
* read next block * read next block
*/ */
ret = fsdata->src->read_block(fsdata->src, ++block, buffer); ret = fsdata->src->read_block(fsdata->src, ++block, buffer);
@ -710,7 +710,7 @@ int ifs_open(IsoFileSource *src)
} }
if (S_ISDIR(data->info.st_mode)) { if (S_ISDIR(data->info.st_mode)) {
/* ensure fs is openned */ /* ensure fs is opened */
ret = data->fs->open(data->fs); ret = data->fs->open(data->fs);
if (ret < 0) { if (ret < 0) {
return ret; return ret;
@ -719,7 +719,7 @@ int ifs_open(IsoFileSource *src)
/* /*
* Cache all directory entries. * Cache all directory entries.
* This can waste more memory, but improves as disc is read in much more * This can waste more memory, but improves as disc is read in much more
* sequencially way, thus reducing jump between tracks on disc * sequentially way, thus reducing jump between tracks on disc
*/ */
ret = read_dir(data); ret = read_dir(data);
data->fs->close(data->fs); data->fs->close(data->fs);
@ -733,7 +733,7 @@ int ifs_open(IsoFileSource *src)
return ret; return ret;
} else if (S_ISREG(data->info.st_mode)) { } else if (S_ISREG(data->info.st_mode)) {
/* ensure fs is openned */ /* ensure fs is opened */
ret = data->fs->open(data->fs); ret = data->fs->open(data->fs);
if (ret < 0) { if (ret < 0) {
return ret; return ret;
@ -745,7 +745,7 @@ int ifs_open(IsoFileSource *src)
data->data.offset = 0; data->data.offset = 0;
data->opened = 1; data->opened = 1;
} else { } else {
/* symlinks and special files inside image can't be openned */ /* symlinks and special files inside image can't be opened */
return ISO_FILE_ERROR; return ISO_FILE_ERROR;
} }
return ISO_SUCCESS; return ISO_SUCCESS;
@ -1108,7 +1108,7 @@ void ifs_free(IsoFileSource *src)
data = src->data; data = src->data;
/* close the file if it is already openned */ /* close the file if it is already opened */
if (data->opened) { if (data->opened) {
src->class->close(src); src->class->close(src);
} }
@ -2334,7 +2334,7 @@ void ifs_fs_free(IsoFilesystem *fs)
data = (_ImageFsData*) fs->data; data = (_ImageFsData*) fs->data;
/* close data source if already openned */ /* close data source if already opened */
if (data->open_count > 0) { if (data->open_count > 0) {
data->src->close(data->src); data->src->close(data->src);
} }
@ -2367,7 +2367,7 @@ void ifs_fs_free(IsoFilesystem *fs)
/** /**
* Read the SUSP system user entries of the "." entry of the root directory, * Read the SUSP system user entries of the "." entry of the root directory,
* indentifying when Rock Ridge extensions are being used. * identifying when Rock Ridge extensions are being used.
* *
* @return * @return
* 1 success, 0 ignored, < 0 error * 1 success, 0 ignored, < 0 error
@ -2984,7 +2984,7 @@ int iso_image_filesystem_new(IsoDataSource *src, struct iso_read_opts *opts,
} }
break; break;
case 2: case 2:
/* suplementary volume descritor */ /* supplementary volume descritor */
{ {
struct ecma119_sup_vol_desc *sup; struct ecma119_sup_vol_desc *sup;
struct ecma119_dir_record *root; struct ecma119_dir_record *root;

4
libisofs/fs_local.c
View File

@ -50,7 +50,7 @@ typedef struct
/** reference to the parent (if root it points to itself) */ /** reference to the parent (if root it points to itself) */
IsoFileSource *parent; IsoFileSource *parent;
char *name; char *name;
unsigned int openned :2; /* 0: not openned, 1: file, 2:dir */ unsigned int openned :2; /* 0: not opened, 1: file, 2:dir */
union union
{ {
int fd; int fd;
@ -483,7 +483,7 @@ void lfs_free(IsoFileSource *src)
data = src->data; data = src->data;
/* close the file if it is already openned */ /* close the file if it is already opened */
if (data->openned) { if (data->openned) {
src->class->close(src); src->class->close(src);
} }

2
libisofs/image.h
View File

@ -30,7 +30,7 @@
* Image is a context for image manipulation. * Image is a context for image manipulation.
* Global objects such as the message_queues must belogn to that * Global objects such as the message_queues must belogn to that
* context. Thus we will have, for example, a msg queue per image, * context. Thus we will have, for example, a msg queue per image,
* so images are completelly independent and can be managed together. * so images are completely independent and can be managed together.
* (Useful, for example, in Multiple-Document-Interface GUI apps. * (Useful, for example, in Multiple-Document-Interface GUI apps.
* [The stuff we have in init belongs really to image!] * [The stuff we have in init belongs really to image!]
*/ */

6
libisofs/iso1999.c
View File

@ -283,7 +283,7 @@ cmp_node(const void *f1, const void *f2)
/** /**
* TODO #00027 Follow ISO 9660:1999 specs when sorting files * TODO #00027 Follow ISO 9660:1999 specs when sorting files
* strcmp do not does exactly what ISO 9660:1999, 9.3, as characters * strcmp do not does exactly what ISO 9660:1999, 9.3, as characters
* < 0x20 " " are allowed, so name len must be taken into accout * < 0x20 " " are allowed, so name len must be taken into account
*/ */
return strcmp(f->name, g->name); return strcmp(f->name, g->name);
} }
@ -358,7 +358,7 @@ int mangle_single_dir(Ecma119Image *img, Iso1999Node *dir)
} }
/* /*
* A max of 7 characters is good enought, it allows handling up to * A max of 7 characters is good enough, it allows handling up to
* 9,999,999 files with same name. * 9,999,999 files with same name.
*/ */
while (digits < 8) { while (digits < 8) {
@ -919,7 +919,7 @@ int write_path_table(Ecma119Image *t, Iso1999Node **pathlist, int l_type)
int ret= ISO_SUCCESS; int ret= ISO_SUCCESS;
uint8_t *zeros = NULL; uint8_t *zeros = NULL;
/* 256 is just a convenient size large enought */ /* 256 is just a convenient size large enough */
LIBISO_ALLOC_MEM(buf, uint8_t, 256); LIBISO_ALLOC_MEM(buf, uint8_t, 256);
path_table_size = 0; path_table_size = 0;

4
libisofs/joliet.c
View File

@ -469,7 +469,7 @@ int mangle_single_dir(Ecma119Image *t, JolietNode *dir)
} }
/* /*
* A max of 7 characters is good enought, it allows handling up to * A max of 7 characters is good enough, it allows handling up to
* 9,999,999 files with same name. * 9,999,999 files with same name.
*/ */
/* Important: joliet_create_mangled_name() relies on digits < 8 */ /* Important: joliet_create_mangled_name() relies on digits < 8 */
@ -1108,7 +1108,7 @@ int write_path_table(Ecma119Image *t, JolietNode **pathlist, int l_type)
int ret= ISO_SUCCESS; int ret= ISO_SUCCESS;
uint8_t *zeros = NULL; uint8_t *zeros = NULL;
/* 256 is just a convenient size large enought */ /* 256 is just a convenient size large enough */
LIBISO_ALLOC_MEM(buf, uint8_t, 256); LIBISO_ALLOC_MEM(buf, uint8_t, 256);
LIBISO_ALLOC_MEM(zeros, uint8_t, BLOCK_SIZE); LIBISO_ALLOC_MEM(zeros, uint8_t, BLOCK_SIZE);
path_table_size = 0; path_table_size = 0;

15
libisofs/libiso_msgs.h
View File

@ -2,7 +2,12 @@
/* libiso_msgs (generated from libdax_msgs : Fri Feb 22 19:42:52 CET 2008) /* libiso_msgs (generated from libdax_msgs : Fri Feb 22 19:42:52 CET 2008)
Message handling facility of libisofs. Message handling facility of libisofs.
Copyright (C) 2006-2016 Thomas Schmitt <scdbackup@gmx.net>, Copyright (C) 2006-2016 Thomas Schmitt <scdbackup@gmx.net>,
provided under GPL version 2 or later
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
or later as published by the Free Software Foundation.
See COPYING file for details.
*/ */
@ -422,7 +427,7 @@ Range "elmom" : 0x00010000 to 0x0001ffff
------------------------------------------------------------------------------ ------------------------------------------------------------------------------
Range "scdbackup" : 0x00020000 to 0x0002ffff Range "scdbackup" : 0x00020000 to 0x0002ffff
Acessing and defending drives: Accessing and defending drives:
0x00020001 (SORRY,LOW) = Cannot open busy device 0x00020001 (SORRY,LOW) = Cannot open busy device
0x00020002 (SORRY,HIGH) = Encountered error when closing drive 0x00020002 (SORRY,HIGH) = Encountered error when closing drive
@ -554,11 +559,11 @@ Range "vreixo" : 0x00030000 to 0x0003ffff
0x0003ffbc (FAILURE,HIGH) = Image already bootable 0x0003ffbc (FAILURE,HIGH) = Image already bootable
0x0003ffbb (FAILURE,HIGH) = Trying to use an invalid file as boot image 0x0003ffbb (FAILURE,HIGH) = Trying to use an invalid file as boot image
0x0003ff80 (FAILURE,HIGH) = Error on file operation 0x0003ff80 (FAILURE,HIGH) = Error on file operation
0x0003ff7f (FAILURE,HIGH) = Trying to open an already openned file 0x0003ff7f (FAILURE,HIGH) = Trying to open an already opened file
0x0003ff7e (FAILURE,HIGH) = Access to file is not allowed 0x0003ff7e (FAILURE,HIGH) = Access to file is not allowed
0x0003ff7d (FAILURE,HIGH) = Incorrect path to file 0x0003ff7d (FAILURE,HIGH) = Incorrect path to file
0x0003ff7c (FAILURE,HIGH) = The file does not exist in the filesystem 0x0003ff7c (FAILURE,HIGH) = The file does not exist in the filesystem
0x0003ff7b (FAILURE,HIGH) = Trying to read or close a file not openned 0x0003ff7b (FAILURE,HIGH) = Trying to read or close a file not opened
0x0003ff7a (FAILURE,HIGH) = Directory used where no dir is expected 0x0003ff7a (FAILURE,HIGH) = Directory used where no dir is expected
0x0003ff79 (FAILURE,HIGH) = File read error 0x0003ff79 (FAILURE,HIGH) = File read error
0x0003ff78 (FAILURE,HIGH) = Not dir used where a dir is expected 0x0003ff78 (FAILURE,HIGH) = Not dir used where a dir is expected
@ -609,7 +614,7 @@ X 0x00030203 (HINT,MEDIUM) = Unsupported El-Torito feature
X 0x00030204 (SORRY,HIGH) = Invalid file to be an El-Torito image X 0x00030204 (SORRY,HIGH) = Invalid file to be an El-Torito image
X 0x00030205 (WARNING,MEDIUM)= Cannot properly patch isolinux image X 0x00030205 (WARNING,MEDIUM)= Cannot properly patch isolinux image
X 0x00030206 (WARNING,MEDIUM)= Copying El-Torito from a previous image without X 0x00030206 (WARNING,MEDIUM)= Copying El-Torito from a previous image without
X enought info about it X enough info about it
X 0x00030301 (NOTE,MEDIUM) = Unsupported file type for Joliet tree X 0x00030301 (NOTE,MEDIUM) = Unsupported file type for Joliet tree

94
libisofs/libisofs.h
View File

@ -119,7 +119,7 @@ int iso_lib_is_compatible(int major, int minor, int micro);
* Usage discussion: * 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. * ensure the compatibility of libraries and applications.
* *
* It is about whether to use at compile time and at runtime the version * 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 * numbers provided here. Thomas Schmitt advises to use them. Vreixo Formoso
@ -319,7 +319,7 @@ enum IsoHideNodeFlag {
* not visible in any tree. * not visible in any tree.
* With directory nodes : Write data content of IsoNode and IsoBoot * With directory nodes : Write data content of IsoNode and IsoBoot
* in the directory's tree unless they are * in the directory's tree unless they are
* explicitely marked LIBISO_HIDE_ON_RR * explicitly marked LIBISO_HIDE_ON_RR
* without LIBISO_HIDE_BUT_WRITE. * without LIBISO_HIDE_BUT_WRITE.
* @since 0.6.34 * @since 0.6.34
*/ */
@ -338,7 +338,7 @@ enum eltorito_boot_media_type {
}; };
/** /**
* Replace mode used when addding a node to a directory. * Replace mode used when adding a node to a directory.
* This controls how libisofs will act when you tried to add to a dir a file * This controls how libisofs will act when you tried to add to a dir a file
* with the same name that an existing file. * with the same name that an existing file.
* *
@ -452,7 +452,7 @@ struct iso_data_source
* @return * @return
* 1 if success, * 1 if success,
* < 0 if error. This function has to emit a valid libisofs error code. * < 0 if error. This function has to emit a valid libisofs error code.
* Predifined (but not mandatory) for this purpose are: * Predefined (but not mandatory) for this purpose are:
* ISO_DATA_SOURCE_SORRY , ISO_DATA_SOURCE_MISHAP, * ISO_DATA_SOURCE_SORRY , ISO_DATA_SOURCE_MISHAP,
* ISO_DATA_SOURCE_FAILURE , ISO_DATA_SOURCE_FATAL * ISO_DATA_SOURCE_FAILURE , ISO_DATA_SOURCE_FATAL
*/ */
@ -593,9 +593,9 @@ struct iso_filesystem
unsigned int (*get_id)(IsoFilesystem *fs); unsigned int (*get_id)(IsoFilesystem *fs);
/** /**
* Opens the filesystem for several read operations. Calling this funcion * Opens the filesystem for several read operations. Calling this function
* is not needed at all, each time that the underlying system resource * is not needed at all, each time that the underlying system resource
* needs to be accessed, it is openned propertly. * needs to be accessed, it is opened property.
* However, if you plan to execute several operations on the filesystem, * 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 * it is a good idea to open it previously, to prevent several open/close
* operations to occur. * operations to occur.
@ -727,7 +727,7 @@ struct IsoFileSource_Iface
int (*open)(IsoFileSource *src); int (*open)(IsoFileSource *src);
/** /**
* Close a previuously openned file * Close a previously opened file
* @return 1 on success, < 0 on error * @return 1 on success, < 0 on error
* Error codes: * Error codes:
* ISO_FILE_ERROR * ISO_FILE_ERROR
@ -809,7 +809,7 @@ struct IsoFileSource_Iface
/** /**
* Get the filesystem for this source. No extra ref is added, so you * Get the filesystem for this source. No extra ref is added, so you
* musn't unref the IsoFilesystem. * must not unref the IsoFilesystem.
* *
* @return * @return
* The filesystem, NULL on error * The filesystem, NULL on error
@ -1523,7 +1523,7 @@ int iso_write_opts_set_hfsp_serial_number(IsoWriteOpts *opts,
* @param opts * @param opts
* The option set to be manipulated. * The option set to be manipulated.
* @param hfsp_block_size * @param hfsp_block_size
* The allocation block size to be used by the HFS+ fileystem. * The allocation block size to be used by the HFS+ filesystem.
* 0, 512, or 2048 * 0, 512, or 2048
* @param apm_block_size * @param apm_block_size
* The block size to be used for and within the Apple Partition Map. * The block size to be used for and within the Apple Partition Map.
@ -1553,7 +1553,7 @@ int iso_write_opts_set_iso1999(IsoWriteOpts *opts, int enable);
* Control generation of non-unique inode numbers for the emerging image. * Control generation of non-unique inode numbers for the emerging image.
* Inode numbers get written as "file serial number" with PX entries as of * Inode numbers get written as "file serial number" with PX entries as of
* RRIP-1.12. They may mark families of hardlinks. * RRIP-1.12. They may mark families of hardlinks.
* RRIP-1.10 prescribes a PX entry without file serial number. If not overriden * RRIP-1.10 prescribes a PX entry without file serial number.If not overridden
* by iso_write_opts_set_rrip_1_10_px_ino() there will be no file serial number * by iso_write_opts_set_rrip_1_10_px_ino() there will be no file serial number
* written into RRIP-1.10 images. * written into RRIP-1.10 images.
* *
@ -1582,7 +1582,7 @@ int iso_write_opts_set_iso1999(IsoWriteOpts *opts, int enable);
int iso_write_opts_set_hardlinks(IsoWriteOpts *opts, int enable); int iso_write_opts_set_hardlinks(IsoWriteOpts *opts, int enable);
/** /**
* Control writing of AAIP informations for ACL and xattr. * Control writing of AAIP information for ACL and xattr.
* For importing ACL and xattr when inserting nodes from external filesystems * For importing ACL and xattr when inserting nodes from external filesystems
* (e.g. the local POSIX filesystem) see iso_image_set_ignore_aclea(). * (e.g. the local POSIX filesystem) see iso_image_set_ignore_aclea().
* For loading of this information from images see iso_read_opts_set_no_aaip(). * For loading of this information from images see iso_read_opts_set_no_aaip().
@ -1794,7 +1794,7 @@ int iso_write_opts_set_allow_7bit_ascii(IsoWriteOpts *opts, int allow);
/** /**
* Allow all characters to be part of Volume and Volset identifiers on * Allow all characters to be part of Volume and Volset identifiers on
* the Primary Volume Descriptor. This breaks ISO-9660 contraints, but * the Primary Volume Descriptor. This breaks ISO-9660 constraints, but
* should work on modern systems. * should work on modern systems.
* *
* @since 0.6.2 * @since 0.6.2
@ -2124,7 +2124,7 @@ int iso_write_opts_set_ms_block(IsoWriteOpts *opts, uint32_t ms_block);
/** /**
* Sets the buffer where to store the descriptors which shall be written * Sets the buffer where to store the descriptors which shall be written
* at the beginning of an overwriteable media to point to the newly written * at the beginning of an overwritable media to point to the newly written
* image. * image.
* This is needed if the write start address of the image is not 0. * This is needed if the write start address of the image is not 0.
* In this case the first 64 KiB of the media have to be overwritten * In this case the first 64 KiB of the media have to be overwritten
@ -2144,15 +2144,15 @@ int iso_write_opts_set_ms_block(IsoWriteOpts *opts, uint32_t ms_block);
* This allows appending of a new session to non-multisession media, such * This allows appending of a new session to non-multisession media, such
* as DVD+RW. The new session will refer to the data of previous sessions * as DVD+RW. The new session will refer to the data of previous sessions
* on the same media. * on the same media.
* libisoburn emulates multisession appendability on overwriteable media * libisoburn emulates multisession appendability on overwritable media
* and disk files by performing this use case. * and disk files by performing this use case.
* *
* - Together with iso_write_opts_set_appendable(opts, 0) the buffer allows * - Together with iso_write_opts_set_appendable(opts, 0) the buffer allows
* to write the first session on overwriteable media to start addresses * to write the first session on overwritable media to start addresses
* other than 0. * other than 0.
* This address must not be smaller than 32 blocks plus the eventual * This address must not be smaller than 32 blocks plus the eventual
* partition offset as defined by iso_write_opts_set_part_offset(). * partition offset as defined by iso_write_opts_set_part_offset().
* libisoburn in most cases writes the first session on overwriteable media * libisoburn in most cases writes the first session on overwritable media
* and disk files to LBA (32 + partition_offset) in order to preserve its * and disk files to LBA (32 + partition_offset) in order to preserve its
* descriptors from the subsequent overwriting by the descriptor buffer of * descriptors from the subsequent overwriting by the descriptor buffer of
* later sessions. * later sessions.
@ -2162,10 +2162,10 @@ int iso_write_opts_set_ms_block(IsoWriteOpts *opts, uint32_t ms_block);
* @param overwrite * @param overwrite
* When not NULL, it should point to at least 64KiB of memory, where * When not NULL, it should point to at least 64KiB of memory, where
* libisofs will install the contents that shall be written at the * libisofs will install the contents that shall be written at the
* beginning of overwriteable media. * beginning of overwritable media.
* You should initialize the buffer either with 0s, or with the contents * You should initialize the buffer either with 0s, or with the contents
* of the first 32 blocks of the image you are growing. In most cases, * of the first 32 blocks of the image you are growing. In most cases,
* 0 is good enought. * 0 is good enough.
* IMPORTANT: If you use iso_write_opts_set_part_offset() then the * IMPORTANT: If you use iso_write_opts_set_part_offset() then the
* overwrite buffer must be larger by the offset defined there. * overwrite buffer must be larger by the offset defined there.
* *
@ -2310,7 +2310,7 @@ int iso_write_opts_set_system_area(IsoWriteOpts *opts, char data[32768],
int iso_write_opts_set_disc_label(IsoWriteOpts *opts, char *label); int iso_write_opts_set_disc_label(IsoWriteOpts *opts, char *label);
/** /**
* Explicitely set the four timestamps of the emerging Primary Volume * Explicitly set the four timestamps of the emerging Primary Volume
* Descriptor and in the volume descriptors of Joliet and ISO 9660:1999, * Descriptor and in the volume descriptors of Joliet and ISO 9660:1999,
* if those are to be generated. * if those are to be generated.
* Default with all parameters is 0. * Default with all parameters is 0.
@ -2641,7 +2641,7 @@ int iso_write_opts_set_efi_bootp(IsoWriteOpts *opts, char *image_path,
* Control whether the emerging GPT gets a pseudo-randomly generated disk GUID * Control whether the emerging GPT gets a pseudo-randomly generated disk GUID
* or whether it gets a user supplied GUID. * or whether it gets a user supplied GUID.
* The partition GUIDs will be generated in a reproducible way by exoring the * The partition GUIDs will be generated in a reproducible way by exoring the
* little-endian 32 bit partion number with the disk GUID beginning at byte * little-endian 32 bit partition number with the disk GUID beginning at byte
* offset 9. * offset 9.
* *
* @param opts * @param opts
@ -2995,7 +2995,7 @@ int iso_read_opts_set_no_joliet(IsoReadOpts *opts, int nojoliet);
int iso_read_opts_set_no_iso1999(IsoReadOpts *opts, int noiso1999); int iso_read_opts_set_no_iso1999(IsoReadOpts *opts, int noiso1999);
/** /**
* Control reading of AAIP informations about ACL and xattr when loading * Control reading of AAIP information about ACL and xattr when loading
* existing images. * existing images.
* For importing ACL and xattr when inserting nodes from external filesystems * For importing ACL and xattr when inserting nodes from external filesystems
* (e.g. the local POSIX filesystem) see iso_image_set_ignore_aclea(). * (e.g. the local POSIX filesystem) see iso_image_set_ignore_aclea().
@ -3266,7 +3266,7 @@ int iso_read_image_features_has_eltorito(IsoReadImageFeatures *f);
void iso_image_ref(IsoImage *image); void iso_image_ref(IsoImage *image);
/** /**
* Decrements the reference couting of the given image. * Decrements the reference counting 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). * their refcount reach 0 too, of course).
* *
@ -3289,7 +3289,7 @@ void iso_image_unref(IsoImage *image);
* any more. It receives the data pointer as an argumente, and eventually * any more. It receives the data pointer as an argumente, and eventually
* causes data to be freed. It can be NULL if you don't need it. * causes data to be freed. It can be NULL if you don't need it.
* @return * @return
* 1 on succes, < 0 on error * 1 on success, < 0 on error
* *
* @since 0.6.2 * @since 0.6.2
*/ */
@ -4878,7 +4878,7 @@ int iso_node_get_xinfo(IsoNode *node, iso_node_xinfo_func proc, void **data);
/** /**
* Get the next pair of function pointer and data of an iteration of the * Get the next pair of function pointer and data of an iteration of the
* list of extended informations. Like: * list of extended information. Like:
* iso_node_xinfo_func proc; * iso_node_xinfo_func proc;
* void *handle = NULL, *data; * void *handle = NULL, *data;
* while (iso_node_get_next_xinfo(node, &handle, &proc, &data) == 1) { * while (iso_node_get_next_xinfo(node, &handle, &proc, &data) == 1) {
@ -5199,7 +5199,7 @@ int iso_node_cmp_ino(IsoNode *n1, IsoNode *n2, int flag);
* if the dir already contains a node with the same name, whether to * 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 * @return
* number of nodes in dir if succes, < 0 otherwise * number of nodes in dir if success, < 0 otherwise
* Possible errors: * Possible errors:
* ISO_NULL_POINTER, if dir or child are NULL * 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
@ -5328,7 +5328,7 @@ IsoDir *iso_node_get_parent(IsoNode *node);
* *
* You can iterate over the children with iso_dir_iter_next. When finished, * You can iterate over the children with iso_dir_iter_next. When finished,
* you should free the iterator with iso_dir_iter_free. * 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 * You must not 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. * iso_dir_iter_take() or iso_dir_iter_remove() instead.
* *
@ -5403,7 +5403,7 @@ void iso_dir_iter_free(IsoDirIter *iter);
* them is not allowed and you will get an ISO_ERROR in second call. * them is not allowed and you will get an ISO_ERROR in second call.
* *
* @return * @return
* 1 on succes, < 0 error * 1 on success, < 0 error
* Possible errors: * Possible errors:
* ISO_NULL_POINTER, if iter is NULL * ISO_NULL_POINTER, if iter is NULL
* ISO_ERROR, on wrong iter usage, for example by call this before * ISO_ERROR, on wrong iter usage, for example by call this before
@ -5422,7 +5422,7 @@ int iso_dir_iter_take(IsoDirIter *iter);
* iso_dir_iter_next between the calls. * iso_dir_iter_next between the calls.
* *
* @return * @return
* 1 on succes, < 0 error * 1 on success, < 0 error
* Possible errors: * Possible errors:
* ISO_NULL_POINTER, if iter is NULL * ISO_NULL_POINTER, if iter is NULL
* ISO_ERROR, on wrong iter usage, for example by calling this before * ISO_ERROR, on wrong iter usage, for example by calling this before
@ -5789,7 +5789,7 @@ int iso_node_get_old_image_lba(IsoNode *node, uint32_t *lba, int flag);
* fails with ISO_NODE_NAME_NOT_UNIQUE. * fails with ISO_NODE_NAME_NOT_UNIQUE.
* @param dir * @param dir
* place where to store a pointer to the newly created dir. No extra * place where to store a pointer to the newly created dir. No extra
* ref is addded, so you will need to call iso_node_ref() if you really * ref is added, 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 * need it. You can pass NULL in this parameter if you don't need the
* pointer. * pointer.
* @return * @return
@ -5850,7 +5850,7 @@ int iso_tree_add_new_dir(IsoDir *parent, const char *name, IsoDir **dir);
* if you need it. * if you need it.
* @param file * @param file
* place where to store a pointer to the newly created file. No extra * place where to store a pointer to the newly created file. No extra
* ref is addded, so you will need to call iso_node_ref() if you really * ref is added, 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 * need it. You can pass NULL in this parameter if you don't need the
* pointer * pointer
* @return * @return
@ -5931,7 +5931,7 @@ int iso_memory_stream_new(unsigned char *buf, size_t size, IsoStream **stream);
* not checked for being oversized. * not checked for being oversized.
* @param link * @param link
* Place where to store a pointer to the newly created link. No extra * Place where to store a pointer to the newly created link. No extra
* ref is addded, so you will need to call iso_node_ref() if you really * ref is added, 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 * need it. You can pass NULL in this parameter if you don't need the
* pointer * pointer
* @return * @return
@ -5981,7 +5981,7 @@ int iso_tree_add_new_symlink(IsoDir *parent, const char *name,
* Add a new special file to the directory tree. As far as libisofs concerns, * Add a new special file to the directory tree. As far as libisofs concerns,
* a special file is a block device, a character device, a FIFO (named pipe) * a 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 * or a socket. You can choose the specific kind of file you want to add
* by setting mode propertly (see man 2 stat). * by setting mode properly (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 * extensions are enabled. Moreover, a special file is just a directory entry
@ -6007,7 +6007,7 @@ int iso_tree_add_new_symlink(IsoDir *parent, const char *name,
* Device ID, equivalent to the st_rdev field in man 2 stat. * Device ID, equivalent to the st_rdev field in man 2 stat.
* @param special * @param special
* Place where to store a pointer to the newly created special file. No * 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 * extra ref is added, 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 * really need it. You can pass NULL in this parameter if you don't need
* the pointer. * the pointer.
* @return * @return
@ -6239,7 +6239,7 @@ void iso_tree_set_report_callback(IsoImage *image,
* Its directory path depends on the parent node. * Its directory path depends on the parent node.
* @param node * @param node
* place where to store a pointer to the newly added file. No * 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 * extra ref is added, 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 * really need it. You can pass NULL in this parameter if you don't need
* the pointer. * the pointer.
* @return * @return
@ -6274,7 +6274,7 @@ int iso_tree_add_node(IsoImage *image, IsoDir *parent, const char *path,
* The absolute path of the file in the local filesystem. * The absolute path of the file in the local filesystem.
* @param node * @param node
* place where to store a pointer to the newly added file. No * 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 * extra ref is added, 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 * really need it. You can pass NULL in this parameter if you don't need
* the pointer. * the pointer.
* @return * @return
@ -6313,7 +6313,7 @@ int iso_tree_add_new_node(IsoImage *image, IsoDir *parent, const char *name,
* byte offset to the end of the file in the local filesystem. * byte offset to the end of the file in the local filesystem.
* @param node * @param node
* place where to store a pointer to the newly added file. No * 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 * extra ref is added, 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 * really need it. You can pass NULL in this parameter if you don't need
* the pointer. * the pointer.
* @return * @return
@ -6442,7 +6442,7 @@ int iso_tree_add_dir_rec(IsoImage *image, IsoDir *parent, const char *dir);
/** /**
* Inquire whether some local filesystem xattr namespace could not be explored * Inquire whether some local filesystem xattr namespace could not be explored
* during node building. This may happen due to lack of adminstrator privileges * during node building.This may happen due to lack of administrator privileges
* e.g. on FreeBSD namespace "system". * e.g. on FreeBSD namespace "system".
* It may well be that the processed local files have no attributes which * It may well be that the processed local files have no attributes which
* would require special privileges. But already their existence was neither * would require special privileges. But already their existence was neither
@ -6455,7 +6455,7 @@ int iso_tree_add_dir_rec(IsoImage *image, IsoDir *parent, const char *dir);
* bit0 = reset internal value to 0 * bit0 = reset internal value to 0
* @return * @return
* 1 = Exploration was prevented * 1 = Exploration was prevented
* 0 = No such prevention occured * 0 = No such prevention occurred
* *
* @since 1.5.0 * @since 1.5.0
*/ */
@ -6715,7 +6715,7 @@ int iso_sev_to_text(int severity_number, char **severity_name);
/** /**
* Get the id of an IsoImage, used for message reporting. This message id, * Get the id of an IsoImage, used for message reporting. This message id,
* retrieved with iso_obtain_msgs(), can be used to distinguish what * retrieved with iso_obtain_msgs(), can be used to distinguish what
* IsoImage has isssued a given message. * IsoImage has issued a given message.
* *
* @since 0.6.2 * @since 0.6.2
*/ */
@ -6903,7 +6903,7 @@ int iso_file_source_stat(IsoFileSource *src, struct stat *info);
int iso_file_source_open(IsoFileSource *src); int iso_file_source_open(IsoFileSource *src);
/** /**
* Close a previuously openned file * Close a previously opened file
* @return 1 on success, < 0 on error * @return 1 on success, < 0 on error
* Error codes: * Error codes:
* ISO_FILE_ERROR * ISO_FILE_ERROR
@ -6959,7 +6959,7 @@ int iso_file_source_read(IsoFileSource *src, void *buf, size_t count);
* 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). * (SEEK_END).
* @return * @return
* Absolute offset posistion on the file, or < 0 on error. Cast the * Absolute offset position on the file, or < 0 on error. Cast the
* returning value to int to get a valid libisofs error. * returning value to int to get a valid libisofs error.
* @since 0.6.4 * @since 0.6.4
*/ */
@ -7051,7 +7051,7 @@ int iso_file_source_get_aa_string(IsoFileSource *src,
/** /**
* Get the filesystem for this source. No extra ref is added, so you * Get the filesystem for this source. No extra ref is added, so you
* musn't unref the IsoFilesystem. * must not unref the IsoFilesystem.
* *
* @return * @return
* The filesystem, NULL on error * The filesystem, NULL on error
@ -7083,7 +7083,7 @@ void iso_filesystem_unref(IsoFilesystem *fs);
* @param opts * @param opts
* Image read options * Image read options
* @param msgid * @param msgid
* An image identifer, obtained with iso_image_get_msg_id(), used to * An image identifier, obtained with iso_image_get_msg_id(), used to
* associated messages issued by the filesystem implementation with an * associated messages issued by the filesystem implementation with an
* existent image. If you are not using this filesystem in relation with * existent image. If you are not using this filesystem in relation with
* any image context, just use 0x1fffff as the value for this parameter. * any image context, just use 0x1fffff as the value for this parameter.
@ -7198,7 +7198,7 @@ void iso_stream_unref(IsoStream *stream);
int iso_stream_open(IsoStream *stream); int iso_stream_open(IsoStream *stream);
/** /**
* Close a previously openned IsoStream. * Close a previously opened IsoStream.
* *
* @return * @return
* 1 on success, < 0 on error * 1 on success, < 0 on error
@ -7421,7 +7421,7 @@ int iso_node_get_acl_text(IsoNode *node,
* bit1= Ignore text parameters but rather update the "access" ACL * bit1= Ignore text parameters but rather update the "access" ACL
* to the stat(2) permissions of node. If no "access" ACL exists, * to the stat(2) permissions of node. If no "access" ACL exists,
* then do nothing and return success. * then do nothing and return success.
* bit2= Be verbous about failure causes. * bit2= Be verbose about failure causes.
* @since 1.5.2 * @since 1.5.2
* @return * @return
* > 0 success * > 0 success
@ -8198,7 +8198,7 @@ int iso_file_make_md5(IsoFile *file, int flag);
* 1= session tag * 1= session tag
* 2= superblock tag * 2= superblock tag
* 3= tree tag * 3= tree tag
* 4= relocated 64 kB superblock tag (at LBA 0 of overwriteable media) * 4= relocated 64 kB superblock tag (at LBA 0 of overwritable media)
* @param pos * @param pos
* Returns the LBA where the tag supposes itself to be stored. * Returns the LBA where the tag supposes itself to be stored.
* If this does not match the data block LBA then the tag might be * If this does not match the data block LBA then the tag might be
@ -8606,7 +8606,7 @@ int iso_conv_name_chars(IsoWriteOpts *opts, char *name, size_t name_len,
/** The file does not exist in the filesystem (FAILURE,HIGH, -132) */ /** The file does not exist in the filesystem (FAILURE,HIGH, -132) */
#define ISO_FILE_DOESNT_EXIST 0xE830FF7C #define ISO_FILE_DOESNT_EXIST 0xE830FF7C
/** Trying to read or close a file not openned (FAILURE,HIGH, -133) */ /** Trying to read or close a file not opened (FAILURE,HIGH, -133) */
#define ISO_FILE_NOT_OPENED 0xE830FF7B #define ISO_FILE_NOT_OPENED 0xE830FF7B
/* @deprecated use ISO_FILE_NOT_OPENED instead */ /* @deprecated use ISO_FILE_NOT_OPENED instead */

2
libisofs/make_isohybrid_mbr.c
View File

@ -702,7 +702,7 @@ int make_isolinux_mbr(uint32_t *img_blocks, Ecma119Image *t,
for (part = 1 ; part <= 4; part++) { for (part = 1 ; part <= 4; part++) {
if ((int) part != part_number) { if ((int) part != part_number) {
/* if this_partition != partition_number: write 16 zero bytes /* if this_partition != partition_number: write 16 zero bytes
(this is now overriden by the eventual desire to announce (this is now overridden by the eventual desire to announce
EFI and HFS boot images.) EFI and HFS boot images.)
*/ */
memset(wpt, 0, 16); memset(wpt, 0, 16);

2
libisofs/md5.c
View File

@ -781,7 +781,7 @@ ex:;
* 1= session tag (End checksumming.) * 1= session tag (End checksumming.)
* 2= superblock tag (System Area and Volume Descriptors) * 2= superblock tag (System Area and Volume Descriptors)
* 3= tree tag (ECMA-119 and Rock Ridge tree) * 3= tree tag (ECMA-119 and Rock Ridge tree)
* 4= relocated superblock tag (at LBA 0 of overwriteable media) * 4= relocated superblock tag (at LBA 0 of overwritable media)
* Write to target->opts_overwrite rather than to iso_write(). * Write to target->opts_overwrite rather than to iso_write().
*/ */
int iso_md5_write_tag(Ecma119Image *t, int flag) int iso_md5_write_tag(Ecma119Image *t, int flag)

2
libisofs/messages.c
View File

@ -160,7 +160,7 @@ int iso_init_with_flag(int flag)
If everything matches, then it produces no C code. In case of mismatch, If everything matches, then it produces no C code. In case of mismatch,
intentionally faulty C code will be inserted. intentionally faulty C code will be inserted.
*/ */
/* The indendation is an advise of man gcc to help old compilers ignoring */ /* The indentation is an advise of man gcc to help old compilers ignoring */
#if iso_libjte_req_major > LIBJTE_VERSION_MAJOR #if iso_libjte_req_major > LIBJTE_VERSION_MAJOR
#define Libisofs_libjte_dot_h_too_olD 1 #define Libisofs_libjte_dot_h_too_olD 1
#endif #endif

8
libisofs/node.c
View File

@ -35,7 +35,7 @@ struct dir_iter_data
IsoNode *pos; IsoNode *pos;
/* Some control flags. /* Some control flags.
* bit 0 -> 1 if next called, 0 reseted at start or on deletion * bit 0 -> 1 if next called, 0 reset at start or on deletion
*/ */
int flag; int flag;
}; };
@ -49,7 +49,7 @@ void iso_node_ref(IsoNode *node)
} }
/** /**
* Decrements the reference couting of the given node. * Decrements the reference counting of the given node.
* If it reach 0, the node is free, and, if the node is a directory, * If it reach 0, the node is free, and, if the node is a directory,
* its children will be unref() too. * its children will be unref() too.
*/ */
@ -586,7 +586,7 @@ int iso_node_get_hidden(IsoNode *node)
* if the dir already contains a node with the same name, whether to * 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 * @return
* number of nodes in dir if succes, < 0 otherwise * number of nodes in dir if success, < 0 otherwise
*/ */
int iso_dir_add_node(IsoDir *dir, IsoNode *child, int iso_dir_add_node(IsoDir *dir, IsoNode *child,
enum iso_replace_mode replace) enum iso_replace_mode replace)
@ -2746,7 +2746,7 @@ int iso_node_cmp_flag(IsoNode *n1, IsoNode *n2, int flag)
if (n1->type != n2->type) if (n1->type != n2->type)
return (n1->type < n2->type ? -1 : 1); return (n1->type < n2->type ? -1 : 1);
/* Imported or explicite ISO image node id has priority */ /* Imported or explicit ISO image node id has priority */
ret1 = (iso_node_get_id(n1, &fs_id1, &dev_id1, &ino_id1, 1) > 0); ret1 = (iso_node_get_id(n1, &fs_id1, &dev_id1, &ino_id1, 1) > 0);
ret2 = (iso_node_get_id(n2, &fs_id2, &dev_id2, &ino_id2, 1) > 0); ret2 = (iso_node_get_id(n2, &fs_id2, &dev_id2, &ino_id2, 1) > 0);
if (ret1 != ret2) if (ret1 != ret2)

2
libisofs/node.h
View File

@ -284,7 +284,7 @@ int iso_node_new_symlink(char *name, char *dest, IsoSymlink **link);
* Create a new special file node. As far as libisofs concerns, * Create a new special file node. As far as libisofs concerns,
* an special file is a block device, a character device, a FIFO (named pipe) * 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 * or a socket. You can choose the specific kind of file you want to add
* by setting mode propertly (see man 2 stat). * by setting mode properly (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 * extensions are enabled. Moreover, a special file is just a directory entry

12
libisofs/rockridge.c
View File

@ -378,7 +378,7 @@ int iso_get_rr_name(IsoWriteOpts *opts, char *input_charset,
ret = strconv(str, input_charset, output_charset, name); ret = strconv(str, input_charset, output_charset, name);
if (ret < 0) { if (ret < 0) {
/* TODO we should check for possible cancelation */ /* TODO we should check for possible cancellation */
if (!(flag & 1)) if (!(flag & 1))
iso_msg_submit(imgid, ISO_FILENAME_WRONG_CHARSET, ret, iso_msg_submit(imgid, ISO_FILENAME_WRONG_CHARSET, ret,
"Charset conversion error. Cannot convert %s from %s to %s", "Charset conversion error. Cannot convert %s from %s to %s",
@ -573,7 +573,7 @@ int rrip_add_SL(Ecma119Image *t, struct susp_info *susp, uint8_t **comp,
} }
/* /*
* In this case we are sure we're writting to CE. Check for * In this case we are sure we're writing to CE. Check for
* debug purposes * debug purposes
*/ */
if (ce == 0) { if (ce == 0) {
@ -1249,7 +1249,7 @@ int susp_calc_nm_sl_al(Ecma119Image *t, Ecma119Node *n, size_t space,
/* /*
* ok, we need a Continuation Area anyway * ok, we need a Continuation Area anyway
* TODO this can be handled better, but for now SL * TODO this can be handled better, but for now SL
* will be completelly moved into the CA * will be completely moved into the CA
*/ */
if (!(flag & 1)) { if (!(flag & 1)) {
free(dest); free(dest);
@ -1600,7 +1600,7 @@ void susp_info_free(struct susp_info* susp)
* Pointer to the struct susp_info where the entries will be stored. * Pointer to the struct susp_info where the entries will be stored.
* If some entries need to go to a Continuation Area, they will be added * If some entries need to go to a Continuation Area, they will be added
* to the existing ce_susp_fields, and ce_len will be incremented * to the existing ce_susp_fields, and ce_len will be incremented
* propertly. Please ensure ce_block is initialized propertly. * properly. Please ensure ce_block is initialized properly.
* @return * @return
* 1 success, < 0 error * 1 success, < 0 error
*/ */
@ -1837,7 +1837,7 @@ int rrip_get_susp_fields(Ecma119Image *t, Ecma119Node *n, int type,
/* /*
* ok, we need a Continuation Area anyway * ok, we need a Continuation Area anyway
* TODO this can be handled better, but for now SL * TODO this can be handled better, but for now SL
* will be completelly moved into the CA * will be completely moved into the CA
*/ */
/* sua_free, ce_len, nm_type already account for CE */ /* sua_free, ce_len, nm_type already account for CE */
@ -2201,7 +2201,7 @@ int susp_update_CE_sizes(Ecma119Image *t, struct susp_info *info, int flag)
* fields are not written. * fields are not written.
* If info does not contain any SUSP entry this function just return. * If info does not contain any SUSP entry this function just return.
* After written, the info susp_fields array will be freed, and the counters * After written, the info susp_fields array will be freed, and the counters
* updated propertly. * updated properly.
*/ */
void rrip_write_susp_fields(Ecma119Image *t, struct susp_info *info, void rrip_write_susp_fields(Ecma119Image *t, struct susp_info *info,
uint8_t *buf) uint8_t *buf)

4
libisofs/rockridge.h
View File

@ -219,7 +219,7 @@ size_t rrip_calc_len(Ecma119Image *t, Ecma119Node *n, int type, size_t space,
* Pointer to the struct susp_info where the entries will be stored. * Pointer to the struct susp_info where the entries will be stored.
* If some entries need to go to a Continuation Area, they will be added * If some entries need to go to a Continuation Area, they will be added
* to the existing ce_susp_fields, and ce_len will be incremented * to the existing ce_susp_fields, and ce_len will be incremented
* propertly. Please ensure ce_block is initialized propertly. * properly. Please ensure ce_block is initialized properly.
* @return * @return
* 1 success, < 0 error * 1 success, < 0 error
*/ */
@ -231,7 +231,7 @@ int rrip_get_susp_fields(Ecma119Image *t, Ecma119Node *n, int type,
* fields are not written. * fields are not written.
* If info does not contain any SUSP entry this function just return. * If info does not contain any SUSP entry this function just return.
* After written, the info susp_fields array will be freed, and the counters * After written, the info susp_fields array will be freed, and the counters
* updated propertly. * updated properly.
*/ */
void rrip_write_susp_fields(Ecma119Image *t, struct susp_info *info, void rrip_write_susp_fields(Ecma119Image *t, struct susp_info *info,
uint8_t *buf); uint8_t *buf);

2
libisofs/stream.h
View File

@ -37,7 +37,7 @@ void iso_stream_get_file_name(IsoStream *stream, char *name);
/** /**
* Create a stream to read from a IsoFileSource. * Create a stream to read from a IsoFileSource.
* The stream will take the ref. to the IsoFileSource, so after a successfully * The stream will take the ref. to the IsoFileSource, so after a successfully
* exectution of this function, you musn't unref() the source, unless you * execution of this function, you must not unref() the source, unless you
* take an extra ref. * take an extra ref.
* *
* @return * @return

2
libisofs/system_area.c
View File

@ -2075,7 +2075,7 @@ int iso_write_system_area(Ecma119Image *t, uint8_t *buf)
/* >>> ??? Do this in any case of t->gpt_req_count > ? */; /* >>> ??? Do this in any case of t->gpt_req_count > ? */;
/* Re-write partion entry 1 : protective MBR for GPT */ /* Re-write partition entry 1 : protective MBR for GPT */
part_type = 0xee; part_type = 0xee;
risk_of_ee = 1; risk_of_ee = 1;
ret = write_mbr_partition_entry(1, part_type, ret = write_mbr_partition_entry(1, part_type,

2
libisofs/system_area.h
View File

@ -72,7 +72,7 @@ int iso_compute_append_partitions(Ecma119Image *t, int flag);
in the table. in the table.
Requested entries with block_count == 0 get expanded to the start of Requested entries with block_count == 0 get expanded to the start of
the next requested entry resp. to image end, if no entry follows. the next requested entry resp. to image end, if no entry follows.
start_block of a follwing entry must be at least a high as the sum of start_block of a following entry must be at least a high as the sum of
start_block and block_count of the previous entry. start_block and block_count of the previous entry.
Empty requested entries will be represented as 16 bytes of 0. Empty requested entries will be represented as 16 bytes of 0.
*/ */

14
libisofs/tree.c
View File

@ -43,11 +43,11 @@
* parent, this functions fails with ISO_NODE_NAME_NOT_UNIQUE. * parent, this functions fails with ISO_NODE_NAME_NOT_UNIQUE.
* @param dir * @param dir
* place where to store a pointer to the newly created dir. No extra * place where to store a pointer to the newly created dir. No extra
* ref is addded, so you will need to call iso_node_ref() if you really * ref is added, 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 * need it. You can pass NULL in this parameter if you don't need the
* pointer. * pointer.
* @return * @return
* number of nodes in dir if succes, < 0 otherwise * number of nodes in dir if success, < 0 otherwise
* Possible errors: * Possible errors:
* ISO_NULL_POINTER, if parent or name are NULL * ISO_NULL_POINTER, if parent or name are NULL
* ISO_NODE_NAME_NOT_UNIQUE, a node with same name already exists * ISO_NODE_NAME_NOT_UNIQUE, a node with same name already exists
@ -127,7 +127,7 @@ int iso_image_add_new_dir(IsoImage *image, IsoDir *parent, const char *name,
* destination of the link * destination of the link
* @param link * @param link
* place where to store a pointer to the newly created link. No extra * place where to store a pointer to the newly created link. No extra
* ref is addded, so you will need to call iso_node_ref() if you really * ref is added, 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 * need it. You can pass NULL in this parameter if you don't need the
* pointer * pointer
* @return * @return
@ -206,7 +206,7 @@ int iso_image_add_new_symlink(IsoImage *image, IsoDir *parent,
* Add a new special file to the directory tree. As far as libisofs concerns, * Add a new special file to the directory tree. As far as libisofs concerns,
* an special file is a block device, a character device, a FIFO (named pipe) * 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 * or a socket. You can choose the specific kind of file you want to add
* by setting mode propertly (see man 2 stat). * by setting mode properly (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 * extensions are enabled. Moreover, a special file is just a directory entry
@ -229,7 +229,7 @@ int iso_image_add_new_symlink(IsoImage *image, IsoDir *parent,
* device ID, equivalent to the st_rdev field in man 2 stat. * device ID, equivalent to the st_rdev field in man 2 stat.
* @param special * @param special
* place where to store a pointer to the newly created special file. No * 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 * extra ref is added, 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 * really need it. You can pass NULL in this parameter if you don't need
* the pointer. * the pointer.
* @return * @return
@ -319,7 +319,7 @@ int iso_image_add_new_special(IsoImage *image, IsoDir *parent,
* IsoStream for the contents of the file * IsoStream for the contents of the file
* @param file * @param file
* place where to store a pointer to the newly created file. No extra * place where to store a pointer to the newly created file. No extra
* ref is addded, so you will need to call iso_node_ref() if you really * ref is added, 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 * need it. You can pass NULL in this parameter if you don't need the
* pointer * pointer
* @return * @return
@ -768,7 +768,7 @@ int check_excludes(IsoImage *image, const char *path)
return 1; return 1;
} }
} else { } else {
/* relative exclude, it is enought if a part of the path matches */ /* relative exclude, it is enough if a part of the path matches */
char *pos = (char*)path; char *pos = (char*)path;
while (pos != NULL) { while (pos != NULL) {
pos++; pos++;

6
libisofs/util.c
View File

@ -1942,7 +1942,7 @@ char *ucs2str(const char *buf, size_t len)
outbytes = (inbytes+1) * MB_LEN_MAX; outbytes = (inbytes+1) * MB_LEN_MAX;
/* ensure enought space */ /* ensure enough space */
out = calloc(outbytes, 1); out = calloc(outbytes, 1);
if (out == NULL) if (out == NULL)
return NULL; return NULL;
@ -1995,7 +1995,7 @@ int iso_lib_is_compatible(int major, int minor, int micro)
{ {
int cmajor, cminor, cmicro; int cmajor, cminor, cmicro;
/* for now, the rule is that library is compitable if requested /* for now, the rule is that library is compatible if requested
* version is lower */ * version is lower */
iso_lib_version(&cmajor, &cminor, &cmicro); iso_lib_version(&cmajor, &cminor, &cmicro);
@ -2332,7 +2332,7 @@ int iso_clone_mgtd_mem(char *in, char **out, size_t size)
(Also accepts capital letters.) (Also accepts capital letters.)
@param text Input like "42", "223062s", "3m" or "-1g" @param text Input like "42", "223062s", "3m" or "-1g"
@param flag Bitfield for control purposes: @param flag Bitfield for control purposes:
bit0= return -1 rathern than 0 on failure bit0= return -1 rather than 0 on failure
bit1= if scaled then compute the last byte of the last unit bit1= if scaled then compute the last byte of the last unit
@return The derived value @return The derived value
*/ */

14
libisofs/util.h
View File

@ -55,7 +55,7 @@ int iso_init_locale(int flag);
* @param ocharset * @param ocharset
* Output charset. Must be supported by iconv * Output charset. Must be supported by iconv
* @param output * @param output
* Location where the pointer to the ouput string will be stored * Location where the pointer to the output string will be stored
* @return * @return
* 1 on success, < 0 on error * 1 on success, < 0 on error
*/ */
@ -80,7 +80,7 @@ int strnconvl(const char *str, const char *icharset, const char *ocharset,
* @param input * @param input
* Input string * Input string
* @param output * @param output
* Location where the pointer to the ouput string will be stored * Location where the pointer to the output string will be stored
* @return * @return
* 1 on success, < 0 on error * 1 on success, < 0 on error
*/ */
@ -95,7 +95,7 @@ int str2ascii(const char *icharset, const char *input, char **output);
* @param input * @param input
* Input string * Input string
* @param output * @param output
* Location where the pointer to the ouput string will be stored * Location where the pointer to the output string will be stored
* @return * @return
* 1 on success, < 0 on error * 1 on success, < 0 on error
*/ */
@ -111,7 +111,7 @@ int str2ucs(const char *icharset, const char *input, uint16_t **output);
* @param input * @param input
* Input string * Input string
* @param output * @param output
* Location where the pointer to the ouput string will be stored * Location where the pointer to the output string will be stored
* @return * @return
* 1 on success, < 0 on error * 1 on success, < 0 on error
*/ */
@ -258,7 +258,7 @@ void iso_handle_split_utf16(uint16_t *utf_word);
/** /**
* Convert a given input string to d-chars. * Convert a given input string to d-chars.
* @return * @return
* 1 on succes, < 0 error, 0 if input was null (output is set to null) * 1 on success, < 0 error, 0 if input was null (output is set to null)
*/ */
int str2d_char(const char *icharset, const char *input, char **output); int str2d_char(const char *icharset, const char *input, char **output);
int str2a_char(const char *icharset, const char *input, char **output); int str2a_char(const char *icharset, const char *input, char **output);
@ -400,7 +400,7 @@ size_t iso_rbtree_get_size(IsoRBTree *tree);
* without counting the final NULL item. * without counting the final NULL item.
* @return * @return
* A sorted array with the contents of the tree, or NULL if there is not * A sorted array with the contents of the tree, or NULL if there is not
* enought memory to allocate the array. You should free(3) the array when * enough memory to allocate the array. You should free(3) the array when
* no more needed. Note that the array is NULL-terminated, and thus it * no more needed. Note that the array is NULL-terminated, and thus it
* has size + 1 length. * has size + 1 length.
*/ */
@ -646,7 +646,7 @@ int iso_clone_mgtd_mem(char *in, char **out, size_t size);
(Also accepts capital letters.) (Also accepts capital letters.)
@param text Input like "42", "223062s", "3m" or "-1g" @param text Input like "42", "223062s", "3m" or "-1g"
@param flag Bitfield for control purposes: @param flag Bitfield for control purposes:
bit0= return -1 rathern than 0 on failure bit0= return -1 rather than 0 on failure
bit1= if scaled then compute the last byte of the last unit bit1= if scaled then compute the last byte of the last unit
@return The derived value @return The derived value
*/ */

2
libisofs/util_rbtree.c
View File

@ -277,7 +277,7 @@ size_t rbtree_to_array_aux(struct iso_rbnode *root, void **array, size_t pos,
* NULL pointer. * NULL pointer.
* @return * @return
* A sorted array with the contents of the tree, or NULL if there is not * A sorted array with the contents of the tree, or NULL if there is not
* enought memory to allocate the array. You should free(3) the array when * enough memory to allocate the array. You should free(3) the array when
* no more needed. Note that the array is NULL-terminated, and thus it * no more needed. Note that the array is NULL-terminated, and thus it
* has size + 1 length. * has size + 1 length.
*/ */