ericonr
/
util-linux
mirror of https://github.com/ericonr/util-linux.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

fsck.cramfs: coding style 

Lots of braces got to be removed, which can cause something to
break even everything is double checked.

Signed-off-by: Sami Kerola <kerolasa@iki.fi>
This commit is contained in:
Sami Kerola 2011-07-20 22:08:48 +02:00
parent fc8dc41054
commit 6ffd9b03f2
1 changed files with 179 additions and 218 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

397
disk-utils/fsck.cramfs.c
View File

@ -79,7 +79,7 @@ struct cramfs_super super; /* just find the cramfs superblock once */
static int cramfs_is_big_endian = 0; /* source is big endian */ static int cramfs_is_big_endian = 0; /* source is big endian */
static int opt_verbose = 0; /* 1 = verbose (-v), 2+ = very verbose (-vv) */ static int opt_verbose = 0; /* 1 = verbose (-v), 2+ = very verbose (-vv) */
char *extract_dir = ""; /* extraction directory (-x) */ char *extract_dir = ""; /* extraction directory (-x) */
#define PAD_SIZE 512 #define PAD_SIZE 512
@ -87,19 +87,19 @@ char *extract_dir = ""; /* extraction directory (-x) */
static int opt_extract = 0; /* extract cramfs (-x) */ static int opt_extract = 0; /* extract cramfs (-x) */
static uid_t euid; /* effective UID */ static uid_t euid; /* effective UID */
/* (cramfs_super + start) <= start_dir < end_dir <= start_data <= end_data */ /* (cramfs_super + start) <= start_dir < end_dir <= start_data <= end_data */
static unsigned long start_dir = ~0UL; /* start of first non-root inode */ static unsigned long start_dir = ~0UL; /* start of first non-root inode */
static unsigned long end_dir = 0; /* end of the directory structure */ static unsigned long end_dir = 0; /* end of the directory structure */
static unsigned long start_data = ~0UL; /* start of the data (256 MB = max) */ static unsigned long start_data = ~0UL; /* start of the data (256 MB = max) */
static unsigned long end_data = 0; /* end of the data */ static unsigned long end_data = 0; /* end of the data */
/* Guarantee access to at least 8kB at a time */ /* Guarantee access to at least 8kB at a time */
#define ROMBUFFER_BITS 13 #define ROMBUFFER_BITS 13
#define ROMBUFFERSIZE (1 << ROMBUFFER_BITS) #define ROMBUFFERSIZE (1 << ROMBUFFER_BITS)
#define ROMBUFFERMASK (ROMBUFFERSIZE-1) #define ROMBUFFERMASK (ROMBUFFERSIZE - 1)
static char read_buffer[ROMBUFFERSIZE * 2]; static char read_buffer[ROMBUFFERSIZE * 2];
static unsigned long read_buffer_block = ~0UL; static unsigned long read_buffer_block = ~0UL;
@ -132,93 +132,79 @@ int get_superblock_endianness(uint32_t magic)
if (magic == CRAMFS_MAGIC) { if (magic == CRAMFS_MAGIC) {
cramfs_is_big_endian = HOST_IS_BIG_ENDIAN; cramfs_is_big_endian = HOST_IS_BIG_ENDIAN;
return 0; return 0;
} } else if (magic ==
else if (magic == u32_toggle_endianness(!HOST_IS_BIG_ENDIAN, CRAMFS_MAGIC)) { u32_toggle_endianness(!HOST_IS_BIG_ENDIAN, CRAMFS_MAGIC)) {
cramfs_is_big_endian = !HOST_IS_BIG_ENDIAN; cramfs_is_big_endian = !HOST_IS_BIG_ENDIAN;
return 0; return 0;
} } else
else {
return -1; return -1;
}
} }
static void test_super(int *start, size_t *length) { static void test_super(int *start, size_t * length)
{
struct stat st; struct stat st;
/* find the physical size of the file or block device */ /* find the physical size of the file or block device */
if (stat(filename, &st) < 0) { if (stat(filename, &st) < 0)
err(FSCK_ERROR, _("stat failed: %s"), filename); err(FSCK_ERROR, _("stat failed: %s"), filename);
}
fd = open(filename, O_RDONLY); fd = open(filename, O_RDONLY);
if (fd < 0) { if (fd < 0)
err(FSCK_ERROR, _("open failed: %s"), filename); err(FSCK_ERROR, _("open failed: %s"), filename);
}
if (S_ISBLK(st.st_mode)) { if (S_ISBLK(st.st_mode)) {
unsigned long long bytes; unsigned long long bytes;
if (blkdev_get_size(fd, &bytes)) { if (blkdev_get_size(fd, &bytes))
err(FSCK_ERROR, _("ioctl failed: unable to determine device size: %s"), filename); err(FSCK_ERROR,
} _("ioctl failed: unable to determine device size: %s"),
filename);
*length = bytes; *length = bytes;
} } else if (S_ISREG(st.st_mode))
else if (S_ISREG(st.st_mode)) {
*length = st.st_size; *length = st.st_size;
} else
else {
errx(FSCK_ERROR, _("not a block device or file: %s"), filename); errx(FSCK_ERROR, _("not a block device or file: %s"), filename);
}
if (*length < sizeof(struct cramfs_super)) { if (*length < sizeof(struct cramfs_super))
errx(FSCK_UNCORRECTED, _("file length too short")); errx(FSCK_UNCORRECTED, _("file length too short"));
}
/* find superblock */ /* find superblock */
if (read(fd, &super, sizeof(super)) != sizeof(super)) { if (read(fd, &super, sizeof(super)) != sizeof(super))
err(FSCK_ERROR, _("read failed: %s"), filename); err(FSCK_ERROR, _("read failed: %s"), filename);
} if (get_superblock_endianness(super.magic) != -1)
if (get_superblock_endianness(super.magic) != -1) {
*start = 0; *start = 0;
}
else if (*length >= (PAD_SIZE + sizeof(super))) { else if (*length >= (PAD_SIZE + sizeof(super))) {
lseek(fd, PAD_SIZE, SEEK_SET); lseek(fd, PAD_SIZE, SEEK_SET);
if (read(fd, &super, sizeof(super)) != sizeof(super)) { if (read(fd, &super, sizeof(super)) != sizeof(super))
err(FSCK_ERROR, _("read failed: %s"), filename); err(FSCK_ERROR, _("read failed: %s"), filename);
} if (get_superblock_endianness(super.magic) != -1)
if (get_superblock_endianness(super.magic) != -1) {
*start = PAD_SIZE; *start = PAD_SIZE;
} else
else {
errx(FSCK_UNCORRECTED, "superblock magic not found"); errx(FSCK_UNCORRECTED, "superblock magic not found");
} } else
}
else {
errx(FSCK_UNCORRECTED, _("superblock magic not found")); errx(FSCK_UNCORRECTED, _("superblock magic not found"));
}
if (opt_verbose) { if (opt_verbose)
printf("cramfs endianness is %s\n", cramfs_is_big_endian ? "big" : "little"); printf("cramfs endianness is %s\n",
} cramfs_is_big_endian ? "big" : "little");
super_toggle_endianness(cramfs_is_big_endian, &super); super_toggle_endianness(cramfs_is_big_endian, &super);
if (super.flags & ~CRAMFS_SUPPORTED_FLAGS) { if (super.flags & ~CRAMFS_SUPPORTED_FLAGS)
errx(FSCK_ERROR, _("unsupported filesystem features")); errx(FSCK_ERROR, _("unsupported filesystem features"));
}
if (super.size < page_size) { if (super.size < page_size)
errx(FSCK_UNCORRECTED, _("superblock size (%d) too small"), super.size); errx(FSCK_UNCORRECTED, _("superblock size (%d) too small"),
} super.size);
if (super.flags & CRAMFS_FLAG_FSID_VERSION_2) { if (super.flags & CRAMFS_FLAG_FSID_VERSION_2) {
if (super.fsid.files == 0) { if (super.fsid.files == 0)
errx(FSCK_UNCORRECTED, _("zero file count")); errx(FSCK_UNCORRECTED, _("zero file count"));
} if (*length < super.size)
if (*length < super.size) {
errx(FSCK_UNCORRECTED, _("file length too short")); errx(FSCK_UNCORRECTED, _("file length too short"));
} else if (*length > super.size)
else if (*length > super.size) { fprintf(stderr,
fprintf(stderr, _("warning: file extends past end of filesystem\n")); _("warning: file extends past end of filesystem\n"));
} } else
}
else {
fprintf(stderr, _("warning: old cramfs format\n")); fprintf(stderr, _("warning: old cramfs format\n"));
}
} }
static void test_crc(int start) static void test_crc(int start)
@ -229,16 +215,19 @@ static void test_crc(int start)
if (!(super.flags & CRAMFS_FLAG_FSID_VERSION_2)) { if (!(super.flags & CRAMFS_FLAG_FSID_VERSION_2)) {
#ifdef INCLUDE_FS_TESTS #ifdef INCLUDE_FS_TESTS
return; return;
#else /* not INCLUDE_FS_TESTS */ #else
errx(FSCK_USAGE, _("unable to test CRC: old cramfs format")); errx(FSCK_USAGE, _("unable to test CRC: old cramfs format"));
#endif /* not INCLUDE_FS_TESTS */ #endif
} }
crc = crc32(0L, Z_NULL, 0); crc = crc32(0L, Z_NULL, 0);
buf = mmap(NULL, super.size, PROT_READ | PROT_WRITE, MAP_PRIVATE, fd, 0); buf =
mmap(NULL, super.size, PROT_READ | PROT_WRITE, MAP_PRIVATE, fd, 0);
if (buf == MAP_FAILED) { if (buf == MAP_FAILED) {
buf = mmap(NULL, super.size, PROT_READ | PROT_WRITE, MAP_PRIVATE | MAP_ANONYMOUS, -1, 0); buf =
mmap(NULL, super.size, PROT_READ | PROT_WRITE,
MAP_PRIVATE | MAP_ANONYMOUS, -1, 0);
if (buf != MAP_FAILED) { if (buf != MAP_FAILED) {
lseek(fd, 0, SEEK_SET); lseek(fd, 0, SEEK_SET);
if (read(fd, buf, super.size) < 0) if (read(fd, buf, super.size) < 0)
@ -246,11 +235,11 @@ static void test_crc(int start)
} }
} }
if (buf != MAP_FAILED) { if (buf != MAP_FAILED) {
((struct cramfs_super *) (buf+start))->fsid.crc = crc32(0L, Z_NULL, 0); ((struct cramfs_super *)(buf + start))->fsid.crc =
crc = crc32(crc, buf+start, super.size-start); crc32(0L, Z_NULL, 0);
crc = crc32(crc, buf + start, super.size - start);
munmap(buf, super.size); munmap(buf, super.size);
} } else {
else {
int retval; int retval;
size_t length = 0; size_t length = 0;
@ -258,18 +247,18 @@ static void test_crc(int start)
lseek(fd, start, SEEK_SET); lseek(fd, start, SEEK_SET);
for (;;) { for (;;) {
retval = read(fd, buf, 4096); retval = read(fd, buf, 4096);
if (retval < 0) { if (retval < 0)
err(FSCK_ERROR, _("read failed: %s"), filename); err(FSCK_ERROR, _("read failed: %s"), filename);
} else if (retval == 0)
else if (retval == 0) {
break; break;
} if (length == 0)
if (length == 0) { ((struct cramfs_super *)buf)->fsid.crc =
((struct cramfs_super *) buf)->fsid.crc = crc32(0L, Z_NULL, 0); crc32(0L, Z_NULL, 0);
}
length += retval; length += retval;
if (length > (super.size-start)) { if (length > (super.size - start)) {
crc = crc32(crc, buf, retval - (length - (super.size-start))); crc = crc32(crc, buf,
retval - (length -
(super.size - start)));
break; break;
} }
crc = crc32(crc, buf, retval); crc = crc32(crc, buf, retval);
@ -277,9 +266,8 @@ static void test_crc(int start)
free(buf); free(buf);
} }
if (crc != super.fsid.crc) { if (crc != super.fsid.crc)
errx(FSCK_UNCORRECTED, _("crc error")); errx(FSCK_UNCORRECTED, _("crc error"));
}
} }
#ifdef INCLUDE_FS_TESTS #ifdef INCLUDE_FS_TESTS
@ -287,14 +275,12 @@ static void print_node(char type, struct cramfs_inode *i, char *name)
{ {
char info[10]; char info[10];
if (S_ISCHR(i->mode) || (S_ISBLK(i->mode))) { if (S_ISCHR(i->mode) || (S_ISBLK(i->mode)))
/* major/minor numbers can be as high as 2^12 or 4096 */ /* major/minor numbers can be as high as 2^12 or 4096 */
snprintf(info, 10, "%4d,%4d", major(i->size), minor(i->size)); snprintf(info, 10, "%4d,%4d", major(i->size), minor(i->size));
} else
else {
/* size be as high as 2^24 or 16777216 */ /* size be as high as 2^24 or 16777216 */
snprintf(info, 10, "%9d", i->size); snprintf(info, 10, "%9d", i->size);
}
printf("%c %04o %s %5d:%-3d %s\n", printf("%c %04o %s %5d:%-3d %s\n",
type, i->mode & ~S_IFMT, info, i->uid, i->gid, type, i->mode & ~S_IFMT, info, i->uid, i->gid,
@ -315,7 +301,7 @@ static void *romfs_read(unsigned long offset)
return read_buffer + (offset & ROMBUFFERMASK); return read_buffer + (offset & ROMBUFFERMASK);
} }
static struct cramfs_inode *cramfs_iget(struct cramfs_inode * i) static struct cramfs_inode *cramfs_iget(struct cramfs_inode *i)
{ {
struct cramfs_inode *inode = xmalloc(sizeof(struct cramfs_inode)); struct cramfs_inode *inode = xmalloc(sizeof(struct cramfs_inode));
@ -338,15 +324,14 @@ static void iput(struct cramfs_inode *inode)
*/ */
static struct cramfs_inode *read_super(void) static struct cramfs_inode *read_super(void)
{ {
struct cramfs_inode * root = cramfs_iget(&super.root); struct cramfs_inode *root = cramfs_iget(&super.root);
unsigned long offset = root->offset << 2; unsigned long offset = root->offset << 2;
if (!S_ISDIR(root->mode)) if (!S_ISDIR(root->mode))
errx(FSCK_UNCORRECTED, _("root inode is not directory")); errx(FSCK_UNCORRECTED, _("root inode is not directory"));
if (!(super.flags & CRAMFS_FLAG_SHIFTED_ROOT_OFFSET) && if (!(super.flags & CRAMFS_FLAG_SHIFTED_ROOT_OFFSET) &&
((offset != sizeof(struct cramfs_super)) && ((offset != sizeof(struct cramfs_super)) &&
(offset != PAD_SIZE + sizeof(struct cramfs_super)))) (offset != PAD_SIZE + sizeof(struct cramfs_super)))) {
{
errx(FSCK_UNCORRECTED, _("bad root offset (%lu)"), offset); errx(FSCK_UNCORRECTED, _("bad root offset (%lu)"), offset);
} }
return root; return root;
@ -359,67 +344,68 @@ static int uncompress_block(void *src, int len)
stream.next_in = src; stream.next_in = src;
stream.avail_in = len; stream.avail_in = len;
stream.next_out = (unsigned char *) outbuffer; stream.next_out = (unsigned char *)outbuffer;
stream.avail_out = page_size*2; stream.avail_out = page_size * 2;
inflateReset(&stream); inflateReset(&stream);
if (len > page_size*2) { if (len > page_size * 2)
errx(FSCK_UNCORRECTED, _("data block too large")); errx(FSCK_UNCORRECTED, _("data block too large"));
}
err = inflate(&stream, Z_FINISH); err = inflate(&stream, Z_FINISH);
if (err != Z_STREAM_END) { if (err != Z_STREAM_END)
errx(FSCK_UNCORRECTED, _("decompression error %p(%d): %s"), errx(FSCK_UNCORRECTED, _("decompression error %p(%d): %s"),
zError(err), src, len); zError(err), src, len);
}
return stream.total_out; return stream.total_out;
} }
#if !HAVE_LCHOWN #if !HAVE_LCHOWN
#define lchown chown #define lchown chown
#endif #endif
static void do_uncompress(char *path, int fd, unsigned long offset, unsigned long size)
static void do_uncompress(char *path, int fd, unsigned long offset,
unsigned long size)
{ {
unsigned long curr = offset + 4 * ((size + page_size - 1) / page_size); unsigned long curr = offset + 4 * ((size + page_size - 1) / page_size);
do { do {
unsigned long out = page_size; unsigned long out = page_size;
unsigned long next = u32_toggle_endianness(cramfs_is_big_endian, *(uint32_t *) romfs_read(offset)); unsigned long next = u32_toggle_endianness(cramfs_is_big_endian,
*(uint32_t *)
romfs_read(offset));
if (next > end_data) { if (next > end_data)
end_data = next; end_data = next;
}
offset += 4; offset += 4;
if (curr == next) { if (curr == next) {
if (opt_verbose > 1) { if (opt_verbose > 1)
printf(_(" hole at %ld (%zd)\n"), curr, page_size); printf(_(" hole at %ld (%zd)\n"), curr,
} page_size);
if (size < page_size) if (size < page_size)
out = size; out = size;
memset(outbuffer, 0x00, out); memset(outbuffer, 0x00, out);
} } else {
else { if (opt_verbose > 1)
if (opt_verbose > 1) { printf(_(" uncompressing block at %ld to %ld (%ld)\n"),
printf(_(" uncompressing block at %ld to %ld (%ld)\n"), curr, next, next - curr); curr, next, next - curr);
}
out = uncompress_block(romfs_read(curr), next - curr); out = uncompress_block(romfs_read(curr), next - curr);
} }
if (size >= page_size) { if (size >= page_size) {
if (out != page_size) { if (out != page_size)
errx(FSCK_UNCORRECTED, _("non-block (%ld) bytes"), out); errx(FSCK_UNCORRECTED,
} _("non-block (%ld) bytes"), out);
} else { } else {
if (out != size) { if (out != size)
errx(FSCK_UNCORRECTED, _("non-size (%ld vs %ld) bytes"), out, size); errx(FSCK_UNCORRECTED,
} _("non-size (%ld vs %ld) bytes"), out,
size);
} }
size -= out; size -= out;
if (opt_extract) { if (opt_extract)
if (write(fd, outbuffer, out) < 0) { if (write(fd, outbuffer, out) < 0)
err(FSCK_ERROR, _("write failed: %s"), path); err(FSCK_ERROR, _("write failed: %s"),
} path);
}
curr = next; curr = next;
} while (size); } while (size);
} }
@ -429,22 +415,17 @@ static void change_file_status(char *path, struct cramfs_inode *i)
struct utimbuf epoch = { 0, 0 }; struct utimbuf epoch = { 0, 0 };
if (euid == 0) { if (euid == 0) {
if (lchown(path, i->uid, i->gid) < 0) { if (lchown(path, i->uid, i->gid) < 0)
err(FSCK_ERROR, _("lchown failed: %s"), path); err(FSCK_ERROR, _("lchown failed: %s"), path);
}
if (S_ISLNK(i->mode)) if (S_ISLNK(i->mode))
return; return;
if ((S_ISUID | S_ISGID) & i->mode) { if (((S_ISUID | S_ISGID) & i->mode) && chmod(path, i->mode) < 0)
if (chmod(path, i->mode) < 0) { err(FSCK_ERROR, _("chown failed: %s"), path);
err(FSCK_ERROR, _("chown failed: %s"), path);
}
}
} }
if (S_ISLNK(i->mode)) if (S_ISLNK(i->mode))
return; return;
if (utime(path, &epoch) < 0) { if (utime(path, &epoch) < 0)
err(FSCK_ERROR, _("utime failed: %s"), path); err(FSCK_ERROR, _("utime failed: %s"), path);
}
} }
static void do_directory(char *path, struct cramfs_inode *i) static void do_directory(char *path, struct cramfs_inode *i)
@ -454,23 +435,24 @@ static void do_directory(char *path, struct cramfs_inode *i)
unsigned long offset = i->offset << 2; unsigned long offset = i->offset << 2;
char *newpath = xmalloc(pathlen + 256); char *newpath = xmalloc(pathlen + 256);
if (offset == 0 && count != 0) { if (offset == 0 && count != 0)
errx(FSCK_UNCORRECTED, _("directory inode has zero offset and non-zero size: %s"), path); errx(FSCK_UNCORRECTED,
} _("directory inode has zero offset and non-zero size: %s"),
if (offset != 0 && offset < start_dir) { path);
if (offset != 0 && offset < start_dir)
start_dir = offset; start_dir = offset;
}
/* TODO: Do we need to check end_dir for empty case? */ /* TODO: Do we need to check end_dir for empty case? */
memcpy(newpath, path, pathlen); memcpy(newpath, path, pathlen);
newpath[pathlen] = '/'; newpath[pathlen] = '/';
pathlen++; pathlen++;
if (opt_verbose) { if (opt_verbose)
print_node('d', i, path); print_node('d', i, path);
}
if (opt_extract) { if (opt_extract) {
if (mkdir(path, i->mode) < 0) { if (mkdir(path, i->mode) < 0)
err(FSCK_ERROR, _("mkdir failed: %s"), path); err(FSCK_ERROR, _("mkdir failed: %s"), path);
}
change_file_status(path, i); change_file_status(path, i);
} }
while (count > 0) { while (count > 0) {
@ -485,23 +467,19 @@ static void do_directory(char *path, struct cramfs_inode *i)
memcpy(newpath + pathlen, romfs_read(offset), newlen); memcpy(newpath + pathlen, romfs_read(offset), newlen);
newpath[pathlen + newlen] = 0; newpath[pathlen + newlen] = 0;
if (newlen == 0) { if (newlen == 0)
errx(FSCK_UNCORRECTED, _("filename length is zero")); errx(FSCK_UNCORRECTED, _("filename length is zero"));
} if ((pathlen + newlen) - strlen(newpath) > 3)
if ((pathlen + newlen) - strlen(newpath) > 3) {
errx(FSCK_UNCORRECTED, _("bad filename length")); errx(FSCK_UNCORRECTED, _("bad filename length"));
}
expand_fs(newpath, child); expand_fs(newpath, child);
offset += newlen; offset += newlen;
if (offset <= start_dir) { if (offset <= start_dir)
errx(FSCK_UNCORRECTED, _("bad inode offset")); errx(FSCK_UNCORRECTED, _("bad inode offset"));
} if (offset > end_dir)
if (offset > end_dir) {
end_dir = offset; end_dir = offset;
} iput(child); /* free(child) */
iput(child); /* free(child) */
} }
free(newpath); free(newpath);
} }
@ -511,27 +489,23 @@ static void do_file(char *path, struct cramfs_inode *i)
unsigned long offset = i->offset << 2; unsigned long offset = i->offset << 2;
int fd = 0; int fd = 0;
if (offset == 0 && i->size != 0) { if (offset == 0 && i->size != 0)
errx(FSCK_UNCORRECTED, _("file inode has zero offset and non-zero size")); errx(FSCK_UNCORRECTED,
} _("file inode has zero offset and non-zero size"));
if (i->size == 0 && offset != 0) { if (i->size == 0 && offset != 0)
errx(FSCK_UNCORRECTED, _("file inode has zero size and non-zero offset")); errx(FSCK_UNCORRECTED,
} _("file inode has zero size and non-zero offset"));
if (offset != 0 && offset < start_data) { if (offset != 0 && offset < start_data)
start_data = offset; start_data = offset;
} if (opt_verbose)
if (opt_verbose) {
print_node('f', i, path); print_node('f', i, path);
}
if (opt_extract) { if (opt_extract) {
fd = open(path, O_WRONLY | O_CREAT | O_TRUNC, i->mode); fd = open(path, O_WRONLY | O_CREAT | O_TRUNC, i->mode);
if (fd < 0) { if (fd < 0)
err(FSCK_ERROR, _("open failed: %s"), path); err(FSCK_ERROR, _("open failed: %s"), path);
}
} }
if (i->size) { if (i->size)
do_uncompress(path, fd, offset, i->size); do_uncompress(path, fd, offset, i->size);
}
if (opt_extract) { if (opt_extract) {
close(fd); close(fd);
change_file_status(path, i); change_file_status(path, i);
@ -542,42 +516,38 @@ static void do_symlink(char *path, struct cramfs_inode *i)
{ {
unsigned long offset = i->offset << 2; unsigned long offset = i->offset << 2;
unsigned long curr = offset + 4; unsigned long curr = offset + 4;
unsigned long next = u32_toggle_endianness(cramfs_is_big_endian, *(uint32_t *) romfs_read(offset)); unsigned long next =
u32_toggle_endianness(cramfs_is_big_endian,
*(uint32_t *) romfs_read(offset));
unsigned long size; unsigned long size;
if (offset == 0) { if (offset == 0)
errx(FSCK_UNCORRECTED, _("symbolic link has zero offset")); errx(FSCK_UNCORRECTED, _("symbolic link has zero offset"));
} if (i->size == 0)
if (i->size == 0) {
errx(FSCK_UNCORRECTED, _("symbolic link has zero size")); errx(FSCK_UNCORRECTED, _("symbolic link has zero size"));
}
if (offset < start_data) { if (offset < start_data)
start_data = offset; start_data = offset;
} if (next > end_data)
if (next > end_data) {
end_data = next; end_data = next;
}
size = uncompress_block(romfs_read(curr), next - curr); size = uncompress_block(romfs_read(curr), next - curr);
if (size != i->size) { if (size != i->size)
errx(FSCK_UNCORRECTED, _("size error in symlink: %s"), path); errx(FSCK_UNCORRECTED, _("size error in symlink: %s"), path);
}
outbuffer[size] = 0; outbuffer[size] = 0;
if (opt_verbose) { if (opt_verbose) {
char *str; char *str;
asprintf(&str, "%s -> %s", path, outbuffer); asprintf(&str, "%s -> %s", path, outbuffer);
print_node('l', i, str); print_node('l', i, str);
if (opt_verbose > 1) { if (opt_verbose > 1)
printf(_(" uncompressing block at %ld to %ld (%ld)\n"), curr, next, next - curr); printf(_(" uncompressing block at %ld to %ld (%ld)\n"),
} curr, next, next - curr);
free(str); free(str);
} }
if (opt_extract) { if (opt_extract) {
if (symlink(outbuffer, path) < 0) { if (symlink(outbuffer, path) < 0)
err(FSCK_ERROR, _("symlink failed: %s"), path); err(FSCK_ERROR, _("symlink failed: %s"), path);
}
change_file_status(path, i); change_file_status(path, i);
} }
} }
@ -587,60 +557,52 @@ static void do_special_inode(char *path, struct cramfs_inode *i)
dev_t devtype = 0; dev_t devtype = 0;
char type; char type;
if (i->offset) { /* no need to shift offset */ if (i->offset)
errx(FSCK_UNCORRECTED, _("special file has non-zero offset: %s"), path); /* no need to shift offset */
} errx(FSCK_UNCORRECTED,
_("special file has non-zero offset: %s"), path);
if (S_ISCHR(i->mode)) { if (S_ISCHR(i->mode)) {
devtype = i->size; devtype = i->size;
type = 'c'; type = 'c';
} } else if (S_ISBLK(i->mode)) {
else if (S_ISBLK(i->mode)) {
devtype = i->size; devtype = i->size;
type = 'b'; type = 'b';
} } else if (S_ISFIFO(i->mode)) {
else if (S_ISFIFO(i->mode)) { if (i->size != 0)
if (i->size != 0) { errx(FSCK_UNCORRECTED, _("fifo has non-zero size: %s"),
errx(FSCK_UNCORRECTED, _("fifo has non-zero size: %s"), path); path);
}
type = 'p'; type = 'p';
} } else if (S_ISSOCK(i->mode)) {
else if (S_ISSOCK(i->mode)) { if (i->size != 0)
if (i->size != 0) { errx(FSCK_UNCORRECTED,
errx(FSCK_UNCORRECTED, _("socket has non-zero size: %s"), path); _("socket has non-zero size: %s"), path);
}
type = 's'; type = 's';
} } else {
else {
errx(FSCK_UNCORRECTED, _("bogus mode: %s (%o)"), path, i->mode); errx(FSCK_UNCORRECTED, _("bogus mode: %s (%o)"), path, i->mode);
return; /* not reached */ return; /* not reached */
} }
if (opt_verbose) { if (opt_verbose)
print_node(type, i, path); print_node(type, i, path);
}
if (opt_extract) { if (opt_extract) {
if (mknod(path, i->mode, devtype) < 0) { if (mknod(path, i->mode, devtype) < 0)
err(FSCK_ERROR, _("mknod failed: %s"), path); err(FSCK_ERROR, _("mknod failed: %s"), path);
}
change_file_status(path, i); change_file_status(path, i);
} }
} }
static void expand_fs(char *path, struct cramfs_inode *inode) static void expand_fs(char *path, struct cramfs_inode *inode)
{ {
if (S_ISDIR(inode->mode)) { if (S_ISDIR(inode->mode))
do_directory(path, inode); do_directory(path, inode);
} else if (S_ISREG(inode->mode))
else if (S_ISREG(inode->mode)) {
do_file(path, inode); do_file(path, inode);
} else if (S_ISLNK(inode->mode))
else if (S_ISLNK(inode->mode)) {
do_symlink(path, inode); do_symlink(path, inode);
} else
else {
do_special_inode(path, inode); do_special_inode(path, inode);
}
} }
static void test_fs(int start) static void test_fs(int start)
@ -656,18 +618,19 @@ static void test_fs(int start)
expand_fs(extract_dir, root); expand_fs(extract_dir, root);
inflateEnd(&stream); inflateEnd(&stream);
if (start_data != ~0UL) { if (start_data != ~0UL) {
if (start_data < (sizeof(struct cramfs_super) + start)) { if (start_data < (sizeof(struct cramfs_super) + start))
errx(FSCK_UNCORRECTED, _("directory data start (%ld) < sizeof(struct cramfs_super) + start (%ld)"), start_data, sizeof(struct cramfs_super) + start); errx(FSCK_UNCORRECTED,
} _("directory data start (%ld) < sizeof(struct cramfs_super) + start (%ld)"),
if (end_dir != start_data) { start_data, sizeof(struct cramfs_super) + start);
errx(FSCK_UNCORRECTED, _("directory data end (%ld) != file data start (%ld)"), end_dir, start_data); if (end_dir != start_data)
} errx(FSCK_UNCORRECTED,
_("directory data end (%ld) != file data start (%ld)"),
end_dir, start_data);
} }
if (super.flags & CRAMFS_FLAG_FSID_VERSION_2) { if (super.flags & CRAMFS_FLAG_FSID_VERSION_2)
if (end_data > super.size) { if (end_data > super.size)
errx(FSCK_UNCORRECTED, _("invalid file data offset")); errx(FSCK_UNCORRECTED, _("invalid file data offset"));
}
}
iput(root); /* free(root) */ iput(root); /* free(root) */
} }
#endif /* INCLUDE_FS_TESTS */ #endif /* INCLUDE_FS_TESTS */
@ -690,7 +653,7 @@ int main(int argc, char **argv)
outbuffer = xmalloc(page_size * 2); outbuffer = xmalloc(page_size * 2);
/* command line options */ /* command line options */
while ((c = getopt(argc, argv, "hx:v")) != EOF) { while ((c = getopt(argc, argv, "hx:v")) != EOF)
switch (c) { switch (c) {
case 'h': case 'h':
usage(FSCK_OK); usage(FSCK_OK);
@ -699,14 +662,13 @@ int main(int argc, char **argv)
opt_extract = 1; opt_extract = 1;
extract_dir = optarg; extract_dir = optarg;
break; break;
#else /* not INCLUDE_FS_TESTS */ #else
errx(FSCK_USAGE, _("compiled without -x support")); errx(FSCK_USAGE, _("compiled without -x support"));
#endif /* not INCLUDE_FS_TESTS */ #endif
case 'v': case 'v':
opt_verbose++; opt_verbose++;
break; break;
} }
}
if ((argc - optind) != 1) if ((argc - optind) != 1)
usage(FSCK_USAGE); usage(FSCK_USAGE);
@ -716,11 +678,10 @@ int main(int argc, char **argv)
test_crc(start); test_crc(start);
#ifdef INCLUDE_FS_TESTS #ifdef INCLUDE_FS_TESTS
test_fs(start); test_fs(start);
#endif /* INCLUDE_FS_TESTS */ #endif
if (opt_verbose) { if (opt_verbose)
printf("%s: OK\n", filename); printf("%s: OK\n", filename);
}
exit(FSCK_OK); exit(FSCK_OK);
} }