rugged 0.21.4 → 0.22.0b1
Sign up to get free protection for your applications and to get access to all the features.
- checksums.yaml +4 -4
- data/README.md +12 -5
- data/ext/rugged/extconf.rb +9 -9
- data/ext/rugged/rugged.c +4 -2
- data/ext/rugged/rugged.h +3 -7
- data/ext/rugged/rugged_blob.c +57 -0
- data/ext/rugged/rugged_cred.c +23 -0
- data/ext/rugged/rugged_index.c +6 -2
- data/ext/rugged/rugged_remote.c +65 -52
- data/ext/rugged/rugged_remote_collection.c +59 -10
- data/ext/rugged/rugged_repo.c +345 -11
- data/ext/rugged/rugged_revwalk.c +10 -0
- data/ext/rugged/rugged_submodule.c +1042 -0
- data/ext/rugged/rugged_submodule_collection.c +236 -0
- data/ext/rugged/rugged_tag_collection.c +70 -2
- data/ext/rugged/rugged_tree.c +29 -10
- data/lib/rugged.rb +3 -0
- data/lib/rugged/attributes.rb +41 -0
- data/lib/rugged/blob.rb +28 -0
- data/lib/rugged/diff.rb +0 -1
- data/lib/rugged/diff/line.rb +1 -3
- data/lib/rugged/patch.rb +12 -2
- data/lib/rugged/repository.rb +7 -0
- data/lib/rugged/submodule_collection.rb +48 -0
- data/lib/rugged/version.rb +1 -1
- data/vendor/libgit2/CMakeLists.txt +27 -3
- data/vendor/libgit2/cmake/Modules/FindGSSAPI.cmake +324 -0
- data/vendor/libgit2/deps/http-parser/http_parser.h +2 -0
- data/vendor/libgit2/deps/zlib/adler32.c +39 -29
- data/vendor/libgit2/deps/zlib/crc32.c +33 -50
- data/vendor/libgit2/deps/zlib/crc32.h +1 -1
- data/vendor/libgit2/deps/zlib/deflate.c +198 -65
- data/vendor/libgit2/deps/zlib/deflate.h +8 -4
- data/vendor/libgit2/deps/zlib/infback.c +640 -0
- data/vendor/libgit2/deps/zlib/inffast.c +3 -3
- data/vendor/libgit2/deps/zlib/inffixed.h +3 -3
- data/vendor/libgit2/deps/zlib/inflate.c +84 -52
- data/vendor/libgit2/deps/zlib/inftrees.c +15 -39
- data/vendor/libgit2/deps/zlib/trees.c +18 -36
- data/vendor/libgit2/deps/zlib/zconf.h +4 -0
- data/vendor/libgit2/deps/zlib/zlib.h +250 -95
- data/vendor/libgit2/deps/zlib/zutil.c +13 -10
- data/vendor/libgit2/deps/zlib/zutil.h +41 -62
- data/vendor/libgit2/include/git2.h +4 -0
- data/vendor/libgit2/include/git2/annotated_commit.h +99 -0
- data/vendor/libgit2/include/git2/attr.h +16 -13
- data/vendor/libgit2/include/git2/branch.h +11 -0
- data/vendor/libgit2/include/git2/buffer.h +16 -0
- data/vendor/libgit2/include/git2/checkout.h +12 -12
- data/vendor/libgit2/include/git2/cherrypick.h +15 -15
- data/vendor/libgit2/include/git2/clone.h +77 -69
- data/vendor/libgit2/include/git2/common.h +13 -1
- data/vendor/libgit2/include/git2/config.h +0 -14
- data/vendor/libgit2/include/git2/describe.h +162 -0
- data/vendor/libgit2/include/git2/diff.h +13 -8
- data/vendor/libgit2/include/git2/errors.h +5 -0
- data/vendor/libgit2/include/git2/global.h +38 -0
- data/vendor/libgit2/include/git2/merge.h +38 -64
- data/vendor/libgit2/include/git2/net.h +2 -2
- data/vendor/libgit2/include/git2/notes.h +17 -0
- data/vendor/libgit2/include/git2/oid.h +8 -4
- data/vendor/libgit2/include/git2/oidarray.h +40 -0
- data/vendor/libgit2/include/git2/rebase.h +261 -0
- data/vendor/libgit2/include/git2/reflog.h +1 -1
- data/vendor/libgit2/include/git2/remote.h +25 -47
- data/vendor/libgit2/include/git2/repository.h +4 -1
- data/vendor/libgit2/include/git2/reset.h +10 -1
- data/vendor/libgit2/include/git2/revert.h +1 -1
- data/vendor/libgit2/include/git2/revwalk.h +28 -23
- data/vendor/libgit2/include/git2/status.h +19 -15
- data/vendor/libgit2/include/git2/submodule.h +18 -0
- data/vendor/libgit2/include/git2/sys/config.h +0 -1
- data/vendor/libgit2/{src → include/git2/sys}/hashsig.h +11 -7
- data/vendor/libgit2/include/git2/sys/refdb_backend.h +13 -0
- data/vendor/libgit2/include/git2/sys/refs.h +0 -11
- data/vendor/libgit2/include/git2/sys/repository.h +13 -0
- data/vendor/libgit2/include/git2/sys/transport.h +352 -0
- data/vendor/libgit2/include/git2/threads.h +10 -20
- data/vendor/libgit2/include/git2/transaction.h +111 -0
- data/vendor/libgit2/include/git2/transport.h +79 -313
- data/vendor/libgit2/include/git2/tree.h +4 -2
- data/vendor/libgit2/include/git2/types.h +77 -8
- data/vendor/libgit2/include/git2/version.h +2 -2
- data/vendor/libgit2/src/annotated_commit.c +121 -0
- data/vendor/libgit2/src/annotated_commit.h +22 -0
- data/vendor/libgit2/src/attr.c +8 -4
- data/vendor/libgit2/src/attr_file.c +24 -2
- data/vendor/libgit2/src/blame.c +0 -1
- data/vendor/libgit2/src/branch.c +32 -3
- data/vendor/libgit2/src/buf_text.c +9 -5
- data/vendor/libgit2/src/buf_text.h +3 -2
- data/vendor/libgit2/src/buffer.c +67 -10
- data/vendor/libgit2/src/buffer.h +4 -2
- data/vendor/libgit2/src/cache.c +9 -9
- data/vendor/libgit2/src/cache.h +1 -1
- data/vendor/libgit2/src/cc-compat.h +2 -0
- data/vendor/libgit2/src/checkout.c +263 -82
- data/vendor/libgit2/src/checkout.h +1 -0
- data/vendor/libgit2/src/cherrypick.c +41 -44
- data/vendor/libgit2/src/clone.c +96 -58
- data/vendor/libgit2/src/commit.c +5 -31
- data/vendor/libgit2/src/commit_list.h +3 -1
- data/vendor/libgit2/src/config.c +0 -17
- data/vendor/libgit2/src/config_cache.c +0 -2
- data/vendor/libgit2/src/config_file.c +12 -15
- data/vendor/libgit2/src/crlf.c +2 -1
- data/vendor/libgit2/src/describe.c +886 -0
- data/vendor/libgit2/src/diff.c +29 -3
- data/vendor/libgit2/src/diff_file.c +1 -0
- data/vendor/libgit2/src/diff_patch.c +2 -3
- data/vendor/libgit2/src/diff_print.c +11 -9
- data/vendor/libgit2/src/diff_tform.c +4 -4
- data/vendor/libgit2/src/errors.c +9 -7
- data/vendor/libgit2/src/fetch.c +6 -6
- data/vendor/libgit2/src/fetchhead.h +2 -4
- data/vendor/libgit2/src/filebuf.c +0 -2
- data/vendor/libgit2/src/filebuf.h +2 -3
- data/vendor/libgit2/src/fileops.c +9 -7
- data/vendor/libgit2/src/global.c +44 -35
- data/vendor/libgit2/src/global.h +2 -0
- data/vendor/libgit2/src/graph.c +2 -2
- data/vendor/libgit2/src/hash.h +3 -1
- data/vendor/libgit2/src/hash/hash_common_crypto.h +44 -0
- data/vendor/libgit2/src/hash/hash_win32.c +1 -1
- data/vendor/libgit2/src/hashsig.c +1 -1
- data/vendor/libgit2/src/ignore.c +5 -88
- data/vendor/libgit2/src/index.c +70 -57
- data/vendor/libgit2/src/index.h +1 -0
- data/vendor/libgit2/src/indexer.c +16 -5
- data/vendor/libgit2/src/iterator.c +70 -1
- data/vendor/libgit2/src/iterator.h +5 -1
- data/vendor/libgit2/src/map.h +0 -1
- data/vendor/libgit2/src/merge.c +203 -327
- data/vendor/libgit2/src/merge.h +3 -13
- data/vendor/libgit2/src/mwindow.c +119 -8
- data/vendor/libgit2/src/mwindow.h +9 -1
- data/vendor/libgit2/src/netops.c +7 -8
- data/vendor/libgit2/src/netops.h +6 -16
- data/vendor/libgit2/src/notes.c +31 -4
- data/vendor/libgit2/src/notes.h +3 -0
- data/vendor/libgit2/src/odb.c +23 -1
- data/vendor/libgit2/src/odb_loose.c +1 -1
- data/vendor/libgit2/src/odb_pack.c +6 -3
- data/vendor/libgit2/src/oid.c +9 -1
- data/vendor/libgit2/src/oid.h +11 -0
- data/vendor/libgit2/src/oidarray.c +21 -0
- data/vendor/libgit2/src/oidarray.h +18 -0
- data/vendor/libgit2/src/oidmap.h +16 -0
- data/vendor/libgit2/src/pack.c +20 -7
- data/vendor/libgit2/src/pack.h +3 -0
- data/vendor/libgit2/src/path.c +120 -293
- data/vendor/libgit2/src/path.h +21 -44
- data/vendor/libgit2/src/pathspec.c +1 -1
- data/vendor/libgit2/src/pool.c +5 -11
- data/vendor/libgit2/src/pool.h +0 -2
- data/vendor/libgit2/src/posix.c +6 -6
- data/vendor/libgit2/src/posix.h +48 -28
- data/vendor/libgit2/src/push.c +19 -48
- data/vendor/libgit2/src/push.h +2 -4
- data/vendor/libgit2/src/rebase.c +1125 -0
- data/vendor/libgit2/src/refdb.c +19 -0
- data/vendor/libgit2/src/refdb.h +2 -1
- data/vendor/libgit2/src/refdb_fs.c +101 -29
- data/vendor/libgit2/src/reflog.c +1 -1
- data/vendor/libgit2/src/refs.c +38 -3
- data/vendor/libgit2/src/refs.h +13 -2
- data/vendor/libgit2/src/refspec.c +20 -2
- data/vendor/libgit2/src/remote.c +288 -154
- data/vendor/libgit2/src/remote.h +5 -1
- data/vendor/libgit2/src/repository.c +75 -36
- data/vendor/libgit2/src/repository.h +3 -25
- data/vendor/libgit2/src/reset.c +5 -1
- data/vendor/libgit2/src/revert.c +4 -6
- data/vendor/libgit2/src/revparse.c +15 -18
- data/vendor/libgit2/src/revwalk.c +96 -22
- data/vendor/libgit2/src/revwalk.h +5 -4
- data/vendor/libgit2/src/settings.c +22 -0
- data/vendor/libgit2/src/signature.c +37 -2
- data/vendor/libgit2/src/signature.h +3 -0
- data/vendor/libgit2/src/stash.c +17 -12
- data/vendor/libgit2/src/status.c +13 -3
- data/vendor/libgit2/src/strnlen.h +2 -1
- data/vendor/libgit2/src/submodule.c +75 -35
- data/vendor/libgit2/src/thread-utils.h +4 -9
- data/vendor/libgit2/src/trace.h +9 -1
- data/vendor/libgit2/src/transaction.c +352 -0
- data/vendor/libgit2/src/transport.c +91 -97
- data/vendor/libgit2/src/transports/auth.c +71 -0
- data/vendor/libgit2/src/transports/auth.h +63 -0
- data/vendor/libgit2/src/transports/auth_negotiate.c +275 -0
- data/vendor/libgit2/src/transports/auth_negotiate.h +27 -0
- data/vendor/libgit2/src/transports/cred.c +58 -0
- data/vendor/libgit2/src/transports/cred.h +14 -0
- data/vendor/libgit2/src/transports/cred_helpers.c +3 -0
- data/vendor/libgit2/src/transports/git.c +1 -0
- data/vendor/libgit2/src/transports/http.c +208 -82
- data/vendor/libgit2/src/transports/local.c +2 -2
- data/vendor/libgit2/src/transports/smart.c +2 -0
- data/vendor/libgit2/src/transports/smart.h +2 -0
- data/vendor/libgit2/src/transports/smart_protocol.c +10 -10
- data/vendor/libgit2/src/transports/ssh.c +243 -57
- data/vendor/libgit2/src/transports/winhttp.c +139 -35
- data/vendor/libgit2/src/tree-cache.c +118 -31
- data/vendor/libgit2/src/tree-cache.h +12 -7
- data/vendor/libgit2/src/tree.c +83 -64
- data/vendor/libgit2/src/tree.h +2 -3
- data/vendor/libgit2/src/unix/map.c +8 -2
- data/vendor/libgit2/src/unix/posix.h +23 -9
- data/vendor/libgit2/src/unix/realpath.c +8 -7
- data/vendor/libgit2/src/userdiff.h +3 -3
- data/vendor/libgit2/src/util.c +2 -92
- data/vendor/libgit2/src/util.h +3 -15
- data/vendor/libgit2/src/win32/findfile.c +0 -1
- data/vendor/libgit2/src/win32/map.c +3 -2
- data/vendor/libgit2/src/win32/mingw-compat.h +5 -12
- data/vendor/libgit2/src/win32/msvc-compat.h +3 -32
- data/vendor/libgit2/src/win32/posix.h +20 -32
- data/vendor/libgit2/src/win32/posix_w32.c +103 -31
- data/vendor/libgit2/src/win32/utf-conv.c +6 -36
- data/vendor/libgit2/src/win32/utf-conv.h +39 -0
- data/vendor/libgit2/src/win32/w32_util.h +0 -1
- metadata +32 -7
- data/vendor/libgit2/src/win32/path_w32.c +0 -305
- data/vendor/libgit2/src/win32/path_w32.h +0 -82
@@ -1,5 +1,5 @@
|
|
1
1
|
/* deflate.h -- internal compression state
|
2
|
-
* Copyright (C) 1995-
|
2
|
+
* Copyright (C) 1995-2012 Jean-loup Gailly
|
3
3
|
* For conditions of distribution and use, see copyright notice in zlib.h
|
4
4
|
*/
|
5
5
|
|
@@ -48,6 +48,9 @@
|
|
48
48
|
#define MAX_BITS 15
|
49
49
|
/* All codes must not exceed MAX_BITS bits */
|
50
50
|
|
51
|
+
#define Buf_size 16
|
52
|
+
/* size of bit buffer in bi_buf */
|
53
|
+
|
51
54
|
#define INIT_STATE 42
|
52
55
|
#define EXTRA_STATE 69
|
53
56
|
#define NAME_STATE 73
|
@@ -101,7 +104,7 @@ typedef struct internal_state {
|
|
101
104
|
int wrap; /* bit 0 true for zlib, bit 1 true for gzip */
|
102
105
|
gz_headerp gzhead; /* gzip header information to write */
|
103
106
|
uInt gzindex; /* where in extra, name, or comment */
|
104
|
-
Byte method; /*
|
107
|
+
Byte method; /* can only be DEFLATED */
|
105
108
|
int last_flush; /* value of flush param for previous deflate call */
|
106
109
|
|
107
110
|
/* used by deflate.c: */
|
@@ -188,7 +191,7 @@ typedef struct internal_state {
|
|
188
191
|
int nice_match; /* Stop searching when current match exceeds this */
|
189
192
|
|
190
193
|
/* used by trees.c: */
|
191
|
-
/* Didn't use ct_data typedef below to
|
194
|
+
/* Didn't use ct_data typedef below to suppress compiler warning */
|
192
195
|
struct ct_data_s dyn_ltree[HEAP_SIZE]; /* literal and length tree */
|
193
196
|
struct ct_data_s dyn_dtree[2*D_CODES+1]; /* distance tree */
|
194
197
|
struct ct_data_s bl_tree[2*BL_CODES+1]; /* Huffman tree for bit lengths */
|
@@ -244,7 +247,7 @@ typedef struct internal_state {
|
|
244
247
|
ulg opt_len; /* bit length of current block with optimal trees */
|
245
248
|
ulg static_len; /* bit length of current block with static trees */
|
246
249
|
uInt matches; /* number of string matches in current block */
|
247
|
-
|
250
|
+
uInt insert; /* bytes at end of window left to insert */
|
248
251
|
|
249
252
|
#ifdef DEBUG
|
250
253
|
ulg compressed_len; /* total bit length of compressed file mod 2^32 */
|
@@ -294,6 +297,7 @@ void ZLIB_INTERNAL _tr_init OF((deflate_state *s));
|
|
294
297
|
int ZLIB_INTERNAL _tr_tally OF((deflate_state *s, unsigned dist, unsigned lc));
|
295
298
|
void ZLIB_INTERNAL _tr_flush_block OF((deflate_state *s, charf *buf,
|
296
299
|
ulg stored_len, int last));
|
300
|
+
void ZLIB_INTERNAL _tr_flush_bits OF((deflate_state *s));
|
297
301
|
void ZLIB_INTERNAL _tr_align OF((deflate_state *s));
|
298
302
|
void ZLIB_INTERNAL _tr_stored_block OF((deflate_state *s, charf *buf,
|
299
303
|
ulg stored_len, int last));
|
@@ -0,0 +1,640 @@
|
|
1
|
+
/* infback.c -- inflate using a call-back interface
|
2
|
+
* Copyright (C) 1995-2011 Mark Adler
|
3
|
+
* For conditions of distribution and use, see copyright notice in zlib.h
|
4
|
+
*/
|
5
|
+
|
6
|
+
/*
|
7
|
+
This code is largely copied from inflate.c. Normally either infback.o or
|
8
|
+
inflate.o would be linked into an application--not both. The interface
|
9
|
+
with inffast.c is retained so that optimized assembler-coded versions of
|
10
|
+
inflate_fast() can be used with either inflate.c or infback.c.
|
11
|
+
*/
|
12
|
+
|
13
|
+
#include "zutil.h"
|
14
|
+
#include "inftrees.h"
|
15
|
+
#include "inflate.h"
|
16
|
+
#include "inffast.h"
|
17
|
+
|
18
|
+
/* function prototypes */
|
19
|
+
local void fixedtables OF((struct inflate_state FAR *state));
|
20
|
+
|
21
|
+
/*
|
22
|
+
strm provides memory allocation functions in zalloc and zfree, or
|
23
|
+
Z_NULL to use the library memory allocation functions.
|
24
|
+
|
25
|
+
windowBits is in the range 8..15, and window is a user-supplied
|
26
|
+
window and output buffer that is 2**windowBits bytes.
|
27
|
+
*/
|
28
|
+
int ZEXPORT inflateBackInit_(strm, windowBits, window, version, stream_size)
|
29
|
+
z_streamp strm;
|
30
|
+
int windowBits;
|
31
|
+
unsigned char FAR *window;
|
32
|
+
const char *version;
|
33
|
+
int stream_size;
|
34
|
+
{
|
35
|
+
struct inflate_state FAR *state;
|
36
|
+
|
37
|
+
if (version == Z_NULL || version[0] != ZLIB_VERSION[0] ||
|
38
|
+
stream_size != (int)(sizeof(z_stream)))
|
39
|
+
return Z_VERSION_ERROR;
|
40
|
+
if (strm == Z_NULL || window == Z_NULL ||
|
41
|
+
windowBits < 8 || windowBits > 15)
|
42
|
+
return Z_STREAM_ERROR;
|
43
|
+
strm->msg = Z_NULL; /* in case we return an error */
|
44
|
+
if (strm->zalloc == (alloc_func)0) {
|
45
|
+
#ifdef Z_SOLO
|
46
|
+
return Z_STREAM_ERROR;
|
47
|
+
#else
|
48
|
+
strm->zalloc = zcalloc;
|
49
|
+
strm->opaque = (voidpf)0;
|
50
|
+
#endif
|
51
|
+
}
|
52
|
+
if (strm->zfree == (free_func)0)
|
53
|
+
#ifdef Z_SOLO
|
54
|
+
return Z_STREAM_ERROR;
|
55
|
+
#else
|
56
|
+
strm->zfree = zcfree;
|
57
|
+
#endif
|
58
|
+
state = (struct inflate_state FAR *)ZALLOC(strm, 1,
|
59
|
+
sizeof(struct inflate_state));
|
60
|
+
if (state == Z_NULL) return Z_MEM_ERROR;
|
61
|
+
Tracev((stderr, "inflate: allocated\n"));
|
62
|
+
strm->state = (struct internal_state FAR *)state;
|
63
|
+
state->dmax = 32768U;
|
64
|
+
state->wbits = windowBits;
|
65
|
+
state->wsize = 1U << windowBits;
|
66
|
+
state->window = window;
|
67
|
+
state->wnext = 0;
|
68
|
+
state->whave = 0;
|
69
|
+
return Z_OK;
|
70
|
+
}
|
71
|
+
|
72
|
+
/*
|
73
|
+
Return state with length and distance decoding tables and index sizes set to
|
74
|
+
fixed code decoding. Normally this returns fixed tables from inffixed.h.
|
75
|
+
If BUILDFIXED is defined, then instead this routine builds the tables the
|
76
|
+
first time it's called, and returns those tables the first time and
|
77
|
+
thereafter. This reduces the size of the code by about 2K bytes, in
|
78
|
+
exchange for a little execution time. However, BUILDFIXED should not be
|
79
|
+
used for threaded applications, since the rewriting of the tables and virgin
|
80
|
+
may not be thread-safe.
|
81
|
+
*/
|
82
|
+
local void fixedtables(state)
|
83
|
+
struct inflate_state FAR *state;
|
84
|
+
{
|
85
|
+
#ifdef BUILDFIXED
|
86
|
+
static int virgin = 1;
|
87
|
+
static code *lenfix, *distfix;
|
88
|
+
static code fixed[544];
|
89
|
+
|
90
|
+
/* build fixed huffman tables if first call (may not be thread safe) */
|
91
|
+
if (virgin) {
|
92
|
+
unsigned sym, bits;
|
93
|
+
static code *next;
|
94
|
+
|
95
|
+
/* literal/length table */
|
96
|
+
sym = 0;
|
97
|
+
while (sym < 144) state->lens[sym++] = 8;
|
98
|
+
while (sym < 256) state->lens[sym++] = 9;
|
99
|
+
while (sym < 280) state->lens[sym++] = 7;
|
100
|
+
while (sym < 288) state->lens[sym++] = 8;
|
101
|
+
next = fixed;
|
102
|
+
lenfix = next;
|
103
|
+
bits = 9;
|
104
|
+
inflate_table(LENS, state->lens, 288, &(next), &(bits), state->work);
|
105
|
+
|
106
|
+
/* distance table */
|
107
|
+
sym = 0;
|
108
|
+
while (sym < 32) state->lens[sym++] = 5;
|
109
|
+
distfix = next;
|
110
|
+
bits = 5;
|
111
|
+
inflate_table(DISTS, state->lens, 32, &(next), &(bits), state->work);
|
112
|
+
|
113
|
+
/* do this just once */
|
114
|
+
virgin = 0;
|
115
|
+
}
|
116
|
+
#else /* !BUILDFIXED */
|
117
|
+
# include "inffixed.h"
|
118
|
+
#endif /* BUILDFIXED */
|
119
|
+
state->lencode = lenfix;
|
120
|
+
state->lenbits = 9;
|
121
|
+
state->distcode = distfix;
|
122
|
+
state->distbits = 5;
|
123
|
+
}
|
124
|
+
|
125
|
+
/* Macros for inflateBack(): */
|
126
|
+
|
127
|
+
/* Load returned state from inflate_fast() */
|
128
|
+
#define LOAD() \
|
129
|
+
do { \
|
130
|
+
put = strm->next_out; \
|
131
|
+
left = strm->avail_out; \
|
132
|
+
next = strm->next_in; \
|
133
|
+
have = strm->avail_in; \
|
134
|
+
hold = state->hold; \
|
135
|
+
bits = state->bits; \
|
136
|
+
} while (0)
|
137
|
+
|
138
|
+
/* Set state from registers for inflate_fast() */
|
139
|
+
#define RESTORE() \
|
140
|
+
do { \
|
141
|
+
strm->next_out = put; \
|
142
|
+
strm->avail_out = left; \
|
143
|
+
strm->next_in = next; \
|
144
|
+
strm->avail_in = have; \
|
145
|
+
state->hold = hold; \
|
146
|
+
state->bits = bits; \
|
147
|
+
} while (0)
|
148
|
+
|
149
|
+
/* Clear the input bit accumulator */
|
150
|
+
#define INITBITS() \
|
151
|
+
do { \
|
152
|
+
hold = 0; \
|
153
|
+
bits = 0; \
|
154
|
+
} while (0)
|
155
|
+
|
156
|
+
/* Assure that some input is available. If input is requested, but denied,
|
157
|
+
then return a Z_BUF_ERROR from inflateBack(). */
|
158
|
+
#define PULL() \
|
159
|
+
do { \
|
160
|
+
if (have == 0) { \
|
161
|
+
have = in(in_desc, &next); \
|
162
|
+
if (have == 0) { \
|
163
|
+
next = Z_NULL; \
|
164
|
+
ret = Z_BUF_ERROR; \
|
165
|
+
goto inf_leave; \
|
166
|
+
} \
|
167
|
+
} \
|
168
|
+
} while (0)
|
169
|
+
|
170
|
+
/* Get a byte of input into the bit accumulator, or return from inflateBack()
|
171
|
+
with an error if there is no input available. */
|
172
|
+
#define PULLBYTE() \
|
173
|
+
do { \
|
174
|
+
PULL(); \
|
175
|
+
have--; \
|
176
|
+
hold += (unsigned long)(*next++) << bits; \
|
177
|
+
bits += 8; \
|
178
|
+
} while (0)
|
179
|
+
|
180
|
+
/* Assure that there are at least n bits in the bit accumulator. If there is
|
181
|
+
not enough available input to do that, then return from inflateBack() with
|
182
|
+
an error. */
|
183
|
+
#define NEEDBITS(n) \
|
184
|
+
do { \
|
185
|
+
while (bits < (unsigned)(n)) \
|
186
|
+
PULLBYTE(); \
|
187
|
+
} while (0)
|
188
|
+
|
189
|
+
/* Return the low n bits of the bit accumulator (n < 16) */
|
190
|
+
#define BITS(n) \
|
191
|
+
((unsigned)hold & ((1U << (n)) - 1))
|
192
|
+
|
193
|
+
/* Remove n bits from the bit accumulator */
|
194
|
+
#define DROPBITS(n) \
|
195
|
+
do { \
|
196
|
+
hold >>= (n); \
|
197
|
+
bits -= (unsigned)(n); \
|
198
|
+
} while (0)
|
199
|
+
|
200
|
+
/* Remove zero to seven bits as needed to go to a byte boundary */
|
201
|
+
#define BYTEBITS() \
|
202
|
+
do { \
|
203
|
+
hold >>= bits & 7; \
|
204
|
+
bits -= bits & 7; \
|
205
|
+
} while (0)
|
206
|
+
|
207
|
+
/* Assure that some output space is available, by writing out the window
|
208
|
+
if it's full. If the write fails, return from inflateBack() with a
|
209
|
+
Z_BUF_ERROR. */
|
210
|
+
#define ROOM() \
|
211
|
+
do { \
|
212
|
+
if (left == 0) { \
|
213
|
+
put = state->window; \
|
214
|
+
left = state->wsize; \
|
215
|
+
state->whave = left; \
|
216
|
+
if (out(out_desc, put, left)) { \
|
217
|
+
ret = Z_BUF_ERROR; \
|
218
|
+
goto inf_leave; \
|
219
|
+
} \
|
220
|
+
} \
|
221
|
+
} while (0)
|
222
|
+
|
223
|
+
/*
|
224
|
+
strm provides the memory allocation functions and window buffer on input,
|
225
|
+
and provides information on the unused input on return. For Z_DATA_ERROR
|
226
|
+
returns, strm will also provide an error message.
|
227
|
+
|
228
|
+
in() and out() are the call-back input and output functions. When
|
229
|
+
inflateBack() needs more input, it calls in(). When inflateBack() has
|
230
|
+
filled the window with output, or when it completes with data in the
|
231
|
+
window, it calls out() to write out the data. The application must not
|
232
|
+
change the provided input until in() is called again or inflateBack()
|
233
|
+
returns. The application must not change the window/output buffer until
|
234
|
+
inflateBack() returns.
|
235
|
+
|
236
|
+
in() and out() are called with a descriptor parameter provided in the
|
237
|
+
inflateBack() call. This parameter can be a structure that provides the
|
238
|
+
information required to do the read or write, as well as accumulated
|
239
|
+
information on the input and output such as totals and check values.
|
240
|
+
|
241
|
+
in() should return zero on failure. out() should return non-zero on
|
242
|
+
failure. If either in() or out() fails, than inflateBack() returns a
|
243
|
+
Z_BUF_ERROR. strm->next_in can be checked for Z_NULL to see whether it
|
244
|
+
was in() or out() that caused in the error. Otherwise, inflateBack()
|
245
|
+
returns Z_STREAM_END on success, Z_DATA_ERROR for an deflate format
|
246
|
+
error, or Z_MEM_ERROR if it could not allocate memory for the state.
|
247
|
+
inflateBack() can also return Z_STREAM_ERROR if the input parameters
|
248
|
+
are not correct, i.e. strm is Z_NULL or the state was not initialized.
|
249
|
+
*/
|
250
|
+
int ZEXPORT inflateBack(strm, in, in_desc, out, out_desc)
|
251
|
+
z_streamp strm;
|
252
|
+
in_func in;
|
253
|
+
void FAR *in_desc;
|
254
|
+
out_func out;
|
255
|
+
void FAR *out_desc;
|
256
|
+
{
|
257
|
+
struct inflate_state FAR *state;
|
258
|
+
z_const unsigned char FAR *next; /* next input */
|
259
|
+
unsigned char FAR *put; /* next output */
|
260
|
+
unsigned have, left; /* available input and output */
|
261
|
+
unsigned long hold; /* bit buffer */
|
262
|
+
unsigned bits; /* bits in bit buffer */
|
263
|
+
unsigned copy; /* number of stored or match bytes to copy */
|
264
|
+
unsigned char FAR *from; /* where to copy match bytes from */
|
265
|
+
code here; /* current decoding table entry */
|
266
|
+
code last; /* parent table entry */
|
267
|
+
unsigned len; /* length to copy for repeats, bits to drop */
|
268
|
+
int ret; /* return code */
|
269
|
+
static const unsigned short order[19] = /* permutation of code lengths */
|
270
|
+
{16, 17, 18, 0, 8, 7, 9, 6, 10, 5, 11, 4, 12, 3, 13, 2, 14, 1, 15};
|
271
|
+
|
272
|
+
/* Check that the strm exists and that the state was initialized */
|
273
|
+
if (strm == Z_NULL || strm->state == Z_NULL)
|
274
|
+
return Z_STREAM_ERROR;
|
275
|
+
state = (struct inflate_state FAR *)strm->state;
|
276
|
+
|
277
|
+
/* Reset the state */
|
278
|
+
strm->msg = Z_NULL;
|
279
|
+
state->mode = TYPE;
|
280
|
+
state->last = 0;
|
281
|
+
state->whave = 0;
|
282
|
+
next = strm->next_in;
|
283
|
+
have = next != Z_NULL ? strm->avail_in : 0;
|
284
|
+
hold = 0;
|
285
|
+
bits = 0;
|
286
|
+
put = state->window;
|
287
|
+
left = state->wsize;
|
288
|
+
|
289
|
+
/* Inflate until end of block marked as last */
|
290
|
+
for (;;)
|
291
|
+
switch (state->mode) {
|
292
|
+
case TYPE:
|
293
|
+
/* determine and dispatch block type */
|
294
|
+
if (state->last) {
|
295
|
+
BYTEBITS();
|
296
|
+
state->mode = DONE;
|
297
|
+
break;
|
298
|
+
}
|
299
|
+
NEEDBITS(3);
|
300
|
+
state->last = BITS(1);
|
301
|
+
DROPBITS(1);
|
302
|
+
switch (BITS(2)) {
|
303
|
+
case 0: /* stored block */
|
304
|
+
Tracev((stderr, "inflate: stored block%s\n",
|
305
|
+
state->last ? " (last)" : ""));
|
306
|
+
state->mode = STORED;
|
307
|
+
break;
|
308
|
+
case 1: /* fixed block */
|
309
|
+
fixedtables(state);
|
310
|
+
Tracev((stderr, "inflate: fixed codes block%s\n",
|
311
|
+
state->last ? " (last)" : ""));
|
312
|
+
state->mode = LEN; /* decode codes */
|
313
|
+
break;
|
314
|
+
case 2: /* dynamic block */
|
315
|
+
Tracev((stderr, "inflate: dynamic codes block%s\n",
|
316
|
+
state->last ? " (last)" : ""));
|
317
|
+
state->mode = TABLE;
|
318
|
+
break;
|
319
|
+
case 3:
|
320
|
+
strm->msg = (char *)"invalid block type";
|
321
|
+
state->mode = BAD;
|
322
|
+
}
|
323
|
+
DROPBITS(2);
|
324
|
+
break;
|
325
|
+
|
326
|
+
case STORED:
|
327
|
+
/* get and verify stored block length */
|
328
|
+
BYTEBITS(); /* go to byte boundary */
|
329
|
+
NEEDBITS(32);
|
330
|
+
if ((hold & 0xffff) != ((hold >> 16) ^ 0xffff)) {
|
331
|
+
strm->msg = (char *)"invalid stored block lengths";
|
332
|
+
state->mode = BAD;
|
333
|
+
break;
|
334
|
+
}
|
335
|
+
state->length = (unsigned)hold & 0xffff;
|
336
|
+
Tracev((stderr, "inflate: stored length %u\n",
|
337
|
+
state->length));
|
338
|
+
INITBITS();
|
339
|
+
|
340
|
+
/* copy stored block from input to output */
|
341
|
+
while (state->length != 0) {
|
342
|
+
copy = state->length;
|
343
|
+
PULL();
|
344
|
+
ROOM();
|
345
|
+
if (copy > have) copy = have;
|
346
|
+
if (copy > left) copy = left;
|
347
|
+
zmemcpy(put, next, copy);
|
348
|
+
have -= copy;
|
349
|
+
next += copy;
|
350
|
+
left -= copy;
|
351
|
+
put += copy;
|
352
|
+
state->length -= copy;
|
353
|
+
}
|
354
|
+
Tracev((stderr, "inflate: stored end\n"));
|
355
|
+
state->mode = TYPE;
|
356
|
+
break;
|
357
|
+
|
358
|
+
case TABLE:
|
359
|
+
/* get dynamic table entries descriptor */
|
360
|
+
NEEDBITS(14);
|
361
|
+
state->nlen = BITS(5) + 257;
|
362
|
+
DROPBITS(5);
|
363
|
+
state->ndist = BITS(5) + 1;
|
364
|
+
DROPBITS(5);
|
365
|
+
state->ncode = BITS(4) + 4;
|
366
|
+
DROPBITS(4);
|
367
|
+
#ifndef PKZIP_BUG_WORKAROUND
|
368
|
+
if (state->nlen > 286 || state->ndist > 30) {
|
369
|
+
strm->msg = (char *)"too many length or distance symbols";
|
370
|
+
state->mode = BAD;
|
371
|
+
break;
|
372
|
+
}
|
373
|
+
#endif
|
374
|
+
Tracev((stderr, "inflate: table sizes ok\n"));
|
375
|
+
|
376
|
+
/* get code length code lengths (not a typo) */
|
377
|
+
state->have = 0;
|
378
|
+
while (state->have < state->ncode) {
|
379
|
+
NEEDBITS(3);
|
380
|
+
state->lens[order[state->have++]] = (unsigned short)BITS(3);
|
381
|
+
DROPBITS(3);
|
382
|
+
}
|
383
|
+
while (state->have < 19)
|
384
|
+
state->lens[order[state->have++]] = 0;
|
385
|
+
state->next = state->codes;
|
386
|
+
state->lencode = (code const FAR *)(state->next);
|
387
|
+
state->lenbits = 7;
|
388
|
+
ret = inflate_table(CODES, state->lens, 19, &(state->next),
|
389
|
+
&(state->lenbits), state->work);
|
390
|
+
if (ret) {
|
391
|
+
strm->msg = (char *)"invalid code lengths set";
|
392
|
+
state->mode = BAD;
|
393
|
+
break;
|
394
|
+
}
|
395
|
+
Tracev((stderr, "inflate: code lengths ok\n"));
|
396
|
+
|
397
|
+
/* get length and distance code code lengths */
|
398
|
+
state->have = 0;
|
399
|
+
while (state->have < state->nlen + state->ndist) {
|
400
|
+
for (;;) {
|
401
|
+
here = state->lencode[BITS(state->lenbits)];
|
402
|
+
if ((unsigned)(here.bits) <= bits) break;
|
403
|
+
PULLBYTE();
|
404
|
+
}
|
405
|
+
if (here.val < 16) {
|
406
|
+
DROPBITS(here.bits);
|
407
|
+
state->lens[state->have++] = here.val;
|
408
|
+
}
|
409
|
+
else {
|
410
|
+
if (here.val == 16) {
|
411
|
+
NEEDBITS(here.bits + 2);
|
412
|
+
DROPBITS(here.bits);
|
413
|
+
if (state->have == 0) {
|
414
|
+
strm->msg = (char *)"invalid bit length repeat";
|
415
|
+
state->mode = BAD;
|
416
|
+
break;
|
417
|
+
}
|
418
|
+
len = (unsigned)(state->lens[state->have - 1]);
|
419
|
+
copy = 3 + BITS(2);
|
420
|
+
DROPBITS(2);
|
421
|
+
}
|
422
|
+
else if (here.val == 17) {
|
423
|
+
NEEDBITS(here.bits + 3);
|
424
|
+
DROPBITS(here.bits);
|
425
|
+
len = 0;
|
426
|
+
copy = 3 + BITS(3);
|
427
|
+
DROPBITS(3);
|
428
|
+
}
|
429
|
+
else {
|
430
|
+
NEEDBITS(here.bits + 7);
|
431
|
+
DROPBITS(here.bits);
|
432
|
+
len = 0;
|
433
|
+
copy = 11 + BITS(7);
|
434
|
+
DROPBITS(7);
|
435
|
+
}
|
436
|
+
if (state->have + copy > state->nlen + state->ndist) {
|
437
|
+
strm->msg = (char *)"invalid bit length repeat";
|
438
|
+
state->mode = BAD;
|
439
|
+
break;
|
440
|
+
}
|
441
|
+
while (copy--)
|
442
|
+
state->lens[state->have++] = (unsigned short)len;
|
443
|
+
}
|
444
|
+
}
|
445
|
+
|
446
|
+
/* handle error breaks in while */
|
447
|
+
if (state->mode == BAD) break;
|
448
|
+
|
449
|
+
/* check for end-of-block code (better have one) */
|
450
|
+
if (state->lens[256] == 0) {
|
451
|
+
strm->msg = (char *)"invalid code -- missing end-of-block";
|
452
|
+
state->mode = BAD;
|
453
|
+
break;
|
454
|
+
}
|
455
|
+
|
456
|
+
/* build code tables -- note: do not change the lenbits or distbits
|
457
|
+
values here (9 and 6) without reading the comments in inftrees.h
|
458
|
+
concerning the ENOUGH constants, which depend on those values */
|
459
|
+
state->next = state->codes;
|
460
|
+
state->lencode = (code const FAR *)(state->next);
|
461
|
+
state->lenbits = 9;
|
462
|
+
ret = inflate_table(LENS, state->lens, state->nlen, &(state->next),
|
463
|
+
&(state->lenbits), state->work);
|
464
|
+
if (ret) {
|
465
|
+
strm->msg = (char *)"invalid literal/lengths set";
|
466
|
+
state->mode = BAD;
|
467
|
+
break;
|
468
|
+
}
|
469
|
+
state->distcode = (code const FAR *)(state->next);
|
470
|
+
state->distbits = 6;
|
471
|
+
ret = inflate_table(DISTS, state->lens + state->nlen, state->ndist,
|
472
|
+
&(state->next), &(state->distbits), state->work);
|
473
|
+
if (ret) {
|
474
|
+
strm->msg = (char *)"invalid distances set";
|
475
|
+
state->mode = BAD;
|
476
|
+
break;
|
477
|
+
}
|
478
|
+
Tracev((stderr, "inflate: codes ok\n"));
|
479
|
+
state->mode = LEN;
|
480
|
+
|
481
|
+
case LEN:
|
482
|
+
/* use inflate_fast() if we have enough input and output */
|
483
|
+
if (have >= 6 && left >= 258) {
|
484
|
+
RESTORE();
|
485
|
+
if (state->whave < state->wsize)
|
486
|
+
state->whave = state->wsize - left;
|
487
|
+
inflate_fast(strm, state->wsize);
|
488
|
+
LOAD();
|
489
|
+
break;
|
490
|
+
}
|
491
|
+
|
492
|
+
/* get a literal, length, or end-of-block code */
|
493
|
+
for (;;) {
|
494
|
+
here = state->lencode[BITS(state->lenbits)];
|
495
|
+
if ((unsigned)(here.bits) <= bits) break;
|
496
|
+
PULLBYTE();
|
497
|
+
}
|
498
|
+
if (here.op && (here.op & 0xf0) == 0) {
|
499
|
+
last = here;
|
500
|
+
for (;;) {
|
501
|
+
here = state->lencode[last.val +
|
502
|
+
(BITS(last.bits + last.op) >> last.bits)];
|
503
|
+
if ((unsigned)(last.bits + here.bits) <= bits) break;
|
504
|
+
PULLBYTE();
|
505
|
+
}
|
506
|
+
DROPBITS(last.bits);
|
507
|
+
}
|
508
|
+
DROPBITS(here.bits);
|
509
|
+
state->length = (unsigned)here.val;
|
510
|
+
|
511
|
+
/* process literal */
|
512
|
+
if (here.op == 0) {
|
513
|
+
Tracevv((stderr, here.val >= 0x20 && here.val < 0x7f ?
|
514
|
+
"inflate: literal '%c'\n" :
|
515
|
+
"inflate: literal 0x%02x\n", here.val));
|
516
|
+
ROOM();
|
517
|
+
*put++ = (unsigned char)(state->length);
|
518
|
+
left--;
|
519
|
+
state->mode = LEN;
|
520
|
+
break;
|
521
|
+
}
|
522
|
+
|
523
|
+
/* process end of block */
|
524
|
+
if (here.op & 32) {
|
525
|
+
Tracevv((stderr, "inflate: end of block\n"));
|
526
|
+
state->mode = TYPE;
|
527
|
+
break;
|
528
|
+
}
|
529
|
+
|
530
|
+
/* invalid code */
|
531
|
+
if (here.op & 64) {
|
532
|
+
strm->msg = (char *)"invalid literal/length code";
|
533
|
+
state->mode = BAD;
|
534
|
+
break;
|
535
|
+
}
|
536
|
+
|
537
|
+
/* length code -- get extra bits, if any */
|
538
|
+
state->extra = (unsigned)(here.op) & 15;
|
539
|
+
if (state->extra != 0) {
|
540
|
+
NEEDBITS(state->extra);
|
541
|
+
state->length += BITS(state->extra);
|
542
|
+
DROPBITS(state->extra);
|
543
|
+
}
|
544
|
+
Tracevv((stderr, "inflate: length %u\n", state->length));
|
545
|
+
|
546
|
+
/* get distance code */
|
547
|
+
for (;;) {
|
548
|
+
here = state->distcode[BITS(state->distbits)];
|
549
|
+
if ((unsigned)(here.bits) <= bits) break;
|
550
|
+
PULLBYTE();
|
551
|
+
}
|
552
|
+
if ((here.op & 0xf0) == 0) {
|
553
|
+
last = here;
|
554
|
+
for (;;) {
|
555
|
+
here = state->distcode[last.val +
|
556
|
+
(BITS(last.bits + last.op) >> last.bits)];
|
557
|
+
if ((unsigned)(last.bits + here.bits) <= bits) break;
|
558
|
+
PULLBYTE();
|
559
|
+
}
|
560
|
+
DROPBITS(last.bits);
|
561
|
+
}
|
562
|
+
DROPBITS(here.bits);
|
563
|
+
if (here.op & 64) {
|
564
|
+
strm->msg = (char *)"invalid distance code";
|
565
|
+
state->mode = BAD;
|
566
|
+
break;
|
567
|
+
}
|
568
|
+
state->offset = (unsigned)here.val;
|
569
|
+
|
570
|
+
/* get distance extra bits, if any */
|
571
|
+
state->extra = (unsigned)(here.op) & 15;
|
572
|
+
if (state->extra != 0) {
|
573
|
+
NEEDBITS(state->extra);
|
574
|
+
state->offset += BITS(state->extra);
|
575
|
+
DROPBITS(state->extra);
|
576
|
+
}
|
577
|
+
if (state->offset > state->wsize - (state->whave < state->wsize ?
|
578
|
+
left : 0)) {
|
579
|
+
strm->msg = (char *)"invalid distance too far back";
|
580
|
+
state->mode = BAD;
|
581
|
+
break;
|
582
|
+
}
|
583
|
+
Tracevv((stderr, "inflate: distance %u\n", state->offset));
|
584
|
+
|
585
|
+
/* copy match from window to output */
|
586
|
+
do {
|
587
|
+
ROOM();
|
588
|
+
copy = state->wsize - state->offset;
|
589
|
+
if (copy < left) {
|
590
|
+
from = put + copy;
|
591
|
+
copy = left - copy;
|
592
|
+
}
|
593
|
+
else {
|
594
|
+
from = put - state->offset;
|
595
|
+
copy = left;
|
596
|
+
}
|
597
|
+
if (copy > state->length) copy = state->length;
|
598
|
+
state->length -= copy;
|
599
|
+
left -= copy;
|
600
|
+
do {
|
601
|
+
*put++ = *from++;
|
602
|
+
} while (--copy);
|
603
|
+
} while (state->length != 0);
|
604
|
+
break;
|
605
|
+
|
606
|
+
case DONE:
|
607
|
+
/* inflate stream terminated properly -- write leftover output */
|
608
|
+
ret = Z_STREAM_END;
|
609
|
+
if (left < state->wsize) {
|
610
|
+
if (out(out_desc, state->window, state->wsize - left))
|
611
|
+
ret = Z_BUF_ERROR;
|
612
|
+
}
|
613
|
+
goto inf_leave;
|
614
|
+
|
615
|
+
case BAD:
|
616
|
+
ret = Z_DATA_ERROR;
|
617
|
+
goto inf_leave;
|
618
|
+
|
619
|
+
default: /* can't happen, but makes compilers happy */
|
620
|
+
ret = Z_STREAM_ERROR;
|
621
|
+
goto inf_leave;
|
622
|
+
}
|
623
|
+
|
624
|
+
/* Return unused input */
|
625
|
+
inf_leave:
|
626
|
+
strm->next_in = next;
|
627
|
+
strm->avail_in = have;
|
628
|
+
return ret;
|
629
|
+
}
|
630
|
+
|
631
|
+
int ZEXPORT inflateBackEnd(strm)
|
632
|
+
z_streamp strm;
|
633
|
+
{
|
634
|
+
if (strm == Z_NULL || strm->state == Z_NULL || strm->zfree == (free_func)0)
|
635
|
+
return Z_STREAM_ERROR;
|
636
|
+
ZFREE(strm, strm->state);
|
637
|
+
strm->state = Z_NULL;
|
638
|
+
Tracev((stderr, "inflate: end\n"));
|
639
|
+
return Z_OK;
|
640
|
+
}
|