diff options
| -rw-r--r-- | tools/squashfs4/patches/120-cygwin_fixes.patch | 54 |
1 files changed, 24 insertions, 30 deletions
diff --git a/tools/squashfs4/patches/120-cygwin_fixes.patch b/tools/squashfs4/patches/120-cygwin_fixes.patch index 1cc563e691..79469a9eaa 100644 --- a/tools/squashfs4/patches/120-cygwin_fixes.patch +++ b/tools/squashfs4/patches/120-cygwin_fixes.patch @@ -1,7 +1,6 @@ -diff -urN squashfs4.0/squashfs-tools/global.h squashfs4.0.new/squashfs-tools/global.h ---- squashfs4.0/squashfs-tools/global.h 2009-08-27 21:33:03.000000000 +0200 -+++ squashfs4.0.new/squashfs-tools/global.h 2009-08-27 21:36:38.000000000 +0200 -@@ -44,6 +44,11 @@ +--- a/squashfs-tools/global.h ++++ b/squashfs-tools/global.h +@@ -44,6 +44,11 @@ typedef long long squashfs_fragment_inde typedef squashfs_inode_t squashfs_inode; 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 #define FNM_EXTMATCH 0 #endif -diff -urN squashfs4.0/squashfs-tools/mksquashfs.c squashfs4.0.new/squashfs-tools/mksquashfs.c ---- squashfs4.0/squashfs-tools/mksquashfs.c 2009-08-27 21:33:06.000000000 +0200 -+++ squashfs4.0.new/squashfs-tools/mksquashfs.c 2009-08-27 21:37:22.000000000 +0200 +--- a/squashfs-tools/mksquashfs.c ++++ b/squashfs-tools/mksquashfs.c @@ -49,10 +49,12 @@ - #include <fnmatch.h> + #include <sys/wait.h> #ifndef linux +#ifndef __CYGWIN__ @@ -29,7 +27,7 @@ diff -urN squashfs4.0/squashfs-tools/mksquashfs.c squashfs4.0.new/squashfs-tools #else #include <endian.h> #include <sys/sysinfo.h> -@@ -825,6 +827,7 @@ +@@ -817,6 +819,7 @@ void sigusr1_handler() void sigwinch_handler() { @@ -37,7 +35,7 @@ diff -urN squashfs4.0/squashfs-tools/mksquashfs.c squashfs4.0.new/squashfs-tools struct winsize winsize; if(ioctl(1, TIOCGWINSZ, &winsize) == -1) { -@@ -834,6 +837,9 @@ +@@ -826,6 +829,9 @@ void sigwinch_handler() columns = 80; } else 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"); signal(SIGUSR1, sigusr1_handler); @@ -58,7 +56,7 @@ diff -urN squashfs4.0/squashfs-tools/mksquashfs.c squashfs4.0.new/squashfs-tools if(processors == -1) { #ifndef linux int mib[2]; -@@ -3775,6 +3783,7 @@ +@@ -3875,6 +3883,7 @@ void initialise_threads() processors = get_nprocs(); #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) 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 ---- squashfs4.0/squashfs-tools/read_fs.c 2009-08-27 21:33:06.000000000 +0200 -+++ squashfs4.0.new/squashfs-tools/read_fs.c 2009-08-27 21:41:54.000000000 +0200 -@@ -40,9 +40,11 @@ +--- a/squashfs-tools/read_fs.c ++++ b/squashfs-tools/read_fs.c +@@ -39,9 +39,11 @@ extern unsigned int get_guid(unsigned in #include <sys/mman.h> #ifndef linux @@ -81,9 +78,8 @@ diff -urN squashfs4.0/squashfs-tools/read_fs.c squashfs4.0.new/squashfs-tools/re #else #include <endian.h> #endif -diff -urN squashfs4.0/squashfs-tools/swap.c squashfs4.0.new/squashfs-tools/swap.c ---- squashfs4.0/squashfs-tools/swap.c 2009-03-26 05:40:16.000000000 +0100 -+++ squashfs4.0.new/squashfs-tools/swap.c 2009-08-27 21:44:52.000000000 +0200 +--- a/squashfs-tools/swap.c ++++ b/squashfs-tools/swap.c @@ -20,9 +20,11 @@ */ @@ -96,10 +92,9 @@ diff -urN squashfs4.0/squashfs-tools/swap.c squashfs4.0.new/squashfs-tools/swap. #else #include <endian.h> #endif -diff -urN squashfs4.0/squashfs-tools/unsquashfs.c squashfs4.0.new/squashfs-tools/unsquashfs.c ---- squashfs4.0/squashfs-tools/unsquashfs.c 2009-08-27 21:33:06.000000000 +0200 -+++ squashfs4.0.new/squashfs-tools/unsquashfs.c 2009-08-27 21:41:38.000000000 +0200 -@@ -111,6 +111,7 @@ +--- a/squashfs-tools/unsquashfs.c ++++ b/squashfs-tools/unsquashfs.c +@@ -112,6 +112,7 @@ void update_progress_bar(); void sigwinch_handler() { @@ -107,7 +102,7 @@ diff -urN squashfs4.0/squashfs-tools/unsquashfs.c squashfs4.0.new/squashfs-tools struct winsize winsize; if(ioctl(1, TIOCGWINSZ, &winsize) == -1) { -@@ -120,6 +121,9 @@ +@@ -121,6 +122,9 @@ void sigwinch_handler() columns = 80; } else 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) EXIT_UNSQUASH("Failed to set signal mask in intialise_threads" "\n"); @@ -128,7 +123,7 @@ diff -urN squashfs4.0/squashfs-tools/unsquashfs.c squashfs4.0.new/squashfs-tools if(processors == -1) { #ifndef linux int mib[2]; -@@ -1816,6 +1822,7 @@ +@@ -1809,6 +1815,7 @@ void initialise_threads(int fragment_buf processors = get_nprocs(); #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) EXIT_UNSQUASH("Out of memory allocating thread descriptors\n"); -diff -urN squashfs4.0/squashfs-tools/unsquashfs.h squashfs4.0.new/squashfs-tools/unsquashfs.h ---- squashfs4.0/squashfs-tools/unsquashfs.h 2009-08-27 21:33:03.000000000 +0200 -+++ squashfs4.0.new/squashfs-tools/unsquashfs.h 2009-08-27 21:44:17.000000000 +0200 -@@ -46,10 +46,12 @@ +--- a/squashfs-tools/unsquashfs.h ++++ b/squashfs-tools/unsquashfs.h +@@ -45,10 +45,12 @@ #include <sys/time.h> #ifndef linux |