Browse Source

Changed wrong use of "resp." in docs

release-1.5.4.branch
Thomas Schmitt 5 years ago
parent
commit
d3fefe4735
11 changed files with 38 additions and 39 deletions
  1. +1
    -1
      ChangeLog
  2. +1
    -1
      README
  3. +6
    -6
      doc/boot_sectors.txt
  4. +1
    -1
      doc/susp_aaip_2_0.txt
  5. +5
    -6
      doc/zisofs_format.txt
  6. +1
    -1
      libisofs/aaip-os-dummy.c
  7. +2
    -2
      libisofs/aaip-os-freebsd.c
  8. +2
    -2
      libisofs/aaip-os-linux.c
  9. +1
    -1
      libisofs/hfsplus.c
  10. +2
    -2
      libisofs/libiso_msgs.h
  11. +16
    -16
      libisofs/libisofs.h

+ 1
- 1
ChangeLog View File

@ -24,7 +24,7 @@ libisofs-1.4.0.tar.gz Sun May 17 2014
* Bug fix: A zero sized GPT partition was marked after the last appended
GPT partition.
* Bug fix: GPT production did not yield proper results with appended sessions
resp. with TOC emulation enabled.
or with TOC emulation enabled.
* Increased default weight of El Torito boot catalog to 1 billion.
* Improved handling of cylinder alignment if the resulting image size is not
divisible by 2048. Old behavior was to not align. New is to pad up by a


+ 1
- 1
README View File

@ -37,7 +37,7 @@ and execute
./configure --prefix=/usr
make
To make the libraries accessible for running resp. developing applications
To make the libraries accessible for running and developing applications
make install
On GNU/Linux it will try to run program ldconfig with the library installation


+ 6
- 6
doc/boot_sectors.txt View File

@ -126,10 +126,10 @@ Defined by El Torito are:
1 = "PowerPC" (possibly for IBM machines with PowerPC CPU)
2 = "Mac" (possibly for Apple computers with MC68000 or PowerPC CPU)
UEFI 2.4 specifies in 12.3.2.1 "ISO-9660 and El Torito":
0xef = EFI, a competitor resp. successor to PC-BIOS, possibly in use with
Intel ia64 Itanium and possibly with newer Apple machines.
0xef = EFI, a competitor and successor to PC-BIOS, further in use with
Intel ia64 Itanium and newer Apple machines.
Words resp. numbers are represented are little-endian.
Words and numbers are represented as little-endian.
Validation Entry:
@ -386,7 +386,7 @@ on Linux a partition device file (e.g. /dev/sdb1) which cannot be used to mount
the ISO filesystem.
libisofs is able to produce a second set of trees and meta data which is
suitable for being mounted at start block 16 (ISO) resp. 64 (MBR).
suitable for being mounted at start block 16 (ISO) which is block 64 in MBR.
See <libisofs/libisofs.h> for call iso_write_opts_set_part_offset()
and http://libburnia-project.org/wiki/PartitionOffset for examples with
program xorriso.
@ -1515,8 +1515,8 @@ The ISO image file gets padded up to full MiB with sufficient room for the GPT
backup which is stored near the very end of the image file. There is need for
at least 16.5 KiB, which effectively occupy 18 KiB.
The backup partition array is stored 17 KiB before the end of MBR partition 1
resp. the image file.
The backup partition array is stored 17 KiB before the end of MBR partition 1,
which is also the end of the image file.
(Potential isohybrid.c bug #1:
Wikipedia suggests "LBA -33" counted from end. This would be 16.5 KiB before
end.)


+ 1
- 1
doc/susp_aaip_2_0.txt View File

@ -217,7 +217,7 @@ S_IRWXG. If there is ACL_USER_N or ACL_GROUP_N there must also be ACL_MASK.
A numeric qualifier is a binary number of variable length up to 4 bytes. The
Most Significant Byte comes first. The number shall be the "POSIX File User ID"
resp. "POSIX File Group ID" as also used in RRIP PX entries. The ids of owning
or "POSIX File Group ID" as also used in RRIP PX entries. The ids of owning
user and owning group shall be taken from the PX entry of the file object.
Optional TRANSLATE entries may associate user or group names with numeric


