libext2fs: explicitly ignore a possible unlink failure in ext2fs_free_icount

[tools/e2fsprogs.git] / lib / ext2fs / dirblock.c

diff --git a/lib/ext2fs/dirblock.c b/lib/ext2fs/dirblock.c
index dd9fe5f..54b2777 100644 (file)
--- a/lib/ext2fs/dirblock.c
+++ b/lib/ext2fs/dirblock.c
@@ -1,14 +1,15 @@
 /*
  * dirblock.c --- directory block routines.
- * 
+ *
  * Copyright (C) 1995, 1996 Theodore Ts'o.
  *
  * %Begin-Header%
- * This file may be redistributed under the terms of the GNU Public
- * License.
+ * This file may be redistributed under the terms of the GNU Library
+ * General Public License, version 2.
  * %End-Header%
  */
 
+#include "config.h"
 #include <stdio.h>
 #if HAVE_UNISTD_H
 #include <unistd.h>
@@ -16,86 +17,97 @@
 #include <string.h>
 #include <time.h>
 
-#if EXT2_FLAT_INCLUDES
 #include "ext2_fs.h"
-#else
-#include <linux/ext2_fs.h>
+#include "ext2fs.h"
+
+errcode_t ext2fs_read_dir_block4(ext2_filsys fs, blk64_t block,
+                                void *buf, int flags EXT2FS_ATTR((unused)),
+                                ext2_ino_t ino)
+{
+       errcode_t       retval;
+       int             corrupt = 0;
+
+       retval = io_channel_read_blk64(fs->io, block, 1, buf);
+       if (retval)
+               return retval;
+
+       if (!(fs->flags & EXT2_FLAG_IGNORE_CSUM_ERRORS) &&
+           !ext2fs_dir_block_csum_verify(fs, ino,
+                                         (struct ext2_dir_entry *)buf))
+               corrupt = 1;
+
+#ifdef WORDS_BIGENDIAN
+       retval = ext2fs_dirent_swab_in(fs, buf, flags);
 #endif
+       if (!retval && corrupt)
+               retval = EXT2_ET_DIR_CSUM_INVALID;
+       return retval;
+}
 
-#include "ext2fs.h"
+errcode_t ext2fs_read_dir_block3(ext2_filsys fs, blk64_t block,
+                                void *buf, int flags EXT2FS_ATTR((unused)))
+{
+       return ext2fs_read_dir_block4(fs, block, buf, flags, 0);
+}
+
+errcode_t ext2fs_read_dir_block2(ext2_filsys fs, blk_t block,
+                                void *buf, int flags EXT2FS_ATTR((unused)))
+{
+       return ext2fs_read_dir_block3(fs, block, buf, flags);
+}
 
 errcode_t ext2fs_read_dir_block(ext2_filsys fs, blk_t block,
-                               void *buf)
+                                void *buf)
+{
+       return ext2fs_read_dir_block3(fs, block, buf, 0);
+}
+
+
+errcode_t ext2fs_write_dir_block4(ext2_filsys fs, blk64_t block,
+                                 void *inbuf, int flags EXT2FS_ATTR((unused)),
+                                 ext2_ino_t ino)
 {
        errcode_t       retval;
-       char            *p, *end;
-       struct ext2_dir_entry *dirent;
-       struct ext2_dir_entry_2 *dirent2;
-       unsigned int    rec_len, do_swap;
+       char            *buf = inbuf;
 
-       retval = io_channel_read_blk(fs->io, block, 1, buf);
+#ifdef WORDS_BIGENDIAN
+       retval = ext2fs_get_mem(fs->blocksize, &buf);
+       if (retval)
+               return retval;
+       memcpy(buf, inbuf, fs->blocksize);
+       retval = ext2fs_dirent_swab_out(fs, buf, flags);
        if (retval)
                return retval;
-       do_swap = (fs->flags & (EXT2_FLAG_SWAP_BYTES|
-                               EXT2_FLAG_SWAP_BYTES_READ)) != 0;
-       p = (char *) buf;
-       end = (char *) buf + fs->blocksize;
-       while (p < end-8) {
-               dirent = (struct ext2_dir_entry_2 *) p;
-               if (do_swap) {
-                       dirent->inode = ext2fs_swab32(dirent->inode);
-                       dirent->rec_len = ext2fs_swab16(dirent->rec_len);
-                       dirent->name_len = ext2fs_swab16(dirent->name_len);
-               }
-               rec_len = dirent->rec_len;
-               if ((rec_len < 8) || (rec_len % 4)) {
-                       rec_len = 8;
-                       retval = EXT2_ET_DIR_CORRUPTED;
-               }
-               dirent2 = dirent;
-               if ((dirent2->name_len +8) > dirent2->rec_len)
-                       retval = EXT2_ET_DIR_CORRUPTED;
-               p += rec_len;
-       }
+#endif
+       retval = ext2fs_dir_block_csum_set(fs, ino,
+                                          (struct ext2_dir_entry *)buf);
+       if (retval)
+               goto out;
+
+       retval = io_channel_write_blk64(fs->io, block, 1, buf);
+
+out:
+#ifdef WORDS_BIGENDIAN
+       ext2fs_free_mem(&buf);
+#endif
        return retval;
 }
 
+errcode_t ext2fs_write_dir_block3(ext2_filsys fs, blk64_t block,
+                                 void *inbuf, int flags EXT2FS_ATTR((unused)))
+{
+       return ext2fs_write_dir_block4(fs, block, inbuf, flags, 0);
+}
+
+errcode_t ext2fs_write_dir_block2(ext2_filsys fs, blk_t block,
+                                void *inbuf, int flags EXT2FS_ATTR((unused)))
+{
+       return ext2fs_write_dir_block3(fs, block, inbuf, flags);
+}
+
 errcode_t ext2fs_write_dir_block(ext2_filsys fs, blk_t block,
                                 void *inbuf)
 {
-       errcode_t       retval;
-       char            *p, *end, *write_buf;
-       char            *buf = 0;
-       struct ext2_dir_entry *dirent;
-
-       if ((fs->flags & EXT2_FLAG_SWAP_BYTES) ||
-           (fs->flags & EXT2_FLAG_SWAP_BYTES_WRITE)) {
-               retval = ext2fs_get_mem(fs->blocksize, (void **) &buf);
-               if (retval)
-                       return retval;
-               write_buf = buf;
-               memcpy(buf, inbuf, fs->blocksize);
-               p = buf;
-               end = buf + fs->blocksize;
-               while (p < end) {
-                       dirent = (struct ext2_dir_entry *) p;
-                       if ((dirent->rec_len < 8) ||
-                           (dirent->rec_len % 4)) {
-                               retval = EXT2_ET_DIR_CORRUPTED;
-                               goto errout;
-                       }
-                       p += dirent->rec_len;
-                       dirent->inode = ext2fs_swab32(dirent->inode);
-                       dirent->rec_len = ext2fs_swab16(dirent->rec_len);
-                       dirent->name_len = ext2fs_swab16(dirent->name_len);
-               }
-       } else
-               write_buf = (char *) inbuf;
-       retval = io_channel_write_blk(fs->io, block, 1, write_buf);
-errout:
-       if (buf)
-               ext2fs_free_mem((void **) &buf);
-       return retval;
+       return ext2fs_write_dir_block3(fs, block, inbuf, 0);
 }
 
-