qi-hardware/openwrt-xburst
1
0
Fork 0
mirror of git://projects.qi-hardware.com/openwrt-xburst.git synced 2024-11-24 02:34:06 +02:00
Code

squashfs4: refresh the cygwin patch

Browse Source 
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@18272 3c298f89-4303-0410-b956-a3cf2f4a3e73
This commit is contained in:
nbd 2009-11-02 14:52:09 +00:00
parent 0511a5502c
commit e1ec0a87e1
1 changed files with 24 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

54
tools/squashfs4/patches/120-cygwin_fixes.patch
View File

@ -1,7 +1,6 @@
diff -urN squashfs4.0/squashfs-tools/global.h squashfs4.0.new/squashfs-tools/global.h --- a/squashfs-tools/global.h
--- squashfs4.0/squashfs-tools/global.h 2009-08-27 21:33:03.000000000 +0200 +++ b/squashfs-tools/global.h
+++ squashfs4.0.new/squashfs-tools/global.h 2009-08-27 21:36:38.000000000 +0200 @@ -44,6 +44,11 @@ typedef long long squashfs_fragment_inde
@@ -44,6 +44,11 @@
typedef squashfs_inode_t squashfs_inode; typedef squashfs_inode_t squashfs_inode;
typedef squashfs_block_t squashfs_block; typedef squashfs_block_t squashfs_block;
@ -13,11 +12,10 @@ diff -urN squashfs4.0/squashfs-tools/global.h squashfs4.0.new/squashfs-tools/glo
#ifndef FNM_EXTMATCH #ifndef FNM_EXTMATCH
#define FNM_EXTMATCH 0 #define FNM_EXTMATCH 0
#endif #endif
diff -urN squashfs4.0/squashfs-tools/mksquashfs.c squashfs4.0.new/squashfs-tools/mksquashfs.c --- a/squashfs-tools/mksquashfs.c
--- squashfs4.0/squashfs-tools/mksquashfs.c 2009-08-27 21:33:06.000000000 +0200 +++ b/squashfs-tools/mksquashfs.c
+++ squashfs4.0.new/squashfs-tools/mksquashfs.c 2009-08-27 21:37:22.000000000 +0200
@@ -49,10 +49,12 @@ @@ -49,10 +49,12 @@
#include <fnmatch.h> #include <sys/wait.h>
#ifndef linux #ifndef linux
+#ifndef __CYGWIN__ +#ifndef __CYGWIN__
@ -29,7 +27,7 @@ diff -urN squashfs4.0/squashfs-tools/mksquashfs.c squashfs4.0.new/squashfs-tools
#else #else
#include <endian.h> #include <endian.h>
#include <sys/sysinfo.h> #include <sys/sysinfo.h>
@@ -825,6 +827,7 @@ @@ -817,6 +819,7 @@ void sigusr1_handler()
void sigwinch_handler() void sigwinch_handler()
{ {
@ -37,7 +35,7 @@ diff -urN squashfs4.0/squashfs-tools/mksquashfs.c squashfs4.0.new/squashfs-tools
struct winsize winsize; struct winsize winsize;
if(ioctl(1, TIOCGWINSZ, &winsize) == -1) { if(ioctl(1, TIOCGWINSZ, &winsize) == -1) {
@@ -834,6 +837,9 @@ @@ -826,6 +829,9 @@ void sigwinch_handler()
columns = 80; columns = 80;
} else } else
columns = winsize.ws_col; columns = winsize.ws_col;
@ -47,7 +45,7 @@ diff -urN squashfs4.0/squashfs-tools/mksquashfs.c squashfs4.0.new/squashfs-tools
} }
@@ -3753,7 +3759,9 @@ @@ -3853,7 +3859,9 @@ void initialise_threads()
BAD_ERROR("Failed to set signal mask in intialise_threads\n"); BAD_ERROR("Failed to set signal mask in intialise_threads\n");
signal(SIGUSR1, sigusr1_handler); signal(SIGUSR1, sigusr1_handler);
@ -58,7 +56,7 @@ diff -urN squashfs4.0/squashfs-tools/mksquashfs.c squashfs4.0.new/squashfs-tools
if(processors == -1) { if(processors == -1) {
#ifndef linux #ifndef linux
int mib[2]; int mib[2];
@@ -3775,6 +3783,7 @@ @@ -3875,6 +3883,7 @@ void initialise_threads()
processors = get_nprocs(); processors = get_nprocs();
#endif #endif
} }
@ -66,10 +64,9 @@ diff -urN squashfs4.0/squashfs-tools/mksquashfs.c squashfs4.0.new/squashfs-tools
if((thread = malloc((2 + processors * 2) * sizeof(pthread_t))) == NULL) if((thread = malloc((2 + processors * 2) * sizeof(pthread_t))) == NULL)
BAD_ERROR("Out of memory allocating thread descriptors\n"); BAD_ERROR("Out of memory allocating thread descriptors\n");
diff -urN squashfs4.0/squashfs-tools/read_fs.c squashfs4.0.new/squashfs-tools/read_fs.c --- a/squashfs-tools/read_fs.c
--- squashfs4.0/squashfs-tools/read_fs.c 2009-08-27 21:33:06.000000000 +0200 +++ b/squashfs-tools/read_fs.c
+++ squashfs4.0.new/squashfs-tools/read_fs.c 2009-08-27 21:41:54.000000000 +0200 @@ -39,9 +39,11 @@ extern unsigned int get_guid(unsigned in
@@ -40,9 +40,11 @@
#include <sys/mman.h> #include <sys/mman.h>
#ifndef linux #ifndef linux
@ -81,9 +78,8 @@ diff -urN squashfs4.0/squashfs-tools/read_fs.c squashfs4.0.new/squashfs-tools/re
#else #else
#include <endian.h> #include <endian.h>
#endif #endif
diff -urN squashfs4.0/squashfs-tools/swap.c squashfs4.0.new/squashfs-tools/swap.c --- a/squashfs-tools/swap.c
--- squashfs4.0/squashfs-tools/swap.c 2009-03-26 05:40:16.000000000 +0100 +++ b/squashfs-tools/swap.c
+++ squashfs4.0.new/squashfs-tools/swap.c 2009-08-27 21:44:52.000000000 +0200
@@ -20,9 +20,11 @@ @@ -20,9 +20,11 @@
*/ */
@ -96,10 +92,9 @@ diff -urN squashfs4.0/squashfs-tools/swap.c squashfs4.0.new/squashfs-tools/swap.
#else #else
#include <endian.h> #include <endian.h>
#endif #endif
diff -urN squashfs4.0/squashfs-tools/unsquashfs.c squashfs4.0.new/squashfs-tools/unsquashfs.c --- a/squashfs-tools/unsquashfs.c
--- squashfs4.0/squashfs-tools/unsquashfs.c 2009-08-27 21:33:06.000000000 +0200 +++ b/squashfs-tools/unsquashfs.c
+++ squashfs4.0.new/squashfs-tools/unsquashfs.c 2009-08-27 21:41:38.000000000 +0200 @@ -112,6 +112,7 @@ void update_progress_bar();
@@ -111,6 +111,7 @@
void sigwinch_handler() void sigwinch_handler()
{ {
@ -107,7 +102,7 @@ diff -urN squashfs4.0/squashfs-tools/unsquashfs.c squashfs4.0.new/squashfs-tools
struct winsize winsize; struct winsize winsize;
if(ioctl(1, TIOCGWINSZ, &winsize) == -1) { if(ioctl(1, TIOCGWINSZ, &winsize) == -1) {
@@ -120,6 +121,9 @@ @@ -121,6 +122,9 @@ void sigwinch_handler()
columns = 80; columns = 80;
} else } else
columns = winsize.ws_col; columns = winsize.ws_col;
@ -117,7 +112,7 @@ diff -urN squashfs4.0/squashfs-tools/unsquashfs.c squashfs4.0.new/squashfs-tools
} }
@@ -1794,7 +1798,9 @@ @@ -1787,7 +1791,9 @@ void initialise_threads(int fragment_buf
if(sigprocmask(SIG_BLOCK, &sigmask, &old_mask) == -1) if(sigprocmask(SIG_BLOCK, &sigmask, &old_mask) == -1)
EXIT_UNSQUASH("Failed to set signal mask in intialise_threads" EXIT_UNSQUASH("Failed to set signal mask in intialise_threads"
"\n"); "\n");
@ -128,7 +123,7 @@ diff -urN squashfs4.0/squashfs-tools/unsquashfs.c squashfs4.0.new/squashfs-tools
if(processors == -1) { if(processors == -1) {
#ifndef linux #ifndef linux
int mib[2]; int mib[2];
@@ -1816,6 +1822,7 @@ @@ -1809,6 +1815,7 @@ void initialise_threads(int fragment_buf
processors = get_nprocs(); processors = get_nprocs();
#endif #endif
} }
@ -136,10 +131,9 @@ diff -urN squashfs4.0/squashfs-tools/unsquashfs.c squashfs4.0.new/squashfs-tools
if((thread = malloc((3 + processors) * sizeof(pthread_t))) == NULL) if((thread = malloc((3 + processors) * sizeof(pthread_t))) == NULL)
EXIT_UNSQUASH("Out of memory allocating thread descriptors\n"); EXIT_UNSQUASH("Out of memory allocating thread descriptors\n");
diff -urN squashfs4.0/squashfs-tools/unsquashfs.h squashfs4.0.new/squashfs-tools/unsquashfs.h --- a/squashfs-tools/unsquashfs.h
--- squashfs4.0/squashfs-tools/unsquashfs.h 2009-08-27 21:33:03.000000000 +0200 +++ b/squashfs-tools/unsquashfs.h
+++ squashfs4.0.new/squashfs-tools/unsquashfs.h 2009-08-27 21:44:17.000000000 +0200 @@ -45,10 +45,12 @@
@@ -46,10 +46,12 @@
#include <sys/time.h> #include <sys/time.h>
#ifndef linux #ifndef linux