Whamcloud - gitweb
git://git.whamcloud.com
/
tools
/
e2fsprogs.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
e2fsprogs: remove checker infrastructure
[tools/e2fsprogs.git]
/
lib
/
ext2fs
/
dir_iterate.c
diff --git
a/lib/ext2fs/dir_iterate.c
b/lib/ext2fs/dir_iterate.c
index
39d713b
..
589af69
100644
(file)
--- a/
lib/ext2fs/dir_iterate.c
+++ b/
lib/ext2fs/dir_iterate.c
@@
-4,11
+4,12
@@
* Copyright (C) 1993, 1994, 1994, 1995, 1996, 1997 Theodore Ts'o.
*
* %Begin-Header%
* Copyright (C) 1993, 1994, 1994, 1995, 1996, 1997 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%
*/
* %End-Header%
*/
+#include "config.h"
#include <stdio.h>
#include <string.h>
#if HAVE_UNISTD_H
#include <stdio.h>
#include <string.h>
#if HAVE_UNISTD_H
@@
-29,7
+30,9
@@
errcode_t ext2fs_get_rec_len(ext2_filsys fs,
{
unsigned int len = dirent->rec_len;
{
unsigned int len = dirent->rec_len;
- if (len == EXT4_MAX_REC_LEN || len == 0)
+ if (fs->blocksize < 65536)
+ *rec_len = len;
+ else if (len == EXT4_MAX_REC_LEN || len == 0)
*rec_len = fs->blocksize;
else
*rec_len = (len & 65532) | ((len & 3) << 16);
*rec_len = fs->blocksize;
else
*rec_len = (len & 65532) | ((len & 3) << 16);
@@
-80,7
+83,7
@@
static int ext2fs_validate_entry(ext2_filsys fs, char *buf,
offset += rec_len;
if ((rec_len < 8) ||
((rec_len % 4) != 0) ||
offset += rec_len;
if ((rec_len < 8) ||
((rec_len % 4) != 0) ||
- (((dirent->name_len & 0xFF)+8) > rec_len))
+ (((
(unsigned)
dirent->name_len & 0xFF)+8) > rec_len))
return 0;
}
return (offset == final_offset);
return 0;
}
return (offset == final_offset);
@@
-120,7
+123,7
@@
errcode_t ext2fs_dir_iterate2(ext2_filsys fs,
ctx.func = func;
ctx.priv_data = priv_data;
ctx.errcode = 0;
ctx.func = func;
ctx.priv_data = priv_data;
ctx.errcode = 0;
- retval = ext2fs_block_iterate
2
(fs, dir, BLOCK_FLAG_READ_ONLY, 0,
+ retval = ext2fs_block_iterate
3
(fs, dir, BLOCK_FLAG_READ_ONLY, 0,
ext2fs_process_dir_block, &ctx);
if (!block_buf)
ext2fs_free_mem(&ctx.buf);
ext2fs_process_dir_block, &ctx);
if (!block_buf)
ext2fs_free_mem(&ctx.buf);
@@
-148,16
+151,16
@@
static int xlate_func(ext2_ino_t dir EXT2FS_ATTR((unused)),
return (*xl->func)(dirent, offset, blocksize, buf, xl->real_private);
}
return (*xl->func)(dirent, offset, blocksize, buf, xl->real_private);
}
-e
xtern e
rrcode_t ext2fs_dir_iterate(ext2_filsys fs,
-
ext2_ino_t dir,
-
int flags,
-
char *block_buf,
-
int (*func)(struct ext2_dir_entry *dirent,
-
int
offset,
-
int
blocksize,
-
char
*buf,
-
void
*priv_data),
-
void *priv_data)
+errcode_t ext2fs_dir_iterate(ext2_filsys fs,
+ ext2_ino_t dir,
+ int flags,
+ char *block_buf,
+ int (*func)(struct ext2_dir_entry *dirent,
+
int
offset,
+
int
blocksize,
+
char
*buf,
+
void
*priv_data),
+ void *priv_data)
{
struct xlate xl;
{
struct xlate xl;
@@
-174,9
+177,9
@@
extern errcode_t ext2fs_dir_iterate(ext2_filsys fs,
* ext2fs_dir_iterate() and ext2fs_dblist_dir_iterate()
*/
int ext2fs_process_dir_block(ext2_filsys fs,
* ext2fs_dir_iterate() and ext2fs_dblist_dir_iterate()
*/
int ext2fs_process_dir_block(ext2_filsys fs,
- blk
_t
*blocknr,
+ blk
64_t
*blocknr,
e2_blkcnt_t blockcnt,
e2_blkcnt_t blockcnt,
- blk
_t
ref_block EXT2FS_ATTR((unused)),
+ blk
64_t
ref_block EXT2FS_ATTR((unused)),
int ref_offset EXT2FS_ATTR((unused)),
void *priv_data)
{
int ref_offset EXT2FS_ATTR((unused)),
void *priv_data)
{
@@
-186,8
+189,8
@@
int ext2fs_process_dir_block(ext2_filsys fs,
int ret = 0;
int changed = 0;
int do_abort = 0;
int ret = 0;
int changed = 0;
int do_abort = 0;
- unsigned int rec_len;
- int entry
, size
;
+ unsigned int rec_len
, size
;
+ int entry;
struct ext2_dir_entry *dirent;
if (blockcnt < 0)
struct ext2_dir_entry *dirent;
if (blockcnt < 0)
@@
-195,7
+198,7
@@
int ext2fs_process_dir_block(ext2_filsys fs,
entry = blockcnt ? DIRENT_OTHER_FILE : DIRENT_DOT_FILE;
entry = blockcnt ? DIRENT_OTHER_FILE : DIRENT_DOT_FILE;
- ctx->errcode = ext2fs_read_dir_block
(fs, *blocknr, ctx->buf
);
+ ctx->errcode = ext2fs_read_dir_block
3(fs, *blocknr, ctx->buf, 0
);
if (ctx->errcode)
return BLOCK_ABORT;
if (ctx->errcode)
return BLOCK_ABORT;
@@
-206,7
+209,7
@@
int ext2fs_process_dir_block(ext2_filsys fs,
if (((offset + rec_len) > fs->blocksize) ||
(rec_len < 8) ||
((rec_len % 4) != 0) ||
if (((offset + rec_len) > fs->blocksize) ||
(rec_len < 8) ||
((rec_len % 4) != 0) ||
- (((dirent->name_len & 0xFF)+8) > rec_len)) {
+ (((
(unsigned)
dirent->name_len & 0xFF)+8) > rec_len)) {
ctx->errcode = EXT2_ET_DIR_CORRUPTED;
return BLOCK_ABORT;
}
ctx->errcode = EXT2_ET_DIR_CORRUPTED;
return BLOCK_ABORT;
}
@@
-256,7
+259,8
@@
next:
}
if (changed) {
}
if (changed) {
- ctx->errcode = ext2fs_write_dir_block(fs, *blocknr, ctx->buf);
+ ctx->errcode = ext2fs_write_dir_block3(fs, *blocknr, ctx->buf,
+ 0);
if (ctx->errcode)
return BLOCK_ABORT;
}
if (ctx->errcode)
return BLOCK_ABORT;
}