#ifndef lint
static const char rcsid[] =
- "$Id: traverse.c,v 1.46 2002/05/16 21:22:36 stelian Exp $";
+ "$Id: traverse.c,v 1.49 2002/07/19 14:57:39 stelian Exp $";
#endif /* not lint */
#include <config.h>
#include <ctype.h>
#include <stdio.h>
+#include <sys/types.h>
#ifdef __STDC__
#include <string.h>
#include <unistd.h>
#endif
+#include <errno.h>
#include <sys/param.h>
#include <sys/stat.h>
#ifdef HAVE_EXT2_JOURNAL_INUM
#define ext2_journal_ino(sb) (sb->s_journal_inum)
#else
-#define ext2_journal_ino(sb) (*((__u32 *)sb + 0x38))
+#define ext2_journal_ino(sb) (*((u_int32_t *)sb + 0x38))
#endif
#ifndef HAVE_EXT2_INO_T
typedef ino_t ext2_ino_t;
if (blkest > sizeest)
blkest = sizeest;
#ifdef __linux__
- if (i_size > fs->blocksize * NDADDR) {
+ if (i_size > (u_quad_t)fs->blocksize * NDADDR) {
/* calculate the number of indirect blocks on the dump tape */
blkest +=
howmany(sizeest - NDADDR * fs->blocksize / TP_BSIZE,
/* The WANTTODUMP macro decides whether a file should be dumped. */
#define WANTTODUMP(dp, ino) \
- (CHANGEDSINCE(dp, spcl.c_ddate) && \
+ (CHANGEDSINCE(dp, ((u_int32_t)spcl.c_ddate)) && \
(!NODUMP_FLAG(dp)) && \
(!exclude_ino(ino)))
SETINO(ino, dumpdirmap);
if (WANTTODUMP(dp, ino)) {
SETINO(ino, dumpinomap);
- if (!MSINCE(dp, spcl.c_ddate))
+ if (!MSINCE(dp, (u_int32_t)spcl.c_ddate))
SETINO(ino, metainomap);
if (mode != IFREG && mode != IFDIR && mode != IFLNK)
*tapesize += 1;
*/
#ifdef __linux__
int
-mapfiles(dump_ino_t maxino, long *tapesize)
+mapfiles(UNUSED(dump_ino_t maxino), long *tapesize)
{
ext2_ino_t ino;
int anydirskipped = 0;
#ifdef __linux__
int
-maponefile(dump_ino_t maxino, long *tapesize, char *directory)
+maponefile(UNUSED(dump_ino_t maxino), long *tapesize, char *directory)
{
errcode_t retval;
ext2_ino_t dir_ino;
/*
* Mark every directory in the path as being dumped
*/
- for (i = 0; i < strlen (directory); i++) {
+ for (i = 0; i < (int)strlen (directory); i++) {
if (directory[i] == '/') {
strncpy (dir_name, directory, i);
dir_name[i] = '\0';
};
static int
-mapfilesindir(struct ext2_dir_entry *dirent, int offset, int blocksize, char *buf, void *private)
+mapfilesindir(struct ext2_dir_entry *dirent, UNUSED(int offset),
+ UNUSED(int blocksize), UNUSED(char *buf), void *private)
{
struct dinode const *dp;
int mode;
* the directories in the filesystem.
*/
int
-mapfilesfromdir(dump_ino_t maxino, long *tapesize, char *directory)
+mapfilesfromdir(UNUSED(dump_ino_t maxino), long *tapesize, char *directory)
{
errcode_t retval;
struct mapfile_context mfc;
/*
* Mark every directory in the path as being dumped
*/
- for (i = 0; i < strlen (directory); i++) {
+ for (i = 0; i < (int)strlen (directory); i++) {
if (directory[i] == '/') {
strncpy (dir_name, directory, i);
dir_name[i] = '\0';
*/
#ifdef __linux__
static int
-searchdir(struct ext2_dir_entry *dp, int offset, int blocksize, char *buf, void *private)
+searchdir(struct ext2_dir_entry *dp, UNUSED(int offset),
+ UNUSED(int blocksize), UNUSED(char *buf), void *private)
{
struct mapdirs_context *mdc;
int *ret;
* Dump a block to the tape
*/
static int
-dumponeblock(ext2_filsys fs, blk_t *blocknr, e2_blkcnt_t blockcnt,
- blk_t ref_block, int ref_offset, void * private)
+dumponeblock(UNUSED(ext2_filsys fs), blk_t *blocknr, e2_blkcnt_t blockcnt,
+ UNUSED(blk_t ref_block), UNUSED(int ref_offset), void * private)
{
struct block_context *p;
int i;
unsigned long cnt;
fsizeT size, remaining;
char buf[TP_BSIZE];
- struct old_bsd_inode obi;
+ struct new_bsd_inode nbi;
int i;
#ifdef __linux__
struct block_context bc;
}
CLRINO(ino, dumpinomap);
#ifdef __linux__
- memset(&obi, 0, sizeof(obi));
- obi.di_mode = dp->di_mode;
- obi.di_uid = dp->di_uid;
- obi.di_gid = dp->di_gid;
- obi.di_qsize.v = i_size;
- obi.di_atime = dp->di_atime;
- obi.di_mtime = dp->di_mtime;
- obi.di_ctime = dp->di_ctime;
- obi.di_nlink = dp->di_nlink;
- obi.di_blocks = dp->di_blocks;
- obi.di_flags = dp->di_flags;
- obi.di_gen = dp->di_gen;
- memmove(&obi.di_db, &dp->di_db, (NDADDR + NIADDR) * sizeof(daddr_t));
+ memset(&nbi, 0, sizeof(nbi));
+ nbi.di_mode = dp->di_mode;
+ nbi.di_nlink = dp->di_nlink;
+ nbi.di_ouid = dp->di_uid;
+ nbi.di_ogid = dp->di_gid;
+ nbi.di_size = i_size;
+ nbi.di_atime.tv_sec = dp->di_atime;
+ nbi.di_mtime.tv_sec = dp->di_mtime;
+ nbi.di_ctime.tv_sec = dp->di_ctime;
+ memmove(&nbi.di_db, &dp->di_db, (NDADDR + NIADDR) * sizeof(daddr_t));
+ nbi.di_flags = dp->di_flags;
+ nbi.di_blocks = dp->di_blocks;
+ nbi.di_gen = dp->di_gen;
+ nbi.di_uid = (((int32_t)dp->di_uidhigh) << 16) | dp->di_uid;
+ nbi.di_gid = (((int32_t)dp->di_gidhigh) << 16) | dp->di_gid;
if (dp->di_file_acl)
warn("ACLs in inode #%ld won't be dumped", (long)ino);
- memmove(&spcl.c_dinode, &obi, sizeof(obi));
+ memmove(&spcl.c_dinode, &nbi, sizeof(nbi));
#else /* __linux__ */
spcl.c_dinode = *dp;
#endif /* __linux__ */
msg("Warning: undefined file type 0%o\n", dp->di_mode & IFMT);
return;
}
- if (i_size > NDADDR * sblock->fs_bsize)
+ if (i_size > (u_quad_t)NDADDR * sblock->fs_bsize)
#ifdef __linux__
cnt = NDADDR * EXT2_FRAGS_PER_BLOCK(fs->super);
#else
/* deal with holes at the end of the inode */
if (i_size > ((u_quad_t)bc.next_block) * sblock->fs_fsize) {
remaining = i_size - ((u_quad_t)bc.next_block) * sblock->fs_fsize;
- for (i = 0; i < howmany(remaining, sblock->fs_fsize); i++) {
+ for (i = 0; i < (int)howmany(remaining, sblock->fs_fsize); i++) {
bc.buf[bc.cnt++] = 0;
if (bc.cnt == bc.max) {
blksout (bc.buf, bc.cnt, bc.ino);
* size of the entry, and creates it in a temporary buffer
*/
static int
-convert_dir(struct ext2_dir_entry *dirent, int offset, int blocksize, char *buf, void *private)
+convert_dir(struct ext2_dir_entry *dirent, UNUSED(int offset),
+ UNUSED(int blocksize), UNUSED(char *buf), void *private)
{
struct convert_dir_context *p;
- struct olddirect *dp;
+ struct direct *dp;
int reclen;
p = (struct convert_dir_context *)private;
reclen = EXT2_DIR_REC_LEN((dirent->name_len & 0xFF) + 1);
if (((p->offset + reclen - 1) / p->bs) != (p->offset / p->bs)) {
- dp = (struct olddirect *)(p->buf + p->prev_offset);
+ dp = (struct direct *)(p->buf + p->prev_offset);
dp->d_reclen += p->bs - (p->offset % p->bs);
p->offset += p->bs - (p->offset % p->bs);
}
- dp = (struct olddirect *)(p->buf + p->offset);
+ dp = (struct direct *)(p->buf + p->offset);
dp->d_ino = dirent->inode;
dp->d_reclen = reclen;
dp->d_namlen = dirent->name_len & 0xFF;
{
fsizeT size;
char buf[TP_BSIZE];
- struct old_bsd_inode obi;
+ struct new_bsd_inode nbi;
struct convert_dir_context cdc;
errcode_t retval;
struct ext2_dir_entry *de;
dir_size = cdc.offset;
#ifdef __linux__
- memset(&obi, 0, sizeof(obi));
- obi.di_mode = dp->di_mode;
- obi.di_uid = dp->di_uid;
- obi.di_gid = dp->di_gid;
- obi.di_qsize.v = dir_size; /* (u_quad_t)dp->di_size; */
- obi.di_atime = dp->di_atime;
- obi.di_mtime = dp->di_mtime;
- obi.di_ctime = dp->di_ctime;
- obi.di_nlink = dp->di_nlink;
- obi.di_blocks = dp->di_blocks;
- obi.di_flags = dp->di_flags;
- obi.di_gen = dp->di_gen;
- memmove(&obi.di_db, &dp->di_db, (NDADDR + NIADDR) * sizeof(daddr_t));
+ memset(&nbi, 0, sizeof(nbi));
+ nbi.di_mode = dp->di_mode;
+ nbi.di_nlink = dp->di_nlink;
+ nbi.di_ouid = dp->di_uid;
+ nbi.di_ogid = dp->di_gid;
+ nbi.di_size = dir_size; /* (u_quad_t)dp->di_size; */
+ nbi.di_atime.tv_sec = dp->di_atime;
+ nbi.di_mtime.tv_sec = dp->di_mtime;
+ nbi.di_ctime.tv_sec = dp->di_ctime;
+ memmove(&nbi.di_db, &dp->di_db, (NDADDR + NIADDR) * sizeof(daddr_t));
+ nbi.di_flags = dp->di_flags;
+ nbi.di_blocks = dp->di_blocks;
+ nbi.di_gen = dp->di_gen;
+ nbi.di_uid = (((int32_t)dp->di_uidhigh) << 16) | dp->di_uid;
+ nbi.di_gid = (((int32_t)dp->di_gidhigh) << 16) | dp->di_gid;
if (dp->di_file_acl)
warn("ACLs in inode #%ld won't be dumped", (long)ino);
- memmove(&spcl.c_dinode, &obi, sizeof(obi));
+ memmove(&spcl.c_dinode, &nbi, sizeof(nbi));
#else /* __linux__ */
spcl.c_dinode = *dp;
#endif /* __linux__ */
bread(daddr_t blkno, char *buf, int size)
{
int cnt, i;
- extern int errno;
loop:
#ifdef __linux__
goto loop;
}
if (cnt == -1)
- msg("read error from %s: %s: [block %d]: count=%d\n",
- disk, strerror(errno), blkno, size);
+ msg("read error from %s: %s: [block %d, ext2blk %d]: count=%d\n",
+ disk, strerror(errno), blkno,
+ dbtofsb(sblock, blkno), size);
else
- msg("short read error from %s: [block %d]: count=%d, got=%d\n",
- disk, blkno, size, cnt);
+ msg("short read error from %s: [block %d, ext2blk %d]: count=%d, got=%d\n",
+ disk, blkno, dbtofsb(sblock, blkno), size, cnt);
if (++breaderrors > breademax) {
msg("More than %d block read errors from %d\n",
breademax, disk);
if ((cnt = read(diskfd, buf, (int)dev_bsize)) == dev_bsize)
continue;
if (cnt == -1) {
- msg("read error from %s: %s: [sector %d]: count=%d\n",
- disk, strerror(errno), blkno, dev_bsize);
+ msg("read error from %s: %s: [sector %d, ext2blk %d]: count=%d\n",
+ disk, strerror(errno), blkno,
+ dbtofsb(sblock, blkno), dev_bsize);
continue;
}
- msg("short read error from %s: [sector %d]: count=%d, got=%d\n",
- disk, blkno, dev_bsize, cnt);
+ msg("short read error from %s: [sector %d, ext2blk %d]: count=%d, got=%d\n",
+ disk, blkno, dbtofsb(sblock, blkno), dev_bsize, cnt);
}
}