Conflicts: contrib/packages/rpm/el5/SPECS/tigervnc.spec vncviewer/Viewport.cxxtags/v1.4.90
@@ -9,12 +9,12 @@ Build Requirements (All Systems) | |||
-- CMake (http://www.cmake.org) v2.8 or later | |||
* Must be a patched snapshot to get full functionality | |||
* See "Building FLTK" below. | |||
-- zlib | |||
-- FLTK 1.3.3 or later | |||
-- If building TLS support: | |||
* GnuTLS | |||
* GnuTLS 3.x | |||
* See "Building TLS Support" below. | |||
-- If building native language support (NLS): | |||
@@ -33,27 +33,9 @@ Build Requirements (Unix) | |||
-- Non-Mac platforms: | |||
* X11 development kit | |||
* autoconf 2.57 or later | |||
* automake 1.7 or later | |||
* libtool 1.4 or later | |||
* OpenSSL v0.9.7 or later | |||
* Python v2.3 or later | |||
* zlib v1.2 or later | |||
* pkgconfig 0.20 or later | |||
If you are using an older RPM-based system which does not meet this | |||
minimum requirement (such as Red Hat Enterprise Linux 4), then you can | |||
build pkgconfig 0.20 from the Fedora 5 source RPM: | |||
http://archive.fedoraproject.org/pub/archive/fedora/linux/core/5/source/SRPMS/pkgconfig-0.20-2.2.1.src.rpm | |||
* gettext 0.14.4 or later | |||
If you are using an older RPM-based system which does not meet this | |||
minimum requirement (such as Red Hat Enterprise Linux 4), then you can | |||
build gettext 0.14.5 from the Fedora 5 source RPM: | |||
http://archive.fedoraproject.org/pub/archive/fedora/linux/core/5/source/SRPMS/gettext-0.14.5-3.src.rpm | |||
NOTE: gcj and libgcj are required when building the above source RPM. | |||
-- If building Xvnc/libvnc.so: | |||
* Xorg server source code, 1.7 or never | |||
* All build requirements Xorg imposes (see its documentation) | |||
============================ | |||
Build Requirements (Windows) | |||
@@ -80,38 +62,6 @@ Build Requirements (Java) | |||
-- See "Building Java Support" below. | |||
============= | |||
Building FLTK | |||
============= | |||
TigerVNC requires FLTK 1.3.2 (or later). Although it will build and work | |||
with plain 1.3.2, to get full functionality and the best behaviour you | |||
need to build a patched version: | |||
1. Check out FLTK 1.3.2 using Subversion: | |||
$ svn co http://svn.easysw.com/public/fltk/fltk/tags/release-1.3.2 fltk-1.3.2 | |||
2. For full functionality, apply patches. All patches can be found in | |||
the contrib/fltk/ directory. There are also some general fixes to | |||
FLTK that can be found in the contrib/fltk/fixes/ directory that | |||
might be useful. | |||
3. Use CMake to build FLTK using the same procedures described below for | |||
building TigerVNC. The recipes in the "Build Recipes" section also apply. | |||
If you want optimized code, make sure to build with | |||
-DCMAKE_BUILD_TYPE=Release. | |||
4. (optional) Use 'make install' to install FLTK into a directory of your | |||
choosing. | |||
5. When building TigerVNC, set the FLTK_FLUID_EXECUTABLE CMake variable to the | |||
location of the fluid executable that was built in Step 3 or installed in | |||
Step 4. This gives CMake a hint as to where to find the FLTK library. | |||
6. If you did not install FLTK, then set the FLTK_INCLUDE_DIR CMake variable to | |||
the location of the FLTK source directory. | |||
================== | |||
Out-of-Tree Builds | |||
================== | |||
@@ -202,14 +152,14 @@ version of the TigerVNC Server. This is accomplished by downloading and | |||
building the more recent Xorg modules in a local directory and then building | |||
Xvnc such that it links against the local build of these libraries, not the X11 | |||
libraries installed on the system. The "build-xorg" script in the TigerVNC | |||
source distribution (located under unix/) automates this process. | |||
source distribution (located under contrib/xorg/) automates this process. | |||
The following procedure will build both the TigerVNC Viewer and a | |||
"legacy-friendly" version of the TigerVNC Server: | |||
cd {build_directory} | |||
sh {source_directory}/unix/build-xorg init | |||
sh {source_directory}/unix/build-xorg build [additional CMake flags] | |||
sh {source_directory}/contrib/xorg/build-xorg init | |||
sh {source_directory}/contrib/xorg/build-xorg build [additional CMake flags] | |||
build-xorg generates a version of Xvnc that has no external dependencies on the | |||
X11 shared libraries or any other distribution-specific shared libraries. This | |||
@@ -223,11 +173,11 @@ once the X11 modules and other dependencies have been built for the first time. | |||
This is convenient for testing changes that just apply to the TigerVNC source | |||
code. To accomplish this, run: | |||
sh {source_directory}/unix/build-xorg rebuild [additional make flags] | |||
sh {source_directory}/contrib/xorg/build-xorg rebuild [additional make flags] | |||
For instance, | |||
sh {source_directory}/unix/build-xorg rebuild clean | |||
sh {source_directory}/contrib/xorg/build-xorg rebuild clean | |||
will clean both the Xvnc and vncviewer builds without destroying any of the | |||
build configuration or module dependencies. |
@@ -74,9 +74,6 @@ set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wall -Wformat=2") | |||
IF(CMAKE_BUILD_TYPE MATCHES Debug) | |||
set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Werror") | |||
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Werror") | |||
# We have a lot of old GnuTLS crud we need to ignore for now | |||
set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Wno-error=deprecated-declarations") | |||
set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Wno-error=deprecated-declarations") | |||
ENDIF() | |||
if(NOT DEFINED BUILD_WINVNC) | |||
@@ -128,14 +125,7 @@ if(UNIX AND NOT APPLE) | |||
endif() | |||
# Check for zlib | |||
find_package(ZLIB) | |||
option(USE_INCLUDED_ZLIB "Force use of the bundled zlib") | |||
if(NOT ZLIB_FOUND) | |||
set(USE_INCLUDED_ZLIB 1) | |||
endif() | |||
if(USE_INCLUDED_ZLIB) | |||
message(STATUS "Using included zlib library") | |||
endif() | |||
find_package(ZLIB REQUIRED) | |||
# Check for gettext | |||
option(ENABLE_NLS "Enable translation of program messages" ON) | |||
@@ -243,41 +233,6 @@ if(UNIX AND NOT APPLE) | |||
endif() | |||
endif() | |||
if(FLTK_FOUND) | |||
set(CMAKE_REQUIRED_INCLUDES ${FLTK_INCLUDE_DIR}) | |||
set(CMAKE_REQUIRED_LIBRARIES ${FLTK_LIBRARIES}) | |||
# FLTK STR #2636 | |||
check_cxx_source_compiles("#include <FL/Fl.H>\nint main(int c, char** v) { Fl::add_clipboard_notify(NULL, NULL); return 0; }" HAVE_FLTK_CLIPBOARD) | |||
# FLTK STR #2638 | |||
check_cxx_source_compiles("#include <FL/Enumerations.H>\nint main(int c, char** v) { return FL_Volume_Down; }" HAVE_FLTK_MEDIAKEYS) | |||
# FLTK STR #2641 | |||
check_cxx_source_compiles("#include <FL/Enumerations.H>\nint main(int c, char** v) { return FL_FULLSCREEN; }" HAVE_FLTK_FULLSCREEN) | |||
# FLTK STR #2660 | |||
check_cxx_source_compiles("#include <FL/Fl_Window.H>\nint main(int c, char** v) { void (Fl_Window::*foo)(const Fl_RGB_Image*,int,int) = &Fl_Window::cursor; return 0; }" HAVE_FLTK_CURSOR) | |||
# FLTK STR #2697 | |||
check_cxx_source_compiles("#include <FL/Fl.H>\nint main(int c, char** v) { int X, Y, W, H; Fl::screen_work_area(X, Y, W, H); return 0; }" HAVE_FLTK_WORK_AREA) | |||
# FLTK STR #2816 | |||
check_cxx_source_compiles("#include <FL/Fl_Window.H>\nint main(int c, char** v) { Fl_Window::default_icons(0, 0); return 0; }" HAVE_FLTK_ICONS) | |||
# FLTK STR #2860 | |||
check_cxx_source_compiles("#include <FL/Fl_Window.H>\nint main(int c, char** v) { void (Fl_Window::*foo)(int,int,int,int) = &Fl_Window::fullscreen_screens; return 0; }" HAVE_FLTK_FULLSCREEN_SCREENS) | |||
# FLTK STR #xxxx | |||
check_cxx_source_compiles("#include <FL/Fl.H>\nint main(int c, char** v) { Fl::add_system_handler(NULL, NULL); return 0; }" HAVE_FLTK_XHANDLERS) | |||
# FLTK STR #xxxx | |||
check_cxx_source_compiles("#include <FL/Fl.H>\nint main(int c, char** v) { Fl::disable_im(); return 0; }" HAVE_FLTK_IM) | |||
set(CMAKE_REQUIRED_INCLUDES) | |||
set(CMAKE_REQUIRED_LIBRARIES) | |||
endif() | |||
# Check for GNUTLS library | |||
option(ENABLE_GNUTLS "Enable protocol encryption and advanced authentication" ON) | |||
if(ENABLE_GNUTLS) | |||
@@ -286,30 +241,6 @@ if(ENABLE_GNUTLS) | |||
include_directories(${GNUTLS_INCLUDE_DIR}) | |||
add_definitions("-DHAVE_GNUTLS") | |||
add_definitions(${GNUTLS_DEFINITIONS}) | |||
# Detect old version of GnuTLS | |||
set(CMAKE_REQUIRED_FLAGS -I${GNUTLS_INCLUDE_DIR}) | |||
set(CMAKE_EXTRA_INCLUDE_FILES gnutls/gnutls.h) | |||
set(CMAKE_REQUIRED_LIBRARIES ${GNUTLS_LIBRARIES}) | |||
if(WIN32) | |||
set(CMAKE_REQUIRED_LIBRARIES ${CMAKE_REQUIRED_LIBRARIES} ws2_32 user32) | |||
endif() | |||
if(ZLIB_FOUND) | |||
# When we build against the static version of GnuTLS, we also use the | |||
# included version of Zlib, but it isn't built yet, so we have to use the | |||
# system's version (if available) to perform this test. | |||
set(CMAKE_REQUIRED_LIBRARIES ${CMAKE_REQUIRED_LIBRARIES};-lz) | |||
endif() | |||
check_function_exists(gnutls_transport_set_errno HAVE_GNUTLS_SET_ERRNO) | |||
check_function_exists(gnutls_transport_set_global_errno HAVE_GNUTLS_SET_GLOBAL_ERRNO) | |||
check_function_exists(gnutls_x509_crt_print HAVE_GNUTLS_X509_CRT_PRINT) | |||
check_type_size(gnutls_x509_crt_t GNUTLS_X509_CRT_T) | |||
check_type_size(gnutls_datum_t GNUTLS_DATUM_T) | |||
check_type_size(gnutls_pk_algorithm_t GNUTLS_PK_ALGORITHM_T) | |||
check_type_size(gnutls_sign_algorithm_t GNUTLS_SIGN_ALGORITHM_T) | |||
set(CMAKE_REQUIRED_FLAGS) | |||
set(CMAKE_EXTRA_INCLUDE_FILES) | |||
set(CMAKE_REQUIRED_LIBRARIES) | |||
endif() | |||
endif() | |||
@@ -15,7 +15,7 @@ if(BUILD_STATIC) | |||
set(JPEG_LIBRARIES "-Wl,-Bstatic -ljpeg -Wl,-Bdynamic") | |||
if(WIN32 AND NOT USE_INCLUDED_ZLIB) | |||
if(WIN32) | |||
set(ZLIB_LIBRARIES "-Wl,-Bstatic -lz -Wl,-Bdynamic") | |||
endif() | |||
@@ -1,10 +1,3 @@ | |||
if(USE_INCLUDED_ZLIB) | |||
add_subdirectory(zlib) | |||
set(ZLIB_INCLUDE_DIRS ${CMAKE_SOURCE_DIR}/common/zlib) | |||
set(ZLIB_LIBRARIES zlib) | |||
endif() | |||
add_subdirectory(os) | |||
add_subdirectory(rdr) | |||
add_subdirectory(network) | |||
@@ -19,7 +12,4 @@ add_subdirectory(rfb) | |||
if(CMAKE_COMPILER_IS_GNUCXX AND (CMAKE_SIZEOF_VOID_P MATCHES 8) AND NOT WIN32) | |||
set_target_properties(os rdr network Xregion rfb | |||
PROPERTIES COMPILE_FLAGS -fPIC) | |||
if(USE_INCLUDED_ZLIB) | |||
set_target_properties(zlib PROPERTIES COMPILE_FLAGS -fPIC) | |||
endif() | |||
endif() |
@@ -2,8 +2,7 @@ include_directories(${CMAKE_SOURCE_DIR}/common) | |||
add_library(os STATIC | |||
w32tiger.c | |||
os.cxx | |||
tls.cxx) | |||
os.cxx) | |||
if(UNIX) | |||
libtool_create_control_file(os) |
@@ -1,198 +0,0 @@ | |||
/* Copyright (C) 2011 TightVNC Team. All Rights Reserved. | |||
* | |||
* This 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. | |||
* | |||
* This software 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 this software; if not, write to the Free Software | |||
* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, | |||
* USA. | |||
*/ | |||
#ifdef HAVE_CONFIG_H | |||
#include <config.h> | |||
#endif | |||
#include <os/tls.h> | |||
#include <iomanip> | |||
#include <stdio.h> | |||
#include <stdlib.h> | |||
#include <string.h> | |||
#include <sstream> | |||
#include <sys/types.h> | |||
#include <time.h> | |||
using namespace std; | |||
#if defined(HAVE_GNUTLS) && !defined(WIN32) | |||
#include <gnutls/gnutls.h> | |||
#include <gnutls/x509.h> | |||
#ifndef HAVE_GNUTLS_X509_CRT_PRINT | |||
/* Ancient GNUTLS... */ | |||
#if !defined(GNUTLS_VERSION_NUMBER) && !defined(LIBGNUTLS_VERSION_NUMBER) | |||
#define GNUTLS_DIG_SHA1 GNUTLS_DIG_SHA | |||
#endif | |||
#define UNKNOWN_SUBJECT(err) \ | |||
do { \ | |||
ss << "unknown subject (" << gnutls_strerror(err) << "), "; \ | |||
} while (0) | |||
#define UNKNOWN_ISSUER(err) \ | |||
do { \ | |||
ss << "unknown issuer (" << gnutls_strerror(err) << "), "; \ | |||
} while (0) | |||
static void | |||
hexprint(ostringstream &ss, const char *data, size_t len) | |||
{ | |||
size_t j; | |||
char tmp[3]; | |||
if (len == 0) | |||
ss << "00"; | |||
else { | |||
for (j = 0; j < len; j++) { | |||
snprintf(tmp, sizeof(tmp), "%.2x", (unsigned char) data[j]); | |||
ss << tmp; | |||
} | |||
} | |||
} | |||
/* Implementation based on gnutls_x509_crt_print from GNUTLS */ | |||
int | |||
gnutls_x509_crt_print(gnutls_x509_crt_t cert, | |||
gnutls_certificate_print_formats_t format, | |||
gnutls_datum_t * out) | |||
{ | |||
ostringstream ss; | |||
int err; | |||
char *dn; | |||
size_t dn_size = 0; | |||
/* Subject */ | |||
err = gnutls_x509_crt_get_dn(cert, NULL, &dn_size); | |||
if (err != GNUTLS_E_SHORT_MEMORY_BUFFER) | |||
UNKNOWN_SUBJECT(err); | |||
else { | |||
dn = (char *)malloc(dn_size); | |||
if (dn == NULL) { | |||
UNKNOWN_SUBJECT(GNUTLS_E_MEMORY_ERROR); | |||
} else { | |||
err = gnutls_x509_crt_get_dn(cert, dn, &dn_size); | |||
if (err < 0) { | |||
UNKNOWN_SUBJECT(err); | |||
} else | |||
ss << "subject `" << dn << "', "; | |||
free(dn); | |||
} | |||
} | |||
/* Issuer */ | |||
dn = NULL; | |||
dn_size = 0; | |||
err = gnutls_x509_crt_get_issuer_dn(cert, NULL, &dn_size); | |||
if (err != GNUTLS_E_SHORT_MEMORY_BUFFER) | |||
UNKNOWN_ISSUER(err); | |||
else { | |||
dn = (char *)malloc(dn_size); | |||
if (dn == NULL) { | |||
UNKNOWN_ISSUER(GNUTLS_E_MEMORY_ERROR); | |||
} else { | |||
err = gnutls_x509_crt_get_issuer_dn(cert, dn, &dn_size); | |||
if (err < 0) | |||
UNKNOWN_ISSUER(err); | |||
else | |||
ss << "issuer `" << dn << "', "; | |||
free(dn); | |||
} | |||
} | |||
/* Key algorithm and size */ | |||
unsigned int bits; | |||
const char *name; | |||
name = gnutls_pk_algorithm_get_name( (gnutls_pk_algorithm_t) | |||
gnutls_x509_crt_get_pk_algorithm(cert, &bits)); | |||
if (name == NULL) | |||
name = "Unknown"; | |||
ss << name << " key " << bits << " bits, "; | |||
/* Signature algorithm */ | |||
err = gnutls_x509_crt_get_signature_algorithm(cert); | |||
if (err < 0) { | |||
ss << "unknown signature algorithm (" << gnutls_strerror(err) | |||
<< "), "; | |||
} else { | |||
const char *name; | |||
name = gnutls_sign_algorithm_get_name((gnutls_sign_algorithm_t)err); | |||
if (name == NULL) | |||
name = "Unknown"; | |||
ss << "signed using " << name; | |||
if (err == GNUTLS_SIGN_RSA_MD5 || err == GNUTLS_SIGN_RSA_MD2) | |||
ss << " (broken!)"; | |||
ss << ", "; | |||
} | |||
/* Validity */ | |||
time_t tim; | |||
char s[42]; | |||
size_t max = sizeof(s); | |||
struct tm t; | |||
tim = gnutls_x509_crt_get_activation_time(cert); | |||
if (gmtime_r(&tim, &t) == NULL) | |||
ss << "unknown activation (" << (unsigned long) tim << ")"; | |||
else if (strftime(s, max, "%Y-%m-%d %H:%M:%S UTC", &t) == 0) | |||
ss << "failed activation (" << (unsigned long) tim << ")"; | |||
else | |||
ss << "activated `" << s << "'"; | |||
ss << ", "; | |||
tim = gnutls_x509_crt_get_expiration_time(cert); | |||
if (gmtime_r(&tim, &t) == NULL) | |||
ss << "unknown expiry (" << (unsigned long) tim << ")"; | |||
else if (strftime(s, max, "%Y-%m-%d %H:%M:%S UTC", &t) == 0) | |||
ss << "failed expiry (" << (unsigned long) tim << ")"; | |||
else | |||
ss << "expires `" << s << "'"; | |||
ss << ", "; | |||
/* Fingerprint */ | |||
char buffer[20]; | |||
size_t size = sizeof(buffer); | |||
err = gnutls_x509_crt_get_fingerprint(cert, GNUTLS_DIG_SHA1, buffer, &size); | |||
if (err < 0) | |||
ss << "unknown fingerprint (" << gnutls_strerror(err) << ")"; | |||
else { | |||
ss << "SHA-1 fingerprint `"; | |||
hexprint(ss, buffer, size); | |||
ss << "'"; | |||
} | |||
out->data = (unsigned char *) strdup(ss.str().c_str()); | |||
if (out->data == NULL) | |||
return GNUTLS_E_MEMORY_ERROR; | |||
out->size = strlen((char *)out->data); | |||
return 0; | |||
} | |||
#endif /* HAVE_GNUTLS_X509_CRT_PRINT */ | |||
#endif /* HAVE_GNUTLS */ | |||
@@ -1,59 +0,0 @@ | |||
/* Copyright (C) 2011 TightVNC Team. All Rights Reserved. | |||
* | |||
* This 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. | |||
* | |||
* This software 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 this software; if not, write to the Free Software | |||
* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, | |||
* USA. | |||
*/ | |||
#ifndef OS_TLS_H | |||
#define OS_TLS_H | |||
#ifdef HAVE_CONFIG_H | |||
#include <config.h> | |||
#endif | |||
#if defined(HAVE_GNUTLS) | |||
#include <gnutls/gnutls.h> | |||
#ifndef HAVE_GNUTLS_DATUM_T | |||
typedef gnutls_datum gnutls_datum_t; | |||
#endif | |||
#ifndef HAVE_GNUTLS_X509_CRT_T | |||
typedef gnutls_x509_crt gnutls_x509_crt_t; | |||
#endif | |||
#ifndef HAVE_GNUTLS_PK_ALGORITHM_T | |||
typedef gnutls_pk_algorithm gnutls_pk_algorithm_t; | |||
#endif | |||
#ifndef HAVE_GNUTLS_SIGN_ALGORITHM_T | |||
typedef gnutls_sign_algorithm gnutls_sign_algorithm_t; | |||
#endif | |||
#ifndef HAVE_GNUTLS_X509_CRT_PRINT | |||
typedef enum { | |||
GNUTLS_CRT_PRINT_ONELINE = 1 | |||
} gnutls_certificate_print_formats_t; | |||
/* | |||
* Prints certificate in human-readable form. | |||
*/ | |||
int | |||
gnutls_x509_crt_print(gnutls_x509_crt_t cert, | |||
gnutls_certificate_print_formats_t format, | |||
gnutls_datum_t * out); | |||
#endif /* HAVE_GNUTLS_X509_CRT_PRINT */ | |||
#endif /* HAVE_GNUTLS */ | |||
#endif /* OS_TLS_H */ | |||
@@ -1,46 +0,0 @@ | |||
/* Copyright (C) 2012 Pierre Ossman for Cendio AB | |||
* | |||
* This 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. | |||
* | |||
* This software 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 this software; if not, write to the Free Software | |||
* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, | |||
* USA. | |||
*/ | |||
#ifndef __RDR_TLSERRNO_H__ | |||
#define __RDR_TLSERRNO_H__ | |||
#ifdef HAVE_CONFIG_H | |||
#include <config.h> | |||
#endif | |||
#ifdef HAVE_GNUTLS | |||
#include <errno.h> | |||
namespace rdr { | |||
static inline void gnutls_errno_helper(gnutls_session session, int _errno) | |||
{ | |||
#if defined(HAVE_GNUTLS_SET_ERRNO) | |||
gnutls_transport_set_errno(session, _errno); | |||
#elif defined(HAVE_GNUTLS_SET_GLOBAL_ERRNO) | |||
gnutls_transport_set_global_errno(_errno); | |||
#else | |||
errno = _errno; | |||
#endif | |||
} | |||
}; | |||
#endif | |||
#endif |
@@ -25,7 +25,6 @@ | |||
#include <rdr/Exception.h> | |||
#include <rdr/TLSException.h> | |||
#include <rdr/TLSInStream.h> | |||
#include <rdr/TLSErrno.h> | |||
#include <errno.h> | |||
#ifdef HAVE_GNUTLS | |||
@@ -33,14 +32,14 @@ using namespace rdr; | |||
enum { DEFAULT_BUF_SIZE = 16384 }; | |||
ssize_t TLSInStream::pull(gnutls_transport_ptr str, void* data, size_t size) | |||
ssize_t TLSInStream::pull(gnutls_transport_ptr_t str, void* data, size_t size) | |||
{ | |||
TLSInStream* self= (TLSInStream*) str; | |||
InStream *in = self->in; | |||
try { | |||
if (!in->check(1, 1, false)) { | |||
gnutls_errno_helper(self->session, EAGAIN); | |||
gnutls_transport_set_errno(self->session, EAGAIN); | |||
return -1; | |||
} | |||
@@ -50,17 +49,17 @@ ssize_t TLSInStream::pull(gnutls_transport_ptr str, void* data, size_t size) | |||
in->readBytes(data, size); | |||
} catch (Exception& e) { | |||
gnutls_errno_helper(self->session, EINVAL); | |||
gnutls_transport_set_errno(self->session, EINVAL); | |||
return -1; | |||
} | |||
return size; | |||
} | |||
TLSInStream::TLSInStream(InStream* _in, gnutls_session _session) | |||
TLSInStream::TLSInStream(InStream* _in, gnutls_session_t _session) | |||
: session(_session), in(_in), bufSize(DEFAULT_BUF_SIZE), offset(0) | |||
{ | |||
gnutls_transport_ptr recv, send; | |||
gnutls_transport_ptr_t recv, send; | |||
ptr = end = start = new U8[bufSize]; | |||
@@ -33,7 +33,7 @@ namespace rdr { | |||
class TLSInStream : public InStream { | |||
public: | |||
TLSInStream(InStream* in, gnutls_session session); | |||
TLSInStream(InStream* in, gnutls_session_t session); | |||
virtual ~TLSInStream(); | |||
int pos(); | |||
@@ -41,9 +41,9 @@ namespace rdr { | |||
private: | |||
int overrun(int itemSize, int nItems, bool wait); | |||
int readTLS(U8* buf, int len, bool wait); | |||
static ssize_t pull(gnutls_transport_ptr str, void* data, size_t size); | |||
static ssize_t pull(gnutls_transport_ptr_t str, void* data, size_t size); | |||
gnutls_session session; | |||
gnutls_session_t session; | |||
InStream* in; | |||
int bufSize; | |||
int offset; |
@@ -25,7 +25,6 @@ | |||
#include <rdr/Exception.h> | |||
#include <rdr/TLSException.h> | |||
#include <rdr/TLSOutStream.h> | |||
#include <rdr/TLSErrno.h> | |||
#include <errno.h> | |||
#ifdef HAVE_GNUTLS | |||
@@ -33,7 +32,7 @@ using namespace rdr; | |||
enum { DEFAULT_BUF_SIZE = 16384 }; | |||
ssize_t TLSOutStream::push(gnutls_transport_ptr str, const void* data, | |||
ssize_t TLSOutStream::push(gnutls_transport_ptr_t str, const void* data, | |||
size_t size) | |||
{ | |||
TLSOutStream* self= (TLSOutStream*) str; | |||
@@ -43,17 +42,17 @@ ssize_t TLSOutStream::push(gnutls_transport_ptr str, const void* data, | |||
out->writeBytes(data, size); | |||
out->flush(); | |||
} catch (Exception& e) { | |||
gnutls_errno_helper(self->session, EINVAL); | |||
gnutls_transport_set_errno(self->session, EINVAL); | |||
return -1; | |||
} | |||
return size; | |||
} | |||
TLSOutStream::TLSOutStream(OutStream* _out, gnutls_session _session) | |||
TLSOutStream::TLSOutStream(OutStream* _out, gnutls_session_t _session) | |||
: session(_session), out(_out), bufSize(DEFAULT_BUF_SIZE), offset(0) | |||
{ | |||
gnutls_transport_ptr recv, send; | |||
gnutls_transport_ptr_t recv, send; | |||
ptr = start = new U8[bufSize]; | |||
end = start + bufSize; |
@@ -32,7 +32,7 @@ namespace rdr { | |||
class TLSOutStream : public OutStream { | |||
public: | |||
TLSOutStream(OutStream* out, gnutls_session session); | |||
TLSOutStream(OutStream* out, gnutls_session_t session); | |||
virtual ~TLSOutStream(); | |||
void flush(); | |||
@@ -43,9 +43,9 @@ namespace rdr { | |||
private: | |||
int writeTLS(const U8* data, int length); | |||
static ssize_t push(gnutls_transport_ptr str, const void* data, size_t size); | |||
static ssize_t push(gnutls_transport_ptr_t str, const void* data, size_t size); | |||
gnutls_session session; | |||
gnutls_session_t session; | |||
OutStream* out; | |||
int bufSize; | |||
U8* start; |
@@ -42,7 +42,6 @@ | |||
#include <rdr/TLSInStream.h> | |||
#include <rdr/TLSOutStream.h> | |||
#include <os/os.h> | |||
#include <os/tls.h> | |||
#include <gnutls/x509.h> | |||
@@ -202,14 +201,32 @@ bool CSecurityTLS::processMsg(CConnection* cc) | |||
void CSecurityTLS::setParam() | |||
{ | |||
static const int kx_anon_priority[] = { GNUTLS_KX_ANON_DH, 0 }; | |||
static const int kx_priority[] = { GNUTLS_KX_DHE_DSS, GNUTLS_KX_RSA, | |||
GNUTLS_KX_DHE_RSA, GNUTLS_KX_SRP, 0 }; | |||
static const char kx_anon_priority[] = ":+ANON-ECDH:+ANON-DH"; | |||
if (anon) { | |||
if (gnutls_kx_set_priority(session, kx_anon_priority) != GNUTLS_E_SUCCESS) | |||
throw AuthFailureException("gnutls_kx_set_priority failed"); | |||
int ret; | |||
char *prio; | |||
const char *err; | |||
prio = (char*)malloc(strlen(Security::GnuTLSPriority) + | |||
strlen(kx_anon_priority) + 1); | |||
if (prio == NULL) | |||
throw AuthFailureException("Not enough memory for GnuTLS priority string"); | |||
strcpy(prio, Security::GnuTLSPriority); | |||
if (anon) | |||
strcat(prio, kx_anon_priority); | |||
ret = gnutls_priority_set_direct(session, prio, &err); | |||
free(prio); | |||
if (ret != GNUTLS_E_SUCCESS) { | |||
if (ret == GNUTLS_E_INVALID_REQUEST) | |||
vlog.error("GnuTLS priority syntax error at: %s", err); | |||
throw AuthFailureException("gnutls_set_priority_direct failed"); | |||
} | |||
if (anon) { | |||
if (gnutls_anon_allocate_client_credentials(&anon_cred) != GNUTLS_E_SUCCESS) | |||
throw AuthFailureException("gnutls_anon_allocate_client_credentials failed"); | |||
@@ -218,9 +235,6 @@ void CSecurityTLS::setParam() | |||
vlog.debug("Anonymous session has been set"); | |||
} else { | |||
if (gnutls_kx_set_priority(session, kx_priority) != GNUTLS_E_SUCCESS) | |||
throw AuthFailureException("gnutls_kx_set_priority failed"); | |||
if (gnutls_certificate_allocate_credentials(&cert_cred) != GNUTLS_E_SUCCESS) | |||
throw AuthFailureException("gnutls_certificate_allocate_credentials failed"); | |||
@@ -259,10 +273,10 @@ void CSecurityTLS::checkSession() | |||
GNUTLS_CERT_SIGNER_NOT_FOUND | | |||
GNUTLS_CERT_SIGNER_NOT_CA; | |||
unsigned int status; | |||
const gnutls_datum *cert_list; | |||
const gnutls_datum_t *cert_list; | |||
unsigned int cert_list_size = 0; | |||
int err; | |||
gnutls_datum info; | |||
gnutls_datum_t info; | |||
if (anon) | |||
return; | |||
@@ -298,7 +312,7 @@ void CSecurityTLS::checkSession() | |||
throw AuthFailureException("empty certificate chain"); | |||
/* Process only server's certificate, not issuer's certificate */ | |||
gnutls_x509_crt crt; | |||
gnutls_x509_crt_t crt; | |||
gnutls_x509_crt_init(&crt); | |||
if (gnutls_x509_crt_import(crt, &cert_list[0], GNUTLS_X509_FMT_DER) < 0) |
@@ -64,9 +64,9 @@ namespace rfb { | |||
private: | |||
static void initGlobal(); | |||
gnutls_session session; | |||
gnutls_anon_client_credentials anon_cred; | |||
gnutls_certificate_credentials cert_cred; | |||
gnutls_session_t session; | |||
gnutls_anon_client_credentials_t anon_cred; | |||
gnutls_certificate_credentials_t cert_cred; | |||
bool anon; | |||
char *cafile, *crlfile; |
@@ -27,6 +27,8 @@ | |||
#error "This source should not be compiled without HAVE_GNUTLS defined" | |||
#endif | |||
#include <stdlib.h> | |||
#include <rfb/SSecurityTLS.h> | |||
#include <rfb/SConnection.h> | |||
#include <rfb/LogWriter.h> | |||
@@ -164,15 +166,32 @@ bool SSecurityTLS::processMsg(SConnection *sc) | |||
return true; | |||
} | |||
void SSecurityTLS::setParams(gnutls_session session) | |||
void SSecurityTLS::setParams(gnutls_session_t session) | |||
{ | |||
static const int kx_anon_priority[] = { GNUTLS_KX_ANON_DH, 0 }; | |||
static const int kx_priority[] = { GNUTLS_KX_DHE_DSS, GNUTLS_KX_RSA, | |||
GNUTLS_KX_DHE_RSA, GNUTLS_KX_SRP, 0 }; | |||
static const char kx_anon_priority[] = ":+ANON-ECDH:+ANON-DH"; | |||
int ret; | |||
char *prio; | |||
const char *err; | |||
prio = (char*)malloc(strlen(Security::GnuTLSPriority) + | |||
strlen(kx_anon_priority) + 1); | |||
if (prio == NULL) | |||
throw AuthFailureException("Not enough memory for GnuTLS priority string"); | |||
strcpy(prio, Security::GnuTLSPriority); | |||
if (anon) | |||
strcat(prio, kx_anon_priority); | |||
if (gnutls_kx_set_priority(session, anon ? kx_anon_priority : kx_priority) | |||
!= GNUTLS_E_SUCCESS) | |||
throw AuthFailureException("gnutls_kx_set_priority failed"); | |||
ret = gnutls_priority_set_direct(session, prio, &err); | |||
free(prio); | |||
if (ret != GNUTLS_E_SUCCESS) { | |||
if (ret == GNUTLS_E_INVALID_REQUEST) | |||
vlog.error("GnuTLS priority syntax error at: %s", err); | |||
throw AuthFailureException("gnutls_set_priority_direct failed"); | |||
} | |||
if (gnutls_dh_params_init(&dh_params) != GNUTLS_E_SUCCESS) | |||
throw AuthFailureException("gnutls_dh_params_init failed"); |
@@ -51,15 +51,15 @@ namespace rfb { | |||
protected: | |||
void shutdown(); | |||
void setParams(gnutls_session session); | |||
void setParams(gnutls_session_t session); | |||
private: | |||
static void initGlobal(); | |||
gnutls_session session; | |||
gnutls_dh_params dh_params; | |||
gnutls_anon_server_credentials anon_cred; | |||
gnutls_certificate_credentials cert_cred; | |||
gnutls_session_t session; | |||
gnutls_dh_params_t dh_params; | |||
gnutls_anon_server_credentials_t anon_cred; | |||
gnutls_certificate_credentials_t cert_cred; | |||
char *keyfile, *certfile; | |||
int type; |
@@ -49,6 +49,12 @@ using namespace std; | |||
static LogWriter vlog("Security"); | |||
#ifdef HAVE_GNUTLS | |||
StringParameter Security::GnuTLSPriority("GnuTLSPriority", | |||
"GnuTLS priority string that controls the TLS session’s handshake algorithms", | |||
"NORMAL"); | |||
#endif | |||
Security::Security() | |||
{ | |||
} |
@@ -93,6 +93,10 @@ namespace rfb { | |||
/* Output char* is stored in static array */ | |||
char *ToString(void); | |||
#ifdef HAVE_GNUTLS | |||
static StringParameter GnuTLSPriority; | |||
#endif | |||
private: | |||
std::list<rdr::U32> enabledSecTypes; | |||
}; |
@@ -1,22 +0,0 @@ | |||
# It seems like gcc for Win32 doesn't support the visibility attribute, | |||
# so disable it to make it stop complaining. | |||
if(WIN32) | |||
add_definitions(-DNO_VIZ) | |||
endif() | |||
add_library(zlib STATIC | |||
adler32.c | |||
compress.c | |||
crc32.c | |||
deflate.c | |||
gzclose.c | |||
gzlib.c | |||
gzread.c | |||
gzwrite.c | |||
inflate.c | |||
infback.c | |||
inftrees.c | |||
inffast.c | |||
trees.c | |||
uncompr.c | |||
zutil.c) |
@@ -1,2 +0,0 @@ | |||
This is a local copy of the zlib library, version 1.2.5. Unneeded parts are | |||
removed, check http://zlib.net for full source and more information. |
@@ -1,169 +0,0 @@ | |||
/* adler32.c -- compute the Adler-32 checksum of a data stream | |||
* Copyright (C) 1995-2007 Mark Adler | |||
* For conditions of distribution and use, see copyright notice in zlib.h | |||
*/ | |||
/* @(#) $Id$ */ | |||
#include "zutil.h" | |||
#define local static | |||
local uLong adler32_combine_(uLong adler1, uLong adler2, z_off64_t len2); | |||
#define BASE 65521UL /* largest prime smaller than 65536 */ | |||
#define NMAX 5552 | |||
/* NMAX is the largest n such that 255n(n+1)/2 + (n+1)(BASE-1) <= 2^32-1 */ | |||
#define DO1(buf,i) {adler += (buf)[i]; sum2 += adler;} | |||
#define DO2(buf,i) DO1(buf,i); DO1(buf,i+1); | |||
#define DO4(buf,i) DO2(buf,i); DO2(buf,i+2); | |||
#define DO8(buf,i) DO4(buf,i); DO4(buf,i+4); | |||
#define DO16(buf) DO8(buf,0); DO8(buf,8); | |||
/* use NO_DIVIDE if your processor does not do division in hardware */ | |||
#ifdef NO_DIVIDE | |||
# define MOD(a) \ | |||
do { \ | |||
if (a >= (BASE << 16)) a -= (BASE << 16); \ | |||
if (a >= (BASE << 15)) a -= (BASE << 15); \ | |||
if (a >= (BASE << 14)) a -= (BASE << 14); \ | |||
if (a >= (BASE << 13)) a -= (BASE << 13); \ | |||
if (a >= (BASE << 12)) a -= (BASE << 12); \ | |||
if (a >= (BASE << 11)) a -= (BASE << 11); \ | |||
if (a >= (BASE << 10)) a -= (BASE << 10); \ | |||
if (a >= (BASE << 9)) a -= (BASE << 9); \ | |||
if (a >= (BASE << 8)) a -= (BASE << 8); \ | |||
if (a >= (BASE << 7)) a -= (BASE << 7); \ | |||
if (a >= (BASE << 6)) a -= (BASE << 6); \ | |||
if (a >= (BASE << 5)) a -= (BASE << 5); \ | |||
if (a >= (BASE << 4)) a -= (BASE << 4); \ | |||
if (a >= (BASE << 3)) a -= (BASE << 3); \ | |||
if (a >= (BASE << 2)) a -= (BASE << 2); \ | |||
if (a >= (BASE << 1)) a -= (BASE << 1); \ | |||
if (a >= BASE) a -= BASE; \ | |||
} while (0) | |||
# define MOD4(a) \ | |||
do { \ | |||
if (a >= (BASE << 4)) a -= (BASE << 4); \ | |||
if (a >= (BASE << 3)) a -= (BASE << 3); \ | |||
if (a >= (BASE << 2)) a -= (BASE << 2); \ | |||
if (a >= (BASE << 1)) a -= (BASE << 1); \ | |||
if (a >= BASE) a -= BASE; \ | |||
} while (0) | |||
#else | |||
# define MOD(a) a %= BASE | |||
# define MOD4(a) a %= BASE | |||
#endif | |||
/* ========================================================================= */ | |||
uLong ZEXPORT adler32(adler, buf, len) | |||
uLong adler; | |||
const Bytef *buf; | |||
uInt len; | |||
{ | |||
unsigned long sum2; | |||
unsigned n; | |||
/* split Adler-32 into component sums */ | |||
sum2 = (adler >> 16) & 0xffff; | |||
adler &= 0xffff; | |||
/* in case user likes doing a byte at a time, keep it fast */ | |||
if (len == 1) { | |||
adler += buf[0]; | |||
if (adler >= BASE) | |||
adler -= BASE; | |||
sum2 += adler; | |||
if (sum2 >= BASE) | |||
sum2 -= BASE; | |||
return adler | (sum2 << 16); | |||
} | |||
/* initial Adler-32 value (deferred check for len == 1 speed) */ | |||
if (buf == Z_NULL) | |||
return 1L; | |||
/* in case short lengths are provided, keep it somewhat fast */ | |||
if (len < 16) { | |||
while (len--) { | |||
adler += *buf++; | |||
sum2 += adler; | |||
} | |||
if (adler >= BASE) | |||
adler -= BASE; | |||
MOD4(sum2); /* only added so many BASE's */ | |||
return adler | (sum2 << 16); | |||
} | |||
/* do length NMAX blocks -- requires just one modulo operation */ | |||
while (len >= NMAX) { | |||
len -= NMAX; | |||
n = NMAX / 16; /* NMAX is divisible by 16 */ | |||
do { | |||
DO16(buf); /* 16 sums unrolled */ | |||
buf += 16; | |||
} while (--n); | |||
MOD(adler); | |||
MOD(sum2); | |||
} | |||
/* do remaining bytes (less than NMAX, still just one modulo) */ | |||
if (len) { /* avoid modulos if none remaining */ | |||
while (len >= 16) { | |||
len -= 16; | |||
DO16(buf); | |||
buf += 16; | |||
} | |||
while (len--) { | |||
adler += *buf++; | |||
sum2 += adler; | |||
} | |||
MOD(adler); | |||
MOD(sum2); | |||
} | |||
/* return recombined sums */ | |||
return adler | (sum2 << 16); | |||
} | |||
/* ========================================================================= */ | |||
local uLong adler32_combine_(adler1, adler2, len2) | |||
uLong adler1; | |||
uLong adler2; | |||
z_off64_t len2; | |||
{ | |||
unsigned long sum1; | |||
unsigned long sum2; | |||
unsigned rem; | |||
/* the derivation of this formula is left as an exercise for the reader */ | |||
rem = (unsigned)(len2 % BASE); | |||
sum1 = adler1 & 0xffff; | |||
sum2 = rem * sum1; | |||
MOD(sum2); | |||
sum1 += (adler2 & 0xffff) + BASE - 1; | |||
sum2 += ((adler1 >> 16) & 0xffff) + ((adler2 >> 16) & 0xffff) + BASE - rem; | |||
if (sum1 >= BASE) sum1 -= BASE; | |||
if (sum1 >= BASE) sum1 -= BASE; | |||
if (sum2 >= (BASE << 1)) sum2 -= (BASE << 1); | |||
if (sum2 >= BASE) sum2 -= BASE; | |||
return sum1 | (sum2 << 16); | |||
} | |||
/* ========================================================================= */ | |||
uLong ZEXPORT adler32_combine(adler1, adler2, len2) | |||
uLong adler1; | |||
uLong adler2; | |||
z_off_t len2; | |||
{ | |||
return adler32_combine_(adler1, adler2, len2); | |||
} | |||
uLong ZEXPORT adler32_combine64(adler1, adler2, len2) | |||
uLong adler1; | |||
uLong adler2; | |||
z_off64_t len2; | |||
{ | |||
return adler32_combine_(adler1, adler2, len2); | |||
} |
@@ -1,80 +0,0 @@ | |||
/* compress.c -- compress a memory buffer | |||
* Copyright (C) 1995-2005 Jean-loup Gailly. | |||
* For conditions of distribution and use, see copyright notice in zlib.h | |||
*/ | |||
/* @(#) $Id$ */ | |||
#define ZLIB_INTERNAL | |||
#include "zlib.h" | |||
/* =========================================================================== | |||
Compresses the source buffer into the destination buffer. The level | |||
parameter has the same meaning as in deflateInit. sourceLen is the byte | |||
length of the source buffer. Upon entry, destLen is the total size of the | |||
destination buffer, which must be at least 0.1% larger than sourceLen plus | |||
12 bytes. Upon exit, destLen is the actual size of the compressed buffer. | |||
compress2 returns Z_OK if success, Z_MEM_ERROR if there was not enough | |||
memory, Z_BUF_ERROR if there was not enough room in the output buffer, | |||
Z_STREAM_ERROR if the level parameter is invalid. | |||
*/ | |||
int ZEXPORT compress2 (dest, destLen, source, sourceLen, level) | |||
Bytef *dest; | |||
uLongf *destLen; | |||
const Bytef *source; | |||
uLong sourceLen; | |||
int level; | |||
{ | |||
z_stream stream; | |||
int err; | |||
stream.next_in = (Bytef*)source; | |||
stream.avail_in = (uInt)sourceLen; | |||
#ifdef MAXSEG_64K | |||
/* Check for source > 64K on 16-bit machine: */ | |||
if ((uLong)stream.avail_in != sourceLen) return Z_BUF_ERROR; | |||
#endif | |||
stream.next_out = dest; | |||
stream.avail_out = (uInt)*destLen; | |||
if ((uLong)stream.avail_out != *destLen) return Z_BUF_ERROR; | |||
stream.zalloc = (alloc_func)0; | |||
stream.zfree = (free_func)0; | |||
stream.opaque = (voidpf)0; | |||
err = deflateInit(&stream, level); | |||
if (err != Z_OK) return err; | |||
err = deflate(&stream, Z_FINISH); | |||
if (err != Z_STREAM_END) { | |||
deflateEnd(&stream); | |||
return err == Z_OK ? Z_BUF_ERROR : err; | |||
} | |||
*destLen = stream.total_out; | |||
err = deflateEnd(&stream); | |||
return err; | |||
} | |||
/* =========================================================================== | |||
*/ | |||
int ZEXPORT compress (dest, destLen, source, sourceLen) | |||
Bytef *dest; | |||
uLongf *destLen; | |||
const Bytef *source; | |||
uLong sourceLen; | |||
{ | |||
return compress2(dest, destLen, source, sourceLen, Z_DEFAULT_COMPRESSION); | |||
} | |||
/* =========================================================================== | |||
If the default memLevel or windowBits for deflateInit() is changed, then | |||
this function needs to be updated. | |||
*/ | |||
uLong ZEXPORT compressBound (sourceLen) | |||
uLong sourceLen; | |||
{ | |||
return sourceLen + (sourceLen >> 12) + (sourceLen >> 14) + | |||
(sourceLen >> 25) + 13; | |||
} |
@@ -1,442 +0,0 @@ | |||
/* crc32.c -- compute the CRC-32 of a data stream | |||
* Copyright (C) 1995-2006, 2010 Mark Adler | |||
* For conditions of distribution and use, see copyright notice in zlib.h | |||
* | |||
* Thanks to Rodney Brown <rbrown64@csc.com.au> for his contribution of faster | |||
* CRC methods: exclusive-oring 32 bits of data at a time, and pre-computing | |||
* tables for updating the shift register in one step with three exclusive-ors | |||
* instead of four steps with four exclusive-ors. This results in about a | |||
* factor of two increase in speed on a Power PC G4 (PPC7455) using gcc -O3. | |||
*/ | |||
/* @(#) $Id$ */ | |||
/* | |||
Note on the use of DYNAMIC_CRC_TABLE: there is no mutex or semaphore | |||
protection on the static variables used to control the first-use generation | |||
of the crc tables. Therefore, if you #define DYNAMIC_CRC_TABLE, you should | |||
first call get_crc_table() to initialize the tables before allowing more than | |||
one thread to use crc32(). | |||
*/ | |||
#ifdef MAKECRCH | |||
# include <stdio.h> | |||
# ifndef DYNAMIC_CRC_TABLE | |||
# define DYNAMIC_CRC_TABLE | |||
# endif /* !DYNAMIC_CRC_TABLE */ | |||
#endif /* MAKECRCH */ | |||
#include "zutil.h" /* for STDC and FAR definitions */ | |||
#define local static | |||
/* Find a four-byte integer type for crc32_little() and crc32_big(). */ | |||
#ifndef NOBYFOUR | |||
# ifdef STDC /* need ANSI C limits.h to determine sizes */ | |||
# include <limits.h> | |||
# define BYFOUR | |||
# if (UINT_MAX == 0xffffffffUL) | |||
typedef unsigned int u4; | |||
# else | |||
# if (ULONG_MAX == 0xffffffffUL) | |||
typedef unsigned long u4; | |||
# else | |||
# if (USHRT_MAX == 0xffffffffUL) | |||
typedef unsigned short u4; | |||
# else | |||
# undef BYFOUR /* can't find a four-byte integer type! */ | |||
# endif | |||
# endif | |||
# endif | |||
# endif /* STDC */ | |||
#endif /* !NOBYFOUR */ | |||
/* Definitions for doing the crc four data bytes at a time. */ | |||
#ifdef BYFOUR | |||
# define REV(w) ((((w)>>24)&0xff)+(((w)>>8)&0xff00)+ \ | |||
(((w)&0xff00)<<8)+(((w)&0xff)<<24)) | |||
local unsigned long crc32_little OF((unsigned long, | |||
const unsigned char FAR *, unsigned)); | |||
local unsigned long crc32_big OF((unsigned long, | |||
const unsigned char FAR *, unsigned)); | |||
# define TBLS 8 | |||
#else | |||
# define TBLS 1 | |||
#endif /* BYFOUR */ | |||
/* Local functions for crc concatenation */ | |||
local unsigned long gf2_matrix_times OF((unsigned long *mat, | |||
unsigned long vec)); | |||
local void gf2_matrix_square OF((unsigned long *square, unsigned long *mat)); | |||
local uLong crc32_combine_(uLong crc1, uLong crc2, z_off64_t len2); | |||
#ifdef DYNAMIC_CRC_TABLE | |||
local volatile int crc_table_empty = 1; | |||
local unsigned long FAR crc_table[TBLS][256]; | |||
local void make_crc_table OF((void)); | |||
#ifdef MAKECRCH | |||
local void write_table OF((FILE *, const unsigned long FAR *)); | |||
#endif /* MAKECRCH */ | |||
/* | |||
Generate tables for a byte-wise 32-bit CRC calculation on the polynomial: | |||
x^32+x^26+x^23+x^22+x^16+x^12+x^11+x^10+x^8+x^7+x^5+x^4+x^2+x+1. | |||
Polynomials over GF(2) are represented in binary, one bit per coefficient, | |||
with the lowest powers in the most significant bit. Then adding polynomials | |||
is just exclusive-or, and multiplying a polynomial by x is a right shift by | |||
one. If we call the above polynomial p, and represent a byte as the | |||
polynomial q, also with the lowest power in the most significant bit (so the | |||
byte 0xb1 is the polynomial x^7+x^3+x+1), then the CRC is (q*x^32) mod p, | |||
where a mod b means the remainder after dividing a by b. | |||
This calculation is done using the shift-register method of multiplying and | |||
taking the remainder. The register is initialized to zero, and for each | |||
incoming bit, x^32 is added mod p to the register if the bit is a one (where | |||
x^32 mod p is p+x^32 = x^26+...+1), and the register is multiplied mod p by | |||
x (which is shifting right by one and adding x^32 mod p if the bit shifted | |||
out is a one). We start with the highest power (least significant bit) of | |||
q and repeat for all eight bits of q. | |||
The first table is simply the CRC of all possible eight bit values. This is | |||
all the information needed to generate CRCs on data a byte at a time for all | |||
combinations of CRC register values and incoming bytes. The remaining tables | |||
allow for word-at-a-time CRC calculation for both big-endian and little- | |||
endian machines, where a word is four bytes. | |||
*/ | |||
local void make_crc_table() | |||
{ | |||
unsigned long c; | |||
int n, k; | |||
unsigned long poly; /* polynomial exclusive-or pattern */ | |||
/* terms of polynomial defining this crc (except x^32): */ | |||
static volatile int first = 1; /* flag to limit concurrent making */ | |||
static const unsigned char p[] = {0,1,2,4,5,7,8,10,11,12,16,22,23,26}; | |||
/* See if another task is already doing this (not thread-safe, but better | |||
than nothing -- significantly reduces duration of vulnerability in | |||
case the advice about DYNAMIC_CRC_TABLE is ignored) */ | |||
if (first) { | |||
first = 0; | |||
/* make exclusive-or pattern from polynomial (0xedb88320UL) */ | |||
poly = 0UL; | |||
for (n = 0; n < sizeof(p)/sizeof(unsigned char); n++) | |||
poly |= 1UL << (31 - p[n]); | |||
/* generate a crc for every 8-bit value */ | |||
for (n = 0; n < 256; n++) { | |||
c = (unsigned long)n; | |||
for (k = 0; k < 8; k++) | |||
c = c & 1 ? poly ^ (c >> 1) : c >> 1; | |||
crc_table[0][n] = c; | |||
} | |||
#ifdef BYFOUR | |||
/* generate crc for each value followed by one, two, and three zeros, | |||
and then the byte reversal of those as well as the first table */ | |||
for (n = 0; n < 256; n++) { | |||
c = crc_table[0][n]; | |||
crc_table[4][n] = REV(c); | |||
for (k = 1; k < 4; k++) { | |||
c = crc_table[0][c & 0xff] ^ (c >> 8); | |||
crc_table[k][n] = c; | |||
crc_table[k + 4][n] = REV(c); | |||
} | |||
} | |||
#endif /* BYFOUR */ | |||
crc_table_empty = 0; | |||
} | |||
else { /* not first */ | |||
/* wait for the other guy to finish (not efficient, but rare) */ | |||
while (crc_table_empty) | |||
; | |||
} | |||
#ifdef MAKECRCH | |||
/* write out CRC tables to crc32.h */ | |||
{ | |||
FILE *out; | |||
out = fopen("crc32.h", "w"); | |||
if (out == NULL) return; | |||
fprintf(out, "/* crc32.h -- tables for rapid CRC calculation\n"); | |||
fprintf(out, " * Generated automatically by crc32.c\n */\n\n"); | |||
fprintf(out, "local const unsigned long FAR "); | |||
fprintf(out, "crc_table[TBLS][256] =\n{\n {\n"); | |||
write_table(out, crc_table[0]); | |||
# ifdef BYFOUR | |||
fprintf(out, "#ifdef BYFOUR\n"); | |||
for (k = 1; k < 8; k++) { | |||
fprintf(out, " },\n {\n"); | |||
write_table(out, crc_table[k]); | |||
} | |||
fprintf(out, "#endif\n"); | |||
# endif /* BYFOUR */ | |||
fprintf(out, " }\n};\n"); | |||
fclose(out); | |||
} | |||
#endif /* MAKECRCH */ | |||
} | |||
#ifdef MAKECRCH | |||
local void write_table(out, table) | |||
FILE *out; | |||
const unsigned long FAR *table; | |||
{ | |||
int n; | |||
for (n = 0; n < 256; n++) | |||
fprintf(out, "%s0x%08lxUL%s", n % 5 ? "" : " ", table[n], | |||
n == 255 ? "\n" : (n % 5 == 4 ? ",\n" : ", ")); | |||
} | |||
#endif /* MAKECRCH */ | |||
#else /* !DYNAMIC_CRC_TABLE */ | |||
/* ======================================================================== | |||
* Tables of CRC-32s of all single-byte values, made by make_crc_table(). | |||
*/ | |||
#include "crc32.h" | |||
#endif /* DYNAMIC_CRC_TABLE */ | |||
/* ========================================================================= | |||
* This function can be used by asm versions of crc32() | |||
*/ | |||
const unsigned long FAR * ZEXPORT get_crc_table() | |||
{ | |||
#ifdef DYNAMIC_CRC_TABLE | |||
if (crc_table_empty) | |||
make_crc_table(); | |||
#endif /* DYNAMIC_CRC_TABLE */ | |||
return (const unsigned long FAR *)crc_table; | |||
} | |||
/* ========================================================================= */ | |||
#define DO1 crc = crc_table[0][((int)crc ^ (*buf++)) & 0xff] ^ (crc >> 8) | |||
#define DO8 DO1; DO1; DO1; DO1; DO1; DO1; DO1; DO1 | |||
/* ========================================================================= */ | |||
unsigned long ZEXPORT crc32(crc, buf, len) | |||
unsigned long crc; | |||
const unsigned char FAR *buf; | |||
uInt len; | |||
{ | |||
if (buf == Z_NULL) return 0UL; | |||
#ifdef DYNAMIC_CRC_TABLE | |||
if (crc_table_empty) | |||
make_crc_table(); | |||
#endif /* DYNAMIC_CRC_TABLE */ | |||
#ifdef BYFOUR | |||
if (sizeof(void *) == sizeof(ptrdiff_t)) { | |||
u4 endian; | |||
endian = 1; | |||
if (*((unsigned char *)(&endian))) | |||
return crc32_little(crc, buf, len); | |||
else | |||
return crc32_big(crc, buf, len); | |||
} | |||
#endif /* BYFOUR */ | |||
crc = crc ^ 0xffffffffUL; | |||
while (len >= 8) { | |||
DO8; | |||
len -= 8; | |||
} | |||
if (len) do { | |||
DO1; | |||
} while (--len); | |||
return crc ^ 0xffffffffUL; | |||
} | |||
#ifdef BYFOUR | |||
/* ========================================================================= */ | |||
#define DOLIT4 c ^= *buf4++; \ | |||
c = crc_table[3][c & 0xff] ^ crc_table[2][(c >> 8) & 0xff] ^ \ | |||
crc_table[1][(c >> 16) & 0xff] ^ crc_table[0][c >> 24] | |||
#define DOLIT32 DOLIT4; DOLIT4; DOLIT4; DOLIT4; DOLIT4; DOLIT4; DOLIT4; DOLIT4 | |||
/* ========================================================================= */ | |||
local unsigned long crc32_little(crc, buf, len) | |||
unsigned long crc; | |||
const unsigned char FAR *buf; | |||
unsigned len; | |||
{ | |||
register u4 c; | |||
register const u4 FAR *buf4; | |||
c = (u4)crc; | |||
c = ~c; | |||
while (len && ((ptrdiff_t)buf & 3)) { | |||
c = crc_table[0][(c ^ *buf++) & 0xff] ^ (c >> 8); | |||
len--; | |||
} | |||
buf4 = (const u4 FAR *)(const void FAR *)buf; | |||
while (len >= 32) { | |||
DOLIT32; | |||
len -= 32; | |||
} | |||
while (len >= 4) { | |||
DOLIT4; | |||
len -= 4; | |||
} | |||
buf = (const unsigned char FAR *)buf4; | |||
if (len) do { | |||
c = crc_table[0][(c ^ *buf++) & 0xff] ^ (c >> 8); | |||
} while (--len); | |||
c = ~c; | |||
return (unsigned long)c; | |||
} | |||
/* ========================================================================= */ | |||
#define DOBIG4 c ^= *++buf4; \ | |||
c = crc_table[4][c & 0xff] ^ crc_table[5][(c >> 8) & 0xff] ^ \ | |||
crc_table[6][(c >> 16) & 0xff] ^ crc_table[7][c >> 24] | |||
#define DOBIG32 DOBIG4; DOBIG4; DOBIG4; DOBIG4; DOBIG4; DOBIG4; DOBIG4; DOBIG4 | |||
/* ========================================================================= */ | |||
local unsigned long crc32_big(crc, buf, len) | |||
unsigned long crc; | |||
const unsigned char FAR *buf; | |||
unsigned len; | |||
{ | |||
register u4 c; | |||
register const u4 FAR *buf4; | |||
c = REV((u4)crc); | |||
c = ~c; | |||
while (len && ((ptrdiff_t)buf & 3)) { | |||
c = crc_table[4][(c >> 24) ^ *buf++] ^ (c << 8); | |||
len--; | |||
} | |||
buf4 = (const u4 FAR *)(const void FAR *)buf; | |||
buf4--; | |||
while (len >= 32) { | |||
DOBIG32; | |||
len -= 32; | |||
} | |||
while (len >= 4) { | |||
DOBIG4; | |||
len -= 4; | |||
} | |||
buf4++; | |||
buf = (const unsigned char FAR *)buf4; | |||
if (len) do { | |||
c = crc_table[4][(c >> 24) ^ *buf++] ^ (c << 8); | |||
} while (--len); | |||
c = ~c; | |||
return (unsigned long)(REV(c)); | |||
} | |||
#endif /* BYFOUR */ | |||
#define GF2_DIM 32 /* dimension of GF(2) vectors (length of CRC) */ | |||
/* ========================================================================= */ | |||
local unsigned long gf2_matrix_times(mat, vec) | |||
unsigned long *mat; | |||
unsigned long vec; | |||
{ | |||
unsigned long sum; | |||
sum = 0; | |||
while (vec) { | |||
if (vec & 1) | |||
sum ^= *mat; | |||
vec >>= 1; | |||
mat++; | |||
} | |||
return sum; | |||
} | |||
/* ========================================================================= */ | |||
local void gf2_matrix_square(square, mat) | |||
unsigned long *square; | |||
unsigned long *mat; | |||
{ | |||
int n; | |||
for (n = 0; n < GF2_DIM; n++) | |||
square[n] = gf2_matrix_times(mat, mat[n]); | |||
} | |||
/* ========================================================================= */ | |||
local uLong crc32_combine_(crc1, crc2, len2) | |||
uLong crc1; | |||
uLong crc2; | |||
z_off64_t len2; | |||
{ | |||
int n; | |||
unsigned long row; | |||
unsigned long even[GF2_DIM]; /* even-power-of-two zeros operator */ | |||
unsigned long odd[GF2_DIM]; /* odd-power-of-two zeros operator */ | |||
/* degenerate case (also disallow negative lengths) */ | |||
if (len2 <= 0) | |||
return crc1; | |||
/* put operator for one zero bit in odd */ | |||
odd[0] = 0xedb88320UL; /* CRC-32 polynomial */ | |||
row = 1; | |||
for (n = 1; n < GF2_DIM; n++) { | |||
odd[n] = row; | |||
row <<= 1; | |||
} | |||
/* put operator for two zero bits in even */ | |||
gf2_matrix_square(even, odd); | |||
/* put operator for four zero bits in odd */ | |||
gf2_matrix_square(odd, even); | |||
/* apply len2 zeros to crc1 (first square will put the operator for one | |||
zero byte, eight zero bits, in even) */ | |||
do { | |||
/* apply zeros operator for this bit of len2 */ | |||
gf2_matrix_square(even, odd); | |||
if (len2 & 1) | |||
crc1 = gf2_matrix_times(even, crc1); | |||
len2 >>= 1; | |||
/* if no more bits set, then done */ | |||
if (len2 == 0) | |||
break; | |||
/* another iteration of the loop with odd and even swapped */ | |||
gf2_matrix_square(odd, even); | |||
if (len2 & 1) | |||
crc1 = gf2_matrix_times(odd, crc1); | |||
len2 >>= 1; | |||
/* if no more bits set, then done */ | |||
} while (len2 != 0); | |||
/* return combined crc */ | |||
crc1 ^= crc2; | |||
return crc1; | |||
} | |||
/* ========================================================================= */ | |||
uLong ZEXPORT crc32_combine(crc1, crc2, len2) | |||
uLong crc1; | |||
uLong crc2; | |||
z_off_t len2; | |||
{ | |||
return crc32_combine_(crc1, crc2, len2); | |||
} | |||
uLong ZEXPORT crc32_combine64(crc1, crc2, len2) | |||
uLong crc1; | |||
uLong crc2; | |||
z_off64_t len2; | |||
{ | |||
return crc32_combine_(crc1, crc2, len2); | |||
} |
@@ -1,441 +0,0 @@ | |||
/* crc32.h -- tables for rapid CRC calculation | |||
* Generated automatically by crc32.c | |||
*/ | |||
local const unsigned long FAR crc_table[TBLS][256] = | |||
{ | |||
{ | |||
0x00000000UL, 0x77073096UL, 0xee0e612cUL, 0x990951baUL, 0x076dc419UL, | |||
0x706af48fUL, 0xe963a535UL, 0x9e6495a3UL, 0x0edb8832UL, 0x79dcb8a4UL, | |||
0xe0d5e91eUL, 0x97d2d988UL, 0x09b64c2bUL, 0x7eb17cbdUL, 0xe7b82d07UL, | |||
0x90bf1d91UL, 0x1db71064UL, 0x6ab020f2UL, 0xf3b97148UL, 0x84be41deUL, | |||
0x1adad47dUL, 0x6ddde4ebUL, 0xf4d4b551UL, 0x83d385c7UL, 0x136c9856UL, | |||
0x646ba8c0UL, 0xfd62f97aUL, 0x8a65c9ecUL, 0x14015c4fUL, 0x63066cd9UL, | |||
0xfa0f3d63UL, 0x8d080df5UL, 0x3b6e20c8UL, 0x4c69105eUL, 0xd56041e4UL, | |||
0xa2677172UL, 0x3c03e4d1UL, 0x4b04d447UL, 0xd20d85fdUL, 0xa50ab56bUL, | |||
0x35b5a8faUL, 0x42b2986cUL, 0xdbbbc9d6UL, 0xacbcf940UL, 0x32d86ce3UL, | |||
0x45df5c75UL, 0xdcd60dcfUL, 0xabd13d59UL, 0x26d930acUL, 0x51de003aUL, | |||
0xc8d75180UL, 0xbfd06116UL, 0x21b4f4b5UL, 0x56b3c423UL, 0xcfba9599UL, | |||
0xb8bda50fUL, 0x2802b89eUL, 0x5f058808UL, 0xc60cd9b2UL, 0xb10be924UL, | |||
0x2f6f7c87UL, 0x58684c11UL, 0xc1611dabUL, 0xb6662d3dUL, 0x76dc4190UL, | |||
0x01db7106UL, 0x98d220bcUL, 0xefd5102aUL, 0x71b18589UL, 0x06b6b51fUL, | |||
0x9fbfe4a5UL, 0xe8b8d433UL, 0x7807c9a2UL, 0x0f00f934UL, 0x9609a88eUL, | |||
0xe10e9818UL, 0x7f6a0dbbUL, 0x086d3d2dUL, 0x91646c97UL, 0xe6635c01UL, | |||
0x6b6b51f4UL, 0x1c6c6162UL, 0x856530d8UL, 0xf262004eUL, 0x6c0695edUL, | |||
0x1b01a57bUL, 0x8208f4c1UL, 0xf50fc457UL, 0x65b0d9c6UL, 0x12b7e950UL, | |||
0x8bbeb8eaUL, 0xfcb9887cUL, 0x62dd1ddfUL, 0x15da2d49UL, 0x8cd37cf3UL, | |||
0xfbd44c65UL, 0x4db26158UL, 0x3ab551ceUL, 0xa3bc0074UL, 0xd4bb30e2UL, | |||
0x4adfa541UL, 0x3dd895d7UL, 0xa4d1c46dUL, 0xd3d6f4fbUL, 0x4369e96aUL, | |||
0x346ed9fcUL, 0xad678846UL, 0xda60b8d0UL, 0x44042d73UL, 0x33031de5UL, | |||
0xaa0a4c5fUL, 0xdd0d7cc9UL, 0x5005713cUL, 0x270241aaUL, 0xbe0b1010UL, | |||
0xc90c2086UL, 0x5768b525UL, 0x206f85b3UL, 0xb966d409UL, 0xce61e49fUL, | |||
0x5edef90eUL, 0x29d9c998UL, 0xb0d09822UL, 0xc7d7a8b4UL, 0x59b33d17UL, | |||
0x2eb40d81UL, 0xb7bd5c3bUL, 0xc0ba6cadUL, 0xedb88320UL, 0x9abfb3b6UL, | |||
0x03b6e20cUL, 0x74b1d29aUL, 0xead54739UL, 0x9dd277afUL, 0x04db2615UL, | |||
0x73dc1683UL, 0xe3630b12UL, 0x94643b84UL, 0x0d6d6a3eUL, 0x7a6a5aa8UL, | |||
0xe40ecf0bUL, 0x9309ff9dUL, 0x0a00ae27UL, 0x7d079eb1UL, 0xf00f9344UL, | |||
0x8708a3d2UL, 0x1e01f268UL, 0x6906c2feUL, 0xf762575dUL, 0x806567cbUL, | |||
0x196c3671UL, 0x6e6b06e7UL, 0xfed41b76UL, 0x89d32be0UL, 0x10da7a5aUL, | |||
0x67dd4accUL, 0xf9b9df6fUL, 0x8ebeeff9UL, 0x17b7be43UL, 0x60b08ed5UL, | |||
0xd6d6a3e8UL, 0xa1d1937eUL, 0x38d8c2c4UL, 0x4fdff252UL, 0xd1bb67f1UL, | |||
0xa6bc5767UL, 0x3fb506ddUL, 0x48b2364bUL, 0xd80d2bdaUL, 0xaf0a1b4cUL, | |||
0x36034af6UL, 0x41047a60UL, 0xdf60efc3UL, 0xa867df55UL, 0x316e8eefUL, | |||
0x4669be79UL, 0xcb61b38cUL, 0xbc66831aUL, 0x256fd2a0UL, 0x5268e236UL, | |||
0xcc0c7795UL, 0xbb0b4703UL, 0x220216b9UL, 0x5505262fUL, 0xc5ba3bbeUL, | |||
0xb2bd0b28UL, 0x2bb45a92UL, 0x5cb36a04UL, 0xc2d7ffa7UL, 0xb5d0cf31UL, | |||
0x2cd99e8bUL, 0x5bdeae1dUL, 0x9b64c2b0UL, 0xec63f226UL, 0x756aa39cUL, | |||
0x026d930aUL, 0x9c0906a9UL, 0xeb0e363fUL, 0x72076785UL, 0x05005713UL, | |||
0x95bf4a82UL, 0xe2b87a14UL, 0x7bb12baeUL, 0x0cb61b38UL, 0x92d28e9bUL, | |||
0xe5d5be0dUL, 0x7cdcefb7UL, 0x0bdbdf21UL, 0x86d3d2d4UL, 0xf1d4e242UL, | |||
0x68ddb3f8UL, 0x1fda836eUL, 0x81be16cdUL, 0xf6b9265bUL, 0x6fb077e1UL, | |||
0x18b74777UL, 0x88085ae6UL, 0xff0f6a70UL, 0x66063bcaUL, 0x11010b5cUL, | |||
0x8f659effUL, 0xf862ae69UL, 0x616bffd3UL, 0x166ccf45UL, 0xa00ae278UL, | |||
0xd70dd2eeUL, 0x4e048354UL, 0x3903b3c2UL, 0xa7672661UL, 0xd06016f7UL, | |||
0x4969474dUL, 0x3e6e77dbUL, 0xaed16a4aUL, 0xd9d65adcUL, 0x40df0b66UL, | |||
0x37d83bf0UL, 0xa9bcae53UL, 0xdebb9ec5UL, 0x47b2cf7fUL, 0x30b5ffe9UL, | |||
0xbdbdf21cUL, 0xcabac28aUL, 0x53b39330UL, 0x24b4a3a6UL, 0xbad03605UL, | |||
0xcdd70693UL, 0x54de5729UL, 0x23d967bfUL, 0xb3667a2eUL, 0xc4614ab8UL, | |||
0x5d681b02UL, 0x2a6f2b94UL, 0xb40bbe37UL, 0xc30c8ea1UL, 0x5a05df1bUL, | |||
0x2d02ef8dUL | |||
#ifdef BYFOUR | |||
}, | |||
{ | |||
0x00000000UL, 0x191b3141UL, 0x32366282UL, 0x2b2d53c3UL, 0x646cc504UL, | |||
0x7d77f445UL, 0x565aa786UL, 0x4f4196c7UL, 0xc8d98a08UL, 0xd1c2bb49UL, | |||
0xfaefe88aUL, 0xe3f4d9cbUL, 0xacb54f0cUL, 0xb5ae7e4dUL, 0x9e832d8eUL, | |||
0x87981ccfUL, 0x4ac21251UL, 0x53d92310UL, 0x78f470d3UL, 0x61ef4192UL, | |||
0x2eaed755UL, 0x37b5e614UL, 0x1c98b5d7UL, 0x05838496UL, 0x821b9859UL, | |||
0x9b00a918UL, 0xb02dfadbUL, 0xa936cb9aUL, 0xe6775d5dUL, 0xff6c6c1cUL, | |||
0xd4413fdfUL, 0xcd5a0e9eUL, 0x958424a2UL, 0x8c9f15e3UL, 0xa7b24620UL, | |||
0xbea97761UL, 0xf1e8e1a6UL, 0xe8f3d0e7UL, 0xc3de8324UL, 0xdac5b265UL, | |||
0x5d5daeaaUL, 0x44469febUL, 0x6f6bcc28UL, 0x7670fd69UL, 0x39316baeUL, | |||
0x202a5aefUL, 0x0b07092cUL, 0x121c386dUL, 0xdf4636f3UL, 0xc65d07b2UL, | |||
0xed705471UL, 0xf46b6530UL, 0xbb2af3f7UL, 0xa231c2b6UL, 0x891c9175UL, | |||
0x9007a034UL, 0x179fbcfbUL, 0x0e848dbaUL, 0x25a9de79UL, 0x3cb2ef38UL, | |||
0x73f379ffUL, 0x6ae848beUL, 0x41c51b7dUL, 0x58de2a3cUL, 0xf0794f05UL, | |||
0xe9627e44UL, 0xc24f2d87UL, 0xdb541cc6UL, 0x94158a01UL, 0x8d0ebb40UL, | |||
0xa623e883UL, 0xbf38d9c2UL, 0x38a0c50dUL, 0x21bbf44cUL, 0x0a96a78fUL, | |||
0x138d96ceUL, 0x5ccc0009UL, 0x45d73148UL, 0x6efa628bUL, 0x77e153caUL, | |||
0xbabb5d54UL, 0xa3a06c15UL, 0x888d3fd6UL, 0x91960e97UL, 0xded79850UL, | |||
0xc7cca911UL, 0xece1fad2UL, 0xf5facb93UL, 0x7262d75cUL, 0x6b79e61dUL, | |||
0x4054b5deUL, 0x594f849fUL, 0x160e1258UL, 0x0f152319UL, 0x243870daUL, | |||
0x3d23419bUL, 0x65fd6ba7UL, 0x7ce65ae6UL, 0x57cb0925UL, 0x4ed03864UL, | |||
0x0191aea3UL, 0x188a9fe2UL, 0x33a7cc21UL, 0x2abcfd60UL, 0xad24e1afUL, | |||
0xb43fd0eeUL, 0x9f12832dUL, 0x8609b26cUL, 0xc94824abUL, 0xd05315eaUL, | |||
0xfb7e4629UL, 0xe2657768UL, 0x2f3f79f6UL, 0x362448b7UL, 0x1d091b74UL, | |||
0x04122a35UL, 0x4b53bcf2UL, 0x52488db3UL, 0x7965de70UL, 0x607eef31UL, | |||
0xe7e6f3feUL, 0xfefdc2bfUL, 0xd5d0917cUL, 0xcccba03dUL, 0x838a36faUL, | |||
0x9a9107bbUL, 0xb1bc5478UL, 0xa8a76539UL, 0x3b83984bUL, 0x2298a90aUL, | |||
0x09b5fac9UL, 0x10aecb88UL, 0x5fef5d4fUL, 0x46f46c0eUL, 0x6dd93fcdUL, | |||
0x74c20e8cUL, 0xf35a1243UL, 0xea412302UL, 0xc16c70c1UL, 0xd8774180UL, | |||
0x9736d747UL, 0x8e2de606UL, 0xa500b5c5UL, 0xbc1b8484UL, 0x71418a1aUL, | |||
0x685abb5bUL, 0x4377e898UL, 0x5a6cd9d9UL, 0x152d4f1eUL, 0x0c367e5fUL, | |||
0x271b2d9cUL, 0x3e001cddUL, 0xb9980012UL, 0xa0833153UL, 0x8bae6290UL, | |||
0x92b553d1UL, 0xddf4c516UL, 0xc4eff457UL, 0xefc2a794UL, 0xf6d996d5UL, | |||
0xae07bce9UL, 0xb71c8da8UL, 0x9c31de6bUL, 0x852aef2aUL, 0xca6b79edUL, | |||
0xd37048acUL, 0xf85d1b6fUL, 0xe1462a2eUL, 0x66de36e1UL, 0x7fc507a0UL, | |||
0x54e85463UL, 0x4df36522UL, 0x02b2f3e5UL, 0x1ba9c2a4UL, 0x30849167UL, | |||
0x299fa026UL, 0xe4c5aeb8UL, 0xfdde9ff9UL, 0xd6f3cc3aUL, 0xcfe8fd7bUL, | |||
0x80a96bbcUL, 0x99b25afdUL, 0xb29f093eUL, 0xab84387fUL, 0x2c1c24b0UL, | |||
0x350715f1UL, 0x1e2a4632UL, 0x07317773UL, 0x4870e1b4UL, 0x516bd0f5UL, | |||
0x7a468336UL, 0x635db277UL, 0xcbfad74eUL, 0xd2e1e60fUL, 0xf9ccb5ccUL, | |||
0xe0d7848dUL, 0xaf96124aUL, 0xb68d230bUL, 0x9da070c8UL, 0x84bb4189UL, | |||
0x03235d46UL, 0x1a386c07UL, 0x31153fc4UL, 0x280e0e85UL, 0x674f9842UL, | |||
0x7e54a903UL, 0x5579fac0UL, 0x4c62cb81UL, 0x8138c51fUL, 0x9823f45eUL, | |||
0xb30ea79dUL, 0xaa1596dcUL, 0xe554001bUL, 0xfc4f315aUL, 0xd7626299UL, | |||
0xce7953d8UL, 0x49e14f17UL, 0x50fa7e56UL, 0x7bd72d95UL, 0x62cc1cd4UL, | |||
0x2d8d8a13UL, 0x3496bb52UL, 0x1fbbe891UL, 0x06a0d9d0UL, 0x5e7ef3ecUL, | |||
0x4765c2adUL, 0x6c48916eUL, 0x7553a02fUL, 0x3a1236e8UL, 0x230907a9UL, | |||
0x0824546aUL, 0x113f652bUL, 0x96a779e4UL, 0x8fbc48a5UL, 0xa4911b66UL, | |||
0xbd8a2a27UL, 0xf2cbbce0UL, 0xebd08da1UL, 0xc0fdde62UL, 0xd9e6ef23UL, | |||
0x14bce1bdUL, 0x0da7d0fcUL, 0x268a833fUL, 0x3f91b27eUL, 0x70d024b9UL, | |||
0x69cb15f8UL, 0x42e6463bUL, 0x5bfd777aUL, 0xdc656bb5UL, 0xc57e5af4UL, | |||
0xee530937UL, 0xf7483876UL, 0xb809aeb1UL, 0xa1129ff0UL, 0x8a3fcc33UL, | |||
0x9324fd72UL | |||
}, | |||
{ | |||
0x00000000UL, 0x01c26a37UL, 0x0384d46eUL, 0x0246be59UL, 0x0709a8dcUL, | |||
0x06cbc2ebUL, 0x048d7cb2UL, 0x054f1685UL, 0x0e1351b8UL, 0x0fd13b8fUL, | |||
0x0d9785d6UL, 0x0c55efe1UL, 0x091af964UL, 0x08d89353UL, 0x0a9e2d0aUL, | |||
0x0b5c473dUL, 0x1c26a370UL, 0x1de4c947UL, 0x1fa2771eUL, 0x1e601d29UL, | |||
0x1b2f0bacUL, 0x1aed619bUL, 0x18abdfc2UL, 0x1969b5f5UL, 0x1235f2c8UL, | |||
0x13f798ffUL, 0x11b126a6UL, 0x10734c91UL, 0x153c5a14UL, 0x14fe3023UL, | |||
0x16b88e7aUL, 0x177ae44dUL, 0x384d46e0UL, 0x398f2cd7UL, 0x3bc9928eUL, | |||
0x3a0bf8b9UL, 0x3f44ee3cUL, 0x3e86840bUL, 0x3cc03a52UL, 0x3d025065UL, | |||
0x365e1758UL, 0x379c7d6fUL, 0x35dac336UL, 0x3418a901UL, 0x3157bf84UL, | |||
0x3095d5b3UL, 0x32d36beaUL, 0x331101ddUL, 0x246be590UL, 0x25a98fa7UL, | |||
0x27ef31feUL, 0x262d5bc9UL, 0x23624d4cUL, 0x22a0277bUL, 0x20e69922UL, | |||
0x2124f315UL, 0x2a78b428UL, 0x2bbade1fUL, 0x29fc6046UL, 0x283e0a71UL, | |||
0x2d711cf4UL, 0x2cb376c3UL, 0x2ef5c89aUL, 0x2f37a2adUL, 0x709a8dc0UL, | |||
0x7158e7f7UL, 0x731e59aeUL, 0x72dc3399UL, 0x7793251cUL, 0x76514f2bUL, | |||
0x7417f172UL, 0x75d59b45UL, 0x7e89dc78UL, 0x7f4bb64fUL, 0x7d0d0816UL, | |||
0x7ccf6221UL, 0x798074a4UL, 0x78421e93UL, 0x7a04a0caUL, 0x7bc6cafdUL, | |||
0x6cbc2eb0UL, 0x6d7e4487UL, 0x6f38fadeUL, 0x6efa90e9UL, 0x6bb5866cUL, | |||
0x6a77ec5bUL, 0x68315202UL, 0x69f33835UL, 0x62af7f08UL, 0x636d153fUL, | |||
0x612bab66UL, 0x60e9c151UL, 0x65a6d7d4UL, 0x6464bde3UL, 0x662203baUL, | |||
0x67e0698dUL, 0x48d7cb20UL, 0x4915a117UL, 0x4b531f4eUL, 0x4a917579UL, | |||
0x4fde63fcUL, 0x4e1c09cbUL, 0x4c5ab792UL, 0x4d98dda5UL, 0x46c49a98UL, | |||
0x4706f0afUL, 0x45404ef6UL, 0x448224c1UL, 0x41cd3244UL, 0x400f5873UL, | |||
0x4249e62aUL, 0x438b8c1dUL, 0x54f16850UL, 0x55330267UL, 0x5775bc3eUL, | |||
0x56b7d609UL, 0x53f8c08cUL, 0x523aaabbUL, 0x507c14e2UL, 0x51be7ed5UL, | |||
0x5ae239e8UL, 0x5b2053dfUL, 0x5966ed86UL, 0x58a487b1UL, 0x5deb9134UL, | |||
0x5c29fb03UL, 0x5e6f455aUL, 0x5fad2f6dUL, 0xe1351b80UL, 0xe0f771b7UL, | |||
0xe2b1cfeeUL, 0xe373a5d9UL, 0xe63cb35cUL, 0xe7fed96bUL, 0xe5b86732UL, | |||
0xe47a0d05UL, 0xef264a38UL, 0xeee4200fUL, 0xeca29e56UL, 0xed60f461UL, | |||
0xe82fe2e4UL, 0xe9ed88d3UL, 0xebab368aUL, 0xea695cbdUL, 0xfd13b8f0UL, | |||
0xfcd1d2c7UL, 0xfe976c9eUL, 0xff5506a9UL, 0xfa1a102cUL, 0xfbd87a1bUL, | |||
0xf99ec442UL, 0xf85cae75UL, 0xf300e948UL, 0xf2c2837fUL, 0xf0843d26UL, | |||
0xf1465711UL, 0xf4094194UL, 0xf5cb2ba3UL, 0xf78d95faUL, 0xf64fffcdUL, | |||
0xd9785d60UL, 0xd8ba3757UL, 0xdafc890eUL, 0xdb3ee339UL, 0xde71f5bcUL, | |||
0xdfb39f8bUL, 0xddf521d2UL, 0xdc374be5UL, 0xd76b0cd8UL, 0xd6a966efUL, | |||
0xd4efd8b6UL, 0xd52db281UL, 0xd062a404UL, 0xd1a0ce33UL, 0xd3e6706aUL, | |||
0xd2241a5dUL, 0xc55efe10UL, 0xc49c9427UL, 0xc6da2a7eUL, 0xc7184049UL, | |||
0xc25756ccUL, 0xc3953cfbUL, 0xc1d382a2UL, 0xc011e895UL, 0xcb4dafa8UL, | |||
0xca8fc59fUL, 0xc8c97bc6UL, 0xc90b11f1UL, 0xcc440774UL, 0xcd866d43UL, | |||
0xcfc0d31aUL, 0xce02b92dUL, 0x91af9640UL, 0x906dfc77UL, 0x922b422eUL, | |||
0x93e92819UL, 0x96a63e9cUL, 0x976454abUL, 0x9522eaf2UL, 0x94e080c5UL, | |||
0x9fbcc7f8UL, 0x9e7eadcfUL, 0x9c381396UL, 0x9dfa79a1UL, 0x98b56f24UL, | |||
0x99770513UL, 0x9b31bb4aUL, 0x9af3d17dUL, 0x8d893530UL, 0x8c4b5f07UL, | |||
0x8e0de15eUL, 0x8fcf8b69UL, 0x8a809decUL, 0x8b42f7dbUL, 0x89044982UL, | |||
0x88c623b5UL, 0x839a6488UL, 0x82580ebfUL, 0x801eb0e6UL, 0x81dcdad1UL, | |||
0x8493cc54UL, 0x8551a663UL, 0x8717183aUL, 0x86d5720dUL, 0xa9e2d0a0UL, | |||
0xa820ba97UL, 0xaa6604ceUL, 0xaba46ef9UL, 0xaeeb787cUL, 0xaf29124bUL, | |||
0xad6fac12UL, 0xacadc625UL, 0xa7f18118UL, 0xa633eb2fUL, 0xa4755576UL, | |||
0xa5b73f41UL, 0xa0f829c4UL, 0xa13a43f3UL, 0xa37cfdaaUL, 0xa2be979dUL, | |||
0xb5c473d0UL, 0xb40619e7UL, 0xb640a7beUL, 0xb782cd89UL, 0xb2cddb0cUL, | |||
0xb30fb13bUL, 0xb1490f62UL, 0xb08b6555UL, 0xbbd72268UL, 0xba15485fUL, | |||
0xb853f606UL, 0xb9919c31UL, 0xbcde8ab4UL, 0xbd1ce083UL, 0xbf5a5edaUL, | |||
0xbe9834edUL | |||
}, | |||
{ | |||
0x00000000UL, 0xb8bc6765UL, 0xaa09c88bUL, 0x12b5afeeUL, 0x8f629757UL, | |||
0x37def032UL, 0x256b5fdcUL, 0x9dd738b9UL, 0xc5b428efUL, 0x7d084f8aUL, | |||
0x6fbde064UL, 0xd7018701UL, 0x4ad6bfb8UL, 0xf26ad8ddUL, 0xe0df7733UL, | |||
0x58631056UL, 0x5019579fUL, 0xe8a530faUL, 0xfa109f14UL, 0x42acf871UL, | |||
0xdf7bc0c8UL, 0x67c7a7adUL, 0x75720843UL, 0xcdce6f26UL, 0x95ad7f70UL, | |||
0x2d111815UL, 0x3fa4b7fbUL, 0x8718d09eUL, 0x1acfe827UL, 0xa2738f42UL, | |||
0xb0c620acUL, 0x087a47c9UL, 0xa032af3eUL, 0x188ec85bUL, 0x0a3b67b5UL, | |||
0xb28700d0UL, 0x2f503869UL, 0x97ec5f0cUL, 0x8559f0e2UL, 0x3de59787UL, | |||
0x658687d1UL, 0xdd3ae0b4UL, 0xcf8f4f5aUL, 0x7733283fUL, 0xeae41086UL, | |||
0x525877e3UL, 0x40edd80dUL, 0xf851bf68UL, 0xf02bf8a1UL, 0x48979fc4UL, | |||
0x5a22302aUL, 0xe29e574fUL, 0x7f496ff6UL, 0xc7f50893UL, 0xd540a77dUL, | |||
0x6dfcc018UL, 0x359fd04eUL, 0x8d23b72bUL, 0x9f9618c5UL, 0x272a7fa0UL, | |||
0xbafd4719UL, 0x0241207cUL, 0x10f48f92UL, 0xa848e8f7UL, 0x9b14583dUL, | |||
0x23a83f58UL, 0x311d90b6UL, 0x89a1f7d3UL, 0x1476cf6aUL, 0xaccaa80fUL, | |||
0xbe7f07e1UL, 0x06c36084UL, 0x5ea070d2UL, 0xe61c17b7UL, 0xf4a9b859UL, | |||
0x4c15df3cUL, 0xd1c2e785UL, 0x697e80e0UL, 0x7bcb2f0eUL, 0xc377486bUL, | |||
0xcb0d0fa2UL, 0x73b168c7UL, 0x6104c729UL, 0xd9b8a04cUL, 0x446f98f5UL, | |||
0xfcd3ff90UL, 0xee66507eUL, 0x56da371bUL, 0x0eb9274dUL, 0xb6054028UL, | |||
0xa4b0efc6UL, 0x1c0c88a3UL, 0x81dbb01aUL, 0x3967d77fUL, 0x2bd27891UL, | |||
0x936e1ff4UL, 0x3b26f703UL, 0x839a9066UL, 0x912f3f88UL, 0x299358edUL, | |||
0xb4446054UL, 0x0cf80731UL, 0x1e4da8dfUL, 0xa6f1cfbaUL, 0xfe92dfecUL, | |||
0x462eb889UL, 0x549b1767UL, 0xec277002UL, 0x71f048bbUL, 0xc94c2fdeUL, | |||
0xdbf98030UL, 0x6345e755UL, 0x6b3fa09cUL, 0xd383c7f9UL, 0xc1366817UL, | |||
0x798a0f72UL, 0xe45d37cbUL, 0x5ce150aeUL, 0x4e54ff40UL, 0xf6e89825UL, | |||
0xae8b8873UL, 0x1637ef16UL, 0x048240f8UL, 0xbc3e279dUL, 0x21e91f24UL, | |||
0x99557841UL, 0x8be0d7afUL, 0x335cb0caUL, 0xed59b63bUL, 0x55e5d15eUL, | |||
0x47507eb0UL, 0xffec19d5UL, 0x623b216cUL, 0xda874609UL, 0xc832e9e7UL, | |||
0x708e8e82UL, 0x28ed9ed4UL, 0x9051f9b1UL, 0x82e4565fUL, 0x3a58313aUL, | |||
0xa78f0983UL, 0x1f336ee6UL, 0x0d86c108UL, 0xb53aa66dUL, 0xbd40e1a4UL, | |||
0x05fc86c1UL, 0x1749292fUL, 0xaff54e4aUL, 0x322276f3UL, 0x8a9e1196UL, | |||
0x982bbe78UL, 0x2097d91dUL, 0x78f4c94bUL, 0xc048ae2eUL, 0xd2fd01c0UL, | |||
0x6a4166a5UL, 0xf7965e1cUL, 0x4f2a3979UL, 0x5d9f9697UL, 0xe523f1f2UL, | |||
0x4d6b1905UL, 0xf5d77e60UL, 0xe762d18eUL, 0x5fdeb6ebUL, 0xc2098e52UL, | |||
0x7ab5e937UL, 0x680046d9UL, 0xd0bc21bcUL, 0x88df31eaUL, 0x3063568fUL, | |||
0x22d6f961UL, 0x9a6a9e04UL, 0x07bda6bdUL, 0xbf01c1d8UL, 0xadb46e36UL, | |||
0x15080953UL, 0x1d724e9aUL, 0xa5ce29ffUL, 0xb77b8611UL, 0x0fc7e174UL, | |||
0x9210d9cdUL, 0x2aacbea8UL, 0x38191146UL, 0x80a57623UL, 0xd8c66675UL, | |||
0x607a0110UL, 0x72cfaefeUL, 0xca73c99bUL, 0x57a4f122UL, 0xef189647UL, | |||
0xfdad39a9UL, 0x45115eccUL, 0x764dee06UL, 0xcef18963UL, 0xdc44268dUL, | |||
0x64f841e8UL, 0xf92f7951UL, 0x41931e34UL, 0x5326b1daUL, 0xeb9ad6bfUL, | |||
0xb3f9c6e9UL, 0x0b45a18cUL, 0x19f00e62UL, 0xa14c6907UL, 0x3c9b51beUL, | |||
0x842736dbUL, 0x96929935UL, 0x2e2efe50UL, 0x2654b999UL, 0x9ee8defcUL, | |||
0x8c5d7112UL, 0x34e11677UL, 0xa9362eceUL, 0x118a49abUL, 0x033fe645UL, | |||
0xbb838120UL, 0xe3e09176UL, 0x5b5cf613UL, 0x49e959fdUL, 0xf1553e98UL, | |||
0x6c820621UL, 0xd43e6144UL, 0xc68bceaaUL, 0x7e37a9cfUL, 0xd67f4138UL, | |||
0x6ec3265dUL, 0x7c7689b3UL, 0xc4caeed6UL, 0x591dd66fUL, 0xe1a1b10aUL, | |||
0xf3141ee4UL, 0x4ba87981UL, 0x13cb69d7UL, 0xab770eb2UL, 0xb9c2a15cUL, | |||
0x017ec639UL, 0x9ca9fe80UL, 0x241599e5UL, 0x36a0360bUL, 0x8e1c516eUL, | |||
0x866616a7UL, 0x3eda71c2UL, 0x2c6fde2cUL, 0x94d3b949UL, 0x090481f0UL, | |||
0xb1b8e695UL, 0xa30d497bUL, 0x1bb12e1eUL, 0x43d23e48UL, 0xfb6e592dUL, | |||
0xe9dbf6c3UL, 0x516791a6UL, 0xccb0a91fUL, 0x740cce7aUL, 0x66b96194UL, | |||
0xde0506f1UL | |||
}, | |||
{ | |||
0x00000000UL, 0x96300777UL, 0x2c610eeeUL, 0xba510999UL, 0x19c46d07UL, | |||
0x8ff46a70UL, 0x35a563e9UL, 0xa395649eUL, 0x3288db0eUL, 0xa4b8dc79UL, | |||
0x1ee9d5e0UL, 0x88d9d297UL, 0x2b4cb609UL, 0xbd7cb17eUL, 0x072db8e7UL, | |||
0x911dbf90UL, 0x6410b71dUL, 0xf220b06aUL, 0x4871b9f3UL, 0xde41be84UL, | |||
0x7dd4da1aUL, 0xebe4dd6dUL, 0x51b5d4f4UL, 0xc785d383UL, 0x56986c13UL, | |||
0xc0a86b64UL, 0x7af962fdUL, 0xecc9658aUL, 0x4f5c0114UL, 0xd96c0663UL, | |||
0x633d0ffaUL, 0xf50d088dUL, 0xc8206e3bUL, 0x5e10694cUL, 0xe44160d5UL, | |||
0x727167a2UL, 0xd1e4033cUL, 0x47d4044bUL, 0xfd850dd2UL, 0x6bb50aa5UL, | |||
0xfaa8b535UL, 0x6c98b242UL, 0xd6c9bbdbUL, 0x40f9bcacUL, 0xe36cd832UL, | |||
0x755cdf45UL, 0xcf0dd6dcUL, 0x593dd1abUL, 0xac30d926UL, 0x3a00de51UL, | |||
0x8051d7c8UL, 0x1661d0bfUL, 0xb5f4b421UL, 0x23c4b356UL, 0x9995bacfUL, | |||
0x0fa5bdb8UL, 0x9eb80228UL, 0x0888055fUL, 0xb2d90cc6UL, 0x24e90bb1UL, | |||
0x877c6f2fUL, 0x114c6858UL, 0xab1d61c1UL, 0x3d2d66b6UL, 0x9041dc76UL, | |||
0x0671db01UL, 0xbc20d298UL, 0x2a10d5efUL, 0x8985b171UL, 0x1fb5b606UL, | |||
0xa5e4bf9fUL, 0x33d4b8e8UL, 0xa2c90778UL, 0x34f9000fUL, 0x8ea80996UL, | |||
0x18980ee1UL, 0xbb0d6a7fUL, 0x2d3d6d08UL, 0x976c6491UL, 0x015c63e6UL, | |||
0xf4516b6bUL, 0x62616c1cUL, 0xd8306585UL, 0x4e0062f2UL, 0xed95066cUL, | |||
0x7ba5011bUL, 0xc1f40882UL, 0x57c40ff5UL, 0xc6d9b065UL, 0x50e9b712UL, | |||
0xeab8be8bUL, 0x7c88b9fcUL, 0xdf1ddd62UL, 0x492dda15UL, 0xf37cd38cUL, | |||
0x654cd4fbUL, 0x5861b24dUL, 0xce51b53aUL, 0x7400bca3UL, 0xe230bbd4UL, | |||
0x41a5df4aUL, 0xd795d83dUL, 0x6dc4d1a4UL, 0xfbf4d6d3UL, 0x6ae96943UL, | |||
0xfcd96e34UL, 0x468867adUL, 0xd0b860daUL, 0x732d0444UL, 0xe51d0333UL, | |||
0x5f4c0aaaUL, 0xc97c0dddUL, 0x3c710550UL, 0xaa410227UL, 0x10100bbeUL, | |||
0x86200cc9UL, 0x25b56857UL, 0xb3856f20UL, 0x09d466b9UL, 0x9fe461ceUL, | |||
0x0ef9de5eUL, 0x98c9d929UL, 0x2298d0b0UL, 0xb4a8d7c7UL, 0x173db359UL, | |||
0x810db42eUL, 0x3b5cbdb7UL, 0xad6cbac0UL, 0x2083b8edUL, 0xb6b3bf9aUL, | |||
0x0ce2b603UL, 0x9ad2b174UL, 0x3947d5eaUL, 0xaf77d29dUL, 0x1526db04UL, | |||
0x8316dc73UL, 0x120b63e3UL, 0x843b6494UL, 0x3e6a6d0dUL, 0xa85a6a7aUL, | |||
0x0bcf0ee4UL, 0x9dff0993UL, 0x27ae000aUL, 0xb19e077dUL, 0x44930ff0UL, | |||
0xd2a30887UL, 0x68f2011eUL, 0xfec20669UL, 0x5d5762f7UL, 0xcb676580UL, | |||
0x71366c19UL, 0xe7066b6eUL, 0x761bd4feUL, 0xe02bd389UL, 0x5a7ada10UL, | |||
0xcc4add67UL, 0x6fdfb9f9UL, 0xf9efbe8eUL, 0x43beb717UL, 0xd58eb060UL, | |||
0xe8a3d6d6UL, 0x7e93d1a1UL, 0xc4c2d838UL, 0x52f2df4fUL, 0xf167bbd1UL, | |||
0x6757bca6UL, 0xdd06b53fUL, 0x4b36b248UL, 0xda2b0dd8UL, 0x4c1b0aafUL, | |||
0xf64a0336UL, 0x607a0441UL, 0xc3ef60dfUL, 0x55df67a8UL, 0xef8e6e31UL, | |||
0x79be6946UL, 0x8cb361cbUL, 0x1a8366bcUL, 0xa0d26f25UL, 0x36e26852UL, | |||
0x95770cccUL, 0x03470bbbUL, 0xb9160222UL, 0x2f260555UL, 0xbe3bbac5UL, | |||
0x280bbdb2UL, 0x925ab42bUL, 0x046ab35cUL, 0xa7ffd7c2UL, 0x31cfd0b5UL, | |||
0x8b9ed92cUL, 0x1daede5bUL, 0xb0c2649bUL, 0x26f263ecUL, 0x9ca36a75UL, | |||
0x0a936d02UL, 0xa906099cUL, 0x3f360eebUL, 0x85670772UL, 0x13570005UL, | |||
0x824abf95UL, 0x147ab8e2UL, 0xae2bb17bUL, 0x381bb60cUL, 0x9b8ed292UL, | |||
0x0dbed5e5UL, 0xb7efdc7cUL, 0x21dfdb0bUL, 0xd4d2d386UL, 0x42e2d4f1UL, | |||
0xf8b3dd68UL, 0x6e83da1fUL, 0xcd16be81UL, 0x5b26b9f6UL, 0xe177b06fUL, | |||
0x7747b718UL, 0xe65a0888UL, 0x706a0fffUL, 0xca3b0666UL, 0x5c0b0111UL, | |||
0xff9e658fUL, 0x69ae62f8UL, 0xd3ff6b61UL, 0x45cf6c16UL, 0x78e20aa0UL, | |||
0xeed20dd7UL, 0x5483044eUL, 0xc2b30339UL, 0x612667a7UL, 0xf71660d0UL, | |||
0x4d476949UL, 0xdb776e3eUL, 0x4a6ad1aeUL, 0xdc5ad6d9UL, 0x660bdf40UL, | |||
0xf03bd837UL, 0x53aebca9UL, 0xc59ebbdeUL, 0x7fcfb247UL, 0xe9ffb530UL, | |||
0x1cf2bdbdUL, 0x8ac2bacaUL, 0x3093b353UL, 0xa6a3b424UL, 0x0536d0baUL, | |||
0x9306d7cdUL, 0x2957de54UL, 0xbf67d923UL, 0x2e7a66b3UL, 0xb84a61c4UL, | |||
0x021b685dUL, 0x942b6f2aUL, 0x37be0bb4UL, 0xa18e0cc3UL, 0x1bdf055aUL, | |||
0x8def022dUL | |||
}, | |||
{ | |||
0x00000000UL, 0x41311b19UL, 0x82623632UL, 0xc3532d2bUL, 0x04c56c64UL, | |||
0x45f4777dUL, 0x86a75a56UL, 0xc796414fUL, 0x088ad9c8UL, 0x49bbc2d1UL, | |||
0x8ae8effaUL, 0xcbd9f4e3UL, 0x0c4fb5acUL, 0x4d7eaeb5UL, 0x8e2d839eUL, | |||
0xcf1c9887UL, 0x5112c24aUL, 0x1023d953UL, 0xd370f478UL, 0x9241ef61UL, | |||
0x55d7ae2eUL, 0x14e6b537UL, 0xd7b5981cUL, 0x96848305UL, 0x59981b82UL, | |||
0x18a9009bUL, 0xdbfa2db0UL, 0x9acb36a9UL, 0x5d5d77e6UL, 0x1c6c6cffUL, | |||
0xdf3f41d4UL, 0x9e0e5acdUL, 0xa2248495UL, 0xe3159f8cUL, 0x2046b2a7UL, | |||
0x6177a9beUL, 0xa6e1e8f1UL, 0xe7d0f3e8UL, 0x2483dec3UL, 0x65b2c5daUL, | |||
0xaaae5d5dUL, 0xeb9f4644UL, 0x28cc6b6fUL, 0x69fd7076UL, 0xae6b3139UL, | |||
0xef5a2a20UL, 0x2c09070bUL, 0x6d381c12UL, 0xf33646dfUL, 0xb2075dc6UL, | |||
0x715470edUL, 0x30656bf4UL, 0xf7f32abbUL, 0xb6c231a2UL, 0x75911c89UL, | |||
0x34a00790UL, 0xfbbc9f17UL, 0xba8d840eUL, 0x79dea925UL, 0x38efb23cUL, | |||
0xff79f373UL, 0xbe48e86aUL, 0x7d1bc541UL, 0x3c2ade58UL, 0x054f79f0UL, | |||
0x447e62e9UL, 0x872d4fc2UL, 0xc61c54dbUL, 0x018a1594UL, 0x40bb0e8dUL, | |||
0x83e823a6UL, 0xc2d938bfUL, 0x0dc5a038UL, 0x4cf4bb21UL, 0x8fa7960aUL, | |||
0xce968d13UL, 0x0900cc5cUL, 0x4831d745UL, 0x8b62fa6eUL, 0xca53e177UL, | |||
0x545dbbbaUL, 0x156ca0a3UL, 0xd63f8d88UL, 0x970e9691UL, 0x5098d7deUL, | |||
0x11a9ccc7UL, 0xd2fae1ecUL, 0x93cbfaf5UL, 0x5cd76272UL, 0x1de6796bUL, | |||
0xdeb55440UL, 0x9f844f59UL, 0x58120e16UL, 0x1923150fUL, 0xda703824UL, | |||
0x9b41233dUL, 0xa76bfd65UL, 0xe65ae67cUL, 0x2509cb57UL, 0x6438d04eUL, | |||
0xa3ae9101UL, 0xe29f8a18UL, 0x21cca733UL, 0x60fdbc2aUL, 0xafe124adUL, | |||
0xeed03fb4UL, 0x2d83129fUL, 0x6cb20986UL, 0xab2448c9UL, 0xea1553d0UL, | |||
0x29467efbUL, 0x687765e2UL, 0xf6793f2fUL, 0xb7482436UL, 0x741b091dUL, | |||
0x352a1204UL, 0xf2bc534bUL, 0xb38d4852UL, 0x70de6579UL, 0x31ef7e60UL, | |||
0xfef3e6e7UL, 0xbfc2fdfeUL, 0x7c91d0d5UL, 0x3da0cbccUL, 0xfa368a83UL, | |||
0xbb07919aUL, 0x7854bcb1UL, 0x3965a7a8UL, 0x4b98833bUL, 0x0aa99822UL, | |||
0xc9fab509UL, 0x88cbae10UL, 0x4f5def5fUL, 0x0e6cf446UL, 0xcd3fd96dUL, | |||
0x8c0ec274UL, 0x43125af3UL, 0x022341eaUL, 0xc1706cc1UL, 0x804177d8UL, | |||
0x47d73697UL, 0x06e62d8eUL, 0xc5b500a5UL, 0x84841bbcUL, 0x1a8a4171UL, | |||
0x5bbb5a68UL, 0x98e87743UL, 0xd9d96c5aUL, 0x1e4f2d15UL, 0x5f7e360cUL, | |||
0x9c2d1b27UL, 0xdd1c003eUL, 0x120098b9UL, 0x533183a0UL, 0x9062ae8bUL, | |||
0xd153b592UL, 0x16c5f4ddUL, 0x57f4efc4UL, 0x94a7c2efUL, 0xd596d9f6UL, | |||
0xe9bc07aeUL, 0xa88d1cb7UL, 0x6bde319cUL, 0x2aef2a85UL, 0xed796bcaUL, | |||
0xac4870d3UL, 0x6f1b5df8UL, 0x2e2a46e1UL, 0xe136de66UL, 0xa007c57fUL, | |||
0x6354e854UL, 0x2265f34dUL, 0xe5f3b202UL, 0xa4c2a91bUL, 0x67918430UL, | |||
0x26a09f29UL, 0xb8aec5e4UL, 0xf99fdefdUL, 0x3accf3d6UL, 0x7bfde8cfUL, | |||
0xbc6ba980UL, 0xfd5ab299UL, 0x3e099fb2UL, 0x7f3884abUL, 0xb0241c2cUL, | |||
0xf1150735UL, 0x32462a1eUL, 0x73773107UL, 0xb4e17048UL, 0xf5d06b51UL, | |||
0x3683467aUL, 0x77b25d63UL, 0x4ed7facbUL, 0x0fe6e1d2UL, 0xccb5ccf9UL, | |||
0x8d84d7e0UL, 0x4a1296afUL, 0x0b238db6UL, 0xc870a09dUL, 0x8941bb84UL, | |||
0x465d2303UL, 0x076c381aUL, 0xc43f1531UL, 0x850e0e28UL, 0x42984f67UL, | |||
0x03a9547eUL, 0xc0fa7955UL, 0x81cb624cUL, 0x1fc53881UL, 0x5ef42398UL, | |||
0x9da70eb3UL, 0xdc9615aaUL, 0x1b0054e5UL, 0x5a314ffcUL, 0x996262d7UL, | |||
0xd85379ceUL, 0x174fe149UL, 0x567efa50UL, 0x952dd77bUL, 0xd41ccc62UL, | |||
0x138a8d2dUL, 0x52bb9634UL, 0x91e8bb1fUL, 0xd0d9a006UL, 0xecf37e5eUL, | |||
0xadc26547UL, 0x6e91486cUL, 0x2fa05375UL, 0xe836123aUL, 0xa9070923UL, | |||
0x6a542408UL, 0x2b653f11UL, 0xe479a796UL, 0xa548bc8fUL, 0x661b91a4UL, | |||
0x272a8abdUL, 0xe0bccbf2UL, 0xa18dd0ebUL, 0x62defdc0UL, 0x23efe6d9UL, | |||
0xbde1bc14UL, 0xfcd0a70dUL, 0x3f838a26UL, 0x7eb2913fUL, 0xb924d070UL, | |||
0xf815cb69UL, 0x3b46e642UL, 0x7a77fd5bUL, 0xb56b65dcUL, 0xf45a7ec5UL, | |||
0x370953eeUL, 0x763848f7UL, 0xb1ae09b8UL, 0xf09f12a1UL, 0x33cc3f8aUL, | |||
0x72fd2493UL | |||
}, | |||
{ | |||
0x00000000UL, 0x376ac201UL, 0x6ed48403UL, 0x59be4602UL, 0xdca80907UL, | |||
0xebc2cb06UL, 0xb27c8d04UL, 0x85164f05UL, 0xb851130eUL, 0x8f3bd10fUL, | |||
0xd685970dUL, 0xe1ef550cUL, 0x64f91a09UL, 0x5393d808UL, 0x0a2d9e0aUL, | |||
0x3d475c0bUL, 0x70a3261cUL, 0x47c9e41dUL, 0x1e77a21fUL, 0x291d601eUL, | |||
0xac0b2f1bUL, 0x9b61ed1aUL, 0xc2dfab18UL, 0xf5b56919UL, 0xc8f23512UL, | |||
0xff98f713UL, 0xa626b111UL, 0x914c7310UL, 0x145a3c15UL, 0x2330fe14UL, | |||
0x7a8eb816UL, 0x4de47a17UL, 0xe0464d38UL, 0xd72c8f39UL, 0x8e92c93bUL, | |||
0xb9f80b3aUL, 0x3cee443fUL, 0x0b84863eUL, 0x523ac03cUL, 0x6550023dUL, | |||
0x58175e36UL, 0x6f7d9c37UL, 0x36c3da35UL, 0x01a91834UL, 0x84bf5731UL, | |||
0xb3d59530UL, 0xea6bd332UL, 0xdd011133UL, 0x90e56b24UL, 0xa78fa925UL, | |||
0xfe31ef27UL, 0xc95b2d26UL, 0x4c4d6223UL, 0x7b27a022UL, 0x2299e620UL, | |||
0x15f32421UL, 0x28b4782aUL, 0x1fdeba2bUL, 0x4660fc29UL, 0x710a3e28UL, | |||
0xf41c712dUL, 0xc376b32cUL, 0x9ac8f52eUL, 0xada2372fUL, 0xc08d9a70UL, | |||
0xf7e75871UL, 0xae591e73UL, 0x9933dc72UL, 0x1c259377UL, 0x2b4f5176UL, | |||
0x72f11774UL, 0x459bd575UL, 0x78dc897eUL, 0x4fb64b7fUL, 0x16080d7dUL, | |||
0x2162cf7cUL, 0xa4748079UL, 0x931e4278UL, 0xcaa0047aUL, 0xfdcac67bUL, | |||
0xb02ebc6cUL, 0x87447e6dUL, 0xdefa386fUL, 0xe990fa6eUL, 0x6c86b56bUL, | |||
0x5bec776aUL, 0x02523168UL, 0x3538f369UL, 0x087faf62UL, 0x3f156d63UL, | |||
0x66ab2b61UL, 0x51c1e960UL, 0xd4d7a665UL, 0xe3bd6464UL, 0xba032266UL, | |||
0x8d69e067UL, 0x20cbd748UL, 0x17a11549UL, 0x4e1f534bUL, 0x7975914aUL, | |||
0xfc63de4fUL, 0xcb091c4eUL, 0x92b75a4cUL, 0xa5dd984dUL, 0x989ac446UL, | |||
0xaff00647UL, 0xf64e4045UL, 0xc1248244UL, 0x4432cd41UL, 0x73580f40UL, | |||
0x2ae64942UL, 0x1d8c8b43UL, 0x5068f154UL, 0x67023355UL, 0x3ebc7557UL, | |||
0x09d6b756UL, 0x8cc0f853UL, 0xbbaa3a52UL, 0xe2147c50UL, 0xd57ebe51UL, | |||
0xe839e25aUL, 0xdf53205bUL, 0x86ed6659UL, 0xb187a458UL, 0x3491eb5dUL, | |||
0x03fb295cUL, 0x5a456f5eUL, 0x6d2fad5fUL, 0x801b35e1UL, 0xb771f7e0UL, | |||
0xeecfb1e2UL, 0xd9a573e3UL, 0x5cb33ce6UL, 0x6bd9fee7UL, 0x3267b8e5UL, | |||
0x050d7ae4UL, 0x384a26efUL, 0x0f20e4eeUL, 0x569ea2ecUL, 0x61f460edUL, | |||
0xe4e22fe8UL, 0xd388ede9UL, 0x8a36abebUL, 0xbd5c69eaUL, 0xf0b813fdUL, | |||
0xc7d2d1fcUL, 0x9e6c97feUL, 0xa90655ffUL, 0x2c101afaUL, 0x1b7ad8fbUL, | |||
0x42c49ef9UL, 0x75ae5cf8UL, 0x48e900f3UL, 0x7f83c2f2UL, 0x263d84f0UL, | |||
0x115746f1UL, 0x944109f4UL, 0xa32bcbf5UL, 0xfa958df7UL, 0xcdff4ff6UL, | |||
0x605d78d9UL, 0x5737bad8UL, 0x0e89fcdaUL, 0x39e33edbUL, 0xbcf571deUL, | |||
0x8b9fb3dfUL, 0xd221f5ddUL, 0xe54b37dcUL, 0xd80c6bd7UL, 0xef66a9d6UL, | |||
0xb6d8efd4UL, 0x81b22dd5UL, 0x04a462d0UL, 0x33cea0d1UL, 0x6a70e6d3UL, | |||
0x5d1a24d2UL, 0x10fe5ec5UL, 0x27949cc4UL, 0x7e2adac6UL, 0x494018c7UL, | |||
0xcc5657c2UL, 0xfb3c95c3UL, 0xa282d3c1UL, 0x95e811c0UL, 0xa8af4dcbUL, | |||
0x9fc58fcaUL, 0xc67bc9c8UL, 0xf1110bc9UL, 0x740744ccUL, 0x436d86cdUL, | |||
0x1ad3c0cfUL, 0x2db902ceUL, 0x4096af91UL, 0x77fc6d90UL, 0x2e422b92UL, | |||
0x1928e993UL, 0x9c3ea696UL, 0xab546497UL, 0xf2ea2295UL, 0xc580e094UL, | |||
0xf8c7bc9fUL, 0xcfad7e9eUL, 0x9613389cUL, 0xa179fa9dUL, 0x246fb598UL, | |||
0x13057799UL, 0x4abb319bUL, 0x7dd1f39aUL, 0x3035898dUL, 0x075f4b8cUL, | |||
0x5ee10d8eUL, 0x698bcf8fUL, 0xec9d808aUL, 0xdbf7428bUL, 0x82490489UL, | |||
0xb523c688UL, 0x88649a83UL, 0xbf0e5882UL, 0xe6b01e80UL, 0xd1dadc81UL, | |||
0x54cc9384UL, 0x63a65185UL, 0x3a181787UL, 0x0d72d586UL, 0xa0d0e2a9UL, | |||
0x97ba20a8UL, 0xce0466aaUL, 0xf96ea4abUL, 0x7c78ebaeUL, 0x4b1229afUL, | |||
0x12ac6fadUL, 0x25c6adacUL, 0x1881f1a7UL, 0x2feb33a6UL, 0x765575a4UL, | |||
0x413fb7a5UL, 0xc429f8a0UL, 0xf3433aa1UL, 0xaafd7ca3UL, 0x9d97bea2UL, | |||
0xd073c4b5UL, 0xe71906b4UL, 0xbea740b6UL, 0x89cd82b7UL, 0x0cdbcdb2UL, | |||
0x3bb10fb3UL, 0x620f49b1UL, 0x55658bb0UL, 0x6822d7bbUL, 0x5f4815baUL, | |||
0x06f653b8UL, 0x319c91b9UL, 0xb48adebcUL, 0x83e01cbdUL, 0xda5e5abfUL, | |||
0xed3498beUL | |||
}, | |||
{ | |||
0x00000000UL, 0x6567bcb8UL, 0x8bc809aaUL, 0xeeafb512UL, 0x5797628fUL, | |||
0x32f0de37UL, 0xdc5f6b25UL, 0xb938d79dUL, 0xef28b4c5UL, 0x8a4f087dUL, | |||
0x64e0bd6fUL, 0x018701d7UL, 0xb8bfd64aUL, 0xddd86af2UL, 0x3377dfe0UL, | |||
0x56106358UL, 0x9f571950UL, 0xfa30a5e8UL, 0x149f10faUL, 0x71f8ac42UL, | |||
0xc8c07bdfUL, 0xada7c767UL, 0x43087275UL, 0x266fcecdUL, 0x707fad95UL, | |||
0x1518112dUL, 0xfbb7a43fUL, 0x9ed01887UL, 0x27e8cf1aUL, 0x428f73a2UL, | |||
0xac20c6b0UL, 0xc9477a08UL, 0x3eaf32a0UL, 0x5bc88e18UL, 0xb5673b0aUL, | |||
0xd00087b2UL, 0x6938502fUL, 0x0c5fec97UL, 0xe2f05985UL, 0x8797e53dUL, | |||
0xd1878665UL, 0xb4e03addUL, 0x5a4f8fcfUL, 0x3f283377UL, 0x8610e4eaUL, | |||
0xe3775852UL, 0x0dd8ed40UL, 0x68bf51f8UL, 0xa1f82bf0UL, 0xc49f9748UL, | |||
0x2a30225aUL, 0x4f579ee2UL, 0xf66f497fUL, 0x9308f5c7UL, 0x7da740d5UL, | |||
0x18c0fc6dUL, 0x4ed09f35UL, 0x2bb7238dUL, 0xc518969fUL, 0xa07f2a27UL, | |||
0x1947fdbaUL, 0x7c204102UL, 0x928ff410UL, 0xf7e848a8UL, 0x3d58149bUL, | |||
0x583fa823UL, 0xb6901d31UL, 0xd3f7a189UL, 0x6acf7614UL, 0x0fa8caacUL, | |||
0xe1077fbeUL, 0x8460c306UL, 0xd270a05eUL, 0xb7171ce6UL, 0x59b8a9f4UL, | |||
0x3cdf154cUL, 0x85e7c2d1UL, 0xe0807e69UL, 0x0e2fcb7bUL, 0x6b4877c3UL, | |||
0xa20f0dcbUL, 0xc768b173UL, 0x29c70461UL, 0x4ca0b8d9UL, 0xf5986f44UL, | |||
0x90ffd3fcUL, 0x7e5066eeUL, 0x1b37da56UL, 0x4d27b90eUL, 0x284005b6UL, | |||
0xc6efb0a4UL, 0xa3880c1cUL, 0x1ab0db81UL, 0x7fd76739UL, 0x9178d22bUL, | |||
0xf41f6e93UL, 0x03f7263bUL, 0x66909a83UL, 0x883f2f91UL, 0xed589329UL, | |||
0x546044b4UL, 0x3107f80cUL, 0xdfa84d1eUL, 0xbacff1a6UL, 0xecdf92feUL, | |||
0x89b82e46UL, 0x67179b54UL, 0x027027ecUL, 0xbb48f071UL, 0xde2f4cc9UL, | |||
0x3080f9dbUL, 0x55e74563UL, 0x9ca03f6bUL, 0xf9c783d3UL, 0x176836c1UL, | |||
0x720f8a79UL, 0xcb375de4UL, 0xae50e15cUL, 0x40ff544eUL, 0x2598e8f6UL, | |||
0x73888baeUL, 0x16ef3716UL, 0xf8408204UL, 0x9d273ebcUL, 0x241fe921UL, | |||
0x41785599UL, 0xafd7e08bUL, 0xcab05c33UL, 0x3bb659edUL, 0x5ed1e555UL, | |||
0xb07e5047UL, 0xd519ecffUL, 0x6c213b62UL, 0x094687daUL, 0xe7e932c8UL, | |||
0x828e8e70UL, 0xd49eed28UL, 0xb1f95190UL, 0x5f56e482UL, 0x3a31583aUL, | |||
0x83098fa7UL, 0xe66e331fUL, 0x08c1860dUL, 0x6da63ab5UL, 0xa4e140bdUL, | |||
0xc186fc05UL, 0x2f294917UL, 0x4a4ef5afUL, 0xf3762232UL, 0x96119e8aUL, | |||
0x78be2b98UL, 0x1dd99720UL, 0x4bc9f478UL, 0x2eae48c0UL, 0xc001fdd2UL, | |||
0xa566416aUL, 0x1c5e96f7UL, 0x79392a4fUL, 0x97969f5dUL, 0xf2f123e5UL, | |||
0x05196b4dUL, 0x607ed7f5UL, 0x8ed162e7UL, 0xebb6de5fUL, 0x528e09c2UL, | |||
0x37e9b57aUL, 0xd9460068UL, 0xbc21bcd0UL, 0xea31df88UL, 0x8f566330UL, | |||
0x61f9d622UL, 0x049e6a9aUL, 0xbda6bd07UL, 0xd8c101bfUL, 0x366eb4adUL, | |||
0x53090815UL, 0x9a4e721dUL, 0xff29cea5UL, 0x11867bb7UL, 0x74e1c70fUL, | |||
0xcdd91092UL, 0xa8beac2aUL, 0x46111938UL, 0x2376a580UL, 0x7566c6d8UL, | |||
0x10017a60UL, 0xfeaecf72UL, 0x9bc973caUL, 0x22f1a457UL, 0x479618efUL, | |||
0xa939adfdUL, 0xcc5e1145UL, 0x06ee4d76UL, 0x6389f1ceUL, 0x8d2644dcUL, | |||
0xe841f864UL, 0x51792ff9UL, 0x341e9341UL, 0xdab12653UL, 0xbfd69aebUL, | |||
0xe9c6f9b3UL, 0x8ca1450bUL, 0x620ef019UL, 0x07694ca1UL, 0xbe519b3cUL, | |||
0xdb362784UL, 0x35999296UL, 0x50fe2e2eUL, 0x99b95426UL, 0xfcdee89eUL, | |||
0x12715d8cUL, 0x7716e134UL, 0xce2e36a9UL, 0xab498a11UL, 0x45e63f03UL, | |||
0x208183bbUL, 0x7691e0e3UL, 0x13f65c5bUL, 0xfd59e949UL, 0x983e55f1UL, | |||
0x2106826cUL, 0x44613ed4UL, 0xaace8bc6UL, 0xcfa9377eUL, 0x38417fd6UL, | |||
0x5d26c36eUL, 0xb389767cUL, 0xd6eecac4UL, 0x6fd61d59UL, 0x0ab1a1e1UL, | |||
0xe41e14f3UL, 0x8179a84bUL, 0xd769cb13UL, 0xb20e77abUL, 0x5ca1c2b9UL, | |||
0x39c67e01UL, 0x80fea99cUL, 0xe5991524UL, 0x0b36a036UL, 0x6e511c8eUL, | |||
0xa7166686UL, 0xc271da3eUL, 0x2cde6f2cUL, 0x49b9d394UL, 0xf0810409UL, | |||
0x95e6b8b1UL, 0x7b490da3UL, 0x1e2eb11bUL, 0x483ed243UL, 0x2d596efbUL, | |||
0xc3f6dbe9UL, 0xa6916751UL, 0x1fa9b0ccUL, 0x7ace0c74UL, 0x9461b966UL, | |||
0xf10605deUL | |||
#endif | |||
} | |||
}; |
@@ -1,342 +0,0 @@ | |||
/* deflate.h -- internal compression state | |||
* Copyright (C) 1995-2010 Jean-loup Gailly | |||
* For conditions of distribution and use, see copyright notice in zlib.h | |||
*/ | |||
/* WARNING: this file should *not* be used by applications. It is | |||
part of the implementation of the compression library and is | |||
subject to change. Applications should only use zlib.h. | |||
*/ | |||
/* @(#) $Id$ */ | |||
#ifndef DEFLATE_H | |||
#define DEFLATE_H | |||
#include "zutil.h" | |||
/* define NO_GZIP when compiling if you want to disable gzip header and | |||
trailer creation by deflate(). NO_GZIP would be used to avoid linking in | |||
the crc code when it is not needed. For shared libraries, gzip encoding | |||
should be left enabled. */ | |||
#ifndef NO_GZIP | |||
# define GZIP | |||
#endif | |||
/* =========================================================================== | |||
* Internal compression state. | |||
*/ | |||
#define LENGTH_CODES 29 | |||
/* number of length codes, not counting the special END_BLOCK code */ | |||
#define LITERALS 256 | |||
/* number of literal bytes 0..255 */ | |||
#define L_CODES (LITERALS+1+LENGTH_CODES) | |||
/* number of Literal or Length codes, including the END_BLOCK code */ | |||
#define D_CODES 30 | |||
/* number of distance codes */ | |||
#define BL_CODES 19 | |||
/* number of codes used to transfer the bit lengths */ | |||
#define HEAP_SIZE (2*L_CODES+1) | |||
/* maximum heap size */ | |||
#define MAX_BITS 15 | |||
/* All codes must not exceed MAX_BITS bits */ | |||
#define INIT_STATE 42 | |||
#define EXTRA_STATE 69 | |||
#define NAME_STATE 73 | |||
#define COMMENT_STATE 91 | |||
#define HCRC_STATE 103 | |||
#define BUSY_STATE 113 | |||
#define FINISH_STATE 666 | |||
/* Stream status */ | |||
/* Data structure describing a single value and its code string. */ | |||
typedef struct ct_data_s { | |||
union { | |||
ush freq; /* frequency count */ | |||
ush code; /* bit string */ | |||
} fc; | |||
union { | |||
ush dad; /* father node in Huffman tree */ | |||
ush len; /* length of bit string */ | |||
} dl; | |||
} FAR ct_data; | |||
#define Freq fc.freq | |||
#define Code fc.code | |||
#define Dad dl.dad | |||
#define Len dl.len | |||
typedef struct static_tree_desc_s static_tree_desc; | |||
typedef struct tree_desc_s { | |||
ct_data *dyn_tree; /* the dynamic tree */ | |||
int max_code; /* largest code with non zero frequency */ | |||
static_tree_desc *stat_desc; /* the corresponding static tree */ | |||
} FAR tree_desc; | |||
typedef ush Pos; | |||
typedef Pos FAR Posf; | |||
typedef unsigned IPos; | |||
/* A Pos is an index in the character window. We use short instead of int to | |||
* save space in the various tables. IPos is used only for parameter passing. | |||
*/ | |||
typedef struct internal_state { | |||
z_streamp strm; /* pointer back to this zlib stream */ | |||
int status; /* as the name implies */ | |||
Bytef *pending_buf; /* output still pending */ | |||
ulg pending_buf_size; /* size of pending_buf */ | |||
Bytef *pending_out; /* next pending byte to output to the stream */ | |||
uInt pending; /* nb of bytes in the pending buffer */ | |||
int wrap; /* bit 0 true for zlib, bit 1 true for gzip */ | |||
gz_headerp gzhead; /* gzip header information to write */ | |||
uInt gzindex; /* where in extra, name, or comment */ | |||
Byte method; /* STORED (for zip only) or DEFLATED */ | |||
int last_flush; /* value of flush param for previous deflate call */ | |||
/* used by deflate.c: */ | |||
uInt w_size; /* LZ77 window size (32K by default) */ | |||
uInt w_bits; /* log2(w_size) (8..16) */ | |||
uInt w_mask; /* w_size - 1 */ | |||
Bytef *window; | |||
/* Sliding window. Input bytes are read into the second half of the window, | |||
* and move to the first half later to keep a dictionary of at least wSize | |||
* bytes. With this organization, matches are limited to a distance of | |||
* wSize-MAX_MATCH bytes, but this ensures that IO is always | |||
* performed with a length multiple of the block size. Also, it limits | |||
* the window size to 64K, which is quite useful on MSDOS. | |||
* To do: use the user input buffer as sliding window. | |||
*/ | |||
ulg window_size; | |||
/* Actual size of window: 2*wSize, except when the user input buffer | |||
* is directly used as sliding window. | |||
*/ | |||
Posf *prev; | |||
/* Link to older string with same hash index. To limit the size of this | |||
* array to 64K, this link is maintained only for the last 32K strings. | |||
* An index in this array is thus a window index modulo 32K. | |||
*/ | |||
Posf *head; /* Heads of the hash chains or NIL. */ | |||
uInt ins_h; /* hash index of string to be inserted */ | |||
uInt hash_size; /* number of elements in hash table */ | |||
uInt hash_bits; /* log2(hash_size) */ | |||
uInt hash_mask; /* hash_size-1 */ | |||
uInt hash_shift; | |||
/* Number of bits by which ins_h must be shifted at each input | |||
* step. It must be such that after MIN_MATCH steps, the oldest | |||
* byte no longer takes part in the hash key, that is: | |||
* hash_shift * MIN_MATCH >= hash_bits | |||
*/ | |||
long block_start; | |||
/* Window position at the beginning of the current output block. Gets | |||
* negative when the window is moved backwards. | |||
*/ | |||
uInt match_length; /* length of best match */ | |||
IPos prev_match; /* previous match */ | |||
int match_available; /* set if previous match exists */ | |||
uInt strstart; /* start of string to insert */ | |||
uInt match_start; /* start of matching string */ | |||
uInt lookahead; /* number of valid bytes ahead in window */ | |||
uInt prev_length; | |||
/* Length of the best match at previous step. Matches not greater than this | |||
* are discarded. This is used in the lazy match evaluation. | |||
*/ | |||
uInt max_chain_length; | |||
/* To speed up deflation, hash chains are never searched beyond this | |||
* length. A higher limit improves compression ratio but degrades the | |||
* speed. | |||
*/ | |||
uInt max_lazy_match; | |||
/* Attempt to find a better match only when the current match is strictly | |||
* smaller than this value. This mechanism is used only for compression | |||
* levels >= 4. | |||
*/ | |||
# define max_insert_length max_lazy_match | |||
/* Insert new strings in the hash table only if the match length is not | |||
* greater than this length. This saves time but degrades compression. | |||
* max_insert_length is used only for compression levels <= 3. | |||
*/ | |||
int level; /* compression level (1..9) */ | |||
int strategy; /* favor or force Huffman coding*/ | |||
uInt good_match; | |||
/* Use a faster search when the previous match is longer than this */ | |||
int nice_match; /* Stop searching when current match exceeds this */ | |||
/* used by trees.c: */ | |||
/* Didn't use ct_data typedef below to supress compiler warning */ | |||
struct ct_data_s dyn_ltree[HEAP_SIZE]; /* literal and length tree */ | |||
struct ct_data_s dyn_dtree[2*D_CODES+1]; /* distance tree */ | |||
struct ct_data_s bl_tree[2*BL_CODES+1]; /* Huffman tree for bit lengths */ | |||
struct tree_desc_s l_desc; /* desc. for literal tree */ | |||
struct tree_desc_s d_desc; /* desc. for distance tree */ | |||
struct tree_desc_s bl_desc; /* desc. for bit length tree */ | |||
ush bl_count[MAX_BITS+1]; | |||
/* number of codes at each bit length for an optimal tree */ | |||
int heap[2*L_CODES+1]; /* heap used to build the Huffman trees */ | |||
int heap_len; /* number of elements in the heap */ | |||
int heap_max; /* element of largest frequency */ | |||
/* The sons of heap[n] are heap[2*n] and heap[2*n+1]. heap[0] is not used. | |||
* The same heap array is used to build all trees. | |||
*/ | |||
uch depth[2*L_CODES+1]; | |||
/* Depth of each subtree used as tie breaker for trees of equal frequency | |||
*/ | |||
uchf *l_buf; /* buffer for literals or lengths */ | |||
uInt lit_bufsize; | |||
/* Size of match buffer for literals/lengths. There are 4 reasons for | |||
* limiting lit_bufsize to 64K: | |||
* - frequencies can be kept in 16 bit counters | |||
* - if compression is not successful for the first block, all input | |||
* data is still in the window so we can still emit a stored block even | |||
* when input comes from standard input. (This can also be done for | |||
* all blocks if lit_bufsize is not greater than 32K.) | |||
* - if compression is not successful for a file smaller than 64K, we can | |||
* even emit a stored file instead of a stored block (saving 5 bytes). | |||
* This is applicable only for zip (not gzip or zlib). | |||
* - creating new Huffman trees less frequently may not provide fast | |||
* adaptation to changes in the input data statistics. (Take for | |||
* example a binary file with poorly compressible code followed by | |||
* a highly compressible string table.) Smaller buffer sizes give | |||
* fast adaptation but have of course the overhead of transmitting | |||
* trees more frequently. | |||
* - I can't count above 4 | |||
*/ | |||
uInt last_lit; /* running index in l_buf */ | |||
ushf *d_buf; | |||
/* Buffer for distances. To simplify the code, d_buf and l_buf have | |||
* the same number of elements. To use different lengths, an extra flag | |||
* array would be necessary. | |||
*/ | |||
ulg opt_len; /* bit length of current block with optimal trees */ | |||
ulg static_len; /* bit length of current block with static trees */ | |||
uInt matches; /* number of string matches in current block */ | |||
int last_eob_len; /* bit length of EOB code for last block */ | |||
#ifdef DEBUG | |||
ulg compressed_len; /* total bit length of compressed file mod 2^32 */ | |||
ulg bits_sent; /* bit length of compressed data sent mod 2^32 */ | |||
#endif | |||
ush bi_buf; | |||
/* Output buffer. bits are inserted starting at the bottom (least | |||
* significant bits). | |||
*/ | |||
int bi_valid; | |||
/* Number of valid bits in bi_buf. All bits above the last valid bit | |||
* are always zero. | |||
*/ | |||
ulg high_water; | |||
/* High water mark offset in window for initialized bytes -- bytes above | |||
* this are set to zero in order to avoid memory check warnings when | |||
* longest match routines access bytes past the input. This is then | |||
* updated to the new high water mark. | |||
*/ | |||
} FAR deflate_state; | |||
/* Output a byte on the stream. | |||
* IN assertion: there is enough room in pending_buf. | |||
*/ | |||
#define put_byte(s, c) {s->pending_buf[s->pending++] = (c);} | |||
#define MIN_LOOKAHEAD (MAX_MATCH+MIN_MATCH+1) | |||
/* Minimum amount of lookahead, except at the end of the input file. | |||
* See deflate.c for comments about the MIN_MATCH+1. | |||
*/ | |||
#define MAX_DIST(s) ((s)->w_size-MIN_LOOKAHEAD) | |||
/* In order to simplify the code, particularly on 16 bit machines, match | |||
* distances are limited to MAX_DIST instead of WSIZE. | |||
*/ | |||
#define WIN_INIT MAX_MATCH | |||
/* Number of bytes after end of data in window to initialize in order to avoid | |||
memory checker errors from longest match routines */ | |||
/* in trees.c */ | |||
void ZLIB_INTERNAL _tr_init OF((deflate_state *s)); | |||
int ZLIB_INTERNAL _tr_tally OF((deflate_state *s, unsigned dist, unsigned lc)); | |||
void ZLIB_INTERNAL _tr_flush_block OF((deflate_state *s, charf *buf, | |||
ulg stored_len, int last)); | |||
void ZLIB_INTERNAL _tr_align OF((deflate_state *s)); | |||
void ZLIB_INTERNAL _tr_stored_block OF((deflate_state *s, charf *buf, | |||
ulg stored_len, int last)); | |||
#define d_code(dist) \ | |||
((dist) < 256 ? _dist_code[dist] : _dist_code[256+((dist)>>7)]) | |||
/* Mapping from a distance to a distance code. dist is the distance - 1 and | |||
* must not have side effects. _dist_code[256] and _dist_code[257] are never | |||
* used. | |||
*/ | |||
#ifndef DEBUG | |||
/* Inline versions of _tr_tally for speed: */ | |||
#if defined(GEN_TREES_H) || !defined(STDC) | |||
extern uch ZLIB_INTERNAL _length_code[]; | |||
extern uch ZLIB_INTERNAL _dist_code[]; | |||
#else | |||
extern const uch ZLIB_INTERNAL _length_code[]; | |||
extern const uch ZLIB_INTERNAL _dist_code[]; | |||
#endif | |||
# define _tr_tally_lit(s, c, flush) \ | |||
{ uch cc = (c); \ | |||
s->d_buf[s->last_lit] = 0; \ | |||
s->l_buf[s->last_lit++] = cc; \ | |||
s->dyn_ltree[cc].Freq++; \ | |||
flush = (s->last_lit == s->lit_bufsize-1); \ | |||
} | |||
# define _tr_tally_dist(s, distance, length, flush) \ | |||
{ uch len = (length); \ | |||
ush dist = (distance); \ | |||
s->d_buf[s->last_lit] = dist; \ | |||
s->l_buf[s->last_lit++] = len; \ | |||
dist--; \ | |||
s->dyn_ltree[_length_code[len]+LITERALS+1].Freq++; \ | |||
s->dyn_dtree[d_code(dist)].Freq++; \ | |||
flush = (s->last_lit == s->lit_bufsize-1); \ | |||
} | |||
#else | |||
# define _tr_tally_lit(s, c, flush) flush = _tr_tally(s, 0, c) | |||
# define _tr_tally_dist(s, distance, length, flush) \ | |||
flush = _tr_tally(s, distance, length) | |||
#endif | |||
#endif /* DEFLATE_H */ |
@@ -1,25 +0,0 @@ | |||
/* gzclose.c -- zlib gzclose() function | |||
* Copyright (C) 2004, 2010 Mark Adler | |||
* For conditions of distribution and use, see copyright notice in zlib.h | |||
*/ | |||
#include "gzguts.h" | |||
/* gzclose() is in a separate file so that it is linked in only if it is used. | |||
That way the other gzclose functions can be used instead to avoid linking in | |||
unneeded compression or decompression routines. */ | |||
int ZEXPORT gzclose(file) | |||
gzFile file; | |||
{ | |||
#ifndef NO_GZCOMPRESS | |||
gz_statep state; | |||
if (file == NULL) | |||
return Z_STREAM_ERROR; | |||
state = (gz_statep)file; | |||
return state->mode == GZ_READ ? gzclose_r(file) : gzclose_w(file); | |||
#else | |||
return gzclose_r(file); | |||
#endif | |||
} |
@@ -1,132 +0,0 @@ | |||
/* gzguts.h -- zlib internal header definitions for gz* operations | |||
* Copyright (C) 2004, 2005, 2010 Mark Adler | |||
* For conditions of distribution and use, see copyright notice in zlib.h | |||
*/ | |||
#ifdef _LARGEFILE64_SOURCE | |||
# ifndef _LARGEFILE_SOURCE | |||
# define _LARGEFILE_SOURCE 1 | |||
# endif | |||
# ifdef _FILE_OFFSET_BITS | |||
# undef _FILE_OFFSET_BITS | |||
# endif | |||
#endif | |||
#if ((__GNUC__-0) * 10 + __GNUC_MINOR__-0 >= 33) && !defined(NO_VIZ) | |||
# define ZLIB_INTERNAL __attribute__((visibility ("hidden"))) | |||
#else | |||
# define ZLIB_INTERNAL | |||
#endif | |||
#include <stdio.h> | |||
#include "zlib.h" | |||
#ifdef STDC | |||
# include <string.h> | |||
# include <stdlib.h> | |||
# include <limits.h> | |||
#endif | |||
#include <fcntl.h> | |||
#ifdef NO_DEFLATE /* for compatibility with old definition */ | |||
# define NO_GZCOMPRESS | |||
#endif | |||
#ifdef _MSC_VER | |||
# include <io.h> | |||
# define vsnprintf _vsnprintf | |||
#endif | |||
#ifndef local | |||
# define local static | |||
#endif | |||
/* compile with -Dlocal if your debugger can't find static symbols */ | |||
/* gz* functions always use library allocation functions */ | |||
#ifndef STDC | |||
extern voidp malloc OF((uInt size)); | |||
extern void free OF((voidpf ptr)); | |||
#endif | |||
/* get errno and strerror definition */ | |||
#if defined UNDER_CE | |||
# include <windows.h> | |||
# define zstrerror() gz_strwinerror((DWORD)GetLastError()) | |||
#else | |||
# ifdef STDC | |||
# include <errno.h> | |||
# define zstrerror() strerror(errno) | |||
# else | |||
# define zstrerror() "stdio error (consult errno)" | |||
# endif | |||
#endif | |||
/* provide prototypes for these when building zlib without LFS */ | |||
#if !defined(_LARGEFILE64_SOURCE) || _LFS64_LARGEFILE-0 == 0 | |||
ZEXTERN gzFile ZEXPORT gzopen64 OF((const char *, const char *)); | |||
ZEXTERN z_off64_t ZEXPORT gzseek64 OF((gzFile, z_off64_t, int)); | |||
ZEXTERN z_off64_t ZEXPORT gztell64 OF((gzFile)); | |||
ZEXTERN z_off64_t ZEXPORT gzoffset64 OF((gzFile)); | |||
#endif | |||
/* default i/o buffer size -- double this for output when reading */ | |||
#define GZBUFSIZE 8192 | |||
/* gzip modes, also provide a little integrity check on the passed structure */ | |||
#define GZ_NONE 0 | |||
#define GZ_READ 7247 | |||
#define GZ_WRITE 31153 | |||
#define GZ_APPEND 1 /* mode set to GZ_WRITE after the file is opened */ | |||
/* values for gz_state how */ | |||
#define LOOK 0 /* look for a gzip header */ | |||
#define COPY 1 /* copy input directly */ | |||
#define GZIP 2 /* decompress a gzip stream */ | |||
/* internal gzip file state data structure */ | |||
typedef struct { | |||
/* used for both reading and writing */ | |||
int mode; /* see gzip modes above */ | |||
int fd; /* file descriptor */ | |||
char *path; /* path or fd for error messages */ | |||
z_off64_t pos; /* current position in uncompressed data */ | |||
unsigned size; /* buffer size, zero if not allocated yet */ | |||
unsigned want; /* requested buffer size, default is GZBUFSIZE */ | |||
unsigned char *in; /* input buffer */ | |||
unsigned char *out; /* output buffer (double-sized when reading) */ | |||
unsigned char *next; /* next output data to deliver or write */ | |||
/* just for reading */ | |||
unsigned have; /* amount of output data unused at next */ | |||
int eof; /* true if end of input file reached */ | |||
z_off64_t start; /* where the gzip data started, for rewinding */ | |||
z_off64_t raw; /* where the raw data started, for seeking */ | |||
int how; /* 0: get header, 1: copy, 2: decompress */ | |||
int direct; /* true if last read direct, false if gzip */ | |||
/* just for writing */ | |||
int level; /* compression level */ | |||
int strategy; /* compression strategy */ | |||
/* seek request */ | |||
z_off64_t skip; /* amount to skip (already rewound if backwards) */ | |||
int seek; /* true if seek request pending */ | |||
/* error information */ | |||
int err; /* error code */ | |||
char *msg; /* error message */ | |||
/* zlib inflate or deflate stream */ | |||
z_stream strm; /* stream structure in-place (not a pointer) */ | |||
} gz_state; | |||
typedef gz_state FAR *gz_statep; | |||
/* shared functions */ | |||
void ZLIB_INTERNAL gz_error OF((gz_statep, int, const char *)); | |||
#if defined UNDER_CE | |||
char ZLIB_INTERNAL *gz_strwinerror OF((DWORD error)); | |||
#endif | |||
/* GT_OFF(x), where x is an unsigned value, is true if x > maximum z_off64_t | |||
value -- needed when comparing unsigned to z_off64_t, which is signed | |||
(possible z_off64_t types off_t, off64_t, and long are all signed) */ | |||
#ifdef INT_MAX | |||
# define GT_OFF(x) (sizeof(int) == sizeof(z_off64_t) && (x) > INT_MAX) | |||
#else | |||
unsigned ZLIB_INTERNAL gz_intmax OF((void)); | |||
# define GT_OFF(x) (sizeof(int) == sizeof(z_off64_t) && (x) > gz_intmax()) | |||
#endif |
@@ -1,537 +0,0 @@ | |||
/* gzlib.c -- zlib functions common to reading and writing gzip files | |||
* Copyright (C) 2004, 2010 Mark Adler | |||
* For conditions of distribution and use, see copyright notice in zlib.h | |||
*/ | |||
#include "gzguts.h" | |||
#if defined(_LARGEFILE64_SOURCE) && _LFS64_LARGEFILE-0 | |||
# define LSEEK lseek64 | |||
#else | |||
# define LSEEK lseek | |||
#endif | |||
/* Local functions */ | |||
local void gz_reset OF((gz_statep)); | |||
local gzFile gz_open OF((const char *, int, const char *)); | |||
#if defined UNDER_CE | |||
/* Map the Windows error number in ERROR to a locale-dependent error message | |||
string and return a pointer to it. Typically, the values for ERROR come | |||
from GetLastError. | |||
The string pointed to shall not be modified by the application, but may be | |||
overwritten by a subsequent call to gz_strwinerror | |||
The gz_strwinerror function does not change the current setting of | |||
GetLastError. */ | |||
char ZLIB_INTERNAL *gz_strwinerror (error) | |||
DWORD error; | |||
{ | |||
static char buf[1024]; | |||
wchar_t *msgbuf; | |||
DWORD lasterr = GetLastError(); | |||
DWORD chars = FormatMessage(FORMAT_MESSAGE_FROM_SYSTEM | |||
| FORMAT_MESSAGE_ALLOCATE_BUFFER, | |||
NULL, | |||
error, | |||
0, /* Default language */ | |||
(LPVOID)&msgbuf, | |||
0, | |||
NULL); | |||
if (chars != 0) { | |||
/* If there is an \r\n appended, zap it. */ | |||
if (chars >= 2 | |||
&& msgbuf[chars - 2] == '\r' && msgbuf[chars - 1] == '\n') { | |||
chars -= 2; | |||
msgbuf[chars] = 0; | |||
} | |||
if (chars > sizeof (buf) - 1) { | |||
chars = sizeof (buf) - 1; | |||
msgbuf[chars] = 0; | |||
} | |||
wcstombs(buf, msgbuf, chars + 1); | |||
LocalFree(msgbuf); | |||
} | |||
else { | |||
sprintf(buf, "unknown win32 error (%ld)", error); | |||
} | |||
SetLastError(lasterr); | |||
return buf; | |||
} | |||
#endif /* UNDER_CE */ | |||
/* Reset gzip file state */ | |||
local void gz_reset(state) | |||
gz_statep state; | |||
{ | |||
if (state->mode == GZ_READ) { /* for reading ... */ | |||
state->have = 0; /* no output data available */ | |||
state->eof = 0; /* not at end of file */ | |||
state->how = LOOK; /* look for gzip header */ | |||
state->direct = 1; /* default for empty file */ | |||
} | |||
state->seek = 0; /* no seek request pending */ | |||
gz_error(state, Z_OK, NULL); /* clear error */ | |||
state->pos = 0; /* no uncompressed data yet */ | |||
state->strm.avail_in = 0; /* no input data yet */ | |||
} | |||
/* Open a gzip file either by name or file descriptor. */ | |||
local gzFile gz_open(path, fd, mode) | |||
const char *path; | |||
int fd; | |||
const char *mode; | |||
{ | |||
gz_statep state; | |||
/* allocate gzFile structure to return */ | |||
state = malloc(sizeof(gz_state)); | |||
if (state == NULL) | |||
return NULL; | |||
state->size = 0; /* no buffers allocated yet */ | |||
state->want = GZBUFSIZE; /* requested buffer size */ | |||
state->msg = NULL; /* no error message yet */ | |||
/* interpret mode */ | |||
state->mode = GZ_NONE; | |||
state->level = Z_DEFAULT_COMPRESSION; | |||
state->strategy = Z_DEFAULT_STRATEGY; | |||
while (*mode) { | |||
if (*mode >= '0' && *mode <= '9') | |||
state->level = *mode - '0'; | |||
else | |||
switch (*mode) { | |||
case 'r': | |||
state->mode = GZ_READ; | |||
break; | |||
#ifndef NO_GZCOMPRESS | |||
case 'w': | |||
state->mode = GZ_WRITE; | |||
break; | |||
case 'a': | |||
state->mode = GZ_APPEND; | |||
break; | |||
#endif | |||
case '+': /* can't read and write at the same time */ | |||
free(state); | |||
return NULL; | |||
case 'b': /* ignore -- will request binary anyway */ | |||
break; | |||
case 'f': | |||
state->strategy = Z_FILTERED; | |||
break; | |||
case 'h': | |||
state->strategy = Z_HUFFMAN_ONLY; | |||
break; | |||
case 'R': | |||
state->strategy = Z_RLE; | |||
break; | |||
case 'F': | |||
state->strategy = Z_FIXED; | |||
default: /* could consider as an error, but just ignore */ | |||
; | |||
} | |||
mode++; | |||
} | |||
/* must provide an "r", "w", or "a" */ | |||
if (state->mode == GZ_NONE) { | |||
free(state); | |||
return NULL; | |||
} | |||
/* save the path name for error messages */ | |||
state->path = malloc(strlen(path) + 1); | |||
if (state->path == NULL) { | |||
free(state); | |||
return NULL; | |||
} | |||
strcpy(state->path, path); | |||
/* open the file with the appropriate mode (or just use fd) */ | |||
state->fd = fd != -1 ? fd : | |||
open(path, | |||
#ifdef O_LARGEFILE | |||
O_LARGEFILE | | |||
#endif | |||
#ifdef O_BINARY | |||
O_BINARY | | |||
#endif | |||
(state->mode == GZ_READ ? | |||
O_RDONLY : | |||
(O_WRONLY | O_CREAT | ( | |||
state->mode == GZ_WRITE ? | |||
O_TRUNC : | |||
O_APPEND))), | |||
0666); | |||
if (state->fd == -1) { | |||
free(state->path); | |||
free(state); | |||
return NULL; | |||
} | |||
if (state->mode == GZ_APPEND) | |||
state->mode = GZ_WRITE; /* simplify later checks */ | |||
/* save the current position for rewinding (only if reading) */ | |||
if (state->mode == GZ_READ) { | |||
state->start = LSEEK(state->fd, 0, SEEK_CUR); | |||
if (state->start == -1) state->start = 0; | |||
} | |||
/* initialize stream */ | |||
gz_reset(state); | |||
/* return stream */ | |||
return (gzFile)state; | |||
} | |||
/* -- see zlib.h -- */ | |||
gzFile ZEXPORT gzopen(path, mode) | |||
const char *path; | |||
const char *mode; | |||
{ | |||
return gz_open(path, -1, mode); | |||
} | |||
/* -- see zlib.h -- */ | |||
gzFile ZEXPORT gzopen64(path, mode) | |||
const char *path; | |||
const char *mode; | |||
{ | |||
return gz_open(path, -1, mode); | |||
} | |||
/* -- see zlib.h -- */ | |||
gzFile ZEXPORT gzdopen(fd, mode) | |||
int fd; | |||
const char *mode; | |||
{ | |||
char *path; /* identifier for error messages */ | |||
gzFile gz; | |||
if (fd == -1 || (path = malloc(7 + 3 * sizeof(int))) == NULL) | |||
return NULL; | |||
sprintf(path, "<fd:%d>", fd); /* for debugging */ | |||
gz = gz_open(path, fd, mode); | |||
free(path); | |||
return gz; | |||
} | |||
/* -- see zlib.h -- */ | |||
int ZEXPORT gzbuffer(file, size) | |||
gzFile file; | |||
unsigned size; | |||
{ | |||
gz_statep state; | |||
/* get internal structure and check integrity */ | |||
if (file == NULL) | |||
return -1; | |||
state = (gz_statep)file; | |||
if (state->mode != GZ_READ && state->mode != GZ_WRITE) | |||
return -1; | |||
/* make sure we haven't already allocated memory */ | |||
if (state->size != 0) | |||
return -1; | |||
/* check and set requested size */ | |||
if (size == 0) | |||
return -1; | |||
state->want = size; | |||
return 0; | |||
} | |||
/* -- see zlib.h -- */ | |||
int ZEXPORT gzrewind(file) | |||
gzFile file; | |||
{ | |||
gz_statep state; | |||
/* get internal structure */ | |||
if (file == NULL) | |||
return -1; | |||
state = (gz_statep)file; | |||
/* check that we're reading and that there's no error */ | |||
if (state->mode != GZ_READ || state->err != Z_OK) | |||
return -1; | |||
/* back up and start over */ | |||
if (LSEEK(state->fd, state->start, SEEK_SET) == -1) | |||
return -1; | |||
gz_reset(state); | |||
return 0; | |||
} | |||
/* -- see zlib.h -- */ | |||
z_off64_t ZEXPORT gzseek64(file, offset, whence) | |||
gzFile file; | |||
z_off64_t offset; | |||
int whence; | |||
{ | |||
unsigned n; | |||
z_off64_t ret; | |||
gz_statep state; | |||
/* get internal structure and check integrity */ | |||
if (file == NULL) | |||
return -1; | |||
state = (gz_statep)file; | |||
if (state->mode != GZ_READ && state->mode != GZ_WRITE) | |||
return -1; | |||
/* check that there's no error */ | |||
if (state->err != Z_OK) | |||
return -1; | |||
/* can only seek from start or relative to current position */ | |||
if (whence != SEEK_SET && whence != SEEK_CUR) | |||
return -1; | |||
/* normalize offset to a SEEK_CUR specification */ | |||
if (whence == SEEK_SET) | |||
offset -= state->pos; | |||
else if (state->seek) | |||
offset += state->skip; | |||
state->seek = 0; | |||
/* if within raw area while reading, just go there */ | |||
if (state->mode == GZ_READ && state->how == COPY && | |||
state->pos + offset >= state->raw) { | |||
ret = LSEEK(state->fd, offset - state->have, SEEK_CUR); | |||
if (ret == -1) | |||
return -1; | |||
state->have = 0; | |||
state->eof = 0; | |||
state->seek = 0; | |||
gz_error(state, Z_OK, NULL); | |||
state->strm.avail_in = 0; | |||
state->pos += offset; | |||
return state->pos; | |||
} | |||
/* calculate skip amount, rewinding if needed for back seek when reading */ | |||
if (offset < 0) { | |||
if (state->mode != GZ_READ) /* writing -- can't go backwards */ | |||
return -1; | |||
offset += state->pos; | |||
if (offset < 0) /* before start of file! */ | |||
return -1; | |||
if (gzrewind(file) == -1) /* rewind, then skip to offset */ | |||
return -1; | |||
} | |||
/* if reading, skip what's in output buffer (one less gzgetc() check) */ | |||
if (state->mode == GZ_READ) { | |||
n = GT_OFF(state->have) || (z_off64_t)state->have > offset ? | |||
(unsigned)offset : state->have; | |||
state->have -= n; | |||
state->next += n; | |||
state->pos += n; | |||
offset -= n; | |||
} | |||
/* request skip (if not zero) */ | |||
if (offset) { | |||
state->seek = 1; | |||
state->skip = offset; | |||
} | |||
return state->pos + offset; | |||
} | |||
/* -- see zlib.h -- */ | |||
z_off_t ZEXPORT gzseek(file, offset, whence) | |||
gzFile file; | |||
z_off_t offset; | |||
int whence; | |||
{ | |||
z_off64_t ret; | |||
ret = gzseek64(file, (z_off64_t)offset, whence); | |||
return ret == (z_off_t)ret ? (z_off_t)ret : -1; | |||
} | |||
/* -- see zlib.h -- */ | |||
z_off64_t ZEXPORT gztell64(file) | |||
gzFile file; | |||
{ | |||
gz_statep state; | |||
/* get internal structure and check integrity */ | |||
if (file == NULL) | |||
return -1; | |||
state = (gz_statep)file; | |||
if (state->mode != GZ_READ && state->mode != GZ_WRITE) | |||
return -1; | |||
/* return position */ | |||
return state->pos + (state->seek ? state->skip : 0); | |||
} | |||
/* -- see zlib.h -- */ | |||
z_off_t ZEXPORT gztell(file) | |||
gzFile file; | |||
{ | |||
z_off64_t ret; | |||
ret = gztell64(file); | |||
return ret == (z_off_t)ret ? (z_off_t)ret : -1; | |||
} | |||
/* -- see zlib.h -- */ | |||
z_off64_t ZEXPORT gzoffset64(file) | |||
gzFile file; | |||
{ | |||
z_off64_t offset; | |||
gz_statep state; | |||
/* get internal structure and check integrity */ | |||
if (file == NULL) | |||
return -1; | |||
state = (gz_statep)file; | |||
if (state->mode != GZ_READ && state->mode != GZ_WRITE) | |||
return -1; | |||
/* compute and return effective offset in file */ | |||
offset = LSEEK(state->fd, 0, SEEK_CUR); | |||
if (offset == -1) | |||
return -1; | |||
if (state->mode == GZ_READ) /* reading */ | |||
offset -= state->strm.avail_in; /* don't count buffered input */ | |||
return offset; | |||
} | |||
/* -- see zlib.h -- */ | |||
z_off_t ZEXPORT gzoffset(file) | |||
gzFile file; | |||
{ | |||
z_off64_t ret; | |||
ret = gzoffset64(file); | |||
return ret == (z_off_t)ret ? (z_off_t)ret : -1; | |||
} | |||
/* -- see zlib.h -- */ | |||
int ZEXPORT gzeof(file) | |||
gzFile file; | |||
{ | |||
gz_statep state; | |||
/* get internal structure and check integrity */ | |||
if (file == NULL) | |||
return 0; | |||
state = (gz_statep)file; | |||
if (state->mode != GZ_READ && state->mode != GZ_WRITE) | |||
return 0; | |||
/* return end-of-file state */ | |||
return state->mode == GZ_READ ? | |||
(state->eof && state->strm.avail_in == 0 && state->have == 0) : 0; | |||
} | |||
/* -- see zlib.h -- */ | |||
const char * ZEXPORT gzerror(file, errnum) | |||
gzFile file; | |||
int *errnum; | |||
{ | |||
gz_statep state; | |||
/* get internal structure and check integrity */ | |||
if (file == NULL) | |||
return NULL; | |||
state = (gz_statep)file; | |||
if (state->mode != GZ_READ && state->mode != GZ_WRITE) | |||
return NULL; | |||
/* return error information */ | |||
if (errnum != NULL) | |||
*errnum = state->err; | |||
return state->msg == NULL ? "" : state->msg; | |||
} | |||
/* -- see zlib.h -- */ | |||
void ZEXPORT gzclearerr(file) | |||
gzFile file; | |||
{ | |||
gz_statep state; | |||
/* get internal structure and check integrity */ | |||
if (file == NULL) | |||
return; | |||
state = (gz_statep)file; | |||
if (state->mode != GZ_READ && state->mode != GZ_WRITE) | |||
return; | |||
/* clear error and end-of-file */ | |||
if (state->mode == GZ_READ) | |||
state->eof = 0; | |||
gz_error(state, Z_OK, NULL); | |||
} | |||
/* Create an error message in allocated memory and set state->err and | |||
state->msg accordingly. Free any previous error message already there. Do | |||
not try to free or allocate space if the error is Z_MEM_ERROR (out of | |||
memory). Simply save the error message as a static string. If there is an | |||
allocation failure constructing the error message, then convert the error to | |||
out of memory. */ | |||
void ZLIB_INTERNAL gz_error(state, err, msg) | |||
gz_statep state; | |||
int err; | |||
const char *msg; | |||
{ | |||
/* free previously allocated message and clear */ | |||
if (state->msg != NULL) { | |||
if (state->err != Z_MEM_ERROR) | |||
free(state->msg); | |||
state->msg = NULL; | |||
} | |||
/* set error code, and if no message, then done */ | |||
state->err = err; | |||
if (msg == NULL) | |||
return; | |||
/* for an out of memory error, save as static string */ | |||
if (err == Z_MEM_ERROR) { | |||
state->msg = (char *)msg; | |||
return; | |||
} | |||
/* construct error message with path */ | |||
if ((state->msg = malloc(strlen(state->path) + strlen(msg) + 3)) == NULL) { | |||
state->err = Z_MEM_ERROR; | |||
state->msg = (char *)"out of memory"; | |||
return; | |||
} | |||
strcpy(state->msg, state->path); | |||
strcat(state->msg, ": "); | |||
strcat(state->msg, msg); | |||
return; | |||
} | |||
#ifndef INT_MAX | |||
/* portably return maximum value for an int (when limits.h presumed not | |||
available) -- we need to do this to cover cases where 2's complement not | |||
used, since C standard permits 1's complement and sign-bit representations, | |||
otherwise we could just use ((unsigned)-1) >> 1 */ | |||
unsigned ZLIB_INTERNAL gz_intmax() | |||
{ | |||
unsigned p, q; | |||
p = 1; | |||
do { | |||
q = p; | |||
p <<= 1; | |||
p++; | |||
} while (p > q); | |||
return q >> 1; | |||
} | |||
#endif |
@@ -1,653 +0,0 @@ | |||
/* gzread.c -- zlib functions for reading gzip files | |||
* Copyright (C) 2004, 2005, 2010 Mark Adler | |||
* For conditions of distribution and use, see copyright notice in zlib.h | |||
*/ | |||
#include "gzguts.h" | |||
/* Local functions */ | |||
local int gz_load OF((gz_statep, unsigned char *, unsigned, unsigned *)); | |||
local int gz_avail OF((gz_statep)); | |||
local int gz_next4 OF((gz_statep, unsigned long *)); | |||
local int gz_head OF((gz_statep)); | |||
local int gz_decomp OF((gz_statep)); | |||
local int gz_make OF((gz_statep)); | |||
local int gz_skip OF((gz_statep, z_off64_t)); | |||
/* Use read() to load a buffer -- return -1 on error, otherwise 0. Read from | |||
state->fd, and update state->eof, state->err, and state->msg as appropriate. | |||
This function needs to loop on read(), since read() is not guaranteed to | |||
read the number of bytes requested, depending on the type of descriptor. */ | |||
local int gz_load(state, buf, len, have) | |||
gz_statep state; | |||
unsigned char *buf; | |||
unsigned len; | |||
unsigned *have; | |||
{ | |||
int ret; | |||
*have = 0; | |||
do { | |||
ret = read(state->fd, buf + *have, len - *have); | |||
if (ret <= 0) | |||
break; | |||
*have += ret; | |||
} while (*have < len); | |||
if (ret < 0) { | |||
gz_error(state, Z_ERRNO, zstrerror()); | |||
return -1; | |||
} | |||
if (ret == 0) | |||
state->eof = 1; | |||
return 0; | |||
} | |||
/* Load up input buffer and set eof flag if last data loaded -- return -1 on | |||
error, 0 otherwise. Note that the eof flag is set when the end of the input | |||
file is reached, even though there may be unused data in the buffer. Once | |||
that data has been used, no more attempts will be made to read the file. | |||
gz_avail() assumes that strm->avail_in == 0. */ | |||
local int gz_avail(state) | |||
gz_statep state; | |||
{ | |||
z_streamp strm = &(state->strm); | |||
if (state->err != Z_OK) | |||
return -1; | |||
if (state->eof == 0) { | |||
if (gz_load(state, state->in, state->size, | |||
(unsigned *)&(strm->avail_in)) == -1) | |||
return -1; | |||
strm->next_in = state->in; | |||
} | |||
return 0; | |||
} | |||
/* Get next byte from input, or -1 if end or error. */ | |||
#define NEXT() ((strm->avail_in == 0 && gz_avail(state) == -1) ? -1 : \ | |||
(strm->avail_in == 0 ? -1 : \ | |||
(strm->avail_in--, *(strm->next_in)++))) | |||
/* Get a four-byte little-endian integer and return 0 on success and the value | |||
in *ret. Otherwise -1 is returned and *ret is not modified. */ | |||
local int gz_next4(state, ret) | |||
gz_statep state; | |||
unsigned long *ret; | |||
{ | |||
int ch; | |||
unsigned long val; | |||
z_streamp strm = &(state->strm); | |||
val = NEXT(); | |||
val += (unsigned)NEXT() << 8; | |||
val += (unsigned long)NEXT() << 16; | |||
ch = NEXT(); | |||
if (ch == -1) | |||
return -1; | |||
val += (unsigned long)ch << 24; | |||
*ret = val; | |||
return 0; | |||
} | |||
/* Look for gzip header, set up for inflate or copy. state->have must be zero. | |||
If this is the first time in, allocate required memory. state->how will be | |||
left unchanged if there is no more input data available, will be set to COPY | |||
if there is no gzip header and direct copying will be performed, or it will | |||
be set to GZIP for decompression, and the gzip header will be skipped so | |||
that the next available input data is the raw deflate stream. If direct | |||
copying, then leftover input data from the input buffer will be copied to | |||
the output buffer. In that case, all further file reads will be directly to | |||
either the output buffer or a user buffer. If decompressing, the inflate | |||
state and the check value will be initialized. gz_head() will return 0 on | |||
success or -1 on failure. Failures may include read errors or gzip header | |||
errors. */ | |||
local int gz_head(state) | |||
gz_statep state; | |||
{ | |||
z_streamp strm = &(state->strm); | |||
int flags; | |||
unsigned len; | |||
/* allocate read buffers and inflate memory */ | |||
if (state->size == 0) { | |||
/* allocate buffers */ | |||
state->in = malloc(state->want); | |||
state->out = malloc(state->want << 1); | |||
if (state->in == NULL || state->out == NULL) { | |||
if (state->out != NULL) | |||
free(state->out); | |||
if (state->in != NULL) | |||
free(state->in); | |||
gz_error(state, Z_MEM_ERROR, "out of memory"); | |||
return -1; | |||
} | |||
state->size = state->want; | |||
/* allocate inflate memory */ | |||
state->strm.zalloc = Z_NULL; | |||
state->strm.zfree = Z_NULL; | |||
state->strm.opaque = Z_NULL; | |||
state->strm.avail_in = 0; | |||
state->strm.next_in = Z_NULL; | |||
if (inflateInit2(&(state->strm), -15) != Z_OK) { /* raw inflate */ | |||
free(state->out); | |||
free(state->in); | |||
state->size = 0; | |||
gz_error(state, Z_MEM_ERROR, "out of memory"); | |||
return -1; | |||
} | |||
} | |||
/* get some data in the input buffer */ | |||
if (strm->avail_in == 0) { | |||
if (gz_avail(state) == -1) | |||
return -1; | |||
if (strm->avail_in == 0) | |||
return 0; | |||
} | |||
/* look for the gzip magic header bytes 31 and 139 */ | |||
if (strm->next_in[0] == 31) { | |||
strm->avail_in--; | |||
strm->next_in++; | |||
if (strm->avail_in == 0 && gz_avail(state) == -1) | |||
return -1; | |||
if (strm->avail_in && strm->next_in[0] == 139) { | |||
/* we have a gzip header, woo hoo! */ | |||
strm->avail_in--; | |||
strm->next_in++; | |||
/* skip rest of header */ | |||
if (NEXT() != 8) { /* compression method */ | |||
gz_error(state, Z_DATA_ERROR, "unknown compression method"); | |||
return -1; | |||
} | |||
flags = NEXT(); | |||
if (flags & 0xe0) { /* reserved flag bits */ | |||
gz_error(state, Z_DATA_ERROR, "unknown header flags set"); | |||
return -1; | |||
} | |||
NEXT(); /* modification time */ | |||
NEXT(); | |||
NEXT(); | |||
NEXT(); | |||
NEXT(); /* extra flags */ | |||
NEXT(); /* operating system */ | |||
if (flags & 4) { /* extra field */ | |||
len = (unsigned)NEXT(); | |||
len += (unsigned)NEXT() << 8; | |||
while (len--) | |||
if (NEXT() < 0) | |||
break; | |||
} | |||
if (flags & 8) /* file name */ | |||
while (NEXT() > 0) | |||
; | |||
if (flags & 16) /* comment */ | |||
while (NEXT() > 0) | |||
; | |||
if (flags & 2) { /* header crc */ | |||
NEXT(); | |||
NEXT(); | |||
} | |||
/* an unexpected end of file is not checked for here -- it will be | |||
noticed on the first request for uncompressed data */ | |||
/* set up for decompression */ | |||
inflateReset(strm); | |||
strm->adler = crc32(0L, Z_NULL, 0); | |||
state->how = GZIP; | |||
state->direct = 0; | |||
return 0; | |||
} | |||
else { | |||
/* not a gzip file -- save first byte (31) and fall to raw i/o */ | |||
state->out[0] = 31; | |||
state->have = 1; | |||
} | |||
} | |||
/* doing raw i/o, save start of raw data for seeking, copy any leftover | |||
input to output -- this assumes that the output buffer is larger than | |||
the input buffer, which also assures space for gzungetc() */ | |||
state->raw = state->pos; | |||
state->next = state->out; | |||
if (strm->avail_in) { | |||
memcpy(state->next + state->have, strm->next_in, strm->avail_in); | |||
state->have += strm->avail_in; | |||
strm->avail_in = 0; | |||
} | |||
state->how = COPY; | |||
state->direct = 1; | |||
return 0; | |||
} | |||
/* Decompress from input to the provided next_out and avail_out in the state. | |||
If the end of the compressed data is reached, then verify the gzip trailer | |||
check value and length (modulo 2^32). state->have and state->next are set | |||
to point to the just decompressed data, and the crc is updated. If the | |||
trailer is verified, state->how is reset to LOOK to look for the next gzip | |||
stream or raw data, once state->have is depleted. Returns 0 on success, -1 | |||
on failure. Failures may include invalid compressed data or a failed gzip | |||
trailer verification. */ | |||
local int gz_decomp(state) | |||
gz_statep state; | |||
{ | |||
int ret; | |||
unsigned had; | |||
unsigned long crc, len; | |||
z_streamp strm = &(state->strm); | |||
/* fill output buffer up to end of deflate stream */ | |||
had = strm->avail_out; | |||
do { | |||
/* get more input for inflate() */ | |||
if (strm->avail_in == 0 && gz_avail(state) == -1) | |||
return -1; | |||
if (strm->avail_in == 0) { | |||
gz_error(state, Z_DATA_ERROR, "unexpected end of file"); | |||
return -1; | |||
} | |||
/* decompress and handle errors */ | |||
ret = inflate(strm, Z_NO_FLUSH); | |||
if (ret == Z_STREAM_ERROR || ret == Z_NEED_DICT) { | |||
gz_error(state, Z_STREAM_ERROR, | |||
"internal error: inflate stream corrupt"); | |||
return -1; | |||
} | |||
if (ret == Z_MEM_ERROR) { | |||
gz_error(state, Z_MEM_ERROR, "out of memory"); | |||
return -1; | |||
} | |||
if (ret == Z_DATA_ERROR) { /* deflate stream invalid */ | |||
gz_error(state, Z_DATA_ERROR, | |||
strm->msg == NULL ? "compressed data error" : strm->msg); | |||
return -1; | |||
} | |||
} while (strm->avail_out && ret != Z_STREAM_END); | |||
/* update available output and crc check value */ | |||
state->have = had - strm->avail_out; | |||
state->next = strm->next_out - state->have; | |||
strm->adler = crc32(strm->adler, state->next, state->have); | |||
/* check gzip trailer if at end of deflate stream */ | |||
if (ret == Z_STREAM_END) { | |||
if (gz_next4(state, &crc) == -1 || gz_next4(state, &len) == -1) { | |||
gz_error(state, Z_DATA_ERROR, "unexpected end of file"); | |||
return -1; | |||
} | |||
if (crc != strm->adler) { | |||
gz_error(state, Z_DATA_ERROR, "incorrect data check"); | |||
return -1; | |||
} | |||
if (len != (strm->total_out & 0xffffffffL)) { | |||
gz_error(state, Z_DATA_ERROR, "incorrect length check"); | |||
return -1; | |||
} | |||
state->how = LOOK; /* ready for next stream, once have is 0 (leave | |||
state->direct unchanged to remember how) */ | |||
} | |||
/* good decompression */ | |||
return 0; | |||
} | |||
/* Make data and put in the output buffer. Assumes that state->have == 0. | |||
Data is either copied from the input file or decompressed from the input | |||
file depending on state->how. If state->how is LOOK, then a gzip header is | |||
looked for (and skipped if found) to determine wither to copy or decompress. | |||
Returns -1 on error, otherwise 0. gz_make() will leave state->have as COPY | |||
or GZIP unless the end of the input file has been reached and all data has | |||
been processed. */ | |||
local int gz_make(state) | |||
gz_statep state; | |||
{ | |||
z_streamp strm = &(state->strm); | |||
if (state->how == LOOK) { /* look for gzip header */ | |||
if (gz_head(state) == -1) | |||
return -1; | |||
if (state->have) /* got some data from gz_head() */ | |||
return 0; | |||
} | |||
if (state->how == COPY) { /* straight copy */ | |||
if (gz_load(state, state->out, state->size << 1, &(state->have)) == -1) | |||
return -1; | |||
state->next = state->out; | |||
} | |||
else if (state->how == GZIP) { /* decompress */ | |||
strm->avail_out = state->size << 1; | |||
strm->next_out = state->out; | |||
if (gz_decomp(state) == -1) | |||
return -1; | |||
} | |||
return 0; | |||
} | |||
/* Skip len uncompressed bytes of output. Return -1 on error, 0 on success. */ | |||
local int gz_skip(state, len) | |||
gz_statep state; | |||
z_off64_t len; | |||
{ | |||
unsigned n; | |||
/* skip over len bytes or reach end-of-file, whichever comes first */ | |||
while (len) | |||
/* skip over whatever is in output buffer */ | |||
if (state->have) { | |||
n = GT_OFF(state->have) || (z_off64_t)state->have > len ? | |||
(unsigned)len : state->have; | |||
state->have -= n; | |||
state->next += n; | |||
state->pos += n; | |||
len -= n; | |||
} | |||
/* output buffer empty -- return if we're at the end of the input */ | |||
else if (state->eof && state->strm.avail_in == 0) | |||
break; | |||
/* need more data to skip -- load up output buffer */ | |||
else { | |||
/* get more output, looking for header if required */ | |||
if (gz_make(state) == -1) | |||
return -1; | |||
} | |||
return 0; | |||
} | |||
/* -- see zlib.h -- */ | |||
int ZEXPORT gzread(file, buf, len) | |||
gzFile file; | |||
voidp buf; | |||
unsigned len; | |||
{ | |||
unsigned got, n; | |||
gz_statep state; | |||
z_streamp strm; | |||
/* get internal structure */ | |||
if (file == NULL) | |||
return -1; | |||
state = (gz_statep)file; | |||
strm = &(state->strm); | |||
/* check that we're reading and that there's no error */ | |||
if (state->mode != GZ_READ || state->err != Z_OK) | |||
return -1; | |||
/* since an int is returned, make sure len fits in one, otherwise return | |||
with an error (this avoids the flaw in the interface) */ | |||
if ((int)len < 0) { | |||
gz_error(state, Z_BUF_ERROR, "requested length does not fit in int"); | |||
return -1; | |||
} | |||
/* if len is zero, avoid unnecessary operations */ | |||
if (len == 0) | |||
return 0; | |||
/* process a skip request */ | |||
if (state->seek) { | |||
state->seek = 0; | |||
if (gz_skip(state, state->skip) == -1) | |||
return -1; | |||
} | |||
/* get len bytes to buf, or less than len if at the end */ | |||
got = 0; | |||
do { | |||
/* first just try copying data from the output buffer */ | |||
if (state->have) { | |||
n = state->have > len ? len : state->have; | |||
memcpy(buf, state->next, n); | |||
state->next += n; | |||
state->have -= n; | |||
} | |||
/* output buffer empty -- return if we're at the end of the input */ | |||
else if (state->eof && strm->avail_in == 0) | |||
break; | |||
/* need output data -- for small len or new stream load up our output | |||
buffer */ | |||
else if (state->how == LOOK || len < (state->size << 1)) { | |||
/* get more output, looking for header if required */ | |||
if (gz_make(state) == -1) | |||
return -1; | |||
continue; /* no progress yet -- go back to memcpy() above */ | |||
/* the copy above assures that we will leave with space in the | |||
output buffer, allowing at least one gzungetc() to succeed */ | |||
} | |||
/* large len -- read directly into user buffer */ | |||
else if (state->how == COPY) { /* read directly */ | |||
if (gz_load(state, buf, len, &n) == -1) | |||
return -1; | |||
} | |||
/* large len -- decompress directly into user buffer */ | |||
else { /* state->how == GZIP */ | |||
strm->avail_out = len; | |||
strm->next_out = buf; | |||
if (gz_decomp(state) == -1) | |||
return -1; | |||
n = state->have; | |||
state->have = 0; | |||
} | |||
/* update progress */ | |||
len -= n; | |||
buf = (char *)buf + n; | |||
got += n; | |||
state->pos += n; | |||
} while (len); | |||
/* return number of bytes read into user buffer (will fit in int) */ | |||
return (int)got; | |||
} | |||
/* -- see zlib.h -- */ | |||
int ZEXPORT gzgetc(file) | |||
gzFile file; | |||
{ | |||
int ret; | |||
unsigned char buf[1]; | |||
gz_statep state; | |||
/* get internal structure */ | |||
if (file == NULL) | |||
return -1; | |||
state = (gz_statep)file; | |||
/* check that we're reading and that there's no error */ | |||
if (state->mode != GZ_READ || state->err != Z_OK) | |||
return -1; | |||
/* try output buffer (no need to check for skip request) */ | |||
if (state->have) { | |||
state->have--; | |||
state->pos++; | |||
return *(state->next)++; | |||
} | |||
/* nothing there -- try gzread() */ | |||
ret = gzread(file, buf, 1); | |||
return ret < 1 ? -1 : buf[0]; | |||
} | |||
/* -- see zlib.h -- */ | |||
int ZEXPORT gzungetc(c, file) | |||
int c; | |||
gzFile file; | |||
{ | |||
gz_statep state; | |||
/* get internal structure */ | |||
if (file == NULL) | |||
return -1; | |||
state = (gz_statep)file; | |||
/* check that we're reading and that there's no error */ | |||
if (state->mode != GZ_READ || state->err != Z_OK) | |||
return -1; | |||
/* process a skip request */ | |||
if (state->seek) { | |||
state->seek = 0; | |||
if (gz_skip(state, state->skip) == -1) | |||
return -1; | |||
} | |||
/* can't push EOF */ | |||
if (c < 0) | |||
return -1; | |||
/* if output buffer empty, put byte at end (allows more pushing) */ | |||
if (state->have == 0) { | |||
state->have = 1; | |||
state->next = state->out + (state->size << 1) - 1; | |||
state->next[0] = c; | |||
state->pos--; | |||
return c; | |||
} | |||
/* if no room, give up (must have already done a gzungetc()) */ | |||
if (state->have == (state->size << 1)) { | |||
gz_error(state, Z_BUF_ERROR, "out of room to push characters"); | |||
return -1; | |||
} | |||
/* slide output data if needed and insert byte before existing data */ | |||
if (state->next == state->out) { | |||
unsigned char *src = state->out + state->have; | |||
unsigned char *dest = state->out + (state->size << 1); | |||
while (src > state->out) | |||
*--dest = *--src; | |||
state->next = dest; | |||
} | |||
state->have++; | |||
state->next--; | |||
state->next[0] = c; | |||
state->pos--; | |||
return c; | |||
} | |||
/* -- see zlib.h -- */ | |||
char * ZEXPORT gzgets(file, buf, len) | |||
gzFile file; | |||
char *buf; | |||
int len; | |||
{ | |||
unsigned left, n; | |||
char *str; | |||
unsigned char *eol; | |||
gz_statep state; | |||
/* check parameters and get internal structure */ | |||
if (file == NULL || buf == NULL || len < 1) | |||
return NULL; | |||
state = (gz_statep)file; | |||
/* check that we're reading and that there's no error */ | |||
if (state->mode != GZ_READ || state->err != Z_OK) | |||
return NULL; | |||
/* process a skip request */ | |||
if (state->seek) { | |||
state->seek = 0; | |||
if (gz_skip(state, state->skip) == -1) | |||
return NULL; | |||
} | |||
/* copy output bytes up to new line or len - 1, whichever comes first -- | |||
append a terminating zero to the string (we don't check for a zero in | |||
the contents, let the user worry about that) */ | |||
str = buf; | |||
left = (unsigned)len - 1; | |||
if (left) do { | |||
/* assure that something is in the output buffer */ | |||
if (state->have == 0) { | |||
if (gz_make(state) == -1) | |||
return NULL; /* error */ | |||
if (state->have == 0) { /* end of file */ | |||
if (buf == str) /* got bupkus */ | |||
return NULL; | |||
break; /* got something -- return it */ | |||
} | |||
} | |||
/* look for end-of-line in current output buffer */ | |||
n = state->have > left ? left : state->have; | |||
eol = memchr(state->next, '\n', n); | |||
if (eol != NULL) | |||
n = (unsigned)(eol - state->next) + 1; | |||
/* copy through end-of-line, or remainder if not found */ | |||
memcpy(buf, state->next, n); | |||
state->have -= n; | |||
state->next += n; | |||
state->pos += n; | |||
left -= n; | |||
buf += n; | |||
} while (left && eol == NULL); | |||
/* found end-of-line or out of space -- terminate string and return it */ | |||
buf[0] = 0; | |||
return str; | |||
} | |||
/* -- see zlib.h -- */ | |||
int ZEXPORT gzdirect(file) | |||
gzFile file; | |||
{ | |||
gz_statep state; | |||
/* get internal structure */ | |||
if (file == NULL) | |||
return 0; | |||
state = (gz_statep)file; | |||
/* check that we're reading */ | |||
if (state->mode != GZ_READ) | |||
return 0; | |||
/* if the state is not known, but we can find out, then do so (this is | |||
mainly for right after a gzopen() or gzdopen()) */ | |||
if (state->how == LOOK && state->have == 0) | |||
(void)gz_head(state); | |||
/* return 1 if reading direct, 0 if decompressing a gzip stream */ | |||
return state->direct; | |||
} | |||
/* -- see zlib.h -- */ | |||
int ZEXPORT gzclose_r(file) | |||
gzFile file; | |||
{ | |||
int ret; | |||
gz_statep state; | |||
/* get internal structure */ | |||
if (file == NULL) | |||
return Z_STREAM_ERROR; | |||
state = (gz_statep)file; | |||
/* check that we're reading */ | |||
if (state->mode != GZ_READ) | |||
return Z_STREAM_ERROR; | |||
/* free memory and close file */ | |||
if (state->size) { | |||
inflateEnd(&(state->strm)); | |||
free(state->out); | |||
free(state->in); | |||
} | |||
gz_error(state, Z_OK, NULL); | |||
free(state->path); | |||
ret = close(state->fd); | |||
free(state); | |||
return ret ? Z_ERRNO : Z_OK; | |||
} |
@@ -1,531 +0,0 @@ | |||
/* gzwrite.c -- zlib functions for writing gzip files | |||
* Copyright (C) 2004, 2005, 2010 Mark Adler | |||
* For conditions of distribution and use, see copyright notice in zlib.h | |||
*/ | |||
#include "gzguts.h" | |||
/* Local functions */ | |||
local int gz_init OF((gz_statep)); | |||
local int gz_comp OF((gz_statep, int)); | |||
local int gz_zero OF((gz_statep, z_off64_t)); | |||
/* Initialize state for writing a gzip file. Mark initialization by setting | |||
state->size to non-zero. Return -1 on failure or 0 on success. */ | |||
local int gz_init(state) | |||
gz_statep state; | |||
{ | |||
int ret; | |||
z_streamp strm = &(state->strm); | |||
/* allocate input and output buffers */ | |||
state->in = malloc(state->want); | |||
state->out = malloc(state->want); | |||
if (state->in == NULL || state->out == NULL) { | |||
if (state->out != NULL) | |||
free(state->out); | |||
if (state->in != NULL) | |||
free(state->in); | |||
gz_error(state, Z_MEM_ERROR, "out of memory"); | |||
return -1; | |||
} | |||
/* allocate deflate memory, set up for gzip compression */ | |||
strm->zalloc = Z_NULL; | |||
strm->zfree = Z_NULL; | |||
strm->opaque = Z_NULL; | |||
ret = deflateInit2(strm, state->level, Z_DEFLATED, | |||
15 + 16, 8, state->strategy); | |||
if (ret != Z_OK) { | |||
free(state->in); | |||
gz_error(state, Z_MEM_ERROR, "out of memory"); | |||
return -1; | |||
} | |||
/* mark state as initialized */ | |||
state->size = state->want; | |||
/* initialize write buffer */ | |||
strm->avail_out = state->size; | |||
strm->next_out = state->out; | |||
state->next = strm->next_out; | |||
return 0; | |||
} | |||
/* Compress whatever is at avail_in and next_in and write to the output file. | |||
Return -1 if there is an error writing to the output file, otherwise 0. | |||
flush is assumed to be a valid deflate() flush value. If flush is Z_FINISH, | |||
then the deflate() state is reset to start a new gzip stream. */ | |||
local int gz_comp(state, flush) | |||
gz_statep state; | |||
int flush; | |||
{ | |||
int ret, got; | |||
unsigned have; | |||
z_streamp strm = &(state->strm); | |||
/* allocate memory if this is the first time through */ | |||
if (state->size == 0 && gz_init(state) == -1) | |||
return -1; | |||
/* run deflate() on provided input until it produces no more output */ | |||
ret = Z_OK; | |||
do { | |||
/* write out current buffer contents if full, or if flushing, but if | |||
doing Z_FINISH then don't write until we get to Z_STREAM_END */ | |||
if (strm->avail_out == 0 || (flush != Z_NO_FLUSH && | |||
(flush != Z_FINISH || ret == Z_STREAM_END))) { | |||
have = (unsigned)(strm->next_out - state->next); | |||
if (have && ((got = write(state->fd, state->next, have)) < 0 || | |||
(unsigned)got != have)) { | |||
gz_error(state, Z_ERRNO, zstrerror()); | |||
return -1; | |||
} | |||
if (strm->avail_out == 0) { | |||
strm->avail_out = state->size; | |||
strm->next_out = state->out; | |||
} | |||
state->next = strm->next_out; | |||
} | |||
/* compress */ | |||
have = strm->avail_out; | |||
ret = deflate(strm, flush); | |||
if (ret == Z_STREAM_ERROR) { | |||
gz_error(state, Z_STREAM_ERROR, | |||
"internal error: deflate stream corrupt"); | |||
return -1; | |||
} | |||
have -= strm->avail_out; | |||
} while (have); | |||
/* if that completed a deflate stream, allow another to start */ | |||
if (flush == Z_FINISH) | |||
deflateReset(strm); | |||
/* all done, no errors */ | |||
return 0; | |||
} | |||
/* Compress len zeros to output. Return -1 on error, 0 on success. */ | |||
local int gz_zero(state, len) | |||
gz_statep state; | |||
z_off64_t len; | |||
{ | |||
int first; | |||
unsigned n; | |||
z_streamp strm = &(state->strm); | |||
/* consume whatever's left in the input buffer */ | |||
if (strm->avail_in && gz_comp(state, Z_NO_FLUSH) == -1) | |||
return -1; | |||
/* compress len zeros (len guaranteed > 0) */ | |||
first = 1; | |||
while (len) { | |||
n = GT_OFF(state->size) || (z_off64_t)state->size > len ? | |||
(unsigned)len : state->size; | |||
if (first) { | |||
memset(state->in, 0, n); | |||
first = 0; | |||
} | |||
strm->avail_in = n; | |||
strm->next_in = state->in; | |||
state->pos += n; | |||
if (gz_comp(state, Z_NO_FLUSH) == -1) | |||
return -1; | |||
len -= n; | |||
} | |||
return 0; | |||
} | |||
/* -- see zlib.h -- */ | |||
int ZEXPORT gzwrite(file, buf, len) | |||
gzFile file; | |||
voidpc buf; | |||
unsigned len; | |||
{ | |||
unsigned put = len; | |||
unsigned n; | |||
gz_statep state; | |||
z_streamp strm; | |||
/* get internal structure */ | |||
if (file == NULL) | |||
return 0; | |||
state = (gz_statep)file; | |||
strm = &(state->strm); | |||
/* check that we're writing and that there's no error */ | |||
if (state->mode != GZ_WRITE || state->err != Z_OK) | |||
return 0; | |||
/* since an int is returned, make sure len fits in one, otherwise return | |||
with an error (this avoids the flaw in the interface) */ | |||
if ((int)len < 0) { | |||
gz_error(state, Z_BUF_ERROR, "requested length does not fit in int"); | |||
return 0; | |||
} | |||
/* if len is zero, avoid unnecessary operations */ | |||
if (len == 0) | |||
return 0; | |||
/* allocate memory if this is the first time through */ | |||
if (state->size == 0 && gz_init(state) == -1) | |||
return 0; | |||
/* check for seek request */ | |||
if (state->seek) { | |||
state->seek = 0; | |||
if (gz_zero(state, state->skip) == -1) | |||
return 0; | |||
} | |||
/* for small len, copy to input buffer, otherwise compress directly */ | |||
if (len < state->size) { | |||
/* copy to input buffer, compress when full */ | |||
do { | |||
if (strm->avail_in == 0) | |||
strm->next_in = state->in; | |||
n = state->size - strm->avail_in; | |||
if (n > len) | |||
n = len; | |||
memcpy(strm->next_in + strm->avail_in, buf, n); | |||
strm->avail_in += n; | |||
state->pos += n; | |||
buf = (char *)buf + n; | |||
len -= n; | |||
if (len && gz_comp(state, Z_NO_FLUSH) == -1) | |||
return 0; | |||
} while (len); | |||
} | |||
else { | |||
/* consume whatever's left in the input buffer */ | |||
if (strm->avail_in && gz_comp(state, Z_NO_FLUSH) == -1) | |||
return 0; | |||
/* directly compress user buffer to file */ | |||
strm->avail_in = len; | |||
strm->next_in = (voidp)buf; | |||
state->pos += len; | |||
if (gz_comp(state, Z_NO_FLUSH) == -1) | |||
return 0; | |||
} | |||
/* input was all buffered or compressed (put will fit in int) */ | |||
return (int)put; | |||
} | |||
/* -- see zlib.h -- */ | |||
int ZEXPORT gzputc(file, c) | |||
gzFile file; | |||
int c; | |||
{ | |||
unsigned char buf[1]; | |||
gz_statep state; | |||
z_streamp strm; | |||
/* get internal structure */ | |||
if (file == NULL) | |||
return -1; | |||
state = (gz_statep)file; | |||
strm = &(state->strm); | |||
/* check that we're writing and that there's no error */ | |||
if (state->mode != GZ_WRITE || state->err != Z_OK) | |||
return -1; | |||
/* check for seek request */ | |||
if (state->seek) { | |||
state->seek = 0; | |||
if (gz_zero(state, state->skip) == -1) | |||
return -1; | |||
} | |||
/* try writing to input buffer for speed (state->size == 0 if buffer not | |||
initialized) */ | |||
if (strm->avail_in < state->size) { | |||
if (strm->avail_in == 0) | |||
strm->next_in = state->in; | |||
strm->next_in[strm->avail_in++] = c; | |||
state->pos++; | |||
return c; | |||
} | |||
/* no room in buffer or not initialized, use gz_write() */ | |||
buf[0] = c; | |||
if (gzwrite(file, buf, 1) != 1) | |||
return -1; | |||
return c; | |||
} | |||
/* -- see zlib.h -- */ | |||
int ZEXPORT gzputs(file, str) | |||
gzFile file; | |||
const char *str; | |||
{ | |||
int ret; | |||
unsigned len; | |||
/* write string */ | |||
len = (unsigned)strlen(str); | |||
ret = gzwrite(file, str, len); | |||
return ret == 0 && len != 0 ? -1 : ret; | |||
} | |||
#ifdef STDC | |||
#include <stdarg.h> | |||
/* -- see zlib.h -- */ | |||
int ZEXPORTVA gzprintf (gzFile file, const char *format, ...) | |||
{ | |||
int size, len; | |||
gz_statep state; | |||
z_streamp strm; | |||
va_list va; | |||
/* get internal structure */ | |||
if (file == NULL) | |||
return -1; | |||
state = (gz_statep)file; | |||
strm = &(state->strm); | |||
/* check that we're writing and that there's no error */ | |||
if (state->mode != GZ_WRITE || state->err != Z_OK) | |||
return 0; | |||
/* make sure we have some buffer space */ | |||
if (state->size == 0 && gz_init(state) == -1) | |||
return 0; | |||
/* check for seek request */ | |||
if (state->seek) { | |||
state->seek = 0; | |||
if (gz_zero(state, state->skip) == -1) | |||
return 0; | |||
} | |||
/* consume whatever's left in the input buffer */ | |||
if (strm->avail_in && gz_comp(state, Z_NO_FLUSH) == -1) | |||
return 0; | |||
/* do the printf() into the input buffer, put length in len */ | |||
size = (int)(state->size); | |||
state->in[size - 1] = 0; | |||
va_start(va, format); | |||
#ifdef NO_vsnprintf | |||
# ifdef HAS_vsprintf_void | |||
(void)vsprintf(state->in, format, va); | |||
va_end(va); | |||
for (len = 0; len < size; len++) | |||
if (state->in[len] == 0) break; | |||
# else | |||
len = vsprintf(state->in, format, va); | |||
va_end(va); | |||
# endif | |||
#else | |||
# ifdef HAS_vsnprintf_void | |||
(void)vsnprintf(state->in, size, format, va); | |||
va_end(va); | |||
len = strlen(state->in); | |||
# else | |||
len = vsnprintf((char *)(state->in), size, format, va); | |||
va_end(va); | |||
# endif | |||
#endif | |||
/* check that printf() results fit in buffer */ | |||
if (len <= 0 || len >= (int)size || state->in[size - 1] != 0) | |||
return 0; | |||
/* update buffer and position, defer compression until needed */ | |||
strm->avail_in = (unsigned)len; | |||
strm->next_in = state->in; | |||
state->pos += len; | |||
return len; | |||
} | |||
#else /* !STDC */ | |||
/* -- see zlib.h -- */ | |||
int ZEXPORTVA gzprintf (file, format, a1, a2, a3, a4, a5, a6, a7, a8, a9, a10, | |||
a11, a12, a13, a14, a15, a16, a17, a18, a19, a20) | |||
gzFile file; | |||
const char *format; | |||
int a1, a2, a3, a4, a5, a6, a7, a8, a9, a10, | |||
a11, a12, a13, a14, a15, a16, a17, a18, a19, a20; | |||
{ | |||
int size, len; | |||
gz_statep state; | |||
z_streamp strm; | |||
/* get internal structure */ | |||
if (file == NULL) | |||
return -1; | |||
state = (gz_statep)file; | |||
strm = &(state->strm); | |||
/* check that we're writing and that there's no error */ | |||
if (state->mode != GZ_WRITE || state->err != Z_OK) | |||
return 0; | |||
/* make sure we have some buffer space */ | |||
if (state->size == 0 && gz_init(state) == -1) | |||
return 0; | |||
/* check for seek request */ | |||
if (state->seek) { | |||
state->seek = 0; | |||
if (gz_zero(state, state->skip) == -1) | |||
return 0; | |||
} | |||
/* consume whatever's left in the input buffer */ | |||
if (strm->avail_in && gz_comp(state, Z_NO_FLUSH) == -1) | |||
return 0; | |||
/* do the printf() into the input buffer, put length in len */ | |||
size = (int)(state->size); | |||
state->in[size - 1] = 0; | |||
#ifdef NO_snprintf | |||
# ifdef HAS_sprintf_void | |||
sprintf(state->in, format, a1, a2, a3, a4, a5, a6, a7, a8, | |||
a9, a10, a11, a12, a13, a14, a15, a16, a17, a18, a19, a20); | |||
for (len = 0; len < size; len++) | |||
if (state->in[len] == 0) break; | |||
# else | |||
len = sprintf(state->in, format, a1, a2, a3, a4, a5, a6, a7, a8, | |||
a9, a10, a11, a12, a13, a14, a15, a16, a17, a18, a19, a20); | |||
# endif | |||
#else | |||
# ifdef HAS_snprintf_void | |||
snprintf(state->in, size, format, a1, a2, a3, a4, a5, a6, a7, a8, | |||
a9, a10, a11, a12, a13, a14, a15, a16, a17, a18, a19, a20); | |||
len = strlen(state->in); | |||
# else | |||
len = snprintf(state->in, size, format, a1, a2, a3, a4, a5, a6, a7, a8, | |||
a9, a10, a11, a12, a13, a14, a15, a16, a17, a18, a19, a20); | |||
# endif | |||
#endif | |||
/* check that printf() results fit in buffer */ | |||
if (len <= 0 || len >= (int)size || state->in[size - 1] != 0) | |||
return 0; | |||
/* update buffer and position, defer compression until needed */ | |||
strm->avail_in = (unsigned)len; | |||
strm->next_in = state->in; | |||
state->pos += len; | |||
return len; | |||
} | |||
#endif | |||
/* -- see zlib.h -- */ | |||
int ZEXPORT gzflush(file, flush) | |||
gzFile file; | |||
int flush; | |||
{ | |||
gz_statep state; | |||
/* get internal structure */ | |||
if (file == NULL) | |||
return -1; | |||
state = (gz_statep)file; | |||
/* check that we're writing and that there's no error */ | |||
if (state->mode != GZ_WRITE || state->err != Z_OK) | |||
return Z_STREAM_ERROR; | |||
/* check flush parameter */ | |||
if (flush < 0 || flush > Z_FINISH) | |||
return Z_STREAM_ERROR; | |||
/* check for seek request */ | |||
if (state->seek) { | |||
state->seek = 0; | |||
if (gz_zero(state, state->skip) == -1) | |||
return -1; | |||
} | |||
/* compress remaining data with requested flush */ | |||
gz_comp(state, flush); | |||
return state->err; | |||
} | |||
/* -- see zlib.h -- */ | |||
int ZEXPORT gzsetparams(file, level, strategy) | |||
gzFile file; | |||
int level; | |||
int strategy; | |||
{ | |||
gz_statep state; | |||
z_streamp strm; | |||
/* get internal structure */ | |||
if (file == NULL) | |||
return Z_STREAM_ERROR; | |||
state = (gz_statep)file; | |||
strm = &(state->strm); | |||
/* check that we're writing and that there's no error */ | |||
if (state->mode != GZ_WRITE || state->err != Z_OK) | |||
return Z_STREAM_ERROR; | |||
/* if no change is requested, then do nothing */ | |||
if (level == state->level && strategy == state->strategy) | |||
return Z_OK; | |||
/* check for seek request */ | |||
if (state->seek) { | |||
state->seek = 0; | |||
if (gz_zero(state, state->skip) == -1) | |||
return -1; | |||
} | |||
/* change compression parameters for subsequent input */ | |||
if (state->size) { | |||
/* flush previous input with previous parameters before changing */ | |||
if (strm->avail_in && gz_comp(state, Z_PARTIAL_FLUSH) == -1) | |||
return state->err; | |||
deflateParams(strm, level, strategy); | |||
} | |||
state->level = level; | |||
state->strategy = strategy; | |||
return Z_OK; | |||
} | |||
/* -- see zlib.h -- */ | |||
int ZEXPORT gzclose_w(file) | |||
gzFile file; | |||
{ | |||
int ret = 0; | |||
gz_statep state; | |||
/* get internal structure */ | |||
if (file == NULL) | |||
return Z_STREAM_ERROR; | |||
state = (gz_statep)file; | |||
/* check that we're writing */ | |||
if (state->mode != GZ_WRITE) | |||
return Z_STREAM_ERROR; | |||
/* check for seek request */ | |||
if (state->seek) { | |||
state->seek = 0; | |||
ret += gz_zero(state, state->skip); | |||
} | |||
/* flush, free memory, and close file */ | |||
ret += gz_comp(state, Z_FINISH); | |||
(void)deflateEnd(&(state->strm)); | |||
free(state->out); | |||
free(state->in); | |||
gz_error(state, Z_OK, NULL); | |||
free(state->path); | |||
ret += close(state->fd); | |||
free(state); | |||
return ret ? Z_ERRNO : Z_OK; | |||
} |
@@ -1,632 +0,0 @@ | |||
/* infback.c -- inflate using a call-back interface | |||
* Copyright (C) 1995-2009 Mark Adler | |||
* For conditions of distribution and use, see copyright notice in zlib.h | |||
*/ | |||
/* | |||
This code is largely copied from inflate.c. Normally either infback.o or | |||
inflate.o would be linked into an application--not both. The interface | |||
with inffast.c is retained so that optimized assembler-coded versions of | |||
inflate_fast() can be used with either inflate.c or infback.c. | |||
*/ | |||
#include "zutil.h" | |||
#include "inftrees.h" | |||
#include "inflate.h" | |||
#include "inffast.h" | |||
/* function prototypes */ | |||
local void fixedtables OF((struct inflate_state FAR *state)); | |||
/* | |||
strm provides memory allocation functions in zalloc and zfree, or | |||
Z_NULL to use the library memory allocation functions. | |||
windowBits is in the range 8..15, and window is a user-supplied | |||
window and output buffer that is 2**windowBits bytes. | |||
*/ | |||
int ZEXPORT inflateBackInit_(strm, windowBits, window, version, stream_size) | |||
z_streamp strm; | |||
int windowBits; | |||
unsigned char FAR *window; | |||
const char *version; | |||
int stream_size; | |||
{ | |||
struct inflate_state FAR *state; | |||
if (version == Z_NULL || version[0] != ZLIB_VERSION[0] || | |||
stream_size != (int)(sizeof(z_stream))) | |||
return Z_VERSION_ERROR; | |||
if (strm == Z_NULL || window == Z_NULL || | |||
windowBits < 8 || windowBits > 15) | |||
return Z_STREAM_ERROR; | |||
strm->msg = Z_NULL; /* in case we return an error */ | |||
if (strm->zalloc == (alloc_func)0) { | |||
strm->zalloc = zcalloc; | |||
strm->opaque = (voidpf)0; | |||
} | |||
if (strm->zfree == (free_func)0) strm->zfree = zcfree; | |||
state = (struct inflate_state FAR *)ZALLOC(strm, 1, | |||
sizeof(struct inflate_state)); | |||
if (state == Z_NULL) return Z_MEM_ERROR; | |||
Tracev((stderr, "inflate: allocated\n")); | |||
strm->state = (struct internal_state FAR *)state; | |||
state->dmax = 32768U; | |||
state->wbits = windowBits; | |||
state->wsize = 1U << windowBits; | |||
state->window = window; | |||
state->wnext = 0; | |||
state->whave = 0; | |||
return Z_OK; | |||
} | |||
/* | |||
Return state with length and distance decoding tables and index sizes set to | |||
fixed code decoding. Normally this returns fixed tables from inffixed.h. | |||
If BUILDFIXED is defined, then instead this routine builds the tables the | |||
first time it's called, and returns those tables the first time and | |||
thereafter. This reduces the size of the code by about 2K bytes, in | |||
exchange for a little execution time. However, BUILDFIXED should not be | |||
used for threaded applications, since the rewriting of the tables and virgin | |||
may not be thread-safe. | |||
*/ | |||
local void fixedtables(state) | |||
struct inflate_state FAR *state; | |||
{ | |||
#ifdef BUILDFIXED | |||
static int virgin = 1; | |||
static code *lenfix, *distfix; | |||
static code fixed[544]; | |||
/* build fixed huffman tables if first call (may not be thread safe) */ | |||
if (virgin) { | |||
unsigned sym, bits; | |||
static code *next; | |||
/* literal/length table */ | |||
sym = 0; | |||
while (sym < 144) state->lens[sym++] = 8; | |||
while (sym < 256) state->lens[sym++] = 9; | |||
while (sym < 280) state->lens[sym++] = 7; | |||
while (sym < 288) state->lens[sym++] = 8; | |||
next = fixed; | |||
lenfix = next; | |||
bits = 9; | |||
inflate_table(LENS, state->lens, 288, &(next), &(bits), state->work); | |||
/* distance table */ | |||
sym = 0; | |||
while (sym < 32) state->lens[sym++] = 5; | |||
distfix = next; | |||
bits = 5; | |||
inflate_table(DISTS, state->lens, 32, &(next), &(bits), state->work); | |||
/* do this just once */ | |||
virgin = 0; | |||
} | |||
#else /* !BUILDFIXED */ | |||
# include "inffixed.h" | |||
#endif /* BUILDFIXED */ | |||
state->lencode = lenfix; | |||
state->lenbits = 9; | |||
state->distcode = distfix; | |||
state->distbits = 5; | |||
} | |||
/* Macros for inflateBack(): */ | |||
/* Load returned state from inflate_fast() */ | |||
#define LOAD() \ | |||
do { \ | |||
put = strm->next_out; \ | |||
left = strm->avail_out; \ | |||
next = strm->next_in; \ | |||
have = strm->avail_in; \ | |||
hold = state->hold; \ | |||
bits = state->bits; \ | |||
} while (0) | |||
/* Set state from registers for inflate_fast() */ | |||
#define RESTORE() \ | |||
do { \ | |||
strm->next_out = put; \ | |||
strm->avail_out = left; \ | |||
strm->next_in = next; \ | |||
strm->avail_in = have; \ | |||
state->hold = hold; \ | |||
state->bits = bits; \ | |||
} while (0) | |||
/* Clear the input bit accumulator */ | |||
#define INITBITS() \ | |||
do { \ | |||
hold = 0; \ | |||
bits = 0; \ | |||
} while (0) | |||
/* Assure that some input is available. If input is requested, but denied, | |||
then return a Z_BUF_ERROR from inflateBack(). */ | |||
#define PULL() \ | |||
do { \ | |||
if (have == 0) { \ | |||
have = in(in_desc, &next); \ | |||
if (have == 0) { \ | |||
next = Z_NULL; \ | |||
ret = Z_BUF_ERROR; \ | |||
goto inf_leave; \ | |||
} \ | |||
} \ | |||
} while (0) | |||
/* Get a byte of input into the bit accumulator, or return from inflateBack() | |||
with an error if there is no input available. */ | |||
#define PULLBYTE() \ | |||
do { \ | |||
PULL(); \ | |||
have--; \ | |||
hold += (unsigned long)(*next++) << bits; \ | |||
bits += 8; \ | |||
} while (0) | |||
/* Assure that there are at least n bits in the bit accumulator. If there is | |||
not enough available input to do that, then return from inflateBack() with | |||
an error. */ | |||
#define NEEDBITS(n) \ | |||
do { \ | |||
while (bits < (unsigned)(n)) \ | |||
PULLBYTE(); \ | |||
} while (0) | |||
/* Return the low n bits of the bit accumulator (n < 16) */ | |||
#define BITS(n) \ | |||
((unsigned)hold & ((1U << (n)) - 1)) | |||
/* Remove n bits from the bit accumulator */ | |||
#define DROPBITS(n) \ | |||
do { \ | |||
hold >>= (n); \ | |||
bits -= (unsigned)(n); \ | |||
} while (0) | |||
/* Remove zero to seven bits as needed to go to a byte boundary */ | |||
#define BYTEBITS() \ | |||
do { \ | |||
hold >>= bits & 7; \ | |||
bits -= bits & 7; \ | |||
} while (0) | |||
/* Assure that some output space is available, by writing out the window | |||
if it's full. If the write fails, return from inflateBack() with a | |||
Z_BUF_ERROR. */ | |||
#define ROOM() \ | |||
do { \ | |||
if (left == 0) { \ | |||
put = state->window; \ | |||
left = state->wsize; \ | |||
state->whave = left; \ | |||
if (out(out_desc, put, left)) { \ | |||
ret = Z_BUF_ERROR; \ | |||
goto inf_leave; \ | |||
} \ | |||
} \ | |||
} while (0) | |||
/* | |||
strm provides the memory allocation functions and window buffer on input, | |||
and provides information on the unused input on return. For Z_DATA_ERROR | |||
returns, strm will also provide an error message. | |||
in() and out() are the call-back input and output functions. When | |||
inflateBack() needs more input, it calls in(). When inflateBack() has | |||
filled the window with output, or when it completes with data in the | |||
window, it calls out() to write out the data. The application must not | |||
change the provided input until in() is called again or inflateBack() | |||
returns. The application must not change the window/output buffer until | |||
inflateBack() returns. | |||
in() and out() are called with a descriptor parameter provided in the | |||
inflateBack() call. This parameter can be a structure that provides the | |||
information required to do the read or write, as well as accumulated | |||
information on the input and output such as totals and check values. | |||
in() should return zero on failure. out() should return non-zero on | |||
failure. If either in() or out() fails, than inflateBack() returns a | |||
Z_BUF_ERROR. strm->next_in can be checked for Z_NULL to see whether it | |||
was in() or out() that caused in the error. Otherwise, inflateBack() | |||
returns Z_STREAM_END on success, Z_DATA_ERROR for an deflate format | |||
error, or Z_MEM_ERROR if it could not allocate memory for the state. | |||
inflateBack() can also return Z_STREAM_ERROR if the input parameters | |||
are not correct, i.e. strm is Z_NULL or the state was not initialized. | |||
*/ | |||
int ZEXPORT inflateBack(strm, in, in_desc, out, out_desc) | |||
z_streamp strm; | |||
in_func in; | |||
void FAR *in_desc; | |||
out_func out; | |||
void FAR *out_desc; | |||
{ | |||
struct inflate_state FAR *state; | |||
unsigned char FAR *next; /* next input */ | |||
unsigned char FAR *put; /* next output */ | |||
unsigned have, left; /* available input and output */ | |||
unsigned long hold; /* bit buffer */ | |||
unsigned bits; /* bits in bit buffer */ | |||
unsigned copy; /* number of stored or match bytes to copy */ | |||
unsigned char FAR *from; /* where to copy match bytes from */ | |||
code here; /* current decoding table entry */ | |||
code last; /* parent table entry */ | |||
unsigned len; /* length to copy for repeats, bits to drop */ | |||
int ret; /* return code */ | |||
static const unsigned short order[19] = /* permutation of code lengths */ | |||
{16, 17, 18, 0, 8, 7, 9, 6, 10, 5, 11, 4, 12, 3, 13, 2, 14, 1, 15}; | |||
/* Check that the strm exists and that the state was initialized */ | |||
if (strm == Z_NULL || strm->state == Z_NULL) | |||
return Z_STREAM_ERROR; | |||
state = (struct inflate_state FAR *)strm->state; | |||
/* Reset the state */ | |||
strm->msg = Z_NULL; | |||
state->mode = TYPE; | |||
state->last = 0; | |||
state->whave = 0; | |||
next = strm->next_in; | |||
have = next != Z_NULL ? strm->avail_in : 0; | |||
hold = 0; | |||
bits = 0; | |||
put = state->window; | |||
left = state->wsize; | |||
/* Inflate until end of block marked as last */ | |||
for (;;) | |||
switch (state->mode) { | |||
case TYPE: | |||
/* determine and dispatch block type */ | |||
if (state->last) { | |||
BYTEBITS(); | |||
state->mode = DONE; | |||
break; | |||
} | |||
NEEDBITS(3); | |||
state->last = BITS(1); | |||
DROPBITS(1); | |||
switch (BITS(2)) { | |||
case 0: /* stored block */ | |||
Tracev((stderr, "inflate: stored block%s\n", | |||
state->last ? " (last)" : "")); | |||
state->mode = STORED; | |||
break; | |||
case 1: /* fixed block */ | |||
fixedtables(state); | |||
Tracev((stderr, "inflate: fixed codes block%s\n", | |||
state->last ? " (last)" : "")); | |||
state->mode = LEN; /* decode codes */ | |||
break; | |||
case 2: /* dynamic block */ | |||
Tracev((stderr, "inflate: dynamic codes block%s\n", | |||
state->last ? " (last)" : "")); | |||
state->mode = TABLE; | |||
break; | |||
case 3: | |||
strm->msg = (char *)"invalid block type"; | |||
state->mode = BAD; | |||
} | |||
DROPBITS(2); | |||
break; | |||
case STORED: | |||
/* get and verify stored block length */ | |||
BYTEBITS(); /* go to byte boundary */ | |||
NEEDBITS(32); | |||
if ((hold & 0xffff) != ((hold >> 16) ^ 0xffff)) { | |||
strm->msg = (char *)"invalid stored block lengths"; | |||
state->mode = BAD; | |||
break; | |||
} | |||
state->length = (unsigned)hold & 0xffff; | |||
Tracev((stderr, "inflate: stored length %u\n", | |||
state->length)); | |||
INITBITS(); | |||
/* copy stored block from input to output */ | |||
while (state->length != 0) { | |||
copy = state->length; | |||
PULL(); | |||
ROOM(); | |||
if (copy > have) copy = have; | |||
if (copy > left) copy = left; | |||
zmemcpy(put, next, copy); | |||
have -= copy; | |||
next += copy; | |||
left -= copy; | |||
put += copy; | |||
state->length -= copy; | |||
} | |||
Tracev((stderr, "inflate: stored end\n")); | |||
state->mode = TYPE; | |||
break; | |||
case TABLE: | |||
/* get dynamic table entries descriptor */ | |||
NEEDBITS(14); | |||
state->nlen = BITS(5) + 257; | |||
DROPBITS(5); | |||
state->ndist = BITS(5) + 1; | |||
DROPBITS(5); | |||
state->ncode = BITS(4) + 4; | |||
DROPBITS(4); | |||
#ifndef PKZIP_BUG_WORKAROUND | |||
if (state->nlen > 286 || state->ndist > 30) { | |||
strm->msg = (char *)"too many length or distance symbols"; | |||
state->mode = BAD; | |||
break; | |||
} | |||
#endif | |||
Tracev((stderr, "inflate: table sizes ok\n")); | |||
/* get code length code lengths (not a typo) */ | |||
state->have = 0; | |||
while (state->have < state->ncode) { | |||
NEEDBITS(3); | |||
state->lens[order[state->have++]] = (unsigned short)BITS(3); | |||
DROPBITS(3); | |||
} | |||
while (state->have < 19) | |||
state->lens[order[state->have++]] = 0; | |||
state->next = state->codes; | |||
state->lencode = (code const FAR *)(state->next); | |||
state->lenbits = 7; | |||
ret = inflate_table(CODES, state->lens, 19, &(state->next), | |||
&(state->lenbits), state->work); | |||
if (ret) { | |||
strm->msg = (char *)"invalid code lengths set"; | |||
state->mode = BAD; | |||
break; | |||
} | |||
Tracev((stderr, "inflate: code lengths ok\n")); | |||
/* get length and distance code code lengths */ | |||
state->have = 0; | |||
while (state->have < state->nlen + state->ndist) { | |||
for (;;) { | |||
here = state->lencode[BITS(state->lenbits)]; | |||
if ((unsigned)(here.bits) <= bits) break; | |||
PULLBYTE(); | |||
} | |||
if (here.val < 16) { | |||
NEEDBITS(here.bits); | |||
DROPBITS(here.bits); | |||
state->lens[state->have++] = here.val; | |||
} | |||
else { | |||
if (here.val == 16) { | |||
NEEDBITS(here.bits + 2); | |||
DROPBITS(here.bits); | |||
if (state->have == 0) { | |||
strm->msg = (char *)"invalid bit length repeat"; | |||
state->mode = BAD; | |||
break; | |||
} | |||
len = (unsigned)(state->lens[state->have - 1]); | |||
copy = 3 + BITS(2); | |||
DROPBITS(2); | |||
} | |||
else if (here.val == 17) { | |||
NEEDBITS(here.bits + 3); | |||
DROPBITS(here.bits); | |||
len = 0; | |||
copy = 3 + BITS(3); | |||
DROPBITS(3); | |||
} | |||
else { | |||
NEEDBITS(here.bits + 7); | |||
DROPBITS(here.bits); | |||
len = 0; | |||
copy = 11 + BITS(7); | |||
DROPBITS(7); | |||
} | |||
if (state->have + copy > state->nlen + state->ndist) { | |||
strm->msg = (char *)"invalid bit length repeat"; | |||
state->mode = BAD; | |||
break; | |||
} | |||
while (copy--) | |||
state->lens[state->have++] = (unsigned short)len; | |||
} | |||
} | |||
/* handle error breaks in while */ | |||
if (state->mode == BAD) break; | |||
/* check for end-of-block code (better have one) */ | |||
if (state->lens[256] == 0) { | |||
strm->msg = (char *)"invalid code -- missing end-of-block"; | |||
state->mode = BAD; | |||
break; | |||
} | |||
/* build code tables -- note: do not change the lenbits or distbits | |||
values here (9 and 6) without reading the comments in inftrees.h | |||
concerning the ENOUGH constants, which depend on those values */ | |||
state->next = state->codes; | |||
state->lencode = (code const FAR *)(state->next); | |||
state->lenbits = 9; | |||
ret = inflate_table(LENS, state->lens, state->nlen, &(state->next), | |||
&(state->lenbits), state->work); | |||
if (ret) { | |||
strm->msg = (char *)"invalid literal/lengths set"; | |||
state->mode = BAD; | |||
break; | |||
} | |||
state->distcode = (code const FAR *)(state->next); | |||
state->distbits = 6; | |||
ret = inflate_table(DISTS, state->lens + state->nlen, state->ndist, | |||
&(state->next), &(state->distbits), state->work); | |||
if (ret) { | |||
strm->msg = (char *)"invalid distances set"; | |||
state->mode = BAD; | |||
break; | |||
} | |||
Tracev((stderr, "inflate: codes ok\n")); | |||
state->mode = LEN; | |||
case LEN: | |||
/* use inflate_fast() if we have enough input and output */ | |||
if (have >= 6 && left >= 258) { | |||
RESTORE(); | |||
if (state->whave < state->wsize) | |||
state->whave = state->wsize - left; | |||
inflate_fast(strm, state->wsize); | |||
LOAD(); | |||
break; | |||
} | |||
/* get a literal, length, or end-of-block code */ | |||
for (;;) { | |||
here = state->lencode[BITS(state->lenbits)]; | |||
if ((unsigned)(here.bits) <= bits) break; | |||
PULLBYTE(); | |||
} | |||
if (here.op && (here.op & 0xf0) == 0) { | |||
last = here; | |||
for (;;) { | |||
here = state->lencode[last.val + | |||
(BITS(last.bits + last.op) >> last.bits)]; | |||
if ((unsigned)(last.bits + here.bits) <= bits) break; | |||
PULLBYTE(); | |||
} | |||
DROPBITS(last.bits); | |||
} | |||
DROPBITS(here.bits); | |||
state->length = (unsigned)here.val; | |||
/* process literal */ | |||
if (here.op == 0) { | |||
Tracevv((stderr, here.val >= 0x20 && here.val < 0x7f ? | |||
"inflate: literal '%c'\n" : | |||
"inflate: literal 0x%02x\n", here.val)); | |||
ROOM(); | |||
*put++ = (unsigned char)(state->length); | |||
left--; | |||
state->mode = LEN; | |||
break; | |||
} | |||
/* process end of block */ | |||
if (here.op & 32) { | |||
Tracevv((stderr, "inflate: end of block\n")); | |||
state->mode = TYPE; | |||
break; | |||
} | |||
/* invalid code */ | |||
if (here.op & 64) { | |||
strm->msg = (char *)"invalid literal/length code"; | |||
state->mode = BAD; | |||
break; | |||
} | |||
/* length code -- get extra bits, if any */ | |||
state->extra = (unsigned)(here.op) & 15; | |||
if (state->extra != 0) { | |||
NEEDBITS(state->extra); | |||
state->length += BITS(state->extra); | |||
DROPBITS(state->extra); | |||
} | |||
Tracevv((stderr, "inflate: length %u\n", state->length)); | |||
/* get distance code */ | |||
for (;;) { | |||
here = state->distcode[BITS(state->distbits)]; | |||
if ((unsigned)(here.bits) <= bits) break; | |||
PULLBYTE(); | |||
} | |||
if ((here.op & 0xf0) == 0) { | |||
last = here; | |||
for (;;) { | |||
here = state->distcode[last.val + | |||
(BITS(last.bits + last.op) >> last.bits)]; | |||
if ((unsigned)(last.bits + here.bits) <= bits) break; | |||
PULLBYTE(); | |||
} | |||
DROPBITS(last.bits); | |||
} | |||
DROPBITS(here.bits); | |||
if (here.op & 64) { | |||
strm->msg = (char *)"invalid distance code"; | |||
state->mode = BAD; | |||
break; | |||
} | |||
state->offset = (unsigned)here.val; | |||
/* get distance extra bits, if any */ | |||
state->extra = (unsigned)(here.op) & 15; | |||
if (state->extra != 0) { | |||
NEEDBITS(state->extra); | |||
state->offset += BITS(state->extra); | |||
DROPBITS(state->extra); | |||
} | |||
if (state->offset > state->wsize - (state->whave < state->wsize ? | |||
left : 0)) { | |||
strm->msg = (char *)"invalid distance too far back"; | |||
state->mode = BAD; | |||
break; | |||
} | |||
Tracevv((stderr, "inflate: distance %u\n", state->offset)); | |||
/* copy match from window to output */ | |||
do { | |||
ROOM(); | |||
copy = state->wsize - state->offset; | |||
if (copy < left) { | |||
from = put + copy; | |||
copy = left - copy; | |||
} | |||
else { | |||
from = put - state->offset; | |||
copy = left; | |||
} | |||
if (copy > state->length) copy = state->length; | |||
state->length -= copy; | |||
left -= copy; | |||
do { | |||
*put++ = *from++; | |||
} while (--copy); | |||
} while (state->length != 0); | |||
break; | |||
case DONE: | |||
/* inflate stream terminated properly -- write leftover output */ | |||
ret = Z_STREAM_END; | |||
if (left < state->wsize) { | |||
if (out(out_desc, state->window, state->wsize - left)) | |||
ret = Z_BUF_ERROR; | |||
} | |||
goto inf_leave; | |||
case BAD: | |||
ret = Z_DATA_ERROR; | |||
goto inf_leave; | |||
default: /* can't happen, but makes compilers happy */ | |||
ret = Z_STREAM_ERROR; | |||
goto inf_leave; | |||
} | |||
/* Return unused input */ | |||
inf_leave: | |||
strm->next_in = next; | |||
strm->avail_in = have; | |||
return ret; | |||
} | |||
int ZEXPORT inflateBackEnd(strm) | |||
z_streamp strm; | |||
{ | |||
if (strm == Z_NULL || strm->state == Z_NULL || strm->zfree == (free_func)0) | |||
return Z_STREAM_ERROR; | |||
ZFREE(strm, strm->state); | |||
strm->state = Z_NULL; | |||
Tracev((stderr, "inflate: end\n")); | |||
return Z_OK; | |||
} |
@@ -1,340 +0,0 @@ | |||
/* inffast.c -- fast decoding | |||
* Copyright (C) 1995-2008, 2010 Mark Adler | |||
* For conditions of distribution and use, see copyright notice in zlib.h | |||
*/ | |||
#include "zutil.h" | |||
#include "inftrees.h" | |||
#include "inflate.h" | |||
#include "inffast.h" | |||
#ifndef ASMINF | |||
/* Allow machine dependent optimization for post-increment or pre-increment. | |||
Based on testing to date, | |||
Pre-increment preferred for: | |||
- PowerPC G3 (Adler) | |||
- MIPS R5000 (Randers-Pehrson) | |||
Post-increment preferred for: | |||
- none | |||
No measurable difference: | |||
- Pentium III (Anderson) | |||
- M68060 (Nikl) | |||
*/ | |||
#ifdef POSTINC | |||
# define OFF 0 | |||
# define PUP(a) *(a)++ | |||
#else | |||
# define OFF 1 | |||
# define PUP(a) *++(a) | |||
#endif | |||
/* | |||
Decode literal, length, and distance codes and write out the resulting | |||
literal and match bytes until either not enough input or output is | |||
available, an end-of-block is encountered, or a data error is encountered. | |||
When large enough input and output buffers are supplied to inflate(), for | |||
example, a 16K input buffer and a 64K output buffer, more than 95% of the | |||
inflate execution time is spent in this routine. | |||
Entry assumptions: | |||
state->mode == LEN | |||
strm->avail_in >= 6 | |||
strm->avail_out >= 258 | |||
start >= strm->avail_out | |||
state->bits < 8 | |||
On return, state->mode is one of: | |||
LEN -- ran out of enough output space or enough available input | |||
TYPE -- reached end of block code, inflate() to interpret next block | |||
BAD -- error in block data | |||
Notes: | |||
- The maximum input bits used by a length/distance pair is 15 bits for the | |||
length code, 5 bits for the length extra, 15 bits for the distance code, | |||
and 13 bits for the distance extra. This totals 48 bits, or six bytes. | |||
Therefore if strm->avail_in >= 6, then there is enough input to avoid | |||
checking for available input while decoding. | |||
- The maximum bytes that a single length/distance pair can output is 258 | |||
bytes, which is the maximum length that can be coded. inflate_fast() | |||
requires strm->avail_out >= 258 for each loop to avoid checking for | |||
output space. | |||
*/ | |||
void ZLIB_INTERNAL inflate_fast(strm, start) | |||
z_streamp strm; | |||
unsigned start; /* inflate()'s starting value for strm->avail_out */ | |||
{ | |||
struct inflate_state FAR *state; | |||
unsigned char FAR *in; /* local strm->next_in */ | |||
unsigned char FAR *last; /* while in < last, enough input available */ | |||
unsigned char FAR *out; /* local strm->next_out */ | |||
unsigned char FAR *beg; /* inflate()'s initial strm->next_out */ | |||
unsigned char FAR *end; /* while out < end, enough space available */ | |||
#ifdef INFLATE_STRICT | |||
unsigned dmax; /* maximum distance from zlib header */ | |||
#endif | |||
unsigned wsize; /* window size or zero if not using window */ | |||
unsigned whave; /* valid bytes in the window */ | |||
unsigned wnext; /* window write index */ | |||
unsigned char FAR *window; /* allocated sliding window, if wsize != 0 */ | |||
unsigned long hold; /* local strm->hold */ | |||
unsigned bits; /* local strm->bits */ | |||
code const FAR *lcode; /* local strm->lencode */ | |||
code const FAR *dcode; /* local strm->distcode */ | |||
unsigned lmask; /* mask for first level of length codes */ | |||
unsigned dmask; /* mask for first level of distance codes */ | |||
code here; /* retrieved table entry */ | |||
unsigned op; /* code bits, operation, extra bits, or */ | |||
/* window position, window bytes to copy */ | |||
unsigned len; /* match length, unused bytes */ | |||
unsigned dist; /* match distance */ | |||
unsigned char FAR *from; /* where to copy match from */ | |||
/* copy state to local variables */ | |||
state = (struct inflate_state FAR *)strm->state; | |||
in = strm->next_in - OFF; | |||
last = in + (strm->avail_in - 5); | |||
out = strm->next_out - OFF; | |||
beg = out - (start - strm->avail_out); | |||
end = out + (strm->avail_out - 257); | |||
#ifdef INFLATE_STRICT | |||
dmax = state->dmax; | |||
#endif | |||
wsize = state->wsize; | |||
whave = state->whave; | |||
wnext = state->wnext; | |||
window = state->window; | |||
hold = state->hold; | |||
bits = state->bits; | |||
lcode = state->lencode; | |||
dcode = state->distcode; | |||
lmask = (1U << state->lenbits) - 1; | |||
dmask = (1U << state->distbits) - 1; | |||
/* decode literals and length/distances until end-of-block or not enough | |||
input data or output space */ | |||
do { | |||
if (bits < 15) { | |||
hold += (unsigned long)(PUP(in)) << bits; | |||
bits += 8; | |||
hold += (unsigned long)(PUP(in)) << bits; | |||
bits += 8; | |||
} | |||
here = lcode[hold & lmask]; | |||
dolen: | |||
op = (unsigned)(here.bits); | |||
hold >>= op; | |||
bits -= op; | |||
op = (unsigned)(here.op); | |||
if (op == 0) { /* literal */ | |||
Tracevv((stderr, here.val >= 0x20 && here.val < 0x7f ? | |||
"inflate: literal '%c'\n" : | |||
"inflate: literal 0x%02x\n", here.val)); | |||
PUP(out) = (unsigned char)(here.val); | |||
} | |||
else if (op & 16) { /* length base */ | |||
len = (unsigned)(here.val); | |||
op &= 15; /* number of extra bits */ | |||
if (op) { | |||
if (bits < op) { | |||
hold += (unsigned long)(PUP(in)) << bits; | |||
bits += 8; | |||
} | |||
len += (unsigned)hold & ((1U << op) - 1); | |||
hold >>= op; | |||
bits -= op; | |||
} | |||
Tracevv((stderr, "inflate: length %u\n", len)); | |||
if (bits < 15) { | |||
hold += (unsigned long)(PUP(in)) << bits; | |||
bits += 8; | |||
hold += (unsigned long)(PUP(in)) << bits; | |||
bits += 8; | |||
} | |||
here = dcode[hold & dmask]; | |||
dodist: | |||
op = (unsigned)(here.bits); | |||
hold >>= op; | |||
bits -= op; | |||
op = (unsigned)(here.op); | |||
if (op & 16) { /* distance base */ | |||
dist = (unsigned)(here.val); | |||
op &= 15; /* number of extra bits */ | |||
if (bits < op) { | |||
hold += (unsigned long)(PUP(in)) << bits; | |||
bits += 8; | |||
if (bits < op) { | |||
hold += (unsigned long)(PUP(in)) << bits; | |||
bits += 8; | |||
} | |||
} | |||
dist += (unsigned)hold & ((1U << op) - 1); | |||
#ifdef INFLATE_STRICT | |||
if (dist > dmax) { | |||
strm->msg = (char *)"invalid distance too far back"; | |||
state->mode = BAD; | |||
break; | |||
} | |||
#endif | |||
hold >>= op; | |||
bits -= op; | |||
Tracevv((stderr, "inflate: distance %u\n", dist)); | |||
op = (unsigned)(out - beg); /* max distance in output */ | |||
if (dist > op) { /* see if copy from window */ | |||
op = dist - op; /* distance back in window */ | |||
if (op > whave) { | |||
if (state->sane) { | |||
strm->msg = | |||
(char *)"invalid distance too far back"; | |||
state->mode = BAD; | |||
break; | |||
} | |||
#ifdef INFLATE_ALLOW_INVALID_DISTANCE_TOOFAR_ARRR | |||
if (len <= op - whave) { | |||
do { | |||
PUP(out) = 0; | |||
} while (--len); | |||
continue; | |||
} | |||
len -= op - whave; | |||
do { | |||
PUP(out) = 0; | |||
} while (--op > whave); | |||
if (op == 0) { | |||
from = out - dist; | |||
do { | |||
PUP(out) = PUP(from); | |||
} while (--len); | |||
continue; | |||
} | |||
#endif | |||
} | |||
from = window - OFF; | |||
if (wnext == 0) { /* very common case */ | |||
from += wsize - op; | |||
if (op < len) { /* some from window */ | |||
len -= op; | |||
do { | |||
PUP(out) = PUP(from); | |||
} while (--op); | |||
from = out - dist; /* rest from output */ | |||
} | |||
} | |||
else if (wnext < op) { /* wrap around window */ | |||
from += wsize + wnext - op; | |||
op -= wnext; | |||
if (op < len) { /* some from end of window */ | |||
len -= op; | |||
do { | |||
PUP(out) = PUP(from); | |||
} while (--op); | |||
from = window - OFF; | |||
if (wnext < len) { /* some from start of window */ | |||
op = wnext; | |||
len -= op; | |||
do { | |||
PUP(out) = PUP(from); | |||
} while (--op); | |||
from = out - dist; /* rest from output */ | |||
} | |||
} | |||
} | |||
else { /* contiguous in window */ | |||
from += wnext - op; | |||
if (op < len) { /* some from window */ | |||
len -= op; | |||
do { | |||
PUP(out) = PUP(from); | |||
} while (--op); | |||
from = out - dist; /* rest from output */ | |||
} | |||
} | |||
while (len > 2) { | |||
PUP(out) = PUP(from); | |||
PUP(out) = PUP(from); | |||
PUP(out) = PUP(from); | |||
len -= 3; | |||
} | |||
if (len) { | |||
PUP(out) = PUP(from); | |||
if (len > 1) | |||
PUP(out) = PUP(from); | |||
} | |||
} | |||
else { | |||
from = out - dist; /* copy direct from output */ | |||
do { /* minimum length is three */ | |||
PUP(out) = PUP(from); | |||
PUP(out) = PUP(from); | |||
PUP(out) = PUP(from); | |||
len -= 3; | |||
} while (len > 2); | |||
if (len) { | |||
PUP(out) = PUP(from); | |||
if (len > 1) | |||
PUP(out) = PUP(from); | |||
} | |||
} | |||
} | |||
else if ((op & 64) == 0) { /* 2nd level distance code */ | |||
here = dcode[here.val + (hold & ((1U << op) - 1))]; | |||
goto dodist; | |||
} | |||
else { | |||
strm->msg = (char *)"invalid distance code"; | |||
state->mode = BAD; | |||
break; | |||
} | |||
} | |||
else if ((op & 64) == 0) { /* 2nd level length code */ | |||
here = lcode[here.val + (hold & ((1U << op) - 1))]; | |||
goto dolen; | |||
} | |||
else if (op & 32) { /* end-of-block */ | |||
Tracevv((stderr, "inflate: end of block\n")); | |||
state->mode = TYPE; | |||
break; | |||
} | |||
else { | |||
strm->msg = (char *)"invalid literal/length code"; | |||
state->mode = BAD; | |||
break; | |||
} | |||
} while (in < last && out < end); | |||
/* return unused bytes (on entry, bits < 8, so in won't go too far back) */ | |||
len = bits >> 3; | |||
in -= len; | |||
bits -= len << 3; | |||
hold &= (1U << bits) - 1; | |||
/* update state and return */ | |||
strm->next_in = in + OFF; | |||
strm->next_out = out + OFF; | |||
strm->avail_in = (unsigned)(in < last ? 5 + (last - in) : 5 - (in - last)); | |||
strm->avail_out = (unsigned)(out < end ? | |||
257 + (end - out) : 257 - (out - end)); | |||
state->hold = hold; | |||
state->bits = bits; | |||
return; | |||
} | |||
/* | |||
inflate_fast() speedups that turned out slower (on a PowerPC G3 750CXe): | |||
- Using bit fields for code structure | |||
- Different op definition to avoid & for extra bits (do & for table bits) | |||
- Three separate decoding do-loops for direct, window, and wnext == 0 | |||
- Special case for distance > 1 copies to do overlapped load and store copy | |||
- Explicit branch predictions (based on measured branch probabilities) | |||
- Deferring match copy and interspersed it with decoding subsequent codes | |||
- Swapping literal/length else | |||
- Swapping window/direct else | |||
- Larger unrolled copy loops (three is about right) | |||
- Moving len -= 3 statement into middle of loop | |||
*/ | |||
#endif /* !ASMINF */ |
@@ -1,11 +0,0 @@ | |||
/* inffast.h -- header to use inffast.c | |||
* Copyright (C) 1995-2003, 2010 Mark Adler | |||
* For conditions of distribution and use, see copyright notice in zlib.h | |||
*/ | |||
/* WARNING: this file should *not* be used by applications. It is | |||
part of the implementation of the compression library and is | |||
subject to change. Applications should only use zlib.h. | |||
*/ | |||
void ZLIB_INTERNAL inflate_fast OF((z_streamp strm, unsigned start)); |
@@ -1,94 +0,0 @@ | |||
/* inffixed.h -- table for decoding fixed codes | |||
* Generated automatically by makefixed(). | |||
*/ | |||
/* WARNING: this file should *not* be used by applications. It | |||
is part of the implementation of the compression library and | |||
is subject to change. Applications should only use zlib.h. | |||
*/ | |||
static const code lenfix[512] = { | |||
{96,7,0},{0,8,80},{0,8,16},{20,8,115},{18,7,31},{0,8,112},{0,8,48}, | |||
{0,9,192},{16,7,10},{0,8,96},{0,8,32},{0,9,160},{0,8,0},{0,8,128}, | |||
{0,8,64},{0,9,224},{16,7,6},{0,8,88},{0,8,24},{0,9,144},{19,7,59}, | |||
{0,8,120},{0,8,56},{0,9,208},{17,7,17},{0,8,104},{0,8,40},{0,9,176}, | |||
{0,8,8},{0,8,136},{0,8,72},{0,9,240},{16,7,4},{0,8,84},{0,8,20}, | |||
{21,8,227},{19,7,43},{0,8,116},{0,8,52},{0,9,200},{17,7,13},{0,8,100}, | |||
{0,8,36},{0,9,168},{0,8,4},{0,8,132},{0,8,68},{0,9,232},{16,7,8}, | |||
{0,8,92},{0,8,28},{0,9,152},{20,7,83},{0,8,124},{0,8,60},{0,9,216}, | |||
{18,7,23},{0,8,108},{0,8,44},{0,9,184},{0,8,12},{0,8,140},{0,8,76}, | |||
{0,9,248},{16,7,3},{0,8,82},{0,8,18},{21,8,163},{19,7,35},{0,8,114}, | |||
{0,8,50},{0,9,196},{17,7,11},{0,8,98},{0,8,34},{0,9,164},{0,8,2}, | |||
{0,8,130},{0,8,66},{0,9,228},{16,7,7},{0,8,90},{0,8,26},{0,9,148}, | |||
{20,7,67},{0,8,122},{0,8,58},{0,9,212},{18,7,19},{0,8,106},{0,8,42}, | |||
{0,9,180},{0,8,10},{0,8,138},{0,8,74},{0,9,244},{16,7,5},{0,8,86}, | |||
{0,8,22},{64,8,0},{19,7,51},{0,8,118},{0,8,54},{0,9,204},{17,7,15}, | |||
{0,8,102},{0,8,38},{0,9,172},{0,8,6},{0,8,134},{0,8,70},{0,9,236}, | |||
{16,7,9},{0,8,94},{0,8,30},{0,9,156},{20,7,99},{0,8,126},{0,8,62}, | |||
{0,9,220},{18,7,27},{0,8,110},{0,8,46},{0,9,188},{0,8,14},{0,8,142}, | |||
{0,8,78},{0,9,252},{96,7,0},{0,8,81},{0,8,17},{21,8,131},{18,7,31}, | |||
{0,8,113},{0,8,49},{0,9,194},{16,7,10},{0,8,97},{0,8,33},{0,9,162}, | |||
{0,8,1},{0,8,129},{0,8,65},{0,9,226},{16,7,6},{0,8,89},{0,8,25}, | |||
{0,9,146},{19,7,59},{0,8,121},{0,8,57},{0,9,210},{17,7,17},{0,8,105}, | |||
{0,8,41},{0,9,178},{0,8,9},{0,8,137},{0,8,73},{0,9,242},{16,7,4}, | |||
{0,8,85},{0,8,21},{16,8,258},{19,7,43},{0,8,117},{0,8,53},{0,9,202}, | |||
{17,7,13},{0,8,101},{0,8,37},{0,9,170},{0,8,5},{0,8,133},{0,8,69}, | |||
{0,9,234},{16,7,8},{0,8,93},{0,8,29},{0,9,154},{20,7,83},{0,8,125}, | |||
{0,8,61},{0,9,218},{18,7,23},{0,8,109},{0,8,45},{0,9,186},{0,8,13}, | |||
{0,8,141},{0,8,77},{0,9,250},{16,7,3},{0,8,83},{0,8,19},{21,8,195}, | |||
{19,7,35},{0,8,115},{0,8,51},{0,9,198},{17,7,11},{0,8,99},{0,8,35}, | |||
{0,9,166},{0,8,3},{0,8,131},{0,8,67},{0,9,230},{16,7,7},{0,8,91}, | |||
{0,8,27},{0,9,150},{20,7,67},{0,8,123},{0,8,59},{0,9,214},{18,7,19}, | |||
{0,8,107},{0,8,43},{0,9,182},{0,8,11},{0,8,139},{0,8,75},{0,9,246}, | |||
{16,7,5},{0,8,87},{0,8,23},{64,8,0},{19,7,51},{0,8,119},{0,8,55}, | |||
{0,9,206},{17,7,15},{0,8,103},{0,8,39},{0,9,174},{0,8,7},{0,8,135}, | |||
{0,8,71},{0,9,238},{16,7,9},{0,8,95},{0,8,31},{0,9,158},{20,7,99}, | |||
{0,8,127},{0,8,63},{0,9,222},{18,7,27},{0,8,111},{0,8,47},{0,9,190}, | |||
{0,8,15},{0,8,143},{0,8,79},{0,9,254},{96,7,0},{0,8,80},{0,8,16}, | |||
{20,8,115},{18,7,31},{0,8,112},{0,8,48},{0,9,193},{16,7,10},{0,8,96}, | |||
{0,8,32},{0,9,161},{0,8,0},{0,8,128},{0,8,64},{0,9,225},{16,7,6}, | |||
{0,8,88},{0,8,24},{0,9,145},{19,7,59},{0,8,120},{0,8,56},{0,9,209}, | |||
{17,7,17},{0,8,104},{0,8,40},{0,9,177},{0,8,8},{0,8,136},{0,8,72}, | |||
{0,9,241},{16,7,4},{0,8,84},{0,8,20},{21,8,227},{19,7,43},{0,8,116}, | |||
{0,8,52},{0,9,201},{17,7,13},{0,8,100},{0,8,36},{0,9,169},{0,8,4}, | |||
{0,8,132},{0,8,68},{0,9,233},{16,7,8},{0,8,92},{0,8,28},{0,9,153}, | |||
{20,7,83},{0,8,124},{0,8,60},{0,9,217},{18,7,23},{0,8,108},{0,8,44}, | |||
{0,9,185},{0,8,12},{0,8,140},{0,8,76},{0,9,249},{16,7,3},{0,8,82}, | |||
{0,8,18},{21,8,163},{19,7,35},{0,8,114},{0,8,50},{0,9,197},{17,7,11}, | |||
{0,8,98},{0,8,34},{0,9,165},{0,8,2},{0,8,130},{0,8,66},{0,9,229}, | |||
{16,7,7},{0,8,90},{0,8,26},{0,9,149},{20,7,67},{0,8,122},{0,8,58}, | |||
{0,9,213},{18,7,19},{0,8,106},{0,8,42},{0,9,181},{0,8,10},{0,8,138}, | |||
{0,8,74},{0,9,245},{16,7,5},{0,8,86},{0,8,22},{64,8,0},{19,7,51}, | |||
{0,8,118},{0,8,54},{0,9,205},{17,7,15},{0,8,102},{0,8,38},{0,9,173}, | |||
{0,8,6},{0,8,134},{0,8,70},{0,9,237},{16,7,9},{0,8,94},{0,8,30}, | |||
{0,9,157},{20,7,99},{0,8,126},{0,8,62},{0,9,221},{18,7,27},{0,8,110}, | |||
{0,8,46},{0,9,189},{0,8,14},{0,8,142},{0,8,78},{0,9,253},{96,7,0}, | |||
{0,8,81},{0,8,17},{21,8,131},{18,7,31},{0,8,113},{0,8,49},{0,9,195}, | |||
{16,7,10},{0,8,97},{0,8,33},{0,9,163},{0,8,1},{0,8,129},{0,8,65}, | |||
{0,9,227},{16,7,6},{0,8,89},{0,8,25},{0,9,147},{19,7,59},{0,8,121}, | |||
{0,8,57},{0,9,211},{17,7,17},{0,8,105},{0,8,41},{0,9,179},{0,8,9}, | |||
{0,8,137},{0,8,73},{0,9,243},{16,7,4},{0,8,85},{0,8,21},{16,8,258}, | |||
{19,7,43},{0,8,117},{0,8,53},{0,9,203},{17,7,13},{0,8,101},{0,8,37}, | |||
{0,9,171},{0,8,5},{0,8,133},{0,8,69},{0,9,235},{16,7,8},{0,8,93}, | |||
{0,8,29},{0,9,155},{20,7,83},{0,8,125},{0,8,61},{0,9,219},{18,7,23}, | |||
{0,8,109},{0,8,45},{0,9,187},{0,8,13},{0,8,141},{0,8,77},{0,9,251}, | |||
{16,7,3},{0,8,83},{0,8,19},{21,8,195},{19,7,35},{0,8,115},{0,8,51}, | |||
{0,9,199},{17,7,11},{0,8,99},{0,8,35},{0,9,167},{0,8,3},{0,8,131}, | |||
{0,8,67},{0,9,231},{16,7,7},{0,8,91},{0,8,27},{0,9,151},{20,7,67}, | |||
{0,8,123},{0,8,59},{0,9,215},{18,7,19},{0,8,107},{0,8,43},{0,9,183}, | |||
{0,8,11},{0,8,139},{0,8,75},{0,9,247},{16,7,5},{0,8,87},{0,8,23}, | |||
{64,8,0},{19,7,51},{0,8,119},{0,8,55},{0,9,207},{17,7,15},{0,8,103}, | |||
{0,8,39},{0,9,175},{0,8,7},{0,8,135},{0,8,71},{0,9,239},{16,7,9}, | |||
{0,8,95},{0,8,31},{0,9,159},{20,7,99},{0,8,127},{0,8,63},{0,9,223}, | |||
{18,7,27},{0,8,111},{0,8,47},{0,9,191},{0,8,15},{0,8,143},{0,8,79}, | |||
{0,9,255} | |||
}; | |||
static const code distfix[32] = { | |||
{16,5,1},{23,5,257},{19,5,17},{27,5,4097},{17,5,5},{25,5,1025}, | |||
{21,5,65},{29,5,16385},{16,5,3},{24,5,513},{20,5,33},{28,5,8193}, | |||
{18,5,9},{26,5,2049},{22,5,129},{64,5,0},{16,5,2},{23,5,385}, | |||
{19,5,25},{27,5,6145},{17,5,7},{25,5,1537},{21,5,97},{29,5,24577}, | |||
{16,5,4},{24,5,769},{20,5,49},{28,5,12289},{18,5,13},{26,5,3073}, | |||
{22,5,193},{64,5,0} | |||
}; |
@@ -1,122 +0,0 @@ | |||
/* inflate.h -- internal inflate state definition | |||
* Copyright (C) 1995-2009 Mark Adler | |||
* For conditions of distribution and use, see copyright notice in zlib.h | |||
*/ | |||
/* WARNING: this file should *not* be used by applications. It is | |||
part of the implementation of the compression library and is | |||
subject to change. Applications should only use zlib.h. | |||
*/ | |||
/* define NO_GZIP when compiling if you want to disable gzip header and | |||
trailer decoding by inflate(). NO_GZIP would be used to avoid linking in | |||
the crc code when it is not needed. For shared libraries, gzip decoding | |||
should be left enabled. */ | |||
#ifndef NO_GZIP | |||
# define GUNZIP | |||
#endif | |||
/* Possible inflate modes between inflate() calls */ | |||
typedef enum { | |||
HEAD, /* i: waiting for magic header */ | |||
FLAGS, /* i: waiting for method and flags (gzip) */ | |||
TIME, /* i: waiting for modification time (gzip) */ | |||
OS, /* i: waiting for extra flags and operating system (gzip) */ | |||
EXLEN, /* i: waiting for extra length (gzip) */ | |||
EXTRA, /* i: waiting for extra bytes (gzip) */ | |||
NAME, /* i: waiting for end of file name (gzip) */ | |||
COMMENT, /* i: waiting for end of comment (gzip) */ | |||
HCRC, /* i: waiting for header crc (gzip) */ | |||
DICTID, /* i: waiting for dictionary check value */ | |||
DICT, /* waiting for inflateSetDictionary() call */ | |||
TYPE, /* i: waiting for type bits, including last-flag bit */ | |||
TYPEDO, /* i: same, but skip check to exit inflate on new block */ | |||
STORED, /* i: waiting for stored size (length and complement) */ | |||
COPY_, /* i/o: same as COPY below, but only first time in */ | |||
COPY, /* i/o: waiting for input or output to copy stored block */ | |||
TABLE, /* i: waiting for dynamic block table lengths */ | |||
LENLENS, /* i: waiting for code length code lengths */ | |||
CODELENS, /* i: waiting for length/lit and distance code lengths */ | |||
LEN_, /* i: same as LEN below, but only first time in */ | |||
LEN, /* i: waiting for length/lit/eob code */ | |||
LENEXT, /* i: waiting for length extra bits */ | |||
DIST, /* i: waiting for distance code */ | |||
DISTEXT, /* i: waiting for distance extra bits */ | |||
MATCH, /* o: waiting for output space to copy string */ | |||
LIT, /* o: waiting for output space to write literal */ | |||
CHECK, /* i: waiting for 32-bit check value */ | |||
LENGTH, /* i: waiting for 32-bit length (gzip) */ | |||
DONE, /* finished check, done -- remain here until reset */ | |||
BAD, /* got a data error -- remain here until reset */ | |||
MEM, /* got an inflate() memory error -- remain here until reset */ | |||
SYNC /* looking for synchronization bytes to restart inflate() */ | |||
} inflate_mode; | |||
/* | |||
State transitions between above modes - | |||
(most modes can go to BAD or MEM on error -- not shown for clarity) | |||
Process header: | |||
HEAD -> (gzip) or (zlib) or (raw) | |||
(gzip) -> FLAGS -> TIME -> OS -> EXLEN -> EXTRA -> NAME -> COMMENT -> | |||
HCRC -> TYPE | |||
(zlib) -> DICTID or TYPE | |||
DICTID -> DICT -> TYPE | |||
(raw) -> TYPEDO | |||
Read deflate blocks: | |||
TYPE -> TYPEDO -> STORED or TABLE or LEN_ or CHECK | |||
STORED -> COPY_ -> COPY -> TYPE | |||
TABLE -> LENLENS -> CODELENS -> LEN_ | |||
LEN_ -> LEN | |||
Read deflate codes in fixed or dynamic block: | |||
LEN -> LENEXT or LIT or TYPE | |||
LENEXT -> DIST -> DISTEXT -> MATCH -> LEN | |||
LIT -> LEN | |||
Process trailer: | |||
CHECK -> LENGTH -> DONE | |||
*/ | |||
/* state maintained between inflate() calls. Approximately 10K bytes. */ | |||
struct inflate_state { | |||
inflate_mode mode; /* current inflate mode */ | |||
int last; /* true if processing last block */ | |||
int wrap; /* bit 0 true for zlib, bit 1 true for gzip */ | |||
int havedict; /* true if dictionary provided */ | |||
int flags; /* gzip header method and flags (0 if zlib) */ | |||
unsigned dmax; /* zlib header max distance (INFLATE_STRICT) */ | |||
unsigned long check; /* protected copy of check value */ | |||
unsigned long total; /* protected copy of output count */ | |||
gz_headerp head; /* where to save gzip header information */ | |||
/* sliding window */ | |||
unsigned wbits; /* log base 2 of requested window size */ | |||
unsigned wsize; /* window size or zero if not using window */ | |||
unsigned whave; /* valid bytes in the window */ | |||
unsigned wnext; /* window write index */ | |||
unsigned char FAR *window; /* allocated sliding window, if needed */ | |||
/* bit accumulator */ | |||
unsigned long hold; /* input bit accumulator */ | |||
unsigned bits; /* number of bits in "in" */ | |||
/* for string and stored block copying */ | |||
unsigned length; /* literal or length of data to copy */ | |||
unsigned offset; /* distance back to copy string from */ | |||
/* for table and code decoding */ | |||
unsigned extra; /* extra bits needed */ | |||
/* fixed and dynamic code tables */ | |||
code const FAR *lencode; /* starting table for length/literal codes */ | |||
code const FAR *distcode; /* starting table for distance codes */ | |||
unsigned lenbits; /* index bits for lencode */ | |||
unsigned distbits; /* index bits for distcode */ | |||
/* dynamic table building */ | |||
unsigned ncode; /* number of code length code lengths */ | |||
unsigned nlen; /* number of length code lengths */ | |||
unsigned ndist; /* number of distance code lengths */ | |||
unsigned have; /* number of code lengths in lens[] */ | |||
code FAR *next; /* next available space in codes[] */ | |||
unsigned short lens[320]; /* temporary storage for code lengths */ | |||
unsigned short work[288]; /* work area for code table building */ | |||
code codes[ENOUGH]; /* space for code tables */ | |||
int sane; /* if false, allow invalid distance too far */ | |||
int back; /* bits back of last unprocessed length/lit */ | |||
unsigned was; /* initial length of match */ | |||
}; |
@@ -1,330 +0,0 @@ | |||
/* inftrees.c -- generate Huffman trees for efficient decoding | |||
* Copyright (C) 1995-2010 Mark Adler | |||
* For conditions of distribution and use, see copyright notice in zlib.h | |||
*/ | |||
#include "zutil.h" | |||
#include "inftrees.h" | |||
#define MAXBITS 15 | |||
const char inflate_copyright[] = | |||
" inflate 1.2.5 Copyright 1995-2010 Mark Adler "; | |||
/* | |||
If you use the zlib library in a product, an acknowledgment is welcome | |||
in the documentation of your product. If for some reason you cannot | |||
include such an acknowledgment, I would appreciate that you keep this | |||
copyright string in the executable of your product. | |||
*/ | |||
/* | |||
Build a set of tables to decode the provided canonical Huffman code. | |||
The code lengths are lens[0..codes-1]. The result starts at *table, | |||
whose indices are 0..2^bits-1. work is a writable array of at least | |||
lens shorts, which is used as a work area. type is the type of code | |||
to be generated, CODES, LENS, or DISTS. On return, zero is success, | |||
-1 is an invalid code, and +1 means that ENOUGH isn't enough. table | |||
on return points to the next available entry's address. bits is the | |||
requested root table index bits, and on return it is the actual root | |||
table index bits. It will differ if the request is greater than the | |||
longest code or if it is less than the shortest code. | |||
*/ | |||
int ZLIB_INTERNAL inflate_table(type, lens, codes, table, bits, work) | |||
codetype type; | |||
unsigned short FAR *lens; | |||
unsigned codes; | |||
code FAR * FAR *table; | |||
unsigned FAR *bits; | |||
unsigned short FAR *work; | |||
{ | |||
unsigned len; /* a code's length in bits */ | |||
unsigned sym; /* index of code symbols */ | |||
unsigned min, max; /* minimum and maximum code lengths */ | |||
unsigned root; /* number of index bits for root table */ | |||
unsigned curr; /* number of index bits for current table */ | |||
unsigned drop; /* code bits to drop for sub-table */ | |||
int left; /* number of prefix codes available */ | |||
unsigned used; /* code entries in table used */ | |||
unsigned huff; /* Huffman code */ | |||
unsigned incr; /* for incrementing code, index */ | |||
unsigned fill; /* index for replicating entries */ | |||
unsigned low; /* low bits for current root entry */ | |||
unsigned mask; /* mask for low root bits */ | |||
code here; /* table entry for duplication */ | |||
code FAR *next; /* next available space in table */ | |||
const unsigned short FAR *base; /* base value table to use */ | |||
const unsigned short FAR *extra; /* extra bits table to use */ | |||
int end; /* use base and extra for symbol > end */ | |||
unsigned short count[MAXBITS+1]; /* number of codes of each length */ | |||
unsigned short offs[MAXBITS+1]; /* offsets in table for each length */ | |||
static const unsigned short lbase[31] = { /* Length codes 257..285 base */ | |||
3, 4, 5, 6, 7, 8, 9, 10, 11, 13, 15, 17, 19, 23, 27, 31, | |||
35, 43, 51, 59, 67, 83, 99, 115, 131, 163, 195, 227, 258, 0, 0}; | |||
static const unsigned short lext[31] = { /* Length codes 257..285 extra */ | |||
16, 16, 16, 16, 16, 16, 16, 16, 17, 17, 17, 17, 18, 18, 18, 18, | |||
19, 19, 19, 19, 20, 20, 20, 20, 21, 21, 21, 21, 16, 73, 195}; | |||
static const unsigned short dbase[32] = { /* Distance codes 0..29 base */ | |||
1, 2, 3, 4, 5, 7, 9, 13, 17, 25, 33, 49, 65, 97, 129, 193, | |||
257, 385, 513, 769, 1025, 1537, 2049, 3073, 4097, 6145, | |||
8193, 12289, 16385, 24577, 0, 0}; | |||
static const unsigned short dext[32] = { /* Distance codes 0..29 extra */ | |||
16, 16, 16, 16, 17, 17, 18, 18, 19, 19, 20, 20, 21, 21, 22, 22, | |||
23, 23, 24, 24, 25, 25, 26, 26, 27, 27, | |||
28, 28, 29, 29, 64, 64}; | |||
/* | |||
Process a set of code lengths to create a canonical Huffman code. The | |||
code lengths are lens[0..codes-1]. Each length corresponds to the | |||
symbols 0..codes-1. The Huffman code is generated by first sorting the | |||
symbols by length from short to long, and retaining the symbol order | |||
for codes with equal lengths. Then the code starts with all zero bits | |||
for the first code of the shortest length, and the codes are integer | |||
increments for the same length, and zeros are appended as the length | |||
increases. For the deflate format, these bits are stored backwards | |||
from their more natural integer increment ordering, and so when the | |||
decoding tables are built in the large loop below, the integer codes | |||
are incremented backwards. | |||
This routine assumes, but does not check, that all of the entries in | |||
lens[] are in the range 0..MAXBITS. The caller must assure this. | |||
1..MAXBITS is interpreted as that code length. zero means that that | |||
symbol does not occur in this code. | |||
The codes are sorted by computing a count of codes for each length, | |||
creating from that a table of starting indices for each length in the | |||
sorted table, and then entering the symbols in order in the sorted | |||
table. The sorted table is work[], with that space being provided by | |||
the caller. | |||
The length counts are used for other purposes as well, i.e. finding | |||
the minimum and maximum length codes, determining if there are any | |||
codes at all, checking for a valid set of lengths, and looking ahead | |||
at length counts to determine sub-table sizes when building the | |||
decoding tables. | |||
*/ | |||
/* accumulate lengths for codes (assumes lens[] all in 0..MAXBITS) */ | |||
for (len = 0; len <= MAXBITS; len++) | |||
count[len] = 0; | |||
for (sym = 0; sym < codes; sym++) | |||
count[lens[sym]]++; | |||
/* bound code lengths, force root to be within code lengths */ | |||
root = *bits; | |||
for (max = MAXBITS; max >= 1; max--) | |||
if (count[max] != 0) break; | |||
if (root > max) root = max; | |||
if (max == 0) { /* no symbols to code at all */ | |||
here.op = (unsigned char)64; /* invalid code marker */ | |||
here.bits = (unsigned char)1; | |||
here.val = (unsigned short)0; | |||
*(*table)++ = here; /* make a table to force an error */ | |||
*(*table)++ = here; | |||
*bits = 1; | |||
return 0; /* no symbols, but wait for decoding to report error */ | |||
} | |||
for (min = 1; min < max; min++) | |||
if (count[min] != 0) break; | |||
if (root < min) root = min; | |||
/* check for an over-subscribed or incomplete set of lengths */ | |||
left = 1; | |||
for (len = 1; len <= MAXBITS; len++) { | |||
left <<= 1; | |||
left -= count[len]; | |||
if (left < 0) return -1; /* over-subscribed */ | |||
} | |||
if (left > 0 && (type == CODES || max != 1)) | |||
return -1; /* incomplete set */ | |||
/* generate offsets into symbol table for each length for sorting */ | |||
offs[1] = 0; | |||
for (len = 1; len < MAXBITS; len++) | |||
offs[len + 1] = offs[len] + count[len]; | |||
/* sort symbols by length, by symbol order within each length */ | |||
for (sym = 0; sym < codes; sym++) | |||
if (lens[sym] != 0) work[offs[lens[sym]]++] = (unsigned short)sym; | |||
/* | |||
Create and fill in decoding tables. In this loop, the table being | |||
filled is at next and has curr index bits. The code being used is huff | |||
with length len. That code is converted to an index by dropping drop | |||
bits off of the bottom. For codes where len is less than drop + curr, | |||
those top drop + curr - len bits are incremented through all values to | |||
fill the table with replicated entries. | |||
root is the number of index bits for the root table. When len exceeds | |||
root, sub-tables are created pointed to by the root entry with an index | |||
of the low root bits of huff. This is saved in low to check for when a | |||
new sub-table should be started. drop is zero when the root table is | |||
being filled, and drop is root when sub-tables are being filled. | |||
When a new sub-table is needed, it is necessary to look ahead in the | |||
code lengths to determine what size sub-table is needed. The length | |||
counts are used for this, and so count[] is decremented as codes are | |||
entered in the tables. | |||
used keeps track of how many table entries have been allocated from the | |||
provided *table space. It is checked for LENS and DIST tables against | |||
the constants ENOUGH_LENS and ENOUGH_DISTS to guard against changes in | |||
the initial root table size constants. See the comments in inftrees.h | |||
for more information. | |||
sym increments through all symbols, and the loop terminates when | |||
all codes of length max, i.e. all codes, have been processed. This | |||
routine permits incomplete codes, so another loop after this one fills | |||
in the rest of the decoding tables with invalid code markers. | |||
*/ | |||
/* set up for code type */ | |||
switch (type) { | |||
case CODES: | |||
base = extra = work; /* dummy value--not used */ | |||
end = 19; | |||
break; | |||
case LENS: | |||
base = lbase; | |||
base -= 257; | |||
extra = lext; | |||
extra -= 257; | |||
end = 256; | |||
break; | |||
default: /* DISTS */ | |||
base = dbase; | |||
extra = dext; | |||
end = -1; | |||
} | |||
/* initialize state for loop */ | |||
huff = 0; /* starting code */ | |||
sym = 0; /* starting code symbol */ | |||
len = min; /* starting code length */ | |||
next = *table; /* current table to fill in */ | |||
curr = root; /* current table index bits */ | |||
drop = 0; /* current bits to drop from code for index */ | |||
low = (unsigned)(-1); /* trigger new sub-table when len > root */ | |||
used = 1U << root; /* use root table entries */ | |||
mask = used - 1; /* mask for comparing low */ | |||
/* check available table space */ | |||
if ((type == LENS && used >= ENOUGH_LENS) || | |||
(type == DISTS && used >= ENOUGH_DISTS)) | |||
return 1; | |||
/* process all codes and make table entries */ | |||
for (;;) { | |||
/* create table entry */ | |||
here.bits = (unsigned char)(len - drop); | |||
if ((int)(work[sym]) < end) { | |||
here.op = (unsigned char)0; | |||
here.val = work[sym]; | |||
} | |||
else if ((int)(work[sym]) > end) { | |||
here.op = (unsigned char)(extra[work[sym]]); | |||
here.val = base[work[sym]]; | |||
} | |||
else { | |||
here.op = (unsigned char)(32 + 64); /* end of block */ | |||
here.val = 0; | |||
} | |||
/* replicate for those indices with low len bits equal to huff */ | |||
incr = 1U << (len - drop); | |||
fill = 1U << curr; | |||
min = fill; /* save offset to next table */ | |||
do { | |||
fill -= incr; | |||
next[(huff >> drop) + fill] = here; | |||
} while (fill != 0); | |||
/* backwards increment the len-bit code huff */ | |||
incr = 1U << (len - 1); | |||
while (huff & incr) | |||
incr >>= 1; | |||
if (incr != 0) { | |||
huff &= incr - 1; | |||
huff += incr; | |||
} | |||
else | |||
huff = 0; | |||
/* go to next symbol, update count, len */ | |||
sym++; | |||
if (--(count[len]) == 0) { | |||
if (len == max) break; | |||
len = lens[work[sym]]; | |||
} | |||
/* create new sub-table if needed */ | |||
if (len > root && (huff & mask) != low) { | |||
/* if first time, transition to sub-tables */ | |||
if (drop == 0) | |||
drop = root; | |||
/* increment past last table */ | |||
next += min; /* here min is 1 << curr */ | |||
/* determine length of next table */ | |||
curr = len - drop; | |||
left = (int)(1 << curr); | |||
while (curr + drop < max) { | |||
left -= count[curr + drop]; | |||
if (left <= 0) break; | |||
curr++; | |||
left <<= 1; | |||
} | |||
/* check for enough space */ | |||
used += 1U << curr; | |||
if ((type == LENS && used >= ENOUGH_LENS) || | |||
(type == DISTS && used >= ENOUGH_DISTS)) | |||
return 1; | |||
/* point entry in root table to sub-table */ | |||
low = huff & mask; | |||
(*table)[low].op = (unsigned char)curr; | |||
(*table)[low].bits = (unsigned char)root; | |||
(*table)[low].val = (unsigned short)(next - *table); | |||
} | |||
} | |||
/* | |||
Fill in rest of table for incomplete codes. This loop is similar to the | |||
loop above in incrementing huff for table indices. It is assumed that | |||
len is equal to curr + drop, so there is no loop needed to increment | |||
through high index bits. When the current sub-table is filled, the loop | |||
drops back to the root table to fill in any remaining entries there. | |||
*/ | |||
here.op = (unsigned char)64; /* invalid code marker */ | |||
here.bits = (unsigned char)(len - drop); | |||
here.val = (unsigned short)0; | |||
while (huff != 0) { | |||
/* when done with sub-table, drop back to root table */ | |||
if (drop != 0 && (huff & mask) != low) { | |||
drop = 0; | |||
len = root; | |||
next = *table; | |||
here.bits = (unsigned char)len; | |||
} | |||
/* put invalid code marker in table */ | |||
next[huff >> drop] = here; | |||
/* backwards increment the len-bit code huff */ | |||
incr = 1U << (len - 1); | |||
while (huff & incr) | |||
incr >>= 1; | |||
if (incr != 0) { | |||
huff &= incr - 1; | |||
huff += incr; | |||
} | |||
else | |||
huff = 0; | |||
} | |||
/* set return parameters */ | |||
*table += used; | |||
*bits = root; | |||
return 0; | |||
} |
@@ -1,62 +0,0 @@ | |||
/* inftrees.h -- header to use inftrees.c | |||
* Copyright (C) 1995-2005, 2010 Mark Adler | |||
* For conditions of distribution and use, see copyright notice in zlib.h | |||
*/ | |||
/* WARNING: this file should *not* be used by applications. It is | |||
part of the implementation of the compression library and is | |||
subject to change. Applications should only use zlib.h. | |||
*/ | |||
/* Structure for decoding tables. Each entry provides either the | |||
information needed to do the operation requested by the code that | |||
indexed that table entry, or it provides a pointer to another | |||
table that indexes more bits of the code. op indicates whether | |||
the entry is a pointer to another table, a literal, a length or | |||
distance, an end-of-block, or an invalid code. For a table | |||
pointer, the low four bits of op is the number of index bits of | |||
that table. For a length or distance, the low four bits of op | |||
is the number of extra bits to get after the code. bits is | |||
the number of bits in this code or part of the code to drop off | |||
of the bit buffer. val is the actual byte to output in the case | |||
of a literal, the base length or distance, or the offset from | |||
the current table to the next table. Each entry is four bytes. */ | |||
typedef struct { | |||
unsigned char op; /* operation, extra bits, table bits */ | |||
unsigned char bits; /* bits in this part of the code */ | |||
unsigned short val; /* offset in table or code value */ | |||
} code; | |||
/* op values as set by inflate_table(): | |||
00000000 - literal | |||
0000tttt - table link, tttt != 0 is the number of table index bits | |||
0001eeee - length or distance, eeee is the number of extra bits | |||
01100000 - end of block | |||
01000000 - invalid code | |||
*/ | |||
/* Maximum size of the dynamic table. The maximum number of code structures is | |||
1444, which is the sum of 852 for literal/length codes and 592 for distance | |||
codes. These values were found by exhaustive searches using the program | |||
examples/enough.c found in the zlib distribtution. The arguments to that | |||
program are the number of symbols, the initial root table size, and the | |||
maximum bit length of a code. "enough 286 9 15" for literal/length codes | |||
returns returns 852, and "enough 30 6 15" for distance codes returns 592. | |||
The initial root table size (9 or 6) is found in the fifth argument of the | |||
inflate_table() calls in inflate.c and infback.c. If the root table size is | |||
changed, then these maximum sizes would be need to be recalculated and | |||
updated. */ | |||
#define ENOUGH_LENS 852 | |||
#define ENOUGH_DISTS 592 | |||
#define ENOUGH (ENOUGH_LENS+ENOUGH_DISTS) | |||
/* Type of code to build for inflate_table() */ | |||
typedef enum { | |||
CODES, | |||
LENS, | |||
DISTS | |||
} codetype; | |||
int ZLIB_INTERNAL inflate_table OF((codetype type, unsigned short FAR *lens, | |||
unsigned codes, code FAR * FAR *table, | |||
unsigned FAR *bits, unsigned short FAR *work)); |
@@ -1,128 +0,0 @@ | |||
/* header created automatically with -DGEN_TREES_H */ | |||
local const ct_data static_ltree[L_CODES+2] = { | |||
{{ 12},{ 8}}, {{140},{ 8}}, {{ 76},{ 8}}, {{204},{ 8}}, {{ 44},{ 8}}, | |||
{{172},{ 8}}, {{108},{ 8}}, {{236},{ 8}}, {{ 28},{ 8}}, {{156},{ 8}}, | |||
{{ 92},{ 8}}, {{220},{ 8}}, {{ 60},{ 8}}, {{188},{ 8}}, {{124},{ 8}}, | |||
{{252},{ 8}}, {{ 2},{ 8}}, {{130},{ 8}}, {{ 66},{ 8}}, {{194},{ 8}}, | |||
{{ 34},{ 8}}, {{162},{ 8}}, {{ 98},{ 8}}, {{226},{ 8}}, {{ 18},{ 8}}, | |||
{{146},{ 8}}, {{ 82},{ 8}}, {{210},{ 8}}, {{ 50},{ 8}}, {{178},{ 8}}, | |||
{{114},{ 8}}, {{242},{ 8}}, {{ 10},{ 8}}, {{138},{ 8}}, {{ 74},{ 8}}, | |||
{{202},{ 8}}, {{ 42},{ 8}}, {{170},{ 8}}, {{106},{ 8}}, {{234},{ 8}}, | |||
{{ 26},{ 8}}, {{154},{ 8}}, {{ 90},{ 8}}, {{218},{ 8}}, {{ 58},{ 8}}, | |||
{{186},{ 8}}, {{122},{ 8}}, {{250},{ 8}}, {{ 6},{ 8}}, {{134},{ 8}}, | |||
{{ 70},{ 8}}, {{198},{ 8}}, {{ 38},{ 8}}, {{166},{ 8}}, {{102},{ 8}}, | |||
{{230},{ 8}}, {{ 22},{ 8}}, {{150},{ 8}}, {{ 86},{ 8}}, {{214},{ 8}}, | |||
{{ 54},{ 8}}, {{182},{ 8}}, {{118},{ 8}}, {{246},{ 8}}, {{ 14},{ 8}}, | |||
{{142},{ 8}}, {{ 78},{ 8}}, {{206},{ 8}}, {{ 46},{ 8}}, {{174},{ 8}}, | |||
{{110},{ 8}}, {{238},{ 8}}, {{ 30},{ 8}}, {{158},{ 8}}, {{ 94},{ 8}}, | |||
{{222},{ 8}}, {{ 62},{ 8}}, {{190},{ 8}}, {{126},{ 8}}, {{254},{ 8}}, | |||
{{ 1},{ 8}}, {{129},{ 8}}, {{ 65},{ 8}}, {{193},{ 8}}, {{ 33},{ 8}}, | |||
{{161},{ 8}}, {{ 97},{ 8}}, {{225},{ 8}}, {{ 17},{ 8}}, {{145},{ 8}}, | |||
{{ 81},{ 8}}, {{209},{ 8}}, {{ 49},{ 8}}, {{177},{ 8}}, {{113},{ 8}}, | |||
{{241},{ 8}}, {{ 9},{ 8}}, {{137},{ 8}}, {{ 73},{ 8}}, {{201},{ 8}}, | |||
{{ 41},{ 8}}, {{169},{ 8}}, {{105},{ 8}}, {{233},{ 8}}, {{ 25},{ 8}}, | |||
{{153},{ 8}}, {{ 89},{ 8}}, {{217},{ 8}}, {{ 57},{ 8}}, {{185},{ 8}}, | |||
{{121},{ 8}}, {{249},{ 8}}, {{ 5},{ 8}}, {{133},{ 8}}, {{ 69},{ 8}}, | |||
{{197},{ 8}}, {{ 37},{ 8}}, {{165},{ 8}}, {{101},{ 8}}, {{229},{ 8}}, | |||
{{ 21},{ 8}}, {{149},{ 8}}, {{ 85},{ 8}}, {{213},{ 8}}, {{ 53},{ 8}}, | |||
{{181},{ 8}}, {{117},{ 8}}, {{245},{ 8}}, {{ 13},{ 8}}, {{141},{ 8}}, | |||
{{ 77},{ 8}}, {{205},{ 8}}, {{ 45},{ 8}}, {{173},{ 8}}, {{109},{ 8}}, | |||
{{237},{ 8}}, {{ 29},{ 8}}, {{157},{ 8}}, {{ 93},{ 8}}, {{221},{ 8}}, | |||
{{ 61},{ 8}}, {{189},{ 8}}, {{125},{ 8}}, {{253},{ 8}}, {{ 19},{ 9}}, | |||
{{275},{ 9}}, {{147},{ 9}}, {{403},{ 9}}, {{ 83},{ 9}}, {{339},{ 9}}, | |||
{{211},{ 9}}, {{467},{ 9}}, {{ 51},{ 9}}, {{307},{ 9}}, {{179},{ 9}}, | |||
{{435},{ 9}}, {{115},{ 9}}, {{371},{ 9}}, {{243},{ 9}}, {{499},{ 9}}, | |||
{{ 11},{ 9}}, {{267},{ 9}}, {{139},{ 9}}, {{395},{ 9}}, {{ 75},{ 9}}, | |||
{{331},{ 9}}, {{203},{ 9}}, {{459},{ 9}}, {{ 43},{ 9}}, {{299},{ 9}}, | |||
{{171},{ 9}}, {{427},{ 9}}, {{107},{ 9}}, {{363},{ 9}}, {{235},{ 9}}, | |||
{{491},{ 9}}, {{ 27},{ 9}}, {{283},{ 9}}, {{155},{ 9}}, {{411},{ 9}}, | |||
{{ 91},{ 9}}, {{347},{ 9}}, {{219},{ 9}}, {{475},{ 9}}, {{ 59},{ 9}}, | |||
{{315},{ 9}}, {{187},{ 9}}, {{443},{ 9}}, {{123},{ 9}}, {{379},{ 9}}, | |||
{{251},{ 9}}, {{507},{ 9}}, {{ 7},{ 9}}, {{263},{ 9}}, {{135},{ 9}}, | |||
{{391},{ 9}}, {{ 71},{ 9}}, {{327},{ 9}}, {{199},{ 9}}, {{455},{ 9}}, | |||
{{ 39},{ 9}}, {{295},{ 9}}, {{167},{ 9}}, {{423},{ 9}}, {{103},{ 9}}, | |||
{{359},{ 9}}, {{231},{ 9}}, {{487},{ 9}}, {{ 23},{ 9}}, {{279},{ 9}}, | |||
{{151},{ 9}}, {{407},{ 9}}, {{ 87},{ 9}}, {{343},{ 9}}, {{215},{ 9}}, | |||
{{471},{ 9}}, {{ 55},{ 9}}, {{311},{ 9}}, {{183},{ 9}}, {{439},{ 9}}, | |||
{{119},{ 9}}, {{375},{ 9}}, {{247},{ 9}}, {{503},{ 9}}, {{ 15},{ 9}}, | |||
{{271},{ 9}}, {{143},{ 9}}, {{399},{ 9}}, {{ 79},{ 9}}, {{335},{ 9}}, | |||
{{207},{ 9}}, {{463},{ 9}}, {{ 47},{ 9}}, {{303},{ 9}}, {{175},{ 9}}, | |||
{{431},{ 9}}, {{111},{ 9}}, {{367},{ 9}}, {{239},{ 9}}, {{495},{ 9}}, | |||
{{ 31},{ 9}}, {{287},{ 9}}, {{159},{ 9}}, {{415},{ 9}}, {{ 95},{ 9}}, | |||
{{351},{ 9}}, {{223},{ 9}}, {{479},{ 9}}, {{ 63},{ 9}}, {{319},{ 9}}, | |||
{{191},{ 9}}, {{447},{ 9}}, {{127},{ 9}}, {{383},{ 9}}, {{255},{ 9}}, | |||
{{511},{ 9}}, {{ 0},{ 7}}, {{ 64},{ 7}}, {{ 32},{ 7}}, {{ 96},{ 7}}, | |||
{{ 16},{ 7}}, {{ 80},{ 7}}, {{ 48},{ 7}}, {{112},{ 7}}, {{ 8},{ 7}}, | |||
{{ 72},{ 7}}, {{ 40},{ 7}}, {{104},{ 7}}, {{ 24},{ 7}}, {{ 88},{ 7}}, | |||
{{ 56},{ 7}}, {{120},{ 7}}, {{ 4},{ 7}}, {{ 68},{ 7}}, {{ 36},{ 7}}, | |||
{{100},{ 7}}, {{ 20},{ 7}}, {{ 84},{ 7}}, {{ 52},{ 7}}, {{116},{ 7}}, | |||
{{ 3},{ 8}}, {{131},{ 8}}, {{ 67},{ 8}}, {{195},{ 8}}, {{ 35},{ 8}}, | |||
{{163},{ 8}}, {{ 99},{ 8}}, {{227},{ 8}} | |||
}; | |||
local const ct_data static_dtree[D_CODES] = { | |||
{{ 0},{ 5}}, {{16},{ 5}}, {{ 8},{ 5}}, {{24},{ 5}}, {{ 4},{ 5}}, | |||
{{20},{ 5}}, {{12},{ 5}}, {{28},{ 5}}, {{ 2},{ 5}}, {{18},{ 5}}, | |||
{{10},{ 5}}, {{26},{ 5}}, {{ 6},{ 5}}, {{22},{ 5}}, {{14},{ 5}}, | |||
{{30},{ 5}}, {{ 1},{ 5}}, {{17},{ 5}}, {{ 9},{ 5}}, {{25},{ 5}}, | |||
{{ 5},{ 5}}, {{21},{ 5}}, {{13},{ 5}}, {{29},{ 5}}, {{ 3},{ 5}}, | |||
{{19},{ 5}}, {{11},{ 5}}, {{27},{ 5}}, {{ 7},{ 5}}, {{23},{ 5}} | |||
}; | |||
const uch ZLIB_INTERNAL _dist_code[DIST_CODE_LEN] = { | |||
0, 1, 2, 3, 4, 4, 5, 5, 6, 6, 6, 6, 7, 7, 7, 7, 8, 8, 8, 8, | |||
8, 8, 8, 8, 9, 9, 9, 9, 9, 9, 9, 9, 10, 10, 10, 10, 10, 10, 10, 10, | |||
10, 10, 10, 10, 10, 10, 10, 10, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, 11, | |||
11, 11, 11, 11, 12, 12, 12, 12, 12, 12, 12, 12, 12, 12, 12, 12, 12, 12, 12, 12, | |||
12, 12, 12, 12, 12, 12, 12, 12, 12, 12, 12, 12, 12, 12, 12, 12, 13, 13, 13, 13, | |||
13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, 13, | |||
13, 13, 13, 13, 13, 13, 13, 13, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, | |||
14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, | |||
14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, | |||
14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 14, 15, 15, 15, 15, 15, 15, 15, 15, | |||
15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, | |||
15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, | |||
15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 15, 0, 0, 16, 17, | |||
18, 18, 19, 19, 20, 20, 20, 20, 21, 21, 21, 21, 22, 22, 22, 22, 22, 22, 22, 22, | |||
23, 23, 23, 23, 23, 23, 23, 23, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, | |||
24, 24, 24, 24, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, | |||
26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, | |||
26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 27, 27, 27, 27, 27, 27, 27, 27, | |||
27, 27, 27, 27, 27, 27, 27, 27, 27, 27, 27, 27, 27, 27, 27, 27, 27, 27, 27, 27, | |||
27, 27, 27, 27, 28, 28, 28, 28, 28, 28, 28, 28, 28, 28, 28, 28, 28, 28, 28, 28, | |||
28, 28, 28, 28, 28, 28, 28, 28, 28, 28, 28, 28, 28, 28, 28, 28, 28, 28, 28, 28, | |||
28, 28, 28, 28, 28, 28, 28, 28, 28, 28, 28, 28, 28, 28, 28, 28, 28, 28, 28, 28, | |||
28, 28, 28, 28, 28, 28, 28, 28, 29, 29, 29, 29, 29, 29, 29, 29, 29, 29, 29, 29, | |||
29, 29, 29, 29, 29, 29, 29, 29, 29, 29, 29, 29, 29, 29, 29, 29, 29, 29, 29, 29, | |||
29, 29, 29, 29, 29, 29, 29, 29, 29, 29, 29, 29, 29, 29, 29, 29, 29, 29, 29, 29, | |||
29, 29, 29, 29, 29, 29, 29, 29, 29, 29, 29, 29 | |||
}; | |||
const uch ZLIB_INTERNAL _length_code[MAX_MATCH-MIN_MATCH+1]= { | |||
0, 1, 2, 3, 4, 5, 6, 7, 8, 8, 9, 9, 10, 10, 11, 11, 12, 12, 12, 12, | |||
13, 13, 13, 13, 14, 14, 14, 14, 15, 15, 15, 15, 16, 16, 16, 16, 16, 16, 16, 16, | |||
17, 17, 17, 17, 17, 17, 17, 17, 18, 18, 18, 18, 18, 18, 18, 18, 19, 19, 19, 19, | |||
19, 19, 19, 19, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, 20, | |||
21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 21, 22, 22, 22, 22, | |||
22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 23, 23, 23, 23, 23, 23, 23, 23, | |||
23, 23, 23, 23, 23, 23, 23, 23, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, | |||
24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, 24, | |||
25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, | |||
25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 25, 26, 26, 26, 26, 26, 26, 26, 26, | |||
26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, 26, | |||
26, 26, 26, 26, 27, 27, 27, 27, 27, 27, 27, 27, 27, 27, 27, 27, 27, 27, 27, 27, | |||
27, 27, 27, 27, 27, 27, 27, 27, 27, 27, 27, 27, 27, 27, 27, 28 | |||
}; | |||
local const int base_length[LENGTH_CODES] = { | |||
0, 1, 2, 3, 4, 5, 6, 7, 8, 10, 12, 14, 16, 20, 24, 28, 32, 40, 48, 56, | |||
64, 80, 96, 112, 128, 160, 192, 224, 0 | |||
}; | |||
local const int base_dist[D_CODES] = { | |||
0, 1, 2, 3, 4, 6, 8, 12, 16, 24, | |||
32, 48, 64, 96, 128, 192, 256, 384, 512, 768, | |||
1024, 1536, 2048, 3072, 4096, 6144, 8192, 12288, 16384, 24576 | |||
}; | |||
@@ -1,59 +0,0 @@ | |||
/* uncompr.c -- decompress a memory buffer | |||
* Copyright (C) 1995-2003, 2010 Jean-loup Gailly. | |||
* For conditions of distribution and use, see copyright notice in zlib.h | |||
*/ | |||
/* @(#) $Id$ */ | |||
#define ZLIB_INTERNAL | |||
#include "zlib.h" | |||
/* =========================================================================== | |||
Decompresses the source buffer into the destination buffer. sourceLen is | |||
the byte length of the source buffer. Upon entry, destLen is the total | |||
size of the destination buffer, which must be large enough to hold the | |||
entire uncompressed data. (The size of the uncompressed data must have | |||
been saved previously by the compressor and transmitted to the decompressor | |||
by some mechanism outside the scope of this compression library.) | |||
Upon exit, destLen is the actual size of the compressed buffer. | |||
uncompress returns Z_OK if success, Z_MEM_ERROR if there was not | |||
enough memory, Z_BUF_ERROR if there was not enough room in the output | |||
buffer, or Z_DATA_ERROR if the input data was corrupted. | |||
*/ | |||
int ZEXPORT uncompress (dest, destLen, source, sourceLen) | |||
Bytef *dest; | |||
uLongf *destLen; | |||
const Bytef *source; | |||
uLong sourceLen; | |||
{ | |||
z_stream stream; | |||
int err; | |||
stream.next_in = (Bytef*)source; | |||
stream.avail_in = (uInt)sourceLen; | |||
/* Check for source > 64K on 16-bit machine: */ | |||
if ((uLong)stream.avail_in != sourceLen) return Z_BUF_ERROR; | |||
stream.next_out = dest; | |||
stream.avail_out = (uInt)*destLen; | |||
if ((uLong)stream.avail_out != *destLen) return Z_BUF_ERROR; | |||
stream.zalloc = (alloc_func)0; | |||
stream.zfree = (free_func)0; | |||
err = inflateInit(&stream); | |||
if (err != Z_OK) return err; | |||
err = inflate(&stream, Z_FINISH); | |||
if (err != Z_STREAM_END) { | |||
inflateEnd(&stream); | |||
if (err == Z_NEED_DICT || (err == Z_BUF_ERROR && stream.avail_in == 0)) | |||
return Z_DATA_ERROR; | |||
return err; | |||
} | |||
*destLen = stream.total_out; | |||
err = inflateEnd(&stream); | |||
return err; | |||
} |
@@ -1,428 +0,0 @@ | |||
/* zconf.h -- configuration of the zlib compression library | |||
* Copyright (C) 1995-2010 Jean-loup Gailly. | |||
* For conditions of distribution and use, see copyright notice in zlib.h | |||
*/ | |||
/* @(#) $Id$ */ | |||
#ifndef ZCONF_H | |||
#define ZCONF_H | |||
/* | |||
* If you *really* need a unique prefix for all types and library functions, | |||
* compile with -DZ_PREFIX. The "standard" zlib should be compiled without it. | |||
* Even better than compiling with -DZ_PREFIX would be to use configure to set | |||
* this permanently in zconf.h using "./configure --zprefix". | |||
*/ | |||
#ifdef Z_PREFIX /* may be set to #if 1 by ./configure */ | |||
/* all linked symbols */ | |||
# define _dist_code z__dist_code | |||
# define _length_code z__length_code | |||
# define _tr_align z__tr_align | |||
# define _tr_flush_block z__tr_flush_block | |||
# define _tr_init z__tr_init | |||
# define _tr_stored_block z__tr_stored_block | |||
# define _tr_tally z__tr_tally | |||
# define adler32 z_adler32 | |||
# define adler32_combine z_adler32_combine | |||
# define adler32_combine64 z_adler32_combine64 | |||
# define compress z_compress | |||
# define compress2 z_compress2 | |||
# define compressBound z_compressBound | |||
# define crc32 z_crc32 | |||
# define crc32_combine z_crc32_combine | |||
# define crc32_combine64 z_crc32_combine64 | |||
# define deflate z_deflate | |||
# define deflateBound z_deflateBound | |||
# define deflateCopy z_deflateCopy | |||
# define deflateEnd z_deflateEnd | |||
# define deflateInit2_ z_deflateInit2_ | |||
# define deflateInit_ z_deflateInit_ | |||
# define deflateParams z_deflateParams | |||
# define deflatePrime z_deflatePrime | |||
# define deflateReset z_deflateReset | |||
# define deflateSetDictionary z_deflateSetDictionary | |||
# define deflateSetHeader z_deflateSetHeader | |||
# define deflateTune z_deflateTune | |||
# define deflate_copyright z_deflate_copyright | |||
# define get_crc_table z_get_crc_table | |||
# define gz_error z_gz_error | |||
# define gz_intmax z_gz_intmax | |||
# define gz_strwinerror z_gz_strwinerror | |||
# define gzbuffer z_gzbuffer | |||
# define gzclearerr z_gzclearerr | |||
# define gzclose z_gzclose | |||
# define gzclose_r z_gzclose_r | |||
# define gzclose_w z_gzclose_w | |||
# define gzdirect z_gzdirect | |||
# define gzdopen z_gzdopen | |||
# define gzeof z_gzeof | |||
# define gzerror z_gzerror | |||
# define gzflush z_gzflush | |||
# define gzgetc z_gzgetc | |||
# define gzgets z_gzgets | |||
# define gzoffset z_gzoffset | |||
# define gzoffset64 z_gzoffset64 | |||
# define gzopen z_gzopen | |||
# define gzopen64 z_gzopen64 | |||
# define gzprintf z_gzprintf | |||
# define gzputc z_gzputc | |||
# define gzputs z_gzputs | |||
# define gzread z_gzread | |||
# define gzrewind z_gzrewind | |||
# define gzseek z_gzseek | |||
# define gzseek64 z_gzseek64 | |||
# define gzsetparams z_gzsetparams | |||
# define gztell z_gztell | |||
# define gztell64 z_gztell64 | |||
# define gzungetc z_gzungetc | |||
# define gzwrite z_gzwrite | |||
# define inflate z_inflate | |||
# define inflateBack z_inflateBack | |||
# define inflateBackEnd z_inflateBackEnd | |||
# define inflateBackInit_ z_inflateBackInit_ | |||
# define inflateCopy z_inflateCopy | |||
# define inflateEnd z_inflateEnd | |||
# define inflateGetHeader z_inflateGetHeader | |||
# define inflateInit2_ z_inflateInit2_ | |||
# define inflateInit_ z_inflateInit_ | |||
# define inflateMark z_inflateMark | |||
# define inflatePrime z_inflatePrime | |||
# define inflateReset z_inflateReset | |||
# define inflateReset2 z_inflateReset2 | |||
# define inflateSetDictionary z_inflateSetDictionary | |||
# define inflateSync z_inflateSync | |||
# define inflateSyncPoint z_inflateSyncPoint | |||
# define inflateUndermine z_inflateUndermine | |||
# define inflate_copyright z_inflate_copyright | |||
# define inflate_fast z_inflate_fast | |||
# define inflate_table z_inflate_table | |||
# define uncompress z_uncompress | |||
# define zError z_zError | |||
# define zcalloc z_zcalloc | |||
# define zcfree z_zcfree | |||
# define zlibCompileFlags z_zlibCompileFlags | |||
# define zlibVersion z_zlibVersion | |||
/* all zlib typedefs in zlib.h and zconf.h */ | |||
# define Byte z_Byte | |||
# define Bytef z_Bytef | |||
# define alloc_func z_alloc_func | |||
# define charf z_charf | |||
# define free_func z_free_func | |||
# define gzFile z_gzFile | |||
# define gz_header z_gz_header | |||
# define gz_headerp z_gz_headerp | |||
# define in_func z_in_func | |||
# define intf z_intf | |||
# define out_func z_out_func | |||
# define uInt z_uInt | |||
# define uIntf z_uIntf | |||
# define uLong z_uLong | |||
# define uLongf z_uLongf | |||
# define voidp z_voidp | |||
# define voidpc z_voidpc | |||
# define voidpf z_voidpf | |||
/* all zlib structs in zlib.h and zconf.h */ | |||
# define gz_header_s z_gz_header_s | |||
# define internal_state z_internal_state | |||
#endif | |||
#if defined(__MSDOS__) && !defined(MSDOS) | |||
# define MSDOS | |||
#endif | |||
#if (defined(OS_2) || defined(__OS2__)) && !defined(OS2) | |||
# define OS2 | |||
#endif | |||
#if defined(_WINDOWS) && !defined(WINDOWS) | |||
# define WINDOWS | |||
#endif | |||
#if defined(_WIN32) || defined(_WIN32_WCE) || defined(__WIN32__) | |||
# ifndef WIN32 | |||
# define WIN32 | |||
# endif | |||
#endif | |||
#if (defined(MSDOS) || defined(OS2) || defined(WINDOWS)) && !defined(WIN32) | |||
# if !defined(__GNUC__) && !defined(__FLAT__) && !defined(__386__) | |||
# ifndef SYS16BIT | |||
# define SYS16BIT | |||
# endif | |||
# endif | |||
#endif | |||
/* | |||
* Compile with -DMAXSEG_64K if the alloc function cannot allocate more | |||
* than 64k bytes at a time (needed on systems with 16-bit int). | |||
*/ | |||
#ifdef SYS16BIT | |||
# define MAXSEG_64K | |||
#endif | |||
#ifdef MSDOS | |||
# define UNALIGNED_OK | |||
#endif | |||
#ifdef __STDC_VERSION__ | |||
# ifndef STDC | |||
# define STDC | |||
# endif | |||
# if __STDC_VERSION__ >= 199901L | |||
# ifndef STDC99 | |||
# define STDC99 | |||
# endif | |||
# endif | |||
#endif | |||
#if !defined(STDC) && (defined(__STDC__) || defined(__cplusplus)) | |||
# define STDC | |||
#endif | |||
#if !defined(STDC) && (defined(__GNUC__) || defined(__BORLANDC__)) | |||
# define STDC | |||
#endif | |||
#if !defined(STDC) && (defined(MSDOS) || defined(WINDOWS) || defined(WIN32)) | |||
# define STDC | |||
#endif | |||
#if !defined(STDC) && (defined(OS2) || defined(__HOS_AIX__)) | |||
# define STDC | |||
#endif | |||
#if defined(__OS400__) && !defined(STDC) /* iSeries (formerly AS/400). */ | |||
# define STDC | |||
#endif | |||
#ifndef STDC | |||
# ifndef const /* cannot use !defined(STDC) && !defined(const) on Mac */ | |||
# define const /* note: need a more gentle solution here */ | |||
# endif | |||
#endif | |||
/* Some Mac compilers merge all .h files incorrectly: */ | |||
#if defined(__MWERKS__)||defined(applec)||defined(THINK_C)||defined(__SC__) | |||
# define NO_DUMMY_DECL | |||
#endif | |||
/* Maximum value for memLevel in deflateInit2 */ | |||
#ifndef MAX_MEM_LEVEL | |||
# ifdef MAXSEG_64K | |||
# define MAX_MEM_LEVEL 8 | |||
# else | |||
# define MAX_MEM_LEVEL 9 | |||
# endif | |||
#endif | |||
/* Maximum value for windowBits in deflateInit2 and inflateInit2. | |||
* WARNING: reducing MAX_WBITS makes minigzip unable to extract .gz files | |||
* created by gzip. (Files created by minigzip can still be extracted by | |||
* gzip.) | |||
*/ | |||
#ifndef MAX_WBITS | |||
# define MAX_WBITS 15 /* 32K LZ77 window */ | |||
#endif | |||
/* The memory requirements for deflate are (in bytes): | |||
(1 << (windowBits+2)) + (1 << (memLevel+9)) | |||
that is: 128K for windowBits=15 + 128K for memLevel = 8 (default values) | |||
plus a few kilobytes for small objects. For example, if you want to reduce | |||
the default memory requirements from 256K to 128K, compile with | |||
make CFLAGS="-O -DMAX_WBITS=14 -DMAX_MEM_LEVEL=7" | |||
Of course this will generally degrade compression (there's no free lunch). | |||
The memory requirements for inflate are (in bytes) 1 << windowBits | |||
that is, 32K for windowBits=15 (default value) plus a few kilobytes | |||
for small objects. | |||
*/ | |||
/* Type declarations */ | |||
#ifndef OF /* function prototypes */ | |||
# ifdef STDC | |||
# define OF(args) args | |||
# else | |||
# define OF(args) () | |||
# endif | |||
#endif | |||
/* The following definitions for FAR are needed only for MSDOS mixed | |||
* model programming (small or medium model with some far allocations). | |||
* This was tested only with MSC; for other MSDOS compilers you may have | |||
* to define NO_MEMCPY in zutil.h. If you don't need the mixed model, | |||
* just define FAR to be empty. | |||
*/ | |||
#ifdef SYS16BIT | |||
# if defined(M_I86SM) || defined(M_I86MM) | |||
/* MSC small or medium model */ | |||
# define SMALL_MEDIUM | |||
# ifdef _MSC_VER | |||
# define FAR _far | |||
# else | |||
# define FAR far | |||
# endif | |||
# endif | |||
# if (defined(__SMALL__) || defined(__MEDIUM__)) | |||
/* Turbo C small or medium model */ | |||
# define SMALL_MEDIUM | |||
# ifdef __BORLANDC__ | |||
# define FAR _far | |||
# else | |||
# define FAR far | |||
# endif | |||
# endif | |||
#endif | |||
#if defined(WINDOWS) || defined(WIN32) | |||
/* If building or using zlib as a DLL, define ZLIB_DLL. | |||
* This is not mandatory, but it offers a little performance increase. | |||
*/ | |||
# ifdef ZLIB_DLL | |||
# if defined(WIN32) && (!defined(__BORLANDC__) || (__BORLANDC__ >= 0x500)) | |||
# ifdef ZLIB_INTERNAL | |||
# define ZEXTERN extern __declspec(dllexport) | |||
# else | |||
# define ZEXTERN extern __declspec(dllimport) | |||
# endif | |||
# endif | |||
# endif /* ZLIB_DLL */ | |||
/* If building or using zlib with the WINAPI/WINAPIV calling convention, | |||
* define ZLIB_WINAPI. | |||
* Caution: the standard ZLIB1.DLL is NOT compiled using ZLIB_WINAPI. | |||
*/ | |||
# ifdef ZLIB_WINAPI | |||
# ifdef FAR | |||
# undef FAR | |||
# endif | |||
# include <windows.h> | |||
/* No need for _export, use ZLIB.DEF instead. */ | |||
/* For complete Windows compatibility, use WINAPI, not __stdcall. */ | |||
# define ZEXPORT WINAPI | |||
# ifdef WIN32 | |||
# define ZEXPORTVA WINAPIV | |||
# else | |||
# define ZEXPORTVA FAR CDECL | |||
# endif | |||
# endif | |||
#endif | |||
#if defined (__BEOS__) | |||
# ifdef ZLIB_DLL | |||
# ifdef ZLIB_INTERNAL | |||
# define ZEXPORT __declspec(dllexport) | |||
# define ZEXPORTVA __declspec(dllexport) | |||
# else | |||
# define ZEXPORT __declspec(dllimport) | |||
# define ZEXPORTVA __declspec(dllimport) | |||
# endif | |||
# endif | |||
#endif | |||
#ifndef ZEXTERN | |||
# define ZEXTERN extern | |||
#endif | |||
#ifndef ZEXPORT | |||
# define ZEXPORT | |||
#endif | |||
#ifndef ZEXPORTVA | |||
# define ZEXPORTVA | |||
#endif | |||
#ifndef FAR | |||
# define FAR | |||
#endif | |||
#if !defined(__MACTYPES__) | |||
typedef unsigned char Byte; /* 8 bits */ | |||
#endif | |||
typedef unsigned int uInt; /* 16 bits or more */ | |||
typedef unsigned long uLong; /* 32 bits or more */ | |||
#ifdef SMALL_MEDIUM | |||
/* Borland C/C++ and some old MSC versions ignore FAR inside typedef */ | |||
# define Bytef Byte FAR | |||
#else | |||
typedef Byte FAR Bytef; | |||
#endif | |||
typedef char FAR charf; | |||
typedef int FAR intf; | |||
typedef uInt FAR uIntf; | |||
typedef uLong FAR uLongf; | |||
#ifdef STDC | |||
typedef void const *voidpc; | |||
typedef void FAR *voidpf; | |||
typedef void *voidp; | |||
#else | |||
typedef Byte const *voidpc; | |||
typedef Byte FAR *voidpf; | |||
typedef Byte *voidp; | |||
#endif | |||
#ifdef HAVE_UNISTD_H /* may be set to #if 1 by ./configure */ | |||
# define Z_HAVE_UNISTD_H | |||
#endif | |||
#ifdef STDC | |||
# include <sys/types.h> /* for off_t */ | |||
#endif | |||
/* a little trick to accommodate both "#define _LARGEFILE64_SOURCE" and | |||
* "#define _LARGEFILE64_SOURCE 1" as requesting 64-bit operations, (even | |||
* though the former does not conform to the LFS document), but considering | |||
* both "#undef _LARGEFILE64_SOURCE" and "#define _LARGEFILE64_SOURCE 0" as | |||
* equivalently requesting no 64-bit operations | |||
*/ | |||
#if -_LARGEFILE64_SOURCE - -1 == 1 | |||
# undef _LARGEFILE64_SOURCE | |||
#endif | |||
#if defined(Z_HAVE_UNISTD_H) || defined(_LARGEFILE64_SOURCE) | |||
# include <unistd.h> /* for SEEK_* and off_t */ | |||
# ifdef VMS | |||
# include <unixio.h> /* for off_t */ | |||
# endif | |||
# ifndef z_off_t | |||
# define z_off_t off_t | |||
# endif | |||
#endif | |||
#ifndef SEEK_SET | |||
# define SEEK_SET 0 /* Seek from beginning of file. */ | |||
# define SEEK_CUR 1 /* Seek from current position. */ | |||
# define SEEK_END 2 /* Set file pointer to EOF plus "offset" */ | |||
#endif | |||
#ifndef z_off_t | |||
# define z_off_t long | |||
#endif | |||
#if defined(_LARGEFILE64_SOURCE) && _LFS64_LARGEFILE-0 | |||
# define z_off64_t off64_t | |||
#else | |||
# define z_off64_t z_off_t | |||
#endif | |||
#if defined(__OS400__) | |||
# define NO_vsnprintf | |||
#endif | |||
#if defined(__MVS__) | |||
# define NO_vsnprintf | |||
#endif | |||
/* MVS linker does not support external names larger than 8 bytes */ | |||
#if defined(__MVS__) | |||
#pragma map(deflateInit_,"DEIN") | |||
#pragma map(deflateInit2_,"DEIN2") | |||
#pragma map(deflateEnd,"DEEND") | |||
#pragma map(deflateBound,"DEBND") | |||
#pragma map(inflateInit_,"ININ") | |||
#pragma map(inflateInit2_,"ININ2") | |||
#pragma map(inflateEnd,"INEND") | |||
#pragma map(inflateSync,"INSY") | |||
#pragma map(inflateSetDictionary,"INSEDI") | |||
#pragma map(compressBound,"CMBND") | |||
#pragma map(inflate_table,"INTABL") | |||
#pragma map(inflate_fast,"INFA") | |||
#pragma map(inflate_copyright,"INCOPY") | |||
#endif | |||
#endif /* ZCONF_H */ |
@@ -1,318 +0,0 @@ | |||
/* zutil.c -- target dependent utility functions for the compression library | |||
* Copyright (C) 1995-2005, 2010 Jean-loup Gailly. | |||
* For conditions of distribution and use, see copyright notice in zlib.h | |||
*/ | |||
/* @(#) $Id$ */ | |||
#include "zutil.h" | |||
#ifndef NO_DUMMY_DECL | |||
struct internal_state {int dummy;}; /* for buggy compilers */ | |||
#endif | |||
const char * const z_errmsg[10] = { | |||
"need dictionary", /* Z_NEED_DICT 2 */ | |||
"stream end", /* Z_STREAM_END 1 */ | |||
"", /* Z_OK 0 */ | |||
"file error", /* Z_ERRNO (-1) */ | |||
"stream error", /* Z_STREAM_ERROR (-2) */ | |||
"data error", /* Z_DATA_ERROR (-3) */ | |||
"insufficient memory", /* Z_MEM_ERROR (-4) */ | |||
"buffer error", /* Z_BUF_ERROR (-5) */ | |||
"incompatible version",/* Z_VERSION_ERROR (-6) */ | |||
""}; | |||
const char * ZEXPORT zlibVersion() | |||
{ | |||
return ZLIB_VERSION; | |||
} | |||
uLong ZEXPORT zlibCompileFlags() | |||
{ | |||
uLong flags; | |||
flags = 0; | |||
switch ((int)(sizeof(uInt))) { | |||
case 2: break; | |||
case 4: flags += 1; break; | |||
case 8: flags += 2; break; | |||
default: flags += 3; | |||
} | |||
switch ((int)(sizeof(uLong))) { | |||
case 2: break; | |||
case 4: flags += 1 << 2; break; | |||
case 8: flags += 2 << 2; break; | |||
default: flags += 3 << 2; | |||
} | |||
switch ((int)(sizeof(voidpf))) { | |||
case 2: break; | |||
case 4: flags += 1 << 4; break; | |||
case 8: flags += 2 << 4; break; | |||
default: flags += 3 << 4; | |||
} | |||
switch ((int)(sizeof(z_off_t))) { | |||
case 2: break; | |||
case 4: flags += 1 << 6; break; | |||
case 8: flags += 2 << 6; break; | |||
default: flags += 3 << 6; | |||
} | |||
#ifdef DEBUG | |||
flags += 1 << 8; | |||
#endif | |||
#if defined(ASMV) || defined(ASMINF) | |||
flags += 1 << 9; | |||
#endif | |||
#ifdef ZLIB_WINAPI | |||
flags += 1 << 10; | |||
#endif | |||
#ifdef BUILDFIXED | |||
flags += 1 << 12; | |||
#endif | |||
#ifdef DYNAMIC_CRC_TABLE | |||
flags += 1 << 13; | |||
#endif | |||
#ifdef NO_GZCOMPRESS | |||
flags += 1L << 16; | |||
#endif | |||
#ifdef NO_GZIP | |||
flags += 1L << 17; | |||
#endif | |||
#ifdef PKZIP_BUG_WORKAROUND | |||
flags += 1L << 20; | |||
#endif | |||
#ifdef FASTEST | |||
flags += 1L << 21; | |||
#endif | |||
#ifdef STDC | |||
# ifdef NO_vsnprintf | |||
flags += 1L << 25; | |||
# ifdef HAS_vsprintf_void | |||
flags += 1L << 26; | |||
# endif | |||
# else | |||
# ifdef HAS_vsnprintf_void | |||
flags += 1L << 26; | |||
# endif | |||
# endif | |||
#else | |||
flags += 1L << 24; | |||
# ifdef NO_snprintf | |||
flags += 1L << 25; | |||
# ifdef HAS_sprintf_void | |||
flags += 1L << 26; | |||
# endif | |||
# else | |||
# ifdef HAS_snprintf_void | |||
flags += 1L << 26; | |||
# endif | |||
# endif | |||
#endif | |||
return flags; | |||
} | |||
#ifdef DEBUG | |||
# ifndef verbose | |||
# define verbose 0 | |||
# endif | |||
int ZLIB_INTERNAL z_verbose = verbose; | |||
void ZLIB_INTERNAL z_error (m) | |||
char *m; | |||
{ | |||
fprintf(stderr, "%s\n", m); | |||
exit(1); | |||
} | |||
#endif | |||
/* exported to allow conversion of error code to string for compress() and | |||
* uncompress() | |||
*/ | |||
const char * ZEXPORT zError(err) | |||
int err; | |||
{ | |||
return ERR_MSG(err); | |||
} | |||
#if defined(_WIN32_WCE) | |||
/* The Microsoft C Run-Time Library for Windows CE doesn't have | |||
* errno. We define it as a global variable to simplify porting. | |||
* Its value is always 0 and should not be used. | |||
*/ | |||
int errno = 0; | |||
#endif | |||
#ifndef HAVE_MEMCPY | |||
void ZLIB_INTERNAL zmemcpy(dest, source, len) | |||
Bytef* dest; | |||
const Bytef* source; | |||
uInt len; | |||
{ | |||
if (len == 0) return; | |||
do { | |||
*dest++ = *source++; /* ??? to be unrolled */ | |||
} while (--len != 0); | |||
} | |||
int ZLIB_INTERNAL zmemcmp(s1, s2, len) | |||
const Bytef* s1; | |||
const Bytef* s2; | |||
uInt len; | |||
{ | |||
uInt j; | |||
for (j = 0; j < len; j++) { | |||
if (s1[j] != s2[j]) return 2*(s1[j] > s2[j])-1; | |||
} | |||
return 0; | |||
} | |||
void ZLIB_INTERNAL zmemzero(dest, len) | |||
Bytef* dest; | |||
uInt len; | |||
{ | |||
if (len == 0) return; | |||
do { | |||
*dest++ = 0; /* ??? to be unrolled */ | |||
} while (--len != 0); | |||
} | |||
#endif | |||
#ifdef SYS16BIT | |||
#ifdef __TURBOC__ | |||
/* Turbo C in 16-bit mode */ | |||
# define MY_ZCALLOC | |||
/* Turbo C malloc() does not allow dynamic allocation of 64K bytes | |||
* and farmalloc(64K) returns a pointer with an offset of 8, so we | |||
* must fix the pointer. Warning: the pointer must be put back to its | |||
* original form in order to free it, use zcfree(). | |||
*/ | |||
#define MAX_PTR 10 | |||
/* 10*64K = 640K */ | |||
local int next_ptr = 0; | |||
typedef struct ptr_table_s { | |||
voidpf org_ptr; | |||
voidpf new_ptr; | |||
} ptr_table; | |||
local ptr_table table[MAX_PTR]; | |||
/* This table is used to remember the original form of pointers | |||
* to large buffers (64K). Such pointers are normalized with a zero offset. | |||
* Since MSDOS is not a preemptive multitasking OS, this table is not | |||
* protected from concurrent access. This hack doesn't work anyway on | |||
* a protected system like OS/2. Use Microsoft C instead. | |||
*/ | |||
voidpf ZLIB_INTERNAL zcalloc (voidpf opaque, unsigned items, unsigned size) | |||
{ | |||
voidpf buf = opaque; /* just to make some compilers happy */ | |||
ulg bsize = (ulg)items*size; | |||
/* If we allocate less than 65520 bytes, we assume that farmalloc | |||
* will return a usable pointer which doesn't have to be normalized. | |||
*/ | |||
if (bsize < 65520L) { | |||
buf = farmalloc(bsize); | |||
if (*(ush*)&buf != 0) return buf; | |||
} else { | |||
buf = farmalloc(bsize + 16L); | |||
} | |||
if (buf == NULL || next_ptr >= MAX_PTR) return NULL; | |||
table[next_ptr].org_ptr = buf; | |||
/* Normalize the pointer to seg:0 */ | |||
*((ush*)&buf+1) += ((ush)((uch*)buf-0) + 15) >> 4; | |||
*(ush*)&buf = 0; | |||
table[next_ptr++].new_ptr = buf; | |||
return buf; | |||
} | |||
void ZLIB_INTERNAL zcfree (voidpf opaque, voidpf ptr) | |||
{ | |||
int n; | |||
if (*(ush*)&ptr != 0) { /* object < 64K */ | |||
farfree(ptr); | |||
return; | |||
} | |||
/* Find the original pointer */ | |||
for (n = 0; n < next_ptr; n++) { | |||
if (ptr != table[n].new_ptr) continue; | |||
farfree(table[n].org_ptr); | |||
while (++n < next_ptr) { | |||
table[n-1] = table[n]; | |||
} | |||
next_ptr--; | |||
return; | |||
} | |||
ptr = opaque; /* just to make some compilers happy */ | |||
Assert(0, "zcfree: ptr not found"); | |||
} | |||
#endif /* __TURBOC__ */ | |||
#ifdef M_I86 | |||
/* Microsoft C in 16-bit mode */ | |||
# define MY_ZCALLOC | |||
#if (!defined(_MSC_VER) || (_MSC_VER <= 600)) | |||
# define _halloc halloc | |||
# define _hfree hfree | |||
#endif | |||
voidpf ZLIB_INTERNAL zcalloc (voidpf opaque, uInt items, uInt size) | |||
{ | |||
if (opaque) opaque = 0; /* to make compiler happy */ | |||
return _halloc((long)items, size); | |||
} | |||
void ZLIB_INTERNAL zcfree (voidpf opaque, voidpf ptr) | |||
{ | |||
if (opaque) opaque = 0; /* to make compiler happy */ | |||
_hfree(ptr); | |||
} | |||
#endif /* M_I86 */ | |||
#endif /* SYS16BIT */ | |||
#ifndef MY_ZCALLOC /* Any system without a special alloc function */ | |||
#ifndef STDC | |||
extern voidp malloc OF((uInt size)); | |||
extern voidp calloc OF((uInt items, uInt size)); | |||
extern void free OF((voidpf ptr)); | |||
#endif | |||
voidpf ZLIB_INTERNAL zcalloc (opaque, items, size) | |||
voidpf opaque; | |||
unsigned items; | |||
unsigned size; | |||
{ | |||
if (opaque) items += size - size; /* make compiler happy */ | |||
return sizeof(uInt) > 2 ? (voidpf)malloc(items * size) : | |||
(voidpf)calloc(items, size); | |||
} | |||
void ZLIB_INTERNAL zcfree (opaque, ptr) | |||
voidpf opaque; | |||
voidpf ptr; | |||
{ | |||
free(ptr); | |||
if (opaque) return; /* make compiler happy */ | |||
} | |||
#endif /* MY_ZCALLOC */ |
@@ -1,274 +0,0 @@ | |||
/* zutil.h -- internal interface and configuration of the compression library | |||
* Copyright (C) 1995-2010 Jean-loup Gailly. | |||
* For conditions of distribution and use, see copyright notice in zlib.h | |||
*/ | |||
/* WARNING: this file should *not* be used by applications. It is | |||
part of the implementation of the compression library and is | |||
subject to change. Applications should only use zlib.h. | |||
*/ | |||
/* @(#) $Id$ */ | |||
#ifndef ZUTIL_H | |||
#define ZUTIL_H | |||
#if ((__GNUC__-0) * 10 + __GNUC_MINOR__-0 >= 33) && !defined(NO_VIZ) | |||
# define ZLIB_INTERNAL __attribute__((visibility ("hidden"))) | |||
#else | |||
# define ZLIB_INTERNAL | |||
#endif | |||
#include "zlib.h" | |||
#ifdef STDC | |||
# if !(defined(_WIN32_WCE) && defined(_MSC_VER)) | |||
# include <stddef.h> | |||
# endif | |||
# include <string.h> | |||
# include <stdlib.h> | |||
#endif | |||
#ifndef local | |||
# define local static | |||
#endif | |||
/* compile with -Dlocal if your debugger can't find static symbols */ | |||
typedef unsigned char uch; | |||
typedef uch FAR uchf; | |||
typedef unsigned short ush; | |||
typedef ush FAR ushf; | |||
typedef unsigned long ulg; | |||
extern const char * const z_errmsg[10]; /* indexed by 2-zlib_error */ | |||
/* (size given to avoid silly warnings with Visual C++) */ | |||
#define ERR_MSG(err) z_errmsg[Z_NEED_DICT-(err)] | |||
#define ERR_RETURN(strm,err) \ | |||
return (strm->msg = (char*)ERR_MSG(err), (err)) | |||
/* To be used only when the state is known to be valid */ | |||
/* common constants */ | |||
#ifndef DEF_WBITS | |||
# define DEF_WBITS MAX_WBITS | |||
#endif | |||
/* default windowBits for decompression. MAX_WBITS is for compression only */ | |||
#if MAX_MEM_LEVEL >= 8 | |||
# define DEF_MEM_LEVEL 8 | |||
#else | |||
# define DEF_MEM_LEVEL MAX_MEM_LEVEL | |||
#endif | |||
/* default memLevel */ | |||
#define STORED_BLOCK 0 | |||
#define STATIC_TREES 1 | |||
#define DYN_TREES 2 | |||
/* The three kinds of block type */ | |||
#define MIN_MATCH 3 | |||
#define MAX_MATCH 258 | |||
/* The minimum and maximum match lengths */ | |||
#define PRESET_DICT 0x20 /* preset dictionary flag in zlib header */ | |||
/* target dependencies */ | |||
#if defined(MSDOS) || (defined(WINDOWS) && !defined(WIN32)) | |||
# define OS_CODE 0x00 | |||
# if defined(__TURBOC__) || defined(__BORLANDC__) | |||
# if (__STDC__ == 1) && (defined(__LARGE__) || defined(__COMPACT__)) | |||
/* Allow compilation with ANSI keywords only enabled */ | |||
void _Cdecl farfree( void *block ); | |||
void *_Cdecl farmalloc( unsigned long nbytes ); | |||
# else | |||
# include <alloc.h> | |||
# endif | |||
# else /* MSC or DJGPP */ | |||
# include <malloc.h> | |||
# endif | |||
#endif | |||
#ifdef AMIGA | |||
# define OS_CODE 0x01 | |||
#endif | |||
#if defined(VAXC) || defined(VMS) | |||
# define OS_CODE 0x02 | |||
# define F_OPEN(name, mode) \ | |||
fopen((name), (mode), "mbc=60", "ctx=stm", "rfm=fix", "mrs=512") | |||
#endif | |||
#if defined(ATARI) || defined(atarist) | |||
# define OS_CODE 0x05 | |||
#endif | |||
#ifdef OS2 | |||
# define OS_CODE 0x06 | |||
# ifdef M_I86 | |||
# include <malloc.h> | |||
# endif | |||
#endif | |||
#if defined(MACOS) || defined(TARGET_OS_MAC) | |||
# define OS_CODE 0x07 | |||
# if defined(__MWERKS__) && __dest_os != __be_os && __dest_os != __win32_os | |||
# include <unix.h> /* for fdopen */ | |||
# else | |||
# ifndef fdopen | |||
# define fdopen(fd,mode) NULL /* No fdopen() */ | |||
# endif | |||
# endif | |||
#endif | |||
#ifdef TOPS20 | |||
# define OS_CODE 0x0a | |||
#endif | |||
#ifdef WIN32 | |||
# ifndef __CYGWIN__ /* Cygwin is Unix, not Win32 */ | |||
# define OS_CODE 0x0b | |||
# endif | |||
#endif | |||
#ifdef __50SERIES /* Prime/PRIMOS */ | |||
# define OS_CODE 0x0f | |||
#endif | |||
#if defined(_BEOS_) || defined(RISCOS) | |||
# define fdopen(fd,mode) NULL /* No fdopen() */ | |||
#endif | |||
#if (defined(_MSC_VER) && (_MSC_VER > 600)) && !defined __INTERIX | |||
# if defined(_WIN32_WCE) | |||
# define fdopen(fd,mode) NULL /* No fdopen() */ | |||
# ifndef _PTRDIFF_T_DEFINED | |||
typedef int ptrdiff_t; | |||
# define _PTRDIFF_T_DEFINED | |||
# endif | |||
# else | |||
# define fdopen(fd,type) _fdopen(fd,type) | |||
# endif | |||
#endif | |||
#if defined(__BORLANDC__) | |||
#pragma warn -8004 | |||
#pragma warn -8008 | |||
#pragma warn -8066 | |||
#endif | |||
/* provide prototypes for these when building zlib without LFS */ | |||
#if !defined(_LARGEFILE64_SOURCE) || _LFS64_LARGEFILE-0 == 0 | |||
ZEXTERN uLong ZEXPORT adler32_combine64 OF((uLong, uLong, z_off_t)); | |||
ZEXTERN uLong ZEXPORT crc32_combine64 OF((uLong, uLong, z_off_t)); | |||
#endif | |||
/* common defaults */ | |||
#ifndef OS_CODE | |||
# define OS_CODE 0x03 /* assume Unix */ | |||
#endif | |||
#ifndef F_OPEN | |||
# define F_OPEN(name, mode) fopen((name), (mode)) | |||
#endif | |||
/* functions */ | |||
#if defined(STDC99) || (defined(__TURBOC__) && __TURBOC__ >= 0x550) | |||
# ifndef HAVE_VSNPRINTF | |||
# define HAVE_VSNPRINTF | |||
# endif | |||
#endif | |||
#if defined(__CYGWIN__) | |||
# ifndef HAVE_VSNPRINTF | |||
# define HAVE_VSNPRINTF | |||
# endif | |||
#endif | |||
#ifndef HAVE_VSNPRINTF | |||
# ifdef MSDOS | |||
/* vsnprintf may exist on some MS-DOS compilers (DJGPP?), | |||
but for now we just assume it doesn't. */ | |||
# define NO_vsnprintf | |||
# endif | |||
# ifdef __TURBOC__ | |||
# define NO_vsnprintf | |||
# endif | |||
# ifdef WIN32 | |||
/* In Win32, vsnprintf is available as the "non-ANSI" _vsnprintf. */ | |||
# if !defined(vsnprintf) && !defined(NO_vsnprintf) | |||
# if !defined(_MSC_VER) || ( defined(_MSC_VER) && _MSC_VER < 1500 ) | |||
# define vsnprintf _vsnprintf | |||
# endif | |||
# endif | |||
# endif | |||
# ifdef __SASC | |||
# define NO_vsnprintf | |||
# endif | |||
#endif | |||
#ifdef VMS | |||
# define NO_vsnprintf | |||
#endif | |||
#if defined(pyr) | |||
# define NO_MEMCPY | |||
#endif | |||
#if defined(SMALL_MEDIUM) && !defined(_MSC_VER) && !defined(__SC__) | |||
/* Use our own functions for small and medium model with MSC <= 5.0. | |||
* You may have to use the same strategy for Borland C (untested). | |||
* The __SC__ check is for Symantec. | |||
*/ | |||
# define NO_MEMCPY | |||
#endif | |||
#if defined(STDC) && !defined(HAVE_MEMCPY) && !defined(NO_MEMCPY) | |||
# define HAVE_MEMCPY | |||
#endif | |||
#ifdef HAVE_MEMCPY | |||
# ifdef SMALL_MEDIUM /* MSDOS small or medium model */ | |||
# define zmemcpy _fmemcpy | |||
# define zmemcmp _fmemcmp | |||
# define zmemzero(dest, len) _fmemset(dest, 0, len) | |||
# else | |||
# define zmemcpy memcpy | |||
# define zmemcmp memcmp | |||
# define zmemzero(dest, len) memset(dest, 0, len) | |||
# endif | |||
#else | |||
void ZLIB_INTERNAL zmemcpy OF((Bytef* dest, const Bytef* source, uInt len)); | |||
int ZLIB_INTERNAL zmemcmp OF((const Bytef* s1, const Bytef* s2, uInt len)); | |||
void ZLIB_INTERNAL zmemzero OF((Bytef* dest, uInt len)); | |||
#endif | |||
/* Diagnostic functions */ | |||
#ifdef DEBUG | |||
# include <stdio.h> | |||
extern int ZLIB_INTERNAL z_verbose; | |||
extern void ZLIB_INTERNAL z_error OF((char *m)); | |||
# define Assert(cond,msg) {if(!(cond)) z_error(msg);} | |||
# define Trace(x) {if (z_verbose>=0) fprintf x ;} | |||
# define Tracev(x) {if (z_verbose>0) fprintf x ;} | |||
# define Tracevv(x) {if (z_verbose>1) fprintf x ;} | |||
# define Tracec(c,x) {if (z_verbose>0 && (c)) fprintf x ;} | |||
# define Tracecv(c,x) {if (z_verbose>1 && (c)) fprintf x ;} | |||
#else | |||
# define Assert(cond,msg) | |||
# define Trace(x) | |||
# define Tracev(x) | |||
# define Tracevv(x) | |||
# define Tracec(c,x) | |||
# define Tracecv(c,x) | |||
#endif | |||
voidpf ZLIB_INTERNAL zcalloc OF((voidpf opaque, unsigned items, | |||
unsigned size)); | |||
void ZLIB_INTERNAL zcfree OF((voidpf opaque, voidpf ptr)); | |||
#define ZALLOC(strm, items, size) \ | |||
(*((strm)->zalloc))((strm)->opaque, (items), (size)) | |||
#define ZFREE(strm, addr) (*((strm)->zfree))((strm)->opaque, (voidpf)(addr)) | |||
#define TRY_FREE(s, p) {if (p) ZFREE(s, p);} | |||
#endif /* ZUTIL_H */ |
@@ -4,22 +4,6 @@ | |||
#cmakedefine HAVE_INET_ATON | |||
#cmakedefine HAVE_INET_PTON | |||
#cmakedefine HAVE_GETADDRINFO | |||
#cmakedefine HAVE_GNUTLS_SET_GLOBAL_ERRNO | |||
#cmakedefine HAVE_GNUTLS_SET_ERRNO | |||
#cmakedefine HAVE_GNUTLS_X509_CRT_PRINT | |||
#cmakedefine HAVE_GNUTLS_X509_CRT_T | |||
#cmakedefine HAVE_GNUTLS_DATUM_T | |||
#cmakedefine HAVE_GNUTLS_PK_ALGORITHM_T | |||
#cmakedefine HAVE_GNUTLS_SIGN_ALGORITHM_T | |||
#cmakedefine HAVE_FLTK_CLIPBOARD | |||
#cmakedefine HAVE_FLTK_MEDIAKEYS | |||
#cmakedefine HAVE_FLTK_FULLSCREEN | |||
#cmakedefine HAVE_FLTK_FULLSCREEN_SCREENS | |||
#cmakedefine HAVE_FLTK_CURSOR | |||
#cmakedefine HAVE_FLTK_WORK_AREA | |||
#cmakedefine HAVE_FLTK_ICONS | |||
#cmakedefine HAVE_FLTK_XHANDLERS | |||
#cmakedefine HAVE_FLTK_IM | |||
#cmakedefine HAVE_ACTIVE_DESKTOP_H | |||
#cmakedefine HAVE_ACTIVE_DESKTOP_L | |||
#cmakedefine ENABLE_NLS 1 |
@@ -741,7 +741,6 @@ export CXXFLAGS=`echo $CXXFLAGS | sed -e 's/ -c //g'` | |||
-DFLTK_INCLUDE_DIR=%{xorg_buildroot}%{_includedir} \ | |||
-DBUILD_STATIC=1 \ | |||
-DCMAKE_BUILD_TYPE=Release \ | |||
-DUSE_INCLUDED_ZLIB=0 \ | |||
-DZLIB_INCLUDE_DIR=%{_includedir} \ | |||
-DZLIB_LIBRARY=%{_libdir}/libz.a \ | |||
-DCMAKE_INSTALL_PREFIX=%{_prefix} |
@@ -9,7 +9,7 @@ set -e | |||
PREFIX= | |||
MAKE="make" | |||
PARALLEL_MAKE=0 | |||
XORG_VERSION=7.4 | |||
XORG_VERSION=7.5 | |||
XONLY=0 | |||
CFGHOST= | |||
SRCDIR=`dirname $0`/.. | |||
@@ -55,9 +55,6 @@ modules="dri2proto \ | |||
libpciaccess \ | |||
pixman" | |||
modules74="fontcacheproto \ | |||
evieext" | |||
init() | |||
{ | |||
update_modules | |||
@@ -72,12 +69,8 @@ init() | |||
pushd xserver | |||
if [ "$XORG_VERSION" = "7.4" ]; then | |||
patch -p1 < $SRCDIR/unix/xserver16.patch | |||
else | |||
patch -p1 < $SRCDIR/unix/xserver18.patch | |||
fi | |||
for all in `find $SRCDIR/unix/xorg-$XORG_VERSION-patches/ -type f |grep '.*\.patch$'`; do | |||
for all in `find $SRCDIR/contrib/xorg/xorg-$XORG_VERSION-patches/ -type f |grep '.*\.patch$'`; do | |||
echo Applying $all | |||
patch -p1 < $all | |||
done | |||
@@ -93,7 +86,7 @@ update_modules() | |||
if [ -d xorg.build ]; then rm -rf xorg.build; fi | |||
mkdir xorg | |||
pushd xorg | |||
$SRCDIR/unix/download-xorg-$XORG_VERSION | |||
$SRCDIR/contrib/xorg/download-xorg-$XORG_VERSION | |||
for module in ${modules}; do | |||
tar jxf ~/.tigervnc-xorg-$XORG_VERSION/${module}.tar.bz2 | |||
done | |||
@@ -117,7 +110,7 @@ build () | |||
# Build VNC | |||
echo "*** Building VNC ***" | |||
cmake -G"Unix Makefiles" ${1+"$@"} -DUSE_INCLUDED_ZLIB=1 -DBUILD_STATIC=1 $SRCDIR | |||
cmake -G"Unix Makefiles" ${1+"$@"} -DBUILD_STATIC=1 $SRCDIR | |||
$MAKE | |||
# Build Xorg | |||
@@ -244,7 +237,6 @@ do | |||
xbuild) MODE=build; XONLY=1 ;; | |||
rebuild) MODE=rebuild ;; | |||
update) MODE=update ;; | |||
-version) XORG_VERSION=$2; shift ;; | |||
-parallel) PARALLEL_MAKE=1; ;; | |||
-srcdir) SRCDIR=$2; shift ;; | |||
*) break ;; | |||
@@ -252,12 +244,6 @@ do | |||
shift | |||
done | |||
case "$XORG_VERSION" in | |||
7.4) modules=$modules" "$modules74 ;; | |||
7.5) ;; | |||
*) if [ ! "$MODE" = "rebuild" ]; then usage; fi ;; | |||
esac | |||
pushd $SRCDIR | |||
SRCDIR=`pwd` | |||
echo "*** Using TigerVNC source tree at $SRCDIR ***" |
@@ -1,84 +0,0 @@ | |||
#!/usr/bin/env python | |||
# -*-mode: python; coding: UTF-8 -*- | |||
import os | |||
import glob | |||
#INDI = "http://ftp.sunet.se/pub/X11/ftp.x.org/individual" | |||
INDI = "http://ftp.x.org/pub/individual/" | |||
PROTO = INDI + "proto/" | |||
LIB = INDI + "lib/" | |||
SERVER = INDI + "xserver/" | |||
UTIL = INDI + "util/" | |||
DATA = INDI + "data/" | |||
APP = INDI + "app/" | |||
packages = { | |||
"damageproto": PROTO + "damageproto-1.1.0.tar.bz2", | |||
"fixesproto": PROTO + "fixesproto-4.0.tar.bz2", | |||
"resourceproto": PROTO + "resourceproto-1.0.2.tar.bz2", | |||
"fontsproto": PROTO + "fontsproto-2.0.2.tar.bz2", | |||
"fontcacheproto" : PROTO + "fontcacheproto-0.1.2.tar.bz2", | |||
"bigreqsproto": PROTO + "bigreqsproto-1.0.2.tar.bz2", | |||
"kbproto": PROTO + "kbproto-1.0.3.tar.bz2", | |||
"inputproto": PROTO + "inputproto-1.5.1.tar.bz2", | |||
"glproto": PROTO + "glproto-1.4.9.tar.bz2", | |||
"xineramaproto": PROTO + "xineramaproto-1.1.2.tar.bz2", | |||
"randrproto": PROTO + "randrproto-1.3.2.tar.bz2", | |||
"scrnsaverproto": PROTO + "scrnsaverproto-1.1.0.tar.bz2", | |||
"renderproto": PROTO + "renderproto-0.9.3.tar.bz2", | |||
"evieext": PROTO + "evieext-1.0.2.tar.bz2", | |||
"xcmiscproto": PROTO + "xcmiscproto-1.1.2.tar.bz2", | |||
"xextproto": PROTO + "xextproto-7.0.3.tar.bz2", | |||
"xf86driproto": PROTO + "xf86driproto-2.0.4.tar.bz2", | |||
"dri2proto": PROTO + "dri2proto-2.1.tar.bz2", | |||
"compositeproto": PROTO + "compositeproto-0.4.tar.bz2", | |||
"xf86vidmodeproto": PROTO + "xf86vidmodeproto-2.2.2.tar.bz2", | |||
"videoproto": PROTO + "videoproto-2.2.2.tar.bz2", | |||
"xproto": PROTO + "xproto-7.0.13.tar.bz2", | |||
"libxkbfile": LIB + "libxkbfile-1.0.5.tar.bz2", | |||
"libXxf86vm": LIB + "libXxf86vm-1.0.2.tar.bz2", | |||
"libXext": LIB + "libXext-1.0.4.tar.bz2", | |||
"libfontenc": LIB + "libfontenc-1.0.4.tar.bz2", | |||
"libXau": LIB + "libXau-1.0.4.tar.bz2", | |||
"libXfont": LIB + "libXfont-1.3.4.tar.bz2", | |||
"libXfixes": LIB + "libXfixes-4.0.3.tar.bz2", | |||
"libSM": LIB + "libSM-1.1.0.tar.bz2", | |||
"libXi": LIB + "libXi-1.1.3.tar.bz2", | |||
"libXmu": LIB + "libXmu-1.0.4.tar.bz2", | |||
"libX11": LIB + "libX11-1.1.5.tar.bz2", | |||
"libXdmcp": LIB + "libXdmcp-1.0.2.tar.bz2", | |||
"xtrans": LIB + "xtrans-1.2.2.tar.bz2", | |||
"libXt": LIB + "libXt-1.0.5.tar.bz2", | |||
"libpciaccess": LIB + "libpciaccess-0.10.4.tar.bz2", | |||
"libICE": LIB + "libICE-1.0.4.tar.bz2", | |||
"pixman": LIB + "pixman-0.16.0.tar.bz2", | |||
"libXdamage": LIB + "libXdamage-1.1.1.tar.bz2", | |||
"util-macros": UTIL + "util-macros-1.1.6.tar.bz2", | |||
"xorg-server": SERVER + "xorg-server-1.6.5.tar.bz2", | |||
"libdrm": "http://dri.freedesktop.org/libdrm/libdrm-2.4.0.tar.bz2", | |||
"Mesa": "http://downloads.sourceforge.net/mesa3d/MesaLib-7.2.tar.bz2", | |||
"libpthread-stubs": "http://xcb.freedesktop.org/dist/libpthread-stubs-0.1.tar.bz2", | |||
"freetype": "http://downloads.sourceforge.net/freetype/freetype-2.3.11.tar.bz2", | |||
} | |||
def main(): | |||
dir = os.path.expanduser("~")+"/.tigervnc-xorg-7.4" | |||
cwd = os.getcwd() | |||
if not os.path.exists(dir): | |||
os.mkdir(dir) | |||
os.chdir(dir) | |||
for pkg in packages.keys(): | |||
loc = packages[pkg] | |||
fname = pkg + ".tar.bz2" | |||
if not os.path.exists(fname): | |||
assert 0 == os.spawnvp(os.P_WAIT, "wget", ["-N", "-c", "-O", fname, loc]) | |||
os.chdir(cwd) | |||
main() |
@@ -1,97 +0,0 @@ | |||
*** a/glx/glxdri.c 2011-02-16 14:00:53.000000000 -0600 | |||
--- b/glx/glxdri.c 2011-02-16 13:56:09.000000000 -0600 | |||
*************** | |||
*** 838,843 **** | |||
- static const char dri_driver_path[] = DRI_DRIVER_PATH; | |||
- | |||
static Bool | |||
glxDRIEnterVT (int index, int flags) | |||
--- 838,841 ---- | |||
diff -r -C2 a/glx/glxdriswrast.c b/glx/glxdriswrast.c | |||
*** a/glx/glxdriswrast.c 2011-02-16 14:00:53.000000000 -0600 | |||
--- b/glx/glxdriswrast.c 2011-02-16 13:56:29.000000000 -0600 | |||
*************** | |||
*** 448,453 **** | |||
} | |||
- static const char dri_driver_path[] = DRI_DRIVER_PATH; | |||
- | |||
static __GLXscreen * | |||
__glXDRIscreenProbe(ScreenPtr pScreen) | |||
--- 448,451 ---- | |||
diff -r -C2 a/glx/glxext.c b/glx/glxext.c | |||
*** a/glx/glxext.c 2011-02-16 14:00:54.000000000 -0600 | |||
--- b/glx/glxext.c 2011-02-16 13:58:39.000000000 -0600 | |||
*************** | |||
*** 520,521 **** | |||
--- 520,548 ---- | |||
return retval; | |||
} | |||
+ | |||
+ char *dri_driver_path = DRI_DRIVER_PATH; | |||
+ | |||
+ int GlxProcessArguments(int argc, char *argv[], int i) | |||
+ { | |||
+ if (strncmp(argv[i], "-dridir", 7) == 0) { | |||
+ if (++i < argc) { | |||
+ #if !defined(WIN32) && !defined(__CYGWIN__) | |||
+ if (getuid() != geteuid()) { | |||
+ LogMessage(X_WARNING, "-dridir is not available for setuid X servers\n"); | |||
+ return -1; | |||
+ } else | |||
+ #endif | |||
+ { | |||
+ if (strlen(argv[i]) < PATH_MAX) { | |||
+ dri_driver_path = argv[i]; | |||
+ return 2; | |||
+ } else { | |||
+ LogMessage(X_ERROR, "-dridir pathname too long\n"); | |||
+ return -1; | |||
+ } | |||
+ } | |||
+ } | |||
+ } | |||
+ | |||
+ return 0; | |||
+ } | |||
diff -r -C2 a/glx/glxserver.h b/glx/glxserver.h | |||
*** a/glx/glxserver.h 2011-02-16 14:00:54.000000000 -0600 | |||
--- b/glx/glxserver.h 2011-02-16 14:01:44.000000000 -0600 | |||
*************** | |||
*** 264,266 **** | |||
--- 264,269 ---- | |||
GLint alignment); | |||
+ extern char *dri_driver_path; | |||
+ extern int GlxProcessArguments(int argc, char *argv[], int i); | |||
+ | |||
#endif /* !__GLX_server_h__ */ | |||
Only in b/os: ._utils.c | |||
diff -r -C2 a/os/utils.c b/os/utils.c | |||
*** a/os/utils.c 2011-02-16 14:01:18.000000000 -0600 | |||
--- b/os/utils.c 2011-02-16 14:04:11.000000000 -0600 | |||
*************** | |||
*** 159,162 **** | |||
--- 159,163 ---- | |||
_X_EXPORT Bool noGlxExtension = FALSE; | |||
_X_EXPORT Bool noGlxVisualInit = FALSE; | |||
+ extern int GlxProcessArguments(int argc, char *argv[], int i); | |||
#endif | |||
#ifdef SCREENSAVER | |||
*************** | |||
*** 854,857 **** | |||
--- 855,866 ---- | |||
} | |||
#endif | |||
+ #ifdef GLXEXT | |||
+ else if ((skip = GlxProcessArguments(argc,argv,i)) != 0) { | |||
+ if (skip > 0) | |||
+ i += skip - 1; | |||
+ else | |||
+ UseMsg(); | |||
+ } | |||
+ #endif | |||
#ifdef RLIMIT_DATA | |||
else if ( strcmp( argv[i], "-ld") == 0) |
@@ -1,33 +0,0 @@ | |||
Only in b/xkb: ._xkbInit.c | |||
diff -r -C2 a/xkb/xkbInit.c b/xkb/xkbInit.c | |||
*** a/xkb/xkbInit.c 2011-02-16 14:07:03.000000000 -0600 | |||
--- b/xkb/xkbInit.c 2011-02-16 14:08:08.000000000 -0600 | |||
*************** | |||
*** 875,879 **** | |||
--- 875,900 ---- | |||
} | |||
return j; | |||
+ } else if (strncmp(argv[i], "-xkbcompdir", 11)==0) { | |||
+ if (++i < argc) { | |||
+ #if !defined(WIN32) && !defined(__CYGWIN__) | |||
+ if (getuid() != geteuid()) { | |||
+ LogMessage(X_WARNING, "-xkbdir is not available for setuid X servers\n"); | |||
+ return -1; | |||
+ } else | |||
+ #endif | |||
+ { | |||
+ if (strlen(argv[i]) < PATH_MAX) { | |||
+ XkbBinDirectory = argv[i]; | |||
+ return 2; | |||
+ } else { | |||
+ LogMessage(X_ERROR, "-xkbcompdir pathname too long\n"); | |||
+ return -1; | |||
+ } | |||
+ } | |||
+ } else { | |||
+ return -1; | |||
+ } | |||
} | |||
+ | |||
if ((strcmp(argv[i], "-ardelay") == 0) || | |||
(strcmp (argv[i], "-ar1") == 0)) { /* -ardelay int */ |
@@ -33,19 +33,11 @@ | |||
#include "inpututils.h" | |||
#endif | |||
#include "mi.h" | |||
#if XORG >= 16 | |||
#include "exevents.h" | |||
#endif | |||
#if XORG == 16 | |||
extern void | |||
CopyKeyClass(DeviceIntPtr device, DeviceIntPtr master); | |||
#endif | |||
#if XORG >= 17 | |||
#include "xkbsrv.h" | |||
#include "xkbstr.h" | |||
#include "xserver-properties.h" | |||
extern _X_EXPORT DevPrivateKey CoreDevicePrivateKey; | |||
#endif | |||
#include <X11/keysym.h> | |||
#include <X11/Xlib.h> | |||
#include <X11/Xutil.h> | |||
@@ -53,9 +45,7 @@ extern _X_EXPORT DevPrivateKey CoreDevicePrivateKey; | |||
#define BUTTONS 7 | |||
/* Event queue is shared between all devices. */ | |||
#if XORG == 15 | |||
static xEvent *eventq = NULL; | |||
#elif XORG < 111 | |||
#if XORG < 111 | |||
static EventList *eventq = NULL; | |||
#endif | |||
@@ -67,10 +57,6 @@ static int cursorPosX, cursorPosY; | |||
static KeySym pressedKeys[256]; | |||
#if XORG < 17 | |||
extern void vncGetInitKeyboardMap(KeySymsPtr keysyms, CARD8 *modmap); | |||
#endif | |||
static int vncPointerProc(DeviceIntPtr pDevice, int onoff); | |||
static void vncKeyboardBell(int percent, DeviceIntPtr device, | |||
void * ctrl, int class); | |||
@@ -103,29 +89,6 @@ void vncInitInputDevice(void) | |||
for (i = 0;i < 256;i++) | |||
pressedKeys[i] = NoSymbol; | |||
#if XORG < 17 | |||
vncPointerDev = AddInputDevice( | |||
#if XORG >= 16 | |||
serverClient, | |||
#endif | |||
vncPointerProc, TRUE); | |||
RegisterPointerDevice(vncPointerDev); | |||
vncKeyboardDev = AddInputDevice( | |||
#if XORG >= 16 | |||
serverClient, | |||
#endif | |||
vncKeyboardProc, TRUE); | |||
RegisterKeyboardDevice(vncKeyboardDev); | |||
if (ActivateDevice(vncPointerDev) != Success || | |||
ActivateDevice(vncKeyboardDev) != Success) | |||
FatalError("Failed to activate TigerVNC devices\n"); | |||
if (!EnableDevice(vncPointerDev) || | |||
!EnableDevice(vncKeyboardDev)) | |||
FatalError("Failed to enable TigerVNC devices\n"); | |||
#else /* < 17 */ | |||
ret = AllocDevicePair(serverClient, "TigerVNC", | |||
&vncPointerDev, &vncKeyboardDev, | |||
vncPointerProc, vncKeyboardProc, | |||
@@ -141,21 +104,12 @@ void vncInitInputDevice(void) | |||
if (!EnableDevice(vncPointerDev, TRUE) || | |||
!EnableDevice(vncKeyboardDev, TRUE)) | |||
FatalError("Failed to activate TigerVNC devices\n"); | |||
#endif /* 17 */ | |||
#if XORG < 111 | |||
/* eventq is never free()-ed because it exists during server life. */ | |||
if (eventq == NULL) { | |||
#if XORG == 15 | |||
eventq = (xEvent *)xcalloc(sizeof(xEvent), | |||
GetMaximumEventsNum()); | |||
if (!eventq) | |||
FatalError("Couldn't allocate eventq\n"); | |||
#else | |||
if (eventq == NULL) | |||
GetEventList(&eventq); | |||
#endif | |||
} | |||
#endif | |||
vncPrepareInputDevices(); | |||
} | |||
@@ -250,15 +204,7 @@ static void enqueueEvents(DeviceIntPtr dev, int n) | |||
* good programming practise but in this case it is safe and | |||
* clear. | |||
*/ | |||
mieqEnqueue(dev, | |||
#if XORG == 15 | |||
eventq + i | |||
#elif XORG == 16 | |||
(eventq + i)->event | |||
#else | |||
(InternalEvent *) (eventq + i)->event | |||
#endif | |||
); | |||
mieqEnqueue(dev, (InternalEvent *) (eventq + i)->event); | |||
} | |||
} | |||
#endif /* XORG < 111 */ | |||
@@ -268,21 +214,18 @@ static int vncPointerProc(DeviceIntPtr pDevice, int onoff) | |||
BYTE map[BUTTONS + 1]; | |||
DevicePtr pDev = (DevicePtr)pDevice; | |||
int i; | |||
#if XORG >= 17 | |||
/* | |||
* NOTE: map[] array is one element longer than btn_labels[] array. This | |||
* is not a bug. | |||
*/ | |||
Atom btn_labels[BUTTONS]; | |||
Atom axes_labels[2]; | |||
#endif | |||
switch (onoff) { | |||
case DEVICE_INIT: | |||
for (i = 0; i < BUTTONS + 1; i++) | |||
map[i] = i; | |||
#if XORG >= 17 | |||
btn_labels[0] = XIGetKnownProperty(BTN_LABEL_PROP_BTN_LEFT); | |||
btn_labels[1] = XIGetKnownProperty(BTN_LABEL_PROP_BTN_MIDDLE); | |||
btn_labels[2] = XIGetKnownProperty(BTN_LABEL_PROP_BTN_RIGHT); | |||
@@ -293,20 +236,11 @@ static int vncPointerProc(DeviceIntPtr pDevice, int onoff) | |||
axes_labels[0] = XIGetKnownProperty(AXIS_LABEL_PROP_REL_X); | |||
axes_labels[1] = XIGetKnownProperty(AXIS_LABEL_PROP_REL_Y); | |||
#endif | |||
InitPointerDeviceStruct(pDev, map, BUTTONS, | |||
#if XORG == 15 | |||
GetMotionHistory, | |||
#elif XORG >= 17 | |||
btn_labels, | |||
#endif | |||
InitPointerDeviceStruct(pDev, map, BUTTONS, btn_labels, | |||
(PtrCtrlProcPtr)NoopDDA, | |||
GetMotionHistorySize(), 2 | |||
#if XORG >= 17 | |||
, axes_labels | |||
#endif | |||
); | |||
GetMotionHistorySize(), | |||
2, axes_labels); | |||
break; | |||
case DEVICE_ON: | |||
pDev->on = TRUE; | |||
@@ -331,24 +265,11 @@ static void vncKeyboardBell(int percent, DeviceIntPtr device, | |||
static int vncKeyboardProc(DeviceIntPtr pDevice, int onoff) | |||
{ | |||
#if XORG < 17 | |||
KeySymsRec keySyms; | |||
CARD8 modMap[MAP_LENGTH]; | |||
#endif | |||
DevicePtr pDev = (DevicePtr)pDevice; | |||
switch (onoff) { | |||
case DEVICE_INIT: | |||
#if XORG < 17 | |||
vncGetInitKeyboardMap(&keySyms, modMap); | |||
#endif | |||
InitKeyboardDeviceStruct( | |||
#if XORG >= 17 | |||
pDevice, NULL, | |||
#else | |||
pDev, &keySyms, modMap, | |||
#endif | |||
vncKeyboardBell, | |||
InitKeyboardDeviceStruct(pDevice, NULL, vncKeyboardBell, | |||
(KbdCtrlProcPtr)NoopDDA); | |||
break; | |||
case DEVICE_ON: |
@@ -1,596 +0,0 @@ | |||
/* Copyright (C) 2009 TightVNC Team | |||
* Copyright (C) 2009 Red Hat, Inc. | |||
* Copyright 2013-2015 Pierre Ossman for Cendio AB | |||
* | |||
* This 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. | |||
* | |||
* This software 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 this software; if not, write to the Free Software | |||
* Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, | |||
* USA. | |||
*/ | |||
#ifdef HAVE_DIX_CONFIG_H | |||
#include <dix-config.h> | |||
#endif | |||
#include "Input.h" | |||
#include "xorg-version.h" | |||
#include "inputstr.h" | |||
#ifndef XKB_IN_SERVER | |||
#define XKB_IN_SERVER | |||
#endif | |||
#ifdef XKB | |||
/* | |||
* This include is needed to use XkbConvertCase instead of XConvertCase even if | |||
* we don't use XKB extension. | |||
*/ | |||
#include <xkbsrv.h> | |||
#endif | |||
/* These defines give us access to all keysyms we need */ | |||
#define XK_PUBLISHING | |||
#define XK_TECHNICAL | |||
#include <X11/keysym.h> | |||
#include <X11/XF86keysym.h> | |||
#include <X11/Xlib.h> | |||
#include <X11/Xutil.h> | |||
extern DeviceIntPtr vncKeyboardDev; | |||
#if XORG < 17 | |||
#define IS_PRESSED(dev, keycode) \ | |||
((dev)->key->down[(keycode) >> 3] & (1 << ((keycode) & 7))) | |||
/* Fairly standard US PC Keyboard */ | |||
#define MIN_KEY 8 | |||
#define MAX_KEY 255 | |||
#define MAP_LEN (MAX_KEY - MIN_KEY + 1) | |||
#define KEYSYMS_PER_KEY 2 | |||
static KeySym keyboardMap[MAP_LEN * KEYSYMS_PER_KEY] = { | |||
NoSymbol, NoSymbol, | |||
XK_Escape, NoSymbol, | |||
XK_1, XK_exclam, | |||
XK_2, XK_at, | |||
XK_3, XK_numbersign, | |||
XK_4, XK_dollar, | |||
XK_5, XK_percent, | |||
XK_6, XK_asciicircum, | |||
XK_7, XK_ampersand, | |||
XK_8, XK_asterisk, | |||
XK_9, XK_parenleft, | |||
XK_0, XK_parenright, | |||
XK_minus, XK_underscore, | |||
XK_equal, XK_plus, | |||
XK_BackSpace, NoSymbol, | |||
XK_Tab, NoSymbol, | |||
XK_q, XK_Q, | |||
XK_w, XK_W, | |||
XK_e, XK_E, | |||
XK_r, XK_R, | |||
XK_t, XK_T, | |||
XK_y, XK_Y, | |||
XK_u, XK_U, | |||
XK_i, XK_I, | |||
XK_o, XK_O, | |||
XK_p, XK_P, | |||
XK_bracketleft, XK_braceleft, | |||
XK_bracketright, XK_braceright, | |||
XK_Return, NoSymbol, | |||
XK_Control_L, NoSymbol, | |||
XK_a, XK_A, | |||
XK_s, XK_S, | |||
XK_d, XK_D, | |||
XK_f, XK_F, | |||
XK_g, XK_G, | |||
XK_h, XK_H, | |||
XK_j, XK_J, | |||
XK_k, XK_K, | |||
XK_l, XK_L, | |||
XK_semicolon, XK_colon, | |||
XK_apostrophe, XK_quotedbl, | |||
XK_grave, XK_asciitilde, | |||
XK_Shift_L, NoSymbol, | |||
XK_backslash, XK_bar, | |||
XK_z, XK_Z, | |||
XK_x, XK_X, | |||
XK_c, XK_C, | |||
XK_v, XK_V, | |||
XK_b, XK_B, | |||
XK_n, XK_N, | |||
XK_m, XK_M, | |||
XK_comma, XK_less, | |||
XK_period, XK_greater, | |||
XK_slash, XK_question, | |||
XK_Shift_R, NoSymbol, | |||
XK_KP_Multiply, NoSymbol, | |||
XK_Alt_L, XK_Meta_L, | |||
XK_space, NoSymbol, | |||
XK_Caps_Lock, NoSymbol, | |||
XK_F1, NoSymbol, | |||
XK_F2, NoSymbol, | |||
XK_F3, NoSymbol, | |||
XK_F4, NoSymbol, | |||
XK_F5, NoSymbol, | |||
XK_F6, NoSymbol, | |||
XK_F7, NoSymbol, | |||
XK_F8, NoSymbol, | |||
XK_F9, NoSymbol, | |||
XK_F10, NoSymbol, | |||
XK_Num_Lock, XK_Pointer_EnableKeys, | |||
XK_Scroll_Lock, NoSymbol, | |||
XK_KP_Home, XK_KP_7, | |||
XK_KP_Up, XK_KP_8, | |||
XK_KP_Prior, XK_KP_9, | |||
XK_KP_Subtract, NoSymbol, | |||
XK_KP_Left, XK_KP_4, | |||
XK_KP_Begin, XK_KP_5, | |||
XK_KP_Right, XK_KP_6, | |||
XK_KP_Add, NoSymbol, | |||
XK_KP_End, XK_KP_1, | |||
XK_KP_Down, XK_KP_2, | |||
XK_KP_Next, XK_KP_3, | |||
XK_KP_Insert, XK_KP_0, | |||
XK_KP_Delete, XK_KP_Decimal, | |||
NoSymbol, NoSymbol, | |||
NoSymbol, NoSymbol, | |||
NoSymbol, NoSymbol, | |||
XK_F11, NoSymbol, | |||
XK_F12, NoSymbol, | |||
XK_Home, NoSymbol, | |||
XK_Up, NoSymbol, | |||
XK_Prior, NoSymbol, | |||
XK_Left, NoSymbol, | |||
NoSymbol, NoSymbol, | |||
XK_Right, NoSymbol, | |||
XK_End, NoSymbol, | |||
XK_Down, NoSymbol, | |||
XK_Next, NoSymbol, | |||
XK_Insert, NoSymbol, | |||
XK_Delete, NoSymbol, | |||
XK_KP_Enter, NoSymbol, | |||
XK_Control_R, NoSymbol, | |||
XK_Pause, XK_Break, | |||
XK_Print, XK_Execute, | |||
XK_KP_Divide, NoSymbol, | |||
XK_Alt_R, XK_Meta_R, | |||
NoSymbol, NoSymbol, | |||
XK_Super_L, NoSymbol, | |||
XK_Super_R, NoSymbol, | |||
XK_Menu, NoSymbol, | |||
}; | |||
void vncGetInitKeyboardMap(KeySymsPtr keysyms, CARD8 *modmap) | |||
{ | |||
int i; | |||
for (i = 0; i < MAP_LENGTH; i++) | |||
modmap[i] = NoSymbol; | |||
for (i = 0; i < MAP_LEN; i++) { | |||
switch (keyboardMap[i * KEYSYMS_PER_KEY]) { | |||
case XK_Shift_L: | |||
case XK_Shift_R: | |||
modmap[i + MIN_KEY] = ShiftMask; | |||
break; | |||
case XK_Caps_Lock: | |||
modmap[i + MIN_KEY] = LockMask; | |||
break; | |||
case XK_Control_L: | |||
case XK_Control_R: | |||
modmap[i + MIN_KEY] = ControlMask; | |||
break; | |||
case XK_Alt_L: | |||
case XK_Alt_R: | |||
modmap[i + MIN_KEY] = Mod1Mask; | |||
break; | |||
case XK_Num_Lock: | |||
modmap[i + MIN_KEY] = Mod2Mask; | |||
break; | |||
/* No defaults for Mod3Mask yet */ | |||
case XK_Super_L: | |||
case XK_Super_R: | |||
case XK_Hyper_L: | |||
case XK_Hyper_R: | |||
modmap[i + MIN_KEY] = Mod4Mask; | |||
break; | |||
case XK_ISO_Level3_Shift: | |||
case XK_Mode_switch: | |||
modmap[i + MIN_KEY] = Mod5Mask; | |||
break; | |||
} | |||
} | |||
keysyms->minKeyCode = MIN_KEY; | |||
keysyms->maxKeyCode = MAX_KEY; | |||
keysyms->mapWidth = KEYSYMS_PER_KEY; | |||
keysyms->map = keyboardMap; | |||
} | |||
void vncPrepareInputDevices(void) | |||
{ | |||
/* Don't need to do anything here */ | |||
} | |||
unsigned vncGetKeyboardState(void) | |||
{ | |||
return vncKeyboardDev->key->state; | |||
} | |||
unsigned vncGetLevelThreeMask(void) | |||
{ | |||
int i, j, k; | |||
int minKeyCode, mapWidth; | |||
KeySym *map; | |||
int maxKeysPerMod; | |||
CARD8 *modmap; | |||
minKeyCode = vncKeyboardDev->key->curKeySyms.minKeyCode; | |||
mapWidth = vncKeyboardDev->key->curKeySyms.mapWidth; | |||
map = vncKeyboardDev->key->curKeySyms.map; | |||
maxKeysPerMod = vncKeyboardDev->key->maxKeysPerModifier; | |||
modmap = vncKeyboardDev->key->modifierKeyMap; | |||
for (i = 3; i < 8; i++) { | |||
for (k = 0; k < maxKeysPerMod; k++) { | |||
int index = i * maxKeysPerMod + k; | |||
int keycode = modmap[index]; | |||
if (keycode == 0) | |||
continue; | |||
for (j = 0; j < mapWidth; j++) { | |||
KeySym keysym; | |||
keysym = map[(keycode - minKeyCode) * mapWidth + j]; | |||
if (keysym == XK_Mode_switch) | |||
return 1 << i; | |||
} | |||
} | |||
} | |||
return 0; | |||
} | |||
KeyCode vncPressShift(void) | |||
{ | |||
int maxKeysPerMod; | |||
maxKeysPerMod = vncKeyboardDev->key->maxKeysPerModifier; | |||
return vncKeyboardDev->key->modifierKeyMap[ShiftMapIndex * maxKeysPerMod]; | |||
} | |||
size_t vncReleaseShift(KeyCode *keys, size_t maxKeys) | |||
{ | |||
size_t count; | |||
int maxKeysPerMod; | |||
count = 0; | |||
maxKeysPerMod = vncKeyboardDev->key->maxKeysPerModifier; | |||
for (int k = 0; k < maxKeysPerMod; k++) { | |||
int keycode; | |||
int index; | |||
index = ShiftMapIndex * maxKeysPerMod + k; | |||
keycode = vncKeyboardDev->key->modifierKeyMap[index]; | |||
if (keycode == 0) | |||
continue; | |||
if (!IS_PRESSED(vncKeyboardDev, keycode)) | |||
continue; | |||
if (count >= maxKeys) | |||
return 0; | |||
keys[count++] = keycode; | |||
} | |||
return count; | |||
} | |||
KeyCode vncPressLevelThree(void) | |||
{ | |||
unsigned mask, index; | |||
int maxKeysPerMod; | |||
mask = getLevelThreeMask(); | |||
if (mask == 0) | |||
return 0; | |||
index = ffs(mask) - 1; | |||
maxKeysPerMod = vncKeyboardDev->key->maxKeysPerModifier; | |||
return vncKeyboardDev->key->modifierKeyMap[index * maxKeysPerMod]; | |||
} | |||
size_t vncReleaseLevelThree(KeyCode *keys, size_t maxKeys) | |||
{ | |||
size_t count; | |||
unsigned mask, msindex; | |||
int maxKeysPerMod; | |||
mask = getLevelThreeMask(); | |||
if (mask == 0) | |||
return 0; | |||
msindex = ffs(mask) - 1; | |||
count = 0; | |||
maxKeysPerMod = vncKeyboardDev->key->maxKeysPerModifier; | |||
for (int k = 0; k < maxKeysPerMod; k++) { | |||
int keycode; | |||
int index; | |||
index = msindex * maxKeysPerMod + k; | |||
keycode = vncKeyboardDev->key->modifierKeyMap[index]; | |||
if (keycode == 0) | |||
continue; | |||
if (!IS_PRESSED(vncKeyboardDev, keycode)) | |||
continue; | |||
if (count >= maxKeys) | |||
return 0; | |||
keys[count++] = keycode; | |||
} | |||
return count; | |||
} | |||
static KeySym KeyCodetoKeySym(KeySymsPtr keymap, int keycode, int col) | |||
{ | |||
int per = keymap->mapWidth; | |||
KeySym *syms; | |||
KeySym lsym, usym; | |||
if ((col < 0) || ((col >= per) && (col > 3)) || | |||
(keycode < keymap->minKeyCode) || (keycode > keymap->maxKeyCode)) | |||
return NoSymbol; | |||
syms = &keymap->map[(keycode - keymap->minKeyCode) * per]; | |||
if (col >= 4) | |||
return syms[col]; | |||
if (col > 1) { | |||
while ((per > 2) && (syms[per - 1] == NoSymbol)) | |||
per--; | |||
if (per < 3) | |||
col -= 2; | |||
} | |||
if ((per <= (col|1)) || (syms[col|1] == NoSymbol)) { | |||
XkbConvertCase(syms[col&~1], &lsym, &usym); | |||
if (!(col & 1)) | |||
return lsym; | |||
/* | |||
* I'm commenting out this logic because it's incorrect even | |||
* though it was copied from the Xlib sources. The X protocol | |||
* book quite clearly states that where a group consists of | |||
* element 1 being a non-alphabetic keysym and element 2 being | |||
* NoSymbol that you treat the second element as being the | |||
* same as the first. This also tallies with the behaviour | |||
* produced by the installed Xlib on my linux box (I believe | |||
* this is because it uses some XKB code rather than the | |||
* original Xlib code - compare XKBBind.c with KeyBind.c in | |||
* lib/X11). | |||
*/ | |||
#if 0 | |||
else if (usym == lsym) | |||
return NoSymbol; | |||
#endif | |||
else | |||
return usym; | |||
} | |||
return syms[col]; | |||
} | |||
KeyCode vncKeysymToKeycode(KeySym keysym, unsigned state, unsigned *new_state) | |||
{ | |||
int i, j; | |||
unsigned mask; | |||
KeySymsPtr keymap; | |||
int mapWidth; | |||
mask = vncGetLevelThreeMask(); | |||
keymap = &vncKeyboardDev->key->curKeySyms; | |||
/* | |||
* Column 0 means both shift and "mode_switch" (AltGr) must be released, | |||
* column 1 means shift must be pressed and mode_switch released, | |||
* column 2 means shift must be released and mode_switch pressed, and | |||
* column 3 means both shift and mode_switch must be pressed. | |||
*/ | |||
j = 0; | |||
if (state & ShiftMask) | |||
j |= 0x1; | |||
if (state & mask) | |||
j |= 0x2; | |||
*new_state = state; | |||
for (i = keymap->minKeyCode; i <= keymap->maxKeyCode; i++) { | |||
if (KeyCodetoKeySym(keymap, i, j) == keysym) | |||
return i; | |||
} | |||
/* Only the first four columns have well-defined meaning */ | |||
mapWidth = keymap->mapWidth; | |||
if (mapWidth > 4) | |||
mapWidth = 4; | |||
for (j = 0; j < mapWidth; j++) { | |||
for (i = keymap->minKeyCode; i <= keymap->maxKeyCode; i++) { | |||
if (KeyCodetoKeySym(keymap, i, j) == keysym) { | |||
*new_state = state & ~(ShiftMask|mask); | |||
if (j & 0x1) | |||
*new_state |= ShiftMask; | |||
if (j & 0x2) | |||
*new_state |= mask; | |||
return i; | |||
} | |||
} | |||
} | |||
return 0; | |||
} | |||
int vncIsLockModifier(KeyCode keycode, unsigned state) | |||
{ | |||
int i, j, k; | |||
int minKeyCode, mapWidth; | |||
KeySym *map; | |||
int maxKeysPerMod; | |||
CARD8 *modmap; | |||
int num_lock_index; | |||
minKeyCode = vncKeyboardDev->key->curKeySyms.minKeyCode; | |||
mapWidth = vncKeyboardDev->key->curKeySyms.mapWidth; | |||
map = vncKeyboardDev->key->curKeySyms.map; | |||
maxKeysPerMod = vncKeyboardDev->key->maxKeysPerModifier; | |||
modmap = vncKeyboardDev->key->modifierKeyMap; | |||
/* Caps Lock is fairly easy as it has a dedicated modmap entry */ | |||
for (k = 0; k < maxKeysPerMod; k++) { | |||
int index; | |||
index = LockMapIndex * maxKeysPerMod + k; | |||
if (keycode == modmap[index]) | |||
return 1; | |||
} | |||
/* For Num Lock we need to find the correct modmap entry */ | |||
num_lock_index = i; | |||
for (i = 3; i < 8; i++) { | |||
for (k = 0; k < maxKeysPerMod; k++) { | |||
int index = i * maxKeysPerMod + k; | |||
int keycode = modmap[index]; | |||
if (keycode == 0) | |||
continue; | |||
for (j = 0; j < mapWidth; j++) { | |||
KeySym keysym; | |||
keysym = map[(keycode - minKeyCode) * mapWidth + j]; | |||
if (keysym == XK_Num_Lock) { | |||
num_lock_index = i; | |||
goto done; | |||
} | |||
} | |||
} | |||
} | |||
done: | |||
if (num_lock_index == 0) | |||
return 0; | |||
/* Now we can look in the modmap */ | |||
for (k = 0; k < maxKeysPerMod; k++) { | |||
int index; | |||
index = num_lock_index * maxKeysPerMod + k; | |||
if (keycode == modmap[index]) | |||
return 1; | |||
} | |||
return 0; | |||
} | |||
int vncIsAffectedByNumLock(KeyCode keycode) | |||
{ | |||
KeySymsPtr keymap; | |||
int i, per; | |||
KeySym *syms; | |||
keymap = &vncKeyboardDev->key->curKeySyms; | |||
per = keymap->mapWidth; | |||
syms = &keymap->map[(keycode - keymap->minKeyCode) * per]; | |||
for (i = 0;i < per;i++) { | |||
if (IsKeypadKey(syms[i])) | |||
return 1; | |||
if (IsPrivateKeypadKey(syms[i])) | |||
return 1; | |||
} | |||
return 0; | |||
} | |||
KeyCode vncAddKeysym(KeySym keysym, unsigned state) | |||
{ | |||
KeyCode kc; | |||
int minKeyCode, maxKeyCode, mapWidth; | |||
KeySym *map; | |||
minKeyCode = vncKeyboardDev->key->curKeySyms.minKeyCode; | |||
maxKeyCode = vncKeyboardDev->key->curKeySyms.maxKeyCode; | |||
mapWidth = vncKeyboardDev->key->curKeySyms.mapWidth; | |||
map = vncKeyboardDev->key->curKeySyms.map; | |||
/* | |||
* Magic, which dynamically adds keysym<->keycode mapping | |||
* depends on X.Org version. Quick explanation of that "magic": | |||
* | |||
* 1.5 | |||
* - has only one core keyboard so we have to keep core | |||
* keyboard mapping synchronized with vncKeyboardDevice. Do | |||
* it via SwitchCoreKeyboard() | |||
* | |||
* 1.6 (aka MPX - Multi pointer X) | |||
* - multiple master devices (= core devices) exists, keep | |||
* vncKeyboardDevice synchronized with proper master device | |||
*/ | |||
for (kc = maxKeyCode; kc >= minKeyCode; kc--) { | |||
DeviceIntPtr master; | |||
if (map[(kc - minKeyCode) * mapWidth] != 0) | |||
continue; | |||
map[(kc - minKeyCode) * mapWidth] = keysym; | |||
#if XORG == 15 | |||
master = inputInfo.keyboard; | |||
#else | |||
master = vncKeyboardDev->u.master; | |||
#endif | |||
void *slave = dixLookupPrivate(&master->devPrivates, | |||
CoreDevicePrivateKey); | |||
if (vncKeyboardDev == slave) { | |||
dixSetPrivate(&master->devPrivates, | |||
CoreDevicePrivateKey, NULL); | |||
#if XORG == 15 | |||
SwitchCoreKeyboard(vncKeyboardDev); | |||
#else | |||
CopyKeyClass(vncKeyboardDev, master); | |||
#endif | |||
} | |||
return kc; | |||
} | |||
return 0; | |||
} | |||
#endif | |||
@@ -24,8 +24,6 @@ | |||
#include "xorg-version.h" | |||
#if XORG >= 17 | |||
#include <stdio.h> | |||
#include <X11/keysym.h> | |||
@@ -655,5 +653,3 @@ static void vncXkbProcessDeviceEvent(int screenNum, | |||
ctrls->enabled_ctrls = backupctrls; | |||
} | |||
#endif /* XORG >= 117 */ |
@@ -16,7 +16,7 @@ HDRS = vncExtInit.h vncHooks.h \ | |||
libvnccommon_la_SOURCES = $(HDRS) vncExt.c vncExtInit.cc vncHooks.c \ | |||
vncBlockHandler.c XorgGlue.c RFBGlue.cc XserverDesktop.cc \ | |||
Input.c InputCore.c InputXKB.c | |||
Input.c InputXKB.c | |||
libvnccommon_la_CPPFLAGS = -DVENDOR_RELEASE="$(VENDOR_RELEASE)" \ | |||
-DVENDOR_STRING="\"$(VENDOR_STRING)\"" -I$(TIGERVNC_SRCDIR)/common -UHAVE_CONFIG_H \ |
@@ -96,10 +96,7 @@ typedef struct _vncHooksGCRec { | |||
#endif | |||
} vncHooksGCRec, *vncHooksGCPtr; | |||
#if XORG == 15 | |||
static DevPrivateKey vncHooksScreenPrivateKey = &vncHooksScreenPrivateKey; | |||
static DevPrivateKey vncHooksGCPrivateKey = &vncHooksGCPrivateKey; | |||
#elif XORG < 19 | |||
#if XORG < 19 | |||
static int vncHooksScreenPrivateKeyIndex; | |||
static int vncHooksGCPrivateKeyIndex; | |||
static DevPrivateKey vncHooksScreenPrivateKey = &vncHooksScreenPrivateKeyIndex; | |||
@@ -133,11 +130,8 @@ static void vncHooksClearToBackground(WindowPtr pWin, int x, int y, int w, | |||
#if XORG < 110 | |||
static RegionPtr vncHooksRestoreAreas(WindowPtr pWin, RegionPtr prgnExposed); | |||
#endif | |||
static Bool vncHooksDisplayCursor( | |||
#if XORG >= 16 | |||
DeviceIntPtr pDev, | |||
#endif | |||
ScreenPtr pScreen, CursorPtr cursor); | |||
static Bool vncHooksDisplayCursor(DeviceIntPtr pDev, | |||
ScreenPtr pScreen, CursorPtr cursor); | |||
#if XORG <= 112 | |||
static void vncHooksBlockHandler(int i, pointer blockData, pointer pTimeout, | |||
pointer pReadmask); | |||
@@ -601,30 +595,20 @@ static RegionPtr vncHooksRestoreAreas(WindowPtr pWin, RegionPtr pRegion) | |||
// DisplayCursor - get the cursor shape | |||
static Bool vncHooksDisplayCursor( | |||
#if XORG >= 16 | |||
DeviceIntPtr pDev, | |||
#endif | |||
ScreenPtr pScreen_, CursorPtr cursor) | |||
static Bool vncHooksDisplayCursor(DeviceIntPtr pDev, | |||
ScreenPtr pScreen_, CursorPtr cursor) | |||
{ | |||
Bool ret; | |||
SCREEN_UNWRAP(pScreen_, DisplayCursor); | |||
ret = (*pScreen->DisplayCursor) ( | |||
#if XORG >= 16 | |||
pDev, | |||
#endif | |||
pScreen, cursor); | |||
ret = (*pScreen->DisplayCursor) (pDev, pScreen, cursor); | |||
#if XORG >= 16 | |||
/* | |||
* XXX DIX calls this function with NULL argument to remove cursor sprite from | |||
* screen. Should we handle this in setCursor as well? | |||
*/ | |||
if (cursor != NullCursor) | |||
#endif | |||
{ | |||
if (cursor != NullCursor) { | |||
int width, height; | |||
int hotX, hotY; | |||
@@ -24,10 +24,8 @@ | |||
#include <dix-config.h> | |||
#endif | |||
#if XORG_VERSION_CURRENT < ((1 * 10000000) + (5 * 100000) + (99 * 1000)) | |||
#define XORG 15 | |||
#elif XORG_VERSION_CURRENT < ((1 * 10000000) + (6 * 100000) + (99 * 1000)) | |||
#define XORG 16 | |||
#if XORG_VERSION_CURRENT < ((1 * 10000000) + (6 * 100000) + (99 * 1000)) | |||
#error "X.Org older than 1.7 is not supported" | |||
#elif XORG_VERSION_CURRENT < ((1 * 10000000) + (7 * 100000) + (99 * 1000)) | |||
#define XORG 17 | |||
#elif XORG_VERSION_CURRENT < ((1 * 10000000) + (8 * 100000) + (99 * 1000)) |
@@ -80,11 +80,9 @@ from the X Consortium. | |||
#endif | |||
#include <X11/keysym.h> | |||
extern char buildtime[]; | |||
#if XORG >= 17 | |||
#undef VENDOR_RELEASE | |||
#undef VENDOR_STRING | |||
#include "version-config.h" | |||
#endif | |||
#include "site.h" | |||
#define XVNCVERSION "TigerVNC 1.4.80" | |||
@@ -848,39 +846,28 @@ vfbCrossScreen (ScreenPtr pScreen, Bool entering) | |||
{ | |||
} | |||
static Bool vfbRealizeCursor( | |||
#if XORG >= 16 | |||
DeviceIntPtr pDev, | |||
#endif | |||
ScreenPtr pScreen, CursorPtr pCursor) { | |||
static Bool vfbRealizeCursor(DeviceIntPtr pDev, | |||
ScreenPtr pScreen, CursorPtr pCursor) | |||
{ | |||
return TRUE; | |||
} | |||
static Bool vfbUnrealizeCursor( | |||
#if XORG >= 16 | |||
DeviceIntPtr pDev, | |||
#endif | |||
ScreenPtr pScreen, CursorPtr pCursor) { | |||
static Bool vfbUnrealizeCursor(DeviceIntPtr pDev, | |||
ScreenPtr pScreen, CursorPtr pCursor) | |||
{ | |||
return TRUE; | |||
} | |||
static void vfbSetCursor( | |||
#if XORG >= 16 | |||
DeviceIntPtr pDev, | |||
#endif | |||
ScreenPtr pScreen, CursorPtr pCursor, int x, int y) | |||
static void vfbSetCursor(DeviceIntPtr pDev, | |||
ScreenPtr pScreen, CursorPtr pCursor, int x, int y) | |||
{ | |||
} | |||
static void vfbMoveCursor( | |||
#if XORG >= 16 | |||
DeviceIntPtr pDev, | |||
#endif | |||
ScreenPtr pScreen, int x, int y) | |||
static void vfbMoveCursor(DeviceIntPtr pDev, | |||
ScreenPtr pScreen, int x, int y) | |||
{ | |||
} | |||
#if XORG >= 16 | |||
static Bool | |||
vfbDeviceCursorInitialize(DeviceIntPtr pDev, ScreenPtr pScreen) | |||
{ | |||
@@ -891,17 +878,14 @@ static void | |||
vfbDeviceCursorCleanup(DeviceIntPtr pDev, ScreenPtr pScreen) | |||
{ | |||
} | |||
#endif | |||
static miPointerSpriteFuncRec vfbPointerSpriteFuncs = { | |||
vfbRealizeCursor, | |||
vfbUnrealizeCursor, | |||
vfbSetCursor, | |||
vfbMoveCursor | |||
#if XORG >= 16 | |||
, vfbDeviceCursorInitialize, | |||
vfbMoveCursor, | |||
vfbDeviceCursorInitialize, | |||
vfbDeviceCursorCleanup | |||
#endif | |||
}; | |||
static miPointerScreenFuncRec vfbPointerCursorFuncs = { | |||
@@ -1220,11 +1204,7 @@ static Bool vncRandRCrtcSet(ScreenPtr pScreen, RRCrtcPtr crtc, RRModePtr mode, | |||
} | |||
/* Let RandR know we approve, and let it update its internal state */ | |||
ret = RRCrtcNotify(crtc, mode, x, y, rotation, | |||
#if XORG >= 16 | |||
NULL, | |||
#endif | |||
num_outputs, outputs); | |||
ret = RRCrtcNotify(crtc, mode, x, y, rotation, NULL, num_outputs, outputs); | |||
if (!ret) | |||
return FALSE; | |||
@@ -1694,9 +1674,6 @@ Bool LegalModifier(unsigned int key, DeviceIntPtr pDev) | |||
void ProcessInputEvents(void) | |||
{ | |||
mieqProcessInputEvents(); | |||
#if XORG == 15 | |||
miPointerUpdate(); | |||
#endif | |||
} | |||
// InitInput is called after InitExtensions, so we're guaranteed that |
@@ -1,158 +0,0 @@ | |||
diff -up xserver/configure.ac.vnc xserver/configure.ac | |||
--- xserver/configure.ac.vnc 2011-05-11 11:02:51.229669941 +0200 | |||
+++ xserver/configure.ac 2011-05-11 11:03:07.754072695 +0200 | |||
@@ -31,7 +31,7 @@ RELEASE_DATE="5 November 2008" | |||
REMEMBER_REMEMBER="The Fifth of November" | |||
AC_CONFIG_SRCDIR([Makefile.am]) | |||
AM_INIT_AUTOMAKE([dist-bzip2 foreign]) | |||
-AM_MAINTAINER_MODE | |||
+m4_pattern_allow([AC_DEFINE]) | |||
dnl this gets generated by autoheader, and thus contains all the defines. we | |||
dnl don't ever actually use it, internally. | |||
@@ -54,6 +54,7 @@ dnl kdrive-config.h covers the kdrive DD | |||
AC_CONFIG_HEADERS(include/kdrive-config.h) | |||
AC_PROG_CC | |||
+AC_PROG_CXX | |||
AM_PROG_AS | |||
AC_PROG_INSTALL | |||
AC_PROG_LN_S | |||
@@ -1010,7 +1011,7 @@ AC_DEFINE(SHAPE, 1, [Support SHAPE exten | |||
AC_DEFINE(XKB, 1, [Build XKB]) | |||
AC_DEFINE(XKB_IN_SERVER, 1, [Build XKB server]) | |||
-AC_DEFINE(XKB_DFLT_DISABLED, 0, [Disable XKB per default]) | |||
+AC_DEFINE(XKB_DFLT_DISABLED, 1, [Disable XKB per default]) | |||
REQUIRED_MODULES="$REQUIRED_MODULES xkbfile" | |||
XKB_LIB='$(top_builddir)/xkb/libxkb.la' | |||
XKB_STUB_LIB='$(top_builddir)/xkb/libxkbstubs.la' | |||
@@ -1220,6 +1221,9 @@ if test "x$XVFB" = xyes; then | |||
AC_SUBST([XVFB_SYS_LIBS]) | |||
fi | |||
+dnl Xvnc DDX | |||
+AC_SUBST([XVNC_CPPFLAGS], ["-DHAVE_DIX_CONFIG_H $XEXT_INC $FB_INC $MI_INC $RENDER_INC $RANDR_INC"]) | |||
+AC_SUBST([XVNC_LIBS], ["$FB_LIB $FIXES_LIB $XEXT_LIB $CONFIG_LIB $DBE_LIB $XTRAP_LIB $RECORD_LIB $GLX_LIBS $RENDER_LIB $RANDR_LIB $DAMAGE_LIB $MIEXT_DAMAGE_LIB $MIEXT_SHADOW_LIB $XI_LIB $XKB_LIB $XKB_STUB_LIB $COMPOSITE_LIB $XPSTUBS_LIB"]) | |||
dnl Xnest DDX | |||
@@ -1314,6 +1318,8 @@ xorg_bus_ppcpci=no | |||
xorg_bus_sparcpci=no | |||
xorg_bus_sparc=no | |||
+AC_DEFINE_UNQUOTED(XORG_VERSION_CURRENT, [$VENDOR_RELEASE], [Current Xorg version]) | |||
+ | |||
if test "x$XORG" = xyes -o "x$XGL" = xyes; then | |||
XORG_DDXINCS='-I$(top_srcdir)/hw/xfree86 -I$(top_srcdir)/hw/xfree86/include -I$(top_srcdir)/hw/xfree86/common' | |||
XORG_OSINCS='-I$(top_srcdir)/hw/xfree86/os-support -I$(top_srcdir)/hw/xfree86/os-support/bus -I$(top_srcdir)/os' | |||
@@ -1521,7 +1527,6 @@ if test "x$XORG" = xyes -o "x$XGL" = xye | |||
AC_DEFINE(XORGSERVER, 1, [Building Xorg server]) | |||
AC_DEFINE(XFree86Server, 1, [Building XFree86 server]) | |||
AC_DEFINE(XFree86LOADER, 1, [Building loadable XFree86 server]) | |||
- AC_DEFINE_UNQUOTED(XORG_VERSION_CURRENT, [$VENDOR_RELEASE], [Current Xorg version]) | |||
AC_DEFINE(NEED_XF86_TYPES, 1, [Need XFree86 typedefs]) | |||
AC_DEFINE(NEED_XF86_PROTOTYPES, 1, [Need XFree86 helper functions]) | |||
AC_DEFINE(__XSERVERNAME__, "Xorg", [Name of X server]) | |||
@@ -2184,6 +2189,7 @@ hw/dmx/input/Makefile | |||
hw/dmx/glxProxy/Makefile | |||
hw/dmx/Makefile | |||
hw/vfb/Makefile | |||
+hw/vnc/Makefile | |||
hw/xgl/Makefile | |||
hw/xgl/egl/Makefile | |||
hw/xgl/egl/module/Makefile | |||
diff -up xserver/hw/Makefile.am.vnc xserver/hw/Makefile.am | |||
--- xserver/hw/Makefile.am.vnc 2011-05-11 11:02:51.809648976 +0200 | |||
+++ xserver/hw/Makefile.am 2011-05-11 11:03:07.754072695 +0200 | |||
@@ -43,7 +43,8 @@ SUBDIRS = \ | |||
$(DMX_SUBDIRS) \ | |||
$(KDRIVE_SUBDIRS) \ | |||
$(XQUARTZ_SUBDIRS) \ | |||
- $(XPRINT_SUBDIRS) | |||
+ $(XPRINT_SUBDIRS) \ | |||
+ vnc | |||
DIST_SUBDIRS = dmx xfree86 vfb xnest xwin xquartz kdrive xgl xprint | |||
diff -up xserver/mi/miinitext.c.vnc xserver/mi/miinitext.c | |||
--- xserver/mi/miinitext.c.vnc 2011-05-11 11:02:53.156600294 +0200 | |||
+++ xserver/mi/miinitext.c 2011-05-11 11:03:31.079229673 +0200 | |||
@@ -292,6 +292,9 @@ extern void BigReqExtensionInit(INITARGS | |||
#ifdef MITMISC | |||
extern void MITMiscExtensionInit(INITARGS); | |||
#endif | |||
+#ifdef TIGERVNC | |||
+extern void vncExtensionInit(INITARGS); | |||
+#endif | |||
#ifdef XIDLE | |||
extern void XIdleExtensionInit(INITARGS); | |||
#endif | |||
@@ -566,6 +569,9 @@ InitExtensions(argc, argv) | |||
#ifdef MITMISC | |||
if (!noMITMiscExtension) MITMiscExtensionInit(); | |||
#endif | |||
+#ifdef TIGERVNC | |||
+ vncExtensionInit(); | |||
+#endif | |||
#ifdef XIDLE | |||
if (!noXIdleExtension) XIdleExtensionInit(); | |||
#endif | |||
--- xserver/os/WaitFor.c.orig 2011-10-07 12:57:57.000000000 +0200 | |||
+++ xserver/os/WaitFor.c 2011-10-07 13:21:11.000000000 +0200 | |||
@@ -125,6 +125,9 @@ | |||
static void CheckAllTimers(void); | |||
static OsTimerPtr timers = NULL; | |||
+extern void vncWriteBlockHandler(fd_set *fds); | |||
+extern void vncWriteWakeupHandler(int nfds, fd_set *fds); | |||
+ | |||
/***************** | |||
* WaitForSomething: | |||
* Make the server suspend until there is | |||
@@ -150,6 +153,7 @@ | |||
INT32 timeout = 0; | |||
fd_set clientsReadable; | |||
fd_set clientsWritable; | |||
+ fd_set socketsWritable; | |||
int curclient; | |||
int selecterr; | |||
int nready; | |||
@@ -220,23 +224,29 @@ | |||
SmartScheduleStopTimer (); | |||
#endif | |||
+ FD_ZERO(&socketsWritable); | |||
+ vncWriteBlockHandler(&socketsWritable); | |||
BlockHandler((pointer)&wt, (pointer)&LastSelectMask); | |||
if (NewOutputPending) | |||
FlushAllOutput(); | |||
/* keep this check close to select() call to minimize race */ | |||
if (dispatchException) | |||
i = -1; | |||
- else if (AnyClientsWriteBlocked) | |||
- { | |||
- XFD_COPYSET(&ClientsWriteBlocked, &clientsWritable); | |||
- i = Select (MaxClients, &LastSelectMask, &clientsWritable, NULL, wt); | |||
- } | |||
- else | |||
- { | |||
- i = Select (MaxClients, &LastSelectMask, NULL, NULL, wt); | |||
+ else { | |||
+ if (AnyClientsWriteBlocked) | |||
+ XFD_ORSET(&socketsWritable, &ClientsWriteBlocked, &socketsWritable); | |||
+ | |||
+ if (XFD_ANYSET(&socketsWritable)) { | |||
+ i = Select (MaxClients, &LastSelectMask, &socketsWritable, NULL, wt); | |||
+ if (AnyClientsWriteBlocked) | |||
+ XFD_ANDSET(&clientsWritable, &socketsWritable, &ClientsWriteBlocked); | |||
+ } else { | |||
+ i = Select (MaxClients, &LastSelectMask, NULL, NULL, wt); | |||
+ } | |||
} | |||
selecterr = GetErrno(); | |||
WakeupHandler(i, (pointer)&LastSelectMask); | |||
+ vncWriteWakeupHandler(i, &socketsWritable); | |||
#ifdef SMART_SCHEDULE | |||
SmartScheduleStartTimer (); | |||
#endif |
@@ -1,99 +0,0 @@ | |||
diff -up xserver/configure.ac.vnc xserver/configure.ac | |||
--- xserver/configure.ac.vnc 2011-05-11 11:06:29.966753119 +0200 | |||
+++ xserver/configure.ac 2011-05-11 11:06:37.286488408 +0200 | |||
@@ -29,7 +29,6 @@ AC_PREREQ(2.57) | |||
AC_INIT([xorg-server], 1.6.5, [https://bugs.freedesktop.org/enter_bug.cgi?product=xorg], xorg-server) | |||
AC_CONFIG_SRCDIR([Makefile.am]) | |||
AM_INIT_AUTOMAKE([dist-bzip2 foreign]) | |||
-AM_MAINTAINER_MODE | |||
RELEASE_DATE="2009-10-11" | |||
@@ -52,6 +51,7 @@ dnl kdrive-config.h covers the kdrive DD | |||
AC_CONFIG_HEADERS(include/kdrive-config.h) | |||
AC_PROG_CC | |||
+AC_PROG_CXX | |||
AM_PROG_AS | |||
AC_PROG_INSTALL | |||
AC_PROG_LN_S | |||
@@ -995,7 +995,7 @@ AC_DEFINE(SHAPE, 1, [Support SHAPE exten | |||
AC_DEFINE(XKB, 1, [Build XKB]) | |||
AC_DEFINE(XKB_IN_SERVER, 1, [Build XKB server]) | |||
-AC_DEFINE(XKB_DFLT_DISABLED, 0, [Disable XKB per default]) | |||
+AC_DEFINE(XKB_DFLT_DISABLED, 1, [Disable XKB per default]) | |||
REQUIRED_MODULES="$REQUIRED_MODULES xkbfile" | |||
XKB_LIB='$(top_builddir)/xkb/libxkb.la' | |||
XKB_STUB_LIB='$(top_builddir)/xkb/libxkbstubs.la' | |||
@@ -1199,6 +1199,9 @@ if test "x$XVFB" = xyes; then | |||
AC_SUBST([XVFB_SYS_LIBS]) | |||
fi | |||
+dnl Xvnc DDX | |||
+AC_SUBST([XVNC_CPPFLAGS], ["-DHAVE_DIX_CONFIG_H $XEXT_INC $FB_INC $MI_INC $RENDER_INC $RANDR_INC"]) | |||
+AC_SUBST([XVNC_LIBS], ["$FB_LIB $FIXES_LIB $XEXT_LIB $CONFIG_LIB $DBE_LIB $RECORD_LIB $GLX_LIBS $RANDR_LIB $RENDER_LIB $DAMAGE_LIB $MIEXT_DAMAGE_LIB $MIEXT_SHADOW_LIB $XI_LIB $XKB_LIB $XKB_STUB_LIB $COMPOSITE_LIB"]) | |||
dnl Xnest DDX | |||
@@ -1234,6 +1237,8 @@ xorg_bus_linuxpci=no | |||
xorg_bus_bsdpci=no | |||
xorg_bus_sparc=no | |||
+AC_DEFINE_UNQUOTED(XORG_VERSION_CURRENT, [$VENDOR_RELEASE], [Current Xorg version]) | |||
+ | |||
if test "x$XORG" = xyes; then | |||
XORG_DDXINCS='-I$(top_srcdir)/hw/xfree86 -I$(top_srcdir)/hw/xfree86/include -I$(top_srcdir)/hw/xfree86/common' | |||
XORG_OSINCS='-I$(top_srcdir)/hw/xfree86/os-support -I$(top_srcdir)/hw/xfree86/os-support/bus -I$(top_srcdir)/os' | |||
@@ -1421,7 +1426,6 @@ if test "x$XORG" = xyes; then | |||
AC_DEFINE(XORGSERVER, 1, [Building Xorg server]) | |||
AC_DEFINE(XFree86Server, 1, [Building XFree86 server]) | |||
AC_DEFINE(XFree86LOADER, 1, [Building loadable XFree86 server]) | |||
- AC_DEFINE_UNQUOTED(XORG_VERSION_CURRENT, [$VENDOR_RELEASE], [Current Xorg version]) | |||
AC_DEFINE(NEED_XF86_TYPES, 1, [Need XFree86 typedefs]) | |||
AC_DEFINE(NEED_XF86_PROTOTYPES, 1, [Need XFree86 helper functions]) | |||
AC_DEFINE(__XSERVERNAME__, "Xorg", [Name of X server]) | |||
@@ -1875,6 +1879,7 @@ hw/dmx/input/Makefile | |||
hw/dmx/glxProxy/Makefile | |||
hw/dmx/Makefile | |||
hw/vfb/Makefile | |||
+hw/vnc/Makefile | |||
hw/xnest/Makefile | |||
hw/xwin/Makefile | |||
hw/xquartz/Makefile | |||
diff -up xserver/hw/Makefile.am.vnc xserver/hw/Makefile.am | |||
--- xserver/hw/Makefile.am.vnc 2011-05-11 11:06:30.022751094 +0200 | |||
+++ xserver/hw/Makefile.am 2011-05-11 11:06:37.286488408 +0200 | |||
@@ -33,7 +33,8 @@ SUBDIRS = \ | |||
$(XNEST_SUBDIRS) \ | |||
$(DMX_SUBDIRS) \ | |||
$(KDRIVE_SUBDIRS) \ | |||
- $(XQUARTZ_SUBDIRS) | |||
+ $(XQUARTZ_SUBDIRS) \ | |||
+ vnc | |||
DIST_SUBDIRS = dmx xfree86 vfb xnest xwin xquartz kdrive | |||
diff -up xserver/mi/miinitext.c.vnc xserver/mi/miinitext.c | |||
--- xserver/mi/miinitext.c.vnc 2011-05-11 11:06:30.127747296 +0200 | |||
+++ xserver/mi/miinitext.c 2011-05-11 11:07:10.182298769 +0200 | |||
@@ -272,6 +272,9 @@ extern void DamageExtensionInit(INITARGS | |||
extern void CompositeExtensionInit(INITARGS); | |||
#endif | |||
extern void GEExtensionInit(INITARGS); | |||
+#ifdef TIGERVNC | |||
+extern void vncExtensionInit(INITARGS); | |||
+#endif | |||
/* The following is only a small first step towards run-time | |||
* configurable extensions. | |||
@@ -438,6 +441,9 @@ InitExtensions(int argc, char *argv[]) | |||
#ifdef XF86BIGFONT | |||
if (!noXFree86BigfontExtension) XFree86BigfontExtensionInit(); | |||
#endif | |||
+#ifdef TIGERVNC | |||
+ vncExtensionInit(); | |||
+#endif | |||
#if !defined(NO_HW_ONLY_EXTS) | |||
#if defined(XF86VIDMODE) | |||
if (!noXFree86VidModeExtension) XFree86VidModeExtensionInit(); |
@@ -112,13 +112,8 @@ DesktopWindow::DesktopWindow(int w, int h, const char *name, | |||
// On OS X we can do the maximize thing properly before the | |||
// window is showned. Other platforms handled further down... | |||
if (maximize) { | |||
#ifdef HAVE_FLTK_WORK_AREA | |||
int dummy; | |||
Fl::screen_work_area(dummy, dummy, w, h, geom_x, geom_y); | |||
#else | |||
w = Fl::w(); | |||
h = Fl::h(); | |||
#endif | |||
} | |||
#endif | |||
@@ -128,7 +123,6 @@ DesktopWindow::DesktopWindow(int w, int h, const char *name, | |||
size(w, h); | |||
} | |||
#ifdef HAVE_FLTK_FULLSCREEN | |||
if (fullScreen) { | |||
// Hack: Window managers seem to be rather crappy at respecting | |||
// fullscreen hints on initial windows. So on X11 we'll have to | |||
@@ -139,16 +133,13 @@ DesktopWindow::DesktopWindow(int w, int h, const char *name, | |||
delayedFullscreen = true; | |||
#endif | |||
} | |||
#endif | |||
show(); | |||
// Full screen events are not sent out for a hidden window, | |||
// so send a fake one here to set up things properly. | |||
#ifdef HAVE_FLTK_FULLSCREEN | |||
if (fullscreen_active()) | |||
handle(FL_FULLSCREEN); | |||
#endif | |||
// Unfortunately, current FLTK does not allow us to set the | |||
// maximized property on Windows and X11 before showing the window. | |||
@@ -165,7 +156,6 @@ DesktopWindow::DesktopWindow(int w, int h, const char *name, | |||
if ((w != this->w()) || (h != this->h())) | |||
scroll->size(this->w(), this->h()); | |||
#ifdef HAVE_FLTK_FULLSCREEN | |||
if (delayedFullscreen) { | |||
// Hack: Fullscreen requests may be ignored, so we need a timeout for | |||
// when we should stop waiting. We also really need to wait for the | |||
@@ -173,7 +163,6 @@ DesktopWindow::DesktopWindow(int w, int h, const char *name, | |||
Fl::add_timeout(0.5, handleFullscreenTimeout, this); | |||
fullscreen_on(); | |||
} | |||
#endif | |||
} | |||
@@ -245,9 +234,7 @@ void DesktopWindow::resizeFramebuffer(int new_w, int new_h) | |||
// If we're letting the viewport match the window perfectly, then | |||
// keep things that way for the new size, otherwise just keep things | |||
// like they are. | |||
#ifdef HAVE_FLTK_FULLSCREEN | |||
if (!fullscreen_active()) { | |||
#endif | |||
if ((w() == viewport->w()) && (h() == viewport->h())) | |||
size(new_w, new_h); | |||
else { | |||
@@ -257,9 +244,7 @@ void DesktopWindow::resizeFramebuffer(int new_w, int new_h) | |||
if ((w() > new_w) || (h() > new_h)) | |||
size(__rfbmin(w(), new_w), __rfbmin(h(), new_h)); | |||
} | |||
#ifdef HAVE_FLTK_FULLSCREEN | |||
} | |||
#endif | |||
viewport->size(new_w, new_h); | |||
@@ -288,10 +273,7 @@ void DesktopWindow::resize(int x, int y, int w, int h) | |||
#if ! (defined(WIN32) || defined(__APPLE__)) | |||
// X11 window managers will treat a resize to cover the entire | |||
// monitor as a request to go full screen. Make sure we avoid this. | |||
#ifdef HAVE_FLTK_FULLSCREEN | |||
if (!fullscreen_active()) | |||
#endif | |||
{ | |||
if (!fullscreen_active()) { | |||
bool resize_req; | |||
// If there is no X11 window, then this must be a resize request, | |||
@@ -367,7 +349,6 @@ void DesktopWindow::resize(int x, int y, int w, int h) | |||
int DesktopWindow::handle(int event) | |||
{ | |||
switch (event) { | |||
#ifdef HAVE_FLTK_FULLSCREEN | |||
case FL_FULLSCREEN: | |||
fullScreen.setParam(fullscreen_active()); | |||
@@ -406,16 +387,6 @@ int DesktopWindow::handle(int event) | |||
} | |||
// Continue processing so that the viewport also gets mouse events | |||
break; | |||
#endif | |||
case FL_SHORTCUT: | |||
// Sometimes the focus gets out of whack and we fall through to the | |||
// shortcut dispatching. Try to make things sane again... | |||
if (Fl::focus() == NULL) { | |||
take_focus(); | |||
Fl::handle(FL_KEYDOWN, this); | |||
} | |||
return 1; | |||
} | |||
return Fl_Window::handle(event); | |||
@@ -428,7 +399,6 @@ int DesktopWindow::fltkHandle(int event, Fl_Window *win) | |||
ret = Fl::handle_(event, win); | |||
#ifdef HAVE_FLTK_FULLSCREEN | |||
// This is hackish and the result of the dodgy focus handling in FLTK. | |||
// The basic problem is that FLTK's view of focus and the system's tend | |||
// to differ, and as a result we do not see all the FL_FOCUS events we | |||
@@ -456,7 +426,6 @@ int DesktopWindow::fltkHandle(int event, Fl_Window *win) | |||
break; | |||
} | |||
} | |||
#endif | |||
return ret; | |||
} | |||
@@ -464,8 +433,6 @@ int DesktopWindow::fltkHandle(int event, Fl_Window *win) | |||
void DesktopWindow::fullscreen_on() | |||
{ | |||
#ifdef HAVE_FLTK_FULLSCREEN | |||
#ifdef HAVE_FLTK_FULLSCREEN_SCREENS | |||
if (not fullScreenAllMonitors) | |||
fullscreen_screens(-1, -1, -1, -1); | |||
else { | |||
@@ -504,10 +471,8 @@ void DesktopWindow::fullscreen_on() | |||
fullscreen_screens(top, bottom, left, right); | |||
} | |||
#endif // HAVE_FLTK_FULLSCREEN_SCREENS | |||
fullscreen(); | |||
#endif // HAVE_FLTK_FULLSCREEN | |||
} | |||
void DesktopWindow::grabKeyboard() | |||
@@ -527,13 +492,7 @@ void DesktopWindow::grabKeyboard() | |||
#elif defined(__APPLE__) | |||
int ret; | |||
ret = cocoa_capture_display(this, | |||
#ifdef HAVE_FLTK_FULLSCREEN_SCREENS | |||
fullScreenAllMonitors | |||
#else | |||
false | |||
#endif | |||
); | |||
ret = cocoa_capture_display(this, fullScreenAllMonitors); | |||
if (ret != 0) | |||
vlog.error(_("Failure grabbing keyboard")); | |||
#else | |||
@@ -590,14 +549,12 @@ void DesktopWindow::handleGrab(void *data) | |||
assert(self); | |||
#ifdef HAVE_FLTK_FULLSCREEN | |||
if (!fullscreenSystemKeys) | |||
return; | |||
if (!self->fullscreen_active()) | |||
return; | |||
self->grabKeyboard(); | |||
#endif | |||
} | |||
@@ -608,31 +565,22 @@ void DesktopWindow::maximizeWindow() | |||
// We cannot use ShowWindow() in full screen mode as it will | |||
// resize things implicitly. Fortunately modifying the style | |||
// directly results in a maximized state once we leave full screen. | |||
#ifdef HAVE_FLTK_FULLSCREEN | |||
if (fullscreen_active()) { | |||
WINDOWINFO wi; | |||
wi.cbSize = sizeof(WINDOWINFO); | |||
GetWindowInfo(fl_xid(this), &wi); | |||
SetWindowLongPtr(fl_xid(this), GWL_STYLE, wi.dwStyle | WS_MAXIMIZE); | |||
} else | |||
#endif | |||
ShowWindow(fl_xid(this), SW_MAXIMIZE); | |||
#elif defined(__APPLE__) | |||
// OS X is somewhat strange and does not really have a concept of a | |||
// maximized window, so we can simply resize the window to the workarea. | |||
// Note that we shouldn't do this whilst in full screen as that will | |||
// incorrectly adjust things. | |||
#ifdef HAVE_FLTK_FULLSCREEN | |||
if (fullscreen_active()) | |||
return; | |||
#endif | |||
int X, Y, W, H; | |||
#ifdef HAVE_FLTK_WORK_AREA | |||
Fl::screen_work_area(X, Y, W, H, this->x(), this->y()); | |||
#else | |||
W = Fl::w(); | |||
H = Fl::h(); | |||
#endif | |||
size(W, H); | |||
#else | |||
// X11 | |||
@@ -690,9 +638,7 @@ void DesktopWindow::remoteResize(int width, int height) | |||
ScreenSet layout; | |||
ScreenSet::iterator iter; | |||
#ifdef HAVE_FLTK_FULLSCREEN | |||
if (!fullscreen_active() || (width > w()) || (height > h())) { | |||
#endif | |||
// In windowed mode (or the framebuffer is so large that we need | |||
// to scroll) we just report a single virtual screen that covers | |||
// the entire framebuffer. | |||
@@ -723,7 +669,6 @@ void DesktopWindow::remoteResize(int width, int height) | |||
layout.begin()->dimensions.tl.y = 0; | |||
layout.begin()->dimensions.br.x = width; | |||
layout.begin()->dimensions.br.y = height; | |||
#ifdef HAVE_FLTK_FULLSCREEN | |||
} else { | |||
int i; | |||
rdr::U32 id; | |||
@@ -790,7 +735,6 @@ void DesktopWindow::remoteResize(int width, int height) | |||
if (layout.num_screens() == 0) | |||
layout.add_screen(rfb::Screen(0, 0, 0, width, height, 0)); | |||
} | |||
#endif | |||
// Do we actually change anything? | |||
if ((width == cc->cp.width) && | |||
@@ -866,7 +810,6 @@ void DesktopWindow::handleOptions(void *data) | |||
{ | |||
DesktopWindow *self = (DesktopWindow*)data; | |||
#ifdef HAVE_FLTK_FULLSCREEN | |||
if (self->fullscreen_active() && fullscreenSystemKeys) | |||
self->grabKeyboard(); | |||
else | |||
@@ -876,7 +819,6 @@ void DesktopWindow::handleOptions(void *data) | |||
self->fullscreen_on(); | |||
else if (!fullScreen && self->fullscreen_active()) | |||
self->fullscreen_off(); | |||
#endif | |||
} | |||
void DesktopWindow::handleFullscreenTimeout(void *data) | |||
@@ -895,7 +837,6 @@ void DesktopWindow::handleFullscreenTimeout(void *data) | |||
void DesktopWindow::handleEdgeScroll(void *data) | |||
{ | |||
#ifdef HAVE_FLTK_FULLSCREEN | |||
DesktopWindow *self = (DesktopWindow *)data; | |||
int mx, my; | |||
@@ -952,5 +893,4 @@ void DesktopWindow::handleEdgeScroll(void *data) | |||
self->scroll->scroll_to(self->scroll->xposition() - dx, self->scroll->yposition() - dy); | |||
Fl::repeat_timeout(0.1, handleEdgeScroll, data); | |||
#endif | |||
} |
@@ -290,12 +290,8 @@ void OptionsDialog::loadOptions(void) | |||
desktopHeightInput->value(buf); | |||
} | |||
remoteResizeCheckbox->value(remoteResize); | |||
#ifdef HAVE_FLTK_FULLSCREEN | |||
fullScreenCheckbox->value(fullScreen); | |||
#ifdef HAVE_FLTK_FULLSCREEN_SCREENS | |||
fullScreenAllMonitorsCheckbox->value(fullScreenAllMonitors); | |||
#endif // HAVE_FLTK_FULLSCREEN_SCREENS | |||
#endif // HAVE_FLTK_FULLSCREEN | |||
handleDesktopSize(desktopSizeCheckbox, this); | |||
@@ -398,12 +394,8 @@ void OptionsDialog::storeOptions(void) | |||
desktopSize.setParam(""); | |||
} | |||
remoteResize.setParam(remoteResizeCheckbox->value()); | |||
#ifdef HAVE_FLTK_FULLSCREEN | |||
fullScreen.setParam(fullScreenCheckbox->value()); | |||
#ifdef HAVE_FLTK_FULLSCREEN_SCREENS | |||
fullScreenAllMonitors.setParam(fullScreenAllMonitorsCheckbox->value()); | |||
#endif // HAVE_FLTK_FULLSCREEN_SCREENS | |||
#endif // HAVE_FLTK_FULLSCREEN | |||
/* Misc. */ | |||
shared.setParam(sharedCheckbox->value()); | |||
@@ -758,26 +750,18 @@ void OptionsDialog::createScreenPage(int tx, int ty, int tw, int th) | |||
_("Resize remote session to the local window"))); | |||
ty += CHECK_HEIGHT + TIGHT_MARGIN; | |||
#ifdef HAVE_FLTK_FULLSCREEN | |||
fullScreenCheckbox = new Fl_Check_Button(LBLRIGHT(tx, ty, | |||
CHECK_MIN_WIDTH, | |||
CHECK_HEIGHT, | |||
_("Full-screen mode"))); | |||
ty += CHECK_HEIGHT + TIGHT_MARGIN; | |||
#ifdef HAVE_FLTK_FULLSCREEN_SCREENS | |||
fullScreenAllMonitorsCheckbox = new Fl_Check_Button(LBLRIGHT(tx + INDENT, ty, | |||
CHECK_MIN_WIDTH, | |||
CHECK_HEIGHT, | |||
_("Enable full-screen mode over all monitors"))); | |||
ty += CHECK_HEIGHT + TIGHT_MARGIN; | |||
#endif // HAVE_FLTK_FULLSCREEN_SCREENS | |||
#endif // HAVE_FLTK_FULLSCREEN | |||
group->end(); | |||
} | |||
@@ -106,15 +106,10 @@ Viewport::Viewport(int w, int h, const rfb::PixelFormat& serverPF, CConn* cc_) | |||
lastPointerPos(0, 0), lastButtonMask(0), | |||
menuCtrlKey(false), menuAltKey(false), cursor(NULL) | |||
{ | |||
// FLTK STR #2636 gives us the ability to monitor clipboard changes | |||
#ifdef HAVE_FLTK_CLIPBOARD | |||
Fl::add_clipboard_notify(handleClipboardChange, this); | |||
#endif | |||
#ifdef HAVE_FLTK_XHANDLERS | |||
// We need to intercept keyboard events early | |||
Fl::add_system_handler(handleSystemEvent, this); | |||
#endif | |||
frameBuffer = createFramebuffer(w, h); | |||
assert(frameBuffer); | |||
@@ -148,13 +143,9 @@ Viewport::~Viewport() | |||
// again later when this object is already gone. | |||
Fl::remove_timeout(handlePointerTimeout, this); | |||
#ifdef HAVE_FLTK_XHANDLERS | |||
Fl::remove_system_handler(handleSystemEvent); | |||
#endif | |||
#ifdef HAVE_FLTK_CLIPBOARD | |||
Fl::remove_clipboard_notify(handleClipboardChange); | |||
#endif | |||
OptionsDialog::removeCallback(handleOptions); | |||
@@ -194,7 +185,6 @@ rfb::ModifiablePixelBuffer* Viewport::getFramebuffer(void) | |||
return frameBuffer; | |||
} | |||
#ifdef HAVE_FLTK_CURSOR | |||
static const char * dotcursor_xpm[] = { | |||
"5 5 2 1", | |||
". c #000000", | |||
@@ -204,12 +194,10 @@ static const char * dotcursor_xpm[] = { | |||
" ... ", | |||
" ... ", | |||
" "}; | |||
#endif | |||
void Viewport::setCursor(int width, int height, const Point& hotspot, | |||
void* data, void* mask) | |||
{ | |||
#ifdef HAVE_FLTK_CURSOR | |||
if (cursor) { | |||
if (!cursor->alloc_array) | |||
delete [] cursor->array; | |||
@@ -269,7 +257,6 @@ void Viewport::setCursor(int width, int height, const Point& hotspot, | |||
if (Fl::belowmouse() == this) | |||
window()->cursor(cursor, cursorHotspot.x, cursorHotspot.y); | |||
#endif | |||
} | |||
@@ -365,17 +352,13 @@ int Viewport::handle(int event) | |||
return 1; | |||
case FL_ENTER: | |||
// Yes, we would like some pointer events please! | |||
#ifdef HAVE_FLTK_CURSOR | |||
if (cursor) | |||
window()->cursor(cursor, cursorHotspot.x, cursorHotspot.y); | |||
#endif | |||
// Yes, we would like some pointer events please! | |||
return 1; | |||
case FL_LEAVE: | |||
#ifdef HAVE_FLTK_CURSOR | |||
window()->cursor(FL_CURSOR_DEFAULT); | |||
#endif | |||
// Fall through as we want a last move event to help trigger edge stuff | |||
case FL_PUSH: | |||
case FL_RELEASE: | |||
@@ -411,9 +394,7 @@ int Viewport::handle(int event) | |||
return 1; | |||
case FL_FOCUS: | |||
#ifdef HAVE_FLTK_IM | |||
Fl::disable_im(); | |||
#endif | |||
// Yes, we would like some focus please! | |||
return 1; | |||
@@ -422,17 +403,12 @@ int Viewport::handle(int event) | |||
// sense (e.g. Alt+Tab where we only see the Alt press) | |||
while (!downKeySym.empty()) | |||
handleKeyRelease(downKeySym.begin()->first); | |||
#ifdef HAVE_FLTK_IM | |||
Fl::enable_im(); | |||
#endif | |||
return 1; | |||
case FL_KEYDOWN: | |||
handleFLTKKeyPress(); | |||
return 1; | |||
case FL_KEYUP: | |||
handleKeyRelease(Fl::event_original_key()); | |||
// Just ignore these as keys were handled in the event handler | |||
return 1; | |||
} | |||
@@ -806,258 +782,6 @@ int Viewport::handleSystemEvent(void *event, void *data) | |||
return 0; | |||
} | |||
rdr::U32 Viewport::translateKeyEvent(void) | |||
{ | |||
unsigned ucs; | |||
int keyCode, origKeyCode; | |||
const char *keyText; | |||
int keyTextLen; | |||
keyCode = Fl::event_key(); | |||
origKeyCode = Fl::event_original_key(); | |||
keyText = Fl::event_text(); | |||
keyTextLen = Fl::event_length(); | |||
vlog.debug("FLTK key %d (%d) '%s'[%d]", origKeyCode, keyCode, keyText, keyTextLen); | |||
// First check for function keys | |||
if ((keyCode > FL_F) && (keyCode <= FL_F_Last)) | |||
return XK_F1 + (keyCode - FL_F - 1); | |||
// Numpad numbers | |||
if ((keyCode >= (FL_KP + '0')) && (keyCode <= (FL_KP + '9'))) | |||
return XK_KP_0 + (keyCode - (FL_KP + '0')); | |||
// FLTK does some special remapping of numpad keys when numlock is off | |||
if ((origKeyCode >= FL_KP) && (origKeyCode <= FL_KP_Last)) { | |||
switch (keyCode) { | |||
case FL_F+1: | |||
return XK_KP_F1; | |||
case FL_F+2: | |||
return XK_KP_F2; | |||
case FL_F+3: | |||
return XK_KP_F3; | |||
case FL_F+4: | |||
return XK_KP_F4; | |||
case FL_Home: | |||
return XK_KP_Home; | |||
case FL_Left: | |||
return XK_KP_Left; | |||
case FL_Up: | |||
return XK_KP_Up; | |||
case FL_Right: | |||
return XK_KP_Right; | |||
case FL_Down: | |||
return XK_KP_Down; | |||
case FL_Page_Up: | |||
return XK_KP_Page_Up; | |||
case FL_Page_Down: | |||
return XK_KP_Page_Down; | |||
case FL_End: | |||
return XK_KP_End; | |||
case FL_Insert: | |||
return XK_KP_Insert; | |||
case FL_Delete: | |||
return XK_KP_Delete; | |||
} | |||
} | |||
#if defined(WIN32) || defined(__APPLE__) | |||
// X11 fairly consistently uses XK_KP_Separator for comma and | |||
// XK_KP_Decimal for period. Windows and OS X are a different matter | |||
// though. | |||
// | |||
// OS X will consistently generate the same key code no matter what | |||
// layout is being used. | |||
// | |||
// Windows is terribly inconcistent, and is not something that's | |||
// likely to change: | |||
// http://blogs.msdn.com/michkap/archive/2006/09/13/752377.aspx | |||
// | |||
// To get X11 behaviour, we instead look at the text generated by | |||
// they key. | |||
if ((keyCode == (FL_KP + ',')) || (keyCode == (FL_KP + '.'))) { | |||
switch (keyText[0]) { | |||
case ',': | |||
return XK_KP_Separator; | |||
case '.': | |||
return XK_KP_Decimal; | |||
default: | |||
vlog.error(_("Unknown decimal separator: '%s'"), keyText); | |||
return XK_KP_Decimal; | |||
} | |||
} | |||
#endif | |||
// Then other special keys | |||
switch (keyCode) { | |||
case FL_BackSpace: | |||
return XK_BackSpace; | |||
case FL_Tab: | |||
return XK_Tab; | |||
case FL_Enter: | |||
return XK_Return; | |||
case FL_Pause: | |||
return XK_Pause; | |||
case FL_Scroll_Lock: | |||
return XK_Scroll_Lock; | |||
case FL_Escape: | |||
return XK_Escape; | |||
case FL_Home: | |||
return XK_Home; | |||
case FL_Left: | |||
return XK_Left; | |||
case FL_Up: | |||
return XK_Up; | |||
case FL_Right: | |||
return XK_Right; | |||
case FL_Down: | |||
return XK_Down; | |||
case FL_Page_Up: | |||
return XK_Page_Up; | |||
case FL_Page_Down: | |||
return XK_Page_Down; | |||
case FL_End: | |||
return XK_End; | |||
case FL_Print: | |||
return XK_Print; | |||
case FL_Insert: | |||
return XK_Insert; | |||
case FL_Menu: | |||
return XK_Menu; | |||
case FL_Help: | |||
return XK_Help; | |||
case FL_Num_Lock: | |||
return XK_Num_Lock; | |||
case FL_Shift_L: | |||
return XK_Shift_L; | |||
case FL_Shift_R: | |||
return XK_Shift_R; | |||
case FL_Control_L: | |||
return XK_Control_L; | |||
case FL_Control_R: | |||
return XK_Control_R; | |||
case FL_Caps_Lock: | |||
return XK_Caps_Lock; | |||
case FL_Meta_L: | |||
return XK_Super_L; | |||
case FL_Meta_R: | |||
return XK_Super_R; | |||
case FL_Alt_L: | |||
return XK_Alt_L; | |||
case FL_Alt_R: | |||
return XK_Alt_R; | |||
case FL_Delete: | |||
return XK_Delete; | |||
case FL_KP_Enter: | |||
return XK_KP_Enter; | |||
case FL_KP + '=': | |||
return XK_KP_Equal; | |||
case FL_KP + '*': | |||
return XK_KP_Multiply; | |||
case FL_KP + '+': | |||
return XK_KP_Add; | |||
case FL_KP + ',': | |||
return XK_KP_Separator; | |||
case FL_KP + '-': | |||
return XK_KP_Subtract; | |||
case FL_KP + '.': | |||
return XK_KP_Decimal; | |||
case FL_KP + '/': | |||
return XK_KP_Divide; | |||
#ifdef HAVE_FLTK_MEDIAKEYS | |||
case FL_Volume_Down: | |||
return XF86XK_AudioLowerVolume; | |||
case FL_Volume_Mute: | |||
return XF86XK_AudioMute; | |||
case FL_Volume_Up: | |||
return XF86XK_AudioRaiseVolume; | |||
case FL_Media_Play: | |||
return XF86XK_AudioPlay; | |||
case FL_Media_Stop: | |||
return XF86XK_AudioStop; | |||
case FL_Media_Prev: | |||
return XF86XK_AudioPrev; | |||
case FL_Media_Next: | |||
return XF86XK_AudioNext; | |||
case FL_Home_Page: | |||
return XF86XK_HomePage; | |||
case FL_Mail: | |||
return XF86XK_Mail; | |||
case FL_Search: | |||
return XF86XK_Search; | |||
case FL_Back: | |||
return XF86XK_Back; | |||
case FL_Forward: | |||
return XF86XK_Forward; | |||
case FL_Stop: | |||
return XF86XK_Stop; | |||
case FL_Refresh: | |||
return XF86XK_Refresh; | |||
case FL_Sleep: | |||
return XF86XK_Sleep; | |||
case FL_Favorites: | |||
return XF86XK_Favorites; | |||
#endif | |||
case XK_ISO_Level3_Shift: | |||
// FLTK tends to let this one leak through on X11... | |||
return XK_ISO_Level3_Shift; | |||
case XK_Multi_key: | |||
// Same for this... | |||
return XK_Multi_key; | |||
} | |||
// Unknown special key? | |||
if (keyTextLen == 0) { | |||
vlog.error(_("Unknown FLTK key code %d (0x%04x)"), keyCode, keyCode); | |||
return NoSymbol; | |||
} | |||
// Control character? | |||
if ((keyTextLen == 1) && ((keyText[0] < 0x20) | (keyText[0] == 0x7f))) { | |||
if (keyText[0] == 0x00) | |||
return XK_2; | |||
else if (keyText[0] < 0x1b) { | |||
if (!!Fl::event_state(FL_SHIFT) != !!Fl::event_state(FL_CAPS_LOCK)) | |||
return keyText[0] + XK_A - 0x01; | |||
else | |||
return keyText[0] + XK_a - 0x01; | |||
} else if (keyText[0] < 0x20) | |||
return keyText[0] + XK_3 - 0x1b; | |||
else | |||
return XK_8; | |||
} | |||
// Look up the symbol the key produces and translate that from Unicode | |||
// to a X11 keysym. | |||
if (fl_utf_nb_char((const unsigned char*)keyText, strlen(keyText)) != 1) { | |||
vlog.error(_("Multiple characters given for key code %d (0x%04x): '%s'"), | |||
keyCode, keyCode, keyText); | |||
return NoSymbol; | |||
} | |||
ucs = fl_utf8decode(keyText, NULL, NULL); | |||
return ucs2keysym(ucs); | |||
} | |||
void Viewport::handleFLTKKeyPress(void) | |||
{ | |||
rdr::U32 keySym; | |||
#ifdef HAVE_FLTK_XHANDLERS | |||
return; | |||
#endif | |||
keySym = translateKeyEvent(); | |||
if (keySym == NoSymbol) | |||
return; | |||
handleKeyPress(Fl::event_original_key(), keySym); | |||
} | |||
void Viewport::initContextMenu() | |||
{ | |||
contextMenu->clear(); | |||
@@ -1065,15 +789,11 @@ void Viewport::initContextMenu() | |||
fltk_menu_add(contextMenu, _("E&xit viewer"), 0, NULL, | |||
(void*)ID_EXIT, FL_MENU_DIVIDER); | |||
#ifdef HAVE_FLTK_FULLSCREEN | |||
fltk_menu_add(contextMenu, _("&Full screen"), 0, NULL, (void*)ID_FULLSCREEN, | |||
FL_MENU_TOGGLE | (window()->fullscreen_active()?FL_MENU_VALUE:0)); | |||
#endif | |||
fltk_menu_add(contextMenu, _("Resize &window to session"), 0, NULL, | |||
(void*)ID_RESIZE, | |||
#ifdef HAVE_FLTK_FULLSCREEN | |||
(window()->fullscreen_active()?FL_MENU_INACTIVE:0) | | |||
#endif | |||
FL_MENU_DIVIDER); | |||
fltk_menu_add(contextMenu, _("&Ctrl"), 0, NULL, (void*)ID_CTRL, | |||
@@ -1121,18 +841,14 @@ void Viewport::popupContextMenu() | |||
// Unfortunately FLTK doesn't reliably restore the mouse pointer for | |||
// menus, so we have to help it out. | |||
#ifdef HAVE_FLTK_CURSOR | |||
if (Fl::belowmouse() == this) | |||
window()->cursor(FL_CURSOR_DEFAULT); | |||
#endif | |||
m = contextMenu->popup(); | |||
// Back to our proper mouse pointer. | |||
#ifdef HAVE_FLTK_CURSOR | |||
if ((Fl::belowmouse() == this) && cursor) | |||
window()->cursor(cursor, cursorHotspot.x, cursorHotspot.y); | |||
#endif | |||
if (m == NULL) | |||
return; | |||
@@ -1141,19 +857,15 @@ void Viewport::popupContextMenu() | |||
case ID_EXIT: | |||
exit_vncviewer(); | |||
break; | |||
#ifdef HAVE_FLTK_FULLSCREEN | |||
case ID_FULLSCREEN: | |||
if (window()->fullscreen_active()) | |||
window()->fullscreen_off(); | |||
else | |||
((DesktopWindow*)window())->fullscreen_on(); | |||
break; | |||
#endif | |||
case ID_RESIZE: | |||
#ifdef HAVE_FLTK_FULLSCREEN | |||
if (window()->fullscreen_active()) | |||
break; | |||
#endif | |||
window()->size(w(), h()); | |||
break; | |||
case ID_CTRL: |
@@ -75,9 +75,6 @@ private: | |||
static int handleSystemEvent(void *event, void *data); | |||
rdr::U32 translateKeyEvent(void); | |||
void handleFLTKKeyPress(void); | |||
void initContextMenu(); | |||
void popupContextMenu(); | |||
@@ -60,11 +60,7 @@ int cocoa_capture_display(Fl_Window *win, bool all_displays) | |||
if (count != (unsigned)Fl::screen_count()) | |||
return 1; | |||
#ifdef HAVE_FLTK_FULLSCREEN_SCREENS | |||
index = Fl::screen_num(win->x(), win->y(), win->w(), win->h()); | |||
#else | |||
index = 0; | |||
#endif | |||
if (CGDisplayCapture(displays[index]) != kCGErrorSuccess) | |||
return 1; | |||
@@ -99,11 +95,9 @@ void cocoa_release_display(Fl_Window *win) | |||
// FIXME: Store the previous level somewhere so we don't have to hard | |||
// code a level here. | |||
#ifdef HAVE_FLTK_FULLSCREEN | |||
if (win->fullscreen_active() && win->contains(Fl::focus())) | |||
newlevel = NSStatusWindowLevel; | |||
else | |||
#endif | |||
newlevel = NSNormalWindowLevel; | |||
// Only change if different as the level change also moves the window |
@@ -92,14 +92,10 @@ IntParameter qualityLevel("QualityLevel", | |||
8); | |||
BoolParameter maximize("Maximize", "Maximize viewer window", false); | |||
#ifdef HAVE_FLTK_FULLSCREEN | |||
BoolParameter fullScreen("FullScreen", "Full screen mode", false); | |||
#ifdef HAVE_FLTK_FULLSCREEN_SCREENS | |||
BoolParameter fullScreenAllMonitors("FullScreenAllMonitors", | |||
"Enable full screen over all monitors", | |||
true); | |||
#endif // HAVE_FLTK_FULLSCREEN_SCREENS | |||
#endif // HAVE_FLTK_FULLSCREEN | |||
StringParameter desktopSize("DesktopSize", | |||
"Reconfigure desktop size on the server on " | |||
"connect (if possible)", ""); | |||
@@ -160,12 +156,8 @@ static VoidParameter* parameterArray[] = { | |||
&compressLevel, | |||
&noJpeg, | |||
&qualityLevel, | |||
#ifdef HAVE_FLTK_FULLSCREEN | |||
&fullScreen, | |||
#ifdef HAVE_FLTK_FULLSCREEN_SCREENS | |||
&fullScreenAllMonitors, | |||
#endif // HAVE_FLTK_FULLSCREEN_SCREENS | |||
#endif // HAVE_FLTK_FULLSCREEN | |||
&desktopSize, | |||
&geometry, | |||
&remoteResize, |
@@ -39,12 +39,8 @@ extern rfb::BoolParameter noJpeg; | |||
extern rfb::IntParameter qualityLevel; | |||
extern rfb::BoolParameter maximize; | |||
#ifdef HAVE_FLTK_FULLSCREEN | |||
extern rfb::BoolParameter fullScreen; | |||
#ifdef HAVE_FLTK_FULLSCREEN_SCREENS | |||
extern rfb::BoolParameter fullScreenAllMonitors; | |||
#endif // HAVE_FLTK_FULLSCREEN_SCREENS | |||
#endif // HAVE_FLTK_FULLSCREEN | |||
extern rfb::StringParameter desktopSize; | |||
extern rfb::StringParameter geometry; | |||
extern rfb::BoolParameter remoteResize; |
@@ -165,7 +165,6 @@ static void init_fltk() | |||
Fl_Window::default_xclass("vncviewer"); | |||
// Set the default icon for all windows. | |||
#ifdef HAVE_FLTK_ICONS | |||
#ifdef WIN32 | |||
HICON lg, sm; | |||
@@ -225,7 +224,6 @@ static void init_fltk() | |||
for (int i = 0;i < count;i++) | |||
delete icons[i]; | |||
#endif | |||
#endif // FLTK_HAVE_ICONS | |||
// This makes the "icon" in dialogs rounded, which fits better | |||
// with the above schemes. |