Changeset 3588b92
- Timestamp:
- Nov 2, 2006, 7:32:32 PM (18 years ago)
- Branches:
- clfs-1.2, clfs-2.1, clfs-3.0.0-systemd, clfs-3.0.0-sysvinit, master, systemd, sysvinit
- Children:
- 035d431
- Parents:
- ce14232
- File:
-
- 1 moved
Legend:
- Unmodified
- Added
- Removed
-
patches/silo-1.4.13-fixes-2.patch
rce14232 r3588b92 1 1 Submitted By: Joe Ciccone <joeciccone at crazyeyesoft dot com> 2 Date: 2006- 02-093 Initial Package Version: 1.4.1 12 Date: 2006-11-02 3 Initial Package Version: 1.4.13 4 4 Upstream Status: Unknown 5 5 Origin: Rocklinux and Jim Gifford and Joe Ciccone 6 6 Description: Fixes cross-compilation issues and silo no longer links to 7 7 libext2fs.so, it is integrated instead. Also allows silo to build 8 8 and work properly on pure64 systems. 9 9 10 diff -Naur silo-1.4.1 1.orig/Makefile silo-1.4.11/Makefile11 --- silo-1.4.1 1.orig/Makefile 2006-03-09 21:34:08 +000012 +++ silo-1.4.1 1/Makefile 2006-03-09 21:34:56 +000010 diff -Naur silo-1.4.13.orig/Makefile silo-1.4.13/Makefile 11 --- silo-1.4.13.orig/Makefile 2006-06-01 10:24:53.000000000 -0700 12 +++ silo-1.4.13/Makefile 2006-11-02 19:21:44.204761742 -0800 13 13 @@ -3,7 +3,7 @@ 14 14 … … 20 20 endif 21 21 22 diff -Naur silo-1.4.1 1.orig/Rules.make silo-1.4.11/Rules.make23 --- silo-1.4.1 1.orig/Rules.make 2006-03-09 21:34:08 +000024 +++ silo-1.4.1 1/Rules.make 2006-03-09 21:48:42 +000022 diff -Naur silo-1.4.13.orig/Rules.make silo-1.4.13/Rules.make 23 --- silo-1.4.13.orig/Rules.make 2006-06-21 00:51:03.000000000 -0700 24 +++ silo-1.4.13/Rules.make 2006-11-02 19:21:44.204761742 -0800 25 25 @@ -1,12 +1,14 @@ 26 VERSION=1.4.1 126 VERSION=1.4.13 27 27 IMGVERSION=0.99 28 28 RM=rm -f … … 44 44 BIN2H=../common/bin2h 45 45 46 diff -Naur silo-1.4.1 1.orig/common/Makefile silo-1.4.11/common/Makefile47 --- silo-1.4.1 1.orig/common/Makefile 2006-03-09 21:34:08 +000048 +++ silo-1.4.1 1/common/Makefile 2006-03-09 21:34:56 +000046 diff -Naur silo-1.4.13.orig/common/Makefile silo-1.4.13/common/Makefile 47 --- silo-1.4.13.orig/common/Makefile 2006-06-01 10:24:53.000000000 -0700 48 +++ silo-1.4.13/common/Makefile 2006-11-02 19:21:44.204761742 -0800 49 49 @@ -5,19 +5,22 @@ 50 50 include ../Rules.make … … 76 76 + $(RM) bin2h *.o 77 77 + 78 diff -Naur silo-1.4.1 1.orig/first/Makefile silo-1.4.11/first/Makefile79 --- silo-1.4.1 1.orig/first/Makefile 2006-03-09 21:34:08 +000080 +++ silo-1.4.1 1/first/Makefile 2006-03-09 21:34:56 +000078 diff -Naur silo-1.4.13.orig/first/Makefile silo-1.4.13/first/Makefile 79 --- silo-1.4.13.orig/first/Makefile 2006-06-01 10:24:53.000000000 -0700 80 +++ silo-1.4.13/first/Makefile 2006-11-02 19:21:44.204761742 -0800 81 81 @@ -13,7 +13,7 @@ 82 82 LDFLAGS=-N -Ttext 0x4000 … … 133 133 ieee32.b: ieee32.o 134 134 $(LD) $(LDFLAGS) -o ieee32.b ieee32.o 135 diff -Naur silo-1.4.1 1.orig/first-isofs/Makefile silo-1.4.11/first-isofs/Makefile136 --- silo-1.4.1 1.orig/first-isofs/Makefile 2006-03-09 21:34:08 +0000137 +++ silo-1.4.1 1/first-isofs/Makefile 2006-03-09 21:34:56 +0000135 diff -Naur silo-1.4.13.orig/first-isofs/Makefile silo-1.4.13/first-isofs/Makefile 136 --- silo-1.4.13.orig/first-isofs/Makefile 2006-06-01 10:24:53.000000000 -0700 137 +++ silo-1.4.13/first-isofs/Makefile 2006-11-02 19:21:44.204761742 -0800 138 138 @@ -11,10 +11,10 @@ 139 139 all: $(NAME).b … … 158 158 clean: 159 159 $(RM) *.o $(NAME) $(NAME).b $(NAME).aout 160 diff -Naur silo-1.4.1 1.orig/include/emul_32/asm/elf.h silo-1.4.11/include/emul_32/asm/elf.h161 --- silo-1.4.1 1.orig/include/emul_32/asm/elf.h 1970-01-01 00:00:00 +0000162 +++ silo-1.4.1 1/include/emul_32/asm/elf.h 2006-03-09 21:34:56 +0000160 diff -Naur silo-1.4.13.orig/include/emul_32/asm/elf.h silo-1.4.13/include/emul_32/asm/elf.h 161 --- silo-1.4.13.orig/include/emul_32/asm/elf.h 1969-12-31 16:00:00.000000000 -0800 162 +++ silo-1.4.13/include/emul_32/asm/elf.h 2006-11-02 19:21:44.204761742 -0800 163 163 @@ -0,0 +1,162 @@ 164 164 +#ifndef __ASMSPARC_ELF_H … … 324 324 + 325 325 +#endif /* !(__ASMSPARC_ELF_H) */ 326 diff -Naur silo-1.4.1 1.orig/include/emul_32/asm/posix_types.h silo-1.4.11/include/emul_32/asm/posix_types.h327 --- silo-1.4.1 1.orig/include/emul_32/asm/posix_types.h 1970-01-01 00:00:00 +0000328 +++ silo-1.4.1 1/include/emul_32/asm/posix_types.h 2006-03-09 21:34:56 +0000326 diff -Naur silo-1.4.13.orig/include/emul_32/asm/posix_types.h silo-1.4.13/include/emul_32/asm/posix_types.h 327 --- silo-1.4.13.orig/include/emul_32/asm/posix_types.h 1969-12-31 16:00:00.000000000 -0800 328 +++ silo-1.4.13/include/emul_32/asm/posix_types.h 2006-11-02 19:21:44.208761609 -0800 329 329 @@ -0,0 +1,122 @@ 330 330 +#ifndef __ARCH_SPARC_POSIX_TYPES_H … … 450 450 + 451 451 +#endif /* !(__ARCH_SPARC_POSIX_TYPES_H) */ 452 diff -Naur silo-1.4.1 1.orig/include/emul_32/asm/types.h silo-1.4.11/include/emul_32/asm/types.h453 --- silo-1.4.1 1.orig/include/emul_32/asm/types.h 1970-01-01 00:00:00 +0000454 +++ silo-1.4.1 1/include/emul_32/asm/types.h 2006-03-09 21:34:56 +0000452 diff -Naur silo-1.4.13.orig/include/emul_32/asm/types.h silo-1.4.13/include/emul_32/asm/types.h 453 --- silo-1.4.13.orig/include/emul_32/asm/types.h 1969-12-31 16:00:00.000000000 -0800 454 +++ silo-1.4.13/include/emul_32/asm/types.h 2006-11-02 19:21:44.208761609 -0800 455 455 @@ -0,0 +1,41 @@ 456 456 +#ifndef _SPARC_TYPES_H … … 495 495 + 496 496 +#endif /* defined(_SPARC_TYPES_H) */ 497 diff -Naur silo-1.4.1 1.orig/include/ext2fs/ext2_err.h silo-1.4.11/include/ext2fs/ext2_err.h498 --- silo-1.4.1 1.orig/include/ext2fs/ext2_err.h 2006-03-09 21:34:08 +0000499 +++ silo-1.4.1 1/include/ext2fs/ext2_err.h 2006-03-09 21:34:56 +0000497 diff -Naur silo-1.4.13.orig/include/ext2fs/ext2_err.h silo-1.4.13/include/ext2fs/ext2_err.h 498 --- silo-1.4.13.orig/include/ext2fs/ext2_err.h 2006-06-01 10:24:53.000000000 -0700 499 +++ silo-1.4.13/include/ext2fs/ext2_err.h 2006-11-02 19:21:44.208761609 -0800 500 500 @@ -3,6 +3,8 @@ 501 501 * This file is automatically generated; please do not edit it. … … 544 544 545 545 /* for compatibility with older versions... */ 546 diff -Naur silo-1.4.1 1.orig/include/ext2fs/ext2_io.h silo-1.4.11/include/ext2fs/ext2_io.h547 --- silo-1.4.1 1.orig/include/ext2fs/ext2_io.h 2006-03-09 21:34:08 +0000548 +++ silo-1.4.1 1/include/ext2fs/ext2_io.h 2006-03-09 21:34:56 +0000546 diff -Naur silo-1.4.13.orig/include/ext2fs/ext2_io.h silo-1.4.13/include/ext2fs/ext2_io.h 547 --- silo-1.4.13.orig/include/ext2fs/ext2_io.h 2006-06-01 10:24:53.000000000 -0700 548 +++ silo-1.4.13/include/ext2fs/ext2_io.h 2006-11-02 19:21:44.208761609 -0800 549 549 @@ -27,6 +27,8 @@ 550 550 typedef struct struct_io_manager *io_manager; … … 593 593 extern io_manager unix_io_manager; 594 594 595 diff -Naur silo-1.4.1 1.orig/libext2fs/ChangeLog silo-1.4.11/libext2fs/ChangeLog596 --- silo-1.4.1 1.orig/libext2fs/ChangeLog 1970-01-01 00:00:00 +0000597 +++ silo-1.4.1 1/libext2fs/ChangeLog 2006-03-09 21:34:56 +0000595 diff -Naur silo-1.4.13.orig/libext2fs/ChangeLog silo-1.4.13/libext2fs/ChangeLog 596 --- silo-1.4.13.orig/libext2fs/ChangeLog 1969-12-31 16:00:00.000000000 -0800 597 +++ silo-1.4.13/libext2fs/ChangeLog 2006-11-02 19:21:44.212761475 -0800 598 598 @@ -0,0 +1,3311 @@ 599 599 +2006-06-30 Theodore Ts'o <tytso@mit.edu> … … 3908 3908 + 3909 3909 + 3910 diff -Naur silo-1.4.1 1.orig/libext2fs/Makefile silo-1.4.11/libext2fs/Makefile3911 --- silo-1.4.1 1.orig/libext2fs/Makefile 1970-01-01 00:00:00 +00003912 +++ silo-1.4.1 1/libext2fs/Makefile 2006-03-09 21:34:56 +00003910 diff -Naur silo-1.4.13.orig/libext2fs/Makefile silo-1.4.13/libext2fs/Makefile 3911 --- silo-1.4.13.orig/libext2fs/Makefile 1969-12-31 16:00:00.000000000 -0800 3912 +++ silo-1.4.13/libext2fs/Makefile 2006-11-02 19:21:44.212761475 -0800 3913 3913 @@ -0,0 +1,21 @@ 3914 3914 + … … 3933 3933 +.c.o: 3934 3934 + $(CC-SILO) $(CFLAGS) $(DEFS) -c $< -o $@ 3935 diff -Naur silo-1.4.1 1.orig/libext2fs/alloc.c silo-1.4.11/libext2fs/alloc.c3936 --- silo-1.4.1 1.orig/libext2fs/alloc.c 1970-01-01 00:00:00 +00003937 +++ silo-1.4.1 1/libext2fs/alloc.c 2006-03-09 21:34:56 +00003935 diff -Naur silo-1.4.13.orig/libext2fs/alloc.c silo-1.4.13/libext2fs/alloc.c 3936 --- silo-1.4.13.orig/libext2fs/alloc.c 1969-12-31 16:00:00.000000000 -0800 3937 +++ silo-1.4.13/libext2fs/alloc.c 2006-11-02 19:21:44.212761475 -0800 3938 3938 @@ -0,0 +1,173 @@ 3939 3939 +/* … … 4110 4110 +} 4111 4111 + 4112 diff -Naur silo-1.4.1 1.orig/libext2fs/alloc_sb.c silo-1.4.11/libext2fs/alloc_sb.c4113 --- silo-1.4.1 1.orig/libext2fs/alloc_sb.c 1970-01-01 00:00:00 +00004114 +++ silo-1.4.1 1/libext2fs/alloc_sb.c 2006-03-09 21:34:56 +00004112 diff -Naur silo-1.4.13.orig/libext2fs/alloc_sb.c silo-1.4.13/libext2fs/alloc_sb.c 4113 --- silo-1.4.13.orig/libext2fs/alloc_sb.c 1969-12-31 16:00:00.000000000 -0800 4114 +++ silo-1.4.13/libext2fs/alloc_sb.c 2006-11-02 19:21:44.212761475 -0800 4115 4115 @@ -0,0 +1,57 @@ 4116 4116 +/* … … 4171 4171 + return num_blocks; 4172 4172 +} 4173 diff -Naur silo-1.4.1 1.orig/libext2fs/alloc_stats.c silo-1.4.11/libext2fs/alloc_stats.c4174 --- silo-1.4.1 1.orig/libext2fs/alloc_stats.c 1970-01-01 00:00:00 +00004175 +++ silo-1.4.1 1/libext2fs/alloc_stats.c 2006-03-09 21:34:56 +00004173 diff -Naur silo-1.4.13.orig/libext2fs/alloc_stats.c silo-1.4.13/libext2fs/alloc_stats.c 4174 --- silo-1.4.13.orig/libext2fs/alloc_stats.c 1969-12-31 16:00:00.000000000 -0800 4175 +++ silo-1.4.13/libext2fs/alloc_stats.c 2006-11-02 19:21:44.212761475 -0800 4176 4176 @@ -0,0 +1,52 @@ 4177 4177 +/* … … 4227 4227 + ext2fs_mark_bb_dirty(fs); 4228 4228 +} 4229 diff -Naur silo-1.4.1 1.orig/libext2fs/alloc_tables.c silo-1.4.11/libext2fs/alloc_tables.c4230 --- silo-1.4.1 1.orig/libext2fs/alloc_tables.c 1970-01-01 00:00:00 +00004231 +++ silo-1.4.1 1/libext2fs/alloc_tables.c 2006-03-09 21:34:56 +00004229 diff -Naur silo-1.4.13.orig/libext2fs/alloc_tables.c silo-1.4.13/libext2fs/alloc_tables.c 4230 --- silo-1.4.13.orig/libext2fs/alloc_tables.c 1969-12-31 16:00:00.000000000 -0800 4231 +++ silo-1.4.13/libext2fs/alloc_tables.c 2006-11-02 19:21:44.212761475 -0800 4232 4232 @@ -0,0 +1,117 @@ 4233 4233 +/* … … 4348 4348 +} 4349 4349 + 4350 diff -Naur silo-1.4.1 1.orig/libext2fs/badblocks.c silo-1.4.11/libext2fs/badblocks.c4351 --- silo-1.4.1 1.orig/libext2fs/badblocks.c 1970-01-01 00:00:00 +00004352 +++ silo-1.4.1 1/libext2fs/badblocks.c 2006-03-09 21:34:56 +00004350 diff -Naur silo-1.4.13.orig/libext2fs/badblocks.c silo-1.4.13/libext2fs/badblocks.c 4351 --- silo-1.4.13.orig/libext2fs/badblocks.c 1969-12-31 16:00:00.000000000 -0800 4352 +++ silo-1.4.13/libext2fs/badblocks.c 2006-11-02 19:21:44.212761475 -0800 4353 4353 @@ -0,0 +1,327 @@ 4354 4354 +/* … … 4679 4679 + return bb->num; 4680 4680 +} 4681 diff -Naur silo-1.4.1 1.orig/libext2fs/bb_compat.c silo-1.4.11/libext2fs/bb_compat.c4682 --- silo-1.4.1 1.orig/libext2fs/bb_compat.c 1970-01-01 00:00:00 +00004683 +++ silo-1.4.1 1/libext2fs/bb_compat.c 2006-03-09 21:34:56 +00004681 diff -Naur silo-1.4.13.orig/libext2fs/bb_compat.c silo-1.4.13/libext2fs/bb_compat.c 4682 --- silo-1.4.13.orig/libext2fs/bb_compat.c 1969-12-31 16:00:00.000000000 -0800 4683 +++ silo-1.4.13/libext2fs/bb_compat.c 2006-11-02 19:21:44.212761475 -0800 4684 4684 @@ -0,0 +1,63 @@ 4685 4685 +/* … … 4746 4746 + ext2fs_badblocks_list_iterate_end(iter); 4747 4747 +} 4748 diff -Naur silo-1.4.1 1.orig/libext2fs/bb_inode.c silo-1.4.11/libext2fs/bb_inode.c4749 --- silo-1.4.1 1.orig/libext2fs/bb_inode.c 1970-01-01 00:00:00 +00004750 +++ silo-1.4.1 1/libext2fs/bb_inode.c 2006-03-09 21:34:56 +00004748 diff -Naur silo-1.4.13.orig/libext2fs/bb_inode.c silo-1.4.13/libext2fs/bb_inode.c 4749 --- silo-1.4.13.orig/libext2fs/bb_inode.c 1969-12-31 16:00:00.000000000 -0800 4750 +++ silo-1.4.13/libext2fs/bb_inode.c 2006-11-02 19:21:44.212761475 -0800 4751 4751 @@ -0,0 +1,267 @@ 4752 4752 +/* … … 5017 5017 + 5018 5018 + 5019 diff -Naur silo-1.4.1 1.orig/libext2fs/bitmaps.c silo-1.4.11/libext2fs/bitmaps.c5020 --- silo-1.4.1 1.orig/libext2fs/bitmaps.c 1970-01-01 00:00:00 +00005021 +++ silo-1.4.1 1/libext2fs/bitmaps.c 2006-03-09 21:34:56 +00005019 diff -Naur silo-1.4.13.orig/libext2fs/bitmaps.c silo-1.4.13/libext2fs/bitmaps.c 5020 --- silo-1.4.13.orig/libext2fs/bitmaps.c 1969-12-31 16:00:00.000000000 -0800 5021 +++ silo-1.4.13/libext2fs/bitmaps.c 2006-11-02 19:21:44.212761475 -0800 5022 5022 @@ -0,0 +1,212 @@ 5023 5023 +/* … … 5233 5233 + (size_t) (((bitmap->real_end - bitmap->start) / 8) + 1)); 5234 5234 +} 5235 diff -Naur silo-1.4.1 1.orig/libext2fs/bitops.c silo-1.4.11/libext2fs/bitops.c5236 --- silo-1.4.1 1.orig/libext2fs/bitops.c 1970-01-01 00:00:00 +00005237 +++ silo-1.4.1 1/libext2fs/bitops.c 2006-03-09 21:34:56 +00005235 diff -Naur silo-1.4.13.orig/libext2fs/bitops.c silo-1.4.13/libext2fs/bitops.c 5236 --- silo-1.4.13.orig/libext2fs/bitops.c 1969-12-31 16:00:00.000000000 -0800 5237 +++ silo-1.4.13/libext2fs/bitops.c 2006-11-02 19:21:44.212761475 -0800 5238 5238 @@ -0,0 +1,91 @@ 5239 5239 +/* … … 5328 5328 +} 5329 5329 + 5330 diff -Naur silo-1.4.1 1.orig/libext2fs/bitops.h silo-1.4.11/libext2fs/bitops.h5331 --- silo-1.4.1 1.orig/libext2fs/bitops.h 1970-01-01 00:00:00 +00005332 +++ silo-1.4.1 1/libext2fs/bitops.h 2006-03-09 21:34:56 +00005330 diff -Naur silo-1.4.13.orig/libext2fs/bitops.h silo-1.4.13/libext2fs/bitops.h 5331 --- silo-1.4.13.orig/libext2fs/bitops.h 1969-12-31 16:00:00.000000000 -0800 5332 +++ silo-1.4.13/libext2fs/bitops.h 2006-11-02 19:21:44.212761475 -0800 5333 5333 @@ -0,0 +1,617 @@ 5334 5334 +/* … … 5949 5949 +#endif 5950 5950 + 5951 diff -Naur silo-1.4.1 1.orig/libext2fs/block.c silo-1.4.11/libext2fs/block.c5952 --- silo-1.4.1 1.orig/libext2fs/block.c 1970-01-01 00:00:00 +00005953 +++ silo-1.4.1 1/libext2fs/block.c 2006-03-09 21:34:56 +00005951 diff -Naur silo-1.4.13.orig/libext2fs/block.c silo-1.4.13/libext2fs/block.c 5952 --- silo-1.4.13.orig/libext2fs/block.c 1969-12-31 16:00:00.000000000 -0800 5953 +++ silo-1.4.13/libext2fs/block.c 2006-11-02 19:21:44.216761341 -0800 5954 5954 @@ -0,0 +1,437 @@ 5955 5955 +/* … … 6390 6390 +} 6391 6391 + 6392 diff -Naur silo-1.4.1 1.orig/libext2fs/bmap.c silo-1.4.11/libext2fs/bmap.c6393 --- silo-1.4.1 1.orig/libext2fs/bmap.c 1970-01-01 00:00:00 +00006394 +++ silo-1.4.1 1/libext2fs/bmap.c 2006-03-09 21:34:56 +00006392 diff -Naur silo-1.4.13.orig/libext2fs/bmap.c silo-1.4.13/libext2fs/bmap.c 6393 --- silo-1.4.13.orig/libext2fs/bmap.c 1969-12-31 16:00:00.000000000 -0800 6394 +++ silo-1.4.13/libext2fs/bmap.c 2006-11-02 19:21:44.216761341 -0800 6395 6395 @@ -0,0 +1,270 @@ 6396 6396 +/* … … 6664 6664 + 6665 6665 + 6666 diff -Naur silo-1.4.1 1.orig/libext2fs/bmove.c silo-1.4.11/libext2fs/bmove.c6667 --- silo-1.4.1 1.orig/libext2fs/bmove.c 1970-01-01 00:00:00 +00006668 +++ silo-1.4.1 1/libext2fs/bmove.c 2006-03-09 21:34:56 +00006666 diff -Naur silo-1.4.13.orig/libext2fs/bmove.c silo-1.4.13/libext2fs/bmove.c 6667 --- silo-1.4.13.orig/libext2fs/bmove.c 1969-12-31 16:00:00.000000000 -0800 6668 +++ silo-1.4.13/libext2fs/bmove.c 2006-11-02 19:21:44.216761341 -0800 6669 6669 @@ -0,0 +1,160 @@ 6670 6670 +/* … … 6828 6828 +} 6829 6829 + 6830 diff -Naur silo-1.4.1 1.orig/libext2fs/brel.h silo-1.4.11/libext2fs/brel.h6831 --- silo-1.4.1 1.orig/libext2fs/brel.h 1970-01-01 00:00:00 +00006832 +++ silo-1.4.1 1/libext2fs/brel.h 2006-03-09 21:34:56 +00006830 diff -Naur silo-1.4.13.orig/libext2fs/brel.h silo-1.4.13/libext2fs/brel.h 6831 --- silo-1.4.13.orig/libext2fs/brel.h 1969-12-31 16:00:00.000000000 -0800 6832 +++ silo-1.4.13/libext2fs/brel.h 2006-11-02 19:21:44.216761341 -0800 6833 6833 @@ -0,0 +1,86 @@ 6834 6834 +/* … … 6918 6918 +#define ext2fs_brel_free(brel) ((brel)->free((brel))) 6919 6919 + 6920 diff -Naur silo-1.4.1 1.orig/libext2fs/brel_ma.c silo-1.4.11/libext2fs/brel_ma.c6921 --- silo-1.4.1 1.orig/libext2fs/brel_ma.c 1970-01-01 00:00:00 +00006922 +++ silo-1.4.1 1/libext2fs/brel_ma.c 2006-03-09 21:34:56 +00006920 diff -Naur silo-1.4.13.orig/libext2fs/brel_ma.c silo-1.4.13/libext2fs/brel_ma.c 6921 --- silo-1.4.13.orig/libext2fs/brel_ma.c 1969-12-31 16:00:00.000000000 -0800 6922 +++ silo-1.4.13/libext2fs/brel_ma.c 2006-11-02 19:21:44.216761341 -0800 6923 6923 @@ -0,0 +1,197 @@ 6924 6924 +/* … … 7119 7119 + return 0; 7120 7120 +} 7121 diff -Naur silo-1.4.1 1.orig/libext2fs/check_desc.c silo-1.4.11/libext2fs/check_desc.c7122 --- silo-1.4.1 1.orig/libext2fs/check_desc.c 1970-01-01 00:00:00 +00007123 +++ silo-1.4.1 1/libext2fs/check_desc.c 2006-03-09 21:34:56 +00007121 diff -Naur silo-1.4.13.orig/libext2fs/check_desc.c silo-1.4.13/libext2fs/check_desc.c 7122 --- silo-1.4.13.orig/libext2fs/check_desc.c 1969-12-31 16:00:00.000000000 -0800 7123 +++ silo-1.4.13/libext2fs/check_desc.c 2006-11-02 19:21:44.216761341 -0800 7124 7124 @@ -0,0 +1,68 @@ 7125 7125 +/* … … 7191 7191 + return 0; 7192 7192 +} 7193 diff -Naur silo-1.4.1 1.orig/libext2fs/closefs.c silo-1.4.11/libext2fs/closefs.c7194 --- silo-1.4.1 1.orig/libext2fs/closefs.c 1970-01-01 00:00:00 +00007195 +++ silo-1.4.1 1/libext2fs/closefs.c 2006-03-09 21:34:56 +00007193 diff -Naur silo-1.4.13.orig/libext2fs/closefs.c silo-1.4.13/libext2fs/closefs.c 7194 --- silo-1.4.13.orig/libext2fs/closefs.c 1969-12-31 16:00:00.000000000 -0800 7195 +++ silo-1.4.13/libext2fs/closefs.c 2006-11-02 19:21:44.216761341 -0800 7196 7196 @@ -0,0 +1,381 @@ 7197 7197 +/* … … 7576 7576 +} 7577 7577 + 7578 diff -Naur silo-1.4.1 1.orig/libext2fs/cmp_bitmaps.c silo-1.4.11/libext2fs/cmp_bitmaps.c7579 --- silo-1.4.1 1.orig/libext2fs/cmp_bitmaps.c 1970-01-01 00:00:00 +00007580 +++ silo-1.4.1 1/libext2fs/cmp_bitmaps.c 2006-03-09 21:34:56 +00007578 diff -Naur silo-1.4.13.orig/libext2fs/cmp_bitmaps.c silo-1.4.13/libext2fs/cmp_bitmaps.c 7579 --- silo-1.4.13.orig/libext2fs/cmp_bitmaps.c 1969-12-31 16:00:00.000000000 -0800 7580 +++ silo-1.4.13/libext2fs/cmp_bitmaps.c 2006-11-02 19:21:44.216761341 -0800 7581 7581 @@ -0,0 +1,72 @@ 7582 7582 +/* … … 7652 7652 +} 7653 7653 + 7654 diff -Naur silo-1.4.1 1.orig/libext2fs/dblist.c silo-1.4.11/libext2fs/dblist.c7655 --- silo-1.4.1 1.orig/libext2fs/dblist.c 1970-01-01 00:00:00 +00007656 +++ silo-1.4.1 1/libext2fs/dblist.c 2006-03-09 21:34:56 +00007654 diff -Naur silo-1.4.13.orig/libext2fs/dblist.c silo-1.4.13/libext2fs/dblist.c 7655 --- silo-1.4.13.orig/libext2fs/dblist.c 1969-12-31 16:00:00.000000000 -0800 7656 +++ silo-1.4.13/libext2fs/dblist.c 2006-11-02 19:21:44.216761341 -0800 7657 7657 @@ -0,0 +1,260 @@ 7658 7658 +/* … … 7916 7916 + return (int) dblist->count; 7917 7917 +} 7918 diff -Naur silo-1.4.1 1.orig/libext2fs/dblist_dir.c silo-1.4.11/libext2fs/dblist_dir.c7919 --- silo-1.4.1 1.orig/libext2fs/dblist_dir.c 1970-01-01 00:00:00 +00007920 +++ silo-1.4.1 1/libext2fs/dblist_dir.c 2006-03-09 21:34:56 +00007918 diff -Naur silo-1.4.13.orig/libext2fs/dblist_dir.c silo-1.4.13/libext2fs/dblist_dir.c 7919 --- silo-1.4.13.orig/libext2fs/dblist_dir.c 1969-12-31 16:00:00.000000000 -0800 7920 +++ silo-1.4.13/libext2fs/dblist_dir.c 2006-11-02 19:21:44.216761341 -0800 7921 7921 @@ -0,0 +1,75 @@ 7922 7922 +/* … … 7995 7995 + db_info->blockcnt, 0, 0, priv_data); 7996 7996 +} 7997 diff -Naur silo-1.4.1 1.orig/libext2fs/dir_iterate.c silo-1.4.11/libext2fs/dir_iterate.c7998 --- silo-1.4.1 1.orig/libext2fs/dir_iterate.c 1970-01-01 00:00:00 +00007999 +++ silo-1.4.1 1/libext2fs/dir_iterate.c 2006-03-09 21:34:56 +00007997 diff -Naur silo-1.4.13.orig/libext2fs/dir_iterate.c silo-1.4.13/libext2fs/dir_iterate.c 7998 --- silo-1.4.13.orig/libext2fs/dir_iterate.c 1969-12-31 16:00:00.000000000 -0800 7999 +++ silo-1.4.13/libext2fs/dir_iterate.c 2006-11-02 19:21:44.216761341 -0800 8000 8000 @@ -0,0 +1,219 @@ 8001 8001 +/* … … 8218 8218 +} 8219 8219 + 8220 diff -Naur silo-1.4.1 1.orig/libext2fs/dirblock.c silo-1.4.11/libext2fs/dirblock.c8221 --- silo-1.4.1 1.orig/libext2fs/dirblock.c 1970-01-01 00:00:00 +00008222 +++ silo-1.4.1 1/libext2fs/dirblock.c 2006-03-09 21:34:56 +00008220 diff -Naur silo-1.4.13.orig/libext2fs/dirblock.c silo-1.4.13/libext2fs/dirblock.c 8221 --- silo-1.4.13.orig/libext2fs/dirblock.c 1969-12-31 16:00:00.000000000 -0800 8222 +++ silo-1.4.13/libext2fs/dirblock.c 2006-11-02 19:21:44.216761341 -0800 8223 8223 @@ -0,0 +1,130 @@ 8224 8224 +/* … … 8352 8352 +} 8353 8353 + 8354 diff -Naur silo-1.4.1 1.orig/libext2fs/dirhash.c silo-1.4.11/libext2fs/dirhash.c8355 --- silo-1.4.1 1.orig/libext2fs/dirhash.c 1970-01-01 00:00:00 +00008356 +++ silo-1.4.1 1/libext2fs/dirhash.c 2006-03-09 21:34:56 +00008354 diff -Naur silo-1.4.13.orig/libext2fs/dirhash.c silo-1.4.13/libext2fs/dirhash.c 8355 --- silo-1.4.13.orig/libext2fs/dirhash.c 1969-12-31 16:00:00.000000000 -0800 8356 +++ silo-1.4.13/libext2fs/dirhash.c 2006-11-02 19:21:44.216761341 -0800 8357 8357 @@ -0,0 +1,233 @@ 8358 8358 +/* … … 8589 8589 + return 0; 8590 8590 +} 8591 diff -Naur silo-1.4.1 1.orig/libext2fs/dosio.c silo-1.4.11/libext2fs/dosio.c8592 --- silo-1.4.1 1.orig/libext2fs/dosio.c 1970-01-01 00:00:00 +00008593 +++ silo-1.4.1 1/libext2fs/dosio.c 2006-03-09 21:34:56 +00008591 diff -Naur silo-1.4.13.orig/libext2fs/dosio.c silo-1.4.13/libext2fs/dosio.c 8592 --- silo-1.4.13.orig/libext2fs/dosio.c 1969-12-31 16:00:00.000000000 -0800 8593 +++ silo-1.4.13/libext2fs/dosio.c 2006-11-02 19:21:44.216761341 -0800 8594 8594 @@ -0,0 +1,456 @@ 8595 8595 +/* … … 9049 9049 + return 0; 9050 9050 +} 9051 diff -Naur silo-1.4.1 1.orig/libext2fs/dosio.h silo-1.4.11/libext2fs/dosio.h9052 --- silo-1.4.1 1.orig/libext2fs/dosio.h 1970-01-01 00:00:00 +00009053 +++ silo-1.4.1 1/libext2fs/dosio.h 2006-03-09 21:34:56 +00009051 diff -Naur silo-1.4.13.orig/libext2fs/dosio.h silo-1.4.13/libext2fs/dosio.h 9052 --- silo-1.4.13.orig/libext2fs/dosio.h 1969-12-31 16:00:00.000000000 -0800 9053 +++ silo-1.4.13/libext2fs/dosio.h 2006-11-02 19:21:44.220761208 -0800 9054 9054 @@ -0,0 +1,153 @@ 9055 9055 +/* … … 9206 9206 + 9207 9207 +#endif /* __diskio_h */ 9208 diff -Naur silo-1.4.1 1.orig/libext2fs/dupfs.c silo-1.4.11/libext2fs/dupfs.c9209 --- silo-1.4.1 1.orig/libext2fs/dupfs.c 1970-01-01 00:00:00 +00009210 +++ silo-1.4.1 1/libext2fs/dupfs.c 2006-03-09 21:34:56 +00009208 diff -Naur silo-1.4.13.orig/libext2fs/dupfs.c silo-1.4.13/libext2fs/dupfs.c 9209 --- silo-1.4.13.orig/libext2fs/dupfs.c 1969-12-31 16:00:00.000000000 -0800 9210 +++ silo-1.4.13/libext2fs/dupfs.c 2006-11-02 19:21:44.220761208 -0800 9211 9211 @@ -0,0 +1,96 @@ 9212 9212 +/* … … 9306 9306 +} 9307 9307 + 9308 diff -Naur silo-1.4.1 1.orig/libext2fs/e2image.h silo-1.4.11/libext2fs/e2image.h9309 --- silo-1.4.1 1.orig/libext2fs/e2image.h 1970-01-01 00:00:00 +00009310 +++ silo-1.4.1 1/libext2fs/e2image.h 2006-03-09 21:34:56 +00009308 diff -Naur silo-1.4.13.orig/libext2fs/e2image.h silo-1.4.13/libext2fs/e2image.h 9309 --- silo-1.4.13.orig/libext2fs/e2image.h 1969-12-31 16:00:00.000000000 -0800 9310 +++ silo-1.4.13/libext2fs/e2image.h 2006-11-02 19:21:44.220761208 -0800 9311 9311 @@ -0,0 +1,51 @@ 9312 9312 +/* … … 9361 9361 + 9362 9362 + 9363 diff -Naur silo-1.4.1 1.orig/libext2fs/expanddir.c silo-1.4.11/libext2fs/expanddir.c9364 --- silo-1.4.1 1.orig/libext2fs/expanddir.c 1970-01-01 00:00:00 +00009365 +++ silo-1.4.1 1/libext2fs/expanddir.c 2006-03-09 21:34:56 +00009363 diff -Naur silo-1.4.13.orig/libext2fs/expanddir.c silo-1.4.13/libext2fs/expanddir.c 9364 --- silo-1.4.13.orig/libext2fs/expanddir.c 1969-12-31 16:00:00.000000000 -0800 9365 +++ silo-1.4.13/libext2fs/expanddir.c 2006-11-02 19:21:44.220761208 -0800 9366 9366 @@ -0,0 +1,126 @@ 9367 9367 +/* … … 9491 9491 + return 0; 9492 9492 +} 9493 diff -Naur silo-1.4.1 1.orig/libext2fs/ext2_err.c silo-1.4.11/libext2fs/ext2_err.c9494 --- silo-1.4.1 1.orig/libext2fs/ext2_err.c 1970-01-01 00:00:00 +00009495 +++ silo-1.4.1 1/libext2fs/ext2_err.c 2006-03-09 21:34:56 +00009493 diff -Naur silo-1.4.13.orig/libext2fs/ext2_err.c silo-1.4.13/libext2fs/ext2_err.c 9494 --- silo-1.4.13.orig/libext2fs/ext2_err.c 1969-12-31 16:00:00.000000000 -0800 9495 +++ silo-1.4.13/libext2fs/ext2_err.c 2006-11-02 19:21:44.220761208 -0800 9496 9496 @@ -0,0 +1,148 @@ 9497 9497 +/* … … 9643 9643 + *end = et; 9644 9644 +} 9645 diff -Naur silo-1.4.1 1.orig/libext2fs/ext2_ext_attr.h silo-1.4.11/libext2fs/ext2_ext_attr.h9646 --- silo-1.4.1 1.orig/libext2fs/ext2_ext_attr.h 1970-01-01 00:00:00 +00009647 +++ silo-1.4.1 1/libext2fs/ext2_ext_attr.h 2006-03-09 21:34:56 +00009645 diff -Naur silo-1.4.13.orig/libext2fs/ext2_ext_attr.h silo-1.4.13/libext2fs/ext2_ext_attr.h 9646 --- silo-1.4.13.orig/libext2fs/ext2_ext_attr.h 1969-12-31 16:00:00.000000000 -0800 9647 +++ silo-1.4.13/libext2fs/ext2_ext_attr.h 2006-11-02 19:21:44.220761208 -0800 9648 9648 @@ -0,0 +1,69 @@ 9649 9649 +/* … … 9716 9716 +#endif /* __KERNEL__ */ 9717 9717 + 9718 diff -Naur silo-1.4.1 1.orig/libext2fs/ext2_fs.h silo-1.4.11/libext2fs/ext2_fs.h9719 --- silo-1.4.1 1.orig/libext2fs/ext2_fs.h 1970-01-01 00:00:00 +00009720 +++ silo-1.4.1 1/libext2fs/ext2_fs.h 2006-03-09 21:34:56 +00009718 diff -Naur silo-1.4.13.orig/libext2fs/ext2_fs.h silo-1.4.13/libext2fs/ext2_fs.h 9719 --- silo-1.4.13.orig/libext2fs/ext2_fs.h 1969-12-31 16:00:00.000000000 -0800 9720 +++ silo-1.4.13/libext2fs/ext2_fs.h 2006-11-02 19:21:44.220761208 -0800 9721 9721 @@ -0,0 +1,644 @@ 9722 9722 +/* … … 10364 10364 + 10365 10365 +#endif /* _LINUX_EXT2_FS_H */ 10366 diff -Naur silo-1.4.1 1.orig/libext2fs/ext2_io.h silo-1.4.11/libext2fs/ext2_io.h10367 --- silo-1.4.1 1.orig/libext2fs/ext2_io.h 1970-01-01 00:00:00 +000010368 +++ silo-1.4.1 1/libext2fs/ext2_io.h 2006-03-09 21:34:56 +000010366 diff -Naur silo-1.4.13.orig/libext2fs/ext2_io.h silo-1.4.13/libext2fs/ext2_io.h 10367 --- silo-1.4.13.orig/libext2fs/ext2_io.h 1969-12-31 16:00:00.000000000 -0800 10368 +++ silo-1.4.13/libext2fs/ext2_io.h 2006-11-02 19:21:44.220761208 -0800 10369 10369 @@ -0,0 +1,108 @@ 10370 10370 +/* … … 10476 10476 +#endif /* _EXT2FS_EXT2_IO_H */ 10477 10477 + 10478 diff -Naur silo-1.4.1 1.orig/libext2fs/ext2fs.h silo-1.4.11/libext2fs/ext2fs.h10479 --- silo-1.4.1 1.orig/libext2fs/ext2fs.h 1970-01-01 00:00:00 +000010480 +++ silo-1.4.1 1/libext2fs/ext2fs.h 2006-03-09 21:34:56 +000010478 diff -Naur silo-1.4.13.orig/libext2fs/ext2fs.h silo-1.4.13/libext2fs/ext2fs.h 10479 --- silo-1.4.13.orig/libext2fs/ext2fs.h 1969-12-31 16:00:00.000000000 -0800 10480 +++ silo-1.4.13/libext2fs/ext2fs.h 2006-11-02 19:21:44.220761208 -0800 10481 10481 @@ -0,0 +1,1140 @@ 10482 10482 +/* … … 11620 11620 + 11621 11621 +#endif /* _EXT2FS_EXT2FS_H */ 11622 diff -Naur silo-1.4.1 1.orig/libext2fs/ext2fsP.h silo-1.4.11/libext2fs/ext2fsP.h11623 --- silo-1.4.1 1.orig/libext2fs/ext2fsP.h 1970-01-01 00:00:00 +000011624 +++ silo-1.4.1 1/libext2fs/ext2fsP.h 2006-03-09 21:34:56 +000011622 diff -Naur silo-1.4.13.orig/libext2fs/ext2fsP.h silo-1.4.13/libext2fs/ext2fsP.h 11623 --- silo-1.4.13.orig/libext2fs/ext2fsP.h 1969-12-31 16:00:00.000000000 -0800 11624 +++ silo-1.4.13/libext2fs/ext2fsP.h 2006-11-02 19:21:44.220761208 -0800 11625 11625 @@ -0,0 +1,88 @@ 11626 11626 +/* … … 11712 11712 + 11713 11713 + 11714 diff -Naur silo-1.4.1 1.orig/libext2fs/ext_attr.c silo-1.4.11/libext2fs/ext_attr.c11715 --- silo-1.4.1 1.orig/libext2fs/ext_attr.c 1970-01-01 00:00:00 +000011716 +++ silo-1.4.1 1/libext2fs/ext_attr.c 2006-03-09 21:34:56 +000011714 diff -Naur silo-1.4.13.orig/libext2fs/ext_attr.c silo-1.4.13/libext2fs/ext_attr.c 11715 --- silo-1.4.13.orig/libext2fs/ext_attr.c 1969-12-31 16:00:00.000000000 -0800 11716 +++ silo-1.4.13/libext2fs/ext_attr.c 2006-11-02 19:21:44.220761208 -0800 11717 11717 @@ -0,0 +1,105 @@ 11718 11718 +/* … … 11821 11821 + return retval; 11822 11822 +} 11823 diff -Naur silo-1.4.1 1.orig/libext2fs/fileio.c silo-1.4.11/libext2fs/fileio.c11824 --- silo-1.4.1 1.orig/libext2fs/fileio.c 1970-01-01 00:00:00 +000011825 +++ silo-1.4.1 1/libext2fs/fileio.c 2006-03-09 21:34:56 +000011823 diff -Naur silo-1.4.13.orig/libext2fs/fileio.c silo-1.4.13/libext2fs/fileio.c 11824 --- silo-1.4.13.orig/libext2fs/fileio.c 1969-12-31 16:00:00.000000000 -0800 11825 +++ silo-1.4.13/libext2fs/fileio.c 2006-11-02 19:21:44.224761074 -0800 11826 11826 @@ -0,0 +1,378 @@ 11827 11827 +/* … … 12203 12203 + return 0; 12204 12204 +} 12205 diff -Naur silo-1.4.1 1.orig/libext2fs/finddev.c silo-1.4.11/libext2fs/finddev.c12206 --- silo-1.4.1 1.orig/libext2fs/finddev.c 1970-01-01 00:00:00 +000012207 +++ silo-1.4.1 1/libext2fs/finddev.c 2006-03-09 21:34:57 +000012205 diff -Naur silo-1.4.13.orig/libext2fs/finddev.c silo-1.4.13/libext2fs/finddev.c 12206 --- silo-1.4.13.orig/libext2fs/finddev.c 1969-12-31 16:00:00.000000000 -0800 12207 +++ silo-1.4.13/libext2fs/finddev.c 2006-11-02 19:21:44.224761074 -0800 12208 12208 @@ -0,0 +1,208 @@ 12209 12209 +/* … … 12415 12415 + 12416 12416 +#endif 12417 diff -Naur silo-1.4.1 1.orig/libext2fs/flushb.c silo-1.4.11/libext2fs/flushb.c12418 --- silo-1.4.1 1.orig/libext2fs/flushb.c 1970-01-01 00:00:00 +000012419 +++ silo-1.4.1 1/libext2fs/flushb.c 2006-03-09 21:34:57 +000012417 diff -Naur silo-1.4.13.orig/libext2fs/flushb.c silo-1.4.13/libext2fs/flushb.c 12418 --- silo-1.4.13.orig/libext2fs/flushb.c 1969-12-31 16:00:00.000000000 -0800 12419 +++ silo-1.4.13/libext2fs/flushb.c 2006-11-02 19:21:44.224761074 -0800 12420 12420 @@ -0,0 +1,82 @@ 12421 12421 +/* … … 12501 12501 + return 0; 12502 12502 +} 12503 diff -Naur silo-1.4.1 1.orig/libext2fs/freefs.c silo-1.4.11/libext2fs/freefs.c12504 --- silo-1.4.1 1.orig/libext2fs/freefs.c 1970-01-01 00:00:00 +000012505 +++ silo-1.4.1 1/libext2fs/freefs.c 2006-03-09 21:34:57 +000012503 diff -Naur silo-1.4.13.orig/libext2fs/freefs.c silo-1.4.13/libext2fs/freefs.c 12504 --- silo-1.4.13.orig/libext2fs/freefs.c 1969-12-31 16:00:00.000000000 -0800 12505 +++ silo-1.4.13/libext2fs/freefs.c 2006-11-02 19:21:44.224761074 -0800 12506 12506 @@ -0,0 +1,147 @@ 12507 12507 +/* … … 12652 12652 +} 12653 12653 + 12654 diff -Naur silo-1.4.1 1.orig/libext2fs/gen_bitmap.c silo-1.4.11/libext2fs/gen_bitmap.c12655 --- silo-1.4.1 1.orig/libext2fs/gen_bitmap.c 1970-01-01 00:00:00 +000012656 +++ silo-1.4.1 1/libext2fs/gen_bitmap.c 2006-03-09 21:34:57 +000012654 diff -Naur silo-1.4.13.orig/libext2fs/gen_bitmap.c silo-1.4.13/libext2fs/gen_bitmap.c 12655 --- silo-1.4.13.orig/libext2fs/gen_bitmap.c 1969-12-31 16:00:00.000000000 -0800 12656 +++ silo-1.4.13/libext2fs/gen_bitmap.c 2006-11-02 19:21:44.224761074 -0800 12657 12657 @@ -0,0 +1,48 @@ 12658 12658 +/* … … 12704 12704 + return ext2fs_clear_bit(bitno - bitmap->start, bitmap->bitmap); 12705 12705 +} 12706 diff -Naur silo-1.4.1 1.orig/libext2fs/get_pathname.c silo-1.4.11/libext2fs/get_pathname.c12707 --- silo-1.4.1 1.orig/libext2fs/get_pathname.c 1970-01-01 00:00:00 +000012708 +++ silo-1.4.1 1/libext2fs/get_pathname.c 2006-03-09 21:34:57 +000012706 diff -Naur silo-1.4.13.orig/libext2fs/get_pathname.c silo-1.4.13/libext2fs/get_pathname.c 12707 --- silo-1.4.13.orig/libext2fs/get_pathname.c 1969-12-31 16:00:00.000000000 -0800 12708 +++ silo-1.4.13/libext2fs/get_pathname.c 2006-11-02 19:21:44.224761074 -0800 12709 12709 @@ -0,0 +1,157 @@ 12710 12710 +/* … … 12865 12865 + 12866 12866 +} 12867 diff -Naur silo-1.4.1 1.orig/libext2fs/getsectsize.c silo-1.4.11/libext2fs/getsectsize.c12868 --- silo-1.4.1 1.orig/libext2fs/getsectsize.c 1970-01-01 00:00:00 +000012869 +++ silo-1.4.1 1/libext2fs/getsectsize.c 2006-03-09 21:34:57 +000012867 diff -Naur silo-1.4.13.orig/libext2fs/getsectsize.c silo-1.4.13/libext2fs/getsectsize.c 12868 --- silo-1.4.13.orig/libext2fs/getsectsize.c 1969-12-31 16:00:00.000000000 -0800 12869 +++ silo-1.4.13/libext2fs/getsectsize.c 2006-11-02 19:21:44.224761074 -0800 12870 12870 @@ -0,0 +1,60 @@ 12871 12871 +/* … … 12929 12929 + return 0; 12930 12930 +} 12931 diff -Naur silo-1.4.1 1.orig/libext2fs/getsize.c silo-1.4.11/libext2fs/getsize.c12932 --- silo-1.4.1 1.orig/libext2fs/getsize.c 1970-01-01 00:00:00 +000012933 +++ silo-1.4.1 1/libext2fs/getsize.c 2006-03-09 21:34:57 +000012931 diff -Naur silo-1.4.13.orig/libext2fs/getsize.c silo-1.4.13/libext2fs/getsize.c 12932 --- silo-1.4.13.orig/libext2fs/getsize.c 1969-12-31 16:00:00.000000000 -0800 12933 +++ silo-1.4.13/libext2fs/getsize.c 2006-11-02 19:21:44.224761074 -0800 12934 12934 @@ -0,0 +1,293 @@ 12935 12935 +/* … … 13226 13226 +} 13227 13227 +#endif 13228 diff -Naur silo-1.4.1 1.orig/libext2fs/icount.c silo-1.4.11/libext2fs/icount.c13229 --- silo-1.4.1 1.orig/libext2fs/icount.c 1970-01-01 00:00:00 +000013230 +++ silo-1.4.1 1/libext2fs/icount.c 2006-03-09 21:34:57 +000013228 diff -Naur silo-1.4.13.orig/libext2fs/icount.c silo-1.4.13/libext2fs/icount.c 13229 --- silo-1.4.13.orig/libext2fs/icount.c 1969-12-31 16:00:00.000000000 -0800 13230 +++ silo-1.4.13/libext2fs/icount.c 2006-11-02 19:21:44.224761074 -0800 13231 13231 @@ -0,0 +1,483 @@ 13232 13232 +/* … … 13713 13713 + return icount->size; 13714 13714 +} 13715 diff -Naur silo-1.4.1 1.orig/libext2fs/imager.c silo-1.4.11/libext2fs/imager.c13716 --- silo-1.4.1 1.orig/libext2fs/imager.c 1970-01-01 00:00:00 +000013717 +++ silo-1.4.1 1/libext2fs/imager.c 2006-03-09 21:34:57 +000013715 diff -Naur silo-1.4.13.orig/libext2fs/imager.c silo-1.4.13/libext2fs/imager.c 13716 --- silo-1.4.13.orig/libext2fs/imager.c 1969-12-31 16:00:00.000000000 -0800 13717 +++ silo-1.4.13/libext2fs/imager.c 2006-11-02 19:21:44.224761074 -0800 13718 13718 @@ -0,0 +1,387 @@ 13719 13719 +/* … … 14104 14104 + return (retval); 14105 14105 +} 14106 diff -Naur silo-1.4.1 1.orig/libext2fs/ind_block.c silo-1.4.11/libext2fs/ind_block.c14107 --- silo-1.4.1 1.orig/libext2fs/ind_block.c 1970-01-01 00:00:00 +000014108 +++ silo-1.4.1 1/libext2fs/ind_block.c 2006-03-09 21:34:57 +000014106 diff -Naur silo-1.4.13.orig/libext2fs/ind_block.c silo-1.4.13/libext2fs/ind_block.c 14107 --- silo-1.4.13.orig/libext2fs/ind_block.c 1969-12-31 16:00:00.000000000 -0800 14108 +++ silo-1.4.13/libext2fs/ind_block.c 2006-11-02 19:21:44.224761074 -0800 14109 14109 @@ -0,0 +1,66 @@ 14110 14110 +/* … … 14174 14174 + 14175 14175 + 14176 diff -Naur silo-1.4.1 1.orig/libext2fs/initialize.c silo-1.4.11/libext2fs/initialize.c14177 --- silo-1.4.1 1.orig/libext2fs/initialize.c 1970-01-01 00:00:00 +000014178 +++ silo-1.4.1 1/libext2fs/initialize.c 2006-03-09 21:34:57 +000014176 diff -Naur silo-1.4.13.orig/libext2fs/initialize.c silo-1.4.13/libext2fs/initialize.c 14177 --- silo-1.4.13.orig/libext2fs/initialize.c 1969-12-31 16:00:00.000000000 -0800 14178 +++ silo-1.4.13/libext2fs/initialize.c 2006-11-02 19:21:44.224761074 -0800 14179 14179 @@ -0,0 +1,387 @@ 14180 14180 +/* … … 14565 14565 + return retval; 14566 14566 +} 14567 diff -Naur silo-1.4.1 1.orig/libext2fs/inline.c silo-1.4.11/libext2fs/inline.c14568 --- silo-1.4.1 1.orig/libext2fs/inline.c 1970-01-01 00:00:00 +000014569 +++ silo-1.4.1 1/libext2fs/inline.c 2006-03-09 21:34:57 +000014567 diff -Naur silo-1.4.13.orig/libext2fs/inline.c silo-1.4.13/libext2fs/inline.c 14568 --- silo-1.4.13.orig/libext2fs/inline.c 1969-12-31 16:00:00.000000000 -0800 14569 +++ silo-1.4.13/libext2fs/inline.c 2006-11-02 19:21:44.224761074 -0800 14570 14570 @@ -0,0 +1,32 @@ 14571 14571 +/* … … 14601 14601 +#include "ext2fs.h" 14602 14602 + 14603 diff -Naur silo-1.4.1 1.orig/libext2fs/inode.c silo-1.4.11/libext2fs/inode.c14604 --- silo-1.4.1 1.orig/libext2fs/inode.c 1970-01-01 00:00:00 +000014605 +++ silo-1.4.1 1/libext2fs/inode.c 2006-03-09 21:34:57 +000014603 diff -Naur silo-1.4.13.orig/libext2fs/inode.c silo-1.4.13/libext2fs/inode.c 14604 --- silo-1.4.13.orig/libext2fs/inode.c 1969-12-31 16:00:00.000000000 -0800 14605 +++ silo-1.4.13/libext2fs/inode.c 2006-11-02 19:21:44.228760941 -0800 14606 14606 @@ -0,0 +1,794 @@ 14607 14607 +/* … … 15399 15399 +} 15400 15400 + 15401 diff -Naur silo-1.4.1 1.orig/libext2fs/inode_io.c silo-1.4.11/libext2fs/inode_io.c15402 --- silo-1.4.1 1.orig/libext2fs/inode_io.c 1970-01-01 00:00:00 +000015403 +++ silo-1.4.1 1/libext2fs/inode_io.c 2006-03-09 21:34:57 +000015401 diff -Naur silo-1.4.13.orig/libext2fs/inode_io.c silo-1.4.13/libext2fs/inode_io.c 15402 --- silo-1.4.13.orig/libext2fs/inode_io.c 1969-12-31 16:00:00.000000000 -0800 15403 +++ silo-1.4.13/libext2fs/inode_io.c 2006-11-02 19:21:44.228760941 -0800 15404 15404 @@ -0,0 +1,270 @@ 15405 15405 +/* … … 15673 15673 +} 15674 15674 + 15675 diff -Naur silo-1.4.1 1.orig/libext2fs/io_manager.c silo-1.4.11/libext2fs/io_manager.c15676 --- silo-1.4.1 1.orig/libext2fs/io_manager.c 1970-01-01 00:00:00 +000015677 +++ silo-1.4.1 1/libext2fs/io_manager.c 2006-03-09 21:34:57 +000015675 diff -Naur silo-1.4.13.orig/libext2fs/io_manager.c silo-1.4.13/libext2fs/io_manager.c 15676 --- silo-1.4.13.orig/libext2fs/io_manager.c 1969-12-31 16:00:00.000000000 -0800 15677 +++ silo-1.4.13/libext2fs/io_manager.c 2006-11-02 19:21:44.228760941 -0800 15678 15678 @@ -0,0 +1,69 @@ 15679 15679 +/* … … 15746 15746 + return EXT2_ET_UNIMPLEMENTED; 15747 15747 +} 15748 diff -Naur silo-1.4.1 1.orig/libext2fs/irel.h silo-1.4.11/libext2fs/irel.h15749 --- silo-1.4.1 1.orig/libext2fs/irel.h 1970-01-01 00:00:00 +000015750 +++ silo-1.4.1 1/libext2fs/irel.h 2006-03-09 21:34:57 +000015748 diff -Naur silo-1.4.13.orig/libext2fs/irel.h silo-1.4.13/libext2fs/irel.h 15749 --- silo-1.4.13.orig/libext2fs/irel.h 1969-12-31 16:00:00.000000000 -0800 15750 +++ silo-1.4.13/libext2fs/irel.h 2006-11-02 19:21:44.228760941 -0800 15751 15751 @@ -0,0 +1,114 @@ 15752 15752 +/* … … 15864 15864 +#define ext2fs_irel_delete(irel, old) ((irel)->delete((irel), old)) 15865 15865 +#define ext2fs_irel_free(irel) ((irel)->free((irel))) 15866 diff -Naur silo-1.4.1 1.orig/libext2fs/irel_ma.c silo-1.4.11/libext2fs/irel_ma.c15867 --- silo-1.4.1 1.orig/libext2fs/irel_ma.c 1970-01-01 00:00:00 +000015868 +++ silo-1.4.1 1/libext2fs/irel_ma.c 2006-03-09 21:34:57 +000015866 diff -Naur silo-1.4.13.orig/libext2fs/irel_ma.c silo-1.4.13/libext2fs/irel_ma.c 15867 --- silo-1.4.13.orig/libext2fs/irel_ma.c 1969-12-31 16:00:00.000000000 -0800 15868 +++ silo-1.4.13/libext2fs/irel_ma.c 2006-11-02 19:21:44.228760941 -0800 15869 15869 @@ -0,0 +1,372 @@ 15870 15870 +/* … … 16240 16240 + return 0; 16241 16241 +} 16242 diff -Naur silo-1.4.1 1.orig/libext2fs/ismounted.c silo-1.4.11/libext2fs/ismounted.c16243 --- silo-1.4.1 1.orig/libext2fs/ismounted.c 1970-01-01 00:00:00 +000016244 +++ silo-1.4.1 1/libext2fs/ismounted.c 2006-03-09 21:34:57 +000016242 diff -Naur silo-1.4.13.orig/libext2fs/ismounted.c silo-1.4.13/libext2fs/ismounted.c 16243 --- silo-1.4.13.orig/libext2fs/ismounted.c 1969-12-31 16:00:00.000000000 -0800 16244 +++ silo-1.4.13/libext2fs/ismounted.c 2006-11-02 19:21:44.228760941 -0800 16245 16245 @@ -0,0 +1,377 @@ 16246 16246 +/* … … 16621 16621 +} 16622 16622 +#endif /* DEBUG */ 16623 diff -Naur silo-1.4.1 1.orig/libext2fs/jfs_compat.h silo-1.4.11/libext2fs/jfs_compat.h16624 --- silo-1.4.1 1.orig/libext2fs/jfs_compat.h 1970-01-01 00:00:00 +000016625 +++ silo-1.4.1 1/libext2fs/jfs_compat.h 2006-03-09 21:34:57 +000016623 diff -Naur silo-1.4.13.orig/libext2fs/jfs_compat.h silo-1.4.13/libext2fs/jfs_compat.h 16624 --- silo-1.4.13.orig/libext2fs/jfs_compat.h 1969-12-31 16:00:00.000000000 -0800 16625 +++ silo-1.4.13/libext2fs/jfs_compat.h 2006-11-02 19:21:44.228760941 -0800 16626 16626 @@ -0,0 +1,67 @@ 16627 16627 + … … 16692 16692 + 16693 16693 +#endif /* _JFS_COMPAT_H */ 16694 diff -Naur silo-1.4.1 1.orig/libext2fs/jfs_dat.h silo-1.4.11/libext2fs/jfs_dat.h16695 --- silo-1.4.1 1.orig/libext2fs/jfs_dat.h 1970-01-01 00:00:00 +000016696 +++ silo-1.4.1 1/libext2fs/jfs_dat.h 2006-03-09 21:34:57 +000016694 diff -Naur silo-1.4.13.orig/libext2fs/jfs_dat.h silo-1.4.13/libext2fs/jfs_dat.h 16695 --- silo-1.4.13.orig/libext2fs/jfs_dat.h 1969-12-31 16:00:00.000000000 -0800 16696 +++ silo-1.4.13/libext2fs/jfs_dat.h 2006-11-02 19:21:44.228760941 -0800 16697 16697 @@ -0,0 +1,64 @@ 16698 16698 +/* … … 16760 16760 +} journal_superblock_t; 16761 16761 + 16762 diff -Naur silo-1.4.1 1.orig/libext2fs/jfs_user.h silo-1.4.11/libext2fs/jfs_user.h16763 --- silo-1.4.1 1.orig/libext2fs/jfs_user.h 1970-01-01 00:00:00 +000016764 +++ silo-1.4.1 1/libext2fs/jfs_user.h 2006-03-09 21:34:57 +000016762 diff -Naur silo-1.4.13.orig/libext2fs/jfs_user.h silo-1.4.13/libext2fs/jfs_user.h 16763 --- silo-1.4.13.orig/libext2fs/jfs_user.h 1969-12-31 16:00:00.000000000 -0800 16764 +++ silo-1.4.13/libext2fs/jfs_user.h 2006-11-02 19:21:44.228760941 -0800 16765 16765 @@ -0,0 +1,8 @@ 16766 16766 +#ifndef _JFS_USER_H … … 16772 16772 + 16773 16773 +#endif /* _JFS_USER_H */ 16774 diff -Naur silo-1.4.1 1.orig/libext2fs/kernel-jbd.h silo-1.4.11/libext2fs/kernel-jbd.h16775 --- silo-1.4.1 1.orig/libext2fs/kernel-jbd.h 1970-01-01 00:00:00 +000016776 +++ silo-1.4.1 1/libext2fs/kernel-jbd.h 2006-03-09 21:34:57 +000016774 diff -Naur silo-1.4.13.orig/libext2fs/kernel-jbd.h silo-1.4.13/libext2fs/kernel-jbd.h 16775 --- silo-1.4.13.orig/libext2fs/kernel-jbd.h 1969-12-31 16:00:00.000000000 -0800 16776 +++ silo-1.4.13/libext2fs/kernel-jbd.h 2006-11-02 19:21:44.228760941 -0800 16777 16777 @@ -0,0 +1,910 @@ 16778 16778 +/* … … 17686 17686 +#endif /* defined(__KERNEL__) && !defined(CONFIG_JBD) */ 17687 17687 +#endif /* _LINUX_JBD_H */ 17688 diff -Naur silo-1.4.1 1.orig/libext2fs/kernel-list.h silo-1.4.11/libext2fs/kernel-list.h17689 --- silo-1.4.1 1.orig/libext2fs/kernel-list.h 1970-01-01 00:00:00 +000017690 +++ silo-1.4.1 1/libext2fs/kernel-list.h 2006-03-09 21:34:57 +000017688 diff -Naur silo-1.4.13.orig/libext2fs/kernel-list.h silo-1.4.13/libext2fs/kernel-list.h 17689 --- silo-1.4.13.orig/libext2fs/kernel-list.h 1969-12-31 16:00:00.000000000 -0800 17690 +++ silo-1.4.13/libext2fs/kernel-list.h 2006-11-02 19:21:44.232760807 -0800 17691 17691 @@ -0,0 +1,112 @@ 17692 17692 +#ifndef _LINUX_LIST_H … … 17802 17802 + 17803 17803 +#endif 17804 diff -Naur silo-1.4.1 1.orig/libext2fs/link.c silo-1.4.11/libext2fs/link.c17805 --- silo-1.4.1 1.orig/libext2fs/link.c 1970-01-01 00:00:00 +000017806 +++ silo-1.4.1 1/libext2fs/link.c 2006-03-09 21:34:57 +000017804 diff -Naur silo-1.4.13.orig/libext2fs/link.c silo-1.4.13/libext2fs/link.c 17805 --- silo-1.4.13.orig/libext2fs/link.c 1969-12-31 16:00:00.000000000 -0800 17806 +++ silo-1.4.13/libext2fs/link.c 2006-11-02 19:21:44.232760807 -0800 17807 17807 @@ -0,0 +1,134 @@ 17808 17808 +/* … … 17940 17940 + return 0; 17941 17941 +} 17942 diff -Naur silo-1.4.1 1.orig/libext2fs/llseek.c silo-1.4.11/libext2fs/llseek.c17943 --- silo-1.4.1 1.orig/libext2fs/llseek.c 1970-01-01 00:00:00 +000017944 +++ silo-1.4.1 1/libext2fs/llseek.c 2006-03-09 21:34:57 +000017942 diff -Naur silo-1.4.13.orig/libext2fs/llseek.c silo-1.4.13/libext2fs/llseek.c 17943 --- silo-1.4.13.orig/libext2fs/llseek.c 1969-12-31 16:00:00.000000000 -0800 17944 +++ silo-1.4.13/libext2fs/llseek.c 2006-11-02 19:21:44.232760807 -0800 17945 17945 @@ -0,0 +1,138 @@ 17946 17946 +/* … … 18082 18082 + 18083 18083 + 18084 diff -Naur silo-1.4.1 1.orig/libext2fs/lookup.c silo-1.4.11/libext2fs/lookup.c18085 --- silo-1.4.1 1.orig/libext2fs/lookup.c 1970-01-01 00:00:00 +000018086 +++ silo-1.4.1 1/libext2fs/lookup.c 2006-03-09 21:34:57 +000018084 diff -Naur silo-1.4.13.orig/libext2fs/lookup.c silo-1.4.13/libext2fs/lookup.c 18085 --- silo-1.4.13.orig/libext2fs/lookup.c 1969-12-31 16:00:00.000000000 -0800 18086 +++ silo-1.4.13/libext2fs/lookup.c 2006-11-02 19:21:44.232760807 -0800 18087 18087 @@ -0,0 +1,69 @@ 18088 18088 +/* … … 18155 18155 + 18156 18156 + 18157 diff -Naur silo-1.4.1 1.orig/libext2fs/mkdir.c silo-1.4.11/libext2fs/mkdir.c18158 --- silo-1.4.1 1.orig/libext2fs/mkdir.c 1970-01-01 00:00:00 +000018159 +++ silo-1.4.1 1/libext2fs/mkdir.c 2006-03-09 21:34:57 +000018157 diff -Naur silo-1.4.13.orig/libext2fs/mkdir.c silo-1.4.13/libext2fs/mkdir.c 18158 --- silo-1.4.13.orig/libext2fs/mkdir.c 1969-12-31 16:00:00.000000000 -0800 18159 +++ silo-1.4.13/libext2fs/mkdir.c 2006-11-02 19:21:44.232760807 -0800 18160 18160 @@ -0,0 +1,142 @@ 18161 18161 +/* … … 18301 18301 + 18302 18302 + 18303 diff -Naur silo-1.4.1 1.orig/libext2fs/mkjournal.c silo-1.4.11/libext2fs/mkjournal.c18304 --- silo-1.4.1 1.orig/libext2fs/mkjournal.c 1970-01-01 00:00:00 +000018305 +++ silo-1.4.1 1/libext2fs/mkjournal.c 2006-03-09 21:34:57 +000018303 diff -Naur silo-1.4.13.orig/libext2fs/mkjournal.c silo-1.4.13/libext2fs/mkjournal.c 18304 --- silo-1.4.13.orig/libext2fs/mkjournal.c 1969-12-31 16:00:00.000000000 -0800 18305 +++ silo-1.4.13/libext2fs/mkjournal.c 2006-11-02 19:21:44.232760807 -0800 18306 18306 @@ -0,0 +1,425 @@ 18307 18307 +/* … … 18730 18730 +} 18731 18731 +#endif 18732 diff -Naur silo-1.4.1 1.orig/libext2fs/namei.c silo-1.4.11/libext2fs/namei.c18733 --- silo-1.4.1 1.orig/libext2fs/namei.c 1970-01-01 00:00:00 +000018734 +++ silo-1.4.1 1/libext2fs/namei.c 2006-03-09 21:34:57 +000018732 diff -Naur silo-1.4.13.orig/libext2fs/namei.c silo-1.4.13/libext2fs/namei.c 18733 --- silo-1.4.13.orig/libext2fs/namei.c 1969-12-31 16:00:00.000000000 -0800 18734 +++ silo-1.4.13/libext2fs/namei.c 2006-11-02 19:21:44.232760807 -0800 18735 18735 @@ -0,0 +1,205 @@ 18736 18736 +/* … … 18939 18939 +} 18940 18940 + 18941 diff -Naur silo-1.4.1 1.orig/libext2fs/native.c silo-1.4.11/libext2fs/native.c18942 --- silo-1.4.1 1.orig/libext2fs/native.c 1970-01-01 00:00:00 +000018943 +++ silo-1.4.1 1/libext2fs/native.c 2006-03-09 21:34:57 +000018941 diff -Naur silo-1.4.13.orig/libext2fs/native.c silo-1.4.13/libext2fs/native.c 18942 --- silo-1.4.13.orig/libext2fs/native.c 1969-12-31 16:00:00.000000000 -0800 18943 +++ silo-1.4.13/libext2fs/native.c 2006-11-02 19:21:44.232760807 -0800 18944 18944 @@ -0,0 +1,27 @@ 18945 18945 +/* … … 18970 18970 + 18971 18971 + 18972 diff -Naur silo-1.4.1 1.orig/libext2fs/newdir.c silo-1.4.11/libext2fs/newdir.c18973 --- silo-1.4.1 1.orig/libext2fs/newdir.c 1970-01-01 00:00:00 +000018974 +++ silo-1.4.1 1/libext2fs/newdir.c 2006-03-09 21:34:57 +000018972 diff -Naur silo-1.4.13.orig/libext2fs/newdir.c silo-1.4.13/libext2fs/newdir.c 18973 --- silo-1.4.13.orig/libext2fs/newdir.c 1969-12-31 16:00:00.000000000 -0800 18974 +++ silo-1.4.13/libext2fs/newdir.c 2006-11-02 19:21:44.232760807 -0800 18975 18975 @@ -0,0 +1,72 @@ 18976 18976 +/* … … 19046 19046 + return 0; 19047 19047 +} 19048 diff -Naur silo-1.4.1 1.orig/libext2fs/nt_io.c silo-1.4.11/libext2fs/nt_io.c19049 --- silo-1.4.1 1.orig/libext2fs/nt_io.c 1970-01-01 00:00:00 +000019050 +++ silo-1.4.1 1/libext2fs/nt_io.c 2006-03-09 21:34:57 +000019048 diff -Naur silo-1.4.13.orig/libext2fs/nt_io.c silo-1.4.13/libext2fs/nt_io.c 19049 --- silo-1.4.13.orig/libext2fs/nt_io.c 1969-12-31 16:00:00.000000000 -0800 19050 +++ silo-1.4.13/libext2fs/nt_io.c 2006-11-02 19:21:44.232760807 -0800 19051 19051 @@ -0,0 +1,1513 @@ 19052 19052 +/* … … 20563 20563 + 20564 20564 + 20565 diff -Naur silo-1.4.1 1.orig/libext2fs/openfs.c silo-1.4.11/libext2fs/openfs.c20566 --- silo-1.4.1 1.orig/libext2fs/openfs.c 1970-01-01 00:00:00 +000020567 +++ silo-1.4.1 1/libext2fs/openfs.c 2006-03-09 21:34:57 +000020565 diff -Naur silo-1.4.13.orig/libext2fs/openfs.c silo-1.4.13/libext2fs/openfs.c 20566 --- silo-1.4.13.orig/libext2fs/openfs.c 1969-12-31 16:00:00.000000000 -0800 20567 +++ silo-1.4.13/libext2fs/openfs.c 2006-11-02 19:21:44.232760807 -0800 20568 20568 @@ -0,0 +1,326 @@ 20569 20569 +/* … … 20893 20893 + return 0; 20894 20894 +} 20895 diff -Naur silo-1.4.1 1.orig/libext2fs/read_bb.c silo-1.4.11/libext2fs/read_bb.c20896 --- silo-1.4.1 1.orig/libext2fs/read_bb.c 1970-01-01 00:00:00 +000020897 +++ silo-1.4.1 1/libext2fs/read_bb.c 2006-03-09 21:34:57 +000020895 diff -Naur silo-1.4.13.orig/libext2fs/read_bb.c silo-1.4.13/libext2fs/read_bb.c 20896 --- silo-1.4.13.orig/libext2fs/read_bb.c 1969-12-31 16:00:00.000000000 -0800 20897 +++ silo-1.4.13/libext2fs/read_bb.c 2006-11-02 19:21:44.236760673 -0800 20898 20898 @@ -0,0 +1,97 @@ 20899 20899 +/* … … 20994 20994 + 20995 20995 + 20996 diff -Naur silo-1.4.1 1.orig/libext2fs/read_bb_file.c silo-1.4.11/libext2fs/read_bb_file.c20997 --- silo-1.4.1 1.orig/libext2fs/read_bb_file.c 1970-01-01 00:00:00 +000020998 +++ silo-1.4.1 1/libext2fs/read_bb_file.c 2006-03-09 21:34:57 +000020996 diff -Naur silo-1.4.13.orig/libext2fs/read_bb_file.c silo-1.4.13/libext2fs/read_bb_file.c 20997 --- silo-1.4.13.orig/libext2fs/read_bb_file.c 1969-12-31 16:00:00.000000000 -0800 20998 +++ silo-1.4.13/libext2fs/read_bb_file.c 2006-11-02 19:21:44.236760673 -0800 20999 20999 @@ -0,0 +1,97 @@ 21000 21000 +/* … … 21095 21095 + 21096 21096 + 21097 diff -Naur silo-1.4.1 1.orig/libext2fs/res_gdt.c silo-1.4.11/libext2fs/res_gdt.c21098 --- silo-1.4.1 1.orig/libext2fs/res_gdt.c 1970-01-01 00:00:00 +000021099 +++ silo-1.4.1 1/libext2fs/res_gdt.c 2006-03-09 21:34:57 +000021097 diff -Naur silo-1.4.13.orig/libext2fs/res_gdt.c silo-1.4.13/libext2fs/res_gdt.c 21098 --- silo-1.4.13.orig/libext2fs/res_gdt.c 1969-12-31 16:00:00.000000000 -0800 21099 +++ silo-1.4.13/libext2fs/res_gdt.c 2006-11-02 19:21:44.236760673 -0800 21100 21100 @@ -0,0 +1,220 @@ 21101 21101 +/* … … 21319 21319 +} 21320 21320 + 21321 diff -Naur silo-1.4.1 1.orig/libext2fs/rs_bitmap.c silo-1.4.11/libext2fs/rs_bitmap.c21322 --- silo-1.4.1 1.orig/libext2fs/rs_bitmap.c 1970-01-01 00:00:00 +000021323 +++ silo-1.4.1 1/libext2fs/rs_bitmap.c 2006-03-09 21:34:57 +000021321 diff -Naur silo-1.4.13.orig/libext2fs/rs_bitmap.c silo-1.4.13/libext2fs/rs_bitmap.c 21322 --- silo-1.4.13.orig/libext2fs/rs_bitmap.c 1969-12-31 16:00:00.000000000 -0800 21323 +++ silo-1.4.13/libext2fs/rs_bitmap.c 2006-11-02 19:21:44.236760673 -0800 21324 21324 @@ -0,0 +1,106 @@ 21325 21325 +/* … … 21429 21429 +} 21430 21430 + 21431 diff -Naur silo-1.4.1 1.orig/libext2fs/rw_bitmaps.c silo-1.4.11/libext2fs/rw_bitmaps.c21432 --- silo-1.4.1 1.orig/libext2fs/rw_bitmaps.c 1970-01-01 00:00:00 +000021433 +++ silo-1.4.1 1/libext2fs/rw_bitmaps.c 2006-03-09 21:34:57 +000021431 diff -Naur silo-1.4.13.orig/libext2fs/rw_bitmaps.c silo-1.4.13/libext2fs/rw_bitmaps.c 21432 --- silo-1.4.13.orig/libext2fs/rw_bitmaps.c 1969-12-31 16:00:00.000000000 -0800 21433 +++ silo-1.4.13/libext2fs/rw_bitmaps.c 2006-11-02 19:21:44.236760673 -0800 21434 21434 @@ -0,0 +1,300 @@ 21435 21435 +/* … … 21733 21733 +} 21734 21734 + 21735 diff -Naur silo-1.4.1 1.orig/libext2fs/sparse.c silo-1.4.11/libext2fs/sparse.c21736 --- silo-1.4.1 1.orig/libext2fs/sparse.c 1970-01-01 00:00:00 +000021737 +++ silo-1.4.1 1/libext2fs/sparse.c 2006-03-09 21:34:57 +000021735 diff -Naur silo-1.4.13.orig/libext2fs/sparse.c silo-1.4.13/libext2fs/sparse.c 21736 --- silo-1.4.13.orig/libext2fs/sparse.c 1969-12-31 16:00:00.000000000 -0800 21737 +++ silo-1.4.13/libext2fs/sparse.c 2006-11-02 19:21:44.236760673 -0800 21738 21738 @@ -0,0 +1,78 @@ 21739 21739 +/* … … 21815 21815 + return ret; 21816 21816 +} 21817 diff -Naur silo-1.4.1 1.orig/libext2fs/swapfs.c silo-1.4.11/libext2fs/swapfs.c21818 --- silo-1.4.1 1.orig/libext2fs/swapfs.c 1970-01-01 00:00:00 +000021819 +++ silo-1.4.1 1/libext2fs/swapfs.c 2006-03-09 21:34:57 +000021817 diff -Naur silo-1.4.13.orig/libext2fs/swapfs.c silo-1.4.13/libext2fs/swapfs.c 21818 --- silo-1.4.13.orig/libext2fs/swapfs.c 1969-12-31 16:00:00.000000000 -0800 21819 +++ silo-1.4.13/libext2fs/swapfs.c 2006-11-02 19:21:44.236760673 -0800 21820 21820 @@ -0,0 +1,237 @@ 21821 21821 +/* … … 22056 22056 + 22057 22057 +#endif 22058 diff -Naur silo-1.4.1 1.orig/libext2fs/test_io.c silo-1.4.11/libext2fs/test_io.c22059 --- silo-1.4.1 1.orig/libext2fs/test_io.c 1970-01-01 00:00:00 +000022060 +++ silo-1.4.1 1/libext2fs/test_io.c 2006-03-09 21:34:57 +000022058 diff -Naur silo-1.4.13.orig/libext2fs/test_io.c silo-1.4.13/libext2fs/test_io.c 22059 --- silo-1.4.13.orig/libext2fs/test_io.c 1969-12-31 16:00:00.000000000 -0800 22060 +++ silo-1.4.13/libext2fs/test_io.c 2006-11-02 19:21:44.244760406 -0800 22061 22061 @@ -0,0 +1,411 @@ 22062 22062 +/* … … 22471 22471 + return retval; 22472 22472 +} 22473 diff -Naur silo-1.4.1 1.orig/libext2fs/tst_badblocks.c silo-1.4.11/libext2fs/tst_badblocks.c22474 --- silo-1.4.1 1.orig/libext2fs/tst_badblocks.c 1970-01-01 00:00:00 +000022475 +++ silo-1.4.1 1/libext2fs/tst_badblocks.c 2006-03-09 21:34:57 +000022473 diff -Naur silo-1.4.13.orig/libext2fs/tst_badblocks.c silo-1.4.13/libext2fs/tst_badblocks.c 22474 --- silo-1.4.13.orig/libext2fs/tst_badblocks.c 1969-12-31 16:00:00.000000000 -0800 22475 +++ silo-1.4.13/libext2fs/tst_badblocks.c 2006-11-02 19:21:44.244760406 -0800 22476 22476 @@ -0,0 +1,293 @@ 22477 22477 +/* … … 22768 22768 + 22769 22769 +} 22770 diff -Naur silo-1.4.1 1.orig/libext2fs/tst_bitops.c silo-1.4.11/libext2fs/tst_bitops.c22771 --- silo-1.4.1 1.orig/libext2fs/tst_bitops.c 1970-01-01 00:00:00 +000022772 +++ silo-1.4.1 1/libext2fs/tst_bitops.c 2006-03-09 21:34:57 +000022770 diff -Naur silo-1.4.13.orig/libext2fs/tst_bitops.c silo-1.4.13/libext2fs/tst_bitops.c 22771 --- silo-1.4.13.orig/libext2fs/tst_bitops.c 1969-12-31 16:00:00.000000000 -0800 22772 +++ silo-1.4.13/libext2fs/tst_bitops.c 2006-11-02 19:21:44.244760406 -0800 22773 22773 @@ -0,0 +1,44 @@ 22774 22774 +/* … … 22816 22816 + } 22817 22817 +} 22818 diff -Naur silo-1.4.1 1.orig/libext2fs/tst_byteswap.c silo-1.4.11/libext2fs/tst_byteswap.c22819 --- silo-1.4.1 1.orig/libext2fs/tst_byteswap.c 1970-01-01 00:00:00 +000022820 +++ silo-1.4.1 1/libext2fs/tst_byteswap.c 2006-03-09 21:34:57 +000022818 diff -Naur silo-1.4.13.orig/libext2fs/tst_byteswap.c silo-1.4.13/libext2fs/tst_byteswap.c 22819 --- silo-1.4.13.orig/libext2fs/tst_byteswap.c 1969-12-31 16:00:00.000000000 -0800 22820 +++ silo-1.4.13/libext2fs/tst_byteswap.c 2006-11-02 19:21:44.244760406 -0800 22821 22821 @@ -0,0 +1,92 @@ 22822 22822 +/* … … 22912 22912 + return errors; 22913 22913 +} 22914 diff -Naur silo-1.4.1 1.orig/libext2fs/tst_getsectsize.c silo-1.4.11/libext2fs/tst_getsectsize.c22915 --- silo-1.4.1 1.orig/libext2fs/tst_getsectsize.c 1970-01-01 00:00:00 +000022916 +++ silo-1.4.1 1/libext2fs/tst_getsectsize.c 2006-03-09 21:34:57 +000022914 diff -Naur silo-1.4.13.orig/libext2fs/tst_getsectsize.c silo-1.4.13/libext2fs/tst_getsectsize.c 22915 --- silo-1.4.13.orig/libext2fs/tst_getsectsize.c 1969-12-31 16:00:00.000000000 -0800 22916 +++ silo-1.4.13/libext2fs/tst_getsectsize.c 2006-11-02 19:21:44.244760406 -0800 22917 22917 @@ -0,0 +1,47 @@ 22918 22918 +/* … … 22963 22963 + exit(0); 22964 22964 +} 22965 diff -Naur silo-1.4.1 1.orig/libext2fs/tst_getsize.c silo-1.4.11/libext2fs/tst_getsize.c22966 --- silo-1.4.1 1.orig/libext2fs/tst_getsize.c 1970-01-01 00:00:00 +000022967 +++ silo-1.4.1 1/libext2fs/tst_getsize.c 2006-03-09 21:34:57 +000022965 diff -Naur silo-1.4.13.orig/libext2fs/tst_getsize.c silo-1.4.13/libext2fs/tst_getsize.c 22966 --- silo-1.4.13.orig/libext2fs/tst_getsize.c 1969-12-31 16:00:00.000000000 -0800 22967 +++ silo-1.4.13/libext2fs/tst_getsize.c 2006-11-02 19:21:44.244760406 -0800 22968 22968 @@ -0,0 +1,44 @@ 22969 22969 +/* … … 23011 23011 + return 0; 23012 23012 +} 23013 diff -Naur silo-1.4.1 1.orig/libext2fs/tst_iscan.c silo-1.4.11/libext2fs/tst_iscan.c23014 --- silo-1.4.1 1.orig/libext2fs/tst_iscan.c 1970-01-01 00:00:00 +000023015 +++ silo-1.4.1 1/libext2fs/tst_iscan.c 2006-03-09 21:34:57 +000023013 diff -Naur silo-1.4.13.orig/libext2fs/tst_iscan.c silo-1.4.13/libext2fs/tst_iscan.c 23014 --- silo-1.4.13.orig/libext2fs/tst_iscan.c 1969-12-31 16:00:00.000000000 -0800 23015 +++ silo-1.4.13/libext2fs/tst_iscan.c 2006-11-02 19:21:44.252760139 -0800 23016 23016 @@ -0,0 +1,218 @@ 23017 23017 +/* … … 23233 23233 +} 23234 23234 + 23235 diff -Naur silo-1.4.1 1.orig/libext2fs/unix_io.c silo-1.4.11/libext2fs/unix_io.c23236 --- silo-1.4.1 1.orig/libext2fs/unix_io.c 1970-01-01 00:00:00 +000023237 +++ silo-1.4.1 1/libext2fs/unix_io.c 2006-03-09 21:34:57 +000023235 diff -Naur silo-1.4.13.orig/libext2fs/unix_io.c silo-1.4.13/libext2fs/unix_io.c 23236 --- silo-1.4.13.orig/libext2fs/unix_io.c 1969-12-31 16:00:00.000000000 -0800 23237 +++ silo-1.4.13/libext2fs/unix_io.c 2006-11-02 19:21:44.252760139 -0800 23238 23238 @@ -0,0 +1,710 @@ 23239 23239 +/* … … 23947 23947 + return EXT2_ET_INVALID_ARGUMENT; 23948 23948 +} 23949 diff -Naur silo-1.4.1 1.orig/libext2fs/unlink.c silo-1.4.11/libext2fs/unlink.c23950 --- silo-1.4.1 1.orig/libext2fs/unlink.c 1970-01-01 00:00:00 +000023951 +++ silo-1.4.1 1/libext2fs/unlink.c 2006-03-09 21:34:57 +000023949 diff -Naur silo-1.4.13.orig/libext2fs/unlink.c silo-1.4.13/libext2fs/unlink.c 23950 --- silo-1.4.13.orig/libext2fs/unlink.c 1969-12-31 16:00:00.000000000 -0800 23951 +++ silo-1.4.13/libext2fs/unlink.c 2006-11-02 19:21:44.252760139 -0800 23952 23952 @@ -0,0 +1,99 @@ 23953 23953 +/* … … 24050 24050 +} 24051 24051 + 24052 diff -Naur silo-1.4.1 1.orig/libext2fs/valid_blk.c silo-1.4.11/libext2fs/valid_blk.c24053 --- silo-1.4.1 1.orig/libext2fs/valid_blk.c 1970-01-01 00:00:00 +000024054 +++ silo-1.4.1 1/libext2fs/valid_blk.c 2006-03-09 21:34:57 +000024052 diff -Naur silo-1.4.13.orig/libext2fs/valid_blk.c silo-1.4.13/libext2fs/valid_blk.c 24053 --- silo-1.4.13.orig/libext2fs/valid_blk.c 1969-12-31 16:00:00.000000000 -0800 24054 +++ silo-1.4.13/libext2fs/valid_blk.c 2006-11-02 19:21:44.256760005 -0800 24055 24055 @@ -0,0 +1,56 @@ 24056 24056 +/* … … 24110 24110 + return 1; 24111 24111 +} 24112 diff -Naur silo-1.4.1 1.orig/libext2fs/version.c silo-1.4.11/libext2fs/version.c24113 --- silo-1.4.1 1.orig/libext2fs/version.c 1970-01-01 00:00:00 +000024114 +++ silo-1.4.1 1/libext2fs/version.c 2006-03-09 21:34:57 +000024112 diff -Naur silo-1.4.13.orig/libext2fs/version.c silo-1.4.13/libext2fs/version.c 24113 --- silo-1.4.13.orig/libext2fs/version.c 1969-12-31 16:00:00.000000000 -0800 24114 +++ silo-1.4.13/libext2fs/version.c 2006-11-02 19:21:44.256760005 -0800 24115 24115 @@ -0,0 +1,52 @@ 24116 24116 +/* … … 24166 24166 + return ext2fs_parse_version_string(lib_version); 24167 24167 +} 24168 diff -Naur silo-1.4.1 1.orig/libext2fs/version.h silo-1.4.11/libext2fs/version.h24169 --- silo-1.4.1 1.orig/libext2fs/version.h 1970-01-01 00:00:00 +000024170 +++ silo-1.4.1 1/libext2fs/version.h 2006-03-09 21:34:57 +000024168 diff -Naur silo-1.4.13.orig/libext2fs/version.h silo-1.4.13/libext2fs/version.h 24169 --- silo-1.4.13.orig/libext2fs/version.h 1969-12-31 16:00:00.000000000 -0800 24170 +++ silo-1.4.13/libext2fs/version.h 2006-11-02 19:21:44.256760005 -0800 24171 24171 @@ -0,0 +1,11 @@ 24172 24172 +/* … … 24181 24181 +#define E2FSPROGS_VERSION "1.38" 24182 24182 +#define E2FSPROGS_DATE "30-Jun-2005" 24183 diff -Naur silo-1.4.1 1.orig/libext2fs/write_bb_file.c silo-1.4.11/libext2fs/write_bb_file.c24184 --- silo-1.4.1 1.orig/libext2fs/write_bb_file.c 1970-01-01 00:00:00 +000024185 +++ silo-1.4.1 1/libext2fs/write_bb_file.c 2006-03-09 21:34:57 +000024183 diff -Naur silo-1.4.13.orig/libext2fs/write_bb_file.c silo-1.4.13/libext2fs/write_bb_file.c 24184 --- silo-1.4.13.orig/libext2fs/write_bb_file.c 1969-12-31 16:00:00.000000000 -0800 24185 +++ silo-1.4.13/libext2fs/write_bb_file.c 2006-11-02 19:21:44.256760005 -0800 24186 24186 @@ -0,0 +1,34 @@ 24187 24187 +/* … … 24219 24219 + return 0; 24220 24220 +} 24221 diff -Naur silo-1.4.1 1.orig/second/Makefile silo-1.4.11/second/Makefile24222 --- silo-1.4.1 1.orig/second/Makefile 2006-03-09 21:34:08 +000024223 +++ silo-1.4.1 1/second/Makefile 2006-03-09 21:34:57 +000024221 diff -Naur silo-1.4.13.orig/second/Makefile silo-1.4.13/second/Makefile 24222 --- silo-1.4.13.orig/second/Makefile 2006-06-01 10:24:53.000000000 -0700 24223 +++ silo-1.4.13/second/Makefile 2006-11-02 19:21:44.260759872 -0800 24224 24224 @@ -27,10 +27,10 @@ 24225 24225 LDFLAGS_LARGE=-N -Ttext $(LARGE_RELOC) … … 24312 24312 second.b: second util 24313 24313 $(ELFTOAOUT) -o second.aout second 24314 diff -Naur silo-1.4.11.orig/second/ls.c silo-1.4.11/second/ls.c 24315 --- silo-1.4.11.orig/second/ls.c 2006-03-09 21:34:08 +0000 24316 +++ silo-1.4.11/second/ls.c 2006-03-09 21:34:57 +0000 24314 diff -Naur silo-1.4.13.orig/second/fs/ufs.c silo-1.4.13/second/fs/ufs.c 24315 --- silo-1.4.13.orig/second/fs/ufs.c 2006-06-01 10:24:53.000000000 -0700 24316 +++ silo-1.4.13/second/fs/ufs.c 2006-11-02 19:25:24.281403152 -0800 24317 @@ -40,28 +40,18 @@ 24318 24319 ino_t inode = 0; 24320 24321 -#ifdef UFS_CIGAM 24322 -/* Apparently new header */ 24323 - 24324 #define ufsi_size(x) ((unsigned int)((x)->ui_size)) 24325 #define ufsi_db(x) ((unsigned int *)((x)->ui_u2.ui_addr.ui_db)) 24326 #define ufsi_ib(x) ((unsigned int *)((x)->ui_u2.ui_addr.ui_ib)) 24327 #define ufsd_namlen(x) ((unsigned char)((x)->d_u.d_44.d_namlen)) 24328 24329 -#ifdef UFS_MINFREE 24330 -/* Apparently even newer header */ 24331 -#define ufs_superblock ufs_super_block 24332 +struct ufs_superblock_full { 24333 + struct ufs_super_block_first first; 24334 + struct ufs_super_block_second second; 24335 + struct ufs_super_block_third third; 24336 +}; 24337 +#define ufs_superblock ufs_super_block_first 24338 #define ufs_direct ufs_dir_entry 24339 -#endif 24340 - 24341 -#else 24342 - 24343 -#define ufsi_size(x) (((x)->ui_size.val[1])) 24344 -#define ufsi_db(x) ((unsigned int *)((x)->ui_db)) 24345 -#define ufsi_ib(x) ((unsigned int *)((x)->ui_ib)) 24346 -#define ufsd_namlen(x) ((unsigned char)((x)->d_namlen)) 24347 - 24348 -#endif 24349 24350 #ifndef S_ISLNK 24351 #include <sys/stat.h> 24352 @@ -92,25 +82,22 @@ 24353 return p; 24354 } 24355 24356 -static struct ufs_superblock *ufs_read_super(ufs_filsys fs) 24357 +static struct ufs_superblock_full *ufs_read_super(ufs_filsys fs) 24358 { 24359 - struct ufs_superblock *usb; 24360 + struct ufs_superblock_full *usb; 24361 24362 - usb = (struct ufs_superblock *) malloc (2048); 24363 + usb = (struct ufs_superblock_full *) malloc (2048); 24364 if (!usb) return 0; 24365 if (io_channel_read_blk (fs->io, UFS_SBLOCK/1024, -2048, (char *)usb)) 24366 return 0; 24367 - if (usb->fs_magic != UFS_MAGIC) { 24368 - /* XXX - replace hard-coded constant with a byte-swap macro */ 24369 - if (usb->fs_magic == 0x54190100) { 24370 - } 24371 + if (usb->third.fs_magic != UFS_MAGIC) { 24372 return 0; 24373 } 24374 - if (usb->fs_bsize != UFS_BSIZE) 24375 + if (usb->first.fs_bsize != UFS_BSIZE) 24376 return 0; 24377 - if (usb->fs_fsize != UFS_FSIZE) 24378 + if (usb->first.fs_fsize != UFS_FSIZE) 24379 return 0; 24380 - io_channel_set_blksize (fs->io, usb->fs_fsize); 24381 + io_channel_set_blksize (fs->io, usb->first.fs_fsize); 24382 return usb; 24383 } 24384 24385 diff -Naur silo-1.4.13.orig/second/ls.c silo-1.4.13/second/ls.c 24386 --- silo-1.4.13.orig/second/ls.c 2006-06-01 10:24:53.000000000 -0700 24387 +++ silo-1.4.13/second/ls.c 2006-11-02 19:21:44.264759738 -0800 24317 24388 @@ -19,10 +19,10 @@ 24318 24389 USA. */ … … 24327 24398 #include <ext2fs/ext2fs.h> 24328 24399 24329 diff -Naur silo-1.4.1 1.orig/silo/silo.c silo-1.4.11/silo/silo.c24330 --- silo-1.4.1 1.orig/silo/silo.c 2006-03-09 21:34:08 +000024331 +++ silo-1.4.1 1/silo/silo.c 2006-03-09 21:34:57 +000024400 diff -Naur silo-1.4.13.orig/silo/silo.c silo-1.4.13/silo/silo.c 24401 --- silo-1.4.13.orig/silo/silo.c 2006-06-01 10:24:53.000000000 -0700 24402 +++ silo-1.4.13/silo/silo.c 2006-11-02 19:21:44.264759738 -0800 24332 24403 @@ -128,8 +128,8 @@ 24333 24404 unsigned short nsect; /* Sectors per track */ … … 24341 24412 unsigned short magic; /* Magic number */ 24342 24413 unsigned short csum; /* Label xor'd checksum */ 24343 diff -Naur silo-1.4.1 1.orig/silo/silocheck.c silo-1.4.11/silo/silocheck.c24344 --- silo-1.4.1 1.orig/silo/silocheck.c 2006-03-09 21:34:08 +000024345 +++ silo-1.4.1 1/silo/silocheck.c 2006-03-09 21:34:57 +000024414 diff -Naur silo-1.4.13.orig/silo/silocheck.c silo-1.4.13/silo/silocheck.c 24415 --- silo-1.4.13.orig/silo/silocheck.c 2006-06-01 10:24:53.000000000 -0700 24416 +++ silo-1.4.13/silo/silocheck.c 2006-11-02 19:21:44.264759738 -0800 24346 24417 @@ -100,8 +100,8 @@ 24347 24418 unsigned short nsect; /* Sectors per track */ … … 24355 24426 unsigned short magic; /* Magic number */ 24356 24427 unsigned short csum; /* Label xor'd checksum */ 24357 diff -Naur silo-1.4.1 1.orig/tilo/Makefile silo-1.4.11/tilo/Makefile24358 --- silo-1.4.1 1.orig/tilo/Makefile 2006-03-09 21:34:08 +000024359 +++ silo-1.4.1 1/tilo/Makefile 2006-03-09 21:34:57 +000024428 diff -Naur silo-1.4.13.orig/tilo/Makefile silo-1.4.13/tilo/Makefile 24429 --- silo-1.4.13.orig/tilo/Makefile 2006-06-01 10:24:53.000000000 -0700 24430 +++ silo-1.4.13/tilo/Makefile 2006-11-02 19:21:44.272759471 -0800 24360 24431 @@ -14,10 +14,10 @@ 24361 24432 all: maketilo
Note:
See TracChangeset
for help on using the changeset viewer.