mirror of
https://github.com/aaru-dps/libaaruformat.git
synced 2025-12-16 19:24:40 +00:00
Compare commits
3 Commits
v1.0.0-alp
...
v1.0.0-alp
| Author | SHA1 | Date | |
|---|---|---|---|
|
e28b1209c8
|
|||
|
0e51337e30
|
|||
|
56bb631872
|
@@ -2,7 +2,7 @@
|
|||||||
<package xmlns="http://schemas.microsoft.com/packaging/2010/07/nuspec.xsd">
|
<package xmlns="http://schemas.microsoft.com/packaging/2010/07/nuspec.xsd">
|
||||||
<metadata>
|
<metadata>
|
||||||
<id>libaaruformat</id>
|
<id>libaaruformat</id>
|
||||||
<version>1.0.0-alpha.12</version>
|
<version>1.0.0-alpha.13</version>
|
||||||
<description>Library for management of AaruFormat images.</description>
|
<description>Library for management of AaruFormat images.</description>
|
||||||
<authors>claunia</authors>
|
<authors>claunia</authors>
|
||||||
<projectUrl>https://github.com/aaru-dps/libaaruformat</projectUrl>
|
<projectUrl>https://github.com/aaru-dps/libaaruformat</projectUrl>
|
||||||
|
|||||||
@@ -217,26 +217,26 @@ int32_t process_ddt_v1(aaruformat_context *ctx, IndexEntry *entry, bool *found_u
|
|||||||
break;
|
break;
|
||||||
// TODO: Check CRC
|
// TODO: Check CRC
|
||||||
case None:
|
case None:
|
||||||
#ifdef __linux__
|
ctx->user_data_ddt = (uint64_t *)malloc(ddt_header.length);
|
||||||
TRACE("Memory mapping deduplication table at position %" PRIu64, entry->offset + sizeof(ddt_header));
|
if(ctx->user_data_ddt == NULL)
|
||||||
ctx->mapped_memory_ddt_size = sizeof(uint64_t) * ddt_header.entries;
|
|
||||||
ctx->user_data_ddt = mmap(NULL, ctx->mapped_memory_ddt_size, PROT_READ, MAP_SHARED,
|
|
||||||
fileno(ctx->imageStream), entry->offset + sizeof(ddt_header));
|
|
||||||
|
|
||||||
if(ctx->user_data_ddt == MAP_FAILED)
|
|
||||||
{
|
{
|
||||||
*found_user_data_ddt = false;
|
TRACE("Cannot allocate memory for DDT, continuing...");
|
||||||
FATAL("Could not read map deduplication table.");
|
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
|
|
||||||
ctx->in_memory_ddt = false;
|
read_bytes = fread(ctx->user_data_ddt, 1, ddt_header.entries * sizeof(uint64_t), ctx->imageStream);
|
||||||
|
|
||||||
|
if(read_bytes != ddt_header.entries * sizeof(uint64_t))
|
||||||
|
{
|
||||||
|
free(ctx->user_data_ddt);
|
||||||
|
TRACE("Could not read deduplication table, continuing...");
|
||||||
|
break;
|
||||||
|
}
|
||||||
|
|
||||||
|
ctx->in_memory_ddt = true;
|
||||||
|
*found_user_data_ddt = true;
|
||||||
|
|
||||||
break;
|
break;
|
||||||
#else // TODO: Implement
|
|
||||||
TRACE("Uncompressed DDT not yet implemented...");
|
|
||||||
*found_user_data_ddt = false;
|
|
||||||
break;
|
|
||||||
#endif
|
|
||||||
default:
|
default:
|
||||||
TRACE("Found unknown compression type %d, continuing...", ddt_header.compression);
|
TRACE("Found unknown compression type %d, continuing...", ddt_header.compression);
|
||||||
*found_user_data_ddt = false;
|
*found_user_data_ddt = false;
|
||||||
|
|||||||
10
tool/info.c
10
tool/info.c
@@ -576,16 +576,8 @@ int info(const char *path)
|
|||||||
printf("\tImage contains %llu sectors\n", ctx->image_info.Sectors);
|
printf("\tImage contains %llu sectors\n", ctx->image_info.Sectors);
|
||||||
printf("\tBiggest sector is %d bytes\n", ctx->image_info.SectorSize);
|
printf("\tBiggest sector is %d bytes\n", ctx->image_info.SectorSize);
|
||||||
printf("\tImage version: %s\n", ctx->image_info.Version);
|
printf("\tImage version: %s\n", ctx->image_info.Version);
|
||||||
|
|
||||||
if(ctx->image_info.Application != NULL)
|
if(ctx->image_info.Application != NULL)
|
||||||
{
|
printf("\tApplication: %s\n", ctx->image_info.Application);
|
||||||
strBuffer = malloc(65);
|
|
||||||
memset(strBuffer, 0, 65);
|
|
||||||
ucnv_convert(NULL, "UTF-16LE", strBuffer, 64, (const char *)ctx->image_info.Application, 64, &u_error_code);
|
|
||||||
if(u_error_code == U_ZERO_ERROR) printf("\tApplication: %s\n", strBuffer);
|
|
||||||
free(strBuffer);
|
|
||||||
}
|
|
||||||
|
|
||||||
if(ctx->image_info.ApplicationVersion != NULL)
|
if(ctx->image_info.ApplicationVersion != NULL)
|
||||||
printf("\tApplication version: %s\n", ctx->image_info.ApplicationVersion);
|
printf("\tApplication version: %s\n", ctx->image_info.ApplicationVersion);
|
||||||
printf("\tCreation time: %s\n", format_filetime(ctx->image_info.CreationTime));
|
printf("\tCreation time: %s\n", format_filetime(ctx->image_info.CreationTime));
|
||||||
|
|||||||
Reference in New Issue
Block a user