diff options
| -rw-r--r-- | disk-utils/mkfs.minix.c | 5 | ||||
| -rw-r--r-- | tests/expected/minix/fsck-images-check-blocks | 2 | ||||
| -rw-r--r-- | tests/expected/minix/fsck-images-v1c14 | 3 | ||||
| -rw-r--r-- | tests/expected/minix/fsck-images-v1c30 | 2 | ||||
| -rw-r--r-- | tests/expected/minix/fsck-images-v2c14 | 3 | ||||
| -rw-r--r-- | tests/expected/minix/fsck-images-v2c30 | 2 | ||||
| -rw-r--r-- | tests/expected/minix/fsck-images-v3c60 | 3 |
7 files changed, 4 insertions, 16 deletions
diff --git a/disk-utils/mkfs.minix.c b/disk-utils/mkfs.minix.c index b472242ed..24e618871 100644 --- a/disk-utils/mkfs.minix.c +++ b/disk-utils/mkfs.minix.c @@ -369,8 +369,7 @@ static void make_root_inode_v1(struct fs_control *ctl) { if (ctl->fs_bad_blocks) inode->i_size = 3 * ctl->fs_dirsize; else { - root_block[2 * ctl->fs_dirsize] = '\0'; - root_block[2 * ctl->fs_dirsize + 1] = '\0'; + memset(&root_block[2 * ctl->fs_dirsize], 0, ctl->fs_dirsize); inode->i_size = 2 * ctl->fs_dirsize; } inode->i_mode = S_IFDIR + 0755; @@ -391,7 +390,7 @@ static void make_root_inode_v2_v3 (struct fs_control *ctl) { if (ctl->fs_bad_blocks) inode->i_size = 3 * ctl->fs_dirsize; else { - root_block[2 * ctl->fs_dirsize] = '\0'; + memset(&root_block[2 * ctl->fs_dirsize], 0, ctl->fs_dirsize); inode->i_size = 2 * ctl->fs_dirsize; } diff --git a/tests/expected/minix/fsck-images-check-blocks b/tests/expected/minix/fsck-images-check-blocks index 883d1e81d..fce90fd89 100644 --- a/tests/expected/minix/fsck-images-check-blocks +++ b/tests/expected/minix/fsck-images-check-blocks @@ -25,7 +25,5 @@ fsck return value: 0 00001410 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 |................| 00001420 01 00 2e 2e 00 00 00 00 00 00 00 00 00 00 00 00 |................| 00001430 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 |................| -00001440 00 00 2e 62 61 64 62 6c 6f 63 6b 73 00 00 00 00 |...badblocks....| -00001450 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 |................| * 00004000 diff --git a/tests/expected/minix/fsck-images-v1c14 b/tests/expected/minix/fsck-images-v1c14 index b3301d983..75e3310f2 100644 --- a/tests/expected/minix/fsck-images-v1c14 +++ b/tests/expected/minix/fsck-images-v1c14 @@ -23,7 +23,6 @@ fsck return value: 0 * 00001400 01 00 2e 00 00 00 00 00 00 00 00 00 00 00 00 00 |................| 00001410 01 00 2e 2e 00 00 00 00 00 00 00 00 00 00 00 00 |................| -00001420 00 00 2e 62 61 64 62 6c 6f 63 6b 73 00 00 00 00 |...badblocks....| -00001430 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 |................| +00001420 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 |................| * 00004000 diff --git a/tests/expected/minix/fsck-images-v1c30 b/tests/expected/minix/fsck-images-v1c30 index 883d1e81d..fce90fd89 100644 --- a/tests/expected/minix/fsck-images-v1c30 +++ b/tests/expected/minix/fsck-images-v1c30 @@ -25,7 +25,5 @@ fsck return value: 0 00001410 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 |................| 00001420 01 00 2e 2e 00 00 00 00 00 00 00 00 00 00 00 00 |................| 00001430 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 |................| -00001440 00 00 2e 62 61 64 62 6c 6f 63 6b 73 00 00 00 00 |...badblocks....| -00001450 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 |................| * 00004000 diff --git a/tests/expected/minix/fsck-images-v2c14 b/tests/expected/minix/fsck-images-v2c14 index 5e155b788..e8bc4e35e 100644 --- a/tests/expected/minix/fsck-images-v2c14 +++ b/tests/expected/minix/fsck-images-v2c14 @@ -24,7 +24,6 @@ fsck return value: 0 * 00001400 01 00 2e 00 00 00 00 00 00 00 00 00 00 00 00 00 |................| 00001410 01 00 2e 2e 00 00 00 00 00 00 00 00 00 00 00 00 |................| -00001420 00 00 2e 62 61 64 62 6c 6f 63 6b 73 00 00 00 00 |...badblocks....| -00001430 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 |................| +00001420 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 |................| * 00004000 diff --git a/tests/expected/minix/fsck-images-v2c30 b/tests/expected/minix/fsck-images-v2c30 index 5f35ed78f..0066e4948 100644 --- a/tests/expected/minix/fsck-images-v2c30 +++ b/tests/expected/minix/fsck-images-v2c30 @@ -26,7 +26,5 @@ fsck return value: 0 00001410 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 |................| 00001420 01 00 2e 2e 00 00 00 00 00 00 00 00 00 00 00 00 |................| 00001430 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 |................| -00001440 00 00 2e 62 61 64 62 6c 6f 63 6b 73 00 00 00 00 |...badblocks....| -00001450 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 |................| * 00004000 diff --git a/tests/expected/minix/fsck-images-v3c60 b/tests/expected/minix/fsck-images-v3c60 index be2b54d0a..89ac9c99d 100644 --- a/tests/expected/minix/fsck-images-v3c60 +++ b/tests/expected/minix/fsck-images-v3c60 @@ -28,7 +28,4 @@ fsck return value: 0 00001440 01 00 00 00 2e 2e 00 00 00 00 00 00 00 00 00 00 |................| 00001450 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 |................| * -00001480 00 00 00 00 2e 62 61 64 62 6c 6f 63 6b 73 00 00 |.....badblocks..| -00001490 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 |................| -* 00004000 |