rugged 1.1.1 → 1.4.3
Sign up to get free protection for your applications and to get access to all the features.
- checksums.yaml +4 -4
- data/LICENSE +1 -0
- data/README.md +1 -1
- data/ext/rugged/extconf.rb +2 -2
- data/ext/rugged/rugged.c +7 -4
- data/ext/rugged/rugged_config.c +7 -2
- data/ext/rugged/rugged_object.c +1 -1
- data/ext/rugged/rugged_remote.c +17 -0
- 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 +103 -271
- data/vendor/libgit2/COPYING +149 -24
- 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 +13 -0
- 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 +14 -0
- 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 -96
- data/vendor/libgit2/cmake/SelectHashes.cmake +39 -48
- 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 +101 -0
- data/vendor/libgit2/deps/ntlmclient/CMakeLists.txt +32 -20
- 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 +154 -122
- data/vendor/libgit2/deps/ntlmclient/ntlm.h +17 -13
- data/vendor/libgit2/deps/ntlmclient/ntlmclient.h +17 -4
- 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/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 +106 -2
- data/vendor/libgit2/include/git2/blame.h +97 -43
- data/vendor/libgit2/include/git2/blob.h +33 -2
- data/vendor/libgit2/include/git2/branch.h +27 -0
- data/vendor/libgit2/include/git2/buffer.h +18 -78
- data/vendor/libgit2/include/git2/cert.h +43 -6
- data/vendor/libgit2/include/git2/checkout.h +32 -13
- data/vendor/libgit2/include/git2/clone.h +4 -4
- data/vendor/libgit2/include/git2/commit.h +37 -19
- data/vendor/libgit2/include/git2/common.h +46 -5
- 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 +326 -6
- data/vendor/libgit2/include/git2/describe.h +7 -2
- data/vendor/libgit2/include/git2/diff.h +50 -121
- data/vendor/libgit2/include/git2/email.h +127 -0
- data/vendor/libgit2/include/git2/errors.h +7 -6
- data/vendor/libgit2/include/git2/filter.h +69 -18
- data/vendor/libgit2/include/git2/graph.h +21 -2
- data/vendor/libgit2/include/git2/ignore.h +1 -1
- data/vendor/libgit2/include/git2/index.h +13 -7
- 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/notes.h +2 -2
- data/vendor/libgit2/include/git2/object.h +23 -0
- data/vendor/libgit2/include/git2/odb.h +65 -6
- data/vendor/libgit2/include/git2/odb_backend.h +1 -1
- data/vendor/libgit2/include/git2/oidarray.h +5 -8
- data/vendor/libgit2/include/git2/pack.h +24 -8
- data/vendor/libgit2/include/git2/patch.h +16 -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 +34 -2
- 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 +8 -4
- data/vendor/libgit2/include/git2/remote.h +246 -46
- data/vendor/libgit2/include/git2/repository.h +25 -18
- data/vendor/libgit2/include/git2/reset.h +2 -2
- data/vendor/libgit2/include/git2/revparse.h +5 -5
- 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 +4 -4
- data/vendor/libgit2/include/git2/status.h +124 -62
- data/vendor/libgit2/include/git2/stdint.h +3 -3
- data/vendor/libgit2/include/git2/submodule.h +16 -2
- data/vendor/libgit2/include/git2/sys/commit_graph.h +174 -0
- data/vendor/libgit2/include/git2/sys/email.h +45 -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 +9 -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 +26 -34
- data/vendor/libgit2/include/git2/tag.h +13 -0
- data/vendor/libgit2/include/git2/tree.h +4 -17
- data/vendor/libgit2/include/git2/types.h +16 -7
- data/vendor/libgit2/include/git2/version.h +4 -4
- data/vendor/libgit2/include/git2/worktree.h +13 -2
- data/vendor/libgit2/include/git2.h +1 -0
- data/vendor/libgit2/src/CMakeLists.txt +192 -290
- 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/annotated_commit.h +1 -1
- data/vendor/libgit2/src/apply.c +34 -25
- data/vendor/libgit2/src/apply.h +2 -2
- data/vendor/libgit2/src/array.h +11 -11
- data/vendor/libgit2/src/attr.c +204 -82
- data/vendor/libgit2/src/attr_file.c +105 -52
- data/vendor/libgit2/src/attr_file.h +36 -15
- data/vendor/libgit2/src/attrcache.c +55 -45
- data/vendor/libgit2/src/attrcache.h +4 -5
- data/vendor/libgit2/src/blame.c +15 -9
- data/vendor/libgit2/src/blame_git.c +2 -2
- data/vendor/libgit2/src/blob.c +76 -52
- data/vendor/libgit2/src/blob.h +1 -1
- data/vendor/libgit2/src/branch.c +203 -110
- 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/cache.c +2 -2
- data/vendor/libgit2/src/cache.h +7 -7
- data/vendor/libgit2/src/cc-compat.h +11 -9
- data/vendor/libgit2/src/checkout.c +118 -91
- data/vendor/libgit2/src/cherrypick.c +16 -12
- data/vendor/libgit2/src/clone.c +97 -103
- data/vendor/libgit2/src/commit.c +167 -84
- data/vendor/libgit2/src/commit.h +24 -1
- data/vendor/libgit2/src/commit_graph.c +1224 -0
- data/vendor/libgit2/src/commit_graph.h +169 -0
- data/vendor/libgit2/src/commit_list.c +48 -3
- data/vendor/libgit2/src/commit_list.h +2 -0
- data/vendor/libgit2/src/common.h +35 -5
- data/vendor/libgit2/src/config.c +119 -64
- data/vendor/libgit2/src/config.h +15 -2
- data/vendor/libgit2/src/config_cache.c +5 -3
- data/vendor/libgit2/src/config_file.c +120 -100
- data/vendor/libgit2/src/config_mem.c +9 -9
- data/vendor/libgit2/src/config_parse.c +29 -27
- data/vendor/libgit2/src/crlf.c +36 -23
- data/vendor/libgit2/src/date.c +13 -19
- data/vendor/libgit2/src/date.h +33 -0
- data/vendor/libgit2/src/delta.c +1 -1
- data/vendor/libgit2/src/describe.c +32 -21
- data/vendor/libgit2/src/diff.c +71 -183
- data/vendor/libgit2/src/diff.h +2 -4
- data/vendor/libgit2/src/diff_driver.c +53 -51
- data/vendor/libgit2/src/diff_driver.h +3 -3
- data/vendor/libgit2/src/diff_file.c +31 -26
- data/vendor/libgit2/src/diff_generate.c +76 -23
- data/vendor/libgit2/src/diff_generate.h +5 -3
- data/vendor/libgit2/src/diff_print.c +120 -95
- data/vendor/libgit2/src/diff_stats.c +47 -34
- data/vendor/libgit2/src/{message.h → diff_stats.h} +7 -6
- data/vendor/libgit2/src/diff_tform.c +18 -16
- data/vendor/libgit2/src/diff_xdiff.c +7 -10
- data/vendor/libgit2/src/diff_xdiff.h +1 -1
- data/vendor/libgit2/src/email.c +315 -0
- data/vendor/libgit2/src/email.h +25 -0
- data/vendor/libgit2/src/errors.c +37 -32
- data/vendor/libgit2/src/features.h.in +11 -2
- data/vendor/libgit2/src/fetch.c +77 -26
- data/vendor/libgit2/src/fetch.h +1 -1
- data/vendor/libgit2/src/fetchhead.c +27 -23
- data/vendor/libgit2/src/filebuf.c +36 -34
- data/vendor/libgit2/src/filebuf.h +1 -1
- data/vendor/libgit2/src/filter.c +278 -132
- data/vendor/libgit2/src/filter.h +46 -6
- data/vendor/libgit2/src/fs_path.c +2071 -0
- data/vendor/libgit2/src/fs_path.h +772 -0
- data/vendor/libgit2/src/futils.c +96 -90
- data/vendor/libgit2/src/futils.h +27 -15
- data/vendor/libgit2/src/graph.c +64 -9
- data/vendor/libgit2/src/hash/sha1/collisiondetect.c +5 -5
- data/vendor/libgit2/src/hash/sha1/common_crypto.c +5 -5
- data/vendor/libgit2/src/hash/sha1/generic.c +2 -2
- data/vendor/libgit2/src/hash/sha1/generic.h +1 -1
- data/vendor/libgit2/src/hash/sha1/mbedtls.c +13 -13
- data/vendor/libgit2/src/hash/sha1/openssl.c +5 -5
- data/vendor/libgit2/src/hash/sha1/sha1dc/sha1.c +9 -11
- data/vendor/libgit2/src/hash/sha1/win32.c +21 -17
- data/vendor/libgit2/src/hash/sha1.h +3 -1
- data/vendor/libgit2/src/hash.c +71 -36
- data/vendor/libgit2/src/hash.h +13 -13
- data/vendor/libgit2/src/hashsig.c +23 -10
- data/vendor/libgit2/src/ident.c +30 -20
- data/vendor/libgit2/src/ignore.c +63 -46
- data/vendor/libgit2/src/ignore.h +2 -2
- data/vendor/libgit2/src/index.c +184 -149
- data/vendor/libgit2/src/index.h +7 -4
- data/vendor/libgit2/src/indexer.c +143 -89
- data/vendor/libgit2/src/integer.h +64 -2
- data/vendor/libgit2/src/iterator.c +93 -73
- data/vendor/libgit2/src/iterator.h +6 -6
- data/vendor/libgit2/src/khash.h +3 -12
- data/vendor/libgit2/src/{settings.c → libgit2.c} +165 -56
- data/vendor/libgit2/src/libgit2.h +15 -0
- data/vendor/libgit2/src/mailmap.c +60 -45
- data/vendor/libgit2/src/map.h +3 -3
- data/vendor/libgit2/src/merge.c +104 -61
- data/vendor/libgit2/src/merge.h +3 -15
- data/vendor/libgit2/src/merge_driver.c +21 -15
- data/vendor/libgit2/src/merge_file.c +24 -6
- data/vendor/libgit2/src/message.c +21 -8
- data/vendor/libgit2/src/midx.c +501 -18
- data/vendor/libgit2/src/midx.h +29 -2
- data/vendor/libgit2/src/mwindow.c +103 -59
- data/vendor/libgit2/src/mwindow.h +3 -3
- data/vendor/libgit2/src/net.c +405 -71
- data/vendor/libgit2/src/net.h +26 -5
- data/vendor/libgit2/src/netops.c +7 -5
- data/vendor/libgit2/src/netops.h +3 -3
- data/vendor/libgit2/src/notes.c +40 -49
- data/vendor/libgit2/src/object.c +68 -20
- data/vendor/libgit2/src/object.h +1 -1
- data/vendor/libgit2/src/odb.c +320 -80
- data/vendor/libgit2/src/odb.h +17 -3
- data/vendor/libgit2/src/odb_loose.c +96 -86
- data/vendor/libgit2/src/odb_mempack.c +19 -6
- data/vendor/libgit2/src/odb_pack.c +402 -125
- data/vendor/libgit2/src/oid.c +16 -8
- data/vendor/libgit2/src/oid.h +15 -0
- data/vendor/libgit2/src/oidarray.c +10 -1
- data/vendor/libgit2/src/pack-objects.c +90 -69
- data/vendor/libgit2/src/pack-objects.h +11 -6
- data/vendor/libgit2/src/pack.c +337 -127
- data/vendor/libgit2/src/pack.h +25 -7
- data/vendor/libgit2/src/patch.c +17 -10
- data/vendor/libgit2/src/patch.h +1 -0
- data/vendor/libgit2/src/patch_generate.c +29 -13
- data/vendor/libgit2/src/patch_generate.h +5 -5
- data/vendor/libgit2/src/patch_parse.c +26 -25
- data/vendor/libgit2/src/path.c +86 -1768
- data/vendor/libgit2/src/path.h +39 -635
- data/vendor/libgit2/src/pathspec.c +12 -12
- data/vendor/libgit2/src/pathspec.h +2 -2
- data/vendor/libgit2/src/pool.c +13 -7
- data/vendor/libgit2/src/posix.c +14 -6
- 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 +18 -14
- data/vendor/libgit2/src/reader.h +2 -2
- data/vendor/libgit2/src/rebase.c +177 -132
- data/vendor/libgit2/src/refdb.c +30 -13
- data/vendor/libgit2/src/refdb_fs.c +548 -222
- data/vendor/libgit2/src/reflog.c +19 -14
- data/vendor/libgit2/src/refs.c +107 -72
- data/vendor/libgit2/src/refs.h +2 -2
- data/vendor/libgit2/src/refspec.c +53 -38
- data/vendor/libgit2/src/refspec.h +5 -2
- data/vendor/libgit2/src/regexp.c +1 -1
- data/vendor/libgit2/src/remote.c +960 -486
- data/vendor/libgit2/src/remote.h +16 -10
- data/vendor/libgit2/src/repository.c +702 -422
- data/vendor/libgit2/src/repository.h +26 -8
- data/vendor/libgit2/src/reset.c +16 -12
- data/vendor/libgit2/src/revert.c +16 -12
- data/vendor/libgit2/src/revparse.c +66 -48
- data/vendor/libgit2/src/revwalk.c +39 -22
- 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 +18 -11
- data/vendor/libgit2/src/signature.h +1 -1
- data/vendor/libgit2/src/sortedcache.c +1 -1
- data/vendor/libgit2/src/sortedcache.h +10 -8
- data/vendor/libgit2/src/stash.c +39 -38
- data/vendor/libgit2/src/status.c +11 -5
- data/vendor/libgit2/src/{buffer.c → str.c} +459 -136
- data/vendor/libgit2/src/str.h +357 -0
- data/vendor/libgit2/src/strarray.c +2 -1
- data/vendor/libgit2/src/streams/mbedtls.c +22 -23
- 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 +290 -212
- data/vendor/libgit2/src/submodule.h +10 -10
- data/vendor/libgit2/src/sysdir.c +70 -56
- data/vendor/libgit2/src/sysdir.h +15 -10
- data/vendor/libgit2/src/tag.c +72 -34
- data/vendor/libgit2/src/thread.c +140 -0
- data/vendor/libgit2/src/thread.h +479 -0
- data/vendor/libgit2/src/threadstate.c +84 -0
- data/vendor/libgit2/src/threadstate.h +24 -0
- data/vendor/libgit2/src/trace.c +3 -16
- data/vendor/libgit2/src/trace.h +17 -30
- data/vendor/libgit2/src/trailer.c +2 -2
- data/vendor/libgit2/src/transaction.c +20 -9
- data/vendor/libgit2/src/transport.c +13 -13
- data/vendor/libgit2/src/transports/auth.c +8 -10
- data/vendor/libgit2/src/transports/auth.h +2 -3
- data/vendor/libgit2/src/transports/auth_negotiate.c +23 -17
- data/vendor/libgit2/src/transports/auth_ntlm.c +20 -16
- data/vendor/libgit2/src/transports/auth_ntlm.h +0 -1
- data/vendor/libgit2/src/transports/credential.c +15 -7
- data/vendor/libgit2/src/transports/git.c +10 -14
- data/vendor/libgit2/src/transports/http.c +56 -34
- data/vendor/libgit2/src/transports/http.h +3 -3
- data/vendor/libgit2/src/transports/httpclient.c +106 -79
- data/vendor/libgit2/src/transports/httpclient.h +1 -1
- data/vendor/libgit2/src/transports/local.c +127 -119
- data/vendor/libgit2/src/transports/smart.c +61 -144
- data/vendor/libgit2/src/transports/smart.h +26 -32
- data/vendor/libgit2/src/transports/smart_pkt.c +33 -33
- data/vendor/libgit2/src/transports/smart_protocol.c +68 -44
- data/vendor/libgit2/src/transports/ssh.c +100 -131
- data/vendor/libgit2/src/transports/winhttp.c +86 -82
- data/vendor/libgit2/src/tree-cache.c +5 -5
- data/vendor/libgit2/src/tree-cache.h +2 -2
- data/vendor/libgit2/src/tree.c +150 -116
- data/vendor/libgit2/src/tree.h +1 -0
- data/vendor/libgit2/src/tsort.c +0 -2
- data/vendor/libgit2/src/unix/map.c +3 -3
- data/vendor/libgit2/src/unix/posix.h +1 -4
- data/vendor/libgit2/src/unix/pthread.h +2 -1
- data/vendor/libgit2/src/unix/realpath.c +0 -2
- data/vendor/libgit2/src/utf8.c +150 -0
- data/vendor/libgit2/src/utf8.h +52 -0
- data/vendor/libgit2/src/util.c +68 -144
- data/vendor/libgit2/src/util.h +36 -68
- data/vendor/libgit2/src/vector.c +23 -19
- data/vendor/libgit2/src/vector.h +5 -3
- data/vendor/libgit2/src/win32/findfile.c +172 -114
- data/vendor/libgit2/src/win32/findfile.h +7 -4
- 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 +162 -33
- data/vendor/libgit2/src/win32/path_w32.h +2 -1
- data/vendor/libgit2/src/win32/posix.h +6 -7
- data/vendor/libgit2/src/win32/posix_w32.c +26 -33
- 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 +5 -6
- data/vendor/libgit2/src/win32/w32_buffer.h +2 -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 +138 -105
- 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 +6 -6
- data/vendor/libgit2/src/zstream.h +4 -4
- metadata +60 -24
- 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/buffer.h +0 -222
- 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
@@ -0,0 +1,150 @@
|
|
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 "utf8.h"
|
9
|
+
|
10
|
+
#include "common.h"
|
11
|
+
|
12
|
+
/*
|
13
|
+
* git_utf8_iterate is taken from the utf8proc project,
|
14
|
+
* http://www.public-software-group.org/utf8proc
|
15
|
+
*
|
16
|
+
* Copyright (c) 2009 Public Software Group e. V., Berlin, Germany
|
17
|
+
*
|
18
|
+
* Permission is hereby granted, free of charge, to any person obtaining a
|
19
|
+
* copy of this software and associated documentation files (the ""Software""),
|
20
|
+
* to deal in the Software without restriction, including without limitation
|
21
|
+
* the rights to use, copy, modify, merge, publish, distribute, sublicense,
|
22
|
+
* and/or sell copies of the Software, and to permit persons to whom the
|
23
|
+
* Software is furnished to do so, subject to the following conditions:
|
24
|
+
*
|
25
|
+
* The above copyright notice and this permission notice shall be included in
|
26
|
+
* all copies or substantial portions of the Software.
|
27
|
+
*
|
28
|
+
* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
|
29
|
+
* IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
|
30
|
+
* FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
|
31
|
+
* AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
|
32
|
+
* LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
|
33
|
+
* FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
|
34
|
+
* DEALINGS IN THE SOFTWARE.
|
35
|
+
*/
|
36
|
+
|
37
|
+
static const uint8_t utf8proc_utf8class[256] = {
|
38
|
+
1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
|
39
|
+
1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
|
40
|
+
1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
|
41
|
+
1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
|
42
|
+
1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
|
43
|
+
1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
|
44
|
+
1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
|
45
|
+
1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
|
46
|
+
0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
|
47
|
+
0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
|
48
|
+
0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
|
49
|
+
0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
|
50
|
+
2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2,
|
51
|
+
2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2,
|
52
|
+
3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3,
|
53
|
+
4, 4, 4, 4, 4, 4, 4, 4, 0, 0, 0, 0, 0, 0, 0, 0
|
54
|
+
};
|
55
|
+
|
56
|
+
static int utf8_charlen(const uint8_t *str, size_t str_len)
|
57
|
+
{
|
58
|
+
uint8_t length;
|
59
|
+
size_t i;
|
60
|
+
|
61
|
+
length = utf8proc_utf8class[str[0]];
|
62
|
+
if (!length)
|
63
|
+
return -1;
|
64
|
+
|
65
|
+
if (str_len > 0 && length > str_len)
|
66
|
+
return -1;
|
67
|
+
|
68
|
+
for (i = 1; i < length; i++) {
|
69
|
+
if ((str[i] & 0xC0) != 0x80)
|
70
|
+
return -1;
|
71
|
+
}
|
72
|
+
|
73
|
+
return (int)length;
|
74
|
+
}
|
75
|
+
|
76
|
+
int git_utf8_iterate(uint32_t *out, const char *_str, size_t str_len)
|
77
|
+
{
|
78
|
+
const uint8_t *str = (const uint8_t *)_str;
|
79
|
+
uint32_t uc = 0;
|
80
|
+
int length;
|
81
|
+
|
82
|
+
*out = 0;
|
83
|
+
|
84
|
+
if ((length = utf8_charlen(str, str_len)) < 0)
|
85
|
+
return -1;
|
86
|
+
|
87
|
+
switch (length) {
|
88
|
+
case 1:
|
89
|
+
uc = str[0];
|
90
|
+
break;
|
91
|
+
case 2:
|
92
|
+
uc = ((str[0] & 0x1F) << 6) + (str[1] & 0x3F);
|
93
|
+
if (uc < 0x80) uc = -1;
|
94
|
+
break;
|
95
|
+
case 3:
|
96
|
+
uc = ((str[0] & 0x0F) << 12) + ((str[1] & 0x3F) << 6)
|
97
|
+
+ (str[2] & 0x3F);
|
98
|
+
if (uc < 0x800 || (uc >= 0xD800 && uc < 0xE000) ||
|
99
|
+
(uc >= 0xFDD0 && uc < 0xFDF0)) uc = -1;
|
100
|
+
break;
|
101
|
+
case 4:
|
102
|
+
uc = ((str[0] & 0x07) << 18) + ((str[1] & 0x3F) << 12)
|
103
|
+
+ ((str[2] & 0x3F) << 6) + (str[3] & 0x3F);
|
104
|
+
if (uc < 0x10000 || uc >= 0x110000) uc = -1;
|
105
|
+
break;
|
106
|
+
default:
|
107
|
+
return -1;
|
108
|
+
}
|
109
|
+
|
110
|
+
if ((uc & 0xFFFF) >= 0xFFFE)
|
111
|
+
return -1;
|
112
|
+
|
113
|
+
*out = uc;
|
114
|
+
return length;
|
115
|
+
}
|
116
|
+
|
117
|
+
size_t git_utf8_char_length(const char *_str, size_t str_len)
|
118
|
+
{
|
119
|
+
const uint8_t *str = (const uint8_t *)_str;
|
120
|
+
size_t offset = 0, count = 0;
|
121
|
+
|
122
|
+
while (offset < str_len) {
|
123
|
+
int length = utf8_charlen(str + offset, str_len - offset);
|
124
|
+
|
125
|
+
if (length < 0)
|
126
|
+
length = 1;
|
127
|
+
|
128
|
+
offset += length;
|
129
|
+
count++;
|
130
|
+
}
|
131
|
+
|
132
|
+
return count;
|
133
|
+
}
|
134
|
+
|
135
|
+
size_t git_utf8_valid_buf_length(const char *_str, size_t str_len)
|
136
|
+
{
|
137
|
+
const uint8_t *str = (const uint8_t *)_str;
|
138
|
+
size_t offset = 0;
|
139
|
+
|
140
|
+
while (offset < str_len) {
|
141
|
+
int length = utf8_charlen(str + offset, str_len - offset);
|
142
|
+
|
143
|
+
if (length < 0)
|
144
|
+
break;
|
145
|
+
|
146
|
+
offset += length;
|
147
|
+
}
|
148
|
+
|
149
|
+
return offset;
|
150
|
+
}
|
@@ -0,0 +1,52 @@
|
|
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_utf8_h__
|
8
|
+
#define INCLUDE_utf8_h__
|
9
|
+
|
10
|
+
#include "common.h"
|
11
|
+
|
12
|
+
/*
|
13
|
+
* Iterate through an UTF-8 string, yielding one codepoint at a time.
|
14
|
+
*
|
15
|
+
* @param out pointer where to store the current codepoint
|
16
|
+
* @param str current position in the string
|
17
|
+
* @param str_len size left in the string
|
18
|
+
* @return length in bytes of the read codepoint; -1 if the codepoint was invalid
|
19
|
+
*/
|
20
|
+
extern int git_utf8_iterate(uint32_t *out, const char *str, size_t str_len);
|
21
|
+
|
22
|
+
/**
|
23
|
+
* Returns the number of characters in the given string.
|
24
|
+
*
|
25
|
+
* This function will count invalid codepoints; if any given byte is
|
26
|
+
* not part of a valid UTF-8 codepoint, then it will be counted toward
|
27
|
+
* the length in characters.
|
28
|
+
*
|
29
|
+
* In other words:
|
30
|
+
* 0x24 (U+0024 "$") has length 1
|
31
|
+
* 0xc2 0xa2 (U+00A2 "¢") has length 1
|
32
|
+
* 0x24 0xc2 0xa2 (U+0024 U+00A2 "$¢") has length 2
|
33
|
+
* 0xf0 0x90 0x8d 0x88 (U+10348 "𐍈") has length 1
|
34
|
+
* 0x24 0xc0 0xc1 0x34 (U+0024 <invalid> <invalid> "4) has length 4
|
35
|
+
*
|
36
|
+
* @param str string to scan
|
37
|
+
* @param str_len size of the string
|
38
|
+
* @return length in characters of the string
|
39
|
+
*/
|
40
|
+
extern size_t git_utf8_char_length(const char *str, size_t str_len);
|
41
|
+
|
42
|
+
/**
|
43
|
+
* Iterate through an UTF-8 string and stops after finding any invalid UTF-8
|
44
|
+
* codepoints.
|
45
|
+
*
|
46
|
+
* @param str string to scan
|
47
|
+
* @param str_len size of the string
|
48
|
+
* @return length in bytes of the string that contains valid data
|
49
|
+
*/
|
50
|
+
extern size_t git_utf8_valid_buf_length(const char *str, size_t str_len);
|
51
|
+
|
52
|
+
#endif
|
data/vendor/libgit2/src/util.c
CHANGED
@@ -13,7 +13,12 @@
|
|
13
13
|
# include "win32/utf-conv.h"
|
14
14
|
# include "win32/w32_buffer.h"
|
15
15
|
|
16
|
-
#
|
16
|
+
# ifndef WIN32_LEAN_AND_MEAN
|
17
|
+
# define WIN32_LEAN_AND_MEAN
|
18
|
+
# endif
|
19
|
+
# include <windows.h>
|
20
|
+
|
21
|
+
# ifdef GIT_QSORT_S
|
17
22
|
# include <search.h>
|
18
23
|
# endif
|
19
24
|
#endif
|
@@ -22,11 +27,15 @@
|
|
22
27
|
# include <Shlwapi.h>
|
23
28
|
#endif
|
24
29
|
|
30
|
+
#if defined(hpux) || defined(__hpux) || defined(_hpux)
|
31
|
+
# include <sys/pstat.h>
|
32
|
+
#endif
|
33
|
+
|
25
34
|
int git__strntol64(int64_t *result, const char *nptr, size_t nptr_len, const char **endptr, int base)
|
26
35
|
{
|
27
36
|
const char *p;
|
28
|
-
int64_t n, nn;
|
29
|
-
int c, ovfl,
|
37
|
+
int64_t n, nn, v;
|
38
|
+
int c, ovfl, neg, ndig;
|
30
39
|
|
31
40
|
p = nptr;
|
32
41
|
neg = 0;
|
@@ -101,19 +110,11 @@ int git__strntol64(int64_t *result, const char *nptr, size_t nptr_len, const cha
|
|
101
110
|
if (v >= base)
|
102
111
|
break;
|
103
112
|
v = neg ? -v : v;
|
104
|
-
if (n
|
105
|
-
ovfl = 1;
|
106
|
-
/* Keep on iterating until the end of this number */
|
107
|
-
continue;
|
108
|
-
}
|
109
|
-
nn = n * base;
|
110
|
-
if ((v > 0 && nn > INT64_MAX - v) ||
|
111
|
-
(v < 0 && nn < INT64_MIN - v)) {
|
113
|
+
if (git__multiply_int64_overflow(&nn, n, base) || git__add_int64_overflow(&n, nn, v)) {
|
112
114
|
ovfl = 1;
|
113
115
|
/* Keep on iterating until the end of this number */
|
114
116
|
continue;
|
115
117
|
}
|
116
|
-
n = nn + v;
|
117
118
|
}
|
118
119
|
|
119
120
|
Return:
|
@@ -672,13 +673,13 @@ size_t git__unescape(char *str)
|
|
672
673
|
return (pos - str);
|
673
674
|
}
|
674
675
|
|
675
|
-
#if defined(
|
676
|
+
#if defined(GIT_QSORT_S) || defined(GIT_QSORT_R_BSD)
|
676
677
|
typedef struct {
|
677
678
|
git__sort_r_cmp cmp;
|
678
679
|
void *payload;
|
679
680
|
} git__qsort_r_glue;
|
680
681
|
|
681
|
-
static int
|
682
|
+
static int GIT_LIBGIT2_CALL git__qsort_r_glue_cmp(
|
682
683
|
void *payload, const void *a, const void *b)
|
683
684
|
{
|
684
685
|
git__qsort_r_glue *glue = payload;
|
@@ -687,9 +688,9 @@ static int GIT_STDLIB_CALL git__qsort_r_glue_cmp(
|
|
687
688
|
#endif
|
688
689
|
|
689
690
|
|
690
|
-
#if !defined(
|
691
|
-
!defined(
|
692
|
-
!defined(
|
691
|
+
#if !defined(GIT_QSORT_R_BSD) && \
|
692
|
+
!defined(GIT_QSORT_R_GNU) && \
|
693
|
+
!defined(GIT_QSORT_S)
|
693
694
|
static void swap(uint8_t *a, uint8_t *b, size_t elsize)
|
694
695
|
{
|
695
696
|
char tmp[256];
|
@@ -720,12 +721,12 @@ static void insertsort(
|
|
720
721
|
void git__qsort_r(
|
721
722
|
void *els, size_t nel, size_t elsize, git__sort_r_cmp cmp, void *payload)
|
722
723
|
{
|
723
|
-
#if defined(
|
724
|
+
#if defined(GIT_QSORT_R_BSD)
|
724
725
|
git__qsort_r_glue glue = { cmp, payload };
|
725
726
|
qsort_r(els, nel, elsize, &glue, git__qsort_r_glue_cmp);
|
726
|
-
#elif defined(
|
727
|
+
#elif defined(GIT_QSORT_R_GNU)
|
727
728
|
qsort_r(els, nel, elsize, cmp, payload);
|
728
|
-
#elif defined(
|
729
|
+
#elif defined(GIT_QSORT_S)
|
729
730
|
git__qsort_r_glue glue = { cmp, payload };
|
730
731
|
qsort_s(els, nel, elsize, git__qsort_r_glue_cmp, &glue);
|
731
732
|
#else
|
@@ -733,131 +734,14 @@ void git__qsort_r(
|
|
733
734
|
#endif
|
734
735
|
}
|
735
736
|
|
736
|
-
/*
|
737
|
-
* git__utf8_iterate is taken from the utf8proc project,
|
738
|
-
* http://www.public-software-group.org/utf8proc
|
739
|
-
*
|
740
|
-
* Copyright (c) 2009 Public Software Group e. V., Berlin, Germany
|
741
|
-
*
|
742
|
-
* Permission is hereby granted, free of charge, to any person obtaining a
|
743
|
-
* copy of this software and associated documentation files (the ""Software""),
|
744
|
-
* to deal in the Software without restriction, including without limitation
|
745
|
-
* the rights to use, copy, modify, merge, publish, distribute, sublicense,
|
746
|
-
* and/or sell copies of the Software, and to permit persons to whom the
|
747
|
-
* Software is furnished to do so, subject to the following conditions:
|
748
|
-
*
|
749
|
-
* The above copyright notice and this permission notice shall be included in
|
750
|
-
* all copies or substantial portions of the Software.
|
751
|
-
*
|
752
|
-
* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
|
753
|
-
* IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
|
754
|
-
* FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
|
755
|
-
* AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
|
756
|
-
* LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
|
757
|
-
* FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
|
758
|
-
* DEALINGS IN THE SOFTWARE.
|
759
|
-
*/
|
760
|
-
|
761
|
-
static const int8_t utf8proc_utf8class[256] = {
|
762
|
-
1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
|
763
|
-
1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
|
764
|
-
1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
|
765
|
-
1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
|
766
|
-
1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
|
767
|
-
1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
|
768
|
-
1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
|
769
|
-
1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
|
770
|
-
0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
|
771
|
-
0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
|
772
|
-
0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
|
773
|
-
0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
|
774
|
-
2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2,
|
775
|
-
2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2,
|
776
|
-
3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3,
|
777
|
-
4, 4, 4, 4, 4, 4, 4, 4, 0, 0, 0, 0, 0, 0, 0, 0
|
778
|
-
};
|
779
|
-
|
780
|
-
static int util_utf8_charlen(const uint8_t *str, size_t str_len)
|
781
|
-
{
|
782
|
-
size_t length, i;
|
783
|
-
|
784
|
-
length = utf8proc_utf8class[str[0]];
|
785
|
-
if (!length)
|
786
|
-
return -1;
|
787
|
-
|
788
|
-
if (str_len > 0 && length > str_len)
|
789
|
-
return -1;
|
790
|
-
|
791
|
-
for (i = 1; i < length; i++) {
|
792
|
-
if ((str[i] & 0xC0) != 0x80)
|
793
|
-
return -1;
|
794
|
-
}
|
795
|
-
|
796
|
-
return (int)length;
|
797
|
-
}
|
798
|
-
|
799
|
-
int git__utf8_iterate(const uint8_t *str, int str_len, int32_t *dst)
|
800
|
-
{
|
801
|
-
int length;
|
802
|
-
int32_t uc = -1;
|
803
|
-
|
804
|
-
*dst = -1;
|
805
|
-
length = util_utf8_charlen(str, str_len);
|
806
|
-
if (length < 0)
|
807
|
-
return -1;
|
808
|
-
|
809
|
-
switch (length) {
|
810
|
-
case 1:
|
811
|
-
uc = str[0];
|
812
|
-
break;
|
813
|
-
case 2:
|
814
|
-
uc = ((str[0] & 0x1F) << 6) + (str[1] & 0x3F);
|
815
|
-
if (uc < 0x80) uc = -1;
|
816
|
-
break;
|
817
|
-
case 3:
|
818
|
-
uc = ((str[0] & 0x0F) << 12) + ((str[1] & 0x3F) << 6)
|
819
|
-
+ (str[2] & 0x3F);
|
820
|
-
if (uc < 0x800 || (uc >= 0xD800 && uc < 0xE000) ||
|
821
|
-
(uc >= 0xFDD0 && uc < 0xFDF0)) uc = -1;
|
822
|
-
break;
|
823
|
-
case 4:
|
824
|
-
uc = ((str[0] & 0x07) << 18) + ((str[1] & 0x3F) << 12)
|
825
|
-
+ ((str[2] & 0x3F) << 6) + (str[3] & 0x3F);
|
826
|
-
if (uc < 0x10000 || uc >= 0x110000) uc = -1;
|
827
|
-
break;
|
828
|
-
}
|
829
|
-
|
830
|
-
if (uc < 0 || ((uc & 0xFFFF) >= 0xFFFE))
|
831
|
-
return -1;
|
832
|
-
|
833
|
-
*dst = uc;
|
834
|
-
return length;
|
835
|
-
}
|
836
|
-
|
837
|
-
size_t git__utf8_valid_buf_length(const uint8_t *str, size_t str_len)
|
838
|
-
{
|
839
|
-
size_t offset = 0;
|
840
|
-
|
841
|
-
while (offset < str_len) {
|
842
|
-
int length = util_utf8_charlen(str + offset, str_len - offset);
|
843
|
-
|
844
|
-
if (length < 0)
|
845
|
-
break;
|
846
|
-
|
847
|
-
offset += length;
|
848
|
-
}
|
849
|
-
|
850
|
-
return offset;
|
851
|
-
}
|
852
|
-
|
853
737
|
#ifdef GIT_WIN32
|
854
|
-
int git__getenv(
|
738
|
+
int git__getenv(git_str *out, const char *name)
|
855
739
|
{
|
856
740
|
wchar_t *wide_name = NULL, *wide_value = NULL;
|
857
741
|
DWORD value_len;
|
858
742
|
int error = -1;
|
859
743
|
|
860
|
-
|
744
|
+
git_str_clear(out);
|
861
745
|
|
862
746
|
if (git__utf8_to_16_alloc(&wide_name, name) < 0)
|
863
747
|
return -1;
|
@@ -870,8 +754,8 @@ int git__getenv(git_buf *out, const char *name)
|
|
870
754
|
}
|
871
755
|
|
872
756
|
if (value_len)
|
873
|
-
error =
|
874
|
-
else if (GetLastError() == ERROR_ENVVAR_NOT_FOUND)
|
757
|
+
error = git_str_put_w(out, wide_value, value_len);
|
758
|
+
else if (GetLastError() == ERROR_SUCCESS || GetLastError() == ERROR_ENVVAR_NOT_FOUND)
|
875
759
|
error = GIT_ENOTFOUND;
|
876
760
|
else
|
877
761
|
git_error_set(GIT_ERROR_OS, "could not read environment variable '%s'", name);
|
@@ -881,15 +765,55 @@ int git__getenv(git_buf *out, const char *name)
|
|
881
765
|
return error;
|
882
766
|
}
|
883
767
|
#else
|
884
|
-
int git__getenv(
|
768
|
+
int git__getenv(git_str *out, const char *name)
|
885
769
|
{
|
886
770
|
const char *val = getenv(name);
|
887
771
|
|
888
|
-
|
772
|
+
git_str_clear(out);
|
889
773
|
|
890
774
|
if (!val)
|
891
775
|
return GIT_ENOTFOUND;
|
892
776
|
|
893
|
-
return
|
777
|
+
return git_str_puts(out, val);
|
894
778
|
}
|
895
779
|
#endif
|
780
|
+
|
781
|
+
/*
|
782
|
+
* By doing this in two steps we can at least get
|
783
|
+
* the function to be somewhat coherent, even
|
784
|
+
* with this disgusting nest of #ifdefs.
|
785
|
+
*/
|
786
|
+
#ifndef _SC_NPROCESSORS_ONLN
|
787
|
+
# ifdef _SC_NPROC_ONLN
|
788
|
+
# define _SC_NPROCESSORS_ONLN _SC_NPROC_ONLN
|
789
|
+
# elif defined _SC_CRAY_NCPU
|
790
|
+
# define _SC_NPROCESSORS_ONLN _SC_CRAY_NCPU
|
791
|
+
# endif
|
792
|
+
#endif
|
793
|
+
|
794
|
+
int git__online_cpus(void)
|
795
|
+
{
|
796
|
+
#ifdef _SC_NPROCESSORS_ONLN
|
797
|
+
long ncpus;
|
798
|
+
#endif
|
799
|
+
|
800
|
+
#ifdef _WIN32
|
801
|
+
SYSTEM_INFO info;
|
802
|
+
GetSystemInfo(&info);
|
803
|
+
|
804
|
+
if ((int)info.dwNumberOfProcessors > 0)
|
805
|
+
return (int)info.dwNumberOfProcessors;
|
806
|
+
#elif defined(hpux) || defined(__hpux) || defined(_hpux)
|
807
|
+
struct pst_dynamic psd;
|
808
|
+
|
809
|
+
if (!pstat_getdynamic(&psd, sizeof(psd), (size_t)1, 0))
|
810
|
+
return (int)psd.psd_proc_cnt;
|
811
|
+
#endif
|
812
|
+
|
813
|
+
#ifdef _SC_NPROCESSORS_ONLN
|
814
|
+
if ((ncpus = (long)sysconf(_SC_NPROCESSORS_ONLN)) > 0)
|
815
|
+
return (int)ncpus;
|
816
|
+
#endif
|
817
|
+
|
818
|
+
return 1;
|
819
|
+
}
|
data/vendor/libgit2/src/util.h
CHANGED
@@ -7,22 +7,18 @@
|
|
7
7
|
#ifndef INCLUDE_util_h__
|
8
8
|
#define INCLUDE_util_h__
|
9
9
|
|
10
|
-
#include "common.h"
|
11
|
-
|
12
10
|
#ifndef GIT_WIN32
|
13
11
|
# include <ctype.h>
|
14
12
|
#endif
|
15
13
|
|
16
|
-
#include "
|
17
|
-
|
18
|
-
#include "buffer.h"
|
14
|
+
#include "str.h"
|
19
15
|
#include "common.h"
|
20
16
|
#include "strnlen.h"
|
21
|
-
#include "thread
|
17
|
+
#include "thread.h"
|
22
18
|
|
23
19
|
#define ARRAY_SIZE(x) (sizeof(x)/sizeof(x[0]))
|
24
20
|
#define bitsizeof(x) (CHAR_BIT * sizeof(x))
|
25
|
-
#define MSB(x, bits) ((x) & (~
|
21
|
+
#define MSB(x, bits) ((x) & (~UINT64_C(0) << (bitsizeof(x) - (bits))))
|
26
22
|
#ifndef min
|
27
23
|
# define min(a,b) ((a) < (b) ? (a) : (b))
|
28
24
|
#endif
|
@@ -34,15 +30,13 @@
|
|
34
30
|
# define GIT_CONTAINER_OF(ptr, type, member) \
|
35
31
|
__builtin_choose_expr( \
|
36
32
|
__builtin_offsetof(type, member) == 0 && \
|
37
|
-
__builtin_types_compatible_p(
|
33
|
+
__builtin_types_compatible_p(__typeof__(&((type *) 0)->member), __typeof__(ptr)), \
|
38
34
|
((type *) (ptr)), \
|
39
35
|
(void)0)
|
40
36
|
#else
|
41
37
|
# define GIT_CONTAINER_OF(ptr, type, member) (type *)(ptr)
|
42
38
|
#endif
|
43
39
|
|
44
|
-
#define GIT_DATE_RFC2822_SZ 32
|
45
|
-
|
46
40
|
/**
|
47
41
|
* Return the length of a constant string.
|
48
42
|
* We are aware that `strlen` performs the same task and is usually
|
@@ -168,30 +162,41 @@ extern int git__strncasecmp(const char *a, const char *b, size_t sz);
|
|
168
162
|
|
169
163
|
extern int git__strcasesort_cmp(const char *a, const char *b);
|
170
164
|
|
165
|
+
/*
|
166
|
+
* Compare some NUL-terminated `a` to a possibly non-NUL terminated
|
167
|
+
* `b` of length `b_len`; like `strncmp` but ensuring that
|
168
|
+
* `strlen(a) == b_len` as well.
|
169
|
+
*/
|
170
|
+
GIT_INLINE(int) git__strlcmp(const char *a, const char *b, size_t b_len)
|
171
|
+
{
|
172
|
+
int cmp = strncmp(a, b, b_len);
|
173
|
+
return cmp ? cmp : (int)a[b_len];
|
174
|
+
}
|
175
|
+
|
171
176
|
typedef struct {
|
172
|
-
|
177
|
+
git_atomic32 refcount;
|
173
178
|
void *owner;
|
174
179
|
} git_refcount;
|
175
180
|
|
176
181
|
typedef void (*git_refcount_freeptr)(void *r);
|
177
182
|
|
178
183
|
#define GIT_REFCOUNT_INC(r) { \
|
179
|
-
|
184
|
+
git_atomic32_inc(&(r)->rc.refcount); \
|
180
185
|
}
|
181
186
|
|
182
187
|
#define GIT_REFCOUNT_DEC(_r, do_free) { \
|
183
188
|
git_refcount *r = &(_r)->rc; \
|
184
|
-
int val =
|
189
|
+
int val = git_atomic32_dec(&r->refcount); \
|
185
190
|
if (val <= 0 && r->owner == NULL) { do_free(_r); } \
|
186
191
|
}
|
187
192
|
|
188
193
|
#define GIT_REFCOUNT_OWN(r, o) { \
|
189
|
-
(void)
|
194
|
+
(void)git_atomic_swap((r)->rc.owner, o); \
|
190
195
|
}
|
191
196
|
|
192
|
-
#define GIT_REFCOUNT_OWNER(r)
|
197
|
+
#define GIT_REFCOUNT_OWNER(r) git_atomic_load((r)->rc.owner)
|
193
198
|
|
194
|
-
#define GIT_REFCOUNT_VAL(r)
|
199
|
+
#define GIT_REFCOUNT_VAL(r) git_atomic32_get((r)->rc.refcount)
|
195
200
|
|
196
201
|
|
197
202
|
static signed char from_hex[] = {
|
@@ -287,26 +292,6 @@ GIT_INLINE(bool) git__isxdigit(int c)
|
|
287
292
|
*/
|
288
293
|
extern int git__parse_bool(int *out, const char *value);
|
289
294
|
|
290
|
-
/*
|
291
|
-
* Parse a string into a value as a git_time_t.
|
292
|
-
*
|
293
|
-
* Sample valid input:
|
294
|
-
* - "yesterday"
|
295
|
-
* - "July 17, 2003"
|
296
|
-
* - "2003-7-17 08:23"
|
297
|
-
*/
|
298
|
-
extern int git__date_parse(git_time_t *out, const char *date);
|
299
|
-
|
300
|
-
/*
|
301
|
-
* Format a git_time as a RFC2822 string
|
302
|
-
*
|
303
|
-
* @param out buffer to store formatted date; a '\\0' terminator will automatically be added.
|
304
|
-
* @param len size of the buffer; should be atleast `GIT_DATE_RFC2822_SZ` in size;
|
305
|
-
* @param date the date to be formatted
|
306
|
-
* @return 0 if successful; -1 on error
|
307
|
-
*/
|
308
|
-
extern int git__date_rfc2822_fmt(char *out, size_t len, const git_time *date);
|
309
|
-
|
310
295
|
/*
|
311
296
|
* Unescapes a string in-place.
|
312
297
|
*
|
@@ -316,27 +301,6 @@ extern int git__date_rfc2822_fmt(char *out, size_t len, const git_time *date);
|
|
316
301
|
*/
|
317
302
|
extern size_t git__unescape(char *str);
|
318
303
|
|
319
|
-
/*
|
320
|
-
* Iterate through an UTF-8 string, yielding one
|
321
|
-
* codepoint at a time.
|
322
|
-
*
|
323
|
-
* @param str current position in the string
|
324
|
-
* @param str_len size left in the string; -1 if the string is NULL-terminated
|
325
|
-
* @param dst pointer where to store the current codepoint
|
326
|
-
* @return length in bytes of the read codepoint; -1 if the codepoint was invalid
|
327
|
-
*/
|
328
|
-
extern int git__utf8_iterate(const uint8_t *str, int str_len, int32_t *dst);
|
329
|
-
|
330
|
-
/*
|
331
|
-
* Iterate through an UTF-8 string and stops after finding any invalid UTF-8
|
332
|
-
* codepoints.
|
333
|
-
*
|
334
|
-
* @param str string to scan
|
335
|
-
* @param str_len size of the string
|
336
|
-
* @return length in bytes of the string that contains valid data
|
337
|
-
*/
|
338
|
-
extern size_t git__utf8_valid_buf_length(const uint8_t *str, size_t str_len);
|
339
|
-
|
340
304
|
/*
|
341
305
|
* Safely zero-out memory, making sure that the compiler
|
342
306
|
* doesn't optimize away the operation.
|
@@ -380,7 +344,7 @@ GIT_INLINE(double) git__timer(void)
|
|
380
344
|
return (double)time * scaling_factor / 1.0E9;
|
381
345
|
}
|
382
346
|
|
383
|
-
#elif defined(
|
347
|
+
#elif defined(__amigaos4__)
|
384
348
|
|
385
349
|
#include <proto/timer.h>
|
386
350
|
|
@@ -397,22 +361,26 @@ GIT_INLINE(double) git__timer(void)
|
|
397
361
|
|
398
362
|
GIT_INLINE(double) git__timer(void)
|
399
363
|
{
|
400
|
-
struct
|
364
|
+
struct timeval tv;
|
401
365
|
|
402
|
-
|
366
|
+
#ifdef CLOCK_MONOTONIC
|
367
|
+
struct timespec tp;
|
368
|
+
if (clock_gettime(CLOCK_MONOTONIC, &tp) == 0)
|
403
369
|
return (double) tp.tv_sec + (double) tp.tv_nsec / 1.0E9;
|
404
|
-
|
405
|
-
|
406
|
-
|
407
|
-
|
408
|
-
|
409
|
-
return (double)tv.tv_sec + (double)tv.tv_usec / 1.0E6;
|
410
|
-
}
|
370
|
+
#endif
|
371
|
+
|
372
|
+
/* Fall back to using gettimeofday */
|
373
|
+
gettimeofday(&tv, NULL);
|
374
|
+
return (double)tv.tv_sec + (double)tv.tv_usec / 1.0E6;
|
411
375
|
}
|
412
376
|
|
413
377
|
#endif
|
414
378
|
|
415
|
-
extern int git__getenv(
|
379
|
+
extern int git__getenv(git_str *out, const char *name);
|
380
|
+
|
381
|
+
extern int git__online_cpus(void);
|
382
|
+
|
383
|
+
GIT_INLINE(int) git__noop(void) { return 0; }
|
416
384
|
|
417
385
|
#include "alloc.h"
|
418
386
|
|