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

Removed change timestamps of 0.6.19

Browse Source
This commit is contained in:
Thomas Schmitt 2009-05-30 18:00:21 +02:00
parent 4353a35c59
commit 5d5a0cbfd4
14 changed files with 16 additions and 67 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
libisofs/ecma119.h
View File

@ -115,12 +115,14 @@ struct iso_write_opts {
*/
unsigned int rrip_version_1_10 :1;
/* ts A90509 */
/** Write field PX with file serial number even with RRIP-1.10 */
/**
* Write field PX with file serial number even with RRIP-1.10
*/
unsigned int rrip_1_10_px_ino :1;
/* ts A90508 */
/* See iso_write_opts_set_hardlinks() */
/**
* See iso_write_opts_set_hardlinks()
*/
unsigned int hardlinks:1;
/**
@ -277,7 +279,6 @@ struct ecma119_image
unsigned int eltorito :1;
unsigned int iso1999 :1;
/* ts A90508 */
unsigned int hardlinks:1; /* see iso_write_opts_set_hardlinks() */
unsigned int aaip :1; /* see iso_write_opts_set_aaip() */
@ -302,7 +303,6 @@ struct ecma119_image
/** Write old fashioned RRIP-1.10 rather than RRIP-1.12 */
unsigned int rrip_version_1_10 :1;
/* ts A90509 */
/** Write field PX with file serial number even with RRIP-1.10 */
unsigned int rrip_1_10_px_ino :1;

8
libisofs/ecma119_tree.c
View File

@ -1,5 +1,6 @@
/*
* Copyright (c) 2007 Vreixo Formoso
* Copyright (c) 2009 Thomas Schmitt
*
* This file is part of the libisofs project; you can redistribute it and/or
* modify it under the terms of the GNU General Public License version 2 as
@ -115,7 +116,6 @@ int create_ecma119_node(Ecma119Image *img, IsoNode *iso, Ecma119Node **node)
#ifdef Libisofs_hardlink_prooF
/*ts A90428 */
/* Looking only for valid ISO image inode numbers. */
{
unsigned int fs_id;
@ -896,7 +896,6 @@ int make_node_array(Ecma119Image *img, Ecma119Node *dir,
return result;
}
/* ts A90508 */
/*
* @param flag
* bit0= compare stat properties and attributes
@ -917,21 +916,18 @@ int ecma119_node_cmp_flag(const void *v1, const void *v2, int flag)
return ret;
}
/* ts A90508 */
static
int ecma119_node_cmp_hard(const void *v1, const void *v2)
{
return ecma119_node_cmp_flag(v1, v2, 1);
}
/* ts A90509 */
static
int ecma119_node_cmp_nohard(const void *v1, const void *v2)
{
return ecma119_node_cmp_flag(v1, v2, 1 | 2);
}
/* ts A90503 */
static
int family_set_ino(Ecma119Image *img, Ecma119Node **nodes, size_t family_start,
size_t next_family, ino_t img_ino, ino_t prev_ino, int flag)
@ -955,7 +951,6 @@ int family_set_ino(Ecma119Image *img, Ecma119Node **nodes, size_t family_start,
return 1;
}
/* ts A90503 */
static
int match_hardlinks(Ecma119Image *img, Ecma119Node *dir, int flag)
{
@ -1030,7 +1025,6 @@ int ecma119_tree_create(Ecma119Image *img)
#ifdef Libisofs_hardlink_matcheR
/* ts A90503 */
iso_msg_debug(img->image->id, "Matching hardlinks...");
ret = match_hardlinks(img, img->root, 0);
if (ret < 0) {

3
libisofs/filesrc.c
View File

@ -18,8 +18,7 @@
#include <string.h>
#include <limits.h>
/* ts A90502 : outsourced comparison to iso_stream_cmp_ino()
*/
int iso_file_src_cmp(const void *n1, const void *n2)
{
int ret;

14
libisofs/fs_image.c
View File

@ -63,7 +63,6 @@ struct iso_read_opts
unsigned int noiso1999 : 1; /*< Do not read ISO 9660:1999 enhanced tree */
unsigned int noaaip : 1; /* Do not read AAIP extension for xattr and ACL */
/* ts A90425 */
/**
* Hand out new inode numbers and overwrite eventually read PX inode
* numbers. This will split apart any hardlinks.
@ -270,14 +269,12 @@ typedef struct
uint32_t imgblock; /**< Block for El-Torito boot image */
uint32_t catblock; /**< Block for El-Torito catalog */
/* ts A90501 */
/* Whether inode numbers from PX entries shall be discarded */
unsigned int make_new_ino : 1 ;
/* Inode number generator counter */
ino_t inode_counter;
/* ts A90425 */
/* PX inode number status
bit0= there were nodes with PX inode numbers
bit1= there were nodes with PX but without inode numbers
@ -1304,7 +1301,6 @@ int iso_file_source_new_ifs(IsoImageFilesystem *fs, IsoFileSource *parent,
continue;
if (SUSP_SIG(sue, 'P', 'X')) {
/* ts A90426 */
has_px = 1;
ret = read_rr_PX(sue, &atts);
if (ret < 0) {
@ -1576,7 +1572,6 @@ int iso_file_source_new_ifs(IsoImageFilesystem *fs, IsoFileSource *parent,
}
}
/* ts A90426 */
if (!has_px) {
fsdata->px_ino_status |= 4;
}
@ -1647,8 +1642,7 @@ int iso_file_source_new_ifs(IsoImageFilesystem *fs, IsoFileSource *parent,
#ifdef Libisofs_hardlink_prooF
/* ts A90426 :
Production of missing inode numbers is delayed until the image is
/* Production of missing inode numbers is delayed until the image is
complete. Then all nodes which shall get a new inode number will
be served.
*/
@ -2779,7 +2773,6 @@ int image_builder_create_node(IsoNodeBuilder *builder, IsoImage *image,
#ifdef Libisofs_hardlink_prooF
/* ts A90428 */
/* Attach ino as xinfo if valid and no IsoStream is involved */
if (info.st_ino != 0 && (info.st_mode & S_IFMT) != S_IFREG &&
!fsdata->make_new_ino) {
@ -2855,7 +2848,6 @@ int create_boot_img_filesrc(IsoImageFilesystem *fs, IsoImage *image,
#ifdef Libisofs_hardlink_prooF
/* ts A90427 : img_give_ino_number() is coordinated with existing inos */
atts.st_ino = img_give_ino_number(image, 0);
#else /* Libisofs_hardlink_prooF */
@ -2999,7 +2991,6 @@ int iso_image_import(IsoImage *image, IsoDataSource *src,
#ifdef Libisofs_hardlink_prooF
/* ts A90501 */
/* Attach ino as xinfo if valid */
if (info.st_ino != 0 && !data->make_new_ino) {
ret = iso_node_set_ino(&(image->root->node), info.st_ino, 0);
@ -3047,13 +3038,11 @@ int iso_image_import(IsoImage *image, IsoDataSource *src,
#ifdef Libisofs_hardlink_prooF
/* ts A90428 */
/* Take over inode management from IsoImageFilesystem.
data->inode_counter is supposed to hold the maximum PX inode number.
*/
image->inode_counter = data->inode_counter;
/* ts A90426 */
if ((data->px_ino_status & (2 | 4 | 8)) || opts->make_new_ino) {
/* Attach new inode numbers to any node which does not have one,
resp. to all nodes in case of opts->make_new_ino
@ -3486,7 +3475,6 @@ int iso_file_get_old_image_sections(IsoFile *file, int *section_count,
return 0;
}
/* ts A90524 */
/* Rank two IsoFileSource by their eventual old image LBAs.
Other IsoFileSource classes will be ranked only roughly.
*/

2
libisofs/fsource.h
View File

@ -1,5 +1,6 @@
/*
* Copyright (c) 2007 Vreixo Formoso
* Copyright (c) 2009 Thomas Schmitt
*
* This file is part of the libisofs project; you can redistribute it and/or
* modify it under the terms of the GNU General Public License version 2 as
@ -31,7 +32,6 @@
int iso_local_filesystem_new(IsoFilesystem **fs);
/* ts A90524 */
/* Rank two IsoFileSource by their eventual old image LBAs.
Other IsoFileSource classes will be ranked only roughly.
*/

7
libisofs/image.c
View File

@ -1,5 +1,6 @@
/*
* Copyright (c) 2007 Vreixo Formoso
* Copyright (c) 2009 Thomas Schmitt
*
* This file is part of the libisofs project; you can redistribute it and/or
* modify it under the terms of the GNU General Public License version 2 as
@ -123,11 +124,8 @@ void iso_image_unref(IsoImage *image)
free(image->copyright_file_id);
free(image->abstract_file_id);
free(image->biblio_file_id);
/* ts A90428 */
if (image->used_inodes != NULL)
free(image->used_inodes);
free(image);
}
}
@ -328,7 +326,6 @@ void iso_image_set_ignore_aclea(IsoImage *image, int what)
}
/* ts A90428 */
static
int img_register_ino(IsoImage *image, IsoNode *node, int flag)
{
@ -350,7 +347,6 @@ int img_register_ino(IsoImage *image, IsoNode *node, int flag)
}
/* ts A90428 */
/* Collect the bitmap of used inode numbers in the range of
_ImageFsData.used_inodes_start + ISO_USED_INODE_RANGE
@param flag bit0= recursion is active
@ -402,7 +398,6 @@ ex:;
}
/* ts A90428 */
/**
* A global counter for inode numbers for the ISO image filesystem.
* On image import it gets maxed by the eventual inode numbers from PX

5
libisofs/image.h
View File

@ -1,5 +1,6 @@
/*
* Copyright (c) 2007 Vreixo Formoso
* Copyright (c) 2009 Thomas Schmitt
*
* This file is part of the libisofs project; you can redistribute it and/or
* modify it under the terms of the GNU General Public License version 2 as
@ -130,7 +131,6 @@ struct Iso_Image
void *user_data;
void (*user_data_free)(void *ptr);
/* ts A90427 */
/**
* Inode number management. inode_counter is taken over from
* IsoImageFilesystem._ImageFsData after image import.
@ -152,14 +152,12 @@ struct Iso_Image
/* ts A90428 */
/* Collect the bitmap of used inode numbers in the range of
_ImageFsData.used_inodes_start + ISO_USED_INODE_RANGE
@param flag bit0= recursion is active
*/
int img_collect_inos(IsoImage *image, IsoDir *dir, int flag);
/* ts A90428 */
/**
* A global counter for inode numbers for the ISO image filesystem.
* On image import it gets maxed by the eventual inode numbers from PX
@ -176,7 +174,6 @@ int img_collect_inos(IsoImage *image, IsoDir *dir, int flag);
*/
ino_t img_give_ino_number(IsoImage *image, int flag);
/* ts A90428 */
/* @param flag bit0= overwrite any ino, else only ino == 0
bit1= install inode with non-data, non-directory files
bit2= install inode with directories

5
libisofs/libisofs.h
View File

@ -893,7 +893,6 @@ struct IsoStream_Iface
*/
IsoStream *(*get_input_stream)(IsoStream *stream, int flag);
/* ts A90511 */
/**
* Compare two streams whether they are based on the same input and will
* produce the same output. If in any doubt, then this comparison should
@ -1237,7 +1236,6 @@ int iso_write_opts_set_joliet(IsoWriteOpts *opts, int enable);
*/
int iso_write_opts_set_iso1999(IsoWriteOpts *opts, int enable);
/* ts A90508 */
/**
* Control generation of non-unique inode numbers for the emerging image.
* Inode numbers get written as "file serial number" with PX entries as of
@ -1374,7 +1372,6 @@ int iso_write_opts_set_joliet_longer_paths(IsoWriteOpts *opts, int allow);
*/
int iso_write_opts_set_rrip_version_1_10(IsoWriteOpts *opts, int oldvers);
/* ts A90509 */
/**
* Write field PX with file serial number (i.e. inode number) even if
* iso_write_opts_set_rrip_version_1_10(,1) is in effect.
@ -2522,7 +2519,6 @@ time_t iso_node_get_ctime(const IsoNode *node);
*/
void iso_node_set_hidden(IsoNode *node, int hide_attrs);
/* ts A90516 */
/**
* Compare two nodes whether they are based on the same input and
* can be considered as hardlinks to the same file objects.
@ -4230,7 +4226,6 @@ void iso_stream_get_id(IsoStream *stream, unsigned int *fs_id, dev_t *dev_id,
*/
char *iso_stream_get_source_path(IsoStream *stream, int flag);
/* ts A90502 */
/**
* Compare two streams whether they are based on the same input and will
* produce the same output. If in any doubt, then this comparison will

7
libisofs/node.c
View File

@ -2254,7 +2254,6 @@ int iso_node_zf_by_magic(IsoNode *node, int flag)
}
/* ts A90427 */
int iso_px_ino_xinfo_func(void *data, int flag)
{
if (flag == 1) {
@ -2264,7 +2263,6 @@ int iso_px_ino_xinfo_func(void *data, int flag)
}
/* ts A90427 */
/*
* @param flag
* bit0= do only retrieve id if node is in imported ISO image
@ -2339,7 +2337,6 @@ no_id:;
}
/* ts A90427 */
static
int iso_node_set_ino_xinfo(IsoNode *node, ino_t ino, int flag)
{
@ -2360,7 +2357,6 @@ int iso_node_set_ino_xinfo(IsoNode *node, ino_t ino, int flag)
}
/* ts A90427 */
int iso_node_set_ino(IsoNode *node, ino_t ino, int flag)
{
int ret;
@ -2410,7 +2406,6 @@ int iso_node_set_ino(IsoNode *node, ino_t ino, int flag)
}
/* ts A90427 */
int iso_node_set_unique_id(IsoNode *node, IsoImage *image, int flag)
{
int ret;
@ -2421,7 +2416,6 @@ int iso_node_set_unique_id(IsoNode *node, IsoImage *image, int flag)
return ret;
}
/* ts A90508 */
/*
* Note to programmers: It is crucial not to break the following constraints.
* Anti-symmetry: cmp(X,Y) == - cmp(Y,X)
@ -2576,7 +2570,6 @@ image_inode_match:;
return 0;
}
/* ts A90516 */
/* API */
int iso_node_cmp_ino(IsoNode *n1, IsoNode *n2, int flag)
{

7
libisofs/node.h
View File

@ -1,5 +1,6 @@
/*
* Copyright (c) 2007 Vreixo Formoso
* Copyright (c) 2009 Thomas Schmitt
*
* This file is part of the libisofs project; you can redistribute it and/or
* modify it under the terms of the GNU General Public License version 2 as
@ -420,9 +421,6 @@ struct zisofs_zf_info {
*/
int iso_file_zf_by_magic(IsoFile *file, int flag);
/* ts A90427 : might become API */
/*
* @param flag
* bit0= do only retrieve id if node is in imported ISO image
@ -435,19 +433,16 @@ int iso_file_zf_by_magic(IsoFile *file, int flag);
int iso_node_get_id(IsoNode *node, unsigned int *fs_id, dev_t *dev_id,
ino_t *ino_id, int flag);
/* ts A90427 */
/* Set a new unique inode ISO image number to the given node.
* This number shall eventually persist during image generation.
*/
int iso_node_set_unique_id(IsoNode *node, IsoImage *image, int flag);
/* ts A90427 */
/* Use this with extreme care. Duplicate inode numbers will indicate hardlink
* relationship between the nodes.
*/
int iso_node_set_ino(IsoNode *node, ino_t ino, int flag);
/* ts A90508 */
/*
* @param flag
* bit0= compare stat properties and attributes

3
libisofs/rockridge_read.c
View File

@ -173,8 +173,7 @@ int read_rr_PX(struct susp_sys_user_entry *px, struct stat *st)
if (px->len_sue[0] == 44) {
/* this corresponds to RRIP 1.12, so we have inode serial number */
st->st_ino = iso_read_bb(px->data.PX.serial, 4, NULL);
/* ts A90426 : Indicate that st_ino is valid */
/* Indicate that st_ino is valid */
return 2;
}
return 1;

3
libisofs/stream.c
View File

@ -1,5 +1,6 @@
/*
* Copyright (c) 2007 Vreixo Formoso
* Copyright (c) 2009 Thomas Schmitt
*
* This file is part of the libisofs project; you can redistribute it and/or
* modify it under the terms of the GNU General Public License version 2 as
@ -713,7 +714,6 @@ ex:;
return path;
}
/* ts A90427 */
/* @return 1 = ok , 0 = not an ISO image stream , <0 = error */
int iso_stream_set_image_ino(IsoStream *stream, ino_t ino, int flag)
{
@ -728,7 +728,6 @@ int iso_stream_set_image_ino(IsoStream *stream, ino_t ino, int flag)
return 0;
}
/* ts A90511 */
/* API */
int iso_stream_cmp_ino(IsoStream *s1, IsoStream *s2, int flag)
{

2
libisofs/stream.h
View File

@ -1,5 +1,6 @@
/*
* Copyright (c) 2007 Vreixo Formoso
* Copyright (c) 2009 Thomas Schmitt
*
* This file is part of the libisofs project; you can redistribute it and/or
* modify it under the terms of the GNU General Public License version 2 as
@ -74,7 +75,6 @@ int iso_stream_get_src_zf(IsoStream *stream, int *header_size_div4,
int *block_size_log2, uint32_t *uncompressed_size,
int flag);
/* ts A90427 */
/**
* Set the inode number of a stream that is based on FSrcStreamData, i.e.
* stems from the imported ISO image.

5
libisofs/util_rbtree.c
View File

@ -198,11 +198,6 @@ int iso_rbtree_insert(IsoRBTree *tree, void *data, void **item)
}
}
/* ts A90424 : Maybe one can try again to introduce an id
tuple which is not considered equal to itself
by the compare test.
The last attempt caused a loop here.
*/
if (q->data == data) {
comp = 0;
} else {