vitalif
/
e2fsprogs
mirror of https://github.com/vitalif/e2fsprogs
1
0
Fork 0
Code Issues Releases Wiki Activity

e2fuzz: fix build problems on macosx and i386 linux 

Fix clang warnings about forgotten header files, dead code, and pwrite
support on OS X.  The unistd.h inclusion also fixes a parameter
truncation bug on i386.

Signed-off-by: Darrick J. Wong <darrick.wong@oracle.com>
Signed-off-by: Theodore Ts'o <tytso@mit.edu>
crypto
Darrick J. Wong 2014-08-10 18:21:14 -04:00 committed by Theodore Ts'o
parent 489ff4a2c7
commit 0165cfadfa
1 changed files with 13 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
misc/e2fuzz.c
View File

@ -18,6 +18,7 @@
#include <sys/stat.h>
#include <fcntl.h>
#include <stdint.h>
#include <unistd.h>
#ifdef HAVE_GETOPT_H
#include <getopt.h>
#endif
@ -31,6 +32,16 @@ static int metadata_only = 1;
static unsigned long long user_corrupt_bytes = 0;
static double user_corrupt_pct = 0.0;
#ifndef HAVE_PWRITE
ssize_t pwrite(int fd, const void *buf, size_t count, off_t offset)
{
if (lseek(fd, offset, SEEK_SET) < 0)
return 0;
return write(fd, buf, count);
}
#endif /* HAVE_PWRITE */
int getseed(void)
{
int r;
@ -70,7 +81,7 @@ errcode_t find_metadata_blocks(ext2_filsys fs, ext2fs_block_bitmap bmap,
off_t *corrupt_bytes)
{
dgrp_t i;
blk64_t b, c, d, j, old_desc_blocks;
blk64_t b, c;
ext2_inode_scan scan;
ext2_ino_t ino;
struct ext2_inode inode;
@ -79,12 +90,6 @@ errcode_t find_metadata_blocks(ext2_filsys fs, ext2fs_block_bitmap bmap,
*corrupt_bytes = 0;
fb.corrupt_blocks = 0;
if (EXT2_HAS_INCOMPAT_FEATURE(fs->super,
EXT2_FEATURE_INCOMPAT_META_BG))
old_desc_blocks = fs->super->s_first_meta_bg;
else
old_desc_blocks = fs->desc_blocks +
fs->super->s_reserved_gdt_blocks;
/* Construct bitmaps of super/descriptor blocks */
for (i = 0; i < fs->group_desc_count; i++) {
@ -271,7 +276,7 @@ int process_fs(const char *fsname)
off % fs->blocksize, off / fs->blocksize, c);
if (dryrun)
continue;
if (pwrite64(fd, &c, sizeof(c), off) != sizeof(c)) {
if (pwrite(fd, &c, sizeof(c), off) != sizeof(c)) {
perror(fsname);
goto fail3;
}