X-Git-Url: https://git.wh0rd.org/?p=dump.git;a=blobdiff_plain;f=restore%2Futilities.c;h=67b223ee26542298de4794621dfb8d3fb000fb3f;hp=2e73aa87cac93cb2bfb3accdfa899b578335feb5;hb=refs%2Fheads%2Fmaster;hpb=a55ce9149e3f4a5f848a20b7593dbe8cd7b0bbd1

diff --git a/restore/utilities.c b/restore/utilities.c
index 2e73aa8..67b223e 100644
--- a/restore/utilities.c
+++ b/restore/utilities.c
@@ -37,7 +37,7 @@
 
 #ifndef lint
 static const char rcsid[] =
-	"$Id: utilities.c,v 1.26 2004/12/15 11:00:01 stelian Exp $";
+	"$Id: utilities.c,v 1.30 2010/06/11 11:19:17 stelian Exp $";
 #endif /* not lint */
 
 #include <config.h>
@@ -189,7 +189,7 @@ removenode(struct entry *ep)
 		badentry(ep, "removenode: not a node");
 	if (ep->e_entries != NULL) {
 		int i;
-		for (i = 0; i < DIRHASH_SIZE; i++) {
+		for (i = 0; i < dirhash_size; i++) {
 			if (ep->e_entries[i] != NULL)
 				badentry(ep, "removenode: non-empty directory");
 		}
@@ -378,9 +378,9 @@ badentry(struct entry *ep, const char *msg)
 		fprintf(stderr, "sibling name: %s\n", myname(ep->e_sibling));
 	if (ep->e_entries != NULL) {
 		int i;
-		for (i = 0; i < DIRHASH_SIZE; i++) {
+		for (i = 0; i < dirhash_size; i++) {
 			if (ep->e_entries[i] != NULL) {
-				fprintf(stderr, "next entry name: %s\n", myname(ep->e_entries[0]));
+				fprintf(stderr, "next entry name: %s\n", myname(ep->e_entries[i]));
 				break;
 			}
 		}
@@ -487,8 +487,11 @@ panic(fmt, va_alist)
 	if (yflag)
 		return;
 	if (reply("abort") == GOOD) {
-		if (reply("dump core") == GOOD)
+		if (reply("dump core") == GOOD) {
+			if (fchdir(wdfd) < 0)
+				warn("fchdir");
 			abort();
+		}
 		exit(1);
 	}
 }