search for: im_volum

...14 insertions(+), 2 deletions(-) > > diff --git a/generator/structs.ml b/generator/structs.ml > index 6017ba6..d986fd9 100644 > --- a/generator/structs.ml > +++ b/generator/structs.ml > @@ -442,8 +442,20 @@ let structs = [ > "im_device", FString; > "im_volume", FString; > ]; > - s_camel_name = "InternalMountable"; > - }; > + s_camel_name = "InternalMountable" }; Unneeded change. > + (* The Sleuth Kit directory entry information. *) > + { defaults with > + s_name = "tsk_dirent";...

...dup(g, mnt->im_device); +} + +char * +guestfs_impl_mountable_subvolume (guestfs_h *g, const char *mountable) +{ + CLEANUP_FREE_INTERNAL_MOUNTABLE struct guestfs_internal_mountable *mnt = NULL; + + mnt = guestfs_internal_parse_mountable (g, mountable); + if (mnt == NULL || STREQ (mnt->im_volume, "")) { + guestfs_int_error_errno (g, EINVAL, "not a btrfs subvolume identifier"); + return NULL; + } + + return safe_strdup(g, mnt->im_volume); +} -- 2.6.2

...e_strdup (g, mnt->im_device); +} + +char * +guestfs_impl_mountable_subvolume (guestfs_h *g, const char *mountable) +{ + CLEANUP_FREE_INTERNAL_MOUNTABLE struct guestfs_internal_mountable *mnt = NULL; + + mnt = guestfs_internal_parse_mountable (g, mountable); + if (mnt == NULL || STREQ (mnt->im_volume, "")) { + guestfs_int_error_errno (g, EINVAL, "not a btrfs subvolume identifier"); + return NULL; + } + + return safe_strdup (g, mnt->im_volume); +} -- 2.6.2

Hi all, Here is version 2 of the patch series, including the changes for Pino's remarks. Cédric Bosdonnat (3): configure: handle older version of ncurses api: add mountable_device and mountable_subvolume fish: fix btrfs subvolumes display in error case fish/options.c | 28 ++++++++++++++++++++++++++- generator/actions.ml | 26 +++++++++++++++++++++++++

Hey there! Here are a few patches to fix unrelated things: one fixes the configure for older ncurses releases having no pkg-config files. The other two are fixing what Richard mentioned about guestfs subvolumes display Cédric Bosdonnat (3): configure: handle older version of ncurses api: add mountable_device and mountable_subvolume fish: fix btrfs subvolumes display in error case

Hi there, Latest and greatest version including all new remarks from both Pino and Rich. Cédric Bosdonnat (3): configure: handle older version of ncurses api: add mountable_device and mountable_subvolume fish: fix btrfs subvolumes display in error case fish/options.c | 28 ++++++++++++++++++++++++++- generator/actions.ml | 26 +++++++++++++++++++++++++ m4/guestfs_libraries.m4

