Sync with rpm-4_0 branch.

CVS patchset: 4876
CVS date: 2001/06/17 22:18:03

1 files changed, 6 insertions, 4 deletions

diff --git a/tools/dump.c b/tools/dump.c
index 6d05af679..584372fab 100644
--- a/tools/dump.c
+++ b/tools/dump.c
@@ -1,6 +1,7 @@
 #include "system.h"
 
 #include <rpmlib.h>
+#include "header_internal.h"
 #include "debug.h"
 
 int main(int argc, char ** argv)
@@ -15,20 +16,21 @@ int main(int argc, char ** argv)
 	fdi = Fopen(argv[1], "r.ufdio");
     }
 
-    if (fdi == NULL || Ferror(fdi)) {
-	fprintf(stderr, _("cannot open %s: %s\n"), argv[1], strerror(errno));
+    if (Ferror(fdi)) {
+	fprintf(stderr, _("cannot open %s: %s\n"),
+		(argc == 1 ? "<stdin>" : argv[1]), Fstrerror(fdi));
 	exit(EXIT_FAILURE);
     }
 
     h = headerRead(fdi, HEADER_MAGIC_YES);
     if (!h) {
-	fprintf(stderr, _("headerRead error: %s\n"), strerror(errno));
+	fprintf(stderr, _("headerRead error: %s\n"), Fstrerror(fdi));
 	exit(EXIT_FAILURE);
     }
     Fclose(fdi);
   
     headerDump(h, stdout, HEADER_DUMP_INLINE, rpmTagTable);
-    headerFree(h);
+    h = headerFree(h);
 
     return 0;
 }