X-Git-Url: https://git.wh0rd.org/?a=blobdiff_plain;f=restore%2Fsymtab.c;h=9ad4955463a8beabf6202b5b20d5accbc6035c44;hb=d572dbfde52e312e2cac3b73d1330ac7170ad687;hp=d9d9a2e2ca6d3776d998b5db77e2ae4561fe9dd0;hpb=1227625a12a66e0ded78a1997c2d23f23202a382;p=dump.git

diff --git a/restore/symtab.c b/restore/symtab.c
index d9d9a2e..9ad4955 100644
--- a/restore/symtab.c
+++ b/restore/symtab.c
@@ -1,8 +1,8 @@
 /*
  *	Ported to Linux's Second Extended File System as part of the
  *	dump and restore backup suit
- *	Remy Card <card@Linux.EU.Org>, 1994, 1995, 1996
- *
+ *	Remy Card <card@Linux.EU.Org>, 1994-1997
+ *	Stelian Pop <pop@cybercable.fr>, 1999-2000
  */
 
 /*
@@ -39,7 +39,8 @@
  */
 
 #ifndef lint
-static char sccsid[] = "@(#)symtab.c	8.3 (Berkeley) 4/28/95";
+static const char rcsid[] =
+	"$Id: symtab.c,v 1.9 2000/06/25 18:42:39 stelian Exp $";
 #endif /* not lint */
 
 /*
@@ -63,6 +64,7 @@ static char sccsid[] = "@(#)symtab.c	8.3 (Berkeley) 4/28/95";
 #endif	/* __linux__ */
 
 #include <errno.h>
+#include <compaterr.h>
 #include <fcntl.h>
 #include <stdio.h>
 #include <stdlib.h>
@@ -95,8 +97,7 @@ static void		 removeentry __P((struct entry *));
  * Look up an entry by inode number
  */
 struct entry *
