A few patches from Erik Hovland, turning strncpy() into safe_strncpy() and

removing some unnecessary code.
This commit is contained in:
Rob Landley
2006-06-25 00:34:52 +00:00
parent 641c3537c0
commit 768945b762
4 changed files with 6 additions and 12 deletions

View File

@@ -699,13 +699,13 @@ int tune2fs_main(int argc, char **argv)
if (strlen(new_label) > sizeof(sb->s_volume_name))
bb_error_msg("Warning: label too long, truncating\n");
memset(sb->s_volume_name, 0, sizeof(sb->s_volume_name));
strncpy(sb->s_volume_name, new_label,
safe_strncpy(sb->s_volume_name, new_label,
sizeof(sb->s_volume_name));
ext2fs_mark_super_dirty(fs);
}
if (M_flag) {
memset(sb->s_last_mounted, 0, sizeof(sb->s_last_mounted));
strncpy(sb->s_last_mounted, new_last_mounted,
safe_strncpy(sb->s_last_mounted, new_last_mounted,
sizeof(sb->s_last_mounted));
ext2fs_mark_super_dirty(fs);
}