rugged 0.28.4.1 → 1.0.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 +17 -15
- 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 +1 -2
- 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/AUTHORS +1 -0
- data/vendor/libgit2/CMakeLists.txt +39 -19
- data/vendor/libgit2/COPYING +28 -0
- data/vendor/libgit2/cmake/Modules/EnableWarnings.cmake +5 -1
- data/vendor/libgit2/cmake/Modules/FindCoreFoundation.cmake +2 -2
- data/vendor/libgit2/cmake/Modules/FindGSSAPI.cmake +1 -1
- data/vendor/libgit2/cmake/Modules/FindGSSFramework.cmake +28 -0
- data/vendor/libgit2/cmake/Modules/FindPCRE.cmake +38 -0
- data/vendor/libgit2/cmake/Modules/FindPCRE2.cmake +37 -0
- data/vendor/libgit2/cmake/Modules/FindSecurity.cmake +2 -2
- data/vendor/libgit2/cmake/Modules/FindStatNsec.cmake +6 -0
- data/vendor/libgit2/cmake/Modules/PkgBuildConfig.cmake +77 -0
- data/vendor/libgit2/cmake/Modules/SanitizeBool.cmake +20 -0
- data/vendor/libgit2/cmake/Modules/SelectGSSAPI.cmake +56 -0
- data/vendor/libgit2/cmake/Modules/SelectHTTPSBackend.cmake +127 -0
- data/vendor/libgit2/cmake/Modules/SelectHashes.cmake +69 -0
- data/vendor/libgit2/deps/http-parser/http_parser.c +11 -6
- data/vendor/libgit2/deps/ntlmclient/CMakeLists.txt +23 -0
- data/vendor/libgit2/deps/ntlmclient/compat.h +55 -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 +1422 -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 +21 -0
- data/vendor/libgit2/deps/ntlmclient/util.h +14 -0
- data/vendor/libgit2/deps/pcre/CMakeLists.txt +140 -0
- data/vendor/libgit2/deps/pcre/COPYING +5 -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 +9800 -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 +421 -0
- data/vendor/libgit2/deps/pcre/pcreposix.h +117 -0
- data/vendor/libgit2/deps/pcre/ucp.h +224 -0
- data/vendor/libgit2/deps/zlib/adler32.c +0 -7
- data/vendor/libgit2/deps/zlib/crc32.c +0 -7
- data/vendor/libgit2/include/git2.h +2 -0
- data/vendor/libgit2/include/git2/apply.h +22 -2
- data/vendor/libgit2/include/git2/attr.h +23 -13
- data/vendor/libgit2/include/git2/blame.h +2 -2
- data/vendor/libgit2/include/git2/blob.h +44 -12
- 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 +15 -6
- data/vendor/libgit2/include/git2/config.h +12 -12
- 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 +321 -3
- data/vendor/libgit2/include/git2/describe.h +4 -4
- data/vendor/libgit2/include/git2/diff.h +16 -14
- data/vendor/libgit2/include/git2/errors.h +4 -2
- data/vendor/libgit2/include/git2/filter.h +8 -0
- data/vendor/libgit2/include/git2/index.h +2 -1
- data/vendor/libgit2/include/git2/indexer.h +48 -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 +3 -2
- 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 +12 -1
- 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 +19 -0
- data/vendor/libgit2/include/git2/remote.h +40 -15
- data/vendor/libgit2/include/git2/repository.h +29 -6
- 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/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 +5 -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 +99 -236
- 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 +60 -30
- data/vendor/libgit2/src/attr.c +70 -64
- data/vendor/libgit2/src/attr_file.c +189 -96
- data/vendor/libgit2/src/attr_file.h +9 -9
- data/vendor/libgit2/src/attrcache.c +48 -48
- data/vendor/libgit2/src/attrcache.h +2 -1
- data/vendor/libgit2/src/blame.c +17 -5
- data/vendor/libgit2/src/blame.h +1 -1
- data/vendor/libgit2/src/blame_git.c +21 -7
- data/vendor/libgit2/src/blob.c +81 -17
- data/vendor/libgit2/src/blob.h +2 -2
- data/vendor/libgit2/src/branch.c +60 -32
- data/vendor/libgit2/src/buffer.c +19 -7
- data/vendor/libgit2/src/buffer.h +1 -0
- data/vendor/libgit2/src/cache.c +33 -36
- data/vendor/libgit2/src/cache.h +1 -1
- data/vendor/libgit2/src/cc-compat.h +5 -0
- data/vendor/libgit2/src/checkout.c +26 -16
- data/vendor/libgit2/src/cherrypick.c +9 -3
- data/vendor/libgit2/src/clone.c +29 -7
- 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 +3 -75
- data/vendor/libgit2/src/config.c +31 -40
- data/vendor/libgit2/src/config.h +7 -6
- data/vendor/libgit2/src/config_backend.h +12 -0
- data/vendor/libgit2/src/config_cache.c +39 -39
- data/vendor/libgit2/src/config_entries.c +69 -99
- 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 +49 -29
- data/vendor/libgit2/src/config_parse.h +13 -12
- data/vendor/libgit2/src/config_snapshot.c +206 -0
- data/vendor/libgit2/src/crlf.c +14 -14
- data/vendor/libgit2/src/describe.c +21 -20
- data/vendor/libgit2/src/diff.c +43 -58
- data/vendor/libgit2/src/diff.h +4 -3
- data/vendor/libgit2/src/diff_driver.c +37 -38
- data/vendor/libgit2/src/diff_file.c +12 -10
- data/vendor/libgit2/src/diff_file.h +2 -2
- data/vendor/libgit2/src/diff_generate.c +148 -98
- data/vendor/libgit2/src/diff_generate.h +2 -2
- data/vendor/libgit2/src/diff_parse.c +1 -1
- data/vendor/libgit2/src/diff_print.c +25 -13
- data/vendor/libgit2/src/diff_stats.c +1 -1
- data/vendor/libgit2/src/diff_tform.c +11 -11
- data/vendor/libgit2/src/errors.c +21 -25
- data/vendor/libgit2/src/errors.h +81 -0
- data/vendor/libgit2/src/features.h.in +9 -2
- data/vendor/libgit2/src/fetch.c +7 -2
- data/vendor/libgit2/src/fetchhead.c +36 -4
- data/vendor/libgit2/src/filebuf.c +6 -10
- data/vendor/libgit2/src/filebuf.h +2 -2
- data/vendor/libgit2/src/filter.c +16 -8
- data/vendor/libgit2/src/{fileops.c → futils.c} +21 -17
- data/vendor/libgit2/src/{fileops.h → futils.h} +5 -5
- data/vendor/libgit2/src/global.c +12 -40
- data/vendor/libgit2/src/global.h +0 -2
- 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/hash/sha1/openssl.h +19 -0
- 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 +91 -65
- data/vendor/libgit2/src/idxmap.h +151 -15
- data/vendor/libgit2/src/ignore.c +32 -38
- data/vendor/libgit2/src/index.c +105 -83
- data/vendor/libgit2/src/index.h +1 -1
- data/vendor/libgit2/src/indexer.c +71 -72
- data/vendor/libgit2/src/integer.h +39 -4
- data/vendor/libgit2/src/iterator.c +40 -35
- data/vendor/libgit2/src/iterator.h +8 -8
- data/vendor/libgit2/src/map.h +1 -1
- data/vendor/libgit2/src/merge.c +78 -51
- data/vendor/libgit2/src/merge.h +2 -2
- data/vendor/libgit2/src/merge_driver.c +5 -5
- data/vendor/libgit2/src/merge_file.c +1 -1
- data/vendor/libgit2/src/mwindow.c +18 -23
- data/vendor/libgit2/src/mwindow.h +4 -4
- data/vendor/libgit2/src/net.c +411 -0
- data/vendor/libgit2/src/net.h +57 -0
- data/vendor/libgit2/src/netops.c +6 -193
- data/vendor/libgit2/src/netops.h +1 -34
- data/vendor/libgit2/src/notes.c +8 -5
- data/vendor/libgit2/src/object.c +3 -3
- data/vendor/libgit2/src/object.h +2 -0
- data/vendor/libgit2/src/odb.c +41 -23
- data/vendor/libgit2/src/odb.h +3 -2
- data/vendor/libgit2/src/odb_loose.c +17 -10
- data/vendor/libgit2/src/odb_mempack.c +13 -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 +19 -8
- data/vendor/libgit2/src/oidmap.c +39 -57
- data/vendor/libgit2/src/oidmap.h +99 -19
- data/vendor/libgit2/src/pack-objects.c +28 -33
- data/vendor/libgit2/src/pack-objects.h +1 -1
- data/vendor/libgit2/src/pack.c +117 -129
- data/vendor/libgit2/src/pack.h +15 -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 -2
- data/vendor/libgit2/src/patch_parse.c +130 -33
- data/vendor/libgit2/src/path.c +43 -6
- data/vendor/libgit2/src/path.h +2 -0
- data/vendor/libgit2/src/pathspec.c +14 -14
- data/vendor/libgit2/src/pool.c +26 -22
- data/vendor/libgit2/src/pool.h +7 -7
- data/vendor/libgit2/src/posix.c +7 -7
- data/vendor/libgit2/src/posix.h +12 -1
- data/vendor/libgit2/src/proxy.c +7 -2
- data/vendor/libgit2/src/push.c +13 -7
- data/vendor/libgit2/src/reader.c +2 -2
- data/vendor/libgit2/src/rebase.c +87 -28
- data/vendor/libgit2/src/refdb.c +12 -0
- data/vendor/libgit2/src/refdb_fs.c +219 -167
- data/vendor/libgit2/src/reflog.c +11 -13
- data/vendor/libgit2/src/refs.c +39 -23
- data/vendor/libgit2/src/refs.h +8 -1
- data/vendor/libgit2/src/refspec.c +9 -16
- data/vendor/libgit2/src/regexp.c +221 -0
- data/vendor/libgit2/src/regexp.h +97 -0
- data/vendor/libgit2/src/remote.c +57 -55
- data/vendor/libgit2/src/remote.h +2 -2
- data/vendor/libgit2/src/repository.c +187 -154
- data/vendor/libgit2/src/repository.h +49 -40
- data/vendor/libgit2/src/revert.c +8 -3
- data/vendor/libgit2/src/revparse.c +18 -19
- data/vendor/libgit2/src/revwalk.c +72 -34
- data/vendor/libgit2/src/revwalk.h +20 -0
- data/vendor/libgit2/src/settings.c +13 -1
- data/vendor/libgit2/src/sortedcache.c +12 -26
- data/vendor/libgit2/src/sortedcache.h +1 -1
- data/vendor/libgit2/src/stash.c +47 -67
- data/vendor/libgit2/src/status.c +17 -11
- data/vendor/libgit2/src/streams/openssl.c +54 -2
- 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 +151 -126
- data/vendor/libgit2/src/submodule.h +1 -1
- data/vendor/libgit2/src/sysdir.c +11 -1
- data/vendor/libgit2/src/tag.c +10 -2
- 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 +10 -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 +476 -0
- data/vendor/libgit2/src/transports/{cred_helpers.c → credential_helpers.c} +21 -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 +1549 -0
- data/vendor/libgit2/src/transports/httpclient.h +190 -0
- data/vendor/libgit2/src/transports/local.c +10 -10
- data/vendor/libgit2/src/transports/smart.c +19 -19
- data/vendor/libgit2/src/transports/smart.h +3 -3
- data/vendor/libgit2/src/transports/smart_pkt.c +1 -1
- 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 +272 -242
- 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 +2 -12
- data/vendor/libgit2/src/userdiff.h +3 -1
- data/vendor/libgit2/src/util.c +51 -53
- data/vendor/libgit2/src/util.h +16 -21
- data/vendor/libgit2/src/wildmatch.c +320 -0
- data/vendor/libgit2/src/wildmatch.h +23 -0
- data/vendor/libgit2/src/win32/map.c +3 -5
- data/vendor/libgit2/src/win32/path_w32.c +40 -3
- 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 +47 -5
- data/vendor/libgit2/src/win32/precompiled.h +0 -2
- data/vendor/libgit2/src/win32/thread.c +5 -10
- 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 +79 -49
- 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 +108 -41
- 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
@@ -0,0 +1,320 @@
|
|
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
|
+
* Do shell-style pattern matching for ?, \, [], and * characters.
|
8
|
+
* It is 8bit clean.
|
9
|
+
*
|
10
|
+
* Written by Rich $alz, mirror!rs, Wed Nov 26 19:03:17 EST 1986.
|
11
|
+
* Rich $alz is now <rsalz@bbn.com>.
|
12
|
+
*
|
13
|
+
* Modified by Wayne Davison to special-case '/' matching, to make '**'
|
14
|
+
* work differently than '*', and to fix the character-class code.
|
15
|
+
*
|
16
|
+
* Imported from git.git.
|
17
|
+
*/
|
18
|
+
|
19
|
+
#include "wildmatch.h"
|
20
|
+
|
21
|
+
#define GIT_SPACE 0x01
|
22
|
+
#define GIT_DIGIT 0x02
|
23
|
+
#define GIT_ALPHA 0x04
|
24
|
+
#define GIT_GLOB_SPECIAL 0x08
|
25
|
+
#define GIT_REGEX_SPECIAL 0x10
|
26
|
+
#define GIT_PATHSPEC_MAGIC 0x20
|
27
|
+
#define GIT_CNTRL 0x40
|
28
|
+
#define GIT_PUNCT 0x80
|
29
|
+
|
30
|
+
enum {
|
31
|
+
S = GIT_SPACE,
|
32
|
+
A = GIT_ALPHA,
|
33
|
+
D = GIT_DIGIT,
|
34
|
+
G = GIT_GLOB_SPECIAL, /* *, ?, [, \\ */
|
35
|
+
R = GIT_REGEX_SPECIAL, /* $, (, ), +, ., ^, {, | */
|
36
|
+
P = GIT_PATHSPEC_MAGIC, /* other non-alnum, except for ] and } */
|
37
|
+
X = GIT_CNTRL,
|
38
|
+
U = GIT_PUNCT,
|
39
|
+
Z = GIT_CNTRL | GIT_SPACE
|
40
|
+
};
|
41
|
+
|
42
|
+
static const unsigned char sane_ctype[256] = {
|
43
|
+
X, X, X, X, X, X, X, X, X, Z, Z, X, X, Z, X, X, /* 0.. 15 */
|
44
|
+
X, X, X, X, X, X, X, X, X, X, X, X, X, X, X, X, /* 16.. 31 */
|
45
|
+
S, P, P, P, R, P, P, P, R, R, G, R, P, P, R, P, /* 32.. 47 */
|
46
|
+
D, D, D, D, D, D, D, D, D, D, P, P, P, P, P, G, /* 48.. 63 */
|
47
|
+
P, A, A, A, A, A, A, A, A, A, A, A, A, A, A, A, /* 64.. 79 */
|
48
|
+
A, A, A, A, A, A, A, A, A, A, A, G, G, U, R, P, /* 80.. 95 */
|
49
|
+
P, A, A, A, A, A, A, A, A, A, A, A, A, A, A, A, /* 96..111 */
|
50
|
+
A, A, A, A, A, A, A, A, A, A, A, R, R, U, P, X, /* 112..127 */
|
51
|
+
/* Nothing in the 128.. range */
|
52
|
+
};
|
53
|
+
|
54
|
+
#define sane_istest(x,mask) ((sane_ctype[(unsigned char)(x)] & (mask)) != 0)
|
55
|
+
#define is_glob_special(x) sane_istest(x,GIT_GLOB_SPECIAL)
|
56
|
+
|
57
|
+
typedef unsigned char uchar;
|
58
|
+
|
59
|
+
/* What character marks an inverted character class? */
|
60
|
+
#define NEGATE_CLASS '!'
|
61
|
+
#define NEGATE_CLASS2 '^'
|
62
|
+
|
63
|
+
#define CC_EQ(class, len, litmatch) ((len) == sizeof (litmatch)-1 \
|
64
|
+
&& *(class) == *(litmatch) \
|
65
|
+
&& strncmp((char*)class, litmatch, len) == 0)
|
66
|
+
|
67
|
+
#if defined STDC_HEADERS || !defined isascii
|
68
|
+
# define ISASCII(c) 1
|
69
|
+
#else
|
70
|
+
# define ISASCII(c) isascii(c)
|
71
|
+
#endif
|
72
|
+
|
73
|
+
#ifdef isblank
|
74
|
+
# define ISBLANK(c) (ISASCII(c) && isblank(c))
|
75
|
+
#else
|
76
|
+
# define ISBLANK(c) ((c) == ' ' || (c) == '\t')
|
77
|
+
#endif
|
78
|
+
|
79
|
+
#ifdef isgraph
|
80
|
+
# define ISGRAPH(c) (ISASCII(c) && isgraph(c))
|
81
|
+
#else
|
82
|
+
# define ISGRAPH(c) (ISASCII(c) && isprint(c) && !isspace(c))
|
83
|
+
#endif
|
84
|
+
|
85
|
+
#define ISPRINT(c) (ISASCII(c) && isprint(c))
|
86
|
+
#define ISDIGIT(c) (ISASCII(c) && isdigit(c))
|
87
|
+
#define ISALNUM(c) (ISASCII(c) && isalnum(c))
|
88
|
+
#define ISALPHA(c) (ISASCII(c) && isalpha(c))
|
89
|
+
#define ISCNTRL(c) (ISASCII(c) && iscntrl(c))
|
90
|
+
#define ISLOWER(c) (ISASCII(c) && islower(c))
|
91
|
+
#define ISPUNCT(c) (ISASCII(c) && ispunct(c))
|
92
|
+
#define ISSPACE(c) (ISASCII(c) && isspace(c))
|
93
|
+
#define ISUPPER(c) (ISASCII(c) && isupper(c))
|
94
|
+
#define ISXDIGIT(c) (ISASCII(c) && isxdigit(c))
|
95
|
+
|
96
|
+
/* Match pattern "p" against "text" */
|
97
|
+
static int dowild(const uchar *p, const uchar *text, unsigned int flags)
|
98
|
+
{
|
99
|
+
uchar p_ch;
|
100
|
+
const uchar *pattern = p;
|
101
|
+
|
102
|
+
for ( ; (p_ch = *p) != '\0'; text++, p++) {
|
103
|
+
int matched, match_slash, negated;
|
104
|
+
uchar t_ch, prev_ch;
|
105
|
+
if ((t_ch = *text) == '\0' && p_ch != '*')
|
106
|
+
return WM_ABORT_ALL;
|
107
|
+
if ((flags & WM_CASEFOLD) && ISUPPER(t_ch))
|
108
|
+
t_ch = tolower(t_ch);
|
109
|
+
if ((flags & WM_CASEFOLD) && ISUPPER(p_ch))
|
110
|
+
p_ch = tolower(p_ch);
|
111
|
+
switch (p_ch) {
|
112
|
+
case '\\':
|
113
|
+
/* Literal match with following character. Note that the test
|
114
|
+
* in "default" handles the p[1] == '\0' failure case. */
|
115
|
+
p_ch = *++p;
|
116
|
+
/* FALLTHROUGH */
|
117
|
+
default:
|
118
|
+
if (t_ch != p_ch)
|
119
|
+
return WM_NOMATCH;
|
120
|
+
continue;
|
121
|
+
case '?':
|
122
|
+
/* Match anything but '/'. */
|
123
|
+
if ((flags & WM_PATHNAME) && t_ch == '/')
|
124
|
+
return WM_NOMATCH;
|
125
|
+
continue;
|
126
|
+
case '*':
|
127
|
+
if (*++p == '*') {
|
128
|
+
const uchar *prev_p = p - 2;
|
129
|
+
while (*++p == '*') {}
|
130
|
+
if (!(flags & WM_PATHNAME))
|
131
|
+
/* without WM_PATHNAME, '*' == '**' */
|
132
|
+
match_slash = 1;
|
133
|
+
else if ((prev_p < pattern || *prev_p == '/') &&
|
134
|
+
(*p == '\0' || *p == '/' ||
|
135
|
+
(p[0] == '\\' && p[1] == '/'))) {
|
136
|
+
/*
|
137
|
+
* Assuming we already match 'foo/' and are at
|
138
|
+
* <star star slash>, just assume it matches
|
139
|
+
* nothing and go ahead match the rest of the
|
140
|
+
* pattern with the remaining string. This
|
141
|
+
* helps make foo/<*><*>/bar (<> because
|
142
|
+
* otherwise it breaks C comment syntax) match
|
143
|
+
* both foo/bar and foo/a/bar.
|
144
|
+
*/
|
145
|
+
if (p[0] == '/' &&
|
146
|
+
dowild(p + 1, text, flags) == WM_MATCH)
|
147
|
+
return WM_MATCH;
|
148
|
+
match_slash = 1;
|
149
|
+
} else /* WM_PATHNAME is set */
|
150
|
+
match_slash = 0;
|
151
|
+
} else
|
152
|
+
/* without WM_PATHNAME, '*' == '**' */
|
153
|
+
match_slash = flags & WM_PATHNAME ? 0 : 1;
|
154
|
+
if (*p == '\0') {
|
155
|
+
/* Trailing "**" matches everything. Trailing "*" matches
|
156
|
+
* only if there are no more slash characters. */
|
157
|
+
if (!match_slash) {
|
158
|
+
if (strchr((char*)text, '/') != NULL)
|
159
|
+
return WM_NOMATCH;
|
160
|
+
}
|
161
|
+
return WM_MATCH;
|
162
|
+
} else if (!match_slash && *p == '/') {
|
163
|
+
/*
|
164
|
+
* _one_ asterisk followed by a slash
|
165
|
+
* with WM_PATHNAME matches the next
|
166
|
+
* directory
|
167
|
+
*/
|
168
|
+
const char *slash = strchr((char*)text, '/');
|
169
|
+
if (!slash)
|
170
|
+
return WM_NOMATCH;
|
171
|
+
text = (const uchar*)slash;
|
172
|
+
/* the slash is consumed by the top-level for loop */
|
173
|
+
break;
|
174
|
+
}
|
175
|
+
while (1) {
|
176
|
+
if (t_ch == '\0')
|
177
|
+
break;
|
178
|
+
/*
|
179
|
+
* Try to advance faster when an asterisk is
|
180
|
+
* followed by a literal. We know in this case
|
181
|
+
* that the string before the literal
|
182
|
+
* must belong to "*".
|
183
|
+
* If match_slash is false, do not look past
|
184
|
+
* the first slash as it cannot belong to '*'.
|
185
|
+
*/
|
186
|
+
if (!is_glob_special(*p)) {
|
187
|
+
p_ch = *p;
|
188
|
+
if ((flags & WM_CASEFOLD) && ISUPPER(p_ch))
|
189
|
+
p_ch = tolower(p_ch);
|
190
|
+
while ((t_ch = *text) != '\0' &&
|
191
|
+
(match_slash || t_ch != '/')) {
|
192
|
+
if ((flags & WM_CASEFOLD) && ISUPPER(t_ch))
|
193
|
+
t_ch = tolower(t_ch);
|
194
|
+
if (t_ch == p_ch)
|
195
|
+
break;
|
196
|
+
text++;
|
197
|
+
}
|
198
|
+
if (t_ch != p_ch)
|
199
|
+
return WM_NOMATCH;
|
200
|
+
}
|
201
|
+
if ((matched = dowild(p, text, flags)) != WM_NOMATCH) {
|
202
|
+
if (!match_slash || matched != WM_ABORT_TO_STARSTAR)
|
203
|
+
return matched;
|
204
|
+
} else if (!match_slash && t_ch == '/')
|
205
|
+
return WM_ABORT_TO_STARSTAR;
|
206
|
+
t_ch = *++text;
|
207
|
+
}
|
208
|
+
return WM_ABORT_ALL;
|
209
|
+
case '[':
|
210
|
+
p_ch = *++p;
|
211
|
+
#ifdef NEGATE_CLASS2
|
212
|
+
if (p_ch == NEGATE_CLASS2)
|
213
|
+
p_ch = NEGATE_CLASS;
|
214
|
+
#endif
|
215
|
+
/* Assign literal 1/0 because of "matched" comparison. */
|
216
|
+
negated = p_ch == NEGATE_CLASS ? 1 : 0;
|
217
|
+
if (negated) {
|
218
|
+
/* Inverted character class. */
|
219
|
+
p_ch = *++p;
|
220
|
+
}
|
221
|
+
prev_ch = 0;
|
222
|
+
matched = 0;
|
223
|
+
do {
|
224
|
+
if (!p_ch)
|
225
|
+
return WM_ABORT_ALL;
|
226
|
+
if (p_ch == '\\') {
|
227
|
+
p_ch = *++p;
|
228
|
+
if (!p_ch)
|
229
|
+
return WM_ABORT_ALL;
|
230
|
+
if (t_ch == p_ch)
|
231
|
+
matched = 1;
|
232
|
+
} else if (p_ch == '-' && prev_ch && p[1] && p[1] != ']') {
|
233
|
+
p_ch = *++p;
|
234
|
+
if (p_ch == '\\') {
|
235
|
+
p_ch = *++p;
|
236
|
+
if (!p_ch)
|
237
|
+
return WM_ABORT_ALL;
|
238
|
+
}
|
239
|
+
if (t_ch <= p_ch && t_ch >= prev_ch)
|
240
|
+
matched = 1;
|
241
|
+
else if ((flags & WM_CASEFOLD) && ISLOWER(t_ch)) {
|
242
|
+
uchar t_ch_upper = toupper(t_ch);
|
243
|
+
if (t_ch_upper <= p_ch && t_ch_upper >= prev_ch)
|
244
|
+
matched = 1;
|
245
|
+
}
|
246
|
+
p_ch = 0; /* This makes "prev_ch" get set to 0. */
|
247
|
+
} else if (p_ch == '[' && p[1] == ':') {
|
248
|
+
const uchar *s;
|
249
|
+
int i;
|
250
|
+
for (s = p += 2; (p_ch = *p) && p_ch != ']'; p++) {} /*SHARED ITERATOR*/
|
251
|
+
if (!p_ch)
|
252
|
+
return WM_ABORT_ALL;
|
253
|
+
i = (int)(p - s - 1);
|
254
|
+
if (i < 0 || p[-1] != ':') {
|
255
|
+
/* Didn't find ":]", so treat like a normal set. */
|
256
|
+
p = s - 2;
|
257
|
+
p_ch = '[';
|
258
|
+
if (t_ch == p_ch)
|
259
|
+
matched = 1;
|
260
|
+
continue;
|
261
|
+
}
|
262
|
+
if (CC_EQ(s,i, "alnum")) {
|
263
|
+
if (ISALNUM(t_ch))
|
264
|
+
matched = 1;
|
265
|
+
} else if (CC_EQ(s,i, "alpha")) {
|
266
|
+
if (ISALPHA(t_ch))
|
267
|
+
matched = 1;
|
268
|
+
} else if (CC_EQ(s,i, "blank")) {
|
269
|
+
if (ISBLANK(t_ch))
|
270
|
+
matched = 1;
|
271
|
+
} else if (CC_EQ(s,i, "cntrl")) {
|
272
|
+
if (ISCNTRL(t_ch))
|
273
|
+
matched = 1;
|
274
|
+
} else if (CC_EQ(s,i, "digit")) {
|
275
|
+
if (ISDIGIT(t_ch))
|
276
|
+
matched = 1;
|
277
|
+
} else if (CC_EQ(s,i, "graph")) {
|
278
|
+
if (ISGRAPH(t_ch))
|
279
|
+
matched = 1;
|
280
|
+
} else if (CC_EQ(s,i, "lower")) {
|
281
|
+
if (ISLOWER(t_ch))
|
282
|
+
matched = 1;
|
283
|
+
} else if (CC_EQ(s,i, "print")) {
|
284
|
+
if (ISPRINT(t_ch))
|
285
|
+
matched = 1;
|
286
|
+
} else if (CC_EQ(s,i, "punct")) {
|
287
|
+
if (ISPUNCT(t_ch))
|
288
|
+
matched = 1;
|
289
|
+
} else if (CC_EQ(s,i, "space")) {
|
290
|
+
if (ISSPACE(t_ch))
|
291
|
+
matched = 1;
|
292
|
+
} else if (CC_EQ(s,i, "upper")) {
|
293
|
+
if (ISUPPER(t_ch))
|
294
|
+
matched = 1;
|
295
|
+
else if ((flags & WM_CASEFOLD) && ISLOWER(t_ch))
|
296
|
+
matched = 1;
|
297
|
+
} else if (CC_EQ(s,i, "xdigit")) {
|
298
|
+
if (ISXDIGIT(t_ch))
|
299
|
+
matched = 1;
|
300
|
+
} else /* malformed [:class:] string */
|
301
|
+
return WM_ABORT_ALL;
|
302
|
+
p_ch = 0; /* This makes "prev_ch" get set to 0. */
|
303
|
+
} else if (t_ch == p_ch)
|
304
|
+
matched = 1;
|
305
|
+
} while (prev_ch = p_ch, (p_ch = *++p) != ']');
|
306
|
+
if (matched == negated ||
|
307
|
+
((flags & WM_PATHNAME) && t_ch == '/'))
|
308
|
+
return WM_NOMATCH;
|
309
|
+
continue;
|
310
|
+
}
|
311
|
+
}
|
312
|
+
|
313
|
+
return *text ? WM_NOMATCH : WM_MATCH;
|
314
|
+
}
|
315
|
+
|
316
|
+
/* Match the "pattern" against the "text" string. */
|
317
|
+
int wildmatch(const char *pattern, const char *text, unsigned int flags)
|
318
|
+
{
|
319
|
+
return dowild((const uchar*)pattern, (const uchar*)text, flags);
|
320
|
+
}
|
@@ -0,0 +1,23 @@
|
|
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_wildmatch_h__
|
9
|
+
#define INCLUDE_wildmatch_h__
|
10
|
+
|
11
|
+
#include "common.h"
|
12
|
+
|
13
|
+
#define WM_CASEFOLD 1
|
14
|
+
#define WM_PATHNAME 2
|
15
|
+
|
16
|
+
#define WM_NOMATCH 1
|
17
|
+
#define WM_MATCH 0
|
18
|
+
#define WM_ABORT_ALL -1
|
19
|
+
#define WM_ABORT_TO_STARSTAR -2
|
20
|
+
|
21
|
+
int wildmatch(const char *pattern, const char *text, unsigned int flags);
|
22
|
+
|
23
|
+
#endif
|
@@ -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
154
|
int git_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
|
|
@@ -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
|