Directory name can include Windows drive letter if guest is Windows and inspection is enabled (i.e. option -m is not given). Fixes: RHBZ#845234 --- cat/ls.c | 37 ++++++++++++++++++++++++++++++++++--- 1 file changed, 34 insertions(+), 3 deletions(-) diff --git a/cat/ls.c b/cat/ls.c index 9161fb6..1a164b3 100644 --- a/cat/ls.c +++ b/cat/ls.c @@ -37,6 +37,7 @@ #include "options.h" #include "visit.h" +#include "windows.h" /* Currently open libguestfs handle. */ guestfs_h *g; @@ -76,6 +77,8 @@ static void output_int64_uid (int64_t); static void output_string (const char *); static void output_string_link (const char *); +static const char *get_windows_root (); + static void __attribute__((noreturn)) usage (int status) { @@ -176,6 +179,7 @@ main (int argc, char *argv[]) #define MODE_LS_R 2 #define MODE_LS_LR (MODE_LS_L|MODE_LS_R) int mode = 0; + CLEANUP_FREE const char * win_root; g = guestfs_create (); if (g == NULL) { @@ -362,19 +366,28 @@ main (int argc, char *argv[]) if (guestfs_launch (g) == -1) exit (EXIT_FAILURE); - if (mps != NULL) + if (mps != NULL) { mount_mps (mps); - else + } else { inspect_mount (); + win_root = get_windows_root (); + } /* Free up data structures, no longer needed after this point. */ free_drives (drvs); free_mps (mps); + unsigned errors = 0; while (optind < argc) { - const char *dir = argv[optind]; + CLEANUP_FREE const char *dir; + + if (inspector == 1 && win_root != NULL) { + dir = windows_path (g, win_root, argv[optind], 1 /* readonly */ ); + } else { + dir = safe_strdup (g, argv[optind]); + } switch (mode) { case 0: /* no -l or -R option */ @@ -409,6 +422,24 @@ main (int argc, char *argv[]) exit (errors == 0 ? EXIT_SUCCESS : EXIT_FAILURE); } +static const char * +get_windows_root (void) +{ + CLEANUP_FREE_STRING_LIST char **roots = NULL; + const char *root; + + roots = guestfs_inspect_get_roots (g); + assert (roots); + assert (roots[0] != NULL); + assert (roots[1] == NULL); + root = safe_strdup(g, roots[0]); + + if (is_windows (g, root)) + return root; + else + return NULL; +} + static int do_ls (const char *dir) { -- 1.9.3

On 05/21/2015 12:16 PM, Pino Toscano wrote: Issue was speed. Without inspection (i.e. -m is given) it takes 3 seconds on my machine. With inspection it takes for 6-8 seconds. If this is a non-issue, I'll add it. Only inspect_os needed for this to work. I've specifically took it out to it's own function. It's more clear to me like this. I like this idea better. cat/cat.c could maybe use it too.

Relates to: RHBZ#845234 --- cat/virt-ls.pod | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/cat/virt-ls.pod b/cat/virt-ls.pod index aa7919d..e96c065 100644 --- a/cat/virt-ls.pod +++ b/cat/virt-ls.pod @@ -22,6 +22,9 @@ and more from a virtual machine or disk image. Multiple directory names can be given, in which case the output from each is concatenated. +Directory name can include Windows drive letter if guest is Windows +and option I<-m> is not given. + To list directories from a libvirt guest use the I<-d> option to specify the name of the guest. For a disk image, use the I<-a> option. @@ -368,7 +371,9 @@ If the mountpoint is omitted, it defaults to C</>. Specifying any mountpoint disables the inspection of the guest and the mount of its root and all of its mountpoints, so make sure to mount all the mountpoints needed to work with the filenames -given as arguments. +given as arguments. Consequence of disabled inspection is faster +execution and inability to use Windows drive letters in directory +names. If you don't know what filesystems a disk image contains, you can either run guestfish without this option, then list the partitions, -- 1.9.3