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

Change IsoStream get_id definition, to always provide a valid id.

Browse Source 
Streams are a better place to handle source content identification, when
the IsoFilesystem is unable to provide a valid identification.
This commit is contained in:
Vreixo Formoso
2008-01-10 17:56:39 +01:00
parent 47bdbd76b5
commit 2ad6f5f667
3 changed files with 53 additions and 54 deletions
Download Patch File Download Diff File Expand all files Collapse all files

37
src/stream.c
View File

@@ -14,6 +14,8 @@
#include <stdlib.h>
#include <string.h>
ino_t serial_id = (ino_t)1;
typedef struct
{
IsoFileSource *src;
@@ -90,27 +92,18 @@ int fsrc_is_repeatable(IsoStream *stream)
}
static
int fsrc_get_id(IsoStream *stream, unsigned int *fs_id, dev_t *dev_id,
void fsrc_get_id(IsoStream *stream, unsigned int *fs_id, dev_t *dev_id,
ino_t *ino_id)
{
FSrcStreamData *data;
IsoFilesystem *fs;
if (stream == NULL || fs_id == NULL || dev_id == NULL || ino_id == NULL) {
return ISO_NULL_POINTER;
}
data = (FSrcStreamData*)stream->data;
fs = iso_file_source_get_filesystem(data->src);
*fs_id = fs->get_id(fs);
if (fs_id == 0) {
return 0;
}
*dev_id = data->dev_id;
*ino_id = data->ino_id;
return ISO_SUCCESS;
}
static
@@ -178,9 +171,27 @@ int iso_file_source_stream_new(IsoFileSource *src, IsoStream **stream)
/* take the ref to IsoFileSource */
data->src = src;
data->dev_id = info.st_dev;
data->ino_id = info.st_ino;
data->size = info.st_size;
/* get the id numbers */
{
IsoFilesystem *fs;
unsigned int fs_id;
fs = iso_file_source_get_filesystem(data->src);
fs_id = fs->get_id(fs);
if (fs_id == 0) {
/*
* the filesystem implementation is unable to provide valid
* st_dev and st_ino fields. Use serial_id.
*/
data->dev_id = (dev_t) 0;
data->ino_id = serial_id++;
} else {
data->dev_id = info.st_dev;
data->ino_id = info.st_ino;
}
}
str->refcount = 1;
str->data = data;