aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rwxr-xr-xkernel-2.4/fs/squashfs/inode.c6
-rwxr-xr-xkernel-2.4/fs/squashfs/squashfs.h2
-rwxr-xr-xkernel-2.4/fs/squashfs/squashfs2_0.c2
-rwxr-xr-xkernel-2.4/include/linux/squashfs_fs.h6
-rwxr-xr-xkernel-2.4/include/linux/squashfs_fs_i.h2
-rwxr-xr-xkernel-2.4/include/linux/squashfs_fs_sb.h2
-rw-r--r--kernel/fs/squashfs/inode.c6
-rw-r--r--kernel/fs/squashfs/squashfs.h2
-rw-r--r--kernel/fs/squashfs/squashfs2_0.c2
-rw-r--r--kernel/include/linux/squashfs_fs.h6
-rw-r--r--kernel/include/linux/squashfs_fs_i.h2
-rw-r--r--kernel/include/linux/squashfs_fs_sb.h2
-rw-r--r--squashfs-tools/global.h2
-rw-r--r--squashfs-tools/mksquashfs.c11
-rw-r--r--squashfs-tools/read_fs.c2
-rw-r--r--squashfs-tools/read_fs.h2
-rw-r--r--squashfs-tools/sort.c2
-rwxr-xr-xsquashfs-tools/sort.h2
-rw-r--r--squashfs-tools/squashfs_fs.h2
-rw-r--r--squashfs-tools/unsquashfs.c8
20 files changed, 34 insertions, 37 deletions
diff --git a/kernel-2.4/fs/squashfs/inode.c b/kernel-2.4/fs/squashfs/inode.c
index 18496bd..22f3743 100755
--- a/kernel-2.4/fs/squashfs/inode.c
+++ b/kernel-2.4/fs/squashfs/inode.c
@@ -2,7 +2,7 @@
* Squashfs - a compressed read only filesystem for Linux
*
* Copyright (c) 2002, 2003, 2004, 2005, 2006
- * Phillip Lougher <phillip@lougher.demon.co.uk>
+ * Phillip Lougher <phillip@lougher.org.uk>
*
* This program is free software; you can redistribute it and/or
* modify it under the terms of the GNU General Public License
@@ -2001,7 +2001,7 @@ static void squashfs_put_super(struct super_block *s)
static int __init init_squashfs_fs(void)
{
- printk(KERN_INFO "squashfs: version 3.0prerelease (2006/2/22) "
+ printk(KERN_INFO "squashfs: version 3.0 (2006/03/15) "
"Phillip Lougher\n");
if (!(stream.workspace = vmalloc(zlib_inflate_workspacesize()))) {
@@ -2024,5 +2024,5 @@ EXPORT_NO_SYMBOLS;
module_init(init_squashfs_fs);
module_exit(exit_squashfs_fs);
MODULE_DESCRIPTION("squashfs, a compressed read-only filesystem");
-MODULE_AUTHOR("Phillip Lougher <phillip@lougher.demon.co.uk>");
+MODULE_AUTHOR("Phillip Lougher <phillip@lougher.org.uk>");
MODULE_LICENSE("GPL");
diff --git a/kernel-2.4/fs/squashfs/squashfs.h b/kernel-2.4/fs/squashfs/squashfs.h
index b5f93fb..e53ceef 100755
--- a/kernel-2.4/fs/squashfs/squashfs.h
+++ b/kernel-2.4/fs/squashfs/squashfs.h
@@ -2,7 +2,7 @@
* Squashfs - a compressed read only filesystem for Linux
*
* Copyright (c) 2002, 2003, 2004, 2005, 2006
- * Phillip Lougher <phillip@lougher.demon.co.uk>
+ * Phillip Lougher <phillip@lougher.org.uk>
*
* This program is free software; you can redistribute it and/or
* modify it under the terms of the GNU General Public License
diff --git a/kernel-2.4/fs/squashfs/squashfs2_0.c b/kernel-2.4/fs/squashfs/squashfs2_0.c
index 433ca30..d4efd8a 100755
--- a/kernel-2.4/fs/squashfs/squashfs2_0.c
+++ b/kernel-2.4/fs/squashfs/squashfs2_0.c
@@ -2,7 +2,7 @@
* Squashfs - a compressed read only filesystem for Linux
*
* Copyright (c) 2002, 2003, 2004, 2005, 2006
- * Phillip Lougher <phillip@lougher.demon.co.uk>
+ * Phillip Lougher <phillip@lougher.org.uk>
*
* This program is free software; you can redistribute it and/or
* modify it under the terms of the GNU General Public License
diff --git a/kernel-2.4/include/linux/squashfs_fs.h b/kernel-2.4/include/linux/squashfs_fs.h
index 9b9c455..5c79e38 100755
--- a/kernel-2.4/include/linux/squashfs_fs.h
+++ b/kernel-2.4/include/linux/squashfs_fs.h
@@ -5,7 +5,7 @@
* Squashfs
*
* Copyright (c) 2002, 2003, 2004, 2005, 2006
- * Phillip Lougher <phillip@lougher.demon.co.uk>
+ * Phillip Lougher <phillip@lougher.org.uk>
*
* This program is free software; you can redistribute it and/or
* modify it under the terms of the GNU General Public License
@@ -650,7 +650,7 @@ struct squashfs_dir_inode_header_1 {
sizeof(struct squashfs_reg_inode_header_1));\
SQUASHFS_SWAP((s)->mtime, d, 24, 32);\
SQUASHFS_SWAP((s)->start_block, d, 56, 32);\
- SQUASHFS_SWAP((s)->file_size, d, 88, SQUASHFS_MAX_FILE_SIZE_LOG);\
+ SQUASHFS_SWAP((s)->file_size, d, 88, 32);\
}
#define SQUASHFS_SWAP_DIR_INODE_HEADER_1(s, d) {\
@@ -806,7 +806,7 @@ struct squashfs_fragment_entry_2 {
SQUASHFS_SWAP((s)->start_block, d, 64, 32);\
SQUASHFS_SWAP((s)->fragment, d, 96, 32);\
SQUASHFS_SWAP((s)->offset, d, 128, 32);\
- SQUASHFS_SWAP((s)->file_size, d, 160, SQUASHFS_MAX_FILE_SIZE_LOG);\
+ SQUASHFS_SWAP((s)->file_size, d, 160, 32);\
}
#define SQUASHFS_SWAP_DIR_INODE_HEADER_2(s, d) {\
diff --git a/kernel-2.4/include/linux/squashfs_fs_i.h b/kernel-2.4/include/linux/squashfs_fs_i.h
index 1d7720c..0fe28cc 100755
--- a/kernel-2.4/include/linux/squashfs_fs_i.h
+++ b/kernel-2.4/include/linux/squashfs_fs_i.h
@@ -4,7 +4,7 @@
* Squashfs
*
* Copyright (c) 2002, 2003, 2004, 2005, 2006
- * Phillip Lougher <phillip@lougher.demon.co.uk>
+ * Phillip Lougher <phillip@lougher.org.uk>
*
* This program is free software; you can redistribute it and/or
* modify it under the terms of the GNU General Public License
diff --git a/kernel-2.4/include/linux/squashfs_fs_sb.h b/kernel-2.4/include/linux/squashfs_fs_sb.h
index 72e16e7..9ea7a11 100755
--- a/kernel-2.4/include/linux/squashfs_fs_sb.h
+++ b/kernel-2.4/include/linux/squashfs_fs_sb.h
@@ -4,7 +4,7 @@
* Squashfs
*
* Copyright (c) 2002, 2003, 2004, 2005, 2006
- * Phillip Lougher <phillip@lougher.demon.co.uk>
+ * Phillip Lougher <phillip@lougher.org.uk>
*
* This program is free software; you can redistribute it and/or
* modify it under the terms of the GNU General Public License
diff --git a/kernel/fs/squashfs/inode.c b/kernel/fs/squashfs/inode.c
index f254914..da0b3ee 100644
--- a/kernel/fs/squashfs/inode.c
+++ b/kernel/fs/squashfs/inode.c
@@ -2,7 +2,7 @@
* Squashfs - a compressed read only filesystem for Linux
*
* Copyright (c) 2002, 2003, 2004, 2005, 2006
- * Phillip Lougher <phillip@lougher.demon.co.uk>
+ * Phillip Lougher <phillip@lougher.org.uk>
*
* This program is free software; you can redistribute it and/or
* modify it under the terms of the GNU General Public License
@@ -2043,7 +2043,7 @@ static int __init init_squashfs_fs(void)
if (err)
goto out;
- printk(KERN_INFO "squashfs: version 3.0prerelease (2006/2/22)) "
+ printk(KERN_INFO "squashfs: version 3.0 (2006/03/15) "
"Phillip Lougher\n");
if (!(stream.workspace = vmalloc(zlib_inflate_workspacesize()))) {
@@ -2123,5 +2123,5 @@ static void destroy_inodecache(void)
module_init(init_squashfs_fs);
module_exit(exit_squashfs_fs);
MODULE_DESCRIPTION("squashfs, a compressed read-only filesystem");
-MODULE_AUTHOR("Phillip Lougher <phillip@lougher.demon.co.uk>");
+MODULE_AUTHOR("Phillip Lougher <phillip@lougher.org.uk>");
MODULE_LICENSE("GPL");
diff --git a/kernel/fs/squashfs/squashfs.h b/kernel/fs/squashfs/squashfs.h
index f5edc55..dcbef0d 100644
--- a/kernel/fs/squashfs/squashfs.h
+++ b/kernel/fs/squashfs/squashfs.h
@@ -2,7 +2,7 @@
* Squashfs - a compressed read only filesystem for Linux
*
* Copyright (c) 2002, 2003, 2004, 2005, 2006
- * Phillip Lougher <phillip@lougher.demon.co.uk>
+ * Phillip Lougher <phillip@lougher.org.uk>
*
* This program is free software; you can redistribute it and/or
* modify it under the terms of the GNU General Public License
diff --git a/kernel/fs/squashfs/squashfs2_0.c b/kernel/fs/squashfs/squashfs2_0.c
index bd402cd..d846eb1 100644
--- a/kernel/fs/squashfs/squashfs2_0.c
+++ b/kernel/fs/squashfs/squashfs2_0.c
@@ -2,7 +2,7 @@
* Squashfs - a compressed read only filesystem for Linux
*
* Copyright (c) 2002, 2003, 2004, 2005, 2006
- * Phillip Lougher <phillip@lougher.demon.co.uk>
+ * Phillip Lougher <phillip@lougher.org.uk>
*
* This program is free software; you can redistribute it and/or
* modify it under the terms of the GNU General Public License
diff --git a/kernel/include/linux/squashfs_fs.h b/kernel/include/linux/squashfs_fs.h
index a6a90c4..ef01d88 100644
--- a/kernel/include/linux/squashfs_fs.h
+++ b/kernel/include/linux/squashfs_fs.h
@@ -5,7 +5,7 @@
* Squashfs
*
* Copyright (c) 2002, 2003, 2004, 2005, 2006
- * Phillip Lougher <phillip@lougher.demon.co.uk>
+ * Phillip Lougher <phillip@lougher.org.uk>
*
* This program is free software; you can redistribute it and/or
* modify it under the terms of the GNU General Public License
@@ -646,7 +646,7 @@ struct squashfs_dir_inode_header_1 {
sizeof(struct squashfs_reg_inode_header_1));\
SQUASHFS_SWAP((s)->mtime, d, 24, 32);\
SQUASHFS_SWAP((s)->start_block, d, 56, 32);\
- SQUASHFS_SWAP((s)->file_size, d, 88, SQUASHFS_MAX_FILE_SIZE_LOG);\
+ SQUASHFS_SWAP((s)->file_size, d, 88, 32);\
}
#define SQUASHFS_SWAP_DIR_INODE_HEADER_1(s, d) {\
@@ -802,7 +802,7 @@ struct squashfs_fragment_entry_2 {
SQUASHFS_SWAP((s)->start_block, d, 64, 32);\
SQUASHFS_SWAP((s)->fragment, d, 96, 32);\
SQUASHFS_SWAP((s)->offset, d, 128, 32);\
- SQUASHFS_SWAP((s)->file_size, d, 160, SQUASHFS_MAX_FILE_SIZE_LOG);\
+ SQUASHFS_SWAP((s)->file_size, d, 160, 32);\
}
#define SQUASHFS_SWAP_DIR_INODE_HEADER_2(s, d) {\
diff --git a/kernel/include/linux/squashfs_fs_i.h b/kernel/include/linux/squashfs_fs_i.h
index aff41a9..d0cf810 100644
--- a/kernel/include/linux/squashfs_fs_i.h
+++ b/kernel/include/linux/squashfs_fs_i.h
@@ -4,7 +4,7 @@
* Squashfs
*
* Copyright (c) 2002, 2003, 2004, 2005, 2006
- * Phillip Lougher <phillip@lougher.demon.co.uk>
+ * Phillip Lougher <phillip@lougher.org.uk>
*
* This program is free software; you can redistribute it and/or
* modify it under the terms of the GNU General Public License
diff --git a/kernel/include/linux/squashfs_fs_sb.h b/kernel/include/linux/squashfs_fs_sb.h
index 72e16e7..9ea7a11 100644
--- a/kernel/include/linux/squashfs_fs_sb.h
+++ b/kernel/include/linux/squashfs_fs_sb.h
@@ -4,7 +4,7 @@
* Squashfs
*
* Copyright (c) 2002, 2003, 2004, 2005, 2006
- * Phillip Lougher <phillip@lougher.demon.co.uk>
+ * Phillip Lougher <phillip@lougher.org.uk>
*
* This program is free software; you can redistribute it and/or
* modify it under the terms of the GNU General Public License
diff --git a/squashfs-tools/global.h b/squashfs-tools/global.h
index c2578ef..2c45c4a 100644
--- a/squashfs-tools/global.h
+++ b/squashfs-tools/global.h
@@ -5,7 +5,7 @@
* Squashfs
*
* Copyright (c) 2002, 2003, 2004, 2005, 2006
- * Phillip Lougher <phillip@lougher.demon.co.uk>
+ * Phillip Lougher <phillip@lougher.org.uk>
*
* This program is free software; you can redistribute it and/or
* modify it under the terms of the GNU General Public License
diff --git a/squashfs-tools/mksquashfs.c b/squashfs-tools/mksquashfs.c
index 3014380..e773f53 100644
--- a/squashfs-tools/mksquashfs.c
+++ b/squashfs-tools/mksquashfs.c
@@ -2,7 +2,7 @@
* Create a squashfs filesystem. This is a highly compressed read only filesystem.
*
* Copyright (c) 2002, 2003, 2004, 2005, 2006
- * Phillip Lougher <phillip@lougher.demon.co.uk>
+ * Phillip Lougher <phillip@lougher.org.uk>
*
* This program is free software; you can redistribute it and/or
* modify it under the terms of the GNU General Public License
@@ -1791,8 +1791,8 @@ void add_old_root_entry(char *name, squashfs_inode inode, int inode_number, int
#define VERSION() \
- printf("mksquashfs version 3.0prerelease (2006/2/25)\n");\
- printf("copyright (C) 2006 Phillip Lougher (phillip@lougher.demon.co.uk)\n\n"); \
+ printf("mksquashfs version 3.0 (2006/03/15)\n");\
+ printf("copyright (C) 2006 Phillip Lougher <phillip@lougher.org.uk>\n\n"); \
printf("This program is free software; you can redistribute it and/or\n");\
printf("modify it under the terms of the GNU General Public License\n");\
printf("as published by the Free Software Foundation; either version 2,\n");\
@@ -1842,9 +1842,7 @@ int main(int argc, char *argv[])
ERROR("%s: -ef missing filename\n", argv[0]);
exit(1);
}
- } else if(strcmp(argv[i], "-2.0") == 0)
- ERROR("Not supported\n");
- else if(strcmp(argv[i], "-no-duplicates") == 0)
+ } else if(strcmp(argv[i], "-no-duplicates") == 0)
duplicate_checking = FALSE;
else if(strcmp(argv[i], "-no-fragments") == 0)
@@ -1952,7 +1950,6 @@ printOptions:
ERROR("-version\t\tprint version, licence and copyright message\n");
ERROR("-info\t\t\tprint files written to filesystem\n");
ERROR("-b <block_size>\t\tset data block to <block_size>. Default %d bytes\n", SQUASHFS_FILE_SIZE);
- ERROR("-2.0\t\t\tcreate a 2.0 filesystem\n");
ERROR("-noI\t\t\tdo not compress inode table\n");
ERROR("-noD\t\t\tdo not compress data blocks\n");
ERROR("-noF\t\t\tdo not compress fragment blocks\n");
diff --git a/squashfs-tools/read_fs.c b/squashfs-tools/read_fs.c
index 3374084..46f4a4e 100644
--- a/squashfs-tools/read_fs.c
+++ b/squashfs-tools/read_fs.c
@@ -2,7 +2,7 @@
* Read a squashfs filesystem. This is a highly compressed read only filesystem.
*
* Copyright (c) 2002, 2003, 2004, 2005, 2006
- * Phillip Lougher <phillip@lougher.demon.co.uk>
+ * Phillip Lougher <phillip@lougher.org.uk>
*
* This program is free software; you can redistribute it and/or
* modify it under the terms of the GNU General Public License
diff --git a/squashfs-tools/read_fs.h b/squashfs-tools/read_fs.h
index 27c93de..1b35aed 100644
--- a/squashfs-tools/read_fs.h
+++ b/squashfs-tools/read_fs.h
@@ -4,7 +4,7 @@
* machine with different byte ordering to the target architecture.
*
* Copyright (c) 2002, 2003, 2004, 2005, 2006
- * Phillip Lougher <phillip@lougher.demon.co.uk>
+ * Phillip Lougher <phillip@lougher.org.uk>
*
* This program is free software; you can redistribute it and/or
* modify it under the terms of the GNU General Public License
diff --git a/squashfs-tools/sort.c b/squashfs-tools/sort.c
index bc6a5e6..c30093f 100644
--- a/squashfs-tools/sort.c
+++ b/squashfs-tools/sort.c
@@ -2,7 +2,7 @@
* Create a squashfs filesystem. This is a highly compressed read only filesystem.
*
* Copyright (c) 2002, 2003, 2004, 2005
- * Phillip Lougher <phillip@lougher.demon.co.uk>
+ * Phillip Lougher <phillip@lougher.org.uk>
*
* This program is free software; you can redistribute it and/or
* modify it under the terms of the GNU General Public License
diff --git a/squashfs-tools/sort.h b/squashfs-tools/sort.h
index 31f8fb6..561c320 100755
--- a/squashfs-tools/sort.h
+++ b/squashfs-tools/sort.h
@@ -5,7 +5,7 @@
* Squashfs
*
* Copyright (c) 2002, 2003, 2004, 2005, 2006
- * Phillip Lougher <phillip@lougher.demon.co.uk>
+ * Phillip Lougher <phillip@lougher.org.uk>
*
* This program is free software; you can redistribute it and/or
* modify it under the terms of the GNU General Public License
diff --git a/squashfs-tools/squashfs_fs.h b/squashfs-tools/squashfs_fs.h
index 0aca9ae..fbbb53c 100644
--- a/squashfs-tools/squashfs_fs.h
+++ b/squashfs-tools/squashfs_fs.h
@@ -5,7 +5,7 @@
* Squashfs
*
* Copyright (c) 2002, 2003, 2004, 2005, 2006
- * Phillip Lougher <phillip@lougher.demon.co.uk>
+ * Phillip Lougher <phillip@lougher.org.uk>
*
* This program is free software; you can redistribute it and/or
* modify it under the terms of the GNU General Public License
diff --git a/squashfs-tools/unsquashfs.c b/squashfs-tools/unsquashfs.c
index 5c4a52c..dae8fd6 100644
--- a/squashfs-tools/unsquashfs.c
+++ b/squashfs-tools/unsquashfs.c
@@ -2,7 +2,7 @@
* Unsquash a squashfs filesystem. This is a highly compressed read only filesystem.
*
* Copyright (c) 2002, 2003, 2004, 2005, 2006
- * Phillip Lougher <phillip@lougher.demon.co.uk>
+ * Phillip Lougher <phillip@lougher.org.uk>
*
* This program is free software; you can redistribute it and/or
* modify it under the terms of the GNU General Public License
@@ -822,7 +822,7 @@ int read_super(squashfs_super_block *sBlk, char *source)
if(sBlk->s_major != SQUASHFS_MAJOR || sBlk->s_minor > SQUASHFS_MINOR) {
ERROR("Major/Minor mismatch, filesystem on %s is (%d:%d)\n",
source, sBlk->s_major, sBlk->s_minor);
- ERROR("This a prerelease of Unsquashfs. I only support Squashfs 3.0 filesystems\n");
+ ERROR("I only support Squashfs 3.0 filesystems! Later releases will support older Squashfs filesystems\n");
goto failed_mount;
}
@@ -859,8 +859,8 @@ failed_mount:
#define VERSION() \
- printf("unsquashfs version 1.0prerelease (2006/1/24)\n");\
- printf("copyright (C) 2006 Phillip Lougher (phillip@lougher.demon.co.uk)\n\n"); \
+ printf("unsquashfs version 1.0 (2006/03/15)\n");\
+ printf("copyright (C) 2006 Phillip Lougher <phillip@lougher.org.uk>\n\n"); \
printf("This program is free software; you can redistribute it and/or\n");\
printf("modify it under the terms of the GNU General Public License\n");\
printf("as published by the Free Software Foundation; either version 2,\n");\
generated by cgit v1.2.3 (git 2.25.1) at 2024-07-08 22:31:05 +0000