hivexsh: cd command: fix error handling
authorRichard Jones <rjones@redhat.com>
Thu, 4 Feb 2010 16:31:09 +0000 (16:31 +0000)
committerRichard Jones <rjones@redhat.com>
Thu, 4 Feb 2010 16:31:09 +0000 (16:31 +0000)
The error behaviour of hivex_node_get_child is subtle, so the 'cd'
command wouldn't always report errors correctly.  This fixes it.

hivex/hivexsh.c

index ceb1153..39ca634 100644 (file)
@@ -559,10 +559,14 @@ cmd_cd (char *path)
       continue;
     }
 
+    errno = 0;
     new_cwd = hivex_node_get_child (h, new_cwd, elem);
     if (new_cwd == 0) {
-      fprintf (stderr, _("hivexsh: cd: subkey '%s' not found\n"),
-               elem);
+      if (errno)
+        perror ("hivexsh: cd");
+      else
+        fprintf (stderr, _("hivexsh: cd: subkey '%s' not found\n"),
+                 elem);
       return -1;
     }
   }