webadmin/bpfire
1
0
Fork 0
mirror of https://github.com/vincentmli/bpfire.git synced 2026-04-09 18:45:54 +02:00
Code Issues Packages Projects Releases Wiki Activity

SquashFS hinzugefuegt damit wir auf OpenVZ-Maschinen bauen koennen.

Browse Source 
Kein Loop-Device mehr erforderlich.


git-svn-id: http://svn.ipfire.org/svn/ipfire/trunk@393 ea5c0bd1-69bd-2848-81d8-4f18e57aeed8
This commit is contained in:
ms
2007-01-20 15:42:28 +00:00
parent 378cbbe0c8
commit 26ec951359
10 changed files with 546 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
config/syslinux/syslinux.cfg
View File

@@ -4,22 +4,22 @@ PROMPT 1
F1 boot.msg
F2 options.msg
DEFAULT vmlinuz
APPEND ide=nodma initrd=instroot.gz root=/dev/ram0 ramdisk_size=16384 vga=791 splash=silent rw
APPEND ide=nodma initrd=instroot root=/dev/ram0 ramdisk_size=16384 vga=791 splash=silent rw
LABEL unattended
KERNEL vmlinuz
APPEND ide=nodma initrd=instroot.gz root=/dev/ram0 ramdisk_size=16384 vga=791 splash=silent rw unattended
APPEND ide=nodma initrd=instroot root=/dev/ram0 ramdisk_size=16384 vga=791 splash=silent rw unattended
LABEL nopcmcia
KERNEL vmlinuz
APPEND ide=nodma initrd=instroot.gz root=/dev/ram0 ramdisk_size=16384 vga=791 splash=silent rw nopcmcia
APPEND ide=nodma initrd=instroot root=/dev/ram0 ramdisk_size=16384 vga=791 splash=silent rw nopcmcia
LABEL nousb
KERNEL vmlinuz
APPEND ide=nodma initrd=instroot.gz root=/dev/ram0 ramdisk_size=16384 vga=791 splash=silent rw nousb
APPEND ide=nodma initrd=instroot root=/dev/ram0 ramdisk_size=16384 vga=791 splash=silent rw nousb
LABEL nousborpcmcia
KERNEL vmlinuz
APPEND ide=nodma initrd=instroot.gz root=/dev/ram0 ramdisk_size=16384 vga=791 splash=silent rw nousb nopcmcia
APPEND ide=nodma initrd=instroot root=/dev/ram0 ramdisk_size=16384 vga=791 splash=silent rw nousb nopcmcia
LABEL dma
KERNEL vmlinuz
APPEND initrd=instroot.gz root=/dev/ram0 ramdisk_size=16384 vga=791 splash=silent rw
APPEND initrd=instroot root=/dev/ram0 ramdisk_size=16384 vga=791 splash=silent rw
LABEL memtest
KERNEL memtest
APPEND -

3
doc/packages-list.txt
View File

@@ -139,6 +139,8 @@
* linux-2.6.16.29-ipfire
* linux-atm-2.4.1
* linux-libc-headers-2.6.12.0
* linux-libc-headers-2.6.12.0_diff
* linux-libc-headers-2.6.12.0_rootfile
* logrotate-3.7.1
* logwatch_7.3.1
* lynx2.8.5
@@ -210,6 +212,7 @@
* snort-2.3.3
* sox-12.18.1
* spandsp-0.0.3pre24
* squashfs3.0
* squid-2.6.STABLE3
* squid-graph-3.2
* squidGuard-1.2.0

2
lfs/cdrom
View File

@@ -76,7 +76,7 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
# Make the ISO
mkdir -p /install/cdrom/boot/isolinux; \
dd if=/dev/zero bs=1k count=2 > /install/cdrom/boot/isolinux/boot.catalog; \
cp /install/images/cdinitrd.gz /install/cdrom/boot/isolinux/instroot.gz; \
cp /install/images/initrd /install/cdrom/boot/isolinux/instroot; \
cp /boot/vmlinuz-$(KVER) /install/cdrom/boot/isolinux/vmlinuz; \
cp $(DIR_SRC)/config/syslinux/syslinux.cfg /install/cdrom/boot/isolinux/isolinux.cfg; \
cp $(DIR_SRC)/config/syslinux/boot.msg /install/cdrom/boot/isolinux/boot.msg; \

