1997-04-26 17:58:21 +04:00
|
|
|
/*
|
|
|
|
* dirblock.c --- directory block routines.
|
|
|
|
*
|
1997-04-29 20:15:03 +04:00
|
|
|
* Copyright (C) 1995, 1996 Theodore Ts'o.
|
|
|
|
*
|
|
|
|
* %Begin-Header%
|
|
|
|
* This file may be redistributed under the terms of the GNU Public
|
|
|
|
* License.
|
|
|
|
* %End-Header%
|
1997-04-26 17:58:21 +04:00
|
|
|
*/
|
|
|
|
|
|
|
|
#include <stdio.h>
|
1997-08-11 03:07:40 +04:00
|
|
|
#if HAVE_UNISTD_H
|
1997-04-26 17:58:21 +04:00
|
|
|
#include <unistd.h>
|
1997-08-11 03:07:40 +04:00
|
|
|
#endif
|
1997-04-29 20:15:03 +04:00
|
|
|
#include <string.h>
|
1997-04-26 17:58:21 +04:00
|
|
|
#include <time.h>
|
|
|
|
|
Many files:
inode.c (ext2fs_open_inode_scan): Initialize the group variables
so that we don't need to call get_next_blockgroup() the first
time around. Saves a bit of time, and prevents us from
needing to assign -1 to current_group (which is an unsigned
value).
icount.c (insert_icount_el): Cast the estimated number of inodes
from a float to an ino_t.
alloc.c, alloc_tables.c, badlbocks.c, bb_compat.c, bb_inode.c,
bitmaps.c, bitops.c, block.c, bmap.c, bmove.c, brel_ma.c,
check_desc.c, closefs.c, cmp_bitmaps.c, dblist.c,
dblist_dir.c, dir_iterate.c, dirblock.c, dupfs.c, expanddir.c,
ext2fs.h, fileio.c, freefs.c, get_pathname.c, getsize.c,
icount.c, initialize.c, inline.c, inode.c, irel_ma.c,
ismounted.c, link.c, lookup.c, mkdir.c, namei.c, native.c,
newdir.c, openfs.c, read_bb.c, read_bb_file.c, rs_bitmap.c,
rw_bitmaps.c, swapfs.c, test_io.c, tst_badblocks.c,
tst_getsize.c, tst_iscan.c, unix_io.c, unlink.c, valid_blk.c,
version.c: If EXT2_FLAT_INCLUDES is defined, then assume all
of the ext2-specific header files are in a flat directory.
block.c, bmove.c, dirblock.c, fileio.c: Explicitly cast
all assignments from void * to be compatible with C++.
closefs.c (ext2fs_flush): Add a call to io_channel_flush() to
make sure the contents of the disk are flushed to disk.
dblist.c (ext2fs_add_dir_block): Change new to be new_entry to
avoid C++ namespace clash.
bitmaps.c (ext2fs_copy_bitmap): Change new to be new_map to
avoid C++ namespace clash.
ext2fs.h, bb_inode.c, block.c, bmove.c, brel.h, brel_ma.c,
irel.h, irel_ma.c, dblist.c, dblist_dir.c, dir_iterate.c,
ext2fsP.h, expanddir.c, get_pathname.c, inode.c, link.c,
unlink.c: Change private to be priv_data (to avoid C++
namespace clash)
1998-01-19 17:47:53 +03:00
|
|
|
#include "ext2_fs.h"
|
1997-04-26 17:58:21 +04:00
|
|
|
#include "ext2fs.h"
|
|
|
|
|
2002-03-12 09:05:06 +03:00
|
|
|
errcode_t ext2fs_read_dir_block2(ext2_filsys fs, blk_t block,
|
2003-12-07 09:28:50 +03:00
|
|
|
void *buf, int flags EXT2FS_ATTR((unused)))
|
1997-04-26 17:58:21 +04:00
|
|
|
{
|
|
|
|
errcode_t retval;
|
|
|
|
char *p, *end;
|
|
|
|
struct ext2_dir_entry *dirent;
|
2002-03-12 09:05:06 +03:00
|
|
|
unsigned int name_len, rec_len, do_swap;
|
|
|
|
|
1997-04-26 17:58:21 +04:00
|
|
|
|
|
|
|
retval = io_channel_read_blk(fs->io, block, 1, buf);
|
|
|
|
if (retval)
|
|
|
|
return retval;
|
ChangeLog, Makefile.in, swapfs.c, unix.c:
Makefile.in: Add message.c and swapfs.c to the list of source files to
build the make depend.
swapfs.c, unix.c: Only support the -s and -S options to e2fsck if
ENABLE_SWAPFS is defined.
Many files:
ext2fs.h, bitops.h, block.c, bmap.c, closefs.c, dirblock.c, inode.c,
native.c, openfs.c, rw_bitmaps.c, swapfs.c: Only include the
byte-swapping logic if ENABLE_SWAPFS is turned on or if we're on a
big-endian machine.
initialize.c (ext2fs_initialize):Use WORDS_BIGENDIAN directly to set
EXT2_FLAG_SWAP_BYTES, instead of using ext2fs_native_flag.
native.c (ext2fs_native_flag): Use WORDS_BIGENDIAN provided by
autoconf to determine whether or not return EXT2_FLAG_SWAP_BYTES.
2001-06-11 11:00:04 +04:00
|
|
|
#ifdef EXT2FS_ENABLE_SWAPFS
|
2001-05-05 09:12:14 +04:00
|
|
|
do_swap = (fs->flags & (EXT2_FLAG_SWAP_BYTES|
|
|
|
|
EXT2_FLAG_SWAP_BYTES_READ)) != 0;
|
ChangeLog, Makefile.in, swapfs.c, unix.c:
Makefile.in: Add message.c and swapfs.c to the list of source files to
build the make depend.
swapfs.c, unix.c: Only support the -s and -S options to e2fsck if
ENABLE_SWAPFS is defined.
Many files:
ext2fs.h, bitops.h, block.c, bmap.c, closefs.c, dirblock.c, inode.c,
native.c, openfs.c, rw_bitmaps.c, swapfs.c: Only include the
byte-swapping logic if ENABLE_SWAPFS is turned on or if we're on a
big-endian machine.
initialize.c (ext2fs_initialize):Use WORDS_BIGENDIAN directly to set
EXT2_FLAG_SWAP_BYTES, instead of using ext2fs_native_flag.
native.c (ext2fs_native_flag): Use WORDS_BIGENDIAN provided by
autoconf to determine whether or not return EXT2_FLAG_SWAP_BYTES.
2001-06-11 11:00:04 +04:00
|
|
|
#endif
|
Many files:
inode.c (ext2fs_open_inode_scan): Initialize the group variables
so that we don't need to call get_next_blockgroup() the first
time around. Saves a bit of time, and prevents us from
needing to assign -1 to current_group (which is an unsigned
value).
icount.c (insert_icount_el): Cast the estimated number of inodes
from a float to an ino_t.
alloc.c, alloc_tables.c, badlbocks.c, bb_compat.c, bb_inode.c,
bitmaps.c, bitops.c, block.c, bmap.c, bmove.c, brel_ma.c,
check_desc.c, closefs.c, cmp_bitmaps.c, dblist.c,
dblist_dir.c, dir_iterate.c, dirblock.c, dupfs.c, expanddir.c,
ext2fs.h, fileio.c, freefs.c, get_pathname.c, getsize.c,
icount.c, initialize.c, inline.c, inode.c, irel_ma.c,
ismounted.c, link.c, lookup.c, mkdir.c, namei.c, native.c,
newdir.c, openfs.c, read_bb.c, read_bb_file.c, rs_bitmap.c,
rw_bitmaps.c, swapfs.c, test_io.c, tst_badblocks.c,
tst_getsize.c, tst_iscan.c, unix_io.c, unlink.c, valid_blk.c,
version.c: If EXT2_FLAT_INCLUDES is defined, then assume all
of the ext2-specific header files are in a flat directory.
block.c, bmove.c, dirblock.c, fileio.c: Explicitly cast
all assignments from void * to be compatible with C++.
closefs.c (ext2fs_flush): Add a call to io_channel_flush() to
make sure the contents of the disk are flushed to disk.
dblist.c (ext2fs_add_dir_block): Change new to be new_entry to
avoid C++ namespace clash.
bitmaps.c (ext2fs_copy_bitmap): Change new to be new_map to
avoid C++ namespace clash.
ext2fs.h, bb_inode.c, block.c, bmove.c, brel.h, brel_ma.c,
irel.h, irel_ma.c, dblist.c, dblist_dir.c, dir_iterate.c,
ext2fsP.h, expanddir.c, get_pathname.c, inode.c, link.c,
unlink.c: Change private to be priv_data (to avoid C++
namespace clash)
1998-01-19 17:47:53 +03:00
|
|
|
p = (char *) buf;
|
1997-04-26 17:58:21 +04:00
|
|
|
end = (char *) buf + fs->blocksize;
|
2001-01-06 01:27:06 +03:00
|
|
|
while (p < end-8) {
|
2001-05-05 20:21:48 +04:00
|
|
|
dirent = (struct ext2_dir_entry *) p;
|
ChangeLog, Makefile.in, swapfs.c, unix.c:
Makefile.in: Add message.c and swapfs.c to the list of source files to
build the make depend.
swapfs.c, unix.c: Only support the -s and -S options to e2fsck if
ENABLE_SWAPFS is defined.
Many files:
ext2fs.h, bitops.h, block.c, bmap.c, closefs.c, dirblock.c, inode.c,
native.c, openfs.c, rw_bitmaps.c, swapfs.c: Only include the
byte-swapping logic if ENABLE_SWAPFS is turned on or if we're on a
big-endian machine.
initialize.c (ext2fs_initialize):Use WORDS_BIGENDIAN directly to set
EXT2_FLAG_SWAP_BYTES, instead of using ext2fs_native_flag.
native.c (ext2fs_native_flag): Use WORDS_BIGENDIAN provided by
autoconf to determine whether or not return EXT2_FLAG_SWAP_BYTES.
2001-06-11 11:00:04 +04:00
|
|
|
#ifdef EXT2FS_ENABLE_SWAPFS
|
2001-05-05 09:12:14 +04:00
|
|
|
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);
|
|
|
|
}
|
2002-03-12 09:05:06 +03:00
|
|
|
#endif
|
|
|
|
name_len = dirent->name_len;
|
|
|
|
#ifdef WORDS_BIGENDIAN
|
|
|
|
if (flags & EXT2_DIRBLOCK_V2_STRUCT)
|
|
|
|
dirent->name_len = ext2fs_swab16(dirent->name_len);
|
ChangeLog, Makefile.in, swapfs.c, unix.c:
Makefile.in: Add message.c and swapfs.c to the list of source files to
build the make depend.
swapfs.c, unix.c: Only support the -s and -S options to e2fsck if
ENABLE_SWAPFS is defined.
Many files:
ext2fs.h, bitops.h, block.c, bmap.c, closefs.c, dirblock.c, inode.c,
native.c, openfs.c, rw_bitmaps.c, swapfs.c: Only include the
byte-swapping logic if ENABLE_SWAPFS is turned on or if we're on a
big-endian machine.
initialize.c (ext2fs_initialize):Use WORDS_BIGENDIAN directly to set
EXT2_FLAG_SWAP_BYTES, instead of using ext2fs_native_flag.
native.c (ext2fs_native_flag): Use WORDS_BIGENDIAN provided by
autoconf to determine whether or not return EXT2_FLAG_SWAP_BYTES.
2001-06-11 11:00:04 +04:00
|
|
|
#endif
|
2001-05-05 09:12:14 +04:00
|
|
|
rec_len = dirent->rec_len;
|
|
|
|
if ((rec_len < 8) || (rec_len % 4)) {
|
|
|
|
rec_len = 8;
|
|
|
|
retval = EXT2_ET_DIR_CORRUPTED;
|
|
|
|
}
|
2002-03-12 09:05:06 +03:00
|
|
|
if (((name_len & 0xFF) + 8) > dirent->rec_len)
|
2001-05-05 09:12:14 +04:00
|
|
|
retval = EXT2_ET_DIR_CORRUPTED;
|
|
|
|
p += rec_len;
|
1997-04-26 17:58:21 +04:00
|
|
|
}
|
2001-05-05 09:12:14 +04:00
|
|
|
return retval;
|
1997-04-26 17:58:21 +04:00
|
|
|
}
|
|
|
|
|
2002-03-12 09:05:06 +03:00
|
|
|
errcode_t ext2fs_read_dir_block(ext2_filsys fs, blk_t block,
|
|
|
|
void *buf)
|
1997-04-26 17:58:21 +04:00
|
|
|
{
|
2002-03-12 09:05:06 +03:00
|
|
|
return ext2fs_read_dir_block2(fs, block, buf, 0);
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
errcode_t ext2fs_write_dir_block2(ext2_filsys fs, blk_t block,
|
2003-12-07 09:28:50 +03:00
|
|
|
void *inbuf, int flags EXT2FS_ATTR((unused)))
|
2002-03-12 09:05:06 +03:00
|
|
|
{
|
|
|
|
#ifdef EXT2FS_ENABLE_SWAPFS
|
|
|
|
int do_swap = 0;
|
1997-04-26 17:58:21 +04:00
|
|
|
errcode_t retval;
|
2002-03-12 09:05:06 +03:00
|
|
|
char *p, *end;
|
1997-04-26 17:58:21 +04:00
|
|
|
char *buf = 0;
|
|
|
|
struct ext2_dir_entry *dirent;
|
|
|
|
|
1997-04-29 19:29:49 +04:00
|
|
|
if ((fs->flags & EXT2_FLAG_SWAP_BYTES) ||
|
2002-03-12 09:05:06 +03:00
|
|
|
(fs->flags & EXT2_FLAG_SWAP_BYTES_WRITE))
|
|
|
|
do_swap = 1;
|
|
|
|
|
|
|
|
#ifndef WORDS_BIGENDIAN
|
|
|
|
if (!do_swap)
|
|
|
|
return io_channel_write_blk(fs->io, block, 1, (char *) inbuf);
|
|
|
|
#endif
|
|
|
|
|
2003-08-01 17:41:07 +04:00
|
|
|
retval = ext2fs_get_mem(fs->blocksize, &buf);
|
2002-03-12 09:05:06 +03:00
|
|
|
if (retval)
|
|
|
|
return retval;
|
|
|
|
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)) {
|
2003-08-01 17:41:07 +04:00
|
|
|
ext2fs_free_mem(&buf);
|
2002-03-12 09:05:06 +03:00
|
|
|
return (EXT2_ET_DIR_CORRUPTED);
|
|
|
|
}
|
|
|
|
p += dirent->rec_len;
|
|
|
|
if (do_swap) {
|
1997-04-26 17:58:21 +04:00
|
|
|
dirent->inode = ext2fs_swab32(dirent->inode);
|
|
|
|
dirent->rec_len = ext2fs_swab16(dirent->rec_len);
|
|
|
|
dirent->name_len = ext2fs_swab16(dirent->name_len);
|
|
|
|
}
|
2002-03-12 09:05:06 +03:00
|
|
|
#ifdef WORDS_BIGENDIAN
|
|
|
|
if (flags & EXT2_DIRBLOCK_V2_STRUCT)
|
|
|
|
dirent->name_len = ext2fs_swab16(dirent->name_len);
|
ChangeLog, Makefile.in, swapfs.c, unix.c:
Makefile.in: Add message.c and swapfs.c to the list of source files to
build the make depend.
swapfs.c, unix.c: Only support the -s and -S options to e2fsck if
ENABLE_SWAPFS is defined.
Many files:
ext2fs.h, bitops.h, block.c, bmap.c, closefs.c, dirblock.c, inode.c,
native.c, openfs.c, rw_bitmaps.c, swapfs.c: Only include the
byte-swapping logic if ENABLE_SWAPFS is turned on or if we're on a
big-endian machine.
initialize.c (ext2fs_initialize):Use WORDS_BIGENDIAN directly to set
EXT2_FLAG_SWAP_BYTES, instead of using ext2fs_native_flag.
native.c (ext2fs_native_flag): Use WORDS_BIGENDIAN provided by
autoconf to determine whether or not return EXT2_FLAG_SWAP_BYTES.
2001-06-11 11:00:04 +04:00
|
|
|
#endif
|
2002-03-12 09:05:06 +03:00
|
|
|
}
|
|
|
|
retval = io_channel_write_blk(fs->io, block, 1, buf);
|
2003-08-01 17:41:07 +04:00
|
|
|
ext2fs_free_mem(&buf);
|
1997-04-26 17:58:21 +04:00
|
|
|
return retval;
|
2002-03-12 09:05:06 +03:00
|
|
|
#else
|
|
|
|
return io_channel_write_blk(fs->io, block, 1, (char *) inbuf);
|
|
|
|
#endif
|
1997-04-26 17:58:21 +04:00
|
|
|
}
|
|
|
|
|
|
|
|
|
2002-03-12 09:05:06 +03:00
|
|
|
errcode_t ext2fs_write_dir_block(ext2_filsys fs, blk_t block,
|
|
|
|
void *inbuf)
|
|
|
|
{
|
|
|
|
return ext2fs_write_dir_block2(fs, block, inbuf, 0);
|
|
|
|
}
|
|
|
|
|