rugged 0.28.5 → 1.1.1
Sign up to get free protection for your applications and to get access to all the features.
- checksums.yaml +4 -4
- data/README.md +2 -2
- data/ext/rugged/extconf.rb +3 -1
- data/ext/rugged/rugged.c +35 -31
- data/ext/rugged/rugged.h +13 -0
- data/ext/rugged/rugged_blob.c +11 -9
- data/ext/rugged/rugged_commit.c +18 -16
- data/ext/rugged/rugged_config.c +1 -1
- data/ext/rugged/rugged_diff.c +4 -26
- data/ext/rugged/rugged_index.c +4 -2
- data/ext/rugged/rugged_note.c +5 -3
- data/ext/rugged/rugged_object.c +57 -10
- data/ext/rugged/rugged_rebase.c +3 -1
- data/ext/rugged/rugged_remote.c +32 -8
- data/ext/rugged/rugged_repo.c +232 -17
- data/ext/rugged/rugged_tag.c +8 -6
- data/ext/rugged/rugged_tree.c +18 -16
- data/lib/rugged/commit.rb +17 -4
- data/lib/rugged/repository.rb +5 -6
- data/lib/rugged/submodule_collection.rb +4 -4
- data/lib/rugged/version.rb +1 -1
- data/vendor/libgit2/CMakeLists.txt +57 -75
- data/vendor/libgit2/COPYING +28 -0
- data/vendor/libgit2/cmake/{Modules/AddCFlagIfSupported.cmake → AddCFlagIfSupported.cmake} +0 -0
- data/vendor/libgit2/cmake/{Modules/EnableWarnings.cmake → EnableWarnings.cmake} +5 -1
- data/vendor/libgit2/cmake/{Modules/FindCoreFoundation.cmake → FindCoreFoundation.cmake} +2 -2
- data/vendor/libgit2/cmake/{Modules/FindGSSAPI.cmake → FindGSSAPI.cmake} +1 -1
- data/vendor/libgit2/cmake/FindGSSFramework.cmake +28 -0
- data/vendor/libgit2/cmake/{Modules/FindHTTP_Parser.cmake → FindHTTP_Parser.cmake} +0 -0
- data/vendor/libgit2/cmake/{Modules/FindIconv.cmake → FindIconv.cmake} +0 -0
- data/vendor/libgit2/cmake/FindPCRE.cmake +38 -0
- data/vendor/libgit2/cmake/FindPCRE2.cmake +37 -0
- data/vendor/libgit2/cmake/{Modules/FindPkgLibraries.cmake → FindPkgLibraries.cmake} +0 -0
- data/vendor/libgit2/cmake/{Modules/FindSecurity.cmake → FindSecurity.cmake} +2 -2
- data/vendor/libgit2/cmake/{Modules/FindStatNsec.cmake → FindStatNsec.cmake} +6 -0
- data/vendor/libgit2/cmake/{Modules/FindmbedTLS.cmake → FindmbedTLS.cmake} +0 -0
- data/vendor/libgit2/cmake/{Modules/IdeSplitSources.cmake → IdeSplitSources.cmake} +0 -0
- data/vendor/libgit2/cmake/PkgBuildConfig.cmake +77 -0
- data/vendor/libgit2/cmake/SanitizeBool.cmake +20 -0
- data/vendor/libgit2/cmake/SelectGSSAPI.cmake +48 -0
- data/vendor/libgit2/cmake/SelectHTTPSBackend.cmake +120 -0
- data/vendor/libgit2/cmake/SelectHashes.cmake +61 -0
- data/vendor/libgit2/deps/http-parser/CMakeLists.txt +4 -3
- data/vendor/libgit2/deps/http-parser/http_parser.c +11 -6
- data/vendor/libgit2/deps/ntlmclient/CMakeLists.txt +25 -0
- data/vendor/libgit2/deps/ntlmclient/compat.h +28 -0
- data/vendor/libgit2/deps/ntlmclient/crypt.h +64 -0
- data/vendor/libgit2/deps/ntlmclient/crypt_commoncrypto.c +120 -0
- data/vendor/libgit2/deps/ntlmclient/crypt_commoncrypto.h +18 -0
- data/vendor/libgit2/deps/ntlmclient/crypt_mbedtls.c +145 -0
- data/vendor/libgit2/deps/ntlmclient/crypt_mbedtls.h +18 -0
- data/vendor/libgit2/deps/ntlmclient/crypt_openssl.c +130 -0
- data/vendor/libgit2/deps/ntlmclient/crypt_openssl.h +21 -0
- data/vendor/libgit2/deps/ntlmclient/ntlm.c +1419 -0
- data/vendor/libgit2/deps/ntlmclient/ntlm.h +174 -0
- data/vendor/libgit2/deps/ntlmclient/ntlmclient.h +320 -0
- data/vendor/libgit2/deps/ntlmclient/unicode.h +36 -0
- data/vendor/libgit2/deps/ntlmclient/unicode_builtin.c +445 -0
- data/vendor/libgit2/deps/ntlmclient/unicode_iconv.c +201 -0
- data/vendor/libgit2/deps/ntlmclient/utf8.h +1257 -0
- data/vendor/libgit2/deps/ntlmclient/util.c +35 -0
- data/vendor/libgit2/deps/ntlmclient/util.h +15 -0
- data/vendor/libgit2/deps/pcre/CMakeLists.txt +140 -0
- data/vendor/libgit2/deps/pcre/COPYING +5 -0
- data/vendor/libgit2/deps/pcre/LICENCE +93 -0
- data/vendor/libgit2/deps/pcre/cmake/COPYING-CMAKE-SCRIPTS +22 -0
- data/vendor/libgit2/deps/pcre/cmake/FindEditline.cmake +17 -0
- data/vendor/libgit2/deps/pcre/cmake/FindPackageHandleStandardArgs.cmake +58 -0
- data/vendor/libgit2/deps/pcre/cmake/FindReadline.cmake +29 -0
- data/vendor/libgit2/deps/pcre/config.h.in +57 -0
- data/vendor/libgit2/deps/pcre/pcre.h +641 -0
- data/vendor/libgit2/deps/pcre/pcre_byte_order.c +319 -0
- data/vendor/libgit2/deps/pcre/pcre_chartables.c +198 -0
- data/vendor/libgit2/deps/pcre/pcre_compile.c +9812 -0
- data/vendor/libgit2/deps/pcre/pcre_config.c +190 -0
- data/vendor/libgit2/deps/pcre/pcre_dfa_exec.c +3676 -0
- data/vendor/libgit2/deps/pcre/pcre_exec.c +7173 -0
- data/vendor/libgit2/deps/pcre/pcre_fullinfo.c +245 -0
- data/vendor/libgit2/deps/pcre/pcre_get.c +669 -0
- data/vendor/libgit2/deps/pcre/pcre_globals.c +86 -0
- data/vendor/libgit2/deps/pcre/pcre_internal.h +2787 -0
- data/vendor/libgit2/deps/pcre/pcre_jit_compile.c +11913 -0
- data/vendor/libgit2/deps/pcre/pcre_maketables.c +156 -0
- data/vendor/libgit2/deps/pcre/pcre_newline.c +210 -0
- data/vendor/libgit2/deps/pcre/pcre_ord2utf8.c +94 -0
- data/vendor/libgit2/deps/pcre/pcre_printint.c +834 -0
- data/vendor/libgit2/deps/pcre/pcre_refcount.c +92 -0
- data/vendor/libgit2/deps/pcre/pcre_string_utils.c +211 -0
- data/vendor/libgit2/deps/pcre/pcre_study.c +1686 -0
- data/vendor/libgit2/deps/pcre/pcre_tables.c +727 -0
- data/vendor/libgit2/deps/pcre/pcre_ucd.c +3644 -0
- data/vendor/libgit2/deps/pcre/pcre_valid_utf8.c +301 -0
- data/vendor/libgit2/deps/pcre/pcre_version.c +98 -0
- data/vendor/libgit2/deps/pcre/pcre_xclass.c +268 -0
- data/vendor/libgit2/deps/pcre/pcreposix.c +420 -0
- data/vendor/libgit2/deps/pcre/pcreposix.h +117 -0
- data/vendor/libgit2/deps/pcre/ucp.h +224 -0
- data/vendor/libgit2/deps/zlib/CMakeLists.txt +6 -5
- data/vendor/libgit2/deps/zlib/adler32.c +0 -7
- data/vendor/libgit2/deps/zlib/crc32.c +0 -7
- data/vendor/libgit2/deps/zlib/deflate.c +1 -0
- data/vendor/libgit2/include/git2.h +2 -0
- data/vendor/libgit2/include/git2/annotated_commit.h +1 -1
- data/vendor/libgit2/include/git2/apply.h +24 -2
- data/vendor/libgit2/include/git2/attr.h +23 -13
- data/vendor/libgit2/include/git2/blame.h +4 -2
- data/vendor/libgit2/include/git2/blob.h +61 -13
- data/vendor/libgit2/include/git2/branch.h +74 -57
- data/vendor/libgit2/include/git2/buffer.h +20 -14
- data/vendor/libgit2/include/git2/cert.h +135 -0
- data/vendor/libgit2/include/git2/checkout.h +46 -14
- data/vendor/libgit2/include/git2/cherrypick.h +3 -3
- data/vendor/libgit2/include/git2/clone.h +2 -2
- data/vendor/libgit2/include/git2/commit.h +23 -1
- data/vendor/libgit2/include/git2/common.h +34 -8
- data/vendor/libgit2/include/git2/config.h +13 -13
- data/vendor/libgit2/include/git2/cred_helpers.h +4 -42
- data/vendor/libgit2/include/git2/credential.h +314 -0
- data/vendor/libgit2/include/git2/credential_helpers.h +52 -0
- data/vendor/libgit2/include/git2/deprecated.h +362 -4
- data/vendor/libgit2/include/git2/describe.h +4 -4
- data/vendor/libgit2/include/git2/diff.h +17 -15
- data/vendor/libgit2/include/git2/errors.h +5 -2
- data/vendor/libgit2/include/git2/filter.h +8 -0
- data/vendor/libgit2/include/git2/index.h +5 -5
- data/vendor/libgit2/include/git2/indexer.h +49 -4
- data/vendor/libgit2/include/git2/merge.h +6 -10
- data/vendor/libgit2/include/git2/net.h +0 -5
- data/vendor/libgit2/include/git2/object.h +2 -14
- data/vendor/libgit2/include/git2/odb.h +18 -22
- data/vendor/libgit2/include/git2/odb_backend.h +5 -4
- data/vendor/libgit2/include/git2/oid.h +11 -6
- data/vendor/libgit2/include/git2/pack.h +13 -2
- data/vendor/libgit2/include/git2/proxy.h +6 -4
- data/vendor/libgit2/include/git2/rebase.h +46 -2
- data/vendor/libgit2/include/git2/refs.h +22 -3
- data/vendor/libgit2/include/git2/remote.h +40 -15
- data/vendor/libgit2/include/git2/repository.h +124 -58
- data/vendor/libgit2/include/git2/revert.h +1 -1
- data/vendor/libgit2/include/git2/revwalk.h +7 -3
- data/vendor/libgit2/include/git2/stash.h +4 -4
- data/vendor/libgit2/include/git2/status.h +25 -16
- data/vendor/libgit2/include/git2/strarray.h +6 -10
- data/vendor/libgit2/include/git2/submodule.h +20 -3
- data/vendor/libgit2/include/git2/sys/alloc.h +9 -9
- data/vendor/libgit2/include/git2/sys/cred.h +15 -0
- data/vendor/libgit2/include/git2/sys/credential.h +90 -0
- data/vendor/libgit2/include/git2/sys/index.h +4 -2
- data/vendor/libgit2/include/git2/sys/mempack.h +2 -1
- data/vendor/libgit2/include/git2/sys/merge.h +1 -1
- data/vendor/libgit2/include/git2/sys/odb_backend.h +48 -4
- data/vendor/libgit2/include/git2/sys/refdb_backend.h +164 -21
- data/vendor/libgit2/include/git2/sys/repository.h +17 -6
- data/vendor/libgit2/include/git2/sys/transport.h +4 -4
- data/vendor/libgit2/include/git2/tag.h +11 -2
- data/vendor/libgit2/include/git2/trace.h +2 -2
- data/vendor/libgit2/include/git2/transport.h +11 -340
- data/vendor/libgit2/include/git2/tree.h +7 -3
- data/vendor/libgit2/include/git2/types.h +4 -89
- data/vendor/libgit2/include/git2/version.h +5 -5
- data/vendor/libgit2/include/git2/worktree.h +5 -5
- data/vendor/libgit2/src/CMakeLists.txt +147 -272
- data/vendor/libgit2/src/alloc.c +2 -14
- data/vendor/libgit2/src/{stdalloc.c → allocators/stdalloc.c} +3 -4
- data/vendor/libgit2/src/{stdalloc.h → allocators/stdalloc.h} +4 -4
- data/vendor/libgit2/src/allocators/win32_crtdbg.c +118 -0
- data/vendor/libgit2/src/{transports/cred.h → allocators/win32_crtdbg.h} +5 -4
- data/vendor/libgit2/src/apply.c +36 -16
- data/vendor/libgit2/src/assert_safe.h +58 -0
- data/vendor/libgit2/src/attr.c +70 -64
- data/vendor/libgit2/src/attr_file.c +197 -99
- data/vendor/libgit2/src/attr_file.h +9 -9
- data/vendor/libgit2/src/attrcache.c +48 -49
- data/vendor/libgit2/src/attrcache.h +2 -1
- data/vendor/libgit2/src/blame.c +34 -15
- data/vendor/libgit2/src/blame.h +1 -1
- data/vendor/libgit2/src/blame_git.c +27 -10
- data/vendor/libgit2/src/blob.c +92 -17
- data/vendor/libgit2/src/blob.h +2 -2
- data/vendor/libgit2/src/branch.c +68 -42
- data/vendor/libgit2/src/buffer.c +11 -3
- data/vendor/libgit2/src/buffer.h +1 -0
- data/vendor/libgit2/src/cache.c +34 -58
- data/vendor/libgit2/src/cache.h +1 -1
- data/vendor/libgit2/src/cc-compat.h +5 -0
- data/vendor/libgit2/src/checkout.c +73 -86
- data/vendor/libgit2/src/cherrypick.c +9 -1
- data/vendor/libgit2/src/clone.c +130 -27
- data/vendor/libgit2/src/clone.h +4 -0
- data/vendor/libgit2/src/commit.c +70 -22
- data/vendor/libgit2/src/commit.h +6 -0
- data/vendor/libgit2/src/commit_list.c +28 -76
- data/vendor/libgit2/src/commit_list.h +2 -2
- data/vendor/libgit2/src/common.h +4 -75
- data/vendor/libgit2/src/config.c +34 -47
- data/vendor/libgit2/src/config.h +7 -6
- data/vendor/libgit2/src/config_backend.h +12 -0
- data/vendor/libgit2/src/config_cache.c +42 -39
- data/vendor/libgit2/src/config_entries.c +76 -98
- data/vendor/libgit2/src/config_entries.h +1 -0
- data/vendor/libgit2/src/config_file.c +346 -380
- data/vendor/libgit2/src/config_mem.c +12 -16
- data/vendor/libgit2/src/config_parse.c +50 -30
- data/vendor/libgit2/src/config_parse.h +13 -12
- data/vendor/libgit2/src/config_snapshot.c +207 -0
- data/vendor/libgit2/src/crlf.c +14 -14
- data/vendor/libgit2/src/describe.c +26 -21
- data/vendor/libgit2/src/diff.c +53 -75
- data/vendor/libgit2/src/diff.h +4 -3
- data/vendor/libgit2/src/diff_driver.c +37 -38
- data/vendor/libgit2/src/diff_file.c +15 -11
- data/vendor/libgit2/src/diff_file.h +2 -2
- data/vendor/libgit2/src/diff_generate.c +36 -37
- data/vendor/libgit2/src/diff_generate.h +2 -2
- data/vendor/libgit2/src/diff_parse.c +3 -4
- data/vendor/libgit2/src/diff_print.c +86 -71
- data/vendor/libgit2/src/diff_stats.c +13 -12
- data/vendor/libgit2/src/diff_tform.c +15 -16
- data/vendor/libgit2/src/errors.c +23 -25
- data/vendor/libgit2/src/errors.h +81 -0
- data/vendor/libgit2/src/features.h.in +9 -2
- data/vendor/libgit2/src/fetch.c +9 -2
- data/vendor/libgit2/src/fetchhead.c +9 -9
- data/vendor/libgit2/src/filebuf.c +1 -1
- data/vendor/libgit2/src/filebuf.h +1 -1
- data/vendor/libgit2/src/filter.c +19 -11
- data/vendor/libgit2/src/{fileops.c → futils.c} +23 -20
- data/vendor/libgit2/src/{fileops.h → futils.h} +8 -8
- data/vendor/libgit2/src/global.c +3 -1
- data/vendor/libgit2/src/hash.c +61 -0
- data/vendor/libgit2/src/hash.h +19 -21
- data/vendor/libgit2/src/hash/sha1.h +38 -0
- data/vendor/libgit2/src/hash/{hash_collisiondetect.h → sha1/collisiondetect.c} +14 -17
- data/vendor/libgit2/src/{sha1_lookup.h → hash/sha1/collisiondetect.h} +8 -8
- data/vendor/libgit2/src/hash/{hash_common_crypto.h → sha1/common_crypto.c} +15 -19
- data/vendor/libgit2/src/hash/sha1/common_crypto.h +19 -0
- data/vendor/libgit2/src/hash/{hash_generic.c → sha1/generic.c} +22 -10
- data/vendor/libgit2/src/hash/{hash_generic.h → sha1/generic.h} +4 -14
- data/vendor/libgit2/src/hash/{hash_mbedtls.c → sha1/mbedtls.c} +15 -7
- data/vendor/libgit2/src/hash/{hash_mbedtls.h → sha1/mbedtls.h} +6 -11
- data/vendor/libgit2/src/hash/{hash_openssl.h → sha1/openssl.c} +14 -18
- data/vendor/libgit2/src/{refdb_fs.h → hash/sha1/openssl.h} +8 -8
- data/vendor/libgit2/src/hash/{sha1dc → sha1/sha1dc}/sha1.c +14 -3
- data/vendor/libgit2/src/hash/{sha1dc → sha1/sha1dc}/sha1.h +0 -0
- data/vendor/libgit2/src/hash/{sha1dc → sha1/sha1dc}/ubc_check.c +0 -0
- data/vendor/libgit2/src/hash/{sha1dc → sha1/sha1dc}/ubc_check.h +0 -0
- data/vendor/libgit2/src/hash/{hash_win32.c → sha1/win32.c} +34 -24
- data/vendor/libgit2/src/hash/{hash_win32.h → sha1/win32.h} +6 -19
- data/vendor/libgit2/src/hashsig.c +1 -1
- data/vendor/libgit2/src/idxmap.c +73 -69
- data/vendor/libgit2/src/idxmap.h +151 -15
- data/vendor/libgit2/src/ignore.c +26 -35
- data/vendor/libgit2/src/index.c +123 -95
- data/vendor/libgit2/src/index.h +1 -1
- data/vendor/libgit2/src/indexer.c +99 -78
- data/vendor/libgit2/src/integer.h +26 -4
- data/vendor/libgit2/src/iterator.c +36 -32
- data/vendor/libgit2/src/iterator.h +8 -8
- data/vendor/libgit2/src/map.h +1 -1
- data/vendor/libgit2/src/merge.c +93 -57
- data/vendor/libgit2/src/merge.h +2 -2
- data/vendor/libgit2/src/merge_driver.c +5 -5
- data/vendor/libgit2/src/merge_file.c +5 -7
- data/vendor/libgit2/src/midx.c +418 -0
- data/vendor/libgit2/src/midx.h +83 -0
- data/vendor/libgit2/src/mwindow.c +144 -74
- data/vendor/libgit2/src/mwindow.h +4 -4
- data/vendor/libgit2/src/net.c +416 -0
- data/vendor/libgit2/src/net.h +57 -0
- data/vendor/libgit2/src/netops.c +6 -222
- data/vendor/libgit2/src/netops.h +1 -37
- data/vendor/libgit2/src/notes.c +8 -5
- data/vendor/libgit2/src/object.c +5 -4
- data/vendor/libgit2/src/object.h +2 -0
- data/vendor/libgit2/src/odb.c +54 -32
- data/vendor/libgit2/src/odb.h +3 -2
- data/vendor/libgit2/src/odb_loose.c +20 -13
- data/vendor/libgit2/src/odb_mempack.c +15 -24
- data/vendor/libgit2/src/odb_pack.c +4 -5
- data/vendor/libgit2/src/offmap.c +43 -55
- data/vendor/libgit2/src/offmap.h +102 -24
- data/vendor/libgit2/src/oid.c +21 -8
- data/vendor/libgit2/src/oidmap.c +39 -57
- data/vendor/libgit2/src/oidmap.h +99 -19
- data/vendor/libgit2/src/pack-objects.c +55 -52
- data/vendor/libgit2/src/pack-objects.h +1 -1
- data/vendor/libgit2/src/pack.c +160 -149
- data/vendor/libgit2/src/pack.h +32 -18
- data/vendor/libgit2/src/parse.c +10 -0
- data/vendor/libgit2/src/parse.h +3 -3
- data/vendor/libgit2/src/patch.c +1 -1
- data/vendor/libgit2/src/patch_generate.c +2 -4
- data/vendor/libgit2/src/patch_parse.c +34 -11
- data/vendor/libgit2/src/path.c +47 -10
- data/vendor/libgit2/src/path.h +2 -0
- data/vendor/libgit2/src/pathspec.c +18 -17
- data/vendor/libgit2/src/pool.c +42 -32
- data/vendor/libgit2/src/pool.h +15 -7
- data/vendor/libgit2/src/posix.c +39 -16
- data/vendor/libgit2/src/posix.h +21 -1
- data/vendor/libgit2/src/proxy.c +9 -2
- data/vendor/libgit2/src/push.c +15 -7
- data/vendor/libgit2/src/reader.c +2 -2
- data/vendor/libgit2/src/rebase.c +89 -28
- data/vendor/libgit2/src/refdb.c +147 -0
- data/vendor/libgit2/src/refdb.h +69 -0
- data/vendor/libgit2/src/refdb_fs.c +230 -241
- data/vendor/libgit2/src/reflog.c +13 -19
- data/vendor/libgit2/src/refs.c +113 -217
- data/vendor/libgit2/src/refs.h +10 -21
- data/vendor/libgit2/src/refspec.c +57 -48
- data/vendor/libgit2/src/regexp.c +221 -0
- data/vendor/libgit2/src/regexp.h +97 -0
- data/vendor/libgit2/src/remote.c +102 -79
- data/vendor/libgit2/src/remote.h +2 -2
- data/vendor/libgit2/src/repository.c +322 -203
- data/vendor/libgit2/src/repository.h +49 -57
- data/vendor/libgit2/src/revert.c +8 -1
- data/vendor/libgit2/src/revparse.c +23 -23
- data/vendor/libgit2/src/revwalk.c +73 -37
- data/vendor/libgit2/src/revwalk.h +20 -0
- data/vendor/libgit2/src/settings.c +22 -1
- data/vendor/libgit2/src/sortedcache.c +14 -29
- data/vendor/libgit2/src/sortedcache.h +1 -1
- data/vendor/libgit2/src/stash.c +49 -67
- data/vendor/libgit2/src/status.c +19 -11
- data/vendor/libgit2/src/strarray.c +63 -0
- data/vendor/libgit2/src/streams/openssl.c +66 -8
- data/vendor/libgit2/src/streams/registry.c +5 -3
- data/vendor/libgit2/src/streams/socket.c +2 -2
- data/vendor/libgit2/src/strmap.c +37 -84
- data/vendor/libgit2/src/strmap.h +105 -33
- data/vendor/libgit2/src/submodule.c +157 -130
- data/vendor/libgit2/src/submodule.h +1 -1
- data/vendor/libgit2/src/sysdir.c +4 -20
- data/vendor/libgit2/src/sysdir.h +0 -11
- data/vendor/libgit2/src/tag.c +12 -2
- data/vendor/libgit2/src/thread-utils.h +163 -40
- data/vendor/libgit2/src/trace.c +1 -1
- data/vendor/libgit2/src/trace.h +3 -3
- data/vendor/libgit2/src/trailer.c +46 -32
- data/vendor/libgit2/src/transaction.c +5 -9
- data/vendor/libgit2/src/transports/auth.c +16 -15
- data/vendor/libgit2/src/transports/auth.h +18 -11
- data/vendor/libgit2/src/transports/auth_negotiate.c +64 -33
- data/vendor/libgit2/src/transports/auth_negotiate.h +2 -2
- data/vendor/libgit2/src/transports/auth_ntlm.c +223 -0
- data/vendor/libgit2/src/transports/auth_ntlm.h +38 -0
- data/vendor/libgit2/src/transports/credential.c +478 -0
- data/vendor/libgit2/src/transports/{cred_helpers.c → credential_helpers.c} +23 -8
- data/vendor/libgit2/src/transports/git.c +11 -16
- data/vendor/libgit2/src/transports/http.c +488 -1248
- data/vendor/libgit2/src/transports/http.h +4 -1
- data/vendor/libgit2/src/transports/httpclient.c +1552 -0
- data/vendor/libgit2/src/transports/httpclient.h +190 -0
- data/vendor/libgit2/src/transports/local.c +12 -12
- data/vendor/libgit2/src/transports/smart.c +21 -21
- data/vendor/libgit2/src/transports/smart.h +3 -3
- data/vendor/libgit2/src/transports/smart_protocol.c +40 -64
- data/vendor/libgit2/src/transports/ssh.c +77 -59
- data/vendor/libgit2/src/transports/winhttp.c +368 -285
- data/vendor/libgit2/src/tree-cache.c +14 -7
- data/vendor/libgit2/src/tree.c +16 -26
- data/vendor/libgit2/src/unix/map.c +1 -1
- data/vendor/libgit2/src/unix/posix.h +16 -11
- data/vendor/libgit2/src/userdiff.h +3 -1
- data/vendor/libgit2/src/util.c +75 -110
- data/vendor/libgit2/src/util.h +18 -23
- data/vendor/libgit2/src/wildmatch.c +320 -0
- data/vendor/libgit2/src/wildmatch.h +23 -0
- data/vendor/libgit2/src/win32/git2.rc +18 -3
- data/vendor/libgit2/src/win32/map.c +3 -5
- data/vendor/libgit2/src/win32/path_w32.c +42 -5
- data/vendor/libgit2/src/win32/path_w32.h +15 -29
- data/vendor/libgit2/src/win32/posix.h +1 -4
- data/vendor/libgit2/src/win32/posix_w32.c +117 -5
- data/vendor/libgit2/src/win32/precompiled.h +0 -2
- data/vendor/libgit2/src/win32/thread.c +5 -5
- data/vendor/libgit2/src/win32/w32_buffer.c +7 -3
- data/vendor/libgit2/src/win32/w32_common.h +39 -0
- data/vendor/libgit2/src/win32/w32_crtdbg_stacktrace.c +0 -93
- data/vendor/libgit2/src/win32/w32_crtdbg_stacktrace.h +0 -2
- data/vendor/libgit2/src/win32/w32_stack.c +4 -9
- data/vendor/libgit2/src/win32/w32_stack.h +3 -3
- data/vendor/libgit2/src/win32/w32_util.c +31 -0
- data/vendor/libgit2/src/win32/w32_util.h +6 -32
- data/vendor/libgit2/src/worktree.c +91 -50
- data/vendor/libgit2/src/xdiff/xdiffi.c +1 -1
- data/vendor/libgit2/src/xdiff/xmerge.c +12 -0
- data/vendor/libgit2/src/xdiff/xpatience.c +3 -0
- data/vendor/libgit2/src/zstream.c +5 -0
- data/vendor/libgit2/src/zstream.h +1 -0
- metadata +123 -53
- data/vendor/libgit2/cmake/Modules/CheckPrototypeDefinition.c.in +0 -29
- data/vendor/libgit2/cmake/Modules/CheckPrototypeDefinition.cmake +0 -96
- data/vendor/libgit2/deps/regex/CMakeLists.txt +0 -2
- data/vendor/libgit2/deps/regex/COPYING +0 -502
- data/vendor/libgit2/deps/regex/config.h +0 -7
- data/vendor/libgit2/deps/regex/regcomp.c +0 -3857
- data/vendor/libgit2/deps/regex/regex.c +0 -92
- data/vendor/libgit2/deps/regex/regex.h +0 -582
- data/vendor/libgit2/deps/regex/regex_internal.c +0 -1744
- data/vendor/libgit2/deps/regex/regex_internal.h +0 -819
- data/vendor/libgit2/deps/regex/regexec.c +0 -4369
- data/vendor/libgit2/include/git2/inttypes.h +0 -309
- data/vendor/libgit2/include/git2/sys/time.h +0 -31
- data/vendor/libgit2/libgit2.pc.in +0 -13
- data/vendor/libgit2/src/fnmatch.c +0 -248
- data/vendor/libgit2/src/fnmatch.h +0 -48
- data/vendor/libgit2/src/sha1_lookup.c +0 -35
- data/vendor/libgit2/src/transports/cred.c +0 -390
@@ -50,7 +50,7 @@ int git__mmap_alignment(size_t *page_size)
|
|
50
50
|
return 0;
|
51
51
|
}
|
52
52
|
|
53
|
-
int p_mmap(git_map *out, size_t len, int prot, int flags, int fd,
|
53
|
+
int p_mmap(git_map *out, size_t len, int prot, int flags, int fd, off64_t offset)
|
54
54
|
{
|
55
55
|
HANDLE fh = (HANDLE)_get_osfhandle(fd);
|
56
56
|
DWORD alignment = get_allocation_granularity();
|
@@ -58,8 +58,8 @@ int p_mmap(git_map *out, size_t len, int prot, int flags, int fd, git_off_t offs
|
|
58
58
|
DWORD view_prot = 0;
|
59
59
|
DWORD off_low = 0;
|
60
60
|
DWORD off_hi = 0;
|
61
|
-
|
62
|
-
|
61
|
+
off64_t page_start;
|
62
|
+
off64_t page_offset;
|
63
63
|
|
64
64
|
GIT_MMAP_VALIDATE(out, len, prot, flags);
|
65
65
|
|
@@ -99,8 +99,6 @@ int p_mmap(git_map *out, size_t len, int prot, int flags, int fd, git_off_t offs
|
|
99
99
|
return -1;
|
100
100
|
}
|
101
101
|
|
102
|
-
assert(sizeof(git_off_t) == 8);
|
103
|
-
|
104
102
|
off_low = (DWORD)(page_start);
|
105
103
|
off_hi = (DWORD)(page_start >> 32);
|
106
104
|
out->data = MapViewOfFile(out->fmh, view_prot, off_hi, off_low, len);
|
@@ -25,6 +25,9 @@
|
|
25
25
|
#define path__is_unc(p) \
|
26
26
|
(((p)[0] == '\\' && (p)[1] == '\\') || ((p)[0] == '/' && (p)[1] == '/'))
|
27
27
|
|
28
|
+
#define path__startswith_slash(p) \
|
29
|
+
((p)[0] == '\\' || (p)[0] == '/')
|
30
|
+
|
28
31
|
GIT_INLINE(int) path__cwd(wchar_t *path, int size)
|
29
32
|
{
|
30
33
|
int len;
|
@@ -140,14 +143,24 @@ int git_win32_path_canonicalize(git_win32_path path)
|
|
140
143
|
|
141
144
|
*to = L'\0';
|
142
145
|
|
143
|
-
|
146
|
+
if ((to - path) > INT_MAX) {
|
147
|
+
SetLastError(ERROR_FILENAME_EXCED_RANGE);
|
148
|
+
return -1;
|
149
|
+
}
|
150
|
+
|
151
|
+
return (int)(to - path);
|
144
152
|
}
|
145
153
|
|
146
|
-
int
|
154
|
+
static int win32_path_cwd(wchar_t *out, size_t len)
|
147
155
|
{
|
148
156
|
int cwd_len;
|
149
157
|
|
150
|
-
if (
|
158
|
+
if (len > INT_MAX) {
|
159
|
+
errno = ENAMETOOLONG;
|
160
|
+
return -1;
|
161
|
+
}
|
162
|
+
|
163
|
+
if ((cwd_len = path__cwd(out, (int)len)) < 0)
|
151
164
|
return -1;
|
152
165
|
|
153
166
|
/* UNC paths */
|
@@ -211,7 +224,7 @@ int git_win32_path_from_utf8(git_win32_path out, const char *src)
|
|
211
224
|
goto on_error;
|
212
225
|
}
|
213
226
|
/* Absolute paths omitting the drive letter */
|
214
|
-
else if (src
|
227
|
+
else if (path__startswith_slash(src)) {
|
215
228
|
if (path__cwd(dest, MAX_PATH) < 0)
|
216
229
|
goto on_error;
|
217
230
|
|
@@ -228,7 +241,7 @@ int git_win32_path_from_utf8(git_win32_path out, const char *src)
|
|
228
241
|
else {
|
229
242
|
int cwd_len;
|
230
243
|
|
231
|
-
if ((cwd_len =
|
244
|
+
if ((cwd_len = win32_path_cwd(dest, MAX_PATH)) < 0)
|
232
245
|
goto on_error;
|
233
246
|
|
234
247
|
dest[cwd_len++] = L'\\';
|
@@ -247,6 +260,30 @@ on_error:
|
|
247
260
|
return -1;
|
248
261
|
}
|
249
262
|
|
263
|
+
int git_win32_path_relative_from_utf8(git_win32_path out, const char *src)
|
264
|
+
{
|
265
|
+
wchar_t *dest = out, *p;
|
266
|
+
int len;
|
267
|
+
|
268
|
+
/* Handle absolute paths */
|
269
|
+
if (git_path_is_absolute(src) ||
|
270
|
+
path__is_nt_namespace(src) ||
|
271
|
+
path__is_unc(src) ||
|
272
|
+
path__startswith_slash(src)) {
|
273
|
+
return git_win32_path_from_utf8(out, src);
|
274
|
+
}
|
275
|
+
|
276
|
+
if ((len = git__utf8_to_16(dest, MAX_PATH, src)) < 0)
|
277
|
+
return -1;
|
278
|
+
|
279
|
+
for (p = dest; p < (dest + len); p++) {
|
280
|
+
if (*p == L'/')
|
281
|
+
*p = L'\\';
|
282
|
+
}
|
283
|
+
|
284
|
+
return len;
|
285
|
+
}
|
286
|
+
|
250
287
|
int git_win32_path_to_utf8(git_win32_utf8_path dest, const wchar_t *src)
|
251
288
|
{
|
252
289
|
char *out = dest;
|
@@ -8,45 +8,28 @@
|
|
8
8
|
#define INCLUDE_win32_path_w32_h__
|
9
9
|
|
10
10
|
#include "common.h"
|
11
|
-
|
12
11
|
#include "vector.h"
|
13
12
|
|
14
|
-
|
15
|
-
*
|
16
|
-
*
|
17
|
-
*
|
18
|
-
*
|
19
|
-
*
|
20
|
-
*
|
21
|
-
|
22
|
-
#define GIT_WIN_PATH_UTF16 MAX_PATH+6
|
23
|
-
|
24
|
-
/* Maximum size of a UTF-8 Win32 path. We remove the "\\?\" or "\\?\UNC\"
|
25
|
-
* prefixes for presentation, bringing us back to 259 (non-NULL)
|
26
|
-
* characters. UTF-8 does have 4-byte sequences, but they are encoded in
|
27
|
-
* UTF-16 using surrogate pairs, which takes up the space of two characters.
|
28
|
-
* Two characters in the range U+0800 -> U+FFFF take up more space in UTF-8
|
29
|
-
* (6 bytes) than one surrogate pair (4 bytes).
|
30
|
-
*/
|
31
|
-
#define GIT_WIN_PATH_UTF8 (259 * 3 + 1)
|
32
|
-
|
33
|
-
/*
|
34
|
-
* The length of a Windows "shortname", for 8.3 compatibility.
|
13
|
+
/**
|
14
|
+
* Create a Win32 path (in UCS-2 format) from a UTF-8 string. If the given
|
15
|
+
* path is relative, then it will be turned into an absolute path by having
|
16
|
+
* the current working directory prepended.
|
17
|
+
*
|
18
|
+
* @param dest The buffer to receive the wide string.
|
19
|
+
* @param src The UTF-8 string to convert.
|
20
|
+
* @return The length of the wide string, in characters (not counting the NULL terminator), or < 0 for failure
|
35
21
|
*/
|
36
|
-
|
37
|
-
|
38
|
-
/* Win32 path types */
|
39
|
-
typedef wchar_t git_win32_path[GIT_WIN_PATH_UTF16];
|
40
|
-
typedef char git_win32_utf8_path[GIT_WIN_PATH_UTF8];
|
22
|
+
extern int git_win32_path_from_utf8(git_win32_path dest, const char *src);
|
41
23
|
|
42
24
|
/**
|
43
|
-
* Create a Win32 path (in UCS-2 format) from a UTF-8 string.
|
25
|
+
* Create a Win32 path (in UCS-2 format) from a UTF-8 string. If the given
|
26
|
+
* path is relative, then it will not be turned into an absolute path.
|
44
27
|
*
|
45
28
|
* @param dest The buffer to receive the wide string.
|
46
29
|
* @param src The UTF-8 string to convert.
|
47
30
|
* @return The length of the wide string, in characters (not counting the NULL terminator), or < 0 for failure
|
48
31
|
*/
|
49
|
-
extern int
|
32
|
+
extern int git_win32_path_relative_from_utf8(git_win32_path dest, const char *src);
|
50
33
|
|
51
34
|
/**
|
52
35
|
* Canonicalize a Win32 UCS-2 path so that it is suitable for delivery to the
|
@@ -55,6 +38,9 @@ extern int git_win32_path_from_utf8(git_win32_path dest, const char *src);
|
|
55
38
|
* canonical (always backslashes, never forward slashes) and process any
|
56
39
|
* directory entries of '.' or '..'.
|
57
40
|
*
|
41
|
+
* Note that this is intended to be used on absolute Windows paths, those
|
42
|
+
* that start with `C:\`, `\\server\share`, `\\?\`, etc.
|
43
|
+
*
|
58
44
|
* This processes the buffer in place.
|
59
45
|
*
|
60
46
|
* @param path The buffer to process
|
@@ -47,7 +47,7 @@ extern int p_chdir(const char* path);
|
|
47
47
|
extern int p_chmod(const char* path, mode_t mode);
|
48
48
|
extern int p_rmdir(const char* path);
|
49
49
|
extern int p_access(const char* path, mode_t mode);
|
50
|
-
extern int p_ftruncate(int fd,
|
50
|
+
extern int p_ftruncate(int fd, off64_t size);
|
51
51
|
|
52
52
|
/* p_lstat is almost but not quite POSIX correct. Specifically, the use of
|
53
53
|
* ENOTDIR is wrong, in that it does not mean precisely that a non-directory
|
@@ -60,7 +60,4 @@ extern int p_lstat_posixly(const char *filename, struct stat *buf);
|
|
60
60
|
extern struct tm * p_localtime_r(const time_t *timer, struct tm *result);
|
61
61
|
extern struct tm * p_gmtime_r(const time_t *timer, struct tm *result);
|
62
62
|
|
63
|
-
/* Use the bundled regcomp */
|
64
|
-
#define p_regcomp regcomp
|
65
|
-
|
66
63
|
#endif
|
@@ -8,7 +8,7 @@
|
|
8
8
|
#include "common.h"
|
9
9
|
|
10
10
|
#include "../posix.h"
|
11
|
-
#include "../
|
11
|
+
#include "../futils.h"
|
12
12
|
#include "path.h"
|
13
13
|
#include "path_w32.h"
|
14
14
|
#include "utf-conv.h"
|
@@ -210,7 +210,7 @@ on_error:
|
|
210
210
|
* We now take a "git_off_t" rather than "long" because
|
211
211
|
* files may be longer than 2Gb.
|
212
212
|
*/
|
213
|
-
int p_ftruncate(int fd,
|
213
|
+
int p_ftruncate(int fd, off64_t size)
|
214
214
|
{
|
215
215
|
if (size < 0) {
|
216
216
|
errno = EINVAL;
|
@@ -251,9 +251,25 @@ int p_link(const char *old, const char *new)
|
|
251
251
|
|
252
252
|
GIT_INLINE(int) unlink_once(const wchar_t *path)
|
253
253
|
{
|
254
|
+
DWORD error;
|
255
|
+
|
254
256
|
if (DeleteFileW(path))
|
255
257
|
return 0;
|
256
258
|
|
259
|
+
if ((error = GetLastError()) == ERROR_ACCESS_DENIED) {
|
260
|
+
WIN32_FILE_ATTRIBUTE_DATA fdata;
|
261
|
+
if (!GetFileAttributesExW(path, GetFileExInfoStandard, &fdata) ||
|
262
|
+
!(fdata.dwFileAttributes & FILE_ATTRIBUTE_REPARSE_POINT) ||
|
263
|
+
!(fdata.dwFileAttributes & FILE_ATTRIBUTE_DIRECTORY))
|
264
|
+
goto out;
|
265
|
+
|
266
|
+
if (RemoveDirectoryW(path))
|
267
|
+
return 0;
|
268
|
+
}
|
269
|
+
|
270
|
+
out:
|
271
|
+
SetLastError(error);
|
272
|
+
|
257
273
|
if (last_error_retryable())
|
258
274
|
return GIT_RETRY;
|
259
275
|
|
@@ -398,18 +414,44 @@ int p_readlink(const char *path, char *buf, size_t bufsiz)
|
|
398
414
|
return (int)bufsiz;
|
399
415
|
}
|
400
416
|
|
417
|
+
static bool target_is_dir(const char *target, const char *path)
|
418
|
+
{
|
419
|
+
git_buf resolved = GIT_BUF_INIT;
|
420
|
+
git_win32_path resolved_w;
|
421
|
+
bool isdir = true;
|
422
|
+
|
423
|
+
if (git_path_is_absolute(target))
|
424
|
+
git_win32_path_from_utf8(resolved_w, target);
|
425
|
+
else if (git_path_dirname_r(&resolved, path) < 0 ||
|
426
|
+
git_path_apply_relative(&resolved, target) < 0 ||
|
427
|
+
git_win32_path_from_utf8(resolved_w, resolved.ptr) < 0)
|
428
|
+
goto out;
|
429
|
+
|
430
|
+
isdir = GetFileAttributesW(resolved_w) & FILE_ATTRIBUTE_DIRECTORY;
|
431
|
+
|
432
|
+
out:
|
433
|
+
git_buf_dispose(&resolved);
|
434
|
+
return isdir;
|
435
|
+
}
|
436
|
+
|
401
437
|
int p_symlink(const char *target, const char *path)
|
402
438
|
{
|
403
439
|
git_win32_path target_w, path_w;
|
404
440
|
DWORD dwFlags;
|
405
441
|
|
442
|
+
/*
|
443
|
+
* Convert both target and path to Windows-style paths. Note that we do
|
444
|
+
* not want to use `git_win32_path_from_utf8` for converting the target,
|
445
|
+
* as that function will automatically pre-pend the current working
|
446
|
+
* directory in case the path is not absolute. As Git will instead use
|
447
|
+
* relative symlinks, this is not someting we want.
|
448
|
+
*/
|
406
449
|
if (git_win32_path_from_utf8(path_w, path) < 0 ||
|
407
|
-
|
450
|
+
git_win32_path_relative_from_utf8(target_w, target) < 0)
|
408
451
|
return -1;
|
409
452
|
|
410
453
|
dwFlags = SYMBOLIC_LINK_FLAG_ALLOW_UNPRIVILEGED_CREATE;
|
411
|
-
|
412
|
-
if (GetFileAttributesW(target_w) & FILE_ATTRIBUTE_DIRECTORY)
|
454
|
+
if (target_is_dir(target, path))
|
413
455
|
dwFlags |= SYMBOLIC_LINK_FLAG_DIRECTORY;
|
414
456
|
|
415
457
|
if (!CreateSymbolicLinkW(path_w, target_w, dwFlags))
|
@@ -940,3 +982,73 @@ int p_inet_pton(int af, const char *src, void *dst)
|
|
940
982
|
errno = EINVAL;
|
941
983
|
return -1;
|
942
984
|
}
|
985
|
+
|
986
|
+
ssize_t p_pread(int fd, void *data, size_t size, off64_t offset)
|
987
|
+
{
|
988
|
+
HANDLE fh;
|
989
|
+
DWORD rsize = 0;
|
990
|
+
OVERLAPPED ov = {0};
|
991
|
+
LARGE_INTEGER pos = {0};
|
992
|
+
off64_t final_offset = 0;
|
993
|
+
|
994
|
+
/* Fail if the final offset would have overflowed to match POSIX semantics. */
|
995
|
+
if (!git__is_ssizet(size) || git__add_int64_overflow(&final_offset, offset, (int64_t)size)) {
|
996
|
+
errno = EINVAL;
|
997
|
+
return -1;
|
998
|
+
}
|
999
|
+
|
1000
|
+
/*
|
1001
|
+
* Truncate large writes to the maximum allowable size: the caller
|
1002
|
+
* needs to always call this in a loop anyways.
|
1003
|
+
*/
|
1004
|
+
if (size > INT32_MAX) {
|
1005
|
+
size = INT32_MAX;
|
1006
|
+
}
|
1007
|
+
|
1008
|
+
pos.QuadPart = offset;
|
1009
|
+
ov.Offset = pos.LowPart;
|
1010
|
+
ov.OffsetHigh = pos.HighPart;
|
1011
|
+
fh = (HANDLE)_get_osfhandle(fd);
|
1012
|
+
|
1013
|
+
if (ReadFile(fh, data, (DWORD)size, &rsize, &ov)) {
|
1014
|
+
return (ssize_t)rsize;
|
1015
|
+
}
|
1016
|
+
|
1017
|
+
set_errno();
|
1018
|
+
return -1;
|
1019
|
+
}
|
1020
|
+
|
1021
|
+
ssize_t p_pwrite(int fd, const void *data, size_t size, off64_t offset)
|
1022
|
+
{
|
1023
|
+
HANDLE fh;
|
1024
|
+
DWORD wsize = 0;
|
1025
|
+
OVERLAPPED ov = {0};
|
1026
|
+
LARGE_INTEGER pos = {0};
|
1027
|
+
off64_t final_offset = 0;
|
1028
|
+
|
1029
|
+
/* Fail if the final offset would have overflowed to match POSIX semantics. */
|
1030
|
+
if (!git__is_ssizet(size) || git__add_int64_overflow(&final_offset, offset, (int64_t)size)) {
|
1031
|
+
errno = EINVAL;
|
1032
|
+
return -1;
|
1033
|
+
}
|
1034
|
+
|
1035
|
+
/*
|
1036
|
+
* Truncate large writes to the maximum allowable size: the caller
|
1037
|
+
* needs to always call this in a loop anyways.
|
1038
|
+
*/
|
1039
|
+
if (size > INT32_MAX) {
|
1040
|
+
size = INT32_MAX;
|
1041
|
+
}
|
1042
|
+
|
1043
|
+
pos.QuadPart = offset;
|
1044
|
+
ov.Offset = pos.LowPart;
|
1045
|
+
ov.OffsetHigh = pos.HighPart;
|
1046
|
+
fh = (HANDLE)_get_osfhandle(fd);
|
1047
|
+
|
1048
|
+
if (WriteFile(fh, data, (DWORD)size, &wsize, &ov)) {
|
1049
|
+
return (ssize_t)wsize;
|
1050
|
+
}
|
1051
|
+
|
1052
|
+
set_errno();
|
1053
|
+
return -1;
|
1054
|
+
}
|
@@ -40,15 +40,15 @@ int git_threads_init(void)
|
|
40
40
|
HMODULE hModule = GetModuleHandleW(L"kernel32");
|
41
41
|
|
42
42
|
if (hModule) {
|
43
|
-
win32_srwlock_initialize = (win32_srwlock_fn)
|
43
|
+
win32_srwlock_initialize = (win32_srwlock_fn)(void *)
|
44
44
|
GetProcAddress(hModule, "InitializeSRWLock");
|
45
|
-
win32_srwlock_acquire_shared = (win32_srwlock_fn)
|
45
|
+
win32_srwlock_acquire_shared = (win32_srwlock_fn)(void *)
|
46
46
|
GetProcAddress(hModule, "AcquireSRWLockShared");
|
47
|
-
win32_srwlock_release_shared = (win32_srwlock_fn)
|
47
|
+
win32_srwlock_release_shared = (win32_srwlock_fn)(void *)
|
48
48
|
GetProcAddress(hModule, "ReleaseSRWLockShared");
|
49
|
-
win32_srwlock_acquire_exclusive = (win32_srwlock_fn)
|
49
|
+
win32_srwlock_acquire_exclusive = (win32_srwlock_fn)(void *)
|
50
50
|
GetProcAddress(hModule, "AcquireSRWLockExclusive");
|
51
|
-
win32_srwlock_release_exclusive = (win32_srwlock_fn)
|
51
|
+
win32_srwlock_release_exclusive = (win32_srwlock_fn)(void *)
|
52
52
|
GetProcAddress(hModule, "ReleaseSRWLockExclusive");
|
53
53
|
}
|
54
54
|
|
@@ -25,13 +25,17 @@ int git_buf_put_w(git_buf *buf, const wchar_t *string_w, size_t len_w)
|
|
25
25
|
int utf8_len, utf8_write_len;
|
26
26
|
size_t new_size;
|
27
27
|
|
28
|
-
if (!len_w)
|
28
|
+
if (!len_w) {
|
29
29
|
return 0;
|
30
|
+
} else if (len_w > INT_MAX) {
|
31
|
+
git_error_set_oom();
|
32
|
+
return -1;
|
33
|
+
}
|
30
34
|
|
31
35
|
assert(string_w);
|
32
36
|
|
33
37
|
/* Measure the string necessary for conversion */
|
34
|
-
if ((utf8_len = WideCharToMultiByte(CP_UTF8, WC_ERR_INVALID_CHARS, string_w, len_w, NULL, 0, NULL, NULL)) == 0)
|
38
|
+
if ((utf8_len = WideCharToMultiByte(CP_UTF8, WC_ERR_INVALID_CHARS, string_w, (int)len_w, NULL, 0, NULL, NULL)) == 0)
|
35
39
|
return 0;
|
36
40
|
|
37
41
|
assert(utf8_len > 0);
|
@@ -43,7 +47,7 @@ int git_buf_put_w(git_buf *buf, const wchar_t *string_w, size_t len_w)
|
|
43
47
|
return -1;
|
44
48
|
|
45
49
|
if ((utf8_write_len = WideCharToMultiByte(
|
46
|
-
CP_UTF8, WC_ERR_INVALID_CHARS, string_w, len_w, &buf->ptr[buf->size], utf8_len, NULL, NULL)) == 0)
|
50
|
+
CP_UTF8, WC_ERR_INVALID_CHARS, string_w, (int)len_w, &buf->ptr[buf->size], utf8_len, NULL, NULL)) == 0)
|
47
51
|
return handle_wc_error();
|
48
52
|
|
49
53
|
assert(utf8_write_len == utf8_len);
|
@@ -0,0 +1,39 @@
|
|
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
|
+
#ifndef INCLUDE_win32_w32_common_h__
|
9
|
+
#define INCLUDE_win32_w32_common_h__
|
10
|
+
|
11
|
+
/*
|
12
|
+
* Provides a large enough buffer to support Windows paths: MAX_PATH is
|
13
|
+
* 260, corresponding to a maximum path length of 259 characters plus a
|
14
|
+
* NULL terminator. Prefixing with "\\?\" adds 4 characters, but if the
|
15
|
+
* original was a UNC path, then we turn "\\server\share" into
|
16
|
+
* "\\?\UNC\server\share". So we replace the first two characters with
|
17
|
+
* 8 characters, a net gain of 6, so the maximum length is MAX_PATH+6.
|
18
|
+
*/
|
19
|
+
#define GIT_WIN_PATH_UTF16 MAX_PATH+6
|
20
|
+
|
21
|
+
/* Maximum size of a UTF-8 Win32 path. We remove the "\\?\" or "\\?\UNC\"
|
22
|
+
* prefixes for presentation, bringing us back to 259 (non-NULL)
|
23
|
+
* characters. UTF-8 does have 4-byte sequences, but they are encoded in
|
24
|
+
* UTF-16 using surrogate pairs, which takes up the space of two characters.
|
25
|
+
* Two characters in the range U+0800 -> U+FFFF take up more space in UTF-8
|
26
|
+
* (6 bytes) than one surrogate pair (4 bytes).
|
27
|
+
*/
|
28
|
+
#define GIT_WIN_PATH_UTF8 (259 * 3 + 1)
|
29
|
+
|
30
|
+
/*
|
31
|
+
* The length of a Windows "shortname", for 8.3 compatibility.
|
32
|
+
*/
|
33
|
+
#define GIT_WIN_PATH_SHORTNAME 13
|
34
|
+
|
35
|
+
/* Win32 path types */
|
36
|
+
typedef wchar_t git_win32_path[GIT_WIN_PATH_UTF16];
|
37
|
+
typedef char git_win32_utf8_path[GIT_WIN_PATH_UTF8];
|
38
|
+
|
39
|
+
#endif
|