rugged 1.4.3 → 1.5.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 +34 -2
- data/ext/rugged/extconf.rb +3 -0
- data/ext/rugged/rugged.c +16 -0
- data/ext/rugged/rugged.h +4 -0
- data/ext/rugged/rugged_remote.c +10 -10
- data/ext/rugged/rugged_repo.c +2 -7
- data/ext/rugged/rugged_settings.c +5 -0
- data/lib/rugged/tree.rb +4 -0
- data/lib/rugged/version.rb +1 -1
- data/vendor/libgit2/CMakeLists.txt +16 -3
- data/vendor/libgit2/COPYING +40 -0
- data/vendor/libgit2/cmake/AddClarTest.cmake +7 -0
- data/vendor/libgit2/cmake/FindPCRE.cmake +3 -4
- data/vendor/libgit2/cmake/FindPCRE2.cmake +1 -1
- data/vendor/libgit2/cmake/SelectHTTPSBackend.cmake +1 -1
- data/vendor/libgit2/cmake/SelectHashes.cmake +62 -14
- data/vendor/libgit2/deps/ntlmclient/crypt_openssl.c +3 -1
- data/vendor/libgit2/deps/zlib/adler32.c +7 -0
- data/vendor/libgit2/deps/zlib/crc32.c +975 -288
- data/vendor/libgit2/deps/zlib/crc32.h +9441 -436
- data/vendor/libgit2/deps/zlib/deflate.c +83 -31
- data/vendor/libgit2/deps/zlib/deflate.h +12 -15
- data/vendor/libgit2/deps/zlib/gzguts.h +3 -2
- data/vendor/libgit2/deps/zlib/infback.c +2 -1
- data/vendor/libgit2/deps/zlib/inffast.c +14 -14
- data/vendor/libgit2/deps/zlib/inflate.c +39 -8
- data/vendor/libgit2/deps/zlib/inflate.h +3 -2
- data/vendor/libgit2/deps/zlib/inftrees.c +3 -3
- data/vendor/libgit2/deps/zlib/trees.c +27 -48
- data/vendor/libgit2/deps/zlib/zlib.h +126 -100
- data/vendor/libgit2/deps/zlib/zutil.c +2 -2
- data/vendor/libgit2/deps/zlib/zutil.h +12 -9
- data/vendor/libgit2/include/git2/branch.h +2 -2
- data/vendor/libgit2/include/git2/common.h +11 -0
- data/vendor/libgit2/include/git2/config.h +6 -6
- data/vendor/libgit2/include/git2/deprecated.h +2 -0
- data/vendor/libgit2/include/git2/errors.h +17 -3
- data/vendor/libgit2/include/git2/merge.h +1 -1
- data/vendor/libgit2/include/git2/status.h +5 -2
- data/vendor/libgit2/include/git2/sys/remote.h +15 -0
- data/vendor/libgit2/include/git2/sys/transport.h +9 -5
- data/vendor/libgit2/include/git2/version.h +27 -6
- data/vendor/libgit2/src/CMakeLists.txt +104 -214
- data/vendor/libgit2/src/README.md +12 -0
- data/vendor/libgit2/src/cli/CMakeLists.txt +53 -0
- data/vendor/libgit2/src/cli/README.md +26 -0
- data/vendor/libgit2/src/cli/cli.h +20 -0
- data/vendor/libgit2/src/cli/cmd.c +21 -0
- data/vendor/libgit2/src/cli/cmd.h +33 -0
- data/vendor/libgit2/src/cli/cmd_cat_file.c +204 -0
- data/vendor/libgit2/src/cli/cmd_clone.c +176 -0
- data/vendor/libgit2/src/cli/cmd_hash_object.c +135 -0
- data/vendor/libgit2/src/cli/cmd_help.c +86 -0
- data/vendor/libgit2/src/cli/error.h +51 -0
- data/vendor/libgit2/src/cli/main.c +106 -0
- data/vendor/libgit2/src/cli/opt.c +669 -0
- data/vendor/libgit2/src/cli/opt.h +349 -0
- data/vendor/libgit2/src/cli/opt_usage.c +194 -0
- data/vendor/libgit2/src/cli/opt_usage.h +35 -0
- data/vendor/libgit2/src/cli/progress.c +345 -0
- data/vendor/libgit2/src/cli/progress.h +117 -0
- data/vendor/libgit2/src/cli/sighandler.h +20 -0
- data/vendor/libgit2/src/cli/unix/sighandler.c +36 -0
- data/vendor/libgit2/src/{win32 → cli/win32}/precompiled.c +0 -0
- data/vendor/libgit2/src/cli/win32/precompiled.h +3 -0
- data/vendor/libgit2/src/cli/win32/sighandler.c +37 -0
- data/vendor/libgit2/src/features.h.in +9 -0
- data/vendor/libgit2/src/libgit2/CMakeLists.txt +131 -0
- data/vendor/libgit2/src/{annotated_commit.c → libgit2/annotated_commit.c} +0 -0
- data/vendor/libgit2/src/{annotated_commit.h → libgit2/annotated_commit.h} +0 -0
- data/vendor/libgit2/src/{apply.c → libgit2/apply.c} +0 -0
- data/vendor/libgit2/src/{apply.h → libgit2/apply.h} +0 -0
- data/vendor/libgit2/src/{attr.c → libgit2/attr.c} +0 -0
- data/vendor/libgit2/src/{attr.h → libgit2/attr.h} +0 -0
- data/vendor/libgit2/src/{attr_file.c → libgit2/attr_file.c} +0 -0
- data/vendor/libgit2/src/{attr_file.h → libgit2/attr_file.h} +0 -0
- data/vendor/libgit2/src/{attrcache.c → libgit2/attrcache.c} +0 -0
- data/vendor/libgit2/src/{attrcache.h → libgit2/attrcache.h} +0 -0
- data/vendor/libgit2/src/{blame.c → libgit2/blame.c} +0 -0
- data/vendor/libgit2/src/{blame.h → libgit2/blame.h} +0 -0
- data/vendor/libgit2/src/{blame_git.c → libgit2/blame_git.c} +0 -0
- data/vendor/libgit2/src/{blame_git.h → libgit2/blame_git.h} +0 -0
- data/vendor/libgit2/src/{blob.c → libgit2/blob.c} +1 -1
- data/vendor/libgit2/src/{blob.h → libgit2/blob.h} +0 -0
- data/vendor/libgit2/src/{branch.c → libgit2/branch.c} +14 -9
- data/vendor/libgit2/src/{branch.h → libgit2/branch.h} +0 -0
- data/vendor/libgit2/src/{buf.c → libgit2/buf.c} +0 -0
- data/vendor/libgit2/src/{buf.h → libgit2/buf.h} +0 -0
- data/vendor/libgit2/src/{cache.c → libgit2/cache.c} +0 -0
- data/vendor/libgit2/src/{cache.h → libgit2/cache.h} +0 -0
- data/vendor/libgit2/src/{checkout.c → libgit2/checkout.c} +0 -0
- data/vendor/libgit2/src/{checkout.h → libgit2/checkout.h} +0 -0
- data/vendor/libgit2/src/{cherrypick.c → libgit2/cherrypick.c} +0 -0
- data/vendor/libgit2/src/{clone.c → libgit2/clone.c} +0 -0
- data/vendor/libgit2/src/{clone.h → libgit2/clone.h} +0 -0
- data/vendor/libgit2/src/{commit.c → libgit2/commit.c} +0 -0
- data/vendor/libgit2/src/{commit.h → libgit2/commit.h} +0 -0
- data/vendor/libgit2/src/{commit_graph.c → libgit2/commit_graph.c} +20 -17
- data/vendor/libgit2/src/{commit_graph.h → libgit2/commit_graph.h} +1 -1
- data/vendor/libgit2/src/{commit_list.c → libgit2/commit_list.c} +0 -0
- data/vendor/libgit2/src/{commit_list.h → libgit2/commit_list.h} +0 -0
- data/vendor/libgit2/src/libgit2/common.h +55 -0
- data/vendor/libgit2/src/{config.c → libgit2/config.c} +6 -3
- data/vendor/libgit2/src/{config.h → libgit2/config.h} +0 -0
- data/vendor/libgit2/src/{config_backend.h → libgit2/config_backend.h} +0 -0
- data/vendor/libgit2/src/{config_cache.c → libgit2/config_cache.c} +0 -0
- data/vendor/libgit2/src/{config_entries.c → libgit2/config_entries.c} +0 -0
- data/vendor/libgit2/src/{config_entries.h → libgit2/config_entries.h} +0 -0
- data/vendor/libgit2/src/{config_file.c → libgit2/config_file.c} +0 -0
- data/vendor/libgit2/src/{config_mem.c → libgit2/config_mem.c} +0 -0
- data/vendor/libgit2/src/{config_parse.c → libgit2/config_parse.c} +0 -0
- data/vendor/libgit2/src/{config_parse.h → libgit2/config_parse.h} +0 -0
- data/vendor/libgit2/src/{config_snapshot.c → libgit2/config_snapshot.c} +0 -0
- data/vendor/libgit2/src/{crlf.c → libgit2/crlf.c} +0 -0
- data/vendor/libgit2/src/{delta.c → libgit2/delta.c} +0 -0
- data/vendor/libgit2/src/{delta.h → libgit2/delta.h} +0 -0
- data/vendor/libgit2/src/{describe.c → libgit2/describe.c} +0 -0
- data/vendor/libgit2/src/{diff.c → libgit2/diff.c} +0 -0
- data/vendor/libgit2/src/{diff.h → libgit2/diff.h} +0 -0
- data/vendor/libgit2/src/{diff_driver.c → libgit2/diff_driver.c} +0 -0
- data/vendor/libgit2/src/{diff_driver.h → libgit2/diff_driver.h} +0 -0
- data/vendor/libgit2/src/{diff_file.c → libgit2/diff_file.c} +0 -0
- data/vendor/libgit2/src/{diff_file.h → libgit2/diff_file.h} +0 -0
- data/vendor/libgit2/src/{diff_generate.c → libgit2/diff_generate.c} +0 -0
- data/vendor/libgit2/src/{diff_generate.h → libgit2/diff_generate.h} +0 -0
- data/vendor/libgit2/src/{diff_parse.c → libgit2/diff_parse.c} +0 -0
- data/vendor/libgit2/src/{diff_parse.h → libgit2/diff_parse.h} +0 -0
- data/vendor/libgit2/src/{diff_print.c → libgit2/diff_print.c} +0 -0
- data/vendor/libgit2/src/{diff_stats.c → libgit2/diff_stats.c} +0 -0
- data/vendor/libgit2/src/{diff_stats.h → libgit2/diff_stats.h} +0 -0
- data/vendor/libgit2/src/{diff_tform.c → libgit2/diff_tform.c} +0 -0
- data/vendor/libgit2/src/{diff_tform.h → libgit2/diff_tform.h} +0 -0
- data/vendor/libgit2/src/{diff_xdiff.c → libgit2/diff_xdiff.c} +1 -0
- data/vendor/libgit2/src/{diff_xdiff.h → libgit2/diff_xdiff.h} +0 -0
- data/vendor/libgit2/src/{email.c → libgit2/email.c} +0 -0
- data/vendor/libgit2/src/{email.h → libgit2/email.h} +0 -0
- data/vendor/libgit2/src/{errors.c → libgit2/errors.c} +0 -0
- data/vendor/libgit2/src/{errors.h → libgit2/errors.h} +1 -2
- data/vendor/libgit2/src/{fetch.c → libgit2/fetch.c} +0 -0
- data/vendor/libgit2/src/{fetch.h → libgit2/fetch.h} +0 -0
- data/vendor/libgit2/src/{fetchhead.c → libgit2/fetchhead.c} +0 -0
- data/vendor/libgit2/src/{fetchhead.h → libgit2/fetchhead.h} +0 -0
- data/vendor/libgit2/src/{filter.c → libgit2/filter.c} +31 -1
- data/vendor/libgit2/src/{filter.h → libgit2/filter.h} +0 -0
- data/vendor/libgit2/src/{win32 → libgit2}/git2.rc +0 -0
- data/vendor/libgit2/src/{graph.c → libgit2/graph.c} +0 -0
- data/vendor/libgit2/src/{hashsig.c → libgit2/hashsig.c} +0 -0
- data/vendor/libgit2/src/{ident.c → libgit2/ident.c} +0 -0
- data/vendor/libgit2/src/{idxmap.c → libgit2/idxmap.c} +0 -0
- data/vendor/libgit2/src/{idxmap.h → libgit2/idxmap.h} +0 -0
- data/vendor/libgit2/src/{ignore.c → libgit2/ignore.c} +0 -0
- data/vendor/libgit2/src/{ignore.h → libgit2/ignore.h} +0 -0
- data/vendor/libgit2/src/{index.c → libgit2/index.c} +6 -6
- data/vendor/libgit2/src/{index.h → libgit2/index.h} +0 -0
- data/vendor/libgit2/src/{indexer.c → libgit2/indexer.c} +2 -2
- data/vendor/libgit2/src/{indexer.h → libgit2/indexer.h} +0 -0
- data/vendor/libgit2/src/{iterator.c → libgit2/iterator.c} +3 -3
- data/vendor/libgit2/src/{iterator.h → libgit2/iterator.h} +0 -0
- data/vendor/libgit2/src/{libgit2.c → libgit2/libgit2.c} +5 -0
- data/vendor/libgit2/src/{libgit2.h → libgit2/libgit2.h} +0 -0
- data/vendor/libgit2/src/{mailmap.c → libgit2/mailmap.c} +0 -0
- data/vendor/libgit2/src/{mailmap.h → libgit2/mailmap.h} +0 -0
- data/vendor/libgit2/src/{merge.c → libgit2/merge.c} +0 -0
- data/vendor/libgit2/src/{merge.h → libgit2/merge.h} +0 -0
- data/vendor/libgit2/src/{merge_driver.c → libgit2/merge_driver.c} +0 -0
- data/vendor/libgit2/src/{merge_driver.h → libgit2/merge_driver.h} +0 -0
- data/vendor/libgit2/src/{merge_file.c → libgit2/merge_file.c} +0 -0
- data/vendor/libgit2/src/{message.c → libgit2/message.c} +0 -0
- data/vendor/libgit2/src/{midx.c → libgit2/midx.c} +20 -23
- data/vendor/libgit2/src/{midx.h → libgit2/midx.h} +2 -1
- data/vendor/libgit2/src/{mwindow.c → libgit2/mwindow.c} +9 -9
- data/vendor/libgit2/src/{mwindow.h → libgit2/mwindow.h} +1 -1
- data/vendor/libgit2/src/{netops.c → libgit2/netops.c} +0 -1
- data/vendor/libgit2/src/{netops.h → libgit2/netops.h} +0 -0
- data/vendor/libgit2/src/{notes.c → libgit2/notes.c} +0 -0
- data/vendor/libgit2/src/{notes.h → libgit2/notes.h} +0 -0
- data/vendor/libgit2/src/{object.c → libgit2/object.c} +1 -0
- data/vendor/libgit2/src/{object.h → libgit2/object.h} +0 -0
- data/vendor/libgit2/src/{object_api.c → libgit2/object_api.c} +0 -0
- data/vendor/libgit2/src/{odb.c → libgit2/odb.c} +2 -2
- data/vendor/libgit2/src/{odb.h → libgit2/odb.h} +0 -0
- data/vendor/libgit2/src/{odb_loose.c → libgit2/odb_loose.c} +0 -0
- data/vendor/libgit2/src/{odb_mempack.c → libgit2/odb_mempack.c} +0 -0
- data/vendor/libgit2/src/{odb_pack.c → libgit2/odb_pack.c} +0 -0
- data/vendor/libgit2/src/{offmap.c → libgit2/offmap.c} +0 -0
- data/vendor/libgit2/src/{offmap.h → libgit2/offmap.h} +0 -0
- data/vendor/libgit2/src/{oid.c → libgit2/oid.c} +2 -21
- data/vendor/libgit2/src/{oid.h → libgit2/oid.h} +35 -2
- data/vendor/libgit2/src/{oidarray.c → libgit2/oidarray.c} +0 -0
- data/vendor/libgit2/src/{oidarray.h → libgit2/oidarray.h} +0 -0
- data/vendor/libgit2/src/{oidmap.c → libgit2/oidmap.c} +1 -1
- data/vendor/libgit2/src/{oidmap.h → libgit2/oidmap.h} +0 -0
- data/vendor/libgit2/src/{pack-objects.c → libgit2/pack-objects.c} +0 -0
- data/vendor/libgit2/src/{pack-objects.h → libgit2/pack-objects.h} +0 -0
- data/vendor/libgit2/src/{pack.c → libgit2/pack.c} +24 -18
- data/vendor/libgit2/src/{pack.h → libgit2/pack.h} +3 -2
- data/vendor/libgit2/src/{parse.c → libgit2/parse.c} +0 -0
- data/vendor/libgit2/src/{parse.h → libgit2/parse.h} +0 -0
- data/vendor/libgit2/src/{patch.c → libgit2/patch.c} +0 -0
- data/vendor/libgit2/src/{patch.h → libgit2/patch.h} +0 -0
- data/vendor/libgit2/src/{patch_generate.c → libgit2/patch_generate.c} +0 -0
- data/vendor/libgit2/src/{patch_generate.h → libgit2/patch_generate.h} +0 -0
- data/vendor/libgit2/src/{patch_parse.c → libgit2/patch_parse.c} +0 -0
- data/vendor/libgit2/src/{patch_parse.h → libgit2/patch_parse.h} +0 -0
- data/vendor/libgit2/src/{path.c → libgit2/path.c} +1 -0
- data/vendor/libgit2/src/{path.h → libgit2/path.h} +0 -0
- data/vendor/libgit2/src/{pathspec.c → libgit2/pathspec.c} +0 -0
- data/vendor/libgit2/src/{pathspec.h → libgit2/pathspec.h} +0 -0
- data/vendor/libgit2/src/{proxy.c → libgit2/proxy.c} +0 -0
- data/vendor/libgit2/src/{proxy.h → libgit2/proxy.h} +0 -0
- data/vendor/libgit2/src/{push.c → libgit2/push.c} +0 -0
- data/vendor/libgit2/src/{push.h → libgit2/push.h} +0 -0
- data/vendor/libgit2/src/{reader.c → libgit2/reader.c} +0 -0
- data/vendor/libgit2/src/{reader.h → libgit2/reader.h} +0 -0
- data/vendor/libgit2/src/{rebase.c → libgit2/rebase.c} +11 -1
- data/vendor/libgit2/src/{refdb.c → libgit2/refdb.c} +0 -0
- data/vendor/libgit2/src/{refdb.h → libgit2/refdb.h} +0 -0
- data/vendor/libgit2/src/{refdb_fs.c → libgit2/refdb_fs.c} +6 -2
- data/vendor/libgit2/src/{reflog.c → libgit2/reflog.c} +0 -0
- data/vendor/libgit2/src/{reflog.h → libgit2/reflog.h} +0 -0
- data/vendor/libgit2/src/{refs.c → libgit2/refs.c} +0 -0
- data/vendor/libgit2/src/{refs.h → libgit2/refs.h} +0 -0
- data/vendor/libgit2/src/{refspec.c → libgit2/refspec.c} +0 -0
- data/vendor/libgit2/src/{refspec.h → libgit2/refspec.h} +0 -0
- data/vendor/libgit2/src/{remote.c → libgit2/remote.c} +1 -1
- data/vendor/libgit2/src/{remote.h → libgit2/remote.h} +1 -1
- data/vendor/libgit2/src/{repo_template.h → libgit2/repo_template.h} +0 -0
- data/vendor/libgit2/src/{repository.c → libgit2/repository.c} +80 -28
- data/vendor/libgit2/src/{repository.h → libgit2/repository.h} +0 -0
- data/vendor/libgit2/src/{reset.c → libgit2/reset.c} +0 -0
- data/vendor/libgit2/src/{revert.c → libgit2/revert.c} +0 -0
- data/vendor/libgit2/src/{revparse.c → libgit2/revparse.c} +0 -0
- data/vendor/libgit2/src/{revwalk.c → libgit2/revwalk.c} +0 -0
- data/vendor/libgit2/src/{revwalk.h → libgit2/revwalk.h} +0 -0
- data/vendor/libgit2/src/{settings.h → libgit2/settings.h} +0 -0
- data/vendor/libgit2/src/{signature.c → libgit2/signature.c} +0 -0
- data/vendor/libgit2/src/{signature.h → libgit2/signature.h} +0 -0
- data/vendor/libgit2/src/{stash.c → libgit2/stash.c} +0 -0
- data/vendor/libgit2/src/{status.c → libgit2/status.c} +0 -0
- data/vendor/libgit2/src/{status.h → libgit2/status.h} +0 -0
- data/vendor/libgit2/src/{strarray.c → libgit2/strarray.c} +0 -0
- data/vendor/libgit2/src/{stream.h → libgit2/stream.h} +0 -0
- data/vendor/libgit2/src/{streams → libgit2/streams}/mbedtls.c +0 -0
- data/vendor/libgit2/src/{streams → libgit2/streams}/mbedtls.h +0 -0
- data/vendor/libgit2/src/{streams → libgit2/streams}/openssl.c +0 -0
- data/vendor/libgit2/src/{streams → libgit2/streams}/openssl.h +0 -0
- data/vendor/libgit2/src/{streams → libgit2/streams}/openssl_dynamic.c +0 -0
- data/vendor/libgit2/src/{streams → libgit2/streams}/openssl_dynamic.h +0 -0
- data/vendor/libgit2/src/{streams → libgit2/streams}/openssl_legacy.c +0 -0
- data/vendor/libgit2/src/{streams → libgit2/streams}/openssl_legacy.h +0 -0
- data/vendor/libgit2/src/{streams → libgit2/streams}/registry.c +0 -0
- data/vendor/libgit2/src/{streams → libgit2/streams}/registry.h +0 -0
- data/vendor/libgit2/src/{streams → libgit2/streams}/socket.c +0 -0
- data/vendor/libgit2/src/{streams → libgit2/streams}/socket.h +0 -0
- data/vendor/libgit2/src/{streams → libgit2/streams}/stransport.c +0 -0
- data/vendor/libgit2/src/{streams → libgit2/streams}/stransport.h +0 -0
- data/vendor/libgit2/src/{streams → libgit2/streams}/tls.c +0 -0
- data/vendor/libgit2/src/{streams → libgit2/streams}/tls.h +0 -0
- data/vendor/libgit2/src/{submodule.c → libgit2/submodule.c} +0 -0
- data/vendor/libgit2/src/{submodule.h → libgit2/submodule.h} +0 -0
- data/vendor/libgit2/src/{sysdir.c → libgit2/sysdir.c} +0 -0
- data/vendor/libgit2/src/{sysdir.h → libgit2/sysdir.h} +0 -0
- data/vendor/libgit2/src/{tag.c → libgit2/tag.c} +15 -5
- data/vendor/libgit2/src/{tag.h → libgit2/tag.h} +0 -0
- data/vendor/libgit2/src/{threadstate.c → libgit2/threadstate.c} +0 -0
- data/vendor/libgit2/src/{threadstate.h → libgit2/threadstate.h} +0 -0
- data/vendor/libgit2/src/{trace.c → libgit2/trace.c} +0 -0
- data/vendor/libgit2/src/{trace.h → libgit2/trace.h} +0 -0
- data/vendor/libgit2/src/{trailer.c → libgit2/trailer.c} +0 -0
- data/vendor/libgit2/src/{transaction.c → libgit2/transaction.c} +0 -0
- data/vendor/libgit2/src/{transaction.h → libgit2/transaction.h} +0 -0
- data/vendor/libgit2/src/{transport.c → libgit2/transport.c} +0 -0
- data/vendor/libgit2/src/{transports → libgit2/transports}/auth.c +0 -0
- data/vendor/libgit2/src/{transports → libgit2/transports}/auth.h +0 -0
- data/vendor/libgit2/src/{transports → libgit2/transports}/auth_negotiate.c +0 -0
- data/vendor/libgit2/src/{transports → libgit2/transports}/auth_negotiate.h +0 -0
- data/vendor/libgit2/src/{transports → libgit2/transports}/auth_ntlm.c +0 -0
- data/vendor/libgit2/src/{transports → libgit2/transports}/auth_ntlm.h +0 -0
- data/vendor/libgit2/src/{transports → libgit2/transports}/credential.c +0 -0
- data/vendor/libgit2/src/{transports → libgit2/transports}/credential_helpers.c +0 -0
- data/vendor/libgit2/src/{transports → libgit2/transports}/git.c +0 -0
- data/vendor/libgit2/src/{transports → libgit2/transports}/http.c +0 -0
- data/vendor/libgit2/src/{transports → libgit2/transports}/http.h +0 -0
- data/vendor/libgit2/src/{transports → libgit2/transports}/httpclient.c +1 -1
- data/vendor/libgit2/src/{transports → libgit2/transports}/httpclient.h +0 -0
- data/vendor/libgit2/src/{transports → libgit2/transports}/local.c +0 -0
- data/vendor/libgit2/src/{transports → libgit2/transports}/smart.c +12 -0
- data/vendor/libgit2/src/{transports → libgit2/transports}/smart.h +0 -0
- data/vendor/libgit2/src/{transports → libgit2/transports}/smart_pkt.c +0 -0
- data/vendor/libgit2/src/{transports → libgit2/transports}/smart_protocol.c +0 -0
- data/vendor/libgit2/src/{transports → libgit2/transports}/ssh.c +0 -0
- data/vendor/libgit2/src/{transports → libgit2/transports}/ssh.h +0 -0
- data/vendor/libgit2/src/{transports → libgit2/transports}/winhttp.c +0 -0
- data/vendor/libgit2/src/{tree-cache.c → libgit2/tree-cache.c} +1 -1
- data/vendor/libgit2/src/{tree-cache.h → libgit2/tree-cache.h} +0 -0
- data/vendor/libgit2/src/{tree.c → libgit2/tree.c} +16 -23
- data/vendor/libgit2/src/{tree.h → libgit2/tree.h} +1 -1
- data/vendor/libgit2/src/{userdiff.h → libgit2/userdiff.h} +0 -0
- data/vendor/libgit2/src/{worktree.c → libgit2/worktree.c} +0 -0
- data/vendor/libgit2/src/{worktree.h → libgit2/worktree.h} +0 -0
- data/vendor/libgit2/src/{xdiff → libgit2/xdiff}/git-xdiff.h +0 -0
- data/vendor/libgit2/src/{xdiff → libgit2/xdiff}/xdiff.h +0 -0
- data/vendor/libgit2/src/{xdiff → libgit2/xdiff}/xdiffi.c +0 -0
- data/vendor/libgit2/src/{xdiff → libgit2/xdiff}/xdiffi.h +0 -0
- data/vendor/libgit2/src/{xdiff → libgit2/xdiff}/xemit.c +0 -0
- data/vendor/libgit2/src/{xdiff → libgit2/xdiff}/xemit.h +0 -0
- data/vendor/libgit2/src/{xdiff → libgit2/xdiff}/xhistogram.c +0 -0
- data/vendor/libgit2/src/{xdiff → libgit2/xdiff}/xinclude.h +0 -0
- data/vendor/libgit2/src/{xdiff → libgit2/xdiff}/xmacros.h +0 -0
- data/vendor/libgit2/src/{xdiff → libgit2/xdiff}/xmerge.c +0 -0
- data/vendor/libgit2/src/{xdiff → libgit2/xdiff}/xpatience.c +0 -0
- data/vendor/libgit2/src/{xdiff → libgit2/xdiff}/xprepare.c +0 -0
- data/vendor/libgit2/src/{xdiff → libgit2/xdiff}/xprepare.h +0 -0
- data/vendor/libgit2/src/{xdiff → libgit2/xdiff}/xtypes.h +0 -0
- data/vendor/libgit2/src/{xdiff → libgit2/xdiff}/xutils.c +0 -0
- data/vendor/libgit2/src/{xdiff → libgit2/xdiff}/xutils.h +0 -0
- data/vendor/libgit2/src/util/CMakeLists.txt +74 -0
- data/vendor/libgit2/src/{alloc.c → util/alloc.c} +0 -0
- data/vendor/libgit2/src/{alloc.h → util/alloc.h} +0 -0
- data/vendor/libgit2/src/{allocators → util/allocators}/failalloc.c +0 -0
- data/vendor/libgit2/src/{allocators → util/allocators}/failalloc.h +1 -1
- data/vendor/libgit2/src/{allocators → util/allocators}/stdalloc.c +0 -0
- data/vendor/libgit2/src/{allocators → util/allocators}/stdalloc.h +1 -1
- data/vendor/libgit2/src/{allocators → util/allocators}/win32_leakcheck.c +0 -0
- data/vendor/libgit2/src/{allocators → util/allocators}/win32_leakcheck.h +1 -1
- data/vendor/libgit2/src/{array.h → util/array.h} +1 -1
- data/vendor/libgit2/src/{assert_safe.h → util/assert_safe.h} +16 -0
- data/vendor/libgit2/src/{bitvec.h → util/bitvec.h} +0 -0
- data/vendor/libgit2/src/{cc-compat.h → util/cc-compat.h} +0 -0
- data/vendor/libgit2/src/{date.c → util/date.c} +4 -3
- data/vendor/libgit2/src/{date.h → util/date.h} +0 -0
- data/vendor/libgit2/src/{filebuf.c → util/filebuf.c} +1 -1
- data/vendor/libgit2/src/{filebuf.h → util/filebuf.h} +1 -1
- data/vendor/libgit2/src/{fs_path.c → util/fs_path.c} +96 -101
- data/vendor/libgit2/src/{fs_path.h → util/fs_path.h} +33 -15
- data/vendor/libgit2/src/{futils.c → util/futils.c} +44 -2
- data/vendor/libgit2/src/{futils.h → util/futils.h} +2 -1
- data/vendor/libgit2/src/{common.h → util/git2_util.h} +13 -59
- data/vendor/libgit2/src/util/hash/builtin.c +53 -0
- data/vendor/libgit2/src/{hash/sha1/openssl.h → util/hash/builtin.h} +6 -6
- data/vendor/libgit2/src/{hash/sha1 → util/hash}/collisiondetect.c +1 -1
- data/vendor/libgit2/src/{hash/sha1 → util/hash}/collisiondetect.h +3 -3
- data/vendor/libgit2/src/{hash/sha1 → util/hash}/common_crypto.c +55 -0
- data/vendor/libgit2/src/{hash/sha1 → util/hash}/common_crypto.h +11 -3
- data/vendor/libgit2/src/{hash/sha1 → util/hash}/mbedtls.c +46 -0
- data/vendor/libgit2/src/{hash/sha1 → util/hash}/mbedtls.h +14 -4
- data/vendor/libgit2/src/util/hash/openssl.c +194 -0
- data/vendor/libgit2/src/util/hash/openssl.h +45 -0
- data/vendor/libgit2/src/util/hash/rfc6234/sha.h +355 -0
- data/vendor/libgit2/src/util/hash/rfc6234/sha224-256.c +601 -0
- data/vendor/libgit2/src/util/hash/sha.h +70 -0
- data/vendor/libgit2/src/{hash/sha1 → util/hash}/sha1dc/sha1.c +0 -0
- data/vendor/libgit2/src/{hash/sha1 → util/hash}/sha1dc/sha1.h +0 -0
- data/vendor/libgit2/src/{hash/sha1 → util/hash}/sha1dc/ubc_check.c +0 -0
- data/vendor/libgit2/src/{hash/sha1 → util/hash}/sha1dc/ubc_check.h +0 -0
- data/vendor/libgit2/src/util/hash/win32.c +549 -0
- data/vendor/libgit2/src/util/hash/win32.h +60 -0
- data/vendor/libgit2/src/{hash.c → util/hash.c} +17 -1
- data/vendor/libgit2/src/{hash.h → util/hash.h} +5 -3
- data/vendor/libgit2/src/{integer.h → util/integer.h} +0 -0
- data/vendor/libgit2/src/{khash.h → util/khash.h} +0 -0
- data/vendor/libgit2/src/{map.h → util/map.h} +1 -1
- data/vendor/libgit2/src/{net.c → util/net.c} +0 -1
- data/vendor/libgit2/src/{net.h → util/net.h} +1 -1
- data/vendor/libgit2/src/{pool.c → util/pool.c} +0 -0
- data/vendor/libgit2/src/{pool.h → util/pool.h} +1 -1
- data/vendor/libgit2/src/{posix.c → util/posix.c} +0 -0
- data/vendor/libgit2/src/{posix.h → util/posix.h} +1 -1
- data/vendor/libgit2/src/{pqueue.c → util/pqueue.c} +0 -0
- data/vendor/libgit2/src/{pqueue.h → util/pqueue.h} +1 -1
- data/vendor/libgit2/src/{rand.c → util/rand.c} +7 -3
- data/vendor/libgit2/src/{rand.h → util/rand.h} +1 -1
- data/vendor/libgit2/src/{regexp.c → util/regexp.c} +0 -0
- data/vendor/libgit2/src/{regexp.h → util/regexp.h} +1 -1
- data/vendor/libgit2/src/{runtime.c → util/runtime.c} +1 -1
- data/vendor/libgit2/src/{runtime.h → util/runtime.h} +1 -1
- data/vendor/libgit2/src/{sortedcache.c → util/sortedcache.c} +0 -0
- data/vendor/libgit2/src/{sortedcache.h → util/sortedcache.h} +1 -1
- data/vendor/libgit2/src/{str.c → util/str.c} +0 -0
- data/vendor/libgit2/src/{str.h → util/str.h} +1 -1
- data/vendor/libgit2/src/{strmap.c → util/strmap.c} +0 -0
- data/vendor/libgit2/src/{strmap.h → util/strmap.h} +1 -1
- data/vendor/libgit2/src/{strnlen.h → util/strnlen.h} +0 -0
- data/vendor/libgit2/src/{thread.c → util/thread.c} +1 -1
- data/vendor/libgit2/src/{thread.h → util/thread.h} +0 -0
- data/vendor/libgit2/src/{tsort.c → util/tsort.c} +1 -1
- data/vendor/libgit2/src/{unix → util/unix}/map.c +1 -1
- data/vendor/libgit2/src/{unix → util/unix}/posix.h +1 -1
- data/vendor/libgit2/src/{unix → util/unix}/pthread.h +0 -0
- data/vendor/libgit2/src/{unix → util/unix}/realpath.c +1 -1
- data/vendor/libgit2/src/{utf8.c → util/utf8.c} +1 -1
- data/vendor/libgit2/src/{utf8.h → util/utf8.h} +1 -1
- data/vendor/libgit2/src/{util.c → util/util.c} +1 -1
- data/vendor/libgit2/src/{util.h → util/util.h} +1 -1
- data/vendor/libgit2/src/{varint.c → util/varint.c} +0 -0
- data/vendor/libgit2/src/{varint.h → util/varint.h} +1 -1
- data/vendor/libgit2/src/{vector.c → util/vector.c} +0 -0
- data/vendor/libgit2/src/{vector.h → util/vector.h} +1 -1
- data/vendor/libgit2/src/{wildmatch.c → util/wildmatch.c} +0 -0
- data/vendor/libgit2/src/{wildmatch.h → util/wildmatch.h} +1 -1
- data/vendor/libgit2/src/{win32 → util/win32}/dir.c +0 -0
- data/vendor/libgit2/src/{win32 → util/win32}/dir.h +1 -1
- data/vendor/libgit2/src/{win32 → util/win32}/error.c +0 -0
- data/vendor/libgit2/src/{win32 → util/win32}/error.h +1 -1
- data/vendor/libgit2/src/{win32 → util/win32}/findfile.c +0 -0
- data/vendor/libgit2/src/{win32 → util/win32}/findfile.h +1 -1
- data/vendor/libgit2/src/{win32 → util/win32}/map.c +1 -1
- data/vendor/libgit2/src/{win32 → util/win32}/mingw-compat.h +0 -0
- data/vendor/libgit2/src/{win32 → util/win32}/msvc-compat.h +0 -0
- data/vendor/libgit2/src/{win32 → util/win32}/path_w32.c +0 -0
- data/vendor/libgit2/src/{win32 → util/win32}/path_w32.h +1 -1
- data/vendor/libgit2/src/{win32 → util/win32}/posix.h +1 -1
- data/vendor/libgit2/src/{win32 → util/win32}/posix_w32.c +1 -1
- data/vendor/libgit2/src/util/win32/precompiled.c +1 -0
- data/vendor/libgit2/src/{win32 → util/win32}/precompiled.h +1 -1
- data/vendor/libgit2/src/{win32 → util/win32}/reparse.h +0 -0
- data/vendor/libgit2/src/{win32 → util/win32}/thread.c +0 -0
- data/vendor/libgit2/src/{win32 → util/win32}/thread.h +1 -1
- data/vendor/libgit2/src/{win32 → util/win32}/utf-conv.c +0 -0
- data/vendor/libgit2/src/{win32 → util/win32}/utf-conv.h +1 -1
- data/vendor/libgit2/src/{win32 → util/win32}/version.h +0 -0
- data/vendor/libgit2/src/{win32 → util/win32}/w32_buffer.c +0 -0
- data/vendor/libgit2/src/{win32 → util/win32}/w32_buffer.h +1 -1
- data/vendor/libgit2/src/{win32 → util/win32}/w32_common.h +0 -0
- data/vendor/libgit2/src/{win32 → util/win32}/w32_leakcheck.c +0 -0
- data/vendor/libgit2/src/{win32 → util/win32}/w32_leakcheck.h +1 -1
- data/vendor/libgit2/src/{win32 → util/win32}/w32_util.c +0 -0
- data/vendor/libgit2/src/{win32 → util/win32}/w32_util.h +1 -1
- data/vendor/libgit2/src/{win32 → util/win32}/win32-compat.h +0 -0
- data/vendor/libgit2/src/{zstream.c → util/zstream.c} +0 -0
- data/vendor/libgit2/src/{zstream.h → util/zstream.h} +1 -1
- metadata +391 -362
- data/vendor/libgit2/src/hash/sha1/generic.c +0 -300
- data/vendor/libgit2/src/hash/sha1/generic.h +0 -19
- data/vendor/libgit2/src/hash/sha1/openssl.c +0 -59
- data/vendor/libgit2/src/hash/sha1/win32.c +0 -333
- data/vendor/libgit2/src/hash/sha1/win32.h +0 -128
- data/vendor/libgit2/src/hash/sha1.h +0 -40
@@ -0,0 +1,669 @@
|
|
1
|
+
/*
|
2
|
+
* Copyright (c), Edward Thomson <ethomson@edwardthomson.com>
|
3
|
+
* All rights reserved.
|
4
|
+
*
|
5
|
+
* This file is part of adopt, distributed under the MIT license.
|
6
|
+
* For full terms and conditions, see the included LICENSE file.
|
7
|
+
*
|
8
|
+
* THIS FILE IS AUTOMATICALLY GENERATED; DO NOT EDIT.
|
9
|
+
*
|
10
|
+
* This file was produced by using the `rename.pl` script included with
|
11
|
+
* adopt. The command-line specified was:
|
12
|
+
*
|
13
|
+
* ./rename.pl cli_opt --filename=opt --include=cli.h --inline=GIT_INLINE --header-guard=CLI_opt_h__ --lowercase-status --without-usage
|
14
|
+
*/
|
15
|
+
|
16
|
+
#include <stdlib.h>
|
17
|
+
#include <string.h>
|
18
|
+
#include <stdio.h>
|
19
|
+
#include <limits.h>
|
20
|
+
#include <assert.h>
|
21
|
+
|
22
|
+
#include "cli.h"
|
23
|
+
#include "opt.h"
|
24
|
+
|
25
|
+
#ifdef _WIN32
|
26
|
+
# include <Windows.h>
|
27
|
+
#else
|
28
|
+
# include <fcntl.h>
|
29
|
+
# include <sys/ioctl.h>
|
30
|
+
#endif
|
31
|
+
|
32
|
+
#ifdef _MSC_VER
|
33
|
+
# define alloca _alloca
|
34
|
+
#endif
|
35
|
+
|
36
|
+
#define spec_is_option_type(x) \
|
37
|
+
((x)->type == CLI_OPT_TYPE_BOOL || \
|
38
|
+
(x)->type == CLI_OPT_TYPE_SWITCH || \
|
39
|
+
(x)->type == CLI_OPT_TYPE_VALUE)
|
40
|
+
|
41
|
+
GIT_INLINE(const cli_opt_spec *) spec_for_long(
|
42
|
+
int *is_negated,
|
43
|
+
int *has_value,
|
44
|
+
const char **value,
|
45
|
+
const cli_opt_parser *parser,
|
46
|
+
const char *arg)
|
47
|
+
{
|
48
|
+
const cli_opt_spec *spec;
|
49
|
+
char *eql;
|
50
|
+
size_t eql_pos;
|
51
|
+
|
52
|
+
eql = strchr(arg, '=');
|
53
|
+
eql_pos = (eql = strchr(arg, '=')) ? (size_t)(eql - arg) : strlen(arg);
|
54
|
+
|
55
|
+
for (spec = parser->specs; spec->type; ++spec) {
|
56
|
+
/* Handle -- (everything after this is literal) */
|
57
|
+
if (spec->type == CLI_OPT_TYPE_LITERAL && arg[0] == '\0')
|
58
|
+
return spec;
|
59
|
+
|
60
|
+
/* Handle --no-option arguments for bool types */
|
61
|
+
if (spec->type == CLI_OPT_TYPE_BOOL &&
|
62
|
+
strncmp(arg, "no-", 3) == 0 &&
|
63
|
+
strcmp(arg + 3, spec->name) == 0) {
|
64
|
+
*is_negated = 1;
|
65
|
+
return spec;
|
66
|
+
}
|
67
|
+
|
68
|
+
/* Handle the typical --option arguments */
|
69
|
+
if (spec_is_option_type(spec) &&
|
70
|
+
spec->name &&
|
71
|
+
strcmp(arg, spec->name) == 0)
|
72
|
+
return spec;
|
73
|
+
|
74
|
+
/* Handle --option=value arguments */
|
75
|
+
if (spec->type == CLI_OPT_TYPE_VALUE &&
|
76
|
+
eql &&
|
77
|
+
strncmp(arg, spec->name, eql_pos) == 0 &&
|
78
|
+
spec->name[eql_pos] == '\0') {
|
79
|
+
*has_value = 1;
|
80
|
+
*value = arg[eql_pos + 1] ? &arg[eql_pos + 1] : NULL;
|
81
|
+
return spec;
|
82
|
+
}
|
83
|
+
}
|
84
|
+
|
85
|
+
return NULL;
|
86
|
+
}
|
87
|
+
|
88
|
+
GIT_INLINE(const cli_opt_spec *) spec_for_short(
|
89
|
+
const char **value,
|
90
|
+
const cli_opt_parser *parser,
|
91
|
+
const char *arg)
|
92
|
+
{
|
93
|
+
const cli_opt_spec *spec;
|
94
|
+
|
95
|
+
for (spec = parser->specs; spec->type; ++spec) {
|
96
|
+
/* Handle -svalue short options with a value */
|
97
|
+
if (spec->type == CLI_OPT_TYPE_VALUE &&
|
98
|
+
arg[0] == spec->alias &&
|
99
|
+
arg[1] != '\0') {
|
100
|
+
*value = &arg[1];
|
101
|
+
return spec;
|
102
|
+
}
|
103
|
+
|
104
|
+
/* Handle typical -s short options */
|
105
|
+
if (arg[0] == spec->alias) {
|
106
|
+
*value = NULL;
|
107
|
+
return spec;
|
108
|
+
}
|
109
|
+
}
|
110
|
+
|
111
|
+
return NULL;
|
112
|
+
}
|
113
|
+
|
114
|
+
GIT_INLINE(const cli_opt_spec *) spec_for_arg(cli_opt_parser *parser)
|
115
|
+
{
|
116
|
+
const cli_opt_spec *spec;
|
117
|
+
size_t args = 0;
|
118
|
+
|
119
|
+
for (spec = parser->specs; spec->type; ++spec) {
|
120
|
+
if (spec->type == CLI_OPT_TYPE_ARG) {
|
121
|
+
if (args == parser->arg_idx) {
|
122
|
+
parser->arg_idx++;
|
123
|
+
return spec;
|
124
|
+
}
|
125
|
+
|
126
|
+
args++;
|
127
|
+
}
|
128
|
+
|
129
|
+
if (spec->type == CLI_OPT_TYPE_ARGS && args == parser->arg_idx)
|
130
|
+
return spec;
|
131
|
+
}
|
132
|
+
|
133
|
+
return NULL;
|
134
|
+
}
|
135
|
+
|
136
|
+
GIT_INLINE(int) spec_is_choice(const cli_opt_spec *spec)
|
137
|
+
{
|
138
|
+
return ((spec + 1)->type &&
|
139
|
+
((spec + 1)->usage & CLI_OPT_USAGE_CHOICE));
|
140
|
+
}
|
141
|
+
|
142
|
+
/*
|
143
|
+
* If we have a choice with switches and bare arguments, and we see
|
144
|
+
* the switch, then we no longer expect the bare argument.
|
145
|
+
*/
|
146
|
+
GIT_INLINE(void) consume_choices(const cli_opt_spec *spec, cli_opt_parser *parser)
|
147
|
+
{
|
148
|
+
/* back up to the beginning of the choices */
|
149
|
+
while (spec->type && (spec->usage & CLI_OPT_USAGE_CHOICE))
|
150
|
+
--spec;
|
151
|
+
|
152
|
+
if (!spec_is_choice(spec))
|
153
|
+
return;
|
154
|
+
|
155
|
+
do {
|
156
|
+
if (spec->type == CLI_OPT_TYPE_ARG)
|
157
|
+
parser->arg_idx++;
|
158
|
+
++spec;
|
159
|
+
} while(spec->type && (spec->usage & CLI_OPT_USAGE_CHOICE));
|
160
|
+
}
|
161
|
+
|
162
|
+
static cli_opt_status_t parse_long(cli_opt *opt, cli_opt_parser *parser)
|
163
|
+
{
|
164
|
+
const cli_opt_spec *spec;
|
165
|
+
char *arg = parser->args[parser->idx++];
|
166
|
+
const char *value = NULL;
|
167
|
+
int is_negated = 0, has_value = 0;
|
168
|
+
|
169
|
+
opt->arg = arg;
|
170
|
+
|
171
|
+
if ((spec = spec_for_long(&is_negated, &has_value, &value, parser, &arg[2])) == NULL) {
|
172
|
+
opt->spec = NULL;
|
173
|
+
opt->status = CLI_OPT_STATUS_UNKNOWN_OPTION;
|
174
|
+
goto done;
|
175
|
+
}
|
176
|
+
|
177
|
+
opt->spec = spec;
|
178
|
+
|
179
|
+
/* Future options parsed as literal */
|
180
|
+
if (spec->type == CLI_OPT_TYPE_LITERAL)
|
181
|
+
parser->in_literal = 1;
|
182
|
+
|
183
|
+
/* --bool or --no-bool */
|
184
|
+
else if (spec->type == CLI_OPT_TYPE_BOOL && spec->value)
|
185
|
+
*((int *)spec->value) = !is_negated;
|
186
|
+
|
187
|
+
/* --accumulate */
|
188
|
+
else if (spec->type == CLI_OPT_TYPE_ACCUMULATOR && spec->value)
|
189
|
+
*((int *)spec->value) += spec->switch_value ? spec->switch_value : 1;
|
190
|
+
|
191
|
+
/* --switch */
|
192
|
+
else if (spec->type == CLI_OPT_TYPE_SWITCH && spec->value)
|
193
|
+
*((int *)spec->value) = spec->switch_value;
|
194
|
+
|
195
|
+
/* Parse values as "--foo=bar" or "--foo bar" */
|
196
|
+
else if (spec->type == CLI_OPT_TYPE_VALUE) {
|
197
|
+
if (has_value)
|
198
|
+
opt->value = (char *)value;
|
199
|
+
else if ((parser->idx + 1) <= parser->args_len)
|
200
|
+
opt->value = parser->args[parser->idx++];
|
201
|
+
|
202
|
+
if (spec->value)
|
203
|
+
*((char **)spec->value) = opt->value;
|
204
|
+
}
|
205
|
+
|
206
|
+
/* Required argument was not provided */
|
207
|
+
if (spec->type == CLI_OPT_TYPE_VALUE &&
|
208
|
+
!opt->value &&
|
209
|
+
!(spec->usage & CLI_OPT_USAGE_VALUE_OPTIONAL))
|
210
|
+
opt->status = CLI_OPT_STATUS_MISSING_VALUE;
|
211
|
+
else
|
212
|
+
opt->status = CLI_OPT_STATUS_OK;
|
213
|
+
|
214
|
+
consume_choices(opt->spec, parser);
|
215
|
+
|
216
|
+
done:
|
217
|
+
return opt->status;
|
218
|
+
}
|
219
|
+
|
220
|
+
static cli_opt_status_t parse_short(cli_opt *opt, cli_opt_parser *parser)
|
221
|
+
{
|
222
|
+
const cli_opt_spec *spec;
|
223
|
+
char *arg = parser->args[parser->idx++];
|
224
|
+
const char *value;
|
225
|
+
|
226
|
+
opt->arg = arg;
|
227
|
+
|
228
|
+
if ((spec = spec_for_short(&value, parser, &arg[1 + parser->in_short])) == NULL) {
|
229
|
+
opt->spec = NULL;
|
230
|
+
opt->status = CLI_OPT_STATUS_UNKNOWN_OPTION;
|
231
|
+
goto done;
|
232
|
+
}
|
233
|
+
|
234
|
+
opt->spec = spec;
|
235
|
+
|
236
|
+
if (spec->type == CLI_OPT_TYPE_BOOL && spec->value)
|
237
|
+
*((int *)spec->value) = 1;
|
238
|
+
|
239
|
+
else if (spec->type == CLI_OPT_TYPE_ACCUMULATOR && spec->value)
|
240
|
+
*((int *)spec->value) += spec->switch_value ? spec->switch_value : 1;
|
241
|
+
|
242
|
+
else if (spec->type == CLI_OPT_TYPE_SWITCH && spec->value)
|
243
|
+
*((int *)spec->value) = spec->switch_value;
|
244
|
+
|
245
|
+
/* Parse values as "-ifoo" or "-i foo" */
|
246
|
+
else if (spec->type == CLI_OPT_TYPE_VALUE) {
|
247
|
+
if (value)
|
248
|
+
opt->value = (char *)value;
|
249
|
+
else if ((parser->idx + 1) <= parser->args_len)
|
250
|
+
opt->value = parser->args[parser->idx++];
|
251
|
+
|
252
|
+
if (spec->value)
|
253
|
+
*((char **)spec->value) = opt->value;
|
254
|
+
}
|
255
|
+
|
256
|
+
/*
|
257
|
+
* Handle compressed short arguments, like "-fbcd"; see if there's
|
258
|
+
* another character after the one we processed. If not, advance
|
259
|
+
* the parser index.
|
260
|
+
*/
|
261
|
+
if (spec->type != CLI_OPT_TYPE_VALUE && arg[2 + parser->in_short] != '\0') {
|
262
|
+
parser->in_short++;
|
263
|
+
parser->idx--;
|
264
|
+
} else {
|
265
|
+
parser->in_short = 0;
|
266
|
+
}
|
267
|
+
|
268
|
+
/* Required argument was not provided */
|
269
|
+
if (spec->type == CLI_OPT_TYPE_VALUE && !opt->value)
|
270
|
+
opt->status = CLI_OPT_STATUS_MISSING_VALUE;
|
271
|
+
else
|
272
|
+
opt->status = CLI_OPT_STATUS_OK;
|
273
|
+
|
274
|
+
consume_choices(opt->spec, parser);
|
275
|
+
|
276
|
+
done:
|
277
|
+
return opt->status;
|
278
|
+
}
|
279
|
+
|
280
|
+
static cli_opt_status_t parse_arg(cli_opt *opt, cli_opt_parser *parser)
|
281
|
+
{
|
282
|
+
const cli_opt_spec *spec = spec_for_arg(parser);
|
283
|
+
|
284
|
+
opt->spec = spec;
|
285
|
+
opt->arg = parser->args[parser->idx];
|
286
|
+
|
287
|
+
if (!spec) {
|
288
|
+
parser->idx++;
|
289
|
+
opt->status = CLI_OPT_STATUS_UNKNOWN_OPTION;
|
290
|
+
} else if (spec->type == CLI_OPT_TYPE_ARGS) {
|
291
|
+
if (spec->value)
|
292
|
+
*((char ***)spec->value) = &parser->args[parser->idx];
|
293
|
+
|
294
|
+
/*
|
295
|
+
* We have started a list of arguments; the remainder of
|
296
|
+
* given arguments need not be examined.
|
297
|
+
*/
|
298
|
+
parser->in_args = (parser->args_len - parser->idx);
|
299
|
+
parser->idx = parser->args_len;
|
300
|
+
opt->args_len = parser->in_args;
|
301
|
+
opt->status = CLI_OPT_STATUS_OK;
|
302
|
+
} else {
|
303
|
+
if (spec->value)
|
304
|
+
*((char **)spec->value) = parser->args[parser->idx];
|
305
|
+
|
306
|
+
parser->idx++;
|
307
|
+
opt->status = CLI_OPT_STATUS_OK;
|
308
|
+
}
|
309
|
+
|
310
|
+
return opt->status;
|
311
|
+
}
|
312
|
+
|
313
|
+
static int support_gnu_style(unsigned int flags)
|
314
|
+
{
|
315
|
+
if ((flags & CLI_OPT_PARSE_FORCE_GNU) != 0)
|
316
|
+
return 1;
|
317
|
+
|
318
|
+
if ((flags & CLI_OPT_PARSE_GNU) == 0)
|
319
|
+
return 0;
|
320
|
+
|
321
|
+
/* TODO: Windows */
|
322
|
+
#if defined(_WIN32) && defined(UNICODE)
|
323
|
+
if (_wgetenv(L"POSIXLY_CORRECT") != NULL)
|
324
|
+
return 0;
|
325
|
+
#else
|
326
|
+
if (getenv("POSIXLY_CORRECT") != NULL)
|
327
|
+
return 0;
|
328
|
+
#endif
|
329
|
+
|
330
|
+
return 1;
|
331
|
+
}
|
332
|
+
|
333
|
+
void cli_opt_parser_init(
|
334
|
+
cli_opt_parser *parser,
|
335
|
+
const cli_opt_spec specs[],
|
336
|
+
char **args,
|
337
|
+
size_t args_len,
|
338
|
+
unsigned int flags)
|
339
|
+
{
|
340
|
+
assert(parser);
|
341
|
+
|
342
|
+
memset(parser, 0x0, sizeof(cli_opt_parser));
|
343
|
+
|
344
|
+
parser->specs = specs;
|
345
|
+
parser->args = args;
|
346
|
+
parser->args_len = args_len;
|
347
|
+
parser->flags = flags;
|
348
|
+
|
349
|
+
parser->needs_sort = support_gnu_style(flags);
|
350
|
+
}
|
351
|
+
|
352
|
+
GIT_INLINE(const cli_opt_spec *) spec_for_sort(
|
353
|
+
int *needs_value,
|
354
|
+
const cli_opt_parser *parser,
|
355
|
+
const char *arg)
|
356
|
+
{
|
357
|
+
int is_negated, has_value = 0;
|
358
|
+
const char *value;
|
359
|
+
const cli_opt_spec *spec = NULL;
|
360
|
+
size_t idx = 0;
|
361
|
+
|
362
|
+
*needs_value = 0;
|
363
|
+
|
364
|
+
if (strncmp(arg, "--", 2) == 0) {
|
365
|
+
spec = spec_for_long(&is_negated, &has_value, &value, parser, &arg[2]);
|
366
|
+
*needs_value = !has_value;
|
367
|
+
}
|
368
|
+
|
369
|
+
else if (strncmp(arg, "-", 1) == 0) {
|
370
|
+
spec = spec_for_short(&value, parser, &arg[1]);
|
371
|
+
|
372
|
+
/*
|
373
|
+
* Advance through compressed short arguments to see if
|
374
|
+
* the last one has a value, eg "-xvffilename".
|
375
|
+
*/
|
376
|
+
while (spec && !value && arg[1 + ++idx] != '\0')
|
377
|
+
spec = spec_for_short(&value, parser, &arg[1 + idx]);
|
378
|
+
|
379
|
+
*needs_value = (value == NULL);
|
380
|
+
}
|
381
|
+
|
382
|
+
return spec;
|
383
|
+
}
|
384
|
+
|
385
|
+
/*
|
386
|
+
* Some parsers allow for handling arguments like "file1 --help file2";
|
387
|
+
* this is done by re-sorting the arguments in-place; emulate that.
|
388
|
+
*/
|
389
|
+
static int sort_gnu_style(cli_opt_parser *parser)
|
390
|
+
{
|
391
|
+
size_t i, j, insert_idx = parser->idx, offset;
|
392
|
+
const cli_opt_spec *spec;
|
393
|
+
char *option, *value;
|
394
|
+
int needs_value, changed = 0;
|
395
|
+
|
396
|
+
parser->needs_sort = 0;
|
397
|
+
|
398
|
+
for (i = parser->idx; i < parser->args_len; i++) {
|
399
|
+
spec = spec_for_sort(&needs_value, parser, parser->args[i]);
|
400
|
+
|
401
|
+
/* Not a "-" or "--" prefixed option. No change. */
|
402
|
+
if (!spec)
|
403
|
+
continue;
|
404
|
+
|
405
|
+
/* A "--" alone means remaining args are literal. */
|
406
|
+
if (spec->type == CLI_OPT_TYPE_LITERAL)
|
407
|
+
break;
|
408
|
+
|
409
|
+
option = parser->args[i];
|
410
|
+
|
411
|
+
/*
|
412
|
+
* If the argument is a value type and doesn't already
|
413
|
+
* have a value (eg "--foo=bar" or "-fbar") then we need
|
414
|
+
* to copy the next argument as its value.
|
415
|
+
*/
|
416
|
+
if (spec->type == CLI_OPT_TYPE_VALUE && needs_value) {
|
417
|
+
/*
|
418
|
+
* A required value is not provided; set parser
|
419
|
+
* index to this value so that we fail on it.
|
420
|
+
*/
|
421
|
+
if (i + 1 >= parser->args_len) {
|
422
|
+
parser->idx = i;
|
423
|
+
return 1;
|
424
|
+
}
|
425
|
+
|
426
|
+
value = parser->args[i + 1];
|
427
|
+
offset = 1;
|
428
|
+
} else {
|
429
|
+
value = NULL;
|
430
|
+
offset = 0;
|
431
|
+
}
|
432
|
+
|
433
|
+
/* Caller error if args[0] is an option. */
|
434
|
+
if (i == 0)
|
435
|
+
return 0;
|
436
|
+
|
437
|
+
/* Shift args up one (or two) and insert the option */
|
438
|
+
for (j = i; j > insert_idx; j--)
|
439
|
+
parser->args[j + offset] = parser->args[j - 1];
|
440
|
+
|
441
|
+
parser->args[insert_idx] = option;
|
442
|
+
|
443
|
+
if (value)
|
444
|
+
parser->args[insert_idx + 1] = value;
|
445
|
+
|
446
|
+
insert_idx += (1 + offset);
|
447
|
+
i += offset;
|
448
|
+
|
449
|
+
changed = 1;
|
450
|
+
}
|
451
|
+
|
452
|
+
return changed;
|
453
|
+
}
|
454
|
+
|
455
|
+
cli_opt_status_t cli_opt_parser_next(cli_opt *opt, cli_opt_parser *parser)
|
456
|
+
{
|
457
|
+
assert(opt && parser);
|
458
|
+
|
459
|
+
memset(opt, 0x0, sizeof(cli_opt));
|
460
|
+
|
461
|
+
if (parser->idx >= parser->args_len) {
|
462
|
+
opt->args_len = parser->in_args;
|
463
|
+
return CLI_OPT_STATUS_DONE;
|
464
|
+
}
|
465
|
+
|
466
|
+
/* Handle options in long form, those beginning with "--" */
|
467
|
+
if (strncmp(parser->args[parser->idx], "--", 2) == 0 &&
|
468
|
+
!parser->in_short &&
|
469
|
+
!parser->in_literal)
|
470
|
+
return parse_long(opt, parser);
|
471
|
+
|
472
|
+
/* Handle options in short form, those beginning with "-" */
|
473
|
+
else if (parser->in_short ||
|
474
|
+
(strncmp(parser->args[parser->idx], "-", 1) == 0 &&
|
475
|
+
!parser->in_literal))
|
476
|
+
return parse_short(opt, parser);
|
477
|
+
|
478
|
+
/*
|
479
|
+
* We've reached the first "bare" argument. In POSIX mode, all
|
480
|
+
* remaining items on the command line are arguments. In GNU
|
481
|
+
* mode, there may be long or short options after this. Sort any
|
482
|
+
* options up to this position then re-parse the current position.
|
483
|
+
*/
|
484
|
+
if (parser->needs_sort && sort_gnu_style(parser))
|
485
|
+
return cli_opt_parser_next(opt, parser);
|
486
|
+
|
487
|
+
return parse_arg(opt, parser);
|
488
|
+
}
|
489
|
+
|
490
|
+
GIT_INLINE(int) spec_included(const cli_opt_spec **specs, const cli_opt_spec *spec)
|
491
|
+
{
|
492
|
+
const cli_opt_spec **i;
|
493
|
+
|
494
|
+
for (i = specs; *i; ++i) {
|
495
|
+
if (spec == *i)
|
496
|
+
return 1;
|
497
|
+
}
|
498
|
+
|
499
|
+
return 0;
|
500
|
+
}
|
501
|
+
|
502
|
+
static cli_opt_status_t validate_required(
|
503
|
+
cli_opt *opt,
|
504
|
+
const cli_opt_spec specs[],
|
505
|
+
const cli_opt_spec **given_specs)
|
506
|
+
{
|
507
|
+
const cli_opt_spec *spec, *required;
|
508
|
+
int given;
|
509
|
+
|
510
|
+
/*
|
511
|
+
* Iterate over the possible specs to identify requirements and
|
512
|
+
* ensure that those have been given on the command-line.
|
513
|
+
* Note that we can have required *choices*, where one in a
|
514
|
+
* list of choices must be specified.
|
515
|
+
*/
|
516
|
+
for (spec = specs, required = NULL, given = 0; spec->type; ++spec) {
|
517
|
+
if (!required && (spec->usage & CLI_OPT_USAGE_REQUIRED)) {
|
518
|
+
required = spec;
|
519
|
+
given = 0;
|
520
|
+
} else if (!required) {
|
521
|
+
continue;
|
522
|
+
}
|
523
|
+
|
524
|
+
if (!given)
|
525
|
+
given = spec_included(given_specs, spec);
|
526
|
+
|
527
|
+
/*
|
528
|
+
* Validate the requirement unless we're in a required
|
529
|
+
* choice. In that case, keep the required state and
|
530
|
+
* validate at the end of the choice list.
|
531
|
+
*/
|
532
|
+
if (!spec_is_choice(spec)) {
|
533
|
+
if (!given) {
|
534
|
+
opt->spec = required;
|
535
|
+
opt->status = CLI_OPT_STATUS_MISSING_ARGUMENT;
|
536
|
+
break;
|
537
|
+
}
|
538
|
+
|
539
|
+
required = NULL;
|
540
|
+
given = 0;
|
541
|
+
}
|
542
|
+
}
|
543
|
+
|
544
|
+
return opt->status;
|
545
|
+
}
|
546
|
+
|
547
|
+
cli_opt_status_t cli_opt_parse(
|
548
|
+
cli_opt *opt,
|
549
|
+
const cli_opt_spec specs[],
|
550
|
+
char **args,
|
551
|
+
size_t args_len,
|
552
|
+
unsigned int flags)
|
553
|
+
{
|
554
|
+
cli_opt_parser parser;
|
555
|
+
const cli_opt_spec **given_specs;
|
556
|
+
size_t given_idx = 0;
|
557
|
+
|
558
|
+
cli_opt_parser_init(&parser, specs, args, args_len, flags);
|
559
|
+
|
560
|
+
given_specs = alloca(sizeof(const cli_opt_spec *) * (args_len + 1));
|
561
|
+
|
562
|
+
while (cli_opt_parser_next(opt, &parser)) {
|
563
|
+
if (opt->status != CLI_OPT_STATUS_OK &&
|
564
|
+
opt->status != CLI_OPT_STATUS_DONE)
|
565
|
+
return opt->status;
|
566
|
+
|
567
|
+
if ((opt->spec->usage & CLI_OPT_USAGE_STOP_PARSING))
|
568
|
+
return (opt->status = CLI_OPT_STATUS_DONE);
|
569
|
+
|
570
|
+
given_specs[given_idx++] = opt->spec;
|
571
|
+
}
|
572
|
+
|
573
|
+
given_specs[given_idx] = NULL;
|
574
|
+
|
575
|
+
return validate_required(opt, specs, given_specs);
|
576
|
+
}
|
577
|
+
|
578
|
+
static int spec_name_fprint(FILE *file, const cli_opt_spec *spec)
|
579
|
+
{
|
580
|
+
int error;
|
581
|
+
|
582
|
+
if (spec->type == CLI_OPT_TYPE_ARG)
|
583
|
+
error = fprintf(file, "%s", spec->value_name);
|
584
|
+
else if (spec->type == CLI_OPT_TYPE_ARGS)
|
585
|
+
error = fprintf(file, "%s", spec->value_name);
|
586
|
+
else if (spec->alias && !(spec->usage & CLI_OPT_USAGE_SHOW_LONG))
|
587
|
+
error = fprintf(file, "-%c", spec->alias);
|
588
|
+
else
|
589
|
+
error = fprintf(file, "--%s", spec->name);
|
590
|
+
|
591
|
+
return error;
|
592
|
+
}
|
593
|
+
|
594
|
+
int cli_opt_status_fprint(
|
595
|
+
FILE *file,
|
596
|
+
const char *command,
|
597
|
+
const cli_opt *opt)
|
598
|
+
{
|
599
|
+
const cli_opt_spec *choice;
|
600
|
+
int error;
|
601
|
+
|
602
|
+
if (command && (error = fprintf(file, "%s: ", command)) < 0)
|
603
|
+
return error;
|
604
|
+
|
605
|
+
switch (opt->status) {
|
606
|
+
case CLI_OPT_STATUS_DONE:
|
607
|
+
error = fprintf(file, "finished processing arguments (no error)\n");
|
608
|
+
break;
|
609
|
+
case CLI_OPT_STATUS_OK:
|
610
|
+
error = fprintf(file, "no error\n");
|
611
|
+
break;
|
612
|
+
case CLI_OPT_STATUS_UNKNOWN_OPTION:
|
613
|
+
error = fprintf(file, "unknown option: %s\n", opt->arg);
|
614
|
+
break;
|
615
|
+
case CLI_OPT_STATUS_MISSING_VALUE:
|
616
|
+
if ((error = fprintf(file, "argument '")) < 0 ||
|
617
|
+
(error = spec_name_fprint(file, opt->spec)) < 0 ||
|
618
|
+
(error = fprintf(file, "' requires a value.\n")) < 0)
|
619
|
+
break;
|
620
|
+
break;
|
621
|
+
case CLI_OPT_STATUS_MISSING_ARGUMENT:
|
622
|
+
if (spec_is_choice(opt->spec)) {
|
623
|
+
int is_choice = 1;
|
624
|
+
|
625
|
+
if (spec_is_choice((opt->spec)+1))
|
626
|
+
error = fprintf(file, "one of");
|
627
|
+
else
|
628
|
+
error = fprintf(file, "either");
|
629
|
+
|
630
|
+
if (error < 0)
|
631
|
+
break;
|
632
|
+
|
633
|
+
for (choice = opt->spec; is_choice; ++choice) {
|
634
|
+
is_choice = spec_is_choice(choice);
|
635
|
+
|
636
|
+
if (!is_choice)
|
637
|
+
error = fprintf(file, " or");
|
638
|
+
else if (choice != opt->spec)
|
639
|
+
error = fprintf(file, ",");
|
640
|
+
|
641
|
+
if ((error < 0) ||
|
642
|
+
(error = fprintf(file, " '")) < 0 ||
|
643
|
+
(error = spec_name_fprint(file, choice)) < 0 ||
|
644
|
+
(error = fprintf(file, "'")) < 0)
|
645
|
+
break;
|
646
|
+
|
647
|
+
if (!spec_is_choice(choice))
|
648
|
+
break;
|
649
|
+
}
|
650
|
+
|
651
|
+
if ((error < 0) ||
|
652
|
+
(error = fprintf(file, " is required.\n")) < 0)
|
653
|
+
break;
|
654
|
+
} else {
|
655
|
+
if ((error = fprintf(file, "argument '")) < 0 ||
|
656
|
+
(error = spec_name_fprint(file, opt->spec)) < 0 ||
|
657
|
+
(error = fprintf(file, "' is required.\n")) < 0)
|
658
|
+
break;
|
659
|
+
}
|
660
|
+
|
661
|
+
break;
|
662
|
+
default:
|
663
|
+
error = fprintf(file, "unknown status: %d\n", opt->status);
|
664
|
+
break;
|
665
|
+
}
|
666
|
+
|
667
|
+
return error;
|
668
|
+
}
|
669
|
+
|