+ 5
- 6
doc/zisofs_format.txt View File

@ -37,7 +37,7 @@ i.e. block sizes 32 kB, 64 kB, and 128 kB. Writers must not use other sizes.
Block Pointers
There are ceil(input_size / block_size) input resp. output blocks.
There are ceil(input_size / block_size) input and output blocks.
Each input block is of fixed size whereas the output blocks have varying
size (down to 0). For each output block there is an offset pointer giving
its byte address in the overall file content. The next block pointer in the
@ -68,7 +68,7 @@ when being read.
ZF may only be applied to files with a single extent and less than 4 GiB of
uncompressed size.
The ZF entry follows the general layout of SUSP resp. RRIP.
The ZF entry follows the general layout of SUSP and RRIP.
Its fields are:
[1] "BP 1 to BP 2 - Signature Word" shall be (5A)(46) ("ZF").
@ -85,19 +85,18 @@ Its fields are:
[5] "BP 7 - Header Size Div 4" shall specify as an 8-bit number the number of
4-byte words in the header part of the file data recorded according
to ISO 9660:7.1.1.
(This is a copy of header byte 12, resp. header BP 13).
(This is a copy of header byte 12 / BP 13).
[6] "BP 8 - Log2 of Block Size" shall specify as an 8-bit number the binary
logarithm of the compression block size recorded according to
ISO 9660:7.1.1.
(This is a copy of header byte 13, resp. header BP 14.
(This is a copy of header byte 13 / BP 14.
The value has to be 15, 16 or 17 i.e. 32 kiB, 64 kiB, or 128 kiB.)
[7] "BP 9 to BP 16 - Uncompressed Size" shall tell the number of uncompressed
bytes represented by the given extent. This field shall be recorded
according to ISO 9660:7.3.3.
(This number is the same as in header bytes 8 to 11, resp header BP 9
to BP 12.)
(This number is the same as in header bytes 8 to 11 / BP 9 to BP 12.)
| 'Z' | 'F' | LENGTH | 1 | 'p' | 'z' | HEADER SIZE DIV 4 | LOG2 BLOCK SIZE
| UNCOMPRESSED SIZE |


+ 1
- 1
libisofs/aaip-os-dummy.c View File

@ -39,7 +39,7 @@
It is permissibile to set them to 1 already now.
bit8 and higher: reserved, submit 0
@return
Bitfield corresponding to flag. If bits are set, th
Bitfield corresponding to flag.
bit0= ACL adapter is enabled
bit1= xattr adapter is enabled
bit2 - bit7= Reserved for future types.


+ 2
- 2
libisofs/aaip-os-freebsd.c View File

@ -49,7 +49,7 @@
It is permissibile to set them to 1 already now.
bit8 and higher: reserved, submit 0
@return
Bitfield corresponding to flag. If bits are set, th
Bitfield corresponding to flag.
bit0= ACL adapter is enabled
bit1= xattr adapter is enabled
bit2 - bit7= Reserved for future types.
@ -687,7 +687,7 @@ ex:;
0 no suitable ACL manipulation adapter available
-1 failure of system ACL service (see errno)
-2 attempt to manipulate ACL of a symbolic link
without bit5 resp. with no suitable link target
without bit5 or with no suitable link target
*/
int aaip_set_acl_text(char *path, char *text, int flag)
{


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

@ -89,7 +89,7 @@ int aaip_local_attr_support(int flag)
or filesystem does not support ACL
-1 failure of system ACL service (see errno)
-2 attempt to inquire ACL of a symbolic link without
bit4 or bit5 resp. with no suitable link target
bit4 or bit5 or with no suitable link target
*/
int aaip_get_acl_text(char *path, char **text, int flag)
{
@ -377,7 +377,7 @@ ex:;
0 ACL support not enabled at compile time
-1 failure of system ACL service (see errno)
-2 attempt to manipulate ACL of a symbolic link
without bit5 resp. with no suitable link target
without bit5 or with no suitable link target
*/
int aaip_set_acl_text(char *path, char *text, int flag)
{


+ 1
- 1
libisofs/hfsplus.c View File

@ -1832,7 +1832,7 @@ struct iso_hfsplus_xinfo_data *iso_hfsplus_xinfo_new(int flag)
}
/* The iso_node_xinfo_cloner function which gets associated to
* iso_hfsplus_xinfo_func by iso_init() resp. iso_init_with_flag() via
* iso_hfsplus_xinfo_func by iso_init() or iso_init_with_flag() via
* iso_node_xinfo_make_clonable()
*/
int iso_hfsplus_xinfo_cloner(void *old_data, void **new_data, int flag)


+ 2
- 2
libisofs/libiso_msgs.h View File

@ -221,7 +221,7 @@ struct libiso_msgs_item;
*/
#define LIBISO_MSGS_SEV_ABORT 0x71000000
/** A severity to exclude resp. discard any possible message.
/** A severity to exclude or discard any possible message.
Do not use this severity for submitting.
*/
#define LIBISO_MSGS_SEV_NEVER 0x7fffffff
@ -510,7 +510,7 @@ Range "scdbackup" : 0x00020000 to 0x0002ffff
0x00020148 (SORRY,HIGH) = Cannot write desired amount of data
0x00020149 (SORRY,HIGH) = Unsuitable filetype for pseudo-drive
0x0002014a (SORRY,HIGH) = Cannot read desired amount of data
0x0002014b (SORRY,HIGH) = Drive is already registered resp. scanned
0x0002014b (SORRY,HIGH) = Drive is already registered and scanned
0x0002014c (FATAL,HIGH) = Emulated drive caught in SCSI function
0x0002014d (SORRY,HIGH) = Asynchromous SCSI error
0x0002014f (SORRY,HIGH) = Timeout with asynchromous SCSI command


+ 16
- 16
libisofs/libisofs.h View File

@ -31,7 +31,7 @@
* This can be achieved either:
* - by using autotools which will define HAVE_STDINT_H or HAVE_INTTYPES_H
* according to its ./configure tests,
* - or by defining the macros HAVE_STDINT_H resp. HAVE_INTTYPES_H according
* - or by defining the macros HAVE_STDINT_H or HAVE_INTTYPES_H according
* to the local situation,
* - or by appropriately defining uint32_t and uint8_t by other means,
* e.g. by including inttypes.h before including libisofs.h
@ -2039,7 +2039,7 @@ int iso_write_opts_set_output_charset(IsoWriteOpts *opts, const char *charset);
* On the other side, an appended image is not self contained. It may refer
* to files that stay stored in the imported existing image.
* This usage model is inspired by CD multi-session. It demands that the
* appended image is finally written to the same media resp. disk file
* appended image is finally written to the same media or disk file
* as the imported image at an address behind the end of that imported image.
* The exact address may depend on media peculiarities and thus has to be
* announced by the application via iso_write_opts_set_ms_block().
@ -2309,7 +2309,7 @@ int iso_write_opts_set_pvd_times(IsoWriteOpts *opts,
* The additional volume descriptor set and trees will allow to mount the
* ISO image at the start of the first partition, while it is still possible
* to mount it via the normal first volume descriptor set and tree at the
* start of the image resp. storage device.
* start of the image or storage device.
* This makes few sense on optical media. But on USB sticks it creates a
* conventional partition table which makes it mountable on e.g. Linux via
* /dev/sdb and /dev/sdb1 alike.
@ -3503,7 +3503,7 @@ int iso_image_set_boot_catalog_hidden(IsoImage *image, int hide_attrs);
/**
* Get the boot media type as of parameter "type" of iso_image_set_boot_image()
* resp. iso_image_add_boot_image().
* or iso_image_add_boot_image().
*
* @param bootimg
* The image to inquire
@ -3629,7 +3629,7 @@ void el_torito_set_no_bootable(ElToritoBootImage *bootimg);
int el_torito_get_bootable(ElToritoBootImage *bootimg);
/**
* Set the id_string of the Validation Entry resp. Sector Header Entry which
* Set the id_string of the Validation Entry or Sector Header Entry which
* will govern the boot image Section Entry in the El Torito Catalog.
*
* @param bootimg
@ -5591,7 +5591,7 @@ int iso_tree_get_ignore_special(IsoImage *image);
* 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,
* following the example above,
*
* iso_tree_add_dir_rec(image, root, "/home/user");
*
@ -5603,8 +5603,8 @@ int iso_tree_get_ignore_special(IsoImage *image);
* 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
* to exclude, respectively, all files or dirs named private, and also all
* files or dirs named data that belong to a folder named "user". Note 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");
@ -6673,7 +6673,7 @@ int iso_stream_clone(IsoStream *old_stream, IsoStream **new_stream, int flag);
*
* An AAIP string contains the Attribute List with the xattr and ACL of a node
* in the image tree. It is formatted according to libisofs specification
* AAIP-2.0 and ready to be written into the System Use Area resp. Continuation
* AAIP-2.0 and ready to be written into the System Use Area or Continuation
* Area of a directory entry in an ISO image.
*
* Applications are not supposed to manipulate AAIP strings directly.
@ -6694,14 +6694,14 @@ int aaip_xinfo_func(void *data, int flag);
/**
* The iso_node_xinfo_cloner function which gets associated to aaip_xinfo_func
* by iso_init() resp. iso_init_with_flag() via iso_node_xinfo_make_clonable().
* by iso_init() or iso_init_with_flag() via iso_node_xinfo_make_clonable().
* @since 1.0.2
*/
int aaip_xinfo_cloner(void *old_data, void **new_data, int flag);
/**
* Get the eventual ACLs which are associated with the node.
* The result will be in "long" text form as of man acl resp. acl_to_text().
* The result will be in "long" text form as of man acl and acl_to_text().
* Call this function with flag bit15 to finally release the memory
* occupied by an ACL inquiry.
*
@ -6915,7 +6915,7 @@ int iso_node_set_attrs(IsoNode *node, size_t num_attrs, char **names,
* It is permissibile to set them to 1 already now.
* bit8 and higher: reserved, submit 0
* @return
* Bitfield corresponding to flag. If bits are set, th
* Bitfield corresponding to flag.
* bit0= ACL adapter is enabled
* bit1= xattr adapter is enabled
* bit2 - bit7= Reserved for future types.
@ -6947,7 +6947,7 @@ int iso_local_attr_support(int flag);
* 0 no ACL manipulation adapter available / ACL not supported on fs
* -1 failure of system ACL service (see errno)
* -2 attempt to inquire ACL of a symbolic link without bit4 or bit5
* resp. with no suitable link target
* or with no suitable link target
*
* @since 0.6.14
*/
@ -6971,7 +6971,7 @@ int iso_local_get_acl_text(char *disk_path, char **text, int flag);
* 0 no ACL manipulation adapter available for desired ACL type
* -1 failure of system ACL service (see errno)
* -2 attempt to manipulate ACL of a symbolic link without bit5
* resp. with no suitable link target
* or with no suitable link target
*
* @since 0.6.14
*/
@ -6992,7 +6992,7 @@ int iso_local_set_acl_text(char *disk_path, char *text, int flag);
* Returns permission bits as of stat(2)
* @return
* 1 success
* -1 failure of lstat() resp. stat() (see errno)
* -1 failure of lstat() or stat() (see errno)
*
* @since 0.6.14
*/
@ -7200,7 +7200,7 @@ struct iso_external_filter_command
int behavior;
/* The eventual suffix which is supposed to be added to the IsoFile name
* resp. to be removed from the name.
* or to be removed from the name.
* (This is to be done by the application, not by calls
* iso_file_add_external_filter() or iso_file_remove_filter().
* The value recorded here serves only as reminder for the application.)


Loading…
Cancel
Save