* 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-2000
+ * Stelian Pop <stelian@popies.net>, 1999-2000
+ * Stelian Pop <stelian@popies.net> - Alcôve <www.alcove.com>, 2000-2002
*/
/*
#ifndef lint
static const char rcsid[] =
- "$Id: dirs.c,v 1.8 2000/02/10 09:42:32 stelian Exp $";
+ "$Id: dirs.c,v 1.17 2002/01/25 15:08:59 stelian Exp $";
#endif /* not lint */
+#include <config.h>
#include <sys/param.h>
#include <sys/file.h>
#include <sys/stat.h>
#ifdef __linux__
+#ifdef HAVE_EXT2FS_EXT2_FS_H
+#include <ext2fs/ext2_fs.h>
+#else
#include <linux/ext2_fs.h>
+#endif
#include <bsdcompat.h>
#else /* __linux__ */
#include <ufs/ufs/dinode.h>
#define INOHASH(val) (val % HASHSIZE)
struct inotab {
struct inotab *t_next;
- ino_t t_ino;
+ dump_ino_t t_ino;
int32_t t_seekpt;
int32_t t_size;
};
* Information retained about directories.
*/
struct modeinfo {
- ino_t ino;
+ dump_ino_t ino;
struct timeval timep[2];
mode_t mode;
uid_t uid;
};
#ifdef __linux__
-static struct inotab *allocinotab __P((ino_t, struct new_bsd_inode *, long));
+static struct inotab *allocinotab __P((dump_ino_t, struct new_bsd_inode *, long));
#else
-static struct inotab *allocinotab __P((ino_t, struct dinode *, long));
+static struct inotab *allocinotab __P((dump_ino_t, struct dinode *, long));
#endif
static void dcvt __P((struct odirect *, struct direct *));
static void flushent __P((void));
-static struct inotab *inotablookup __P((ino_t));
+static struct inotab *inotablookup __P((dump_ino_t));
static RST_DIR *opendirfile __P((const char *));
static void putdir __P((char *, size_t));
static void putent __P((struct direct *));
static void rst_seekdir __P((RST_DIR *, long, long));
static long rst_telldir __P((RST_DIR *));
-static struct direct *searchdir __P((ino_t, char *));
+static struct direct *searchdir __P((dump_ino_t, char *));
/*
* Extract directory contents, building up a directory structure
void
extractdirs(int genmode)
{
- register int i;
+ int i;
#ifdef __linux__
- register struct new_bsd_inode *ip;
+ struct new_bsd_inode *ip;
#else
- register struct dinode *ip;
+ struct dinode *ip;
#endif
struct inotab *itp;
struct direct nulldir;
curfile.action = USING;
ip = curfile.dip;
if (ip == NULL || (ip->di_mode & IFMT) != IFDIR) {
- (void) fclose(df);
+ if ( fclose(df) == EOF )
+ err(1, "cannot write to file %s", dirfile);
dirp = opendirfile(dirfile);
if (dirp == NULL)
warn("opendirfile");
- if (mf != NULL)
- (void) fclose(mf);
+ if (mf != NULL && fclose(mf) == EOF )
+ err(1, "cannot write to file %s", dirfile);
i = dirlookup(dot);
if (i == 0)
panic("Root directory is not on tape\n");
* pname and pass them off to be processed.
*/
void
-treescan(char *pname, ino_t ino, long (*todo) __P((char *, ino_t, int)))
+treescan(char *pname, dump_ino_t ino, long (*todo) __P((char *, dump_ino_t, int)))
{
- register struct inotab *itp;
- register struct direct *dp;
+ struct inotab *itp;
+ struct direct *dp;
int namelen;
long bpt;
char locname[MAXPATHLEN + 1];
struct direct *
pathsearch(const char *pathname)
{
- ino_t ino;
+ dump_ino_t ino;
struct direct *dp;
char *path, *name, buffer[MAXPATHLEN];
* Return its inode number if found, zero if it does not exist.
*/
static struct direct *
-searchdir(ino_t inum, char *name)
+searchdir(dump_ino_t inum, char *name)
{
- register struct direct *dp;
- register struct inotab *itp;
+ struct direct *dp;
+ struct inotab *itp;
int len;
itp = inotablookup(inum);
putdir(char *buf, size_t size)
{
struct direct cvtbuf;
- register struct odirect *odp;
+ struct odirect *odp;
struct odirect *eodp;
- register struct direct *dp;
+ struct direct *dp;
long loc, i;
if (cvtflag) {
if ((dp->d_reclen & 0x3) != 0 ||
dp->d_reclen > i ||
dp->d_reclen < DIRSIZ(0, dp) ||
- dp->d_namlen > NAME_MAX) {
+ dp->d_namlen > MAXNAMLEN) {
Vprintf(stdout, "Mangled directory: ");
if ((dp->d_reclen & 0x3) != 0)
Vprintf(stdout,
Vprintf(stdout,
"reclen less than DIRSIZ (%d < %d) ",
dp->d_reclen, DIRSIZ(0, dp));
- if (dp->d_namlen > NAME_MAX)
+ if (dp->d_namlen > MAXNAMLEN)
Vprintf(stdout,
"reclen name too big (%d > %d) ",
- dp->d_namlen, NAME_MAX);
+ dp->d_namlen, MAXNAMLEN);
Vprintf(stdout, "\n");
loc += i;
continue;
if (dirloc + dp->d_reclen > DIRBLKSIZ) {
((struct direct *)(dirbuf + prev))->d_reclen =
DIRBLKSIZ - prev;
- (void) fwrite(dirbuf, 1, DIRBLKSIZ, df);
+ if ( fwrite(dirbuf, 1, DIRBLKSIZ, df) != DIRBLKSIZ )
+ err(1,"cannot write to file %s", dirfile);
dirloc = 0;
}
memmove(dirbuf + dirloc, dp, (size_t)dp->d_reclen);
flushent(void)
{
((struct direct *)(dirbuf + prev))->d_reclen = DIRBLKSIZ - prev;
- (void) fwrite(dirbuf, (int)dirloc, 1, df);
+ if ( fwrite(dirbuf, (int)dirloc, 1, df) != 1 )
+ err(1, "cannot write to file %s", dirfile);
seekpt = ftell(df);
+ if (seekpt == -1)
+ err(1, "cannot write to file %s", dirfile);
dirloc = 0;
}
struct direct *
rst_readdir(RST_DIR *dirp)
{
- register struct direct *dp;
+ struct direct *dp;
for (;;) {
if (dirp->dd_loc == 0) {
{
struct inotab *itp;
RST_DIR *dirp;
- ino_t ino;
+ dump_ino_t ino;
if ((ino = dirlookup(name)) > 0 &&
(itp = inotablookup(ino)) != NULL) {
static RST_DIR *
opendirfile(const char *name)
{
- register RST_DIR *dirp;
- register int fd;
+ RST_DIR *dirp;
+ int fd;
if ((fd = open(name, O_RDONLY)) == -1)
return (NULL);
* Generate a literal copy of a directory.
*/
int
-genliteraldir(char *name, ino_t ino)
+genliteraldir(char *name, dump_ino_t ino)
{
- register struct inotab *itp;
+ struct inotab *itp;
int ofile, dp, i, size;
char buf[BUFSIZ];
* Determine the type of an inode
*/
int
-inodetype(ino_t ino)
+inodetype(dump_ino_t ino)
{
struct inotab *itp;
*/
static struct inotab *
#ifdef __linux__
-allocinotab(ino_t ino, struct new_bsd_inode *dip, long seekpt)
+allocinotab(dump_ino_t ino, struct new_bsd_inode *dip, long seekpt)
#else
-allocinotab(ino_t ino, struct dinode *dip, long seekpt)
+allocinotab(dump_ino_t ino, struct dinode *dip, long seekpt)
#endif
{
- register struct inotab *itp;
+ struct inotab *itp;
struct modeinfo node;
itp = calloc(1, sizeof(struct inotab));
node.flags = dip->di_flags;
node.uid = dip->di_uid;
node.gid = dip->di_gid;
- (void) fwrite((char *)&node, 1, sizeof(struct modeinfo), mf);
+ if ( fwrite((char *)&node, 1, sizeof(struct modeinfo), mf) != sizeof(struct modeinfo) )
+ err(1,"cannot write to file %s", modefile);
return (itp);
}
* Look up an inode in the table of directories
*/
static struct inotab *
-inotablookup(ino_t ino)
+inotablookup(dump_ino_t ino)
{
- register struct inotab *itp;
+ struct inotab *itp;
for (itp = inotab[INOHASH(ino)]; itp != NULL; itp = itp->t_next)
if (itp->t_ino == ino)
git.wh0rd.org / dump.git / blobdiff