Add local EXT2_FT_* constants.

[dump.git] / dump / traverse.c

diff --git a/dump/traverse.c b/dump/traverse.c
index a51e36265d9a1fdf189bfb8ff59d0dc73aac7ebc..d97e38e23ecd42119710af3590cf2de154715585 100644 (file)
--- a/dump/traverse.c
+++ b/dump/traverse.c
@@ -41,7 +41,7 @@
 
 #ifndef lint
 static const char rcsid[] =
-       "$Id: traverse.c,v 1.51 2002/09/02 12:20:26 stelian Exp $";
+       "$Id: traverse.c,v 1.54 2003/01/10 14:46:55 stelian Exp $";
 #endif /* not lint */
 
 #include <config.h>
@@ -134,6 +134,17 @@ typedef ino_t ext2_ino_t;
 #ifndef EXT2_RESIZE_INO
 #define EXT2_RESIZE_INO                        7
 #endif
+#ifndef EXT2_FT_UNKNOWN
+#define EXT2_FT_UNKNOWN                0
+#define EXT2_FT_REG_FILE       1
+#define EXT2_FT_DIR            2
+#define EXT2_FT_CHRDEV         3
+#define EXT2_FT_BLKDEV         4
+#define EXT2_FT_FIFO           5
+#define EXT2_FT_SOCK           6
+#define EXT2_FT_SYMLINK                7
+#define EXT2_FT_MAX            8
+#endif
 
 int dump_fs_open(const char *disk, ext2_filsys *fs)
 {
@@ -825,7 +836,7 @@ dumpino(struct dinode *dp, dump_ino_t ino, int metaonly)
        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);
+               msg("ACLs in inode #%ld won't be dumped\n", (long)ino);
        memmove(&spcl.c_dinode, &nbi, sizeof(nbi));
 #else  /* __linux__ */
        spcl.c_dinode = *dp;
@@ -1083,7 +1094,7 @@ dumpdirino(struct dinode *dp, dump_ino_t ino)
        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);
+               msg("ACLs in inode #%ld won't be dumped\n", (long)ino);
        memmove(&spcl.c_dinode, &nbi, sizeof(nbi));
 #else  /* __linux__ */
        spcl.c_dinode = *dp;
@@ -1346,7 +1357,7 @@ loop:
        else
                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) {
+       if (breademax && ++breaderrors > breademax) {
                msg("More than %d block read errors from %d\n",
                        breademax, disk);
                broadcast("DUMP IS AILING!\n");