* Ported to Linux's Second Extended File System as part of the
* dump and restore backup suit
* Remy Card <card@Linux.EU.Org>, 1994-1997
- * Stelian Pop <pop@cybercable.fr>, 1999
+ * Stelian Pop <pop@noos.fr>, 1999-2000
+ * Stelian Pop <pop@noos.fr> - AlcĂ´ve <www.alcove.fr>, 2000
*/
/*
#ifndef lint
static const char rcsid[] =
- "$Id: symtab.c,v 1.6 1999/10/13 09:57:21 stelian Exp $";
+ "$Id: symtab.c,v 1.15 2001/05/12 11:36:12 stelian Exp $";
#endif /* not lint */
/*
* are needed, by calling "myname".
*/
+#include <config.h>
#include <sys/param.h>
#include <sys/stat.h>
#ifdef __linux__
#include <sys/time.h>
+#include <time.h>
#include <linux/ext2_fs.h>
#include <bsdcompat.h>
#else /* __linux__ */
static struct entry **entry;
static long entrytblsize;
-static void addino __P((ino_t, struct entry *));
+static void addino __P((dump_ino_t, struct entry *));
static struct entry *lookupparent __P((char *));
static void removeentry __P((struct entry *));
* Look up an entry by inode number
*/
struct entry *
-lookupino(ino_t inum)
+lookupino(dump_ino_t inum)
{
register struct entry *ep;
* Add an entry into the entry table
*/
static void
-addino(ino_t inum, struct entry *np)
+addino(dump_ino_t inum, struct entry *np)
{
struct entry **epp;
* Delete an entry from the entry table
*/
void
-deleteino(ino_t inum)
+deleteino(dump_ino_t inum)
{
register struct entry *next;
struct entry **prev;
* add an entry to the symbol table
*/
struct entry *
-addentry(char *name, ino_t inum, int type)
+addentry(char *name, dump_ino_t inum, int type)
{
register struct entry *np, *ep;
} 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);
freeentry(struct entry *ep)
{
register struct entry *np;
- ino_t inum;
+ dump_ino_t inum;
if (ep->e_flags != REMOVED)
badentry(ep, "not marked REMOVED");
#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
} 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);
int32_t entrytblsize;
time_t dumptime;
time_t dumpdate;
- ino_t maxino;
+ dump_ino_t maxino;
int32_t ntrec;
+ int32_t zflag;
};
/*
dumpsymtable(char *filename, long checkpt)
{
register struct entry *ep, *tep;
- register ino_t i;
+ register dump_ino_t i;
struct entry temp, *tentry;
long mynum = 1, stroff = 0;
FILE *fd;
hdr.dumptime = dumptime;
hdr.dumpdate = dumpdate;
hdr.ntrec = ntrec;
+ hdr.zflag = zflag;
(void) fwrite((char *)&hdr, sizeof(struct symtableheader), 1, fd);
if (ferror(fd)) {
warn("fwrite");
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) {
warn("open");
- panic("cannot open symbol table file %s\n", filename);
+ errx(1, "cannot open symbol table file %s", filename);
}
if (fstat(fd, &stbuf) < 0) {
warn("stat");
- panic("cannot stat symbol table file %s\n", filename);
+ 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) {
warn("read");
- panic("cannot read symbol table file %s\n", filename);
+ errx(1, "cannot read symbol table file %s", filename);
}
switch (command) {
case 'r':
curfile.action = SKIP;
dumptime = hdr.dumptime;
dumpdate = hdr.dumpdate;
+ zflag = hdr.zflag;
if (!bflag)
newtapebuf(hdr.ntrec);
getvol(hdr.volno);