Changeset 3588b92


Ignore:
Timestamp:
Nov 2, 2006, 7:32:32 PM (17 years ago)
Author:
Jim Gifford <clfs@…>
Branches:
clfs-1.2, clfs-2.1, clfs-3.0.0-systemd, clfs-3.0.0-sysvinit, master, systemd, sysvinit
Children:
035d431
Parents:
ce14232
Message:

Updated Silo Patch

File:
1 moved

Legend:

Unmodified
Added
Removed
  • patches/silo-1.4.13-fixes-2.patch

    rce14232 r3588b92  
    11Submitted By: Joe Ciccone <joeciccone at crazyeyesoft dot com>
    2 Date: 2006-02-09
    3 Initial Package Version: 1.4.11
     2Date: 2006-11-02
     3Initial Package Version: 1.4.13
    44Upstream Status: Unknown
    55Origin: Rocklinux and Jim Gifford and Joe Ciccone
    66Description: Fixes cross-compilation issues and silo no longer links to
    7         libext2fs.so, it is integrated instead. Also allows silo to build
     7        libext2fs.so, it is integrated instead. Also allows silo to build
    88        and work properly on pure64 systems.
    99
    10 diff -Naur silo-1.4.11.orig/Makefile silo-1.4.11/Makefile
    11 --- silo-1.4.11.orig/Makefile   2006-03-09 21:34:08 +0000
    12 +++ silo-1.4.11/Makefile        2006-03-09 21:34:56 +0000
     10diff -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
    1313@@ -3,7 +3,7 @@
    1414 
     
    2020 endif
    2121 
    22 diff -Naur silo-1.4.11.orig/Rules.make silo-1.4.11/Rules.make
    23 --- silo-1.4.11.orig/Rules.make 2006-03-09 21:34:08 +0000
    24 +++ silo-1.4.11/Rules.make      2006-03-09 21:48:42 +0000
     22diff -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
    2525@@ -1,12 +1,14 @@
    26  VERSION=1.4.11
     26 VERSION=1.4.13
    2727 IMGVERSION=0.99
    2828 RM=rm -f
     
    4444 BIN2H=../common/bin2h
    4545 
    46 diff -Naur silo-1.4.11.orig/common/Makefile silo-1.4.11/common/Makefile
    47 --- silo-1.4.11.orig/common/Makefile    2006-03-09 21:34:08 +0000
    48 +++ silo-1.4.11/common/Makefile 2006-03-09 21:34:56 +0000
     46diff -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
    4949@@ -5,19 +5,22 @@
    5050 include ../Rules.make
     
    7676+       $(RM) bin2h *.o
    7777+
    78 diff -Naur silo-1.4.11.orig/first/Makefile silo-1.4.11/first/Makefile
    79 --- silo-1.4.11.orig/first/Makefile     2006-03-09 21:34:08 +0000
    80 +++ silo-1.4.11/first/Makefile  2006-03-09 21:34:56 +0000
     78diff -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
    8181@@ -13,7 +13,7 @@
    8282 LDFLAGS=-N -Ttext 0x4000
     
    133133 ieee32.b: ieee32.o
    134134        $(LD) $(LDFLAGS) -o ieee32.b ieee32.o
    135 diff -Naur silo-1.4.11.orig/first-isofs/Makefile silo-1.4.11/first-isofs/Makefile
    136 --- silo-1.4.11.orig/first-isofs/Makefile       2006-03-09 21:34:08 +0000
    137 +++ silo-1.4.11/first-isofs/Makefile    2006-03-09 21:34:56 +0000
     135diff -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
    138138@@ -11,10 +11,10 @@
    139139 all: $(NAME).b
     
    158158 clean:
    159159        $(RM) *.o $(NAME) $(NAME).b $(NAME).aout
    160 diff -Naur silo-1.4.11.orig/include/emul_32/asm/elf.h silo-1.4.11/include/emul_32/asm/elf.h
    161 --- silo-1.4.11.orig/include/emul_32/asm/elf.h  1970-01-01 00:00:00 +0000
    162 +++ silo-1.4.11/include/emul_32/asm/elf.h       2006-03-09 21:34:56 +0000
     160diff -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
    163163@@ -0,0 +1,162 @@
    164164+#ifndef __ASMSPARC_ELF_H
     
    324324+
    325325+#endif /* !(__ASMSPARC_ELF_H) */
    326 diff -Naur silo-1.4.11.orig/include/emul_32/asm/posix_types.h silo-1.4.11/include/emul_32/asm/posix_types.h
    327 --- silo-1.4.11.orig/include/emul_32/asm/posix_types.h  1970-01-01 00:00:00 +0000
    328 +++ silo-1.4.11/include/emul_32/asm/posix_types.h       2006-03-09 21:34:56 +0000
     326diff -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
    329329@@ -0,0 +1,122 @@
    330330+#ifndef __ARCH_SPARC_POSIX_TYPES_H
     
    450450+
    451451+#endif /* !(__ARCH_SPARC_POSIX_TYPES_H) */
    452 diff -Naur silo-1.4.11.orig/include/emul_32/asm/types.h silo-1.4.11/include/emul_32/asm/types.h
    453 --- silo-1.4.11.orig/include/emul_32/asm/types.h        1970-01-01 00:00:00 +0000
    454 +++ silo-1.4.11/include/emul_32/asm/types.h     2006-03-09 21:34:56 +0000
     452diff -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
    455455@@ -0,0 +1,41 @@
    456456+#ifndef _SPARC_TYPES_H
     
    495495+
    496496+#endif /* defined(_SPARC_TYPES_H) */
    497 diff -Naur silo-1.4.11.orig/include/ext2fs/ext2_err.h silo-1.4.11/include/ext2fs/ext2_err.h
    498 --- silo-1.4.11.orig/include/ext2fs/ext2_err.h  2006-03-09 21:34:08 +0000
    499 +++ silo-1.4.11/include/ext2fs/ext2_err.h       2006-03-09 21:34:56 +0000
     497diff -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
    500500@@ -3,6 +3,8 @@
    501501  * This file is automatically generated; please do not edit it.
     
    544544 
    545545 /* for compatibility with older versions... */
    546 diff -Naur silo-1.4.11.orig/include/ext2fs/ext2_io.h silo-1.4.11/include/ext2fs/ext2_io.h
    547 --- silo-1.4.11.orig/include/ext2fs/ext2_io.h   2006-03-09 21:34:08 +0000
    548 +++ silo-1.4.11/include/ext2fs/ext2_io.h        2006-03-09 21:34:56 +0000
     546diff -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
    549549@@ -27,6 +27,8 @@
    550550 typedef struct struct_io_manager *io_manager;
     
    593593 extern io_manager unix_io_manager;
    594594 
    595 diff -Naur silo-1.4.11.orig/libext2fs/ChangeLog silo-1.4.11/libext2fs/ChangeLog
    596 --- silo-1.4.11.orig/libext2fs/ChangeLog        1970-01-01 00:00:00 +0000
    597 +++ silo-1.4.11/libext2fs/ChangeLog     2006-03-09 21:34:56 +0000
     595diff -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
    598598@@ -0,0 +1,3311 @@
    599599+2006-06-30  Theodore Ts'o  <tytso@mit.edu>
     
    39083908+
    39093909+
    3910 diff -Naur silo-1.4.11.orig/libext2fs/Makefile silo-1.4.11/libext2fs/Makefile
    3911 --- silo-1.4.11.orig/libext2fs/Makefile 1970-01-01 00:00:00 +0000
    3912 +++ silo-1.4.11/libext2fs/Makefile      2006-03-09 21:34:56 +0000
     3910diff -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
    39133913@@ -0,0 +1,21 @@
    39143914+
     
    39333933+.c.o:
    39343934+       $(CC-SILO) $(CFLAGS) $(DEFS) -c $< -o $@
    3935 diff -Naur silo-1.4.11.orig/libext2fs/alloc.c silo-1.4.11/libext2fs/alloc.c
    3936 --- silo-1.4.11.orig/libext2fs/alloc.c  1970-01-01 00:00:00 +0000
    3937 +++ silo-1.4.11/libext2fs/alloc.c       2006-03-09 21:34:56 +0000
     3935diff -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
    39383938@@ -0,0 +1,173 @@
    39393939+/*
     
    41104110+}
    41114111+
    4112 diff -Naur silo-1.4.11.orig/libext2fs/alloc_sb.c silo-1.4.11/libext2fs/alloc_sb.c
    4113 --- silo-1.4.11.orig/libext2fs/alloc_sb.c       1970-01-01 00:00:00 +0000
    4114 +++ silo-1.4.11/libext2fs/alloc_sb.c    2006-03-09 21:34:56 +0000
     4112diff -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
    41154115@@ -0,0 +1,57 @@
    41164116+/*
     
    41714171+       return num_blocks;
    41724172+}
    4173 diff -Naur silo-1.4.11.orig/libext2fs/alloc_stats.c silo-1.4.11/libext2fs/alloc_stats.c
    4174 --- silo-1.4.11.orig/libext2fs/alloc_stats.c    1970-01-01 00:00:00 +0000
    4175 +++ silo-1.4.11/libext2fs/alloc_stats.c 2006-03-09 21:34:56 +0000
     4173diff -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
    41764176@@ -0,0 +1,52 @@
    41774177+/*
     
    42274227+       ext2fs_mark_bb_dirty(fs);
    42284228+}
    4229 diff -Naur silo-1.4.11.orig/libext2fs/alloc_tables.c silo-1.4.11/libext2fs/alloc_tables.c
    4230 --- silo-1.4.11.orig/libext2fs/alloc_tables.c   1970-01-01 00:00:00 +0000
    4231 +++ silo-1.4.11/libext2fs/alloc_tables.c        2006-03-09 21:34:56 +0000
     4229diff -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
    42324232@@ -0,0 +1,117 @@
    42334233+/*
     
    43484348+}
    43494349+
    4350 diff -Naur silo-1.4.11.orig/libext2fs/badblocks.c silo-1.4.11/libext2fs/badblocks.c
    4351 --- silo-1.4.11.orig/libext2fs/badblocks.c      1970-01-01 00:00:00 +0000
    4352 +++ silo-1.4.11/libext2fs/badblocks.c   2006-03-09 21:34:56 +0000
     4350diff -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
    43534353@@ -0,0 +1,327 @@
    43544354+/*
     
    46794679+       return bb->num;
    46804680+}
    4681 diff -Naur silo-1.4.11.orig/libext2fs/bb_compat.c silo-1.4.11/libext2fs/bb_compat.c
    4682 --- silo-1.4.11.orig/libext2fs/bb_compat.c      1970-01-01 00:00:00 +0000
    4683 +++ silo-1.4.11/libext2fs/bb_compat.c   2006-03-09 21:34:56 +0000
     4681diff -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
    46844684@@ -0,0 +1,63 @@
    46854685+/*
     
    47464746+       ext2fs_badblocks_list_iterate_end(iter);
    47474747+}
    4748 diff -Naur silo-1.4.11.orig/libext2fs/bb_inode.c silo-1.4.11/libext2fs/bb_inode.c
    4749 --- silo-1.4.11.orig/libext2fs/bb_inode.c       1970-01-01 00:00:00 +0000
    4750 +++ silo-1.4.11/libext2fs/bb_inode.c    2006-03-09 21:34:56 +0000
     4748diff -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
    47514751@@ -0,0 +1,267 @@
    47524752+/*
     
    50175017+
    50185018+
    5019 diff -Naur silo-1.4.11.orig/libext2fs/bitmaps.c silo-1.4.11/libext2fs/bitmaps.c
    5020 --- silo-1.4.11.orig/libext2fs/bitmaps.c        1970-01-01 00:00:00 +0000
    5021 +++ silo-1.4.11/libext2fs/bitmaps.c     2006-03-09 21:34:56 +0000
     5019diff -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
    50225022@@ -0,0 +1,212 @@
    50235023+/*
     
    52335233+              (size_t) (((bitmap->real_end - bitmap->start) / 8) + 1));
    52345234+}
    5235 diff -Naur silo-1.4.11.orig/libext2fs/bitops.c silo-1.4.11/libext2fs/bitops.c
    5236 --- silo-1.4.11.orig/libext2fs/bitops.c 1970-01-01 00:00:00 +0000
    5237 +++ silo-1.4.11/libext2fs/bitops.c      2006-03-09 21:34:56 +0000
     5235diff -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
    52385238@@ -0,0 +1,91 @@
    52395239+/*
     
    53285328+}
    53295329+
    5330 diff -Naur silo-1.4.11.orig/libext2fs/bitops.h silo-1.4.11/libext2fs/bitops.h
    5331 --- silo-1.4.11.orig/libext2fs/bitops.h 1970-01-01 00:00:00 +0000
    5332 +++ silo-1.4.11/libext2fs/bitops.h      2006-03-09 21:34:56 +0000
     5330diff -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
    53335333@@ -0,0 +1,617 @@
    53345334+/*
     
    59495949+#endif
    59505950+
    5951 diff -Naur silo-1.4.11.orig/libext2fs/block.c silo-1.4.11/libext2fs/block.c
    5952 --- silo-1.4.11.orig/libext2fs/block.c  1970-01-01 00:00:00 +0000
    5953 +++ silo-1.4.11/libext2fs/block.c       2006-03-09 21:34:56 +0000
     5951diff -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
    59545954@@ -0,0 +1,437 @@
    59555955+/*
     
    63906390+}
    63916391+
    6392 diff -Naur silo-1.4.11.orig/libext2fs/bmap.c silo-1.4.11/libext2fs/bmap.c
    6393 --- silo-1.4.11.orig/libext2fs/bmap.c   1970-01-01 00:00:00 +0000
    6394 +++ silo-1.4.11/libext2fs/bmap.c        2006-03-09 21:34:56 +0000
     6392diff -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
    63956395@@ -0,0 +1,270 @@
    63966396+/*
     
    66646664+
    66656665+
    6666 diff -Naur silo-1.4.11.orig/libext2fs/bmove.c silo-1.4.11/libext2fs/bmove.c
    6667 --- silo-1.4.11.orig/libext2fs/bmove.c  1970-01-01 00:00:00 +0000
    6668 +++ silo-1.4.11/libext2fs/bmove.c       2006-03-09 21:34:56 +0000
     6666diff -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
    66696669@@ -0,0 +1,160 @@
    66706670+/*
     
    68286828+}
    68296829+
    6830 diff -Naur silo-1.4.11.orig/libext2fs/brel.h silo-1.4.11/libext2fs/brel.h
    6831 --- silo-1.4.11.orig/libext2fs/brel.h   1970-01-01 00:00:00 +0000
    6832 +++ silo-1.4.11/libext2fs/brel.h        2006-03-09 21:34:56 +0000
     6830diff -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
    68336833@@ -0,0 +1,86 @@
    68346834+/*
     
    69186918+#define ext2fs_brel_free(brel) ((brel)->free((brel)))
    69196919+
    6920 diff -Naur silo-1.4.11.orig/libext2fs/brel_ma.c silo-1.4.11/libext2fs/brel_ma.c
    6921 --- silo-1.4.11.orig/libext2fs/brel_ma.c        1970-01-01 00:00:00 +0000
    6922 +++ silo-1.4.11/libext2fs/brel_ma.c     2006-03-09 21:34:56 +0000
     6920diff -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
    69236923@@ -0,0 +1,197 @@
    69246924+/*
     
    71197119+       return 0;
    71207120+}
    7121 diff -Naur silo-1.4.11.orig/libext2fs/check_desc.c silo-1.4.11/libext2fs/check_desc.c
    7122 --- silo-1.4.11.orig/libext2fs/check_desc.c     1970-01-01 00:00:00 +0000
    7123 +++ silo-1.4.11/libext2fs/check_desc.c  2006-03-09 21:34:56 +0000
     7121diff -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
    71247124@@ -0,0 +1,68 @@
    71257125+/*
     
    71917191+       return 0;
    71927192+}
    7193 diff -Naur silo-1.4.11.orig/libext2fs/closefs.c silo-1.4.11/libext2fs/closefs.c
    7194 --- silo-1.4.11.orig/libext2fs/closefs.c        1970-01-01 00:00:00 +0000
    7195 +++ silo-1.4.11/libext2fs/closefs.c     2006-03-09 21:34:56 +0000
     7193diff -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
    71967196@@ -0,0 +1,381 @@
    71977197+/*
     
    75767576+}
    75777577+
    7578 diff -Naur silo-1.4.11.orig/libext2fs/cmp_bitmaps.c silo-1.4.11/libext2fs/cmp_bitmaps.c
    7579 --- silo-1.4.11.orig/libext2fs/cmp_bitmaps.c    1970-01-01 00:00:00 +0000
    7580 +++ silo-1.4.11/libext2fs/cmp_bitmaps.c 2006-03-09 21:34:56 +0000
     7578diff -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
    75817581@@ -0,0 +1,72 @@
    75827582+/*
     
    76527652+}
    76537653+
    7654 diff -Naur silo-1.4.11.orig/libext2fs/dblist.c silo-1.4.11/libext2fs/dblist.c
    7655 --- silo-1.4.11.orig/libext2fs/dblist.c 1970-01-01 00:00:00 +0000
    7656 +++ silo-1.4.11/libext2fs/dblist.c      2006-03-09 21:34:56 +0000
     7654diff -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
    76577657@@ -0,0 +1,260 @@
    76587658+/*
     
    79167916+       return (int) dblist->count;
    79177917+}
    7918 diff -Naur silo-1.4.11.orig/libext2fs/dblist_dir.c silo-1.4.11/libext2fs/dblist_dir.c
    7919 --- silo-1.4.11.orig/libext2fs/dblist_dir.c     1970-01-01 00:00:00 +0000
    7920 +++ silo-1.4.11/libext2fs/dblist_dir.c  2006-03-09 21:34:56 +0000
     7918diff -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
    79217921@@ -0,0 +1,75 @@
    79227922+/*
     
    79957995+                                       db_info->blockcnt, 0, 0, priv_data);
    79967996+}
    7997 diff -Naur silo-1.4.11.orig/libext2fs/dir_iterate.c silo-1.4.11/libext2fs/dir_iterate.c
    7998 --- silo-1.4.11.orig/libext2fs/dir_iterate.c    1970-01-01 00:00:00 +0000
    7999 +++ silo-1.4.11/libext2fs/dir_iterate.c 2006-03-09 21:34:56 +0000
     7997diff -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
    80008000@@ -0,0 +1,219 @@
    80018001+/*
     
    82188218+}
    82198219+
    8220 diff -Naur silo-1.4.11.orig/libext2fs/dirblock.c silo-1.4.11/libext2fs/dirblock.c
    8221 --- silo-1.4.11.orig/libext2fs/dirblock.c       1970-01-01 00:00:00 +0000
    8222 +++ silo-1.4.11/libext2fs/dirblock.c    2006-03-09 21:34:56 +0000
     8220diff -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
    82238223@@ -0,0 +1,130 @@
    82248224+/*
     
    83528352+}
    83538353+
    8354 diff -Naur silo-1.4.11.orig/libext2fs/dirhash.c silo-1.4.11/libext2fs/dirhash.c
    8355 --- silo-1.4.11.orig/libext2fs/dirhash.c        1970-01-01 00:00:00 +0000
    8356 +++ silo-1.4.11/libext2fs/dirhash.c     2006-03-09 21:34:56 +0000
     8354diff -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
    83578357@@ -0,0 +1,233 @@
    83588358+/*
     
    85898589+       return 0;
    85908590+}
    8591 diff -Naur silo-1.4.11.orig/libext2fs/dosio.c silo-1.4.11/libext2fs/dosio.c
    8592 --- silo-1.4.11.orig/libext2fs/dosio.c  1970-01-01 00:00:00 +0000
    8593 +++ silo-1.4.11/libext2fs/dosio.c       2006-03-09 21:34:56 +0000
     8591diff -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
    85948594@@ -0,0 +1,456 @@
    85958595+/*
     
    90499049+  return 0;
    90509050+}
    9051 diff -Naur silo-1.4.11.orig/libext2fs/dosio.h silo-1.4.11/libext2fs/dosio.h
    9052 --- silo-1.4.11.orig/libext2fs/dosio.h  1970-01-01 00:00:00 +0000
    9053 +++ silo-1.4.11/libext2fs/dosio.h       2006-03-09 21:34:56 +0000
     9051diff -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
    90549054@@ -0,0 +1,153 @@
    90559055+/*
     
    92069206+
    92079207+#endif /* __diskio_h */
    9208 diff -Naur silo-1.4.11.orig/libext2fs/dupfs.c silo-1.4.11/libext2fs/dupfs.c
    9209 --- silo-1.4.11.orig/libext2fs/dupfs.c  1970-01-01 00:00:00 +0000
    9210 +++ silo-1.4.11/libext2fs/dupfs.c       2006-03-09 21:34:56 +0000
     9208diff -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
    92119211@@ -0,0 +1,96 @@
    92129212+/*
     
    93069306+}
    93079307+
    9308 diff -Naur silo-1.4.11.orig/libext2fs/e2image.h silo-1.4.11/libext2fs/e2image.h
    9309 --- silo-1.4.11.orig/libext2fs/e2image.h        1970-01-01 00:00:00 +0000
    9310 +++ silo-1.4.11/libext2fs/e2image.h     2006-03-09 21:34:56 +0000
     9308diff -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
    93119311@@ -0,0 +1,51 @@
    93129312+/*
     
    93619361+       
    93629362+       
    9363 diff -Naur silo-1.4.11.orig/libext2fs/expanddir.c silo-1.4.11/libext2fs/expanddir.c
    9364 --- silo-1.4.11.orig/libext2fs/expanddir.c      1970-01-01 00:00:00 +0000
    9365 +++ silo-1.4.11/libext2fs/expanddir.c   2006-03-09 21:34:56 +0000
     9363diff -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
    93669366@@ -0,0 +1,126 @@
    93679367+/*
     
    94919491+       return 0;
    94929492+}
    9493 diff -Naur silo-1.4.11.orig/libext2fs/ext2_err.c silo-1.4.11/libext2fs/ext2_err.c
    9494 --- silo-1.4.11.orig/libext2fs/ext2_err.c       1970-01-01 00:00:00 +0000
    9495 +++ silo-1.4.11/libext2fs/ext2_err.c    2006-03-09 21:34:56 +0000
     9493diff -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
    94969496@@ -0,0 +1,148 @@
    94979497+/*
     
    96439643+    *end = et;
    96449644+}
    9645 diff -Naur silo-1.4.11.orig/libext2fs/ext2_ext_attr.h silo-1.4.11/libext2fs/ext2_ext_attr.h
    9646 --- silo-1.4.11.orig/libext2fs/ext2_ext_attr.h  1970-01-01 00:00:00 +0000
    9647 +++ silo-1.4.11/libext2fs/ext2_ext_attr.h       2006-03-09 21:34:56 +0000
     9645diff -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
    96489648@@ -0,0 +1,69 @@
    96499649+/*
     
    97169716+#endif  /* __KERNEL__ */
    97179717+
    9718 diff -Naur silo-1.4.11.orig/libext2fs/ext2_fs.h silo-1.4.11/libext2fs/ext2_fs.h
    9719 --- silo-1.4.11.orig/libext2fs/ext2_fs.h        1970-01-01 00:00:00 +0000
    9720 +++ silo-1.4.11/libext2fs/ext2_fs.h     2006-03-09 21:34:56 +0000
     9718diff -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
    97219721@@ -0,0 +1,644 @@
    97229722+/*
     
    1036410364+
    1036510365+#endif /* _LINUX_EXT2_FS_H */
    10366 diff -Naur silo-1.4.11.orig/libext2fs/ext2_io.h silo-1.4.11/libext2fs/ext2_io.h
    10367 --- silo-1.4.11.orig/libext2fs/ext2_io.h        1970-01-01 00:00:00 +0000
    10368 +++ silo-1.4.11/libext2fs/ext2_io.h     2006-03-09 21:34:56 +0000
     10366diff -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
    1036910369@@ -0,0 +1,108 @@
    1037010370+/*
     
    1047610476+#endif /* _EXT2FS_EXT2_IO_H */
    1047710477+       
    10478 diff -Naur silo-1.4.11.orig/libext2fs/ext2fs.h silo-1.4.11/libext2fs/ext2fs.h
    10479 --- silo-1.4.11.orig/libext2fs/ext2fs.h 1970-01-01 00:00:00 +0000
    10480 +++ silo-1.4.11/libext2fs/ext2fs.h      2006-03-09 21:34:56 +0000
     10478diff -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
    1048110481@@ -0,0 +1,1140 @@
    1048210482+/*
     
    1162011620+
    1162111621+#endif /* _EXT2FS_EXT2FS_H */
    11622 diff -Naur silo-1.4.11.orig/libext2fs/ext2fsP.h silo-1.4.11/libext2fs/ext2fsP.h
    11623 --- silo-1.4.11.orig/libext2fs/ext2fsP.h        1970-01-01 00:00:00 +0000
    11624 +++ silo-1.4.11/libext2fs/ext2fsP.h     2006-03-09 21:34:56 +0000
     11622diff -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
    1162511625@@ -0,0 +1,88 @@
    1162611626+/*
     
    1171211712+
    1171311713+
    11714 diff -Naur silo-1.4.11.orig/libext2fs/ext_attr.c silo-1.4.11/libext2fs/ext_attr.c
    11715 --- silo-1.4.11.orig/libext2fs/ext_attr.c       1970-01-01 00:00:00 +0000
    11716 +++ silo-1.4.11/libext2fs/ext_attr.c    2006-03-09 21:34:56 +0000
     11714diff -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
    1171711717@@ -0,0 +1,105 @@
    1171811718+/*
     
    1182111821+       return retval;
    1182211822+}
    11823 diff -Naur silo-1.4.11.orig/libext2fs/fileio.c silo-1.4.11/libext2fs/fileio.c
    11824 --- silo-1.4.11.orig/libext2fs/fileio.c 1970-01-01 00:00:00 +0000
    11825 +++ silo-1.4.11/libext2fs/fileio.c      2006-03-09 21:34:56 +0000
     11823diff -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
    1182611826@@ -0,0 +1,378 @@
    1182711827+/*
     
    1220312203+       return 0;
    1220412204+}
    12205 diff -Naur silo-1.4.11.orig/libext2fs/finddev.c silo-1.4.11/libext2fs/finddev.c
    12206 --- silo-1.4.11.orig/libext2fs/finddev.c        1970-01-01 00:00:00 +0000
    12207 +++ silo-1.4.11/libext2fs/finddev.c     2006-03-09 21:34:57 +0000
     12205diff -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
    1220812208@@ -0,0 +1,208 @@
    1220912209+/*
     
    1241512415+       
    1241612416+#endif
    12417 diff -Naur silo-1.4.11.orig/libext2fs/flushb.c silo-1.4.11/libext2fs/flushb.c
    12418 --- silo-1.4.11.orig/libext2fs/flushb.c 1970-01-01 00:00:00 +0000
    12419 +++ silo-1.4.11/libext2fs/flushb.c      2006-03-09 21:34:57 +0000
     12417diff -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
    1242012420@@ -0,0 +1,82 @@
    1242112421+/*
     
    1250112501+       return 0;
    1250212502+}
    12503 diff -Naur silo-1.4.11.orig/libext2fs/freefs.c silo-1.4.11/libext2fs/freefs.c
    12504 --- silo-1.4.11.orig/libext2fs/freefs.c 1970-01-01 00:00:00 +0000
    12505 +++ silo-1.4.11/libext2fs/freefs.c      2006-03-09 21:34:57 +0000
     12503diff -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
    1250612506@@ -0,0 +1,147 @@
    1250712507+/*
     
    1265212652+}
    1265312653+
    12654 diff -Naur silo-1.4.11.orig/libext2fs/gen_bitmap.c silo-1.4.11/libext2fs/gen_bitmap.c
    12655 --- silo-1.4.11.orig/libext2fs/gen_bitmap.c     1970-01-01 00:00:00 +0000
    12656 +++ silo-1.4.11/libext2fs/gen_bitmap.c  2006-03-09 21:34:57 +0000
     12654diff -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
    1265712657@@ -0,0 +1,48 @@
    1265812658+/*
     
    1270412704+       return ext2fs_clear_bit(bitno - bitmap->start, bitmap->bitmap);
    1270512705+}
    12706 diff -Naur silo-1.4.11.orig/libext2fs/get_pathname.c silo-1.4.11/libext2fs/get_pathname.c
    12707 --- silo-1.4.11.orig/libext2fs/get_pathname.c   1970-01-01 00:00:00 +0000
    12708 +++ silo-1.4.11/libext2fs/get_pathname.c        2006-03-09 21:34:57 +0000
     12706diff -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
    1270912709@@ -0,0 +1,157 @@
    1271012710+/*
     
    1286512865+       
    1286612866+}
    12867 diff -Naur silo-1.4.11.orig/libext2fs/getsectsize.c silo-1.4.11/libext2fs/getsectsize.c
    12868 --- silo-1.4.11.orig/libext2fs/getsectsize.c    1970-01-01 00:00:00 +0000
    12869 +++ silo-1.4.11/libext2fs/getsectsize.c 2006-03-09 21:34:57 +0000
     12867diff -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
    1287012870@@ -0,0 +1,60 @@
    1287112871+/*
     
    1292912929+       return 0;
    1293012930+}
    12931 diff -Naur silo-1.4.11.orig/libext2fs/getsize.c silo-1.4.11/libext2fs/getsize.c
    12932 --- silo-1.4.11.orig/libext2fs/getsize.c        1970-01-01 00:00:00 +0000
    12933 +++ silo-1.4.11/libext2fs/getsize.c     2006-03-09 21:34:57 +0000
     12931diff -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
    1293412934@@ -0,0 +1,293 @@
    1293512935+/*
     
    1322613226+}
    1322713227+#endif
    13228 diff -Naur silo-1.4.11.orig/libext2fs/icount.c silo-1.4.11/libext2fs/icount.c
    13229 --- silo-1.4.11.orig/libext2fs/icount.c 1970-01-01 00:00:00 +0000
    13230 +++ silo-1.4.11/libext2fs/icount.c      2006-03-09 21:34:57 +0000
     13228diff -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
    1323113231@@ -0,0 +1,483 @@
    1323213232+/*
     
    1371313713+       return icount->size;
    1371413714+}
    13715 diff -Naur silo-1.4.11.orig/libext2fs/imager.c silo-1.4.11/libext2fs/imager.c
    13716 --- silo-1.4.11.orig/libext2fs/imager.c 1970-01-01 00:00:00 +0000
    13717 +++ silo-1.4.11/libext2fs/imager.c      2006-03-09 21:34:57 +0000
     13715diff -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
    1371813718@@ -0,0 +1,387 @@
    1371913719+/*
     
    1410414104+       return (retval);
    1410514105+}
    14106 diff -Naur silo-1.4.11.orig/libext2fs/ind_block.c silo-1.4.11/libext2fs/ind_block.c
    14107 --- silo-1.4.11.orig/libext2fs/ind_block.c      1970-01-01 00:00:00 +0000
    14108 +++ silo-1.4.11/libext2fs/ind_block.c   2006-03-09 21:34:57 +0000
     14106diff -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
    1410914109@@ -0,0 +1,66 @@
    1411014110+/*
     
    1417414174+
    1417514175+
    14176 diff -Naur silo-1.4.11.orig/libext2fs/initialize.c silo-1.4.11/libext2fs/initialize.c
    14177 --- silo-1.4.11.orig/libext2fs/initialize.c     1970-01-01 00:00:00 +0000
    14178 +++ silo-1.4.11/libext2fs/initialize.c  2006-03-09 21:34:57 +0000
     14176diff -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
    1417914179@@ -0,0 +1,387 @@
    1418014180+/*
     
    1456514565+       return retval;
    1456614566+}
    14567 diff -Naur silo-1.4.11.orig/libext2fs/inline.c silo-1.4.11/libext2fs/inline.c
    14568 --- silo-1.4.11.orig/libext2fs/inline.c 1970-01-01 00:00:00 +0000
    14569 +++ silo-1.4.11/libext2fs/inline.c      2006-03-09 21:34:57 +0000
     14567diff -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
    1457014570@@ -0,0 +1,32 @@
    1457114571+/*
     
    1460114601+#include "ext2fs.h"
    1460214602+
    14603 diff -Naur silo-1.4.11.orig/libext2fs/inode.c silo-1.4.11/libext2fs/inode.c
    14604 --- silo-1.4.11.orig/libext2fs/inode.c  1970-01-01 00:00:00 +0000
    14605 +++ silo-1.4.11/libext2fs/inode.c       2006-03-09 21:34:57 +0000
     14603diff -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
    1460614606@@ -0,0 +1,794 @@
    1460714607+/*
     
    1539915399+}
    1540015400+
    15401 diff -Naur silo-1.4.11.orig/libext2fs/inode_io.c silo-1.4.11/libext2fs/inode_io.c
    15402 --- silo-1.4.11.orig/libext2fs/inode_io.c       1970-01-01 00:00:00 +0000
    15403 +++ silo-1.4.11/libext2fs/inode_io.c    2006-03-09 21:34:57 +0000
     15401diff -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
    1540415404@@ -0,0 +1,270 @@
    1540515405+/*
     
    1567315673+}
    1567415674+
    15675 diff -Naur silo-1.4.11.orig/libext2fs/io_manager.c silo-1.4.11/libext2fs/io_manager.c
    15676 --- silo-1.4.11.orig/libext2fs/io_manager.c     1970-01-01 00:00:00 +0000
    15677 +++ silo-1.4.11/libext2fs/io_manager.c  2006-03-09 21:34:57 +0000
     15675diff -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
    1567815678@@ -0,0 +1,69 @@
    1567915679+/*
     
    1574615746+       return EXT2_ET_UNIMPLEMENTED;
    1574715747+}
    15748 diff -Naur silo-1.4.11.orig/libext2fs/irel.h silo-1.4.11/libext2fs/irel.h
    15749 --- silo-1.4.11.orig/libext2fs/irel.h   1970-01-01 00:00:00 +0000
    15750 +++ silo-1.4.11/libext2fs/irel.h        2006-03-09 21:34:57 +0000
     15748diff -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
    1575115751@@ -0,0 +1,114 @@
    1575215752+/*
     
    1586415864+#define ext2fs_irel_delete(irel, old) ((irel)->delete((irel), old))
    1586515865+#define ext2fs_irel_free(irel) ((irel)->free((irel)))
    15866 diff -Naur silo-1.4.11.orig/libext2fs/irel_ma.c silo-1.4.11/libext2fs/irel_ma.c
    15867 --- silo-1.4.11.orig/libext2fs/irel_ma.c        1970-01-01 00:00:00 +0000
    15868 +++ silo-1.4.11/libext2fs/irel_ma.c     2006-03-09 21:34:57 +0000
     15866diff -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
    1586915869@@ -0,0 +1,372 @@
    1587015870+/*
     
    1624016240+       return 0;
    1624116241+}
    16242 diff -Naur silo-1.4.11.orig/libext2fs/ismounted.c silo-1.4.11/libext2fs/ismounted.c
    16243 --- silo-1.4.11.orig/libext2fs/ismounted.c      1970-01-01 00:00:00 +0000
    16244 +++ silo-1.4.11/libext2fs/ismounted.c   2006-03-09 21:34:57 +0000
     16242diff -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
    1624516245@@ -0,0 +1,377 @@
    1624616246+/*
     
    1662116621+}
    1662216622+#endif /* DEBUG */
    16623 diff -Naur silo-1.4.11.orig/libext2fs/jfs_compat.h silo-1.4.11/libext2fs/jfs_compat.h
    16624 --- silo-1.4.11.orig/libext2fs/jfs_compat.h     1970-01-01 00:00:00 +0000
    16625 +++ silo-1.4.11/libext2fs/jfs_compat.h  2006-03-09 21:34:57 +0000
     16623diff -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
    1662616626@@ -0,0 +1,67 @@
    1662716627+
     
    1669216692+
    1669316693+#endif /* _JFS_COMPAT_H */
    16694 diff -Naur silo-1.4.11.orig/libext2fs/jfs_dat.h silo-1.4.11/libext2fs/jfs_dat.h
    16695 --- silo-1.4.11.orig/libext2fs/jfs_dat.h        1970-01-01 00:00:00 +0000
    16696 +++ silo-1.4.11/libext2fs/jfs_dat.h     2006-03-09 21:34:57 +0000
     16694diff -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
    1669716697@@ -0,0 +1,64 @@
    1669816698+/*
     
    1676016760+} journal_superblock_t;
    1676116761+
    16762 diff -Naur silo-1.4.11.orig/libext2fs/jfs_user.h silo-1.4.11/libext2fs/jfs_user.h
    16763 --- silo-1.4.11.orig/libext2fs/jfs_user.h       1970-01-01 00:00:00 +0000
    16764 +++ silo-1.4.11/libext2fs/jfs_user.h    2006-03-09 21:34:57 +0000
     16762diff -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
    1676516765@@ -0,0 +1,8 @@
    1676616766+#ifndef _JFS_USER_H
     
    1677216772+
    1677316773+#endif /* _JFS_USER_H */
    16774 diff -Naur silo-1.4.11.orig/libext2fs/kernel-jbd.h silo-1.4.11/libext2fs/kernel-jbd.h
    16775 --- silo-1.4.11.orig/libext2fs/kernel-jbd.h     1970-01-01 00:00:00 +0000
    16776 +++ silo-1.4.11/libext2fs/kernel-jbd.h  2006-03-09 21:34:57 +0000
     16774diff -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
    1677716777@@ -0,0 +1,910 @@
    1677816778+/*
     
    1768617686+#endif /* defined(__KERNEL__) && !defined(CONFIG_JBD) */
    1768717687+#endif /* _LINUX_JBD_H */
    17688 diff -Naur silo-1.4.11.orig/libext2fs/kernel-list.h silo-1.4.11/libext2fs/kernel-list.h
    17689 --- silo-1.4.11.orig/libext2fs/kernel-list.h    1970-01-01 00:00:00 +0000
    17690 +++ silo-1.4.11/libext2fs/kernel-list.h 2006-03-09 21:34:57 +0000
     17688diff -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
    1769117691@@ -0,0 +1,112 @@
    1769217692+#ifndef _LINUX_LIST_H
     
    1780217802+
    1780317803+#endif
    17804 diff -Naur silo-1.4.11.orig/libext2fs/link.c silo-1.4.11/libext2fs/link.c
    17805 --- silo-1.4.11.orig/libext2fs/link.c   1970-01-01 00:00:00 +0000
    17806 +++ silo-1.4.11/libext2fs/link.c        2006-03-09 21:34:57 +0000
     17804diff -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
    1780717807@@ -0,0 +1,134 @@
    1780817808+/*
     
    1794017940+       return 0;
    1794117941+}
    17942 diff -Naur silo-1.4.11.orig/libext2fs/llseek.c silo-1.4.11/libext2fs/llseek.c
    17943 --- silo-1.4.11.orig/libext2fs/llseek.c 1970-01-01 00:00:00 +0000
    17944 +++ silo-1.4.11/libext2fs/llseek.c      2006-03-09 21:34:57 +0000
     17942diff -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
    1794517945@@ -0,0 +1,138 @@
    1794617946+/*
     
    1808218082+
    1808318083+
    18084 diff -Naur silo-1.4.11.orig/libext2fs/lookup.c silo-1.4.11/libext2fs/lookup.c
    18085 --- silo-1.4.11.orig/libext2fs/lookup.c 1970-01-01 00:00:00 +0000
    18086 +++ silo-1.4.11/libext2fs/lookup.c      2006-03-09 21:34:57 +0000
     18084diff -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
    1808718087@@ -0,0 +1,69 @@
    1808818088+/*
     
    1815518155+
    1815618156+
    18157 diff -Naur silo-1.4.11.orig/libext2fs/mkdir.c silo-1.4.11/libext2fs/mkdir.c
    18158 --- silo-1.4.11.orig/libext2fs/mkdir.c  1970-01-01 00:00:00 +0000
    18159 +++ silo-1.4.11/libext2fs/mkdir.c       2006-03-09 21:34:57 +0000
     18157diff -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
    1816018160@@ -0,0 +1,142 @@
    1816118161+/*
     
    1830118301+
    1830218302+
    18303 diff -Naur silo-1.4.11.orig/libext2fs/mkjournal.c silo-1.4.11/libext2fs/mkjournal.c
    18304 --- silo-1.4.11.orig/libext2fs/mkjournal.c      1970-01-01 00:00:00 +0000
    18305 +++ silo-1.4.11/libext2fs/mkjournal.c   2006-03-09 21:34:57 +0000
     18303diff -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
    1830618306@@ -0,0 +1,425 @@
    1830718307+/*
     
    1873018730+}
    1873118731+#endif
    18732 diff -Naur silo-1.4.11.orig/libext2fs/namei.c silo-1.4.11/libext2fs/namei.c
    18733 --- silo-1.4.11.orig/libext2fs/namei.c  1970-01-01 00:00:00 +0000
    18734 +++ silo-1.4.11/libext2fs/namei.c       2006-03-09 21:34:57 +0000
     18732diff -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
    1873518735@@ -0,0 +1,205 @@
    1873618736+/*
     
    1893918939+}
    1894018940+
    18941 diff -Naur silo-1.4.11.orig/libext2fs/native.c silo-1.4.11/libext2fs/native.c
    18942 --- silo-1.4.11.orig/libext2fs/native.c 1970-01-01 00:00:00 +0000
    18943 +++ silo-1.4.11/libext2fs/native.c      2006-03-09 21:34:57 +0000
     18941diff -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
    1894418944@@ -0,0 +1,27 @@
    1894518945+/*
     
    1897018970+       
    1897118971+       
    18972 diff -Naur silo-1.4.11.orig/libext2fs/newdir.c silo-1.4.11/libext2fs/newdir.c
    18973 --- silo-1.4.11.orig/libext2fs/newdir.c 1970-01-01 00:00:00 +0000
    18974 +++ silo-1.4.11/libext2fs/newdir.c      2006-03-09 21:34:57 +0000
     18972diff -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
    1897518975@@ -0,0 +1,72 @@
    1897618976+/*
     
    1904619046+       return 0;
    1904719047+}
    19048 diff -Naur silo-1.4.11.orig/libext2fs/nt_io.c silo-1.4.11/libext2fs/nt_io.c
    19049 --- silo-1.4.11.orig/libext2fs/nt_io.c  1970-01-01 00:00:00 +0000
    19050 +++ silo-1.4.11/libext2fs/nt_io.c       2006-03-09 21:34:57 +0000
     19048diff -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
    1905119051@@ -0,0 +1,1513 @@
    1905219052+/*
     
    2056320563+
    2056420564+
    20565 diff -Naur silo-1.4.11.orig/libext2fs/openfs.c silo-1.4.11/libext2fs/openfs.c
    20566 --- silo-1.4.11.orig/libext2fs/openfs.c 1970-01-01 00:00:00 +0000
    20567 +++ silo-1.4.11/libext2fs/openfs.c      2006-03-09 21:34:57 +0000
     20565diff -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
    2056820568@@ -0,0 +1,326 @@
    2056920569+/*
     
    2089320893+       return 0;
    2089420894+}
    20895 diff -Naur silo-1.4.11.orig/libext2fs/read_bb.c silo-1.4.11/libext2fs/read_bb.c
    20896 --- silo-1.4.11.orig/libext2fs/read_bb.c        1970-01-01 00:00:00 +0000
    20897 +++ silo-1.4.11/libext2fs/read_bb.c     2006-03-09 21:34:57 +0000
     20895diff -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
    2089820898@@ -0,0 +1,97 @@
    2089920899+/*
     
    2099420994+
    2099520995+
    20996 diff -Naur silo-1.4.11.orig/libext2fs/read_bb_file.c silo-1.4.11/libext2fs/read_bb_file.c
    20997 --- silo-1.4.11.orig/libext2fs/read_bb_file.c   1970-01-01 00:00:00 +0000
    20998 +++ silo-1.4.11/libext2fs/read_bb_file.c        2006-03-09 21:34:57 +0000
     20996diff -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
    2099920999@@ -0,0 +1,97 @@
    2100021000+/*
     
    2109521095+
    2109621096+
    21097 diff -Naur silo-1.4.11.orig/libext2fs/res_gdt.c silo-1.4.11/libext2fs/res_gdt.c
    21098 --- silo-1.4.11.orig/libext2fs/res_gdt.c        1970-01-01 00:00:00 +0000
    21099 +++ silo-1.4.11/libext2fs/res_gdt.c     2006-03-09 21:34:57 +0000
     21097diff -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
    2110021100@@ -0,0 +1,220 @@
    2110121101+/*
     
    2131921319+}
    2132021320+
    21321 diff -Naur silo-1.4.11.orig/libext2fs/rs_bitmap.c silo-1.4.11/libext2fs/rs_bitmap.c
    21322 --- silo-1.4.11.orig/libext2fs/rs_bitmap.c      1970-01-01 00:00:00 +0000
    21323 +++ silo-1.4.11/libext2fs/rs_bitmap.c   2006-03-09 21:34:57 +0000
     21321diff -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
    2132421324@@ -0,0 +1,106 @@
    2132521325+/*
     
    2142921429+}
    2143021430+
    21431 diff -Naur silo-1.4.11.orig/libext2fs/rw_bitmaps.c silo-1.4.11/libext2fs/rw_bitmaps.c
    21432 --- silo-1.4.11.orig/libext2fs/rw_bitmaps.c     1970-01-01 00:00:00 +0000
    21433 +++ silo-1.4.11/libext2fs/rw_bitmaps.c  2006-03-09 21:34:57 +0000
     21431diff -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
    2143421434@@ -0,0 +1,300 @@
    2143521435+/*
     
    2173321733+}     
    2173421734+
    21735 diff -Naur silo-1.4.11.orig/libext2fs/sparse.c silo-1.4.11/libext2fs/sparse.c
    21736 --- silo-1.4.11.orig/libext2fs/sparse.c 1970-01-01 00:00:00 +0000
    21737 +++ silo-1.4.11/libext2fs/sparse.c      2006-03-09 21:34:57 +0000
     21735diff -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
    2173821738@@ -0,0 +1,78 @@
    2173921739+/*
     
    2181521815+       return ret;
    2181621816+}
    21817 diff -Naur silo-1.4.11.orig/libext2fs/swapfs.c silo-1.4.11/libext2fs/swapfs.c
    21818 --- silo-1.4.11.orig/libext2fs/swapfs.c 1970-01-01 00:00:00 +0000
    21819 +++ silo-1.4.11/libext2fs/swapfs.c      2006-03-09 21:34:57 +0000
     21817diff -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
    2182021820@@ -0,0 +1,237 @@
    2182121821+/*
     
    2205622056+
    2205722057+#endif
    22058 diff -Naur silo-1.4.11.orig/libext2fs/test_io.c silo-1.4.11/libext2fs/test_io.c
    22059 --- silo-1.4.11.orig/libext2fs/test_io.c        1970-01-01 00:00:00 +0000
    22060 +++ silo-1.4.11/libext2fs/test_io.c     2006-03-09 21:34:57 +0000
     22058diff -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
    2206122061@@ -0,0 +1,411 @@
    2206222062+/*
     
    2247122471+       return retval;
    2247222472+}
    22473 diff -Naur silo-1.4.11.orig/libext2fs/tst_badblocks.c silo-1.4.11/libext2fs/tst_badblocks.c
    22474 --- silo-1.4.11.orig/libext2fs/tst_badblocks.c  1970-01-01 00:00:00 +0000
    22475 +++ silo-1.4.11/libext2fs/tst_badblocks.c       2006-03-09 21:34:57 +0000
     22473diff -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
    2247622476@@ -0,0 +1,293 @@
    2247722477+/*
     
    2276822768+
    2276922769+}
    22770 diff -Naur silo-1.4.11.orig/libext2fs/tst_bitops.c silo-1.4.11/libext2fs/tst_bitops.c
    22771 --- silo-1.4.11.orig/libext2fs/tst_bitops.c     1970-01-01 00:00:00 +0000
    22772 +++ silo-1.4.11/libext2fs/tst_bitops.c  2006-03-09 21:34:57 +0000
     22770diff -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
    2277322773@@ -0,0 +1,44 @@
    2277422774+/*
     
    2281622816+       }
    2281722817+}
    22818 diff -Naur silo-1.4.11.orig/libext2fs/tst_byteswap.c silo-1.4.11/libext2fs/tst_byteswap.c
    22819 --- silo-1.4.11.orig/libext2fs/tst_byteswap.c   1970-01-01 00:00:00 +0000
    22820 +++ silo-1.4.11/libext2fs/tst_byteswap.c        2006-03-09 21:34:57 +0000
     22818diff -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
    2282122821@@ -0,0 +1,92 @@
    2282222822+/*
     
    2291222912+       return errors;
    2291322913+}
    22914 diff -Naur silo-1.4.11.orig/libext2fs/tst_getsectsize.c silo-1.4.11/libext2fs/tst_getsectsize.c
    22915 --- silo-1.4.11.orig/libext2fs/tst_getsectsize.c        1970-01-01 00:00:00 +0000
    22916 +++ silo-1.4.11/libext2fs/tst_getsectsize.c     2006-03-09 21:34:57 +0000
     22914diff -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
    2291722917@@ -0,0 +1,47 @@
    2291822918+/*
     
    2296322963+       exit(0);
    2296422964+}
    22965 diff -Naur silo-1.4.11.orig/libext2fs/tst_getsize.c silo-1.4.11/libext2fs/tst_getsize.c
    22966 --- silo-1.4.11.orig/libext2fs/tst_getsize.c    1970-01-01 00:00:00 +0000
    22967 +++ silo-1.4.11/libext2fs/tst_getsize.c 2006-03-09 21:34:57 +0000
     22965diff -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
    2296822968@@ -0,0 +1,44 @@
    2296922969+/*
     
    2301123011+       return 0;
    2301223012+}
    23013 diff -Naur silo-1.4.11.orig/libext2fs/tst_iscan.c silo-1.4.11/libext2fs/tst_iscan.c
    23014 --- silo-1.4.11.orig/libext2fs/tst_iscan.c      1970-01-01 00:00:00 +0000
    23015 +++ silo-1.4.11/libext2fs/tst_iscan.c   2006-03-09 21:34:57 +0000
     23013diff -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
    2301623016@@ -0,0 +1,218 @@
    2301723017+/*
     
    2323323233+}
    2323423234+
    23235 diff -Naur silo-1.4.11.orig/libext2fs/unix_io.c silo-1.4.11/libext2fs/unix_io.c
    23236 --- silo-1.4.11.orig/libext2fs/unix_io.c        1970-01-01 00:00:00 +0000
    23237 +++ silo-1.4.11/libext2fs/unix_io.c     2006-03-09 21:34:57 +0000
     23235diff -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
    2323823238@@ -0,0 +1,710 @@
    2323923239+/*
     
    2394723947+       return EXT2_ET_INVALID_ARGUMENT;
    2394823948+}
    23949 diff -Naur silo-1.4.11.orig/libext2fs/unlink.c silo-1.4.11/libext2fs/unlink.c
    23950 --- silo-1.4.11.orig/libext2fs/unlink.c 1970-01-01 00:00:00 +0000
    23951 +++ silo-1.4.11/libext2fs/unlink.c      2006-03-09 21:34:57 +0000
     23949diff -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
    2395223952@@ -0,0 +1,99 @@
    2395323953+/*
     
    2405024050+}
    2405124051+
    24052 diff -Naur silo-1.4.11.orig/libext2fs/valid_blk.c silo-1.4.11/libext2fs/valid_blk.c
    24053 --- silo-1.4.11.orig/libext2fs/valid_blk.c      1970-01-01 00:00:00 +0000
    24054 +++ silo-1.4.11/libext2fs/valid_blk.c   2006-03-09 21:34:57 +0000
     24052diff -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
    2405524055@@ -0,0 +1,56 @@
    2405624056+/*
     
    2411024110+       return 1;
    2411124111+}
    24112 diff -Naur silo-1.4.11.orig/libext2fs/version.c silo-1.4.11/libext2fs/version.c
    24113 --- silo-1.4.11.orig/libext2fs/version.c        1970-01-01 00:00:00 +0000
    24114 +++ silo-1.4.11/libext2fs/version.c     2006-03-09 21:34:57 +0000
     24112diff -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
    2411524115@@ -0,0 +1,52 @@
    2411624116+/*
     
    2416624166+       return ext2fs_parse_version_string(lib_version);
    2416724167+}
    24168 diff -Naur silo-1.4.11.orig/libext2fs/version.h silo-1.4.11/libext2fs/version.h
    24169 --- silo-1.4.11.orig/libext2fs/version.h        1970-01-01 00:00:00 +0000
    24170 +++ silo-1.4.11/libext2fs/version.h     2006-03-09 21:34:57 +0000
     24168diff -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
    2417124171@@ -0,0 +1,11 @@
    2417224172+/*
     
    2418124181+#define E2FSPROGS_VERSION "1.38"
    2418224182+#define E2FSPROGS_DATE "30-Jun-2005"
    24183 diff -Naur silo-1.4.11.orig/libext2fs/write_bb_file.c silo-1.4.11/libext2fs/write_bb_file.c
    24184 --- silo-1.4.11.orig/libext2fs/write_bb_file.c  1970-01-01 00:00:00 +0000
    24185 +++ silo-1.4.11/libext2fs/write_bb_file.c       2006-03-09 21:34:57 +0000
     24183diff -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
    2418624186@@ -0,0 +1,34 @@
    2418724187+/*
     
    2421924219+       return 0;
    2422024220+}
    24221 diff -Naur silo-1.4.11.orig/second/Makefile silo-1.4.11/second/Makefile
    24222 --- silo-1.4.11.orig/second/Makefile    2006-03-09 21:34:08 +0000
    24223 +++ silo-1.4.11/second/Makefile 2006-03-09 21:34:57 +0000
     24221diff -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
    2422424224@@ -27,10 +27,10 @@
    2422524225 LDFLAGS_LARGE=-N -Ttext $(LARGE_RELOC)
     
    2431224312 second.b: second util
    2431324313        $(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
     24314diff -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 
     24385diff -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
    2431724388@@ -19,10 +19,10 @@
    2431824389    USA.  */
     
    2432724398 #include <ext2fs/ext2fs.h>
    2432824399 
    24329 diff -Naur silo-1.4.11.orig/silo/silo.c silo-1.4.11/silo/silo.c
    24330 --- silo-1.4.11.orig/silo/silo.c        2006-03-09 21:34:08 +0000
    24331 +++ silo-1.4.11/silo/silo.c     2006-03-09 21:34:57 +0000
     24400diff -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
    2433224403@@ -128,8 +128,8 @@
    2433324404     unsigned short nsect;      /* Sectors per track */
     
    2434124412     unsigned short magic;      /* Magic number */
    2434224413     unsigned short csum;       /* Label xor'd checksum */
    24343 diff -Naur silo-1.4.11.orig/silo/silocheck.c silo-1.4.11/silo/silocheck.c
    24344 --- silo-1.4.11.orig/silo/silocheck.c   2006-03-09 21:34:08 +0000
    24345 +++ silo-1.4.11/silo/silocheck.c        2006-03-09 21:34:57 +0000
     24414diff -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
    2434624417@@ -100,8 +100,8 @@
    2434724418     unsigned short nsect;      /* Sectors per track */
     
    2435524426     unsigned short magic;      /* Magic number */
    2435624427     unsigned short csum;       /* Label xor'd checksum */
    24357 diff -Naur silo-1.4.11.orig/tilo/Makefile silo-1.4.11/tilo/Makefile
    24358 --- silo-1.4.11.orig/tilo/Makefile      2006-03-09 21:34:08 +0000
    24359 +++ silo-1.4.11/tilo/Makefile   2006-03-09 21:34:57 +0000
     24428diff -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
    2436024431@@ -14,10 +14,10 @@
    2436124432 all: maketilo
Note: See TracChangeset for help on using the changeset viewer.