From 9086b64c5309708016c3a33925d223af5d9ff380 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Janosch=20Gr=C3=A4f?= Date: Sat, 4 Apr 2009 23:09:51 +0200 Subject: [PATCH] iso9660: ~Check signature --- apps/iso9660/file.c | 1 - apps/iso9660/volume_descriptor.c | 7 +++---- 2 files changed, 3 insertions(+), 5 deletions(-) diff --git a/apps/iso9660/file.c b/apps/iso9660/file.c index bf1e328..86c636d 100644 --- a/apps/iso9660/file.c +++ b/apps/iso9660/file.c @@ -37,6 +37,5 @@ size_t iso9660_fs_file_read(struct cdi_fs_stream *stream,uint64_t start,size_t s if (start+size>res->data_size) size = res->data_size-start; iso9660_read(res,start,size,buffer); - //cdi_cache_entry_read(res->cache_entry,start,size,buffer); return size; } diff --git a/apps/iso9660/volume_descriptor.c b/apps/iso9660/volume_descriptor.c index 5ad4819..8cb9630 100644 --- a/apps/iso9660/volume_descriptor.c +++ b/apps/iso9660/volume_descriptor.c @@ -32,9 +32,8 @@ * @return If signature is right */ static int iso9660_voldesc_checksig(uint8_t sig[6]) { - return 1; - //char right[6] = {'C','D','0','0','1',1}; - //return memcmp(right,sig,6)==0; + char right[6] = {'C','D','0','0','1',1}; + return memcmp(right,sig,6)==0; } /** @@ -50,7 +49,7 @@ int iso9660_voldesc_load(struct cdi_fs_filesystem *fs,iso9660_voldesc_type_t typ size_t i; for (i=ISO9660_FIRST_SECTOR;header.type!=type && header.type!=ISO9660_VOLDESC_TERM;i++) { - iso9660_sector_read(fs,i*ISO9660_DEFAULT_SECTOR_SIZE,sizeof(header),&header); + if (iso9660_sector_read(fs,i*ISO9660_DEFAULT_SECTOR_SIZE,sizeof(header),&header)!=sizeof(header)) return -1; if (!iso9660_voldesc_checksig(header.signature)) return -1; } i--; -- 2.11.4.GIT