-lookupino(inum)
-	ino_t inum;
+lookupino(ino_t inum)
 {
 	register struct entry *ep;
 
@@ -112,9 +113,7 @@ lookupino(inum)
  * Add an entry into the entry table
  */
 static void
-addino(inum, np)
-	ino_t inum;
-	struct entry *np;
+addino(ino_t inum, struct entry *np)
 {
 	struct entry **epp;
 
@@ -134,8 +133,7 @@ addino(inum, np)
  * Delete an entry from the entry table
  */
 void
-deleteino(inum)
-	ino_t inum;
+deleteino(ino_t inum)
 {
 	register struct entry *next;
 	struct entry **prev;
@@ -158,8 +156,7 @@ deleteino(inum)
  * Look up an entry by name
  */
 struct entry *
-lookupname(name)
-	char *name;
+lookupname(char *name)
 {
 	register struct entry *ep;
 	register char *np, *cp;
@@ -167,8 +164,11 @@ lookupname(name)
 
 	cp = name;
 	for (ep = lookupino(ROOTINO); ep != NULL; ep = ep->e_entries) {
-		for (np = buf; *cp != '/' && *cp != '\0'; )
+		for (np = buf; *cp != '/' && *cp != '\0' &&
+				np < &buf[sizeof(buf)]; )
 			*np++ = *cp++;
+		if (np == &buf[sizeof(buf)])
+			break;
 		*np = '\0';
 		for ( ; ep != NULL; ep = ep->e_sibling)
 			if (strcmp(ep->e_name, buf) == 0)
@@ -185,8 +185,7 @@ lookupname(name)
  * Look up the parent of a pathname
  */
 static struct entry *
-lookupparent(name)
-	char *name;
+lookupparent(char *name)
 {
 	struct entry *ep;
 	char *tailindex;
@@ -208,15 +207,14 @@ lookupparent(name)
  * Determine the current pathname of a node or leaf
  */
 char *
-myname(ep)
-	register struct entry *ep;
+myname(struct entry *ep)
 {
 	register char *cp;
 	static char namebuf[MAXPATHLEN];
 
 	for (cp = &namebuf[MAXPATHLEN - 2]; cp > &namebuf[ep->e_namlen]; ) {
 		cp -= ep->e_namlen;
-		memmove(cp, ep->e_name, (long)ep->e_namlen);
+		memmove(cp, ep->e_name, (size_t)ep->e_namlen);
 		if (ep == lookupino(ROOTINO))
 			return (cp);
 		*(--cp) = '/';
@@ -227,7 +225,7 @@ myname(ep)
 }
 
 /*
- * Unused symbol table entries are linked together on a freelist
+ * Unused symbol table entries are linked together on a free list
  * headed by the following pointer.
  */
 static struct entry *freelist = NULL;
@@ -236,21 +234,18 @@ static struct entry *freelist = NULL;
  * add an entry to the symbol table
  */
 struct entry *
-addentry(name, inum, type)
-	char *name;
-	ino_t inum;
-	int type;
+addentry(char *name, ino_t inum, int type)
 {
 	register struct entry *np, *ep;
 
 	if (freelist != NULL) {
 		np = freelist;
 		freelist = np->e_next;
-		memset(np, 0, (long)sizeof(struct entry));
+		memset(np, 0, sizeof(struct entry));
 	} else {
 		np = (struct entry *)calloc(1, sizeof(struct entry));
 		if (np == NULL)
-			panic("no memory to extend symbol table\n");
+			errx(1, "no memory to extend symbol table");
 	}
 	np->e_type = type & ~LINK;
 	ep = lookupparent(name);
@@ -271,7 +266,7 @@ addentry(name, inum, type)
 	if (type & LINK) {
 		ep = lookupino(inum);
 		if (ep == NULL)
-			panic("link to non-existant name\n");
+			panic("link to non-existent name\n");
 		np->e_ino = inum;
 		np->e_links = ep->e_links;
 		ep->e_links = np;
@@ -287,8 +282,7 @@ addentry(name, inum, type)
  * delete an entry from the symbol table
  */
 void
-freeentry(ep)
-	register struct entry *ep;
+freeentry(struct entry *ep)
 {
 	register struct entry *np;
 	ino_t inum;
@@ -331,9 +325,7 @@ freeentry(ep)
  * Relocate an entry in the tree structure
  */
 void
-moveentry(ep, newname)
-	register struct entry *ep;
-	char *newname;
+moveentry(struct entry *ep, char *newname)
 {
 	struct entry *np;
 	char *cp;
@@ -361,8 +353,7 @@ moveentry(ep, newname)
  * Remove an entry in the tree structure
  */
 static void
-removeentry(ep)
-	register struct entry *ep;
+removeentry(struct entry *ep)
 {
 	register struct entry *np;
 
@@ -383,12 +374,12 @@ removeentry(ep)
 
 /*
  * Table of unused string entries, sorted by length.
- * 
+ *
  * Entries are allocated in STRTBLINCR sized pieces so that names
  * of similar lengths can use the same entry. The value of STRTBLINCR
  * is chosen so that every entry has at least enough space to hold
  * a "struct strtbl" header. Thus every entry can be linked onto an
- * apprpriate free list.
+ * appropriate free list.
  *
  * NB. The macro "allocsize" below assumes that "struct strhdr"
  *     has a size that is a power of two.
@@ -400,15 +391,14 @@ struct strhdr {
 #define STRTBLINCR	(sizeof(struct strhdr))
 #define allocsize(size)	(((size) + 1 + STRTBLINCR - 1) & ~(STRTBLINCR - 1))
 
-static struct strhdr strtblhdr[allocsize(NAME_MAX) / STRTBLINCR];
+static struct strhdr strtblhdr[allocsize(MAXNAMLEN) / STRTBLINCR];
 
 /*
  * Allocate space for a name. It first looks to see if it already
  * has an appropriate sized entry, and if not allocates a new one.
  */
 char *
-savename(name)
-	char *name;
+savename(char *name)
 {
 	struct strhdr *np;
 	long len;
@@ -424,7 +414,7 @@ savename(name)
 	} else {
 		cp = malloc((unsigned)allocsize(len));
 		if (cp == NULL)
-			panic("no space for string table\n");
+			errx(1, "no space for string table");
 	}
 	(void) strcpy(cp, name);
 	return (cp);
@@ -435,11 +425,10 @@ savename(name)
  * appropriate free list.
  */
 void
-freename(name)
-	char *name;
+freename(char *name)
 {
 	struct strhdr *tp, *np;
-	
+
 	tp = &strtblhdr[strlen(name) / STRTBLINCR];
 	np = (struct strhdr *)name;
 	np->next = tp->next;
@@ -450,22 +439,20 @@ freename(name)
  * Useful quantities placed at the end of a dumped symbol table.
  */
 struct symtableheader {
-	long	volno;
-	long	stringsize;
-	long	entrytblsize;
+	int32_t	volno;
+	int32_t	stringsize;
+	int32_t	entrytblsize;
 	time_t	dumptime;
 	time_t	dumpdate;
 	ino_t	maxino;
-	long	ntrec;
+	int32_t	ntrec;
 };
 
 /*
  * dump a snapshot of the symbol table
  */
 void
-dumpsymtable(filename, checkpt)
-	char *filename;
-	long checkpt;
+dumpsymtable(char *filename, long checkpt)
 {
 	register struct entry *ep, *tep;
 	register ino_t i;
@@ -474,20 +461,20 @@ dumpsymtable(filename, checkpt)
 	FILE *fd;
 	struct symtableheader hdr;
 
-	vprintf(stdout, "Check pointing the restore\n");
+	Vprintf(stdout, "Check pointing the restore\n");
 	if (Nflag)
 		return;
 	if ((fd = fopen(filename, "w")) == NULL) {
-		fprintf(stderr, "fopen: %s\n", strerror(errno));
+		warn("fopen");
 		panic("cannot create save file %s for symbol table\n",
 			filename);
 	}
 	clearerr(fd);
 	/*
-	 * Assign indicies to each entry
+	 * Assign indices to each entry
 	 * Write out the string entries
 	 */
-	for (i = WINO; i < maxino; i++) {
+	for (i = WINO; i <= maxino; i++) {
 		for (ep = lookupino(i); ep != NULL; ep = ep->e_links) {
 			ep->e_index = mynum++;
 			(void) fwrite(ep->e_name, sizeof(char),
@@ -499,9 +486,9 @@ dumpsymtable(filename, checkpt)
 	 */
 	tep = &temp;
 	stroff = 0;
-	for (i = WINO; i < maxino; i++) {
+	for (i = WINO; i <= maxino; i++) {
 		for (ep = lookupino(i); ep != NULL; ep = ep->e_links) {
-			memmove(tep, ep, (long)sizeof(struct entry));
+			memmove(tep, ep, sizeof(struct entry));
 			tep->e_name = (char *)stroff;
 			stroff += allocsize(ep->e_namlen);
 			tep->e_parent = (struct entry *)ep->e_parent->e_index;
@@ -539,7 +526,7 @@ dumpsymtable(filename, checkpt)
 	hdr.ntrec = ntrec;
 	(void) fwrite((char *)&hdr, sizeof(struct symtableheader), 1, fd);
 	if (ferror(fd)) {
-		fprintf(stderr, "fwrite: %s\n", strerror(errno));
+		warn("fwrite");
 		panic("output error to file %s writing symbol table\n",
 			filename);
 	}
@@ -550,8 +537,7 @@ dumpsymtable(filename, checkpt)
  * Initialize a symbol table from a file
  */
 void
-initsymtable(filename)
-	char *filename;
+initsymtable(char *filename)
 {
 	char *base;
 	long tblsize;
@@ -562,33 +548,33 @@ initsymtable(filename)
 	register long i;
 	int fd;
 
-	vprintf(stdout, "Initialize symbol table.\n");
+	Vprintf(stdout, "Initialize symbol table.\n");
 	if (filename == NULL) {
 		entrytblsize = maxino / HASHFACTOR;
 		entry = (struct entry **)
 			calloc((unsigned)entrytblsize, sizeof(struct entry *));
 		if (entry == (struct entry **)NULL)
-			panic("no memory for entry table\n");
+			errx(1, "no memory for entry table");
 		ep = addentry(".", ROOTINO, NODE);
 		ep->e_flags |= NEW;
 		return;
 	}
 	if ((fd = open(filename, O_RDONLY, 0)) < 0) {
-		fprintf(stderr, "open: %s\n", strerror(errno));
-		panic("cannot open symbol table file %s\n", filename);
+		warn("open");
+		errx(1, "cannot open symbol table file %s", filename);
 	}
 	if (fstat(fd, &stbuf) < 0) {
-		fprintf(stderr, "stat: %s\n", strerror(errno));
-		panic("cannot stat symbol table file %s\n", filename);
+		warn("stat");
+		errx(1, "cannot stat symbol table file %s", filename);
 	}
 	tblsize = stbuf.st_size - sizeof(struct symtableheader);
 	base = calloc(sizeof(char), (unsigned)tblsize);
 	if (base == NULL)
-		panic("cannot allocate space for symbol table\n");
+		errx(1, "cannot allocate space for symbol table");
 	if (read(fd, base, (int)tblsize) < 0 ||
 	    read(fd, (char *)&hdr, sizeof(struct symtableheader)) < 0) {
-		fprintf(stderr, "read: %s\n", strerror(errno));
-		panic("cannot read symbol table file %s\n", filename);
+		warn("read");
+		errx(1, "cannot read symbol table file %s", filename);
 	}
 	switch (command) {
 	case 'r':
@@ -596,13 +582,9 @@ initsymtable(filename)
 		 * For normal continuation, insure that we are using
 		 * the next incremental tape
 		 */
-		if (hdr.dumpdate != dumptime) {
-			if (hdr.dumpdate < dumptime)
-				fprintf(stderr, "Incremental tape too low\n");
-			else
-				fprintf(stderr, "Incremental tape too high\n");
-			done(1);
-		}
+		if (hdr.dumpdate != dumptime)
+			errx(1, "Incremental tape too %s",
+				(hdr.dumpdate < dumptime) ? "low" : "high");
 		break;
 	case 'R':
 		/*