Skip to content

Commit

Permalink
Worked on handling renamed single monolithic sparse images
Browse files Browse the repository at this point in the history
  • Loading branch information
joachimmetz committed Mar 6, 2016
1 parent 6c284fc commit d494172
Show file tree
Hide file tree
Showing 6 changed files with 462 additions and 20 deletions.
2 changes: 1 addition & 1 deletion AUTHORS
Original file line number Diff line number Diff line change
Expand Up @@ -6,4 +6,4 @@ Additional credits go to:
* Tal Saiag, for providing multiple patches including improvements
to the Python bindings.
* Joel Uckelman, for providing patches to make parsing of the descriptor
file case-insensitive.
file case-insensitive and handling renamed single monolithic sparse images.
6 changes: 0 additions & 6 deletions ChangeLog
Original file line number Diff line number Diff line change
@@ -1,6 +1,4 @@
TODO
* fallback inflate implementation
- add addler32 support
* vmdkmount empty array on close not on free
* add thread-safety in
- extent_descriptor API functions?
Expand All @@ -12,10 +10,6 @@ TODO
* make libvmdk_handle_open_extent_data_files_file_io_pool work
* make libvmdk_handle_open_extent_data_files use libvmdk_handle_open_extent_data_files_file_io_pool

* if there is a single filename in the disk database and the current file is
not a descriptor-only file assume the current file is the right one even if
the names don't match

* update manuals
- update vmdkinfo.1
- add vmdkmount.1
Expand Down
12 changes: 6 additions & 6 deletions include/Makefile.am
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
include_HEADERS = \
libvmdk.h
libvmdk.h

pkginclude_HEADERS = \
libvmdk/definitions.h \
libvmdk/error.h \
libvmdk/extern.h \
libvmdk/features.h \
libvmdk/types.h
libvmdk/definitions.h \
libvmdk/error.h \
libvmdk/extern.h \
libvmdk/features.h \
libvmdk/types.h

EXTRA_DIST = \
libvmdk.h.in \
Expand Down
5 changes: 5 additions & 0 deletions libvmdk/libvmdk_extent_descriptor.c
Original file line number Diff line number Diff line change
Expand Up @@ -159,6 +159,11 @@ int libvmdk_internal_extent_descriptor_free(
memory_free(
( *extent_descriptor )->filename );
}
if( ( *extent_descriptor )->alternate_filename != NULL )
{
memory_free(
( *extent_descriptor )->alternate_filename );
}
memory_free(
*extent_descriptor );

Expand Down
8 changes: 8 additions & 0 deletions libvmdk/libvmdk_extent_descriptor.h
Original file line number Diff line number Diff line change
Expand Up @@ -47,6 +47,14 @@ struct libvmdk_internal_extent_descriptor
*/
size_t filename_size;

/* The alternate filename
*/
libcstring_system_character_t *alternate_filename;

/* The alternate filename size
*/
size_t alternate_filename_size;

/* The extent offset
*/
off64_t offset;
Expand Down
Loading

0 comments on commit d494172

Please sign in to comment.