inspector: Make whole disk paths canonical (RHBZ#655554).

[libguestfs.git] / inspector / virt-inspector.c

diff --git a/inspector/virt-inspector.c b/inspector/virt-inspector.c
index a3c0a04..ee7c9c3 100644 (file)
--- a/inspector/virt-inspector.c
+++ b/inspector/virt-inspector.c
@@ -83,7 +83,7 @@ usage (int status)
              "  --keys-from-stdin    Read passphrases from stdin\n"
              "  -v|--verbose         Verbose messages\n"
              "  -V|--version         Display version and exit\n"
-             "  -x                   Echo each command before executing it\n"
+             "  -x                   Trace libguestfs API calls\n"
              "For more information, see the manpage %s(1).\n"),
              program_name, program_name, program_name,
              program_name);
@@ -632,7 +632,7 @@ canonicalize (char *dev)
       (dev[5] == 'h' || dev[5] == 'v') &&
       dev[6] == 'd' &&
       c_isalpha (dev[7]) &&
-      c_isdigit (dev[8]))
+      (c_isdigit (dev[8]) || dev[8] == '\0'))
     dev[5] = 's';
 }