Round directory size up to the nearest sector size multiple

Author: rapperskull

extract-xiso.c

@@ -1823,6 +1823,7 @@ int write_directory( dir_node_avl *in_avl, int in_xiso, int in_depth ) {
 	xoff_t				pos;
 	int					err = 0, pad;
 	unsigned short		l_offset, r_offset;
+	unsigned long		file_size = in_avl->file_size + (in_avl->subdirectory ? (XISO_SECTOR_SIZE - (in_avl->file_size % XISO_SECTOR_SIZE)) % XISO_SECTOR_SIZE  : 0);
 	char				length = (char) strlen( in_avl->filename ), attributes = in_avl->subdirectory ? XISO_ATTRIBUTE_DIR : XISO_ATTRIBUTE_ARC, sector[ XISO_SECTOR_SIZE ];
 
 	little32( in_avl->file_size );
@@ -1841,7 +1842,7 @@ int write_directory( dir_node_avl *in_avl, int in_xiso, int in_depth ) {
 	if ( ! err && write( in_xiso, &l_offset, XISO_TABLE_OFFSET_SIZE ) != XISO_TABLE_OFFSET_SIZE ) write_err();
 	if ( ! err && write( in_xiso, &r_offset, XISO_TABLE_OFFSET_SIZE ) != XISO_TABLE_OFFSET_SIZE ) write_err();
 	if ( ! err && write( in_xiso, &in_avl->start_sector, XISO_SECTOR_OFFSET_SIZE ) != XISO_SECTOR_OFFSET_SIZE ) write_err();
-	if ( ! err && write( in_xiso, &in_avl->file_size, XISO_FILESIZE_SIZE ) != XISO_FILESIZE_SIZE ) write_err();
+	if ( ! err && write( in_xiso, &file_size, XISO_FILESIZE_SIZE ) != XISO_FILESIZE_SIZE ) write_err();
 	if ( ! err && write( in_xiso, &attributes, XISO_ATTRIBUTES_SIZE ) != XISO_ATTRIBUTES_SIZE ) write_err();
 	if ( ! err && write( in_xiso, &length, XISO_FILENAME_LENGTH_SIZE ) != XISO_FILENAME_LENGTH_SIZE ) write_err();
 	if ( ! err && write( in_xiso, in_avl->filename, length ) != length ) write_err();
@@ -1859,7 +1860,6 @@ int calculate_directory_offsets( dir_node_avl *in_avl, unsigned long *io_current
 	if ( in_avl->subdirectory ) {
 		if (in_avl->subdirectory == EMPTY_SUBDIRECTORY) {
 			in_avl->start_sector = *io_current_sector;
-			in_avl->file_size = XISO_SECTOR_SIZE;
 			*io_current_sector += 1;
 		}
 		else {
@@ -1890,12 +1890,8 @@ int write_dir_start_and_file_positions( dir_node_avl *in_avl, wdsafp_context *io
 
 
 int calculate_total_files_and_bytes( dir_node_avl *in_avl, void *in_context, int in_depth ) {
-	if ( in_avl->subdirectory ) {
-		if ( in_avl->subdirectory != EMPTY_SUBDIRECTORY ) {
-			avl_traverse_depth_first( in_avl->subdirectory, (traversal_callback) calculate_total_files_and_bytes, nil, k_prefix, 0 );
-		} else {
-			s_total_bytes += XISO_SECTOR_SIZE;
-		}
+	if ( in_avl->subdirectory && in_avl->subdirectory != EMPTY_SUBDIRECTORY ) {
+		avl_traverse_depth_first( in_avl->subdirectory, (traversal_callback) calculate_total_files_and_bytes, nil, k_prefix, 0 );
 	} else {
 		++s_total_files;
 		s_total_bytes += in_avl->file_size;
@@ -1906,9 +1902,13 @@ int calculate_total_files_and_bytes( dir_node_avl *in_avl, void *in_context, int
 
 
 int calculate_directory_requirements( dir_node_avl *in_avl, void *in_context, int in_depth ) {
-	if ( in_avl->subdirectory && in_avl->subdirectory != EMPTY_SUBDIRECTORY ) {
-		avl_traverse_depth_first( in_avl->subdirectory, (traversal_callback) calculate_directory_size, &in_avl->file_size, k_prefix, 0 );
-		avl_traverse_depth_first( in_avl->subdirectory, (traversal_callback) calculate_directory_requirements, in_context, k_prefix, 0 );
+	if ( in_avl->subdirectory ) {
+		if (in_avl->subdirectory != EMPTY_SUBDIRECTORY) {
+			avl_traverse_depth_first(in_avl->subdirectory, (traversal_callback)calculate_directory_size, &in_avl->file_size, k_prefix, 0);
+			avl_traverse_depth_first(in_avl->subdirectory, (traversal_callback)calculate_directory_requirements, in_context, k_prefix, 0);
+		} else {
+			in_avl->file_size = XISO_SECTOR_SIZE;
+		}
 	}
 
 	return 0;