rugged 1.1.1 → 1.2.0
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- checksums.yaml +4 -4
- data/LICENSE +1 -0
- data/README.md +1 -1
- data/ext/rugged/rugged.c +7 -4
- data/ext/rugged/rugged_object.c +1 -1
- data/ext/rugged/rugged_repo.c +3 -3
- data/lib/rugged/repository.rb +2 -2
- data/lib/rugged/version.rb +1 -1
- data/vendor/libgit2/CMakeLists.txt +11 -6
- data/vendor/libgit2/COPYING +109 -1
- data/vendor/libgit2/cmake/Findfutimens.cmake +14 -0
- data/vendor/libgit2/cmake/SelectHTTPSBackend.cmake +4 -0
- data/vendor/libgit2/cmake/SelectHashes.cmake +1 -0
- data/vendor/libgit2/deps/chromium-zlib/CMakeLists.txt +101 -0
- data/vendor/libgit2/deps/ntlmclient/CMakeLists.txt +17 -5
- data/vendor/libgit2/deps/ntlmclient/crypt.h +14 -9
- data/vendor/libgit2/deps/ntlmclient/crypt_commoncrypto.c +20 -20
- data/vendor/libgit2/deps/ntlmclient/crypt_commoncrypto.h +3 -3
- data/vendor/libgit2/deps/ntlmclient/crypt_mbedtls.c +37 -36
- data/vendor/libgit2/deps/ntlmclient/crypt_mbedtls.h +4 -3
- data/vendor/libgit2/deps/ntlmclient/crypt_openssl.c +178 -51
- data/vendor/libgit2/deps/ntlmclient/crypt_openssl.h +74 -5
- data/vendor/libgit2/deps/ntlmclient/ntlm.c +150 -118
- data/vendor/libgit2/deps/ntlmclient/ntlm.h +13 -9
- data/vendor/libgit2/deps/ntlmclient/ntlmclient.h +16 -3
- data/vendor/libgit2/deps/ntlmclient/unicode.h +10 -4
- data/vendor/libgit2/deps/ntlmclient/unicode_builtin.c +16 -27
- data/vendor/libgit2/deps/ntlmclient/unicode_builtin.h +20 -0
- data/vendor/libgit2/deps/ntlmclient/unicode_iconv.c +28 -52
- data/vendor/libgit2/deps/ntlmclient/unicode_iconv.h +22 -0
- data/vendor/libgit2/include/git2/attr.h +89 -0
- data/vendor/libgit2/include/git2/blame.h +93 -42
- data/vendor/libgit2/include/git2/blob.h +14 -2
- data/vendor/libgit2/include/git2/branch.h +25 -0
- data/vendor/libgit2/include/git2/cert.h +42 -5
- data/vendor/libgit2/include/git2/checkout.h +28 -12
- data/vendor/libgit2/include/git2/commit.h +35 -19
- data/vendor/libgit2/include/git2/common.h +14 -4
- data/vendor/libgit2/include/git2/deprecated.h +206 -6
- data/vendor/libgit2/include/git2/diff.h +34 -19
- data/vendor/libgit2/include/git2/errors.h +6 -6
- data/vendor/libgit2/include/git2/filter.h +57 -17
- data/vendor/libgit2/include/git2/graph.h +20 -2
- data/vendor/libgit2/include/git2/index.h +2 -2
- data/vendor/libgit2/include/git2/odb.h +29 -0
- data/vendor/libgit2/include/git2/patch.h +8 -0
- data/vendor/libgit2/include/git2/rebase.h +25 -1
- data/vendor/libgit2/include/git2/refs.h +6 -2
- data/vendor/libgit2/include/git2/remote.h +59 -6
- data/vendor/libgit2/include/git2/revparse.h +5 -5
- data/vendor/libgit2/include/git2/status.h +115 -59
- data/vendor/libgit2/include/git2/submodule.h +9 -0
- data/vendor/libgit2/include/git2/sys/commit_graph.h +174 -0
- data/vendor/libgit2/include/git2/sys/filter.h +49 -28
- data/vendor/libgit2/include/git2/sys/midx.h +74 -0
- data/vendor/libgit2/include/git2/sys/odb_backend.h +7 -0
- data/vendor/libgit2/include/git2/sys/transport.h +1 -0
- data/vendor/libgit2/include/git2/tag.h +12 -0
- data/vendor/libgit2/include/git2/tree.h +0 -14
- data/vendor/libgit2/include/git2/types.h +9 -0
- data/vendor/libgit2/include/git2/version.h +4 -4
- data/vendor/libgit2/include/git2/worktree.h +1 -0
- data/vendor/libgit2/src/CMakeLists.txt +25 -4
- data/vendor/libgit2/src/alloc.c +21 -8
- data/vendor/libgit2/src/allocators/failalloc.c +92 -0
- data/vendor/libgit2/src/allocators/failalloc.h +23 -0
- data/vendor/libgit2/src/allocators/stdalloc.c +41 -10
- data/vendor/libgit2/src/allocators/win32_leakcheck.c +118 -0
- data/vendor/libgit2/src/allocators/{win32_crtdbg.h → win32_leakcheck.h} +3 -3
- data/vendor/libgit2/src/annotated_commit.c +21 -9
- data/vendor/libgit2/src/apply.c +16 -7
- data/vendor/libgit2/src/array.h +11 -11
- data/vendor/libgit2/src/attr.c +181 -74
- data/vendor/libgit2/src/attr_file.c +84 -39
- data/vendor/libgit2/src/attr_file.h +32 -11
- data/vendor/libgit2/src/attrcache.c +42 -37
- data/vendor/libgit2/src/attrcache.h +4 -5
- data/vendor/libgit2/src/blame.c +11 -5
- data/vendor/libgit2/src/blob.c +35 -24
- data/vendor/libgit2/src/branch.c +69 -17
- data/vendor/libgit2/src/buffer.c +334 -25
- data/vendor/libgit2/src/buffer.h +153 -2
- data/vendor/libgit2/src/cache.c +2 -2
- data/vendor/libgit2/src/cache.h +7 -7
- data/vendor/libgit2/src/cc-compat.h +10 -2
- data/vendor/libgit2/src/checkout.c +48 -26
- data/vendor/libgit2/src/cherrypick.c +6 -2
- data/vendor/libgit2/src/clone.c +41 -47
- data/vendor/libgit2/src/commit.c +41 -28
- data/vendor/libgit2/src/commit_graph.c +1209 -0
- data/vendor/libgit2/src/commit_graph.h +162 -0
- data/vendor/libgit2/src/commit_list.c +46 -0
- data/vendor/libgit2/src/commit_list.h +2 -0
- data/vendor/libgit2/src/common.h +25 -2
- data/vendor/libgit2/src/config.c +37 -15
- data/vendor/libgit2/src/config_cache.c +5 -3
- data/vendor/libgit2/src/config_file.c +16 -8
- data/vendor/libgit2/src/config_parse.c +4 -6
- data/vendor/libgit2/src/crlf.c +16 -6
- data/vendor/libgit2/src/date.c +4 -3
- data/vendor/libgit2/src/delta.c +1 -1
- data/vendor/libgit2/src/describe.c +6 -3
- data/vendor/libgit2/src/diff.c +11 -8
- data/vendor/libgit2/src/diff_driver.c +21 -17
- data/vendor/libgit2/src/diff_file.c +2 -6
- data/vendor/libgit2/src/diff_generate.c +46 -17
- data/vendor/libgit2/src/diff_print.c +19 -6
- data/vendor/libgit2/src/diff_stats.c +7 -5
- data/vendor/libgit2/src/diff_tform.c +9 -8
- data/vendor/libgit2/src/diff_xdiff.c +4 -2
- data/vendor/libgit2/src/diff_xdiff.h +1 -1
- data/vendor/libgit2/src/errors.c +24 -19
- data/vendor/libgit2/src/features.h.in +5 -1
- data/vendor/libgit2/src/fetch.c +5 -2
- data/vendor/libgit2/src/fetchhead.c +8 -4
- data/vendor/libgit2/src/filebuf.c +9 -7
- data/vendor/libgit2/src/filter.c +206 -110
- data/vendor/libgit2/src/filter.h +24 -5
- data/vendor/libgit2/src/futils.c +5 -5
- data/vendor/libgit2/src/futils.h +1 -1
- data/vendor/libgit2/src/graph.c +64 -9
- data/vendor/libgit2/src/hash/sha1/collisiondetect.c +3 -3
- data/vendor/libgit2/src/hash/sha1/common_crypto.c +3 -3
- data/vendor/libgit2/src/hash/sha1/generic.h +1 -1
- data/vendor/libgit2/src/hash/sha1/mbedtls.c +12 -12
- data/vendor/libgit2/src/hash/sha1/openssl.c +3 -3
- data/vendor/libgit2/src/hash/sha1/sha1dc/sha1.c +0 -2
- data/vendor/libgit2/src/hash/sha1/win32.c +15 -11
- data/vendor/libgit2/src/hash.c +16 -13
- data/vendor/libgit2/src/hash.h +1 -1
- data/vendor/libgit2/src/hashsig.c +23 -10
- data/vendor/libgit2/src/ident.c +13 -3
- data/vendor/libgit2/src/ignore.c +35 -19
- data/vendor/libgit2/src/index.c +106 -70
- data/vendor/libgit2/src/index.h +1 -1
- data/vendor/libgit2/src/indexer.c +31 -29
- data/vendor/libgit2/src/integer.h +64 -2
- data/vendor/libgit2/src/iterator.c +36 -24
- data/vendor/libgit2/src/iterator.h +1 -1
- data/vendor/libgit2/src/khash.h +2 -11
- data/vendor/libgit2/src/{settings.c → libgit2.c} +117 -50
- data/vendor/libgit2/src/libgit2.h +15 -0
- data/vendor/libgit2/src/mailmap.c +23 -10
- data/vendor/libgit2/src/map.h +3 -3
- data/vendor/libgit2/src/merge.c +70 -30
- data/vendor/libgit2/src/merge.h +2 -1
- data/vendor/libgit2/src/merge_driver.c +19 -13
- data/vendor/libgit2/src/merge_file.c +11 -3
- data/vendor/libgit2/src/message.c +3 -1
- data/vendor/libgit2/src/midx.c +471 -10
- data/vendor/libgit2/src/midx.h +28 -1
- data/vendor/libgit2/src/mwindow.c +103 -59
- data/vendor/libgit2/src/mwindow.h +3 -3
- data/vendor/libgit2/src/net.c +127 -3
- data/vendor/libgit2/src/net.h +16 -2
- data/vendor/libgit2/src/netops.c +6 -4
- data/vendor/libgit2/src/netops.h +2 -2
- data/vendor/libgit2/src/notes.c +10 -10
- data/vendor/libgit2/src/object.c +22 -14
- data/vendor/libgit2/src/odb.c +285 -48
- data/vendor/libgit2/src/odb.h +16 -2
- data/vendor/libgit2/src/odb_loose.c +28 -18
- data/vendor/libgit2/src/odb_mempack.c +1 -1
- data/vendor/libgit2/src/odb_pack.c +391 -114
- data/vendor/libgit2/src/oid.c +5 -4
- data/vendor/libgit2/src/pack-objects.c +54 -48
- data/vendor/libgit2/src/pack.c +329 -119
- data/vendor/libgit2/src/pack.h +25 -7
- data/vendor/libgit2/src/patch.c +14 -7
- data/vendor/libgit2/src/patch_generate.c +2 -2
- data/vendor/libgit2/src/patch_parse.c +2 -1
- data/vendor/libgit2/src/path.c +98 -53
- data/vendor/libgit2/src/path.h +79 -6
- data/vendor/libgit2/src/pathspec.c +8 -8
- data/vendor/libgit2/src/pool.c +13 -7
- data/vendor/libgit2/src/posix.c +11 -3
- data/vendor/libgit2/src/reader.c +10 -6
- data/vendor/libgit2/src/rebase.c +93 -49
- data/vendor/libgit2/src/refdb.c +30 -13
- data/vendor/libgit2/src/refdb_fs.c +121 -69
- data/vendor/libgit2/src/reflog.c +19 -14
- data/vendor/libgit2/src/refs.c +76 -41
- data/vendor/libgit2/src/refspec.c +32 -12
- data/vendor/libgit2/src/remote.c +272 -102
- data/vendor/libgit2/src/remote.h +2 -1
- data/vendor/libgit2/src/repository.c +176 -103
- data/vendor/libgit2/src/repository.h +12 -1
- data/vendor/libgit2/src/reset.c +7 -6
- data/vendor/libgit2/src/revert.c +6 -2
- data/vendor/libgit2/src/revparse.c +14 -9
- data/vendor/libgit2/src/revwalk.c +32 -15
- data/vendor/libgit2/src/runtime.c +162 -0
- data/vendor/libgit2/src/runtime.h +62 -0
- data/vendor/libgit2/src/settings.h +11 -0
- data/vendor/libgit2/src/signature.c +6 -5
- data/vendor/libgit2/src/sortedcache.h +10 -8
- data/vendor/libgit2/src/stash.c +3 -1
- data/vendor/libgit2/src/status.c +7 -4
- data/vendor/libgit2/src/strarray.c +2 -1
- data/vendor/libgit2/src/streams/mbedtls.c +14 -17
- data/vendor/libgit2/src/streams/mbedtls.h +1 -1
- data/vendor/libgit2/src/streams/openssl.c +101 -201
- data/vendor/libgit2/src/streams/openssl.h +9 -1
- data/vendor/libgit2/src/streams/openssl_dynamic.c +309 -0
- data/vendor/libgit2/src/streams/openssl_dynamic.h +348 -0
- data/vendor/libgit2/src/streams/openssl_legacy.c +203 -0
- data/vendor/libgit2/src/streams/openssl_legacy.h +63 -0
- data/vendor/libgit2/src/streams/registry.c +5 -6
- data/vendor/libgit2/src/streams/socket.c +6 -2
- data/vendor/libgit2/src/streams/stransport.c +6 -3
- data/vendor/libgit2/src/streams/tls.c +5 -3
- data/vendor/libgit2/src/submodule.c +128 -62
- data/vendor/libgit2/src/submodule.h +9 -9
- data/vendor/libgit2/src/sysdir.c +4 -6
- data/vendor/libgit2/src/tag.c +47 -11
- data/vendor/libgit2/src/thread.c +140 -0
- data/vendor/libgit2/src/thread.h +479 -0
- data/vendor/libgit2/src/threadstate.c +83 -0
- data/vendor/libgit2/src/threadstate.h +24 -0
- data/vendor/libgit2/src/trace.c +2 -2
- data/vendor/libgit2/src/trace.h +17 -13
- data/vendor/libgit2/src/transaction.c +19 -8
- data/vendor/libgit2/src/transport.c +3 -3
- data/vendor/libgit2/src/transports/auth.c +1 -1
- data/vendor/libgit2/src/transports/auth_negotiate.c +11 -4
- data/vendor/libgit2/src/transports/auth_ntlm.c +10 -6
- data/vendor/libgit2/src/transports/credential.c +15 -7
- data/vendor/libgit2/src/transports/git.c +1 -3
- data/vendor/libgit2/src/transports/http.c +19 -17
- data/vendor/libgit2/src/transports/http.h +1 -0
- data/vendor/libgit2/src/transports/httpclient.c +53 -26
- data/vendor/libgit2/src/transports/httpclient.h +1 -1
- data/vendor/libgit2/src/transports/local.c +3 -3
- data/vendor/libgit2/src/transports/smart.c +12 -7
- data/vendor/libgit2/src/transports/smart.h +1 -1
- data/vendor/libgit2/src/transports/smart_protocol.c +11 -5
- data/vendor/libgit2/src/transports/ssh.c +51 -17
- data/vendor/libgit2/src/transports/winhttp.c +41 -31
- data/vendor/libgit2/src/tree.c +100 -77
- data/vendor/libgit2/src/tree.h +1 -0
- data/vendor/libgit2/src/tsort.c +0 -2
- data/vendor/libgit2/src/unix/map.c +3 -1
- data/vendor/libgit2/src/unix/pthread.h +2 -1
- data/vendor/libgit2/src/utf8.c +150 -0
- data/vendor/libgit2/src/utf8.h +52 -0
- data/vendor/libgit2/src/util.c +53 -129
- data/vendor/libgit2/src/util.h +33 -39
- data/vendor/libgit2/src/vector.c +23 -19
- data/vendor/libgit2/src/vector.h +4 -2
- data/vendor/libgit2/src/win32/findfile.c +4 -2
- data/vendor/libgit2/src/win32/map.c +1 -1
- data/vendor/libgit2/src/win32/msvc-compat.h +9 -1
- data/vendor/libgit2/src/win32/path_w32.c +22 -24
- data/vendor/libgit2/src/win32/path_w32.h +0 -1
- data/vendor/libgit2/src/win32/posix_w32.c +7 -1
- data/vendor/libgit2/src/win32/precompiled.h +0 -1
- data/vendor/libgit2/src/win32/reparse.h +4 -4
- data/vendor/libgit2/src/win32/thread.c +24 -15
- data/vendor/libgit2/src/win32/thread.h +1 -1
- data/vendor/libgit2/src/win32/w32_buffer.c +3 -3
- data/vendor/libgit2/src/win32/w32_common.h +18 -9
- data/vendor/libgit2/src/win32/{w32_crtdbg_stacktrace.c → w32_leakcheck.c} +269 -33
- data/vendor/libgit2/src/win32/w32_leakcheck.h +222 -0
- data/vendor/libgit2/src/win32/w32_util.h +6 -6
- data/vendor/libgit2/src/worktree.c +27 -16
- data/vendor/libgit2/src/zstream.c +1 -1
- metadata +32 -16
- data/vendor/libgit2/src/allocators/win32_crtdbg.c +0 -118
- data/vendor/libgit2/src/buf_text.c +0 -316
- data/vendor/libgit2/src/buf_text.h +0 -122
- data/vendor/libgit2/src/global.c +0 -363
- data/vendor/libgit2/src/global.h +0 -41
- data/vendor/libgit2/src/thread-utils.c +0 -58
- data/vendor/libgit2/src/thread-utils.h +0 -369
- data/vendor/libgit2/src/win32/w32_crtdbg_stacktrace.h +0 -127
- data/vendor/libgit2/src/win32/w32_stack.c +0 -188
- data/vendor/libgit2/src/win32/w32_stack.h +0 -140
|
@@ -1,118 +0,0 @@
|
|
|
1
|
-
/*
|
|
2
|
-
* Copyright (C) the libgit2 contributors. All rights reserved.
|
|
3
|
-
*
|
|
4
|
-
* This file is part of libgit2, distributed under the GNU GPL v2 with
|
|
5
|
-
* a Linking Exception. For full terms see the included COPYING file.
|
|
6
|
-
*/
|
|
7
|
-
|
|
8
|
-
#include "win32_crtdbg.h"
|
|
9
|
-
|
|
10
|
-
#if defined(GIT_MSVC_CRTDBG)
|
|
11
|
-
|
|
12
|
-
#include "win32/w32_crtdbg_stacktrace.h"
|
|
13
|
-
|
|
14
|
-
static void *crtdbg__malloc(size_t len, const char *file, int line)
|
|
15
|
-
{
|
|
16
|
-
void *ptr = _malloc_dbg(len, _NORMAL_BLOCK, git_win32__crtdbg_stacktrace(1,file), line);
|
|
17
|
-
if (!ptr) git_error_set_oom();
|
|
18
|
-
return ptr;
|
|
19
|
-
}
|
|
20
|
-
|
|
21
|
-
static void *crtdbg__calloc(size_t nelem, size_t elsize, const char *file, int line)
|
|
22
|
-
{
|
|
23
|
-
void *ptr = _calloc_dbg(nelem, elsize, _NORMAL_BLOCK, git_win32__crtdbg_stacktrace(1,file), line);
|
|
24
|
-
if (!ptr) git_error_set_oom();
|
|
25
|
-
return ptr;
|
|
26
|
-
}
|
|
27
|
-
|
|
28
|
-
static char *crtdbg__strdup(const char *str, const char *file, int line)
|
|
29
|
-
{
|
|
30
|
-
char *ptr = _strdup_dbg(str, _NORMAL_BLOCK, git_win32__crtdbg_stacktrace(1,file), line);
|
|
31
|
-
if (!ptr) git_error_set_oom();
|
|
32
|
-
return ptr;
|
|
33
|
-
}
|
|
34
|
-
|
|
35
|
-
static char *crtdbg__strndup(const char *str, size_t n, const char *file, int line)
|
|
36
|
-
{
|
|
37
|
-
size_t length = 0, alloclength;
|
|
38
|
-
char *ptr;
|
|
39
|
-
|
|
40
|
-
length = p_strnlen(str, n);
|
|
41
|
-
|
|
42
|
-
if (GIT_ADD_SIZET_OVERFLOW(&alloclength, length, 1) ||
|
|
43
|
-
!(ptr = crtdbg__malloc(alloclength, file, line)))
|
|
44
|
-
return NULL;
|
|
45
|
-
|
|
46
|
-
if (length)
|
|
47
|
-
memcpy(ptr, str, length);
|
|
48
|
-
|
|
49
|
-
ptr[length] = '\0';
|
|
50
|
-
|
|
51
|
-
return ptr;
|
|
52
|
-
}
|
|
53
|
-
|
|
54
|
-
static char *crtdbg__substrdup(const char *start, size_t n, const char *file, int line)
|
|
55
|
-
{
|
|
56
|
-
char *ptr;
|
|
57
|
-
size_t alloclen;
|
|
58
|
-
|
|
59
|
-
if (GIT_ADD_SIZET_OVERFLOW(&alloclen, n, 1) ||
|
|
60
|
-
!(ptr = crtdbg__malloc(alloclen, file, line)))
|
|
61
|
-
return NULL;
|
|
62
|
-
|
|
63
|
-
memcpy(ptr, start, n);
|
|
64
|
-
ptr[n] = '\0';
|
|
65
|
-
return ptr;
|
|
66
|
-
}
|
|
67
|
-
|
|
68
|
-
static void *crtdbg__realloc(void *ptr, size_t size, const char *file, int line)
|
|
69
|
-
{
|
|
70
|
-
void *new_ptr = _realloc_dbg(ptr, size, _NORMAL_BLOCK, git_win32__crtdbg_stacktrace(1,file), line);
|
|
71
|
-
if (!new_ptr) git_error_set_oom();
|
|
72
|
-
return new_ptr;
|
|
73
|
-
}
|
|
74
|
-
|
|
75
|
-
static void *crtdbg__reallocarray(void *ptr, size_t nelem, size_t elsize, const char *file, int line)
|
|
76
|
-
{
|
|
77
|
-
size_t newsize;
|
|
78
|
-
|
|
79
|
-
if (GIT_MULTIPLY_SIZET_OVERFLOW(&newsize, nelem, elsize))
|
|
80
|
-
return NULL;
|
|
81
|
-
|
|
82
|
-
return crtdbg__realloc(ptr, newsize, file, line);
|
|
83
|
-
}
|
|
84
|
-
|
|
85
|
-
static void *crtdbg__mallocarray(size_t nelem, size_t elsize, const char *file, int line)
|
|
86
|
-
{
|
|
87
|
-
return crtdbg__reallocarray(NULL, nelem, elsize, file, line);
|
|
88
|
-
}
|
|
89
|
-
|
|
90
|
-
static void crtdbg__free(void *ptr)
|
|
91
|
-
{
|
|
92
|
-
free(ptr);
|
|
93
|
-
}
|
|
94
|
-
|
|
95
|
-
int git_win32_crtdbg_init_allocator(git_allocator *allocator)
|
|
96
|
-
{
|
|
97
|
-
allocator->gmalloc = crtdbg__malloc;
|
|
98
|
-
allocator->gcalloc = crtdbg__calloc;
|
|
99
|
-
allocator->gstrdup = crtdbg__strdup;
|
|
100
|
-
allocator->gstrndup = crtdbg__strndup;
|
|
101
|
-
allocator->gsubstrdup = crtdbg__substrdup;
|
|
102
|
-
allocator->grealloc = crtdbg__realloc;
|
|
103
|
-
allocator->greallocarray = crtdbg__reallocarray;
|
|
104
|
-
allocator->gmallocarray = crtdbg__mallocarray;
|
|
105
|
-
allocator->gfree = crtdbg__free;
|
|
106
|
-
return 0;
|
|
107
|
-
}
|
|
108
|
-
|
|
109
|
-
#else
|
|
110
|
-
|
|
111
|
-
int git_win32_crtdbg_init_allocator(git_allocator *allocator)
|
|
112
|
-
{
|
|
113
|
-
GIT_UNUSED(allocator);
|
|
114
|
-
git_error_set(GIT_EINVALID, "crtdbg memory allocator not available");
|
|
115
|
-
return -1;
|
|
116
|
-
}
|
|
117
|
-
|
|
118
|
-
#endif
|
|
@@ -1,316 +0,0 @@
|
|
|
1
|
-
/*
|
|
2
|
-
* Copyright (C) the libgit2 contributors. All rights reserved.
|
|
3
|
-
*
|
|
4
|
-
* This file is part of libgit2, distributed under the GNU GPL v2 with
|
|
5
|
-
* a Linking Exception. For full terms see the included COPYING file.
|
|
6
|
-
*/
|
|
7
|
-
#include "buf_text.h"
|
|
8
|
-
|
|
9
|
-
int git_buf_text_puts_escaped(
|
|
10
|
-
git_buf *buf,
|
|
11
|
-
const char *string,
|
|
12
|
-
const char *esc_chars,
|
|
13
|
-
const char *esc_with)
|
|
14
|
-
{
|
|
15
|
-
const char *scan;
|
|
16
|
-
size_t total = 0, esc_len = strlen(esc_with), count, alloclen;
|
|
17
|
-
|
|
18
|
-
if (!string)
|
|
19
|
-
return 0;
|
|
20
|
-
|
|
21
|
-
for (scan = string; *scan; ) {
|
|
22
|
-
/* count run of non-escaped characters */
|
|
23
|
-
count = strcspn(scan, esc_chars);
|
|
24
|
-
total += count;
|
|
25
|
-
scan += count;
|
|
26
|
-
/* count run of escaped characters */
|
|
27
|
-
count = strspn(scan, esc_chars);
|
|
28
|
-
total += count * (esc_len + 1);
|
|
29
|
-
scan += count;
|
|
30
|
-
}
|
|
31
|
-
|
|
32
|
-
GIT_ERROR_CHECK_ALLOC_ADD(&alloclen, total, 1);
|
|
33
|
-
if (git_buf_grow_by(buf, alloclen) < 0)
|
|
34
|
-
return -1;
|
|
35
|
-
|
|
36
|
-
for (scan = string; *scan; ) {
|
|
37
|
-
count = strcspn(scan, esc_chars);
|
|
38
|
-
|
|
39
|
-
memmove(buf->ptr + buf->size, scan, count);
|
|
40
|
-
scan += count;
|
|
41
|
-
buf->size += count;
|
|
42
|
-
|
|
43
|
-
for (count = strspn(scan, esc_chars); count > 0; --count) {
|
|
44
|
-
/* copy escape sequence */
|
|
45
|
-
memmove(buf->ptr + buf->size, esc_with, esc_len);
|
|
46
|
-
buf->size += esc_len;
|
|
47
|
-
/* copy character to be escaped */
|
|
48
|
-
buf->ptr[buf->size] = *scan;
|
|
49
|
-
buf->size++;
|
|
50
|
-
scan++;
|
|
51
|
-
}
|
|
52
|
-
}
|
|
53
|
-
|
|
54
|
-
buf->ptr[buf->size] = '\0';
|
|
55
|
-
|
|
56
|
-
return 0;
|
|
57
|
-
}
|
|
58
|
-
|
|
59
|
-
void git_buf_text_unescape(git_buf *buf)
|
|
60
|
-
{
|
|
61
|
-
buf->size = git__unescape(buf->ptr);
|
|
62
|
-
}
|
|
63
|
-
|
|
64
|
-
int git_buf_text_crlf_to_lf(git_buf *tgt, const git_buf *src)
|
|
65
|
-
{
|
|
66
|
-
const char *scan = src->ptr;
|
|
67
|
-
const char *scan_end = src->ptr + src->size;
|
|
68
|
-
const char *next = memchr(scan, '\r', src->size);
|
|
69
|
-
size_t new_size;
|
|
70
|
-
char *out;
|
|
71
|
-
|
|
72
|
-
assert(tgt != src);
|
|
73
|
-
|
|
74
|
-
if (!next)
|
|
75
|
-
return git_buf_set(tgt, src->ptr, src->size);
|
|
76
|
-
|
|
77
|
-
/* reduce reallocs while in the loop */
|
|
78
|
-
GIT_ERROR_CHECK_ALLOC_ADD(&new_size, src->size, 1);
|
|
79
|
-
if (git_buf_grow(tgt, new_size) < 0)
|
|
80
|
-
return -1;
|
|
81
|
-
|
|
82
|
-
out = tgt->ptr;
|
|
83
|
-
tgt->size = 0;
|
|
84
|
-
|
|
85
|
-
/* Find the next \r and copy whole chunk up to there to tgt */
|
|
86
|
-
for (; next; scan = next + 1, next = memchr(scan, '\r', scan_end - scan)) {
|
|
87
|
-
if (next > scan) {
|
|
88
|
-
size_t copylen = (size_t)(next - scan);
|
|
89
|
-
memcpy(out, scan, copylen);
|
|
90
|
-
out += copylen;
|
|
91
|
-
}
|
|
92
|
-
|
|
93
|
-
/* Do not drop \r unless it is followed by \n */
|
|
94
|
-
if (next + 1 == scan_end || next[1] != '\n')
|
|
95
|
-
*out++ = '\r';
|
|
96
|
-
}
|
|
97
|
-
|
|
98
|
-
/* Copy remaining input into dest */
|
|
99
|
-
if (scan < scan_end) {
|
|
100
|
-
size_t remaining = (size_t)(scan_end - scan);
|
|
101
|
-
memcpy(out, scan, remaining);
|
|
102
|
-
out += remaining;
|
|
103
|
-
}
|
|
104
|
-
|
|
105
|
-
tgt->size = (size_t)(out - tgt->ptr);
|
|
106
|
-
tgt->ptr[tgt->size] = '\0';
|
|
107
|
-
|
|
108
|
-
return 0;
|
|
109
|
-
}
|
|
110
|
-
|
|
111
|
-
int git_buf_text_lf_to_crlf(git_buf *tgt, const git_buf *src)
|
|
112
|
-
{
|
|
113
|
-
const char *start = src->ptr;
|
|
114
|
-
const char *end = start + src->size;
|
|
115
|
-
const char *scan = start;
|
|
116
|
-
const char *next = memchr(scan, '\n', src->size);
|
|
117
|
-
size_t alloclen;
|
|
118
|
-
|
|
119
|
-
assert(tgt != src);
|
|
120
|
-
|
|
121
|
-
if (!next)
|
|
122
|
-
return git_buf_set(tgt, src->ptr, src->size);
|
|
123
|
-
|
|
124
|
-
/* attempt to reduce reallocs while in the loop */
|
|
125
|
-
GIT_ERROR_CHECK_ALLOC_ADD(&alloclen, src->size, src->size >> 4);
|
|
126
|
-
GIT_ERROR_CHECK_ALLOC_ADD(&alloclen, alloclen, 1);
|
|
127
|
-
if (git_buf_grow(tgt, alloclen) < 0)
|
|
128
|
-
return -1;
|
|
129
|
-
tgt->size = 0;
|
|
130
|
-
|
|
131
|
-
for (; next; scan = next + 1, next = memchr(scan, '\n', end - scan)) {
|
|
132
|
-
size_t copylen = next - scan;
|
|
133
|
-
|
|
134
|
-
/* if we find mixed line endings, carry on */
|
|
135
|
-
if (copylen && next[-1] == '\r')
|
|
136
|
-
copylen--;
|
|
137
|
-
|
|
138
|
-
GIT_ERROR_CHECK_ALLOC_ADD(&alloclen, copylen, 3);
|
|
139
|
-
if (git_buf_grow_by(tgt, alloclen) < 0)
|
|
140
|
-
return -1;
|
|
141
|
-
|
|
142
|
-
if (copylen) {
|
|
143
|
-
memcpy(tgt->ptr + tgt->size, scan, copylen);
|
|
144
|
-
tgt->size += copylen;
|
|
145
|
-
}
|
|
146
|
-
|
|
147
|
-
tgt->ptr[tgt->size++] = '\r';
|
|
148
|
-
tgt->ptr[tgt->size++] = '\n';
|
|
149
|
-
}
|
|
150
|
-
|
|
151
|
-
tgt->ptr[tgt->size] = '\0';
|
|
152
|
-
return git_buf_put(tgt, scan, end - scan);
|
|
153
|
-
}
|
|
154
|
-
|
|
155
|
-
int git_buf_text_common_prefix(git_buf *buf, const git_strarray *strings)
|
|
156
|
-
{
|
|
157
|
-
size_t i;
|
|
158
|
-
const char *str, *pfx;
|
|
159
|
-
|
|
160
|
-
git_buf_clear(buf);
|
|
161
|
-
|
|
162
|
-
if (!strings || !strings->count)
|
|
163
|
-
return 0;
|
|
164
|
-
|
|
165
|
-
/* initialize common prefix to first string */
|
|
166
|
-
if (git_buf_sets(buf, strings->strings[0]) < 0)
|
|
167
|
-
return -1;
|
|
168
|
-
|
|
169
|
-
/* go through the rest of the strings, truncating to shared prefix */
|
|
170
|
-
for (i = 1; i < strings->count; ++i) {
|
|
171
|
-
|
|
172
|
-
for (str = strings->strings[i], pfx = buf->ptr;
|
|
173
|
-
*str && *str == *pfx; str++, pfx++)
|
|
174
|
-
/* scanning */;
|
|
175
|
-
|
|
176
|
-
git_buf_truncate(buf, pfx - buf->ptr);
|
|
177
|
-
|
|
178
|
-
if (!buf->size)
|
|
179
|
-
break;
|
|
180
|
-
}
|
|
181
|
-
|
|
182
|
-
return 0;
|
|
183
|
-
}
|
|
184
|
-
|
|
185
|
-
bool git_buf_text_is_binary(const git_buf *buf)
|
|
186
|
-
{
|
|
187
|
-
const char *scan = buf->ptr, *end = buf->ptr + buf->size;
|
|
188
|
-
git_bom_t bom;
|
|
189
|
-
int printable = 0, nonprintable = 0;
|
|
190
|
-
|
|
191
|
-
scan += git_buf_text_detect_bom(&bom, buf);
|
|
192
|
-
|
|
193
|
-
if (bom > GIT_BOM_UTF8)
|
|
194
|
-
return 1;
|
|
195
|
-
|
|
196
|
-
while (scan < end) {
|
|
197
|
-
unsigned char c = *scan++;
|
|
198
|
-
|
|
199
|
-
/* Printable characters are those above SPACE (0x1F) excluding DEL,
|
|
200
|
-
* and including BS, ESC and FF.
|
|
201
|
-
*/
|
|
202
|
-
if ((c > 0x1F && c != 127) || c == '\b' || c == '\033' || c == '\014')
|
|
203
|
-
printable++;
|
|
204
|
-
else if (c == '\0')
|
|
205
|
-
return true;
|
|
206
|
-
else if (!git__isspace(c))
|
|
207
|
-
nonprintable++;
|
|
208
|
-
}
|
|
209
|
-
|
|
210
|
-
return ((printable >> 7) < nonprintable);
|
|
211
|
-
}
|
|
212
|
-
|
|
213
|
-
bool git_buf_text_contains_nul(const git_buf *buf)
|
|
214
|
-
{
|
|
215
|
-
return (memchr(buf->ptr, '\0', buf->size) != NULL);
|
|
216
|
-
}
|
|
217
|
-
|
|
218
|
-
int git_buf_text_detect_bom(git_bom_t *bom, const git_buf *buf)
|
|
219
|
-
{
|
|
220
|
-
const char *ptr;
|
|
221
|
-
size_t len;
|
|
222
|
-
|
|
223
|
-
*bom = GIT_BOM_NONE;
|
|
224
|
-
/* need at least 2 bytes to look for any BOM */
|
|
225
|
-
if (buf->size < 2)
|
|
226
|
-
return 0;
|
|
227
|
-
|
|
228
|
-
ptr = buf->ptr;
|
|
229
|
-
len = buf->size;
|
|
230
|
-
|
|
231
|
-
switch (*ptr++) {
|
|
232
|
-
case 0:
|
|
233
|
-
if (len >= 4 && ptr[0] == 0 && ptr[1] == '\xFE' && ptr[2] == '\xFF') {
|
|
234
|
-
*bom = GIT_BOM_UTF32_BE;
|
|
235
|
-
return 4;
|
|
236
|
-
}
|
|
237
|
-
break;
|
|
238
|
-
case '\xEF':
|
|
239
|
-
if (len >= 3 && ptr[0] == '\xBB' && ptr[1] == '\xBF') {
|
|
240
|
-
*bom = GIT_BOM_UTF8;
|
|
241
|
-
return 3;
|
|
242
|
-
}
|
|
243
|
-
break;
|
|
244
|
-
case '\xFE':
|
|
245
|
-
if (*ptr == '\xFF') {
|
|
246
|
-
*bom = GIT_BOM_UTF16_BE;
|
|
247
|
-
return 2;
|
|
248
|
-
}
|
|
249
|
-
break;
|
|
250
|
-
case '\xFF':
|
|
251
|
-
if (*ptr != '\xFE')
|
|
252
|
-
break;
|
|
253
|
-
if (len >= 4 && ptr[1] == 0 && ptr[2] == 0) {
|
|
254
|
-
*bom = GIT_BOM_UTF32_LE;
|
|
255
|
-
return 4;
|
|
256
|
-
} else {
|
|
257
|
-
*bom = GIT_BOM_UTF16_LE;
|
|
258
|
-
return 2;
|
|
259
|
-
}
|
|
260
|
-
break;
|
|
261
|
-
default:
|
|
262
|
-
break;
|
|
263
|
-
}
|
|
264
|
-
|
|
265
|
-
return 0;
|
|
266
|
-
}
|
|
267
|
-
|
|
268
|
-
bool git_buf_text_gather_stats(
|
|
269
|
-
git_buf_text_stats *stats, const git_buf *buf, bool skip_bom)
|
|
270
|
-
{
|
|
271
|
-
const char *scan = buf->ptr, *end = buf->ptr + buf->size;
|
|
272
|
-
int skip;
|
|
273
|
-
|
|
274
|
-
memset(stats, 0, sizeof(*stats));
|
|
275
|
-
|
|
276
|
-
/* BOM detection */
|
|
277
|
-
skip = git_buf_text_detect_bom(&stats->bom, buf);
|
|
278
|
-
if (skip_bom)
|
|
279
|
-
scan += skip;
|
|
280
|
-
|
|
281
|
-
/* Ignore EOF character */
|
|
282
|
-
if (buf->size > 0 && end[-1] == '\032')
|
|
283
|
-
end--;
|
|
284
|
-
|
|
285
|
-
/* Counting loop */
|
|
286
|
-
while (scan < end) {
|
|
287
|
-
unsigned char c = *scan++;
|
|
288
|
-
|
|
289
|
-
if (c > 0x1F && c != 0x7F)
|
|
290
|
-
stats->printable++;
|
|
291
|
-
else switch (c) {
|
|
292
|
-
case '\0':
|
|
293
|
-
stats->nul++;
|
|
294
|
-
stats->nonprintable++;
|
|
295
|
-
break;
|
|
296
|
-
case '\n':
|
|
297
|
-
stats->lf++;
|
|
298
|
-
break;
|
|
299
|
-
case '\r':
|
|
300
|
-
stats->cr++;
|
|
301
|
-
if (scan < end && *scan == '\n')
|
|
302
|
-
stats->crlf++;
|
|
303
|
-
break;
|
|
304
|
-
case '\t': case '\f': case '\v': case '\b': case 0x1b: /*ESC*/
|
|
305
|
-
stats->printable++;
|
|
306
|
-
break;
|
|
307
|
-
default:
|
|
308
|
-
stats->nonprintable++;
|
|
309
|
-
break;
|
|
310
|
-
}
|
|
311
|
-
}
|
|
312
|
-
|
|
313
|
-
/* Treat files with a bare CR as binary */
|
|
314
|
-
return (stats->cr != stats->crlf || stats->nul > 0 ||
|
|
315
|
-
((stats->printable >> 7) < stats->nonprintable));
|
|
316
|
-
}
|
|
@@ -1,122 +0,0 @@
|
|
|
1
|
-
/*
|
|
2
|
-
* Copyright (C) the libgit2 contributors. All rights reserved.
|
|
3
|
-
*
|
|
4
|
-
* This file is part of libgit2, distributed under the GNU GPL v2 with
|
|
5
|
-
* a Linking Exception. For full terms see the included COPYING file.
|
|
6
|
-
*/
|
|
7
|
-
#ifndef INCLUDE_buf_text_h__
|
|
8
|
-
#define INCLUDE_buf_text_h__
|
|
9
|
-
|
|
10
|
-
#include "common.h"
|
|
11
|
-
|
|
12
|
-
#include "buffer.h"
|
|
13
|
-
|
|
14
|
-
typedef enum {
|
|
15
|
-
GIT_BOM_NONE = 0,
|
|
16
|
-
GIT_BOM_UTF8 = 1,
|
|
17
|
-
GIT_BOM_UTF16_LE = 2,
|
|
18
|
-
GIT_BOM_UTF16_BE = 3,
|
|
19
|
-
GIT_BOM_UTF32_LE = 4,
|
|
20
|
-
GIT_BOM_UTF32_BE = 5
|
|
21
|
-
} git_bom_t;
|
|
22
|
-
|
|
23
|
-
typedef struct {
|
|
24
|
-
git_bom_t bom; /* BOM found at head of text */
|
|
25
|
-
unsigned int nul, cr, lf, crlf; /* NUL, CR, LF and CRLF counts */
|
|
26
|
-
unsigned int printable, nonprintable; /* These are just approximations! */
|
|
27
|
-
} git_buf_text_stats;
|
|
28
|
-
|
|
29
|
-
/**
|
|
30
|
-
* Append string to buffer, prefixing each character from `esc_chars` with
|
|
31
|
-
* `esc_with` string.
|
|
32
|
-
*
|
|
33
|
-
* @param buf Buffer to append data to
|
|
34
|
-
* @param string String to escape and append
|
|
35
|
-
* @param esc_chars Characters to be escaped
|
|
36
|
-
* @param esc_with String to insert in from of each found character
|
|
37
|
-
* @return 0 on success, <0 on failure (probably allocation problem)
|
|
38
|
-
*/
|
|
39
|
-
extern int git_buf_text_puts_escaped(
|
|
40
|
-
git_buf *buf,
|
|
41
|
-
const char *string,
|
|
42
|
-
const char *esc_chars,
|
|
43
|
-
const char *esc_with);
|
|
44
|
-
|
|
45
|
-
/**
|
|
46
|
-
* Append string escaping characters that are regex special
|
|
47
|
-
*/
|
|
48
|
-
GIT_INLINE(int) git_buf_text_puts_escape_regex(git_buf *buf, const char *string)
|
|
49
|
-
{
|
|
50
|
-
return git_buf_text_puts_escaped(buf, string, "^.[]$()|*+?{}\\", "\\");
|
|
51
|
-
}
|
|
52
|
-
|
|
53
|
-
/**
|
|
54
|
-
* Unescape all characters in a buffer in place
|
|
55
|
-
*
|
|
56
|
-
* I.e. remove backslashes
|
|
57
|
-
*/
|
|
58
|
-
extern void git_buf_text_unescape(git_buf *buf);
|
|
59
|
-
|
|
60
|
-
/**
|
|
61
|
-
* Replace all \r\n with \n.
|
|
62
|
-
*
|
|
63
|
-
* @return 0 on success, -1 on memory error
|
|
64
|
-
*/
|
|
65
|
-
extern int git_buf_text_crlf_to_lf(git_buf *tgt, const git_buf *src);
|
|
66
|
-
|
|
67
|
-
/**
|
|
68
|
-
* Replace all \n with \r\n. Does not modify existing \r\n.
|
|
69
|
-
*
|
|
70
|
-
* @return 0 on success, -1 on memory error
|
|
71
|
-
*/
|
|
72
|
-
extern int git_buf_text_lf_to_crlf(git_buf *tgt, const git_buf *src);
|
|
73
|
-
|
|
74
|
-
/**
|
|
75
|
-
* Fill buffer with the common prefix of a array of strings
|
|
76
|
-
*
|
|
77
|
-
* Buffer will be set to empty if there is no common prefix
|
|
78
|
-
*/
|
|
79
|
-
extern int git_buf_text_common_prefix(git_buf *buf, const git_strarray *strs);
|
|
80
|
-
|
|
81
|
-
/**
|
|
82
|
-
* Check quickly if buffer looks like it contains binary data
|
|
83
|
-
*
|
|
84
|
-
* @param buf Buffer to check
|
|
85
|
-
* @return true if buffer looks like non-text data
|
|
86
|
-
*/
|
|
87
|
-
extern bool git_buf_text_is_binary(const git_buf *buf);
|
|
88
|
-
|
|
89
|
-
/**
|
|
90
|
-
* Check quickly if buffer contains a NUL byte
|
|
91
|
-
*
|
|
92
|
-
* @param buf Buffer to check
|
|
93
|
-
* @return true if buffer contains a NUL byte
|
|
94
|
-
*/
|
|
95
|
-
extern bool git_buf_text_contains_nul(const git_buf *buf);
|
|
96
|
-
|
|
97
|
-
/**
|
|
98
|
-
* Check if a buffer begins with a UTF BOM
|
|
99
|
-
*
|
|
100
|
-
* @param bom Set to the type of BOM detected or GIT_BOM_NONE
|
|
101
|
-
* @param buf Buffer in which to check the first bytes for a BOM
|
|
102
|
-
* @return Number of bytes of BOM data (or 0 if no BOM found)
|
|
103
|
-
*/
|
|
104
|
-
extern int git_buf_text_detect_bom(git_bom_t *bom, const git_buf *buf);
|
|
105
|
-
|
|
106
|
-
/**
|
|
107
|
-
* Gather stats for a piece of text
|
|
108
|
-
*
|
|
109
|
-
* Fill the `stats` structure with counts of unreadable characters, carriage
|
|
110
|
-
* returns, etc, so it can be used in heuristics. This automatically skips
|
|
111
|
-
* a trailing EOF (\032 character). Also it will look for a BOM at the
|
|
112
|
-
* start of the text and can be told to skip that as well.
|
|
113
|
-
*
|
|
114
|
-
* @param stats Structure to be filled in
|
|
115
|
-
* @param buf Text to process
|
|
116
|
-
* @param skip_bom Exclude leading BOM from stats if true
|
|
117
|
-
* @return Does the buffer heuristically look like binary data
|
|
118
|
-
*/
|
|
119
|
-
extern bool git_buf_text_gather_stats(
|
|
120
|
-
git_buf_text_stats *stats, const git_buf *buf, bool skip_bom);
|
|
121
|
-
|
|
122
|
-
#endif
|