21
lfs/initrd
View File

@@ -127,24 +127,7 @@ $(TARGET) :
# make new dependencies
depmod -a -F /boot/System.map-$(KVER) $(KVER)
RAMDISK_SIZE=16384 && \
dd if=/dev/zero of=/install/images/cdinitrd bs=1k count=$${RAMDISK_SIZE}
for i in `seq 0 7`; do \
if (! losetup /dev/loop$${i} >/dev/null 2>&1 ); then \
LOOPDEV="/dev/loop$${i}" \
break; \
fi; \
done && \
losetup $$LOOPDEV /install/images/cdinitrd && \
mke2fs -m 0 -N 1024 $$LOOPDEV && \
mount -t ext2 $$LOOPDEV /install/mnt && \
rm -rf /install/mnt/lost+found && \
cp -aR /install/initrd/* /install/mnt/ && \
cd /install/mnt/ && find ./ -ls > $(DIR_INFO)/_build.cdinitrd && \
touch /install/mnt/CDROMBOOT && \
cd / && umount /install/mnt && \
losetup -d $$LOOPDEV
gzip -9 /install/images/cdinitrd
splash -s -f /boot/splash/config/bootsplash-1024x768.cfg >> /install/images/cdinitrd.gz
mksquashfs /install/initrd /install/images/initrd
cd /install/initrd && find ./ -ls > $(DIR_INFO)/_build.initrd.log
@$(POSTBUILD)

7
lfs/linux
View File

@@ -130,6 +130,11 @@ $(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
# H323 conntrack
cd $(DIR_APP) && bunzip2 -cd $(DIR_DL)/patch-2.6.16-nath323-1.3.bz2 | patch -Np1
# SquashFS
cd $(DIR_SRC) && rm -rf squashfs*
cd $(DIR_SRC) && tar xfz $(DIR_DL)/squashfs3.0.tar.gz
cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/squashfs3.0/linux-2.6.15/squashfs3.0-patch
# Patch-o-matic
cd $(DIR_SRC) && rm -rf iptables-*
cd $(DIR_SRC) && tar xfj $(DIR_DL)/iptables-1.3.5.tar.bz2
@@ -199,5 +204,5 @@ endif
ifeq "$(SMP)" "1"
rm -rf /lib/modules/$(VER)-smp/pcmcia
endif
@rm -rf $(DIR_SRC)/patch-o-matic* $(DIR_SRC)/iptables*
@rm -rf $(DIR_SRC)/patch-o-matic* $(DIR_SRC)/iptables* $(DIR_SRC)/squashfs*
@$(POSTBUILD)

4
lfs/pxe
View File

@@ -52,7 +52,7 @@ $(TARGET) :
rm -rf /tmp/*
mkdir -p /tmp/$(VERSION) /tmp/pxelinux.cfg
cp /usr/lib/syslinux/pxelinux.0 /tmp
cp /install/images/cdinitrd.gz /tmp/$(VERSION)/instroot.gz
cp /install/images/initrd /tmp/$(VERSION)/instroot
cp /boot/vmlinuz-$(KVER) /tmp/$(VERSION)/vmlinuz
cp $(DIR_SRC)/config/syslinux/options.msg /tmp/$(VERSION)/options.msg
cp $(DIR_SRC)/config/syslinux/splash.lss /tmp/$(VERSION)/splash.lss
@@ -68,7 +68,7 @@ $(TARGET) :
$(DIR_SRC)/config/syslinux/syslinux.cfg \
> /tmp/pxelinux.cfg/$(SNAME)-pxe-$(VERSION).model
ln -s $(SNAME)-pxe-$(VERSION).model /tmp/pxelinux.cfg/default
chmod 444 /tmp/$(VERSION)/instroot.gz
chmod 444 /tmp/$(VERSION)/instroot
cd /tmp && tar cvzf \
/install/images/$(SNAME)-$(VERSION).$(MACHINE)-pxe.tgz *
rm -rf /tmp/*

79
lfs/squashfstools Normal file
View File

@@ -0,0 +1,79 @@
###############################################################################
# This file is part of the IPCop Firewall. #
# #
# IPCop is free software; you can redistribute it and/or modify #
# it under the terms of the GNU General Public License as published by #
# the Free Software Foundation; either version 2 of the License, or #
# (at your option) any later version. #
# #
# IPCop is distributed in the hope that it will be useful, #
# but WITHOUT ANY WARRANTY; without even the implied warranty of #
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the #
# GNU General Public License for more details. #
# #
# You should have received a copy of the GNU General Public License #
# along with IPCop; if not, write to the Free Software #
# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA #
# #
# Makefiles are based on LFSMake, which is #
# Copyright (C) 2002 Rod Roard <rod@sunsetsystems.com> #
# #
###############################################################################
###############################################################################
# Definitions
###############################################################################
include Config
VER = 3.0
THISAPP = squashfs$(VER)
DL_FILE = $(THISAPP).tar.gz
DL_FROM = $(URL_IPFIRE)
DIR_APP = $(DIR_SRC)/$(THISAPP)
TARGET = $(DIR_INFO)/$(THISAPP)
###############################################################################
# Top-level Rules
###############################################################################
objects = $(DL_FILE)
$(DL_FILE) = $(DL_FROM)/$(DL_FILE)
$(DL_FILE)_MD5 = 9fd05d0bfbb712f5fb95edafea5bc733
install : $(TARGET)
check : $(patsubst %,$(DIR_CHK)/%,$(objects))
download :$(patsubst %,$(DIR_DL)/%,$(objects))
md5 : $(subst %,%_MD5,$(objects))
###############################################################################
# Downloading, checking, md5sum
###############################################################################
$(patsubst %,$(DIR_CHK)/%,$(objects)) :
@$(CHECK)
$(patsubst %,$(DIR_DL)/%,$(objects)) :
@$(LOAD)
$(subst %,%_MD5,$(objects)) :
@$(MD5)
###############################################################################
# Installation Details
###############################################################################
$(TARGET) : $(patsubst %,$(DIR_DL)/%,$(objects))
@$(PREBUILD)
@rm -rf $(DIR_APP) && cd $(DIR_SRC) && tar zxf $(DIR_DL)/$(DL_FILE)
cd $(DIR_APP) && patch -Np1 < $(DIR_SRC)/src/patches/squashfstools-3.0.patch
cd $(DIR_APP)/squashfs-tools && make "CC=g++" mksquashfs
cd $(DIR_APP)/squashfs-tools && cp -f mksquashfs /bin
@rm -rf $(DIR_APP)
@$(POSTBUILD)

1
make.sh
View File

@@ -380,6 +380,7 @@ buildipfire() {
ipfiremake dnsmasq
ipfiremake dosfstools
ipfiremake reiserfsprogs
ipfiremake squashfstools
ipfiremake ethtool
ipfiremake ez-ipupdate
ipfiremake fcron

4
src/initscripts/init.d/network
View File

@@ -39,6 +39,8 @@ case "${1}" in
modprobe ip_nat_mms
modprobe ip_conntrack_pptp
modprobe ip_nat_pptp
modprobe ip_conntrack_sip
modprobe ip_nat_sip
# Remove possible leftover files
rm -f CONFIG_ROOT/red/{active,device,dial-on-demand,dns1,dns2,local-ipaddress,remote-ipaddress,resolv.conf}
@@ -230,7 +232,7 @@ case "${1}" in
if [ "$DNS1" = "" ]; then
echo -n `/etc/rc.d/helper/getdnsfromdhcpc.pl 1` > /var/ipfire/red/dns1
echo -n `/etc/rc.d/helper/getdnsfromdhcpc.pl 2` > /var/ipfire/red/dns2
else
else
echo "$DNS1" > /var/ipfire/red/dns1
echo "$DNS2" > /var/ipfire/red/dns2
fi

443
src/patches/squashfstools-3.0.patch Normal file
View File

@@ -0,0 +1,443 @@
diff -u squashfs3.0old/squashfs-tools/mksquashfs.c squashfs3.0/squashfs-tools/mksquashfs.c
--- squashfs3.0old/squashfs-tools/mksquashfs.c 2006-03-15 21:36:20.000000000 +0000
+++ squashfs3.0/squashfs-tools/mksquashfs.c 2006-04-17 10:58:49.000000000 +0100
@@ -72,7 +72,7 @@
#define EXIT_MKSQUASHFS() do {\
if(restore)\
restorefs();\
- if(delete && destination_file && !block_device)\
+ if(deletesquash && destination_file && !block_device)\
unlink(destination_file);\
exit(1);\
} while(0)
@@ -81,7 +81,7 @@
EXIT_MKSQUASHFS();\
} while(0)
-int delete = FALSE;
+int deletesquash = FALSE;
long long total_compressed = 0, total_uncompressed = 0;
int fd;
@@ -251,6 +251,7 @@
squashfs_fragment_entry **fragment_table);
int get_sorted_inode(squashfs_inode *inode, struct stat *buf);
int read_sort_file(char *filename, int source, char *source_path[]);
+int dir_scan2(squashfs_inode *inode, struct dir_info *dir_info);
void sort_files_and_write(struct dir_info *dir);
struct file_info *duplicate(char *(get_next_file_block)(struct duplicate_buffer_handle *, unsigned int), struct duplicate_buffer_handle *file_start, long long bytes, unsigned int **block_list, long long *start, int blocks, struct fragment **fragment, char *frag_data, int frag_bytes);
struct dir_info *dir_scan1(char *, int (_readdir)(char *, char *, struct dir_info *));
@@ -285,7 +286,7 @@
}
-void sighandler()
+void sighandler(int signal)
{
if(interrupted == 1)
restorefs();
@@ -297,7 +298,7 @@
}
-void sighandler2()
+void sighandler2(int signal)
{
EXIT_MKSQUASHFS();
}
@@ -693,7 +694,7 @@
void scan2_init_dir(struct directory *dir)
{
- if((dir->buff = malloc(SQUASHFS_METADATA_SIZE)) == NULL) {
+ if((dir->buff = (unsigned char *)malloc(SQUASHFS_METADATA_SIZE)) == NULL) {
BAD_ERROR("Out of memory allocating directory buffer\n");
}
@@ -720,7 +721,7 @@
}
if(dir->p + sizeof(squashfs_dir_entry) + size + sizeof(squashfs_dir_header) >= dir->buff + dir->size) {
- if((buff = realloc(dir->buff, dir->size += SQUASHFS_METADATA_SIZE)) == NULL) {
+ if((buff = (unsigned char *)realloc(dir->buff, dir->size += SQUASHFS_METADATA_SIZE)) == NULL) {
BAD_ERROR("Out of memory reallocating directory buffer\n");
}
@@ -737,7 +738,7 @@
if((dir->p + sizeof(squashfs_dir_entry) + size - dir->index_count_p) > SQUASHFS_METADATA_SIZE) {
if(dir->i_count % I_COUNT_SIZE == 0)
- if((dir->index = realloc(dir->index, (dir->i_count + I_COUNT_SIZE) * sizeof(struct cached_dir_index))) == NULL)
+ if((dir->index = (struct cached_dir_index *)realloc(dir->index, (dir->i_count + I_COUNT_SIZE) * sizeof(struct cached_dir_index))) == NULL)
BAD_ERROR("Out of memory in directory index table reallocation!\n");
dir->index[dir->i_count].index.index = dir->p - dir->buff;
dir->index[dir->i_count].index.size = size - 1;
@@ -1175,7 +1176,7 @@
int blocks = (read_size + block_size - 1) >> block_log, allocated_blocks = blocks;
unsigned int *block_list, *block_listp;
- if((block_list = malloc(blocks * sizeof(unsigned int))) == NULL)
+ if((block_list = (unsigned int *)malloc(blocks * sizeof(unsigned int))) == NULL)
BAD_ERROR("Out of memory allocating block_list\n");
block_listp = block_list;
@@ -1329,7 +1330,7 @@
inode = inode->next;
}
- if((inode = malloc(sizeof(struct inode_info))) == NULL)
+ if((inode = (struct inode_info *)malloc(sizeof(struct inode_info))) == NULL)
BAD_ERROR("Out of memory in inode hash table entry allocation\n");
memcpy(&inode->buf, buf, sizeof(struct stat));
@@ -1350,10 +1351,10 @@
inline void add_dir_entry(char *name, char *pathname, struct dir_info *sub_dir, struct inode_info *inode_info, void *data, struct dir_info *dir)
{
if((dir->count % DIR_ENTRIES) == 0)
- if((dir->list = realloc(dir->list, (dir->count + DIR_ENTRIES) * sizeof(struct dir_ent *))) == NULL)
+ if((dir->list = (struct dir_ent **)realloc(dir->list, (dir->count + DIR_ENTRIES) * sizeof(struct dir_ent *))) == NULL)
BAD_ERROR("Out of memory in add_dir_entry\n");
- if((dir->list[dir->count] = malloc(sizeof(struct dir_ent))) == NULL)
+ if((dir->list[dir->count] = (struct dir_ent *)malloc(sizeof(struct dir_ent))) == NULL)
BAD_ERROR("Out of memory in linux_opendir\n");
if(sub_dir)
@@ -1363,7 +1364,7 @@
dir->list[dir->count]->inode = inode_info;
dir->list[dir->count]->dir = sub_dir;
dir->list[dir->count]->our_dir = dir;
- dir->list[dir->count++]->data = data;
+ dir->list[dir->count++]->data = (struct old_root_entry_info *)data;
dir->byte_count += strlen(name) + sizeof(squashfs_dir_entry);
}
@@ -1392,7 +1393,7 @@
struct dirent *d_name;
struct dir_info *dir;
- if((dir = malloc(sizeof(struct dir_info))) == NULL)
+ if((dir = (struct dir_info *)malloc(sizeof(struct dir_info))) == NULL)
return NULL;
if(pathname[0] != '\0' && (dir->linuxdir = opendir(pathname)) == NULL) {
@@ -1527,10 +1528,10 @@
if(dir_info == NULL)
return;
- if((dir_ent = malloc(sizeof(struct dir_ent))) == NULL)
+ if((dir_ent = (struct dir_ent *)malloc(sizeof(struct dir_ent))) == NULL)
BAD_ERROR("Out of memory in dir_scan\n");
- if((inode_info = malloc(sizeof(struct inode_info))) == NULL)
+ if((inode_info = (struct inode_info *)malloc(sizeof(struct inode_info))) == NULL)
BAD_ERROR("Out of memory in dir_scan\n");
dir_ent->name = dir_ent->pathname = strdup(pathname);
@@ -1929,7 +1930,7 @@
break;
else if(strcmp(argv[i], "-noappend") == 0)
- delete = TRUE;
+ deletesquash = TRUE;
else if(strcmp(argv[i], "-keep-as-directory") == 0)
keep_as_directory = TRUE;
@@ -1996,7 +1997,7 @@
perror("Could not create destination file");
exit(1);
}
- delete = TRUE;
+ deletesquash = TRUE;
} else {
perror("Could not stat destination file");
exit(1);
@@ -2011,7 +2012,7 @@
block_device = 1;
} else if(S_ISREG(buf.st_mode)) {
- if((fd = open(argv[source + 1], (delete ? O_TRUNC : 0) | O_RDWR)) == -1) {
+ if((fd = open(argv[source + 1], (deletesquash ? O_TRUNC : 0) | O_RDWR)) == -1) {
perror("Could not open regular file for writing as destination");
exit(1);
}
@@ -2023,7 +2024,7 @@
}
- if(!delete) {
+ if(!deletesquash) {
if(read_super(fd, &sBlk, &orig_be, argv[source + 1]) == 0) {
ERROR("Failed to read existing filesystem - will not overwrite - ABORTING!\n");
EXIT_MKSQUASHFS();
@@ -2068,7 +2069,7 @@
else if(strcmp(argv[i], "-b") == 0 || strcmp(argv[i], "-root-becomes") == 0 || strcmp(argv[i], "-ef") == 0)
i++;
- if(delete) {
+ if(deletesquash) {
printf("Creating %s %d.%d filesystem on %s, block size %d.\n",
be ? "big endian" : "little endian", SQUASHFS_MAJOR, SQUASHFS_MINOR, argv[source + 1], block_size);
bytes = sizeof(squashfs_super_block);
@@ -2176,7 +2177,7 @@
block_offset = check_data ? 3 : 2;
- if(delete && !keep_as_directory && source == 1 && S_ISDIR(source_buf.st_mode))
+ if(deletesquash && !keep_as_directory && source == 1 && S_ISDIR(source_buf.st_mode))
dir_scan(&inode, source_path[0], scan1_readdir);
else if(!keep_as_directory && source == 1 && S_ISDIR(source_buf.st_mode))
dir_scan(&inode, source_path[0], scan1_single_readdir);
diff -u squashfs3.0old/squashfs-tools/read_fs.c squashfs3.0/squashfs-tools/read_fs.c
--- squashfs3.0old/squashfs-tools/read_fs.c 2006-03-15 21:36:21.000000000 +0000
+++ squashfs3.0/squashfs-tools/read_fs.c 2006-04-17 11:01:56.000000000 +0100
@@ -61,14 +61,14 @@
fprintf(stderr, s, ## args); \
} while(0)
-int swap;
+int swapsquash;
int read_block(int fd, long long start, long long *next, unsigned char *block, squashfs_super_block *sBlk)
{
unsigned short c_byte;
int offset = 2;
- if(swap) {
+ if(swapsquash) {
read_bytes(fd, start, 2, (char *) block);
((unsigned char *) &c_byte)[1] = block[0];
((unsigned char *) &c_byte)[0] = block[1];
@@ -125,7 +125,7 @@
*root_inode_block = bytes;
}
if((size - bytes < SQUASHFS_METADATA_SIZE) &&
- ((*inode_table = realloc(*inode_table, size += SQUASHFS_METADATA_SIZE)) == NULL))
+ ((*inode_table = (unsigned char *)realloc(*inode_table, size += SQUASHFS_METADATA_SIZE)) == NULL))
return FALSE;
TRACE("scan_inode_table: reading block 0x%llx\n", start);
if((byte = read_block(fd, start, &start, *inode_table + bytes, sBlk)) == 0) {
@@ -145,14 +145,14 @@
*/
*root_inode_size = bytes - (*root_inode_block + root_inode_offset);
bytes = *root_inode_block + root_inode_offset;
- if(swap) {
+ if(swapsquash) {
squashfs_base_inode_header sinode;
memcpy(&sinode, *inode_table + bytes, sizeof(dir_inode->base));
SQUASHFS_SWAP_BASE_INODE_HEADER(&dir_inode->base, &sinode, sizeof(squashfs_base_inode_header));
} else
memcpy(&dir_inode->base, *inode_table + bytes, sizeof(dir_inode->base));
if(dir_inode->base.inode_type == SQUASHFS_DIR_TYPE) {
- if(swap) {
+ if(swapsquash) {
squashfs_dir_inode_header sinode;
memcpy(&sinode, *inode_table + bytes, sizeof(dir_inode->dir));
SQUASHFS_SWAP_DIR_INODE_HEADER(&dir_inode->dir, &sinode);
@@ -160,7 +160,7 @@
memcpy(&dir_inode->dir, *inode_table + bytes, sizeof(dir_inode->dir));
directory_start_block = dir_inode->dir.start_block;
} else {
- if(swap) {
+ if(swapsquash) {
squashfs_ldir_inode_header sinode;
memcpy(&sinode, *inode_table + bytes, sizeof(dir_inode->ldir));
SQUASHFS_SWAP_LDIR_INODE_HEADER(&dir_inode->ldir, &sinode);
@@ -170,7 +170,7 @@
}
for(cur_ptr = *inode_table; cur_ptr < *inode_table + bytes; files ++) {
- if(swap) {
+ if(swapsquash) {
squashfs_reg_inode_header sinode;
memcpy(&sinode, cur_ptr, sizeof(inode));
SQUASHFS_SWAP_REG_INODE_HEADER(&inode, &sinode);
@@ -191,13 +191,13 @@
TRACE("scan_inode_table: regular file, file_size %lld, blocks %d\n", inode.file_size, blocks);
- if((block_list = malloc(blocks * sizeof(unsigned int))) == NULL) {
+ if((block_list = (unsigned int *)malloc(blocks * sizeof(unsigned int))) == NULL) {
ERROR("Out of memory in block list malloc\n");
goto failed;
}
cur_ptr += sizeof(inode);
- if(swap) {
+ if(swapsquash) {
unsigned int sblock_list[blocks];
memcpy(sblock_list, cur_ptr, blocks * sizeof(unsigned int));
SQUASHFS_SWAP_INTS(block_list, sblock_list, blocks);
@@ -222,7 +222,7 @@
int i, start;
unsigned int *block_list;
- if(swap) {
+ if(swapsquash) {
squashfs_lreg_inode_header sinodep;
memcpy(&sinodep, cur_ptr, sizeof(sinodep));
SQUASHFS_SWAP_LREG_INODE_HEADER(&inode, &sinodep);
@@ -238,12 +238,12 @@
sBlk->block_log;
start = inode.start_block;
- if((block_list = malloc(blocks * sizeof(unsigned int))) == NULL) {
+ if((block_list = (unsigned int *)malloc(blocks * sizeof(unsigned int))) == NULL) {
ERROR("Out of memory in block list malloc\n");
goto failed;
}
- if(swap) {
+ if(swapsquash) {
unsigned int sblock_list[blocks];
memcpy(sblock_list, cur_ptr, blocks * sizeof(unsigned int));
SQUASHFS_SWAP_INTS(block_list, sblock_list, blocks);
@@ -263,7 +263,7 @@
case SQUASHFS_SYMLINK_TYPE: {
squashfs_symlink_inode_header inodep;
- if(swap) {
+ if(swapsquash) {
squashfs_symlink_inode_header sinodep;
memcpy(&sinodep, cur_ptr, sizeof(sinodep));
SQUASHFS_SWAP_SYMLINK_INODE_HEADER(&inodep, &sinodep);
@@ -276,7 +276,7 @@
case SQUASHFS_DIR_TYPE: {
squashfs_dir_inode_header dir_inode;
- if(swap) {
+ if(swapsquash) {
squashfs_dir_inode_header sinode;
memcpy(&sinode, cur_ptr, sizeof(dir_inode));
SQUASHFS_SWAP_DIR_INODE_HEADER(&dir_inode, &sinode);
@@ -292,7 +292,7 @@
squashfs_ldir_inode_header dir_inode;
int i;
- if(swap) {
+ if(swapsquash) {
squashfs_ldir_inode_header sinode;
memcpy(&sinode, cur_ptr, sizeof(dir_inode));
SQUASHFS_SWAP_LDIR_INODE_HEADER(&dir_inode, &sinode);
@@ -304,7 +304,7 @@
cur_ptr += sizeof(squashfs_ldir_inode_header);
for(i = 0; i < dir_inode.i_count; i++) {
squashfs_dir_index index;
- if(swap) {
+ if(swapsquash) {
squashfs_dir_index sindex;
memcpy(&sindex, cur_ptr, sizeof(squashfs_dir_index));
SQUASHFS_SWAP_DIR_INDEX(&index, &sindex);
@@ -348,14 +348,14 @@
read_bytes(fd, SQUASHFS_START, sizeof(squashfs_super_block), (char *) sBlk);
/* Check it is a SQUASHFS superblock */
- swap = 0;
+ swapsquash = 0;
if(sBlk->s_magic != SQUASHFS_MAGIC) {
if(sBlk->s_magic == SQUASHFS_MAGIC_SWAP) {
squashfs_super_block sblk;
ERROR("Reading a different endian SQUASHFS filesystem on %s - ignoring -le/-be options\n", source);
SQUASHFS_SWAP_SUPER_BLOCK(&sblk, sBlk);
memcpy(sBlk, &sblk, sizeof(squashfs_super_block));
- swap = 1;
+ swapsquash = 1;
} else {
ERROR("Can't find a SQUASHFS superblock on %s\n", source);
goto failed_mount;
@@ -373,9 +373,9 @@
}
#if __BYTE_ORDER == __BIG_ENDIAN
- *be = !swap;
+ *be = !swapsquash;
#else
- *be = swap;
+ *be = swapsquash;
#endif
printf("Found a valid SQUASHFS superblock on %s.\n", source);
@@ -416,7 +416,7 @@
long long start = sBlk->directory_table_start + directory_start_block, last_start_block;
size += offset;
- if((directory_table = malloc((size + SQUASHFS_METADATA_SIZE * 2 - 1) & ~(SQUASHFS_METADATA_SIZE - 1))) == NULL)
+ if((directory_table = (unsigned char *)malloc((size + SQUASHFS_METADATA_SIZE * 2 - 1) & ~(SQUASHFS_METADATA_SIZE - 1))) == NULL)
return NULL;
while(bytes < size) {
TRACE("squashfs_readdir: reading block 0x%llx, bytes read so far %d\n", start, bytes);
@@ -433,7 +433,7 @@
bytes = offset;
while(bytes < size) {
- if(swap) {
+ if(swapsquash) {
squashfs_dir_header sdirh;
memcpy(&sdirh, directory_table + bytes, sizeof(sdirh));
SQUASHFS_SWAP_DIR_HEADER(&dirh, &sdirh);
@@ -445,7 +445,7 @@
bytes += sizeof(dirh);
while(dir_count--) {
- if(swap) {
+ if(swapsquash) {
squashfs_dir_entry sdire;
memcpy(&sdire, directory_table + bytes, sizeof(sdire));
SQUASHFS_SWAP_DIR_ENTRY(dire, &sdire);
@@ -481,7 +481,7 @@
return 0;
}
- if(swap) {
+ if(swapsquash) {
squashfs_fragment_index sfragment_table_index[indexes];
read_bytes(fd, sBlk->fragment_table_start, SQUASHFS_FRAGMENT_INDEX_BYTES(sBlk->fragments), (char *) sfragment_table_index);
@@ -494,7 +494,7 @@
TRACE("Read fragment table block %d, from 0x%llx, length %d\n", i, fragment_table_index[i], length);
}
- if(swap) {
+ if(swapsquash) {
squashfs_fragment_entry sfragment;
for(i = 0; i < sBlk->fragments; i++) {
SQUASHFS_SWAP_FRAGMENT_ENTRY((&sfragment), (&(*fragment_table)[i]));
@@ -584,7 +584,7 @@
}
memcpy(*directory_data_cache, directory_table, *inode_dir_offset + *inode_dir_file_size);
- if(!swap)
+ if(!swapsquash)
read_bytes(fd, sBlk->uid_start, sBlk->no_uids * sizeof(squashfs_uid), (char *) uids);
else {
squashfs_uid uids_copy[sBlk->no_uids];
@@ -593,7 +593,7 @@
SQUASHFS_SWAP_DATA(uids, uids_copy, sBlk->no_uids, sizeof(squashfs_uid) * 8);
}
- if(!swap)
+ if(!swapsquash)
read_bytes(fd, sBlk->guid_start, sBlk->no_guids * sizeof(squashfs_uid), (char *) guids);
else {
squashfs_uid guids_copy[sBlk->no_guids];
diff -u squashfs3.0old/squashfs-tools/sort.c squashfs3.0/squashfs-tools/sort.c
--- squashfs3.0old/squashfs-tools/sort.c 2006-03-15 21:36:21.000000000 +0000
+++ squashfs3.0/squashfs-tools/sort.c 2006-04-17 11:01:33.000000000 +0100
@@ -87,7 +87,7 @@
struct priority_entry *new_priority_entry;
priority += 32768;
- if((new_priority_entry = malloc(sizeof(struct priority_entry))) == NULL) {
+ if((new_priority_entry = (struct priority_entry *)malloc(sizeof(struct priority_entry))) == NULL) {
ERROR("Out of memory allocating priority entry\n");
return FALSE;
}
@@ -117,7 +117,7 @@
#define ADD_ENTRY(buf, priority) {\
int hash = buf.st_ino & 0xffff;\
struct sort_info *s;\
- if((s = malloc(sizeof(struct sort_info))) == NULL) {\
+ if((s = (struct sort_info *)malloc(sizeof(struct sort_info))) == NULL) {\
ERROR("Out of memory allocating sort list entry\n");\
return FALSE;\
}\