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

Removed development marks

Browse Source
This commit is contained in:
Thomas Schmitt 2010-09-11 12:50:36 +00:00
parent 2ad974f639
commit b8aad74477
5 changed files with 26 additions and 38 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
libisoburn/trunk/libisoburn/isoburn.c
View File

@ -355,9 +355,8 @@ int isoburn_msgs_submit(struct isoburn *o, int error_code, char msg_text[],
} }
/* TWINTREE: /** Check whether the size of target_iso_head matches the given partition
Check whether size of target_iso_head matches partition offset. offset. Eventually adjust size.
Eventually adjust size.
*/ */
int isoburn_adjust_target_iso_head(struct isoburn *o, int isoburn_adjust_target_iso_head(struct isoburn *o,
uint32_t offst, int flag) uint32_t offst, int flag)

22
libisoburn/trunk/libisoburn/isoburn.h
View File

@ -38,7 +38,6 @@ int isoburn_toc_entry_destroy(struct isoburn_toc_entry **o, int flag);
/* Minimal size of target_iso_head which is to be written during /* Minimal size of target_iso_head which is to be written during
isoburn_activate_session(). isoburn_activate_session().
TWINTREE:
Within this size there is everything that is needed for image access with Within this size there is everything that is needed for image access with
no partition offset. The actual target_iso_head buffer must be larger by no partition offset. The actual target_iso_head buffer must be larger by
the evential partition offset. the evential partition offset.
@ -253,9 +252,8 @@ isoburn_data_source_new(struct burn_drive *d);
int isoburn_data_source_shutdown(IsoDataSource *src, int flag); int isoburn_data_source_shutdown(IsoDataSource *src, int flag);
/** TWINTREE: /** Check whether the size of target_iso_head matches the given partition
Check whether size of target_iso_head matches offset. offset. Eventually adjust size.
Eventually adjust size.
*/ */
int isoburn_adjust_target_iso_head(struct isoburn *o, int isoburn_adjust_target_iso_head(struct isoburn *o,
uint32_t offst, int flag); uint32_t offst, int flag);
@ -537,15 +535,14 @@ struct isoburn_imgen_opts {
and timezone 0 */ and timezone 0 */
char vol_uuid[17]; char vol_uuid[17];
/* TWINTREE: The number of unclaimed 2K blocks before /* The number of unclaimed 2K blocks before start of partition 1 as of
start of partition 1 as of the MBR in system area. the MBR in system area. If not 0 this will cause double volume
If not 0 this will cause double volume descriptor sets descriptor sets and double tree.
and double tree.
*/ */
uint32_t partition_offset; uint32_t partition_offset;
/* TWINTREE: Partition table parameter: 1 to 63, 0= disabled/default */ /* Partition table parameter: 1 to 63, 0= disabled/default */
int partition_secs_per_head; int partition_secs_per_head;
/* TWINTREE: 1 to 255, 0= disabled/default */ /* 1 to 255, 0= disabled/default */
int partition_heads_per_cyl; int partition_heads_per_cyl;
}; };
@ -584,9 +581,8 @@ struct isoburn_imgen_opts {
In this case, no copy of the session 1 header is maintained and no TOC In this case, no copy of the session 1 header is maintained and no TOC
will be possible. Thus writing begins sequentially at LBA 0. will be possible. Thus writing begins sequentially at LBA 0.
TWINTREE: IMPORTANT: This macro gives the minimal size of an image header.
This macro gives the minimal size of an image header. It has to be It has to be enlarged by the eventual partition offset.
enlarged by the eventual partition offset.
*/ */
#define Libisoburn_overwriteable_starT \ #define Libisoburn_overwriteable_starT \
((off_t) (Libisoburn_target_head_sizE/2048)) ((off_t) (Libisoburn_target_head_sizE/2048))

6
libisoburn/trunk/libisoburn/isofs_wrap.c
View File

@ -305,8 +305,7 @@ int isoburn_activate_session(struct burn_drive *drive)
} }
/** TWINTREE: /** API @since 0.6.2
API @since 0.6.2
*/ */
int isoburn_get_img_partition_offset(struct burn_drive *drive, int isoburn_get_img_partition_offset(struct burn_drive *drive,
uint32_t *block_offset_2k) uint32_t *block_offset_2k)
@ -327,8 +326,7 @@ int isoburn_get_img_partition_offset(struct burn_drive *drive,
} }
/* TWINTREE: /* Check for MBR signature and a first partition that starts at a 2k block
Check for MBR signature and a first partition that starts at a 2k block
and ends where the image ends. and ends where the image ends.
If not too large or too small, accept its start as partition offset. If not too large or too small, accept its start as partition offset.
*/ */

29
libisoburn/trunk/libisoburn/libisoburn.h
View File

@ -1222,21 +1222,17 @@ int isoburn_igopt_set_system_area(struct isoburn_imgen_opts *o,
int isoburn_igopt_get_system_area(struct isoburn_imgen_opts *o, int isoburn_igopt_get_system_area(struct isoburn_imgen_opts *o,
char data[32768], int *options); char data[32768], int *options);
/** >>> TWINTREE : Under Construction. /** Control production of a second set of volume descriptors (superblock)
Do not use yet for multi-session and directory trees, together with a partition table in the MBR where the
first partition has non-zero start address and the others are zeroed.
Control production of a second set of volume descriptors (ISO 9660 superblock) The first partition stretches to the end of the whole ISO image.
and directory trees, together with a partition table entry in the MBR which The additional volume descriptor set and trees will allow to mount the
has non-zero start address. ISO image at the start of the first partition, while it is still possible
The second volume descriptor set and trees will allow to mount the ISO image to mount it via the normal first volume descriptor set and tree at the
at the start of the first partition, while it is still possible to mount it start of the image resp. storage device.
via the normal fist volume descriptor set and tree at the start of the device. This makes few sense on optical media. But on USB sticks it creates a
This makes few sense on optical media. Nevertheless it creates a conventional conventional partition table which makes it mountable on e.g. Linux via
partition table on USB sticks which then are mountable on Linux via /dev/sdb /dev/sdb and /dev/sdb1 alike.
and /dev/sdb1 alike.
>>> Not combinable with multi-session yet.
@since 0.6.2 @since 0.6.2
@param opts @param opts
The option set to be manipulated. The option set to be manipulated.
@ -1361,8 +1357,7 @@ int isoburn_set_read_pacifier(struct burn_drive *drive,
int (*read_pacifier)(IsoImage*, IsoFileSource*), int (*read_pacifier)(IsoImage*, IsoFileSource*),
void *app_handle); void *app_handle);
/** TWINTREE: /** Inquire the partition offset of the loaded image. The first 512 bytes of
Inquire the partition offset of the loaded image. The first 512 bytes of
the image get examined whether they bear an MBR signature and a first the image get examined whether they bear an MBR signature and a first
partition table entry which matches the size of the image. In this case partition table entry which matches the size of the image. In this case
the start address is recorded as partition offset and internal buffers the start address is recorded as partition offset and internal buffers

2
libisoburn/trunk/xorriso/xorriso_timestamp.h
View File

@ -1 +1 @@
#define Xorriso_timestamP "2010.09.10.171223" #define Xorriso_timestamP "2010.09.11.125002"