/*
* 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
*/
/*-
*/
#ifndef lint
-static char sccsid[] = "@(#)traverse.c 8.7 (Berkeley) 6/15/95";
+static const char rcsid[] =
+ "$Id: traverse.c,v 1.6 1999/10/13 09:57:20 stelian Exp $";
#endif /* not lint */
#include <sys/param.h>
-#include <sys/time.h>
#include <sys/stat.h>
#ifdef __linux__
#include <linux/ext2_fs.h>
#include <bsdcompat.h>
-#include <err.h>
+#include <compaterr.h>
#include <stdlib.h>
+#define swab32(x) ext2fs_swab32(x)
#else /* __linux__ */
+#define swab32(x) x
#ifdef sunos
#include <sys/vnode.h>
typedef long fsizeT;
#endif
-#ifndef __linux__
-static int dirindir __P((ino_t ino, daddr_t blkno, int level, long *size));
-#endif
-static void dmpindir __P((ino_t ino, daddr_t blk, int level, fsizeT *size));
#ifdef __linux__
static int searchdir __P((struct ext2_dir_entry *dp, int offset,
int blocksize, char *buf, void *private));
+loff_t llseek (int fd, loff_t offset, int origin);
#else
+static int dirindir __P((ino_t ino, daddr_t blkno, int level, long *size));
+static void dmpindir __P((ino_t ino, daddr_t blk, int level, fsizeT *size));
static int searchdir __P((ino_t ino, daddr_t blkno, long size, long filesize));
#endif
* hence the estimate may be high.
*/
long
-blockest(dp)
- register struct dinode *dp;
+blockest(struct dinode *dp)
{
long blkest, sizeest;
* the directories in the filesystem.
*/
int
-mapfiles(maxino, tapesize)
- ino_t maxino;
- long *tapesize;
+mapfiles(ino_t maxino, long *tapesize)
{
register int mode;
register ino_t ino;
};
static int
-mapfilesindir(dirent, offset, blocksize, buf, private)
- struct ext2_dir_entry *dirent;
- int offset;
- int blocksize;
- char *buf;
- void *private;
+mapfilesindir(struct ext2_dir_entry *dirent, int offset, int blocksize, char *buf, void *private)
{
register struct dinode *dp;
register int mode;
* the directories in the filesystem.
*/
int
-mapfilesfromdir(maxino, tapesize, directory)
- ino_t maxino;
- long *tapesize;
- char *directory;
+mapfilesfromdir(ino_t maxino, long *tapesize, char *directory)
{
errcode_t retval;
struct mapfile_context mfc;
* pass using this algorithm.
*/
int
-mapdirs(maxino, tapesize)
- ino_t maxino;
- long *tapesize;
+mapdirs(ino_t maxino, long *tapesize)
{
register struct dinode *dp;
- register int i, isdir;
+ register int isdir;
register char *map;
register ino_t ino;
+#ifndef __linux__
+ register int i;
long filesize;
+#endif
int ret, change = 0;
isdir = 0; /* XXX just to get gcc to shut up */
isdir >>= 1;
if ((isdir & 1) == 0 || TSTINO(ino, dumpinomap))
continue;
-#ifdef __linux__
dp = getino(ino);
+#ifdef __linux__
ret = 0;
ext2fs_dir_iterate(fs, ino, 0, NULL, searchdir, (void *) &ret);
#else /* __linux__ */
- dp = getino(ino);
filesize = dp->di_size;
for (ret = 0, i = 0; filesize > 0 && i < NDADDR; i++) {
if (dp->di_db[i] != 0)
* require the directory to be dumped.
*/
static int
-dirindir(ino, blkno, ind_level, filesize)
- ino_t ino;
- daddr_t blkno;
- int ind_level;
- long *filesize;
+dirindir(ino_t ino, daddr_t blkno, int ind_level, long *filesize)
{
int ret = 0;
register int i;
*/
#ifdef __linux__
static int
-searchdir(dp, offset, blocksize, buf, private)
- struct ext2_dir_entry *dp;
- int offset;
- int blocksize;
- char *buf;
- void *private;
+searchdir(struct ext2_dir_entry *dp, int offset, int blocksize, char *buf, void *private)
{
int *ret = (int *) private;
#else /* __linux__ */
static int
-searchdir(ino, blkno, size, filesize)
- ino_t ino;
- daddr_t blkno;
- register long size;
- long filesize;
+searchdir(ino_t ino, daddr_t blkno, long size, long filesize)
{
register struct direct *dp;
register long loc, ret = 0;
* Dump the contents of an inode to tape.
*/
void
-dumpino(dp, ino)
- register struct dinode *dp;
- ino_t ino;
+dumpino(struct dinode *dp, ino_t ino)
{
- int ind_level, cnt;
+ int cnt;
fsizeT size;
char buf[TP_BSIZE];
struct old_bsd_inode obi;
#ifdef __linux__
struct block_context bc;
+#else
+ int ind_level;
#endif
if (newtape) {
obi.di_gen = dp->di_gen;
memmove(&obi.di_db, &dp->di_db, (NDADDR + NIADDR) * sizeof(daddr_t));
if (dp->di_file_acl || dp->di_dir_acl)
- warn("ACLs in inode #%d won't be dumped", ino);
+ warn("ACLs in inode #%ld won't be dumped", ino);
memmove(&spcl.c_dinode, &obi, sizeof(obi));
#else /* __linux__ */
spcl.c_dinode = *dp;
else
cnt = howmany(dp->di_size, sblock->fs_fsize);
blksout(&dp->di_db[0], cnt, ino);
- if ((size = ((int)dp->di_size) - NDADDR * sblock->fs_bsize) <= 0)
+ if ((size = dp->di_size - NDADDR * sblock->fs_bsize) <= 0)
return;
#ifdef __linux__
bc.max = NINDIR(sblock) * EXT2_FRAGS_PER_BLOCK(fs->super);
* size of the entry, and creates it in a temporary buffer
*/
static int
-convert_dir(dirent, offset, blocksize, buf, private)
- struct ext2_dir_entry *dirent;
- int offset;
- int blocksize;
- char *buf;
- void *private;
+convert_dir(struct ext2_dir_entry *dirent, int offset, int blocksize, char *buf, void *private)
{
struct convert_dir_context *p;
struct direct *dp;
* Dumps a directory to tape after converting it to the BSD format
*/
void
-dumpdirino(dp, ino)
- register struct dinode *dp;
- ino_t ino;
+dumpdirino(struct dinode *dp, ino_t ino)
{
fsizeT size;
char buf[TP_BSIZE];
ext2fs directory to avoid problems ;-) */
cdc.buf = (char *)malloc(dp->di_size * 2 * sizeof(char));
if (cdc.buf == NULL)
- err(1, "Cannot allocate buffer to convert directory #%ld\n",
- ino);
+ err(1, "Cannot allocate buffer to convert directory #%lu\n",
+ (unsigned long)ino);
cdc.offset = 0;
cdc.prev_offset = 0;
cdc.bs = MIN(DIRBLKSIZ, TP_BSIZE);
obi.di_gen = dp->di_gen;
memmove(&obi.di_db, &dp->di_db, (NDADDR + NIADDR) * sizeof(daddr_t));
if (dp->di_file_acl || dp->di_dir_acl)
- warn("ACLs in inode #%d won't be dumped", ino);
+ warn("ACLs in inode #%ld won't be dumped", ino);
memmove(&spcl.c_dinode, &obi, sizeof(obi));
#else /* __linux__ */
spcl.c_dinode = *dp;
* Read indirect blocks, and pass the data blocks to be dumped.
*/
static void
-dmpindir(ino, blk, ind_level, size)
- ino_t ino;
- daddr_t blk;
- int ind_level;
- fsizeT *size;
+dmpindir(ino_t ino, daddr_t blk, int ind_level, fsizeT *size)
{
int i, cnt;
+#ifdef __linux__
+ int max;
+ blk_t *swapme;
+#endif
daddr_t idblk[MAXNINDIR];
- if (blk != 0)
+ if (blk != 0) {
bread(fsbtodb(sblock, blk), (char *)idblk, (int) sblock->fs_bsize);
+#ifdef __linux__
+ /*
+ * My RedHat 4.0 system doesn't have these flags; I haven't
+ * upgraded e2fsprogs yet
+ */
+#if defined(EXT2_FLAG_SWAP_BYTES)
+ if ((fs->flags & EXT2_FLAG_SWAP_BYTES) ||
+ (fs->flags & EXT2_FLAG_SWAP_BYTES_READ)) {
+#endif
+ max = sblock->fs_bsize >> 2;
+ swapme = (blk_t *) idblk;
+ for (i = 0; i < max; i++, swapme++)
+ *swapme = swab32(*swapme);
+#if defined(EXT2_FLAG_SWAP_BYTES)
+ }
+#endif
+#endif
else
memset(idblk, 0, (int)sblock->fs_bsize);
if (ind_level <= 0) {
* Collect up the data into tape record sized buffers and output them.
*/
void
-blksout(blkp, frags, ino)
- daddr_t *blkp;
- int frags;
- ino_t ino;
+blksout(daddr_t *blkp, int frags, ino_t ino)
{
register daddr_t *bp;
int i, j, count, blks, tbperdb;
spcl.c_count = count - i;
writeheader(ino);
bp = &blkp[i / tbperdb];
- for (j = i; j < count; j += tbperdb, bp++)
- if (*bp != 0)
+ for (j = i; j < count; j += tbperdb, bp++) {
+ if (*bp != 0) {
if (j + tbperdb <= count)
dumpblock(*bp, (int)sblock->fs_bsize);
else
dumpblock(*bp, (count - j) * TP_BSIZE);
+ }
+ }
spcl.c_type = TS_ADDR;
}
}
* Dump a map to the tape.
*/
void
-dumpmap(map, type, ino)
- char *map;
- int type;
- ino_t ino;
+dumpmap(char *map, int type, ino_t ino)
{
register int i;
char *cp;
* Write a header record to the dump tape.
*/
void
-writeheader(ino)
- ino_t ino;
+writeheader(ino_t ino)
{
#ifdef __linux__
register __s32 sum, cnt, *lp;
#else
- register long sum, cnt, *lp;
+ register int32_t sum, cnt, *lp;
#endif
spcl.c_inumber = ino;
#ifdef __linux__
lp = (__s32 *)&spcl;
#else
- lp = (long *)&spcl;
+ lp = (int32_t *)&spcl;
#endif
sum = 0;
#ifdef __linux__
cnt = sizeof(union u_spcl) / (4 * sizeof(__s32));
#else
- cnt = sizeof(union u_spcl) / (4 * sizeof(long));
+ cnt = sizeof(union u_spcl) / (4 * sizeof(int32_t));
#endif
while (--cnt >= 0) {
sum += *lp++;
#ifdef __linux__
struct dinode *
-getino(inum)
- ino_t inum;
+getino(ino_t inum)
{
static struct dinode dinode;
}
#else /* __linux__ */
struct dinode *
-getino(inum)
- ino_t inum;
+getino(ino_t inum)
{
static daddr_t minino, maxino;
static struct dinode inoblock[MAXINOPB];
* Error recovery is attempted at most BREADEMAX times before seeking
* consent from the operator to continue.
*/
-int breaderrors = 0;
+int breaderrors = 0;
#define BREADEMAX 32
void
-bread(blkno, buf, size)
- daddr_t blkno;
- char *buf;
- int size;
+bread(daddr_t blkno, char *buf, int size)
{
int cnt, i;
extern int errno;
loop:
#ifdef __linux__
- if (ext2_llseek(diskfd, ((ext2_loff_t)blkno << dev_bshift), 0) !=
+ if (llseek(diskfd, ((ext2_loff_t)blkno << dev_bshift), 0) !=
((ext2_loff_t)blkno << dev_bshift))
#else
- if ((int)lseek(diskfd, ((off_t)blkno << dev_bshift), 0) == -1)
+ if (lseek(diskfd, ((off_t)blkno << dev_bshift), 0) !=
+ ((off_t)blkno << dev_bshift))
#endif
msg("bread: lseek fails\n");
if ((cnt = read(diskfd, buf, size)) == size)
memset(buf, 0, size);
for (i = 0; i < size; i += dev_bsize, buf += dev_bsize, blkno++) {
#ifdef __linux__
- if (ext2_llseek(diskfd, ((ext2_loff_t)blkno << dev_bshift), 0) !=
+ if (llseek(diskfd, ((ext2_loff_t)blkno << dev_bshift), 0) !=
((ext2_loff_t)blkno << dev_bshift))
#else
- if ((int)lseek(diskfd, ((off_t)blkno << dev_bshift), 0) == -1)
+ if (lseek(diskfd, ((off_t)blkno << dev_bshift), 0) !=
+ ((off_t)blkno << dev_bshift))
#endif
msg("bread: lseek2 fails!\n");
if ((cnt = read(diskfd, buf, (int)dev_bsize)) == dev_bsize)
git.wh0rd.org / dump.git / blobdiff