rugged 1.3.1 → 1.4.2
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/ext/rugged/extconf.rb +1 -1
- data/ext/rugged/rugged_config.c +7 -2
- data/ext/rugged/rugged_remote.c +17 -0
- data/lib/rugged/version.rb +1 -1
- data/vendor/libgit2/CMakeLists.txt +103 -276
- data/vendor/libgit2/COPYING +36 -19
- data/vendor/libgit2/cmake/AddCFlagIfSupported.cmake +21 -21
- data/vendor/libgit2/cmake/DefaultCFlags.cmake +154 -0
- data/vendor/libgit2/cmake/EnableWarnings.cmake +13 -13
- data/vendor/libgit2/cmake/FindCoreFoundation.cmake +13 -13
- data/vendor/libgit2/cmake/FindGSSAPI.cmake +171 -287
- data/vendor/libgit2/cmake/FindGSSFramework.cmake +13 -13
- data/vendor/libgit2/cmake/{FindHTTP_Parser.cmake → FindHTTPParser.cmake} +17 -17
- data/vendor/libgit2/cmake/FindIconv.cmake +27 -27
- data/vendor/libgit2/cmake/FindLibSSH2.cmake +5 -5
- data/vendor/libgit2/cmake/FindPCRE.cmake +13 -13
- data/vendor/libgit2/cmake/FindPCRE2.cmake +12 -12
- data/vendor/libgit2/cmake/FindPkgLibraries.cmake +19 -19
- data/vendor/libgit2/cmake/FindSecurity.cmake +14 -14
- data/vendor/libgit2/cmake/FindStatNsec.cmake +12 -18
- data/vendor/libgit2/cmake/Findfutimens.cmake +8 -8
- data/vendor/libgit2/cmake/FindmbedTLS.cmake +63 -70
- data/vendor/libgit2/cmake/IdeSplitSources.cmake +18 -18
- data/vendor/libgit2/cmake/PkgBuildConfig.cmake +60 -60
- data/vendor/libgit2/cmake/SanitizeBool.cmake +20 -20
- data/vendor/libgit2/cmake/SelectGSSAPI.cmake +37 -37
- data/vendor/libgit2/cmake/SelectHTTPParser.cmake +19 -0
- data/vendor/libgit2/cmake/SelectHTTPSBackend.cmake +100 -100
- data/vendor/libgit2/cmake/SelectHashes.cmake +39 -49
- data/vendor/libgit2/cmake/SelectRegex.cmake +51 -0
- data/vendor/libgit2/cmake/SelectSSH.cmake +41 -0
- data/vendor/libgit2/cmake/SelectWinHTTP.cmake +17 -0
- data/vendor/libgit2/cmake/SelectZlib.cmake +34 -0
- data/vendor/libgit2/deps/chromium-zlib/CMakeLists.txt +6 -6
- data/vendor/libgit2/deps/ntlmclient/CMakeLists.txt +31 -31
- data/vendor/libgit2/deps/ntlmclient/crypt_openssl.c +1 -1
- data/vendor/libgit2/deps/ntlmclient/ntlm.c +4 -4
- data/vendor/libgit2/deps/ntlmclient/ntlm.h +4 -4
- data/vendor/libgit2/deps/ntlmclient/ntlmclient.h +2 -2
- data/vendor/libgit2/deps/pcre/CMakeLists.txt +88 -88
- data/vendor/libgit2/deps/winhttp/CMakeLists.txt +14 -16
- data/vendor/libgit2/include/git2/apply.h +16 -2
- data/vendor/libgit2/include/git2/attr.h +11 -2
- data/vendor/libgit2/include/git2/blame.h +4 -1
- data/vendor/libgit2/include/git2/blob.h +14 -1
- data/vendor/libgit2/include/git2/branch.h +2 -0
- data/vendor/libgit2/include/git2/buffer.h +18 -78
- data/vendor/libgit2/include/git2/cert.h +2 -2
- data/vendor/libgit2/include/git2/checkout.h +5 -2
- data/vendor/libgit2/include/git2/clone.h +3 -3
- data/vendor/libgit2/include/git2/commit.h +2 -0
- data/vendor/libgit2/include/git2/common.h +4 -1
- data/vendor/libgit2/include/git2/config.h +19 -3
- data/vendor/libgit2/include/git2/credential.h +2 -1
- data/vendor/libgit2/include/git2/credential_helpers.h +1 -0
- data/vendor/libgit2/include/git2/deprecated.h +1 -1
- data/vendor/libgit2/include/git2/describe.h +7 -2
- data/vendor/libgit2/include/git2/diff.h +17 -9
- data/vendor/libgit2/include/git2/email.h +1 -1
- data/vendor/libgit2/include/git2/errors.h +1 -1
- data/vendor/libgit2/include/git2/filter.h +7 -2
- data/vendor/libgit2/include/git2/graph.h +1 -0
- data/vendor/libgit2/include/git2/ignore.h +1 -1
- data/vendor/libgit2/include/git2/index.h +11 -5
- data/vendor/libgit2/include/git2/indexer.h +19 -0
- data/vendor/libgit2/include/git2/merge.h +23 -3
- data/vendor/libgit2/include/git2/message.h +2 -0
- data/vendor/libgit2/include/git2/object.h +23 -0
- data/vendor/libgit2/include/git2/odb.h +37 -7
- data/vendor/libgit2/include/git2/odb_backend.h +1 -1
- data/vendor/libgit2/include/git2/pack.h +24 -8
- data/vendor/libgit2/include/git2/patch.h +8 -0
- data/vendor/libgit2/include/git2/pathspec.h +1 -1
- data/vendor/libgit2/include/git2/proxy.h +1 -1
- data/vendor/libgit2/include/git2/rebase.h +9 -1
- data/vendor/libgit2/include/git2/refdb.h +3 -0
- data/vendor/libgit2/include/git2/reflog.h +1 -1
- data/vendor/libgit2/include/git2/refs.h +2 -2
- data/vendor/libgit2/include/git2/remote.h +184 -37
- data/vendor/libgit2/include/git2/repository.h +14 -9
- data/vendor/libgit2/include/git2/reset.h +2 -2
- data/vendor/libgit2/include/git2/revparse.h +1 -1
- data/vendor/libgit2/include/git2/revwalk.h +4 -1
- data/vendor/libgit2/include/git2/signature.h +1 -1
- data/vendor/libgit2/include/git2/stash.h +3 -3
- data/vendor/libgit2/include/git2/status.h +9 -3
- data/vendor/libgit2/include/git2/submodule.h +7 -2
- data/vendor/libgit2/include/git2/sys/commit_graph.h +1 -1
- data/vendor/libgit2/include/git2/sys/odb_backend.h +2 -5
- data/vendor/libgit2/include/git2/sys/remote.h +31 -0
- data/vendor/libgit2/include/git2/sys/stream.h +1 -1
- data/vendor/libgit2/include/git2/sys/transport.h +25 -34
- data/vendor/libgit2/include/git2/tag.h +1 -0
- data/vendor/libgit2/include/git2/tree.h +4 -3
- data/vendor/libgit2/include/git2/types.h +7 -7
- data/vendor/libgit2/include/git2/version.h +4 -4
- data/vendor/libgit2/include/git2/worktree.h +12 -2
- data/vendor/libgit2/src/CMakeLists.txt +189 -315
- data/vendor/libgit2/src/annotated_commit.h +1 -1
- data/vendor/libgit2/src/apply.c +18 -18
- data/vendor/libgit2/src/apply.h +2 -2
- data/vendor/libgit2/src/attr.c +18 -18
- data/vendor/libgit2/src/attr_file.c +17 -17
- data/vendor/libgit2/src/attr_file.h +4 -4
- data/vendor/libgit2/src/attrcache.c +17 -12
- data/vendor/libgit2/src/blame_git.c +1 -1
- data/vendor/libgit2/src/blob.c +33 -26
- data/vendor/libgit2/src/blob.h +1 -1
- data/vendor/libgit2/src/branch.c +150 -109
- data/vendor/libgit2/src/branch.h +15 -3
- data/vendor/libgit2/src/buf.c +126 -0
- data/vendor/libgit2/src/buf.h +50 -0
- data/vendor/libgit2/src/cc-compat.h +1 -1
- data/vendor/libgit2/src/checkout.c +74 -68
- data/vendor/libgit2/src/cherrypick.c +10 -10
- data/vendor/libgit2/src/clone.c +66 -66
- data/vendor/libgit2/src/commit.c +128 -58
- data/vendor/libgit2/src/commit.h +24 -1
- data/vendor/libgit2/src/commit_graph.c +68 -53
- data/vendor/libgit2/src/commit_graph.h +10 -3
- data/vendor/libgit2/src/commit_list.c +2 -3
- data/vendor/libgit2/src/common.h +10 -3
- data/vendor/libgit2/src/config.c +97 -68
- data/vendor/libgit2/src/config.h +15 -2
- data/vendor/libgit2/src/config_file.c +103 -91
- data/vendor/libgit2/src/config_mem.c +9 -9
- data/vendor/libgit2/src/config_parse.c +27 -23
- data/vendor/libgit2/src/crlf.c +24 -21
- data/vendor/libgit2/src/date.c +10 -17
- data/vendor/libgit2/src/date.h +33 -0
- data/vendor/libgit2/src/describe.c +27 -19
- data/vendor/libgit2/src/diff.c +25 -8
- data/vendor/libgit2/src/diff.h +2 -4
- data/vendor/libgit2/src/diff_driver.c +34 -36
- data/vendor/libgit2/src/diff_driver.h +3 -3
- data/vendor/libgit2/src/diff_file.c +29 -20
- data/vendor/libgit2/src/diff_generate.c +30 -6
- data/vendor/libgit2/src/diff_generate.h +5 -3
- data/vendor/libgit2/src/diff_print.c +102 -95
- data/vendor/libgit2/src/diff_stats.c +40 -29
- data/vendor/libgit2/src/{message.h → diff_stats.h} +7 -6
- data/vendor/libgit2/src/diff_tform.c +9 -8
- data/vendor/libgit2/src/diff_xdiff.c +3 -8
- data/vendor/libgit2/src/email.c +54 -38
- data/vendor/libgit2/src/email.h +1 -1
- data/vendor/libgit2/src/errors.c +18 -18
- data/vendor/libgit2/src/features.h.in +6 -1
- data/vendor/libgit2/src/fetch.c +69 -24
- data/vendor/libgit2/src/fetch.h +1 -1
- data/vendor/libgit2/src/fetchhead.c +19 -19
- data/vendor/libgit2/src/filebuf.c +28 -28
- data/vendor/libgit2/src/filebuf.h +1 -1
- data/vendor/libgit2/src/filter.c +96 -52
- data/vendor/libgit2/src/filter.h +26 -5
- data/vendor/libgit2/src/fs_path.c +1912 -0
- data/vendor/libgit2/src/fs_path.h +752 -0
- data/vendor/libgit2/src/futils.c +91 -85
- data/vendor/libgit2/src/futils.h +26 -14
- data/vendor/libgit2/src/hash/sha1/collisiondetect.c +2 -2
- data/vendor/libgit2/src/hash/sha1/common_crypto.c +2 -2
- data/vendor/libgit2/src/hash/sha1/generic.c +2 -2
- data/vendor/libgit2/src/hash/sha1/mbedtls.c +2 -2
- data/vendor/libgit2/src/hash/sha1/openssl.c +2 -2
- data/vendor/libgit2/src/hash/sha1/sha1dc/sha1.c +1 -1
- data/vendor/libgit2/src/hash/sha1/win32.c +6 -6
- data/vendor/libgit2/src/hash/sha1.h +3 -1
- data/vendor/libgit2/src/hash.c +67 -35
- data/vendor/libgit2/src/hash.h +12 -12
- data/vendor/libgit2/src/ident.c +18 -18
- data/vendor/libgit2/src/ignore.c +35 -34
- data/vendor/libgit2/src/ignore.h +2 -2
- data/vendor/libgit2/src/index.c +79 -80
- data/vendor/libgit2/src/index.h +6 -3
- data/vendor/libgit2/src/indexer.c +75 -57
- data/vendor/libgit2/src/iterator.c +64 -56
- data/vendor/libgit2/src/iterator.h +5 -5
- data/vendor/libgit2/src/khash.h +1 -1
- data/vendor/libgit2/src/libgit2.c +22 -11
- data/vendor/libgit2/src/mailmap.c +38 -36
- data/vendor/libgit2/src/merge.c +27 -27
- data/vendor/libgit2/src/merge.h +1 -14
- data/vendor/libgit2/src/merge_driver.c +2 -2
- data/vendor/libgit2/src/merge_file.c +13 -3
- data/vendor/libgit2/src/message.c +21 -10
- data/vendor/libgit2/src/midx.c +83 -66
- data/vendor/libgit2/src/midx.h +3 -3
- data/vendor/libgit2/src/mwindow.c +1 -1
- data/vendor/libgit2/src/net.c +278 -68
- data/vendor/libgit2/src/net.h +10 -3
- data/vendor/libgit2/src/netops.c +1 -1
- data/vendor/libgit2/src/netops.h +1 -1
- data/vendor/libgit2/src/notes.c +20 -29
- data/vendor/libgit2/src/object.c +49 -9
- data/vendor/libgit2/src/object.h +1 -1
- data/vendor/libgit2/src/odb.c +35 -32
- data/vendor/libgit2/src/odb.h +1 -1
- data/vendor/libgit2/src/odb_loose.c +68 -68
- data/vendor/libgit2/src/odb_mempack.c +18 -5
- data/vendor/libgit2/src/odb_pack.c +43 -43
- data/vendor/libgit2/src/oid.c +11 -4
- data/vendor/libgit2/src/oid.h +15 -0
- data/vendor/libgit2/src/pack-objects.c +41 -26
- data/vendor/libgit2/src/pack-objects.h +11 -6
- data/vendor/libgit2/src/pack.c +10 -10
- data/vendor/libgit2/src/patch.c +3 -3
- data/vendor/libgit2/src/patch.h +1 -0
- data/vendor/libgit2/src/patch_generate.c +27 -11
- data/vendor/libgit2/src/patch_generate.h +5 -5
- data/vendor/libgit2/src/patch_parse.c +24 -24
- data/vendor/libgit2/src/path.c +76 -1803
- data/vendor/libgit2/src/path.h +34 -703
- data/vendor/libgit2/src/pathspec.c +6 -6
- data/vendor/libgit2/src/pathspec.h +2 -2
- data/vendor/libgit2/src/posix.c +3 -3
- data/vendor/libgit2/src/posix.h +1 -0
- data/vendor/libgit2/src/pqueue.h +1 -1
- data/vendor/libgit2/src/proxy.c +4 -1
- data/vendor/libgit2/src/proxy.h +1 -1
- data/vendor/libgit2/src/push.c +30 -35
- data/vendor/libgit2/src/push.h +4 -16
- data/vendor/libgit2/src/rand.c +226 -0
- data/vendor/libgit2/src/rand.h +37 -0
- data/vendor/libgit2/src/reader.c +8 -8
- data/vendor/libgit2/src/reader.h +2 -2
- data/vendor/libgit2/src/rebase.c +89 -88
- data/vendor/libgit2/src/refdb_fs.c +447 -173
- data/vendor/libgit2/src/refs.c +32 -32
- data/vendor/libgit2/src/refs.h +2 -2
- data/vendor/libgit2/src/refspec.c +32 -37
- data/vendor/libgit2/src/refspec.h +5 -2
- data/vendor/libgit2/src/regexp.c +1 -1
- data/vendor/libgit2/src/remote.c +713 -419
- data/vendor/libgit2/src/remote.h +15 -10
- data/vendor/libgit2/src/repository.c +338 -323
- data/vendor/libgit2/src/repository.h +11 -9
- data/vendor/libgit2/src/reset.c +8 -5
- data/vendor/libgit2/src/revert.c +10 -10
- data/vendor/libgit2/src/revparse.c +48 -35
- data/vendor/libgit2/src/revwalk.c +7 -7
- data/vendor/libgit2/src/signature.c +12 -6
- data/vendor/libgit2/src/signature.h +1 -1
- data/vendor/libgit2/src/sortedcache.c +1 -1
- data/vendor/libgit2/src/sortedcache.h +1 -1
- data/vendor/libgit2/src/stash.c +36 -37
- data/vendor/libgit2/src/status.c +4 -1
- data/vendor/libgit2/src/{buffer.c → str.c} +157 -151
- data/vendor/libgit2/src/str.h +357 -0
- data/vendor/libgit2/src/streams/mbedtls.c +8 -6
- data/vendor/libgit2/src/streams/openssl_dynamic.h +3 -3
- data/vendor/libgit2/src/submodule.c +171 -159
- data/vendor/libgit2/src/submodule.h +1 -1
- data/vendor/libgit2/src/sysdir.c +68 -52
- data/vendor/libgit2/src/sysdir.h +15 -10
- data/vendor/libgit2/src/tag.c +29 -27
- data/vendor/libgit2/src/thread.h +3 -3
- data/vendor/libgit2/src/threadstate.c +3 -3
- data/vendor/libgit2/src/threadstate.h +1 -1
- data/vendor/libgit2/src/trace.c +1 -14
- data/vendor/libgit2/src/trace.h +5 -22
- data/vendor/libgit2/src/trailer.c +1 -1
- data/vendor/libgit2/src/transaction.c +1 -1
- data/vendor/libgit2/src/transport.c +10 -10
- data/vendor/libgit2/src/transports/auth.c +7 -9
- data/vendor/libgit2/src/transports/auth.h +2 -3
- data/vendor/libgit2/src/transports/auth_negotiate.c +12 -13
- data/vendor/libgit2/src/transports/auth_ntlm.c +10 -10
- data/vendor/libgit2/src/transports/auth_ntlm.h +0 -1
- data/vendor/libgit2/src/transports/git.c +9 -11
- data/vendor/libgit2/src/transports/http.c +37 -17
- data/vendor/libgit2/src/transports/http.h +2 -3
- data/vendor/libgit2/src/transports/httpclient.c +65 -65
- data/vendor/libgit2/src/transports/local.c +124 -116
- data/vendor/libgit2/src/transports/smart.c +51 -139
- data/vendor/libgit2/src/transports/smart.h +25 -31
- data/vendor/libgit2/src/transports/smart_pkt.c +33 -33
- data/vendor/libgit2/src/transports/smart_protocol.c +57 -39
- data/vendor/libgit2/src/transports/ssh.c +47 -112
- data/vendor/libgit2/src/transports/winhttp.c +50 -56
- data/vendor/libgit2/src/tree-cache.c +5 -5
- data/vendor/libgit2/src/tree-cache.h +2 -2
- data/vendor/libgit2/src/tree.c +59 -48
- data/vendor/libgit2/src/tree.h +1 -1
- data/vendor/libgit2/src/unix/map.c +0 -2
- data/vendor/libgit2/src/unix/posix.h +1 -4
- data/vendor/libgit2/src/unix/realpath.c +0 -2
- data/vendor/libgit2/src/util.c +14 -14
- data/vendor/libgit2/src/util.h +2 -28
- data/vendor/libgit2/src/vector.h +1 -1
- data/vendor/libgit2/src/win32/findfile.c +172 -116
- data/vendor/libgit2/src/win32/findfile.h +7 -4
- data/vendor/libgit2/src/win32/path_w32.c +140 -9
- data/vendor/libgit2/src/win32/path_w32.h +2 -0
- data/vendor/libgit2/src/win32/posix.h +0 -1
- data/vendor/libgit2/src/win32/posix_w32.c +11 -27
- data/vendor/libgit2/src/win32/w32_buffer.c +2 -3
- data/vendor/libgit2/src/win32/w32_buffer.h +2 -3
- data/vendor/libgit2/src/win32/w32_leakcheck.c +1 -1
- data/vendor/libgit2/src/worktree.c +116 -94
- data/vendor/libgit2/src/worktree.h +1 -1
- data/vendor/libgit2/src/xdiff/git-xdiff.h +53 -0
- data/vendor/libgit2/src/xdiff/xdiff.h +15 -15
- data/vendor/libgit2/src/xdiff/xdiffi.c +134 -108
- data/vendor/libgit2/src/xdiff/xemit.c +23 -7
- data/vendor/libgit2/src/xdiff/xhistogram.c +87 -78
- data/vendor/libgit2/src/xdiff/xinclude.h +1 -12
- data/vendor/libgit2/src/xdiff/xmerge.c +104 -117
- data/vendor/libgit2/src/xdiff/xpatience.c +6 -17
- data/vendor/libgit2/src/xdiff/xprepare.c +15 -20
- data/vendor/libgit2/src/xdiff/xutils.c +18 -7
- data/vendor/libgit2/src/zstream.c +5 -5
- data/vendor/libgit2/src/zstream.h +4 -4
- metadata +25 -10
- data/vendor/libgit2/src/buffer.h +0 -374
|
@@ -1,37 +1,37 @@
|
|
|
1
|
-
|
|
2
|
-
|
|
1
|
+
file(GLOB SRC_NTLMCLIENT "ntlm.c" "ntlm.h" "util.c" "util.h")
|
|
2
|
+
list(SORT SRC_NTLMCLIENT)
|
|
3
3
|
|
|
4
|
-
|
|
4
|
+
add_definitions(-DNTLM_STATIC=1)
|
|
5
5
|
|
|
6
|
-
|
|
6
|
+
disable_warnings(implicit-fallthrough)
|
|
7
7
|
|
|
8
|
-
|
|
9
|
-
|
|
10
|
-
|
|
11
|
-
|
|
12
|
-
|
|
13
|
-
|
|
14
|
-
|
|
8
|
+
if(USE_ICONV)
|
|
9
|
+
add_definitions(-DUNICODE_ICONV=1)
|
|
10
|
+
file(GLOB SRC_NTLMCLIENT_UNICODE "unicode_iconv.c" "unicode_iconv.h")
|
|
11
|
+
else()
|
|
12
|
+
add_definitions(-DUNICODE_BUILTIN=1)
|
|
13
|
+
file(GLOB SRC_NTLMCLIENT_UNICODE "unicode_builtin.c" "unicode_builtin.h")
|
|
14
|
+
endif()
|
|
15
15
|
|
|
16
|
-
|
|
17
|
-
|
|
18
|
-
|
|
16
|
+
if(USE_HTTPS STREQUAL "SecureTransport")
|
|
17
|
+
add_definitions(-DCRYPT_COMMONCRYPTO)
|
|
18
|
+
set(SRC_NTLMCLIENT_CRYPTO "crypt_commoncrypto.c" "crypt_commoncrypto.h")
|
|
19
19
|
# CC_MD4 has been deprecated in macOS 10.15.
|
|
20
|
-
|
|
21
|
-
|
|
22
|
-
|
|
23
|
-
|
|
24
|
-
|
|
25
|
-
|
|
26
|
-
|
|
27
|
-
|
|
28
|
-
|
|
29
|
-
|
|
30
|
-
|
|
31
|
-
|
|
32
|
-
|
|
33
|
-
|
|
34
|
-
|
|
35
|
-
|
|
20
|
+
set_source_files_properties("crypt_commoncrypto.c" COMPILE_FLAGS "-Wno-deprecated")
|
|
21
|
+
elseif(USE_HTTPS STREQUAL "OpenSSL")
|
|
22
|
+
add_definitions(-DCRYPT_OPENSSL)
|
|
23
|
+
include_directories(${OPENSSL_INCLUDE_DIR})
|
|
24
|
+
set(SRC_NTLMCLIENT_CRYPTO "crypt_openssl.c" "crypt_openssl.h")
|
|
25
|
+
elseif(USE_HTTPS STREQUAL "OpenSSL-Dynamic")
|
|
26
|
+
add_definitions(-DCRYPT_OPENSSL)
|
|
27
|
+
add_definitions(-DCRYPT_OPENSSL_DYNAMIC)
|
|
28
|
+
set(SRC_NTLMCLIENT_CRYPTO "crypt_openssl.c" "crypt_openssl.h")
|
|
29
|
+
elseif(USE_HTTPS STREQUAL "mbedTLS")
|
|
30
|
+
add_definitions(-DCRYPT_MBEDTLS)
|
|
31
|
+
include_directories(${MBEDTLS_INCLUDE_DIR})
|
|
32
|
+
set(SRC_NTLMCLIENT_CRYPTO "crypt_mbedtls.c" "crypt_mbedtls.h")
|
|
33
|
+
else()
|
|
34
|
+
message(FATAL_ERROR "Unable to use libgit2's HTTPS backend (${USE_HTTPS}) for NTLM crypto")
|
|
35
|
+
endif()
|
|
36
36
|
|
|
37
|
-
|
|
37
|
+
add_library(ntlmclient OBJECT ${SRC_NTLMCLIENT} ${SRC_NTLMCLIENT_UNICODE} ${SRC_NTLMCLIENT_CRYPTO})
|
|
@@ -44,7 +44,7 @@ static inline void HMAC_CTX_free(HMAC_CTX *ctx)
|
|
|
44
44
|
|
|
45
45
|
#endif
|
|
46
46
|
|
|
47
|
-
#if OPENSSL_VERSION_NUMBER >= 0x10100000L || defined(CRYPT_OPENSSL_DYNAMIC)
|
|
47
|
+
#if (OPENSSL_VERSION_NUMBER >= 0x10100000L && !LIBRESSL_VERSION_NUMBER) || defined(CRYPT_OPENSSL_DYNAMIC)
|
|
48
48
|
|
|
49
49
|
static inline void HMAC_CTX_cleanup(HMAC_CTX *ctx)
|
|
50
50
|
{
|
|
@@ -930,10 +930,10 @@ const char *ntlm_client_target_domain_dns(ntlm_client *ntlm)
|
|
|
930
930
|
}
|
|
931
931
|
|
|
932
932
|
#define EVEN_PARITY(a) \
|
|
933
|
-
(!!((a) &
|
|
934
|
-
!!((a) &
|
|
935
|
-
!!((a) &
|
|
936
|
-
!!((a) &
|
|
933
|
+
(!!((a) & INT64_C(0x01)) ^ !!((a) & INT64_C(0x02)) ^ \
|
|
934
|
+
!!((a) & INT64_C(0x04)) ^ !!((a) & INT64_C(0x08)) ^ \
|
|
935
|
+
!!((a) & INT64_C(0x10)) ^ !!((a) & INT64_C(0x20)) ^ \
|
|
936
|
+
!!((a) & INT64_C(0x40)) ^ !!((a) & INT64_C(0x80)))
|
|
937
937
|
|
|
938
938
|
static void generate_odd_parity(ntlm_des_block *block)
|
|
939
939
|
{
|
|
@@ -30,7 +30,7 @@ typedef enum {
|
|
|
30
30
|
NTLM_STATE_CHALLENGE = 1,
|
|
31
31
|
NTLM_STATE_RESPONSE = 2,
|
|
32
32
|
NTLM_STATE_ERROR = 3,
|
|
33
|
-
NTLM_STATE_COMPLETE = 4
|
|
33
|
+
NTLM_STATE_COMPLETE = 4
|
|
34
34
|
} ntlm_state;
|
|
35
35
|
|
|
36
36
|
typedef struct {
|
|
@@ -122,7 +122,7 @@ struct ntlm_client {
|
|
|
122
122
|
};
|
|
123
123
|
|
|
124
124
|
typedef enum {
|
|
125
|
-
NTLM_ENABLE_HOSTVERSION = (1 << 31)
|
|
125
|
+
NTLM_ENABLE_HOSTVERSION = (1 << 31)
|
|
126
126
|
} ntlm_client_internal_flags;
|
|
127
127
|
|
|
128
128
|
typedef enum {
|
|
@@ -130,7 +130,7 @@ typedef enum {
|
|
|
130
130
|
NTLM_TARGET_INFO_SERVER = 1,
|
|
131
131
|
NTLM_TARGET_INFO_DOMAIN = 2,
|
|
132
132
|
NTLM_TARGET_INFO_SERVER_DNS = 3,
|
|
133
|
-
NTLM_TARGET_INFO_DOMAIN_DNS = 4
|
|
133
|
+
NTLM_TARGET_INFO_DOMAIN_DNS = 4
|
|
134
134
|
} ntlm_target_info_type_t;
|
|
135
135
|
|
|
136
136
|
typedef enum {
|
|
@@ -168,7 +168,7 @@ typedef enum {
|
|
|
168
168
|
NTLM_NEGOTIATE_TARGET_INFO = 0x00800000,
|
|
169
169
|
|
|
170
170
|
/* Version information should be provided */
|
|
171
|
-
NTLM_NEGOTIATE_VERSION = 0x01000000
|
|
171
|
+
NTLM_NEGOTIATE_VERSION = 0x01000000
|
|
172
172
|
} ntlm_negotiate_t;
|
|
173
173
|
|
|
174
174
|
extern int ntlm_client_set_nonce(ntlm_client *ntlm, uint64_t nonce);
|
|
@@ -32,7 +32,7 @@ typedef enum {
|
|
|
32
32
|
/**
|
|
33
33
|
* The input provided to the function is missing or invalid.
|
|
34
34
|
*/
|
|
35
|
-
NTLM_CLIENT_ERROR_INVALID_INPUT = -2
|
|
35
|
+
NTLM_CLIENT_ERROR_INVALID_INPUT = -2
|
|
36
36
|
} ntlm_error_code;
|
|
37
37
|
|
|
38
38
|
/*
|
|
@@ -98,7 +98,7 @@ typedef enum {
|
|
|
98
98
|
* its idea of its hostname in the challenge message. You may
|
|
99
99
|
* then set the authentication target based on it.
|
|
100
100
|
*/
|
|
101
|
-
NTLM_CLIENT_DISABLE_REQUEST_TARGET = (1 << 4)
|
|
101
|
+
NTLM_CLIENT_DISABLE_REQUEST_TARGET = (1 << 4)
|
|
102
102
|
} ntlm_client_flags;
|
|
103
103
|
|
|
104
104
|
|
|
@@ -1,95 +1,95 @@
|
|
|
1
|
-
|
|
2
|
-
|
|
3
|
-
|
|
4
|
-
|
|
5
|
-
|
|
6
|
-
|
|
7
|
-
|
|
8
|
-
|
|
9
|
-
|
|
10
|
-
|
|
11
|
-
|
|
12
|
-
|
|
13
|
-
|
|
14
|
-
|
|
15
|
-
|
|
16
|
-
|
|
17
|
-
|
|
18
|
-
|
|
19
|
-
|
|
20
|
-
|
|
21
|
-
|
|
22
|
-
|
|
23
|
-
|
|
24
|
-
|
|
1
|
+
include(CheckIncludeFile)
|
|
2
|
+
include(CheckFunctionExists)
|
|
3
|
+
include(CheckTypeSize)
|
|
4
|
+
|
|
5
|
+
check_include_file(dirent.h HAVE_DIRENT_H)
|
|
6
|
+
check_include_file(stdint.h HAVE_STDINT_H)
|
|
7
|
+
check_include_file(inttypes.h HAVE_INTTYPES_H)
|
|
8
|
+
check_include_file(sys/stat.h HAVE_SYS_STAT_H)
|
|
9
|
+
check_include_file(sys/types.h HAVE_SYS_TYPES_H)
|
|
10
|
+
check_include_file(unistd.h HAVE_UNISTD_H)
|
|
11
|
+
check_include_file(windows.h HAVE_WINDOWS_H)
|
|
12
|
+
|
|
13
|
+
check_function_exists(bcopy HAVE_BCOPY)
|
|
14
|
+
check_function_exists(memmove HAVE_MEMMOVE)
|
|
15
|
+
check_function_exists(strerror HAVE_STRERROR)
|
|
16
|
+
check_function_exists(strtoll HAVE_STRTOLL)
|
|
17
|
+
check_function_exists(strtoq HAVE_STRTOQ)
|
|
18
|
+
check_function_exists(_strtoi64 HAVE__STRTOI64)
|
|
19
|
+
|
|
20
|
+
check_type_size("long long" LONG_LONG)
|
|
21
|
+
check_type_size("unsigned long long" UNSIGNED_LONG_LONG)
|
|
22
|
+
|
|
23
|
+
disable_warnings(unused-function)
|
|
24
|
+
disable_warnings(implicit-fallthrough)
|
|
25
25
|
|
|
26
26
|
# User-configurable options
|
|
27
27
|
|
|
28
|
-
|
|
29
|
-
|
|
30
|
-
|
|
31
|
-
|
|
32
|
-
|
|
33
|
-
|
|
34
|
-
|
|
35
|
-
|
|
36
|
-
|
|
37
|
-
|
|
38
|
-
|
|
39
|
-
|
|
40
|
-
|
|
41
|
-
|
|
42
|
-
|
|
43
|
-
|
|
44
|
-
|
|
45
|
-
|
|
46
|
-
|
|
28
|
+
set(SUPPORT_PCRE8 1)
|
|
29
|
+
set(PCRE_LINK_SIZE "2")
|
|
30
|
+
set(PCRE_PARENS_NEST_LIMIT "250")
|
|
31
|
+
set(PCRE_MATCH_LIMIT "10000000")
|
|
32
|
+
set(PCRE_MATCH_LIMIT_RECURSION "MATCH_LIMIT")
|
|
33
|
+
set(PCRE_NEWLINE "LF")
|
|
34
|
+
set(NO_RECURSE 1)
|
|
35
|
+
set(PCRE_POSIX_MALLOC_THRESHOLD "10")
|
|
36
|
+
set(BSR_ANYCRLF 0)
|
|
37
|
+
|
|
38
|
+
if(MINGW)
|
|
39
|
+
option(NON_STANDARD_LIB_PREFIX
|
|
40
|
+
"ON=Shared libraries built in mingw will be named pcre.dll, etc., instead of libpcre.dll, etc."
|
|
41
|
+
OFF)
|
|
42
|
+
|
|
43
|
+
option(NON_STANDARD_LIB_SUFFIX
|
|
44
|
+
"ON=Shared libraries built in mingw will be named libpcre-0.dll, etc., instead of libpcre.dll, etc."
|
|
45
|
+
OFF)
|
|
46
|
+
endif(MINGW)
|
|
47
47
|
|
|
48
48
|
# Prepare build configuration
|
|
49
49
|
|
|
50
|
-
|
|
51
|
-
|
|
52
|
-
|
|
53
|
-
|
|
54
|
-
|
|
55
|
-
|
|
56
|
-
|
|
57
|
-
|
|
58
|
-
|
|
59
|
-
|
|
60
|
-
|
|
61
|
-
|
|
62
|
-
|
|
63
|
-
|
|
64
|
-
|
|
65
|
-
|
|
66
|
-
|
|
67
|
-
|
|
68
|
-
|
|
69
|
-
|
|
70
|
-
|
|
71
|
-
|
|
72
|
-
|
|
73
|
-
|
|
74
|
-
|
|
75
|
-
|
|
76
|
-
|
|
77
|
-
|
|
78
|
-
|
|
79
|
-
|
|
80
|
-
|
|
81
|
-
|
|
50
|
+
set(pcre_have_long_long 0)
|
|
51
|
+
set(pcre_have_ulong_long 0)
|
|
52
|
+
|
|
53
|
+
if(HAVE_LONG_LONG)
|
|
54
|
+
set(pcre_have_long_long 1)
|
|
55
|
+
endif(HAVE_LONG_LONG)
|
|
56
|
+
|
|
57
|
+
if(HAVE_UNSIGNED_LONG_LONG)
|
|
58
|
+
set(pcre_have_ulong_long 1)
|
|
59
|
+
endif(HAVE_UNSIGNED_LONG_LONG)
|
|
60
|
+
|
|
61
|
+
set(NEWLINE "")
|
|
62
|
+
|
|
63
|
+
if(PCRE_NEWLINE STREQUAL "LF")
|
|
64
|
+
set(NEWLINE "10")
|
|
65
|
+
endif(PCRE_NEWLINE STREQUAL "LF")
|
|
66
|
+
if(PCRE_NEWLINE STREQUAL "CR")
|
|
67
|
+
set(NEWLINE "13")
|
|
68
|
+
endif(PCRE_NEWLINE STREQUAL "CR")
|
|
69
|
+
if(PCRE_NEWLINE STREQUAL "CRLF")
|
|
70
|
+
set(NEWLINE "3338")
|
|
71
|
+
endif(PCRE_NEWLINE STREQUAL "CRLF")
|
|
72
|
+
if(PCRE_NEWLINE STREQUAL "ANY")
|
|
73
|
+
set(NEWLINE "-1")
|
|
74
|
+
endif(PCRE_NEWLINE STREQUAL "ANY")
|
|
75
|
+
if(PCRE_NEWLINE STREQUAL "ANYCRLF")
|
|
76
|
+
set(NEWLINE "-2")
|
|
77
|
+
endif(PCRE_NEWLINE STREQUAL "ANYCRLF")
|
|
78
|
+
|
|
79
|
+
if(NEWLINE STREQUAL "")
|
|
80
|
+
message(FATAL_ERROR "The PCRE_NEWLINE variable must be set to one of the following values: \"LF\", \"CR\", \"CRLF\", \"ANY\", \"ANYCRLF\".")
|
|
81
|
+
endif(NEWLINE STREQUAL "")
|
|
82
82
|
|
|
83
83
|
# Output files
|
|
84
|
-
|
|
84
|
+
configure_file(config.h.in
|
|
85
85
|
${PROJECT_BINARY_DIR}/src/pcre/config.h
|
|
86
86
|
@ONLY)
|
|
87
87
|
|
|
88
88
|
# Source code
|
|
89
89
|
|
|
90
|
-
|
|
90
|
+
set(PCRE_HEADERS ${PROJECT_BINARY_DIR}/src/pcre/config.h)
|
|
91
91
|
|
|
92
|
-
|
|
92
|
+
set(PCRE_SOURCES
|
|
93
93
|
pcre_byte_order.c
|
|
94
94
|
pcre_chartables.c
|
|
95
95
|
pcre_compile.c
|
|
@@ -113,28 +113,28 @@ SET(PCRE_SOURCES
|
|
|
113
113
|
pcre_xclass.c
|
|
114
114
|
)
|
|
115
115
|
|
|
116
|
-
|
|
116
|
+
set(PCREPOSIX_HEADERS pcreposix.h)
|
|
117
117
|
|
|
118
|
-
|
|
118
|
+
set(PCREPOSIX_SOURCES pcreposix.c)
|
|
119
119
|
|
|
120
120
|
# Fix static compilation with MSVC: https://bugs.exim.org/show_bug.cgi?id=1681
|
|
121
121
|
# This code was taken from the CMake wiki, not from WebM.
|
|
122
122
|
|
|
123
123
|
# Build setup
|
|
124
124
|
|
|
125
|
-
|
|
125
|
+
add_definitions(-DHAVE_CONFIG_H)
|
|
126
126
|
|
|
127
|
-
|
|
128
|
-
|
|
129
|
-
|
|
127
|
+
if(MSVC)
|
|
128
|
+
add_definitions(-D_CRT_SECURE_NO_DEPRECATE -D_CRT_SECURE_NO_WARNINGS)
|
|
129
|
+
endif(MSVC)
|
|
130
130
|
|
|
131
|
-
|
|
131
|
+
set(CMAKE_INCLUDE_CURRENT_DIR 1)
|
|
132
132
|
|
|
133
|
-
|
|
133
|
+
set(targets)
|
|
134
134
|
|
|
135
135
|
# Libraries
|
|
136
136
|
# pcre
|
|
137
|
-
|
|
138
|
-
|
|
137
|
+
include_directories(${PROJECT_BINARY_DIR}/src/pcre)
|
|
138
|
+
add_library(pcre OBJECT ${PCRE_HEADERS} ${PCRE_SOURCES} ${PCREPOSIX_SOURCES})
|
|
139
139
|
|
|
140
140
|
# end CMakeLists.txt
|
|
@@ -1,26 +1,24 @@
|
|
|
1
|
-
|
|
2
|
-
|
|
3
|
-
|
|
4
|
-
|
|
1
|
+
find_program(DLLTOOL dlltool CMAKE_FIND_ROOT_PATH_BOTH)
|
|
2
|
+
if(NOT DLLTOOL)
|
|
3
|
+
message(FATAL_ERROR "Could not find dlltool command")
|
|
4
|
+
endif()
|
|
5
5
|
|
|
6
|
-
|
|
7
|
-
|
|
8
|
-
|
|
6
|
+
set(LIBWINHTTP_PATH "${PROJECT_BINARY_DIR}/deps/winhttp")
|
|
7
|
+
set(LIBWINHTTP_PATH ${LIBWINHTTP_PATH} PARENT_SCOPE)
|
|
8
|
+
file(MAKE_DIRECTORY ${LIBWINHTTP_PATH})
|
|
9
9
|
|
|
10
|
-
|
|
10
|
+
if(CMAKE_SIZEOF_VOID_P EQUAL 8)
|
|
11
11
|
set(WINHTTP_DEF "winhttp64.def")
|
|
12
|
-
|
|
12
|
+
else()
|
|
13
13
|
set(WINHTTP_DEF "winhttp.def")
|
|
14
|
-
|
|
14
|
+
endif()
|
|
15
15
|
|
|
16
|
-
|
|
16
|
+
add_custom_command(
|
|
17
17
|
OUTPUT ${LIBWINHTTP_PATH}/libwinhttp.a
|
|
18
18
|
COMMAND ${DLLTOOL} -d ${WINHTTP_DEF} -k -D winhttp.dll -l libwinhttp.a
|
|
19
19
|
DEPENDS ${WINHTTP_DEF}
|
|
20
|
-
WORKING_DIRECTORY ${LIBWINHTTP_PATH}
|
|
21
|
-
)
|
|
20
|
+
WORKING_DIRECTORY ${LIBWINHTTP_PATH})
|
|
22
21
|
|
|
23
|
-
|
|
22
|
+
set_source_files_properties(
|
|
24
23
|
${CMAKE_CURRENT_SOURCE_DIR}/src/transports/winhttp.c
|
|
25
|
-
PROPERTIES OBJECT_DEPENDS ${LIBWINHTTP_PATH}/libwinhttp.a
|
|
26
|
-
)
|
|
24
|
+
PROPERTIES OBJECT_DEPENDS ${LIBWINHTTP_PATH}/libwinhttp.a)
|
|
@@ -32,6 +32,8 @@ GIT_BEGIN_DECL
|
|
|
32
32
|
*
|
|
33
33
|
* @param delta The delta to be applied
|
|
34
34
|
* @param payload User-specified payload
|
|
35
|
+
* @return 0 if the delta is applied, < 0 if the apply process will be aborted
|
|
36
|
+
* or > 0 if the delta will not be applied.
|
|
35
37
|
*/
|
|
36
38
|
typedef int GIT_CALLBACK(git_apply_delta_cb)(
|
|
37
39
|
const git_diff_delta *delta,
|
|
@@ -48,6 +50,8 @@ typedef int GIT_CALLBACK(git_apply_delta_cb)(
|
|
|
48
50
|
*
|
|
49
51
|
* @param hunk The hunk to be applied
|
|
50
52
|
* @param payload User-specified payload
|
|
53
|
+
* @return 0 if the hunk is applied, < 0 if the apply process will be aborted
|
|
54
|
+
* or > 0 if the hunk will not be applied.
|
|
51
55
|
*/
|
|
52
56
|
typedef int GIT_CALLBACK(git_apply_hunk_cb)(
|
|
53
57
|
const git_diff_hunk *hunk,
|
|
@@ -59,7 +63,7 @@ typedef enum {
|
|
|
59
63
|
* Don't actually make changes, just test that the patch applies.
|
|
60
64
|
* This is the equivalent of `git apply --check`.
|
|
61
65
|
*/
|
|
62
|
-
GIT_APPLY_CHECK = (1 << 0)
|
|
66
|
+
GIT_APPLY_CHECK = (1 << 0)
|
|
63
67
|
} git_apply_flags_t;
|
|
64
68
|
|
|
65
69
|
/**
|
|
@@ -89,6 +93,16 @@ typedef struct {
|
|
|
89
93
|
#define GIT_APPLY_OPTIONS_VERSION 1
|
|
90
94
|
#define GIT_APPLY_OPTIONS_INIT {GIT_APPLY_OPTIONS_VERSION}
|
|
91
95
|
|
|
96
|
+
/**
|
|
97
|
+
* Initialize git_apply_options structure
|
|
98
|
+
*
|
|
99
|
+
* Initialize a `git_apply_options` with default values. Equivalent to creating
|
|
100
|
+
* an instance with GIT_APPLY_OPTIONS_INIT.
|
|
101
|
+
*
|
|
102
|
+
* @param opts The `git_apply_options` struct to initialize.
|
|
103
|
+
* @param version The struct version; pass `GIT_APPLY_OPTIONS_VERSION`
|
|
104
|
+
* @return 0 on success or -1 on failure.
|
|
105
|
+
*/
|
|
92
106
|
GIT_EXTERN(int) git_apply_options_init(git_apply_options *opts, unsigned int version);
|
|
93
107
|
|
|
94
108
|
/**
|
|
@@ -127,7 +141,7 @@ typedef enum {
|
|
|
127
141
|
* Apply the patch to both the working directory and the index.
|
|
128
142
|
* This is the equivalent of `git apply --index`.
|
|
129
143
|
*/
|
|
130
|
-
GIT_APPLY_LOCATION_BOTH = 2
|
|
144
|
+
GIT_APPLY_LOCATION_BOTH = 2
|
|
131
145
|
} git_apply_location_t;
|
|
132
146
|
|
|
133
147
|
/**
|
|
@@ -83,7 +83,7 @@ typedef enum {
|
|
|
83
83
|
GIT_ATTR_VALUE_UNSPECIFIED = 0, /**< The attribute has been left unspecified */
|
|
84
84
|
GIT_ATTR_VALUE_TRUE, /**< The attribute has been set */
|
|
85
85
|
GIT_ATTR_VALUE_FALSE, /**< The attribute has been unset */
|
|
86
|
-
GIT_ATTR_VALUE_STRING
|
|
86
|
+
GIT_ATTR_VALUE_STRING /**< This attribute has a value */
|
|
87
87
|
} git_attr_value_t;
|
|
88
88
|
|
|
89
89
|
/**
|
|
@@ -177,6 +177,7 @@ typedef struct {
|
|
|
177
177
|
* not have to exist, but if it does not, then it will be
|
|
178
178
|
* treated as a plain file (not a directory).
|
|
179
179
|
* @param name The name of the attribute to look up.
|
|
180
|
+
* @return 0 or an error code.
|
|
180
181
|
*/
|
|
181
182
|
GIT_EXTERN(int) git_attr_get(
|
|
182
183
|
const char **value_out,
|
|
@@ -199,6 +200,7 @@ GIT_EXTERN(int) git_attr_get(
|
|
|
199
200
|
* not have to exist, but if it does not, then it will be
|
|
200
201
|
* treated as a plain file (not a directory).
|
|
201
202
|
* @param name The name of the attribute to look up.
|
|
203
|
+
* @return 0 or an error code.
|
|
202
204
|
*/
|
|
203
205
|
GIT_EXTERN(int) git_attr_get_ext(
|
|
204
206
|
const char **value_out,
|
|
@@ -235,6 +237,7 @@ GIT_EXTERN(int) git_attr_get_ext(
|
|
|
235
237
|
* it will be treated as a plain file (i.e. not a directory).
|
|
236
238
|
* @param num_attr The number of attributes being looked up
|
|
237
239
|
* @param names An array of num_attr strings containing attribute names.
|
|
240
|
+
* @return 0 or an error code.
|
|
238
241
|
*/
|
|
239
242
|
GIT_EXTERN(int) git_attr_get_many(
|
|
240
243
|
const char **values_out,
|
|
@@ -259,6 +262,7 @@ GIT_EXTERN(int) git_attr_get_many(
|
|
|
259
262
|
* it will be treated as a plain file (i.e. not a directory).
|
|
260
263
|
* @param num_attr The number of attributes being looked up
|
|
261
264
|
* @param names An array of num_attr strings containing attribute names.
|
|
265
|
+
* @return 0 or an error code.
|
|
262
266
|
*/
|
|
263
267
|
GIT_EXTERN(int) git_attr_get_many_ext(
|
|
264
268
|
const char **values_out,
|
|
@@ -344,11 +348,16 @@ GIT_EXTERN(int) git_attr_cache_flush(
|
|
|
344
348
|
* Add a macro definition.
|
|
345
349
|
*
|
|
346
350
|
* Macros will automatically be loaded from the top level `.gitattributes`
|
|
347
|
-
* file of the repository (plus the
|
|
351
|
+
* file of the repository (plus the built-in "binary" macro). This
|
|
348
352
|
* function allows you to add others. For example, to add the default
|
|
349
353
|
* macro, you would call:
|
|
350
354
|
*
|
|
351
355
|
* git_attr_add_macro(repo, "binary", "-diff -crlf");
|
|
356
|
+
*
|
|
357
|
+
* @param repo The repository to add the macro in.
|
|
358
|
+
* @param name The name of the macro.
|
|
359
|
+
* @param values The value for the macro.
|
|
360
|
+
* @return 0 or an error code.
|
|
352
361
|
*/
|
|
353
362
|
GIT_EXTERN(int) git_attr_add_macro(
|
|
354
363
|
git_repository *repo,
|
|
@@ -73,7 +73,7 @@ typedef enum {
|
|
|
73
73
|
GIT_BLAME_USE_MAILMAP = (1<<5),
|
|
74
74
|
|
|
75
75
|
/** Ignore whitespace differences */
|
|
76
|
-
GIT_BLAME_IGNORE_WHITESPACE = (1<<6)
|
|
76
|
+
GIT_BLAME_IGNORE_WHITESPACE = (1<<6)
|
|
77
77
|
} git_blame_flag_t;
|
|
78
78
|
|
|
79
79
|
/**
|
|
@@ -203,6 +203,9 @@ typedef struct git_blame git_blame;
|
|
|
203
203
|
|
|
204
204
|
/**
|
|
205
205
|
* Gets the number of hunks that exist in the blame structure.
|
|
206
|
+
*
|
|
207
|
+
* @param blame The blame structure to query.
|
|
208
|
+
* @return The number of hunks.
|
|
206
209
|
*/
|
|
207
210
|
GIT_EXTERN(uint32_t) git_blame_get_hunk_count(git_blame *blame);
|
|
208
211
|
|
|
@@ -119,7 +119,7 @@ typedef enum {
|
|
|
119
119
|
* When set, filters will be loaded from a `.gitattributes` file
|
|
120
120
|
* in the specified commit.
|
|
121
121
|
*/
|
|
122
|
-
GIT_BLOB_FILTER_ATTRIBUTES_FROM_COMMIT = (1 << 3)
|
|
122
|
+
GIT_BLOB_FILTER_ATTRIBUTES_FROM_COMMIT = (1 << 3)
|
|
123
123
|
} git_blob_filter_flag_t;
|
|
124
124
|
|
|
125
125
|
/**
|
|
@@ -284,12 +284,25 @@ GIT_EXTERN(int) git_blob_create_from_buffer(
|
|
|
284
284
|
*/
|
|
285
285
|
GIT_EXTERN(int) git_blob_is_binary(const git_blob *blob);
|
|
286
286
|
|
|
287
|
+
/**
|
|
288
|
+
* Determine if the given content is most certainly binary or not;
|
|
289
|
+
* this is the same mechanism used by `git_blob_is_binary` but only
|
|
290
|
+
* looking at raw data.
|
|
291
|
+
*
|
|
292
|
+
* @param data The blob data which content should be analyzed
|
|
293
|
+
* @param len The length of the data
|
|
294
|
+
* @return 1 if the content of the blob is detected
|
|
295
|
+
* as binary; 0 otherwise.
|
|
296
|
+
*/
|
|
297
|
+
GIT_EXTERN(int) git_blob_data_is_binary(const char *data, size_t len);
|
|
298
|
+
|
|
287
299
|
/**
|
|
288
300
|
* Create an in-memory copy of a blob. The copy must be explicitly
|
|
289
301
|
* free'd or it will leak.
|
|
290
302
|
*
|
|
291
303
|
* @param out Pointer to store the copy of the object
|
|
292
304
|
* @param source Original object to copy
|
|
305
|
+
* @return 0.
|
|
293
306
|
*/
|
|
294
307
|
GIT_EXTERN(int) git_blob_dup(git_blob **out, git_blob *source);
|
|
295
308
|
|
|
@@ -34,6 +34,8 @@ GIT_BEGIN_DECL
|
|
|
34
34
|
*
|
|
35
35
|
* @param out Pointer where to store the underlying reference.
|
|
36
36
|
*
|
|
37
|
+
* @param repo the repository to create the branch in.
|
|
38
|
+
*
|
|
37
39
|
* @param branch_name Name for the branch; this name is
|
|
38
40
|
* validated for consistency. It should also not conflict with
|
|
39
41
|
* an already existing branch name.
|