...| 16 ++++++++++++++-- 1 file changed, 14 insertions(+), 2 deletions(-) diff --git a/generator/structs.ml b/generator/structs.ml index 6017ba6..d986fd9 100644 --- a/generator/structs.ml +++ b/generator/structs.ml @@ -442,8 +442,20 @@ let structs = [ "im_device", FString; "im_volume", FString; ]; - s_camel_name = "InternalMountable"; - }; + s_camel_name = "InternalMountable" }; + + (* The Sleuth Kit directory entry information. *) + { defaults with + s_name = "tsk_dirent"; + s_cols = [ + "tsk_inode", FUInt64;...

...ml | 15 ++++++++++++++- 1 file changed, 14 insertions(+), 1 deletion(-) diff --git a/generator/structs.ml b/generator/structs.ml index 6017ba6..4abb576 100644 --- a/generator/structs.ml +++ b/generator/structs.ml @@ -442,8 +442,21 @@ let structs = [ "im_device", FString; "im_volume", FString; ]; s_camel_name = "InternalMountable"; }; + + (* The Sleuth Kit directory entry information. *) + { defaults with + s_name = "tsk_dirent"; + s_cols = [ + "tsk_inode", FUInt64; + "tsk_type", FChar; + "tsk_siz...

...+ + return NULL; +} + +char * +guestfs_impl_mountable_subvolume (guestfs_h *g, const char *mountable) +{ + CLEANUP_FREE_INTERNAL_MOUNTABLE struct guestfs_internal_mountable *mnt = NULL; + + if ((mnt = guestfs_internal_parse_mountable (g, mountable))) + return safe_strdup(g, mnt->im_volume); + + errno = EINVAL; + return NULL; +} -- 2.6.2

...es." }; + ] (* Non-API meta-commands available only in guestfish. diff --git a/generator/structs.ml b/generator/structs.ml index 6017ba6..9d2f309 100644 --- a/generator/structs.ml +++ b/generator/structs.ml @@ -442,8 +442,18 @@ let structs = [ "im_device", FString; "im_volume", FString; ]; - s_camel_name = "InternalMountable"; - }; + s_camel_name = "InternalMountable" }; + + (* The Sleuth Kit node info struct. *) + { defaults with + s_name = "tsk_node"; + s_cols = [ + "tsk_name", FString; + "ts...

The ffind API allows to retrieve a file name from a device given its inode. The function returns a struct "tsknode" which contains the file name, its inode and it's allocation status. The struct will be employed by other APIs as well (fls, ifind etc..). $ ./run guestfish --ro -a /home/noxdafox/disks/ubuntu.qcow2 ><fs> run ><fs> ffind /dev/sda1 2 tsk_name: /

...;ext4"] libguestfs: trace: vfs_type "/dev/sda1" libguestfs: trace: vfs_type = "ext4" libguestfs: trace: internal_parse_mountable "/dev/sda1" libguestfs: trace: internal_parse_mountable = <struct guestfs_internal_mountable = im_type: 0, im_device: /dev/sda1, im_volume: , > libguestfs: trace: is_whole_device "/dev/sda1" libguestfs: trace: is_whole_device = 0 libguestfs: trace: mount_ro "/dev/sda1" "/" libguestfs: trace: mount_ro = 0 libguestfs: trace: part_to_dev "/dev/sda1" libguestfs: trace: part_to_dev = "...

...ibguestfs: trace: vfs_type "/dev/sda1" > libguestfs: trace: vfs_type = "ext4" > libguestfs: trace: internal_parse_mountable "/dev/sda1" > libguestfs: trace: internal_parse_mountable = <struct guestfs_internal_mountable = im_type: 0, im_device: /dev/sda1, im_volume: , > > libguestfs: trace: is_whole_device "/dev/sda1" > libguestfs: trace: is_whole_device = 0 > libguestfs: trace: mount_ro "/dev/sda1" "/" > libguestfs: trace: mount_ro = 0 > libguestfs: trace: part_to_dev "/dev/sda1" > libguestf...

...: trace: vfs_type "/dev/sda1" >> libguestfs: trace: vfs_type = "ext4" >> libguestfs: trace: internal_parse_mountable "/dev/sda1" >> libguestfs: trace: internal_parse_mountable = <struct guestfs_internal_mountable = im_type: 0, im_device: /dev/sda1, im_volume: , > >> libguestfs: trace: is_whole_device "/dev/sda1" >> libguestfs: trace: is_whole_device = 0 >> libguestfs: trace: mount_ro "/dev/sda1" "/" >> libguestfs: trace: mount_ro = 0 >> libguestfs: trace: part_to_dev "/dev/sda1"...

v3: - File size will be reported as - 1 if it cannot be retrieved. - Code improvements based on comments. Matteo Cafasso (5): generator: Added tsk_dirent struct configure: Added libtsk compile-time check daemon: Added internal_filesystem_walk command appliance: Added filesystem_walk command appliance: Added filesystem_walk command tests daemon/Makefile.am | 4 +-

...V: im_device=%s\n", mountable->im_device); goto error; @@ -94,12 +93,11 @@ main (int argc, char *argv[]) if (mountable->im_type != MOUNTABLE_BTRFSVOL || STRNEQ ("/dev/VG/LV", mountable->im_device) || - STRNEQ ("sv", mountable->im_volume)) - { + STRNEQ ("sv", mountable->im_volume)) { fprintf (stderr, "incorrectly parsed /dev/VG/LV/sv: im_device=%s, im_volume=%s\n", mountable->im_device, mountable->im_volume); goto error; - } + } guestfs_free_internal_mountable (moun...

v5: - fixed compile-time warning - removed unused flag enumeration - new version 1.33.19 Patch ready for review. Matteo Cafasso (5): generator: Added tsk_dirent struct configure: Added libtsk compile-time check New API: internal_filesystem_walk New API: filesystem_walk lib: Added filesystem_walk command tests daemon/Makefile.am | 4 +- daemon/tsk.c

v4: - Changed tsk_allocated struct field into tsk_flags. - Added optional dependency in documentation. - Use asprintf and perror instead of asprintf_nowarn and fprintf. - Ensure CLEANUP_FREE vars are initialised. - Reworked the function documentation. - Improved tests robustness. Matteo Cafasso (5): generator: Added tsk_dirent struct configure: Added libtsk compile-time check

Result of earlier copy and paste. --- align/scan.c | 35 ++++++++++--------- cat/cat.c | 39 +++++++++++---------- cat/filesystems.c | 69 +++++++++++++++++++------------------- cat/log.c | 35 ++++++++++--------- cat/ls.c | 61 +++++++++++++++++---------------- df/main.c | 43 ++++++++++++------------ diff/diff.c | 67

...198 (vfs_type) took 0.02 seconds guestfsd: main_loop: new request, len 0x38 commandrvf: stdout=n stderr=y flags=0x0 commandrvf: udevadm --debug settle -E /dev/sda1 calling: settle libguestfs: trace: internal_parse_mountable = <struct guestfs_internal_mountable = im_type: 0, im_device: /dev/sda1, im_volume: , > libguestfs: trace: is_whole_device "/dev/sda1" guestfsd: main_loop: proc 396 (internal_parse_mountable) took 0.01 seconds guestfsd: main_loop: new request, len 0x38 commandrvf: stdout=n stderr=y flags=0x0 commandrvf: udevadm --debug settle -E /dev/sda1 calling: settle guestfsd: m...