rugged 1.3.2.3 → 1.4.2

Sign up to get free protection for your applications and to get access to all the features.
Files changed (329) hide show
  1. checksums.yaml +4 -4
  2. data/ext/rugged/extconf.rb +1 -1
  3. data/ext/rugged/rugged_config.c +7 -2
  4. data/ext/rugged/rugged_remote.c +17 -0
  5. data/lib/rugged/version.rb +1 -1
  6. data/vendor/libgit2/CMakeLists.txt +103 -276
  7. data/vendor/libgit2/COPYING +36 -19
  8. data/vendor/libgit2/cmake/AddCFlagIfSupported.cmake +21 -21
  9. data/vendor/libgit2/cmake/DefaultCFlags.cmake +154 -0
  10. data/vendor/libgit2/cmake/EnableWarnings.cmake +13 -13
  11. data/vendor/libgit2/cmake/FindCoreFoundation.cmake +13 -13
  12. data/vendor/libgit2/cmake/FindGSSAPI.cmake +171 -287
  13. data/vendor/libgit2/cmake/FindGSSFramework.cmake +13 -13
  14. data/vendor/libgit2/cmake/{FindHTTP_Parser.cmake → FindHTTPParser.cmake} +17 -17
  15. data/vendor/libgit2/cmake/FindIconv.cmake +27 -27
  16. data/vendor/libgit2/cmake/FindLibSSH2.cmake +5 -5
  17. data/vendor/libgit2/cmake/FindPCRE.cmake +13 -13
  18. data/vendor/libgit2/cmake/FindPCRE2.cmake +12 -12
  19. data/vendor/libgit2/cmake/FindPkgLibraries.cmake +19 -19
  20. data/vendor/libgit2/cmake/FindSecurity.cmake +14 -14
  21. data/vendor/libgit2/cmake/FindStatNsec.cmake +12 -18
  22. data/vendor/libgit2/cmake/Findfutimens.cmake +8 -8
  23. data/vendor/libgit2/cmake/FindmbedTLS.cmake +63 -70
  24. data/vendor/libgit2/cmake/IdeSplitSources.cmake +18 -18
  25. data/vendor/libgit2/cmake/PkgBuildConfig.cmake +60 -60
  26. data/vendor/libgit2/cmake/SanitizeBool.cmake +20 -20
  27. data/vendor/libgit2/cmake/SelectGSSAPI.cmake +37 -37
  28. data/vendor/libgit2/cmake/SelectHTTPParser.cmake +19 -0
  29. data/vendor/libgit2/cmake/SelectHTTPSBackend.cmake +100 -100
  30. data/vendor/libgit2/cmake/SelectHashes.cmake +39 -49
  31. data/vendor/libgit2/cmake/SelectRegex.cmake +51 -0
  32. data/vendor/libgit2/cmake/SelectSSH.cmake +41 -0
  33. data/vendor/libgit2/cmake/SelectWinHTTP.cmake +17 -0
  34. data/vendor/libgit2/cmake/SelectZlib.cmake +34 -0
  35. data/vendor/libgit2/deps/chromium-zlib/CMakeLists.txt +6 -6
  36. data/vendor/libgit2/deps/ntlmclient/CMakeLists.txt +31 -31
  37. data/vendor/libgit2/deps/ntlmclient/crypt_openssl.c +1 -1
  38. data/vendor/libgit2/deps/ntlmclient/ntlm.c +4 -4
  39. data/vendor/libgit2/deps/ntlmclient/ntlm.h +4 -4
  40. data/vendor/libgit2/deps/ntlmclient/ntlmclient.h +2 -2
  41. data/vendor/libgit2/deps/pcre/CMakeLists.txt +88 -88
  42. data/vendor/libgit2/deps/winhttp/CMakeLists.txt +14 -16
  43. data/vendor/libgit2/deps/zlib/adler32.c +0 -7
  44. data/vendor/libgit2/deps/zlib/crc32.c +288 -975
  45. data/vendor/libgit2/deps/zlib/crc32.h +436 -9441
  46. data/vendor/libgit2/deps/zlib/deflate.c +31 -83
  47. data/vendor/libgit2/deps/zlib/deflate.h +15 -12
  48. data/vendor/libgit2/deps/zlib/gzguts.h +2 -3
  49. data/vendor/libgit2/deps/zlib/infback.c +1 -2
  50. data/vendor/libgit2/deps/zlib/inffast.c +14 -14
  51. data/vendor/libgit2/deps/zlib/inflate.c +8 -39
  52. data/vendor/libgit2/deps/zlib/inflate.h +2 -3
  53. data/vendor/libgit2/deps/zlib/inftrees.c +3 -3
  54. data/vendor/libgit2/deps/zlib/trees.c +48 -27
  55. data/vendor/libgit2/deps/zlib/zlib.h +100 -126
  56. data/vendor/libgit2/deps/zlib/zutil.c +2 -2
  57. data/vendor/libgit2/deps/zlib/zutil.h +9 -12
  58. data/vendor/libgit2/include/git2/apply.h +16 -2
  59. data/vendor/libgit2/include/git2/attr.h +11 -2
  60. data/vendor/libgit2/include/git2/blame.h +4 -1
  61. data/vendor/libgit2/include/git2/blob.h +14 -1
  62. data/vendor/libgit2/include/git2/branch.h +2 -0
  63. data/vendor/libgit2/include/git2/buffer.h +18 -78
  64. data/vendor/libgit2/include/git2/cert.h +2 -2
  65. data/vendor/libgit2/include/git2/checkout.h +5 -2
  66. data/vendor/libgit2/include/git2/clone.h +3 -3
  67. data/vendor/libgit2/include/git2/commit.h +2 -0
  68. data/vendor/libgit2/include/git2/common.h +5 -12
  69. data/vendor/libgit2/include/git2/config.h +19 -3
  70. data/vendor/libgit2/include/git2/credential.h +2 -1
  71. data/vendor/libgit2/include/git2/credential_helpers.h +1 -0
  72. data/vendor/libgit2/include/git2/deprecated.h +1 -1
  73. data/vendor/libgit2/include/git2/describe.h +7 -2
  74. data/vendor/libgit2/include/git2/diff.h +17 -9
  75. data/vendor/libgit2/include/git2/email.h +1 -1
  76. data/vendor/libgit2/include/git2/errors.h +1 -2
  77. data/vendor/libgit2/include/git2/filter.h +7 -2
  78. data/vendor/libgit2/include/git2/graph.h +1 -0
  79. data/vendor/libgit2/include/git2/ignore.h +1 -1
  80. data/vendor/libgit2/include/git2/index.h +11 -5
  81. data/vendor/libgit2/include/git2/indexer.h +19 -0
  82. data/vendor/libgit2/include/git2/merge.h +23 -3
  83. data/vendor/libgit2/include/git2/message.h +2 -0
  84. data/vendor/libgit2/include/git2/object.h +23 -0
  85. data/vendor/libgit2/include/git2/odb.h +37 -7
  86. data/vendor/libgit2/include/git2/odb_backend.h +1 -1
  87. data/vendor/libgit2/include/git2/pack.h +24 -8
  88. data/vendor/libgit2/include/git2/patch.h +8 -0
  89. data/vendor/libgit2/include/git2/pathspec.h +1 -1
  90. data/vendor/libgit2/include/git2/proxy.h +1 -1
  91. data/vendor/libgit2/include/git2/rebase.h +9 -1
  92. data/vendor/libgit2/include/git2/refdb.h +3 -0
  93. data/vendor/libgit2/include/git2/reflog.h +1 -1
  94. data/vendor/libgit2/include/git2/refs.h +2 -2
  95. data/vendor/libgit2/include/git2/remote.h +184 -37
  96. data/vendor/libgit2/include/git2/repository.h +14 -9
  97. data/vendor/libgit2/include/git2/reset.h +2 -2
  98. data/vendor/libgit2/include/git2/revparse.h +1 -1
  99. data/vendor/libgit2/include/git2/revwalk.h +4 -1
  100. data/vendor/libgit2/include/git2/signature.h +1 -1
  101. data/vendor/libgit2/include/git2/stash.h +3 -3
  102. data/vendor/libgit2/include/git2/status.h +9 -3
  103. data/vendor/libgit2/include/git2/submodule.h +7 -2
  104. data/vendor/libgit2/include/git2/sys/commit_graph.h +1 -1
  105. data/vendor/libgit2/include/git2/sys/odb_backend.h +2 -5
  106. data/vendor/libgit2/include/git2/sys/remote.h +31 -0
  107. data/vendor/libgit2/include/git2/sys/stream.h +1 -1
  108. data/vendor/libgit2/include/git2/sys/transport.h +25 -34
  109. data/vendor/libgit2/include/git2/tag.h +1 -0
  110. data/vendor/libgit2/include/git2/tree.h +4 -3
  111. data/vendor/libgit2/include/git2/types.h +7 -7
  112. data/vendor/libgit2/include/git2/version.h +3 -3
  113. data/vendor/libgit2/include/git2/worktree.h +12 -2
  114. data/vendor/libgit2/src/CMakeLists.txt +189 -315
  115. data/vendor/libgit2/src/annotated_commit.h +1 -1
  116. data/vendor/libgit2/src/apply.c +18 -18
  117. data/vendor/libgit2/src/apply.h +2 -2
  118. data/vendor/libgit2/src/attr.c +18 -18
  119. data/vendor/libgit2/src/attr_file.c +17 -17
  120. data/vendor/libgit2/src/attr_file.h +4 -4
  121. data/vendor/libgit2/src/attrcache.c +17 -12
  122. data/vendor/libgit2/src/blame_git.c +1 -1
  123. data/vendor/libgit2/src/blob.c +33 -26
  124. data/vendor/libgit2/src/blob.h +1 -1
  125. data/vendor/libgit2/src/branch.c +150 -109
  126. data/vendor/libgit2/src/branch.h +15 -3
  127. data/vendor/libgit2/src/buf.c +126 -0
  128. data/vendor/libgit2/src/buf.h +50 -0
  129. data/vendor/libgit2/src/cc-compat.h +1 -1
  130. data/vendor/libgit2/src/checkout.c +74 -68
  131. data/vendor/libgit2/src/cherrypick.c +10 -10
  132. data/vendor/libgit2/src/clone.c +66 -66
  133. data/vendor/libgit2/src/commit.c +128 -58
  134. data/vendor/libgit2/src/commit.h +24 -1
  135. data/vendor/libgit2/src/commit_graph.c +68 -53
  136. data/vendor/libgit2/src/commit_graph.h +10 -3
  137. data/vendor/libgit2/src/commit_list.c +2 -3
  138. data/vendor/libgit2/src/common.h +10 -3
  139. data/vendor/libgit2/src/config.c +99 -77
  140. data/vendor/libgit2/src/config.h +15 -2
  141. data/vendor/libgit2/src/config_file.c +103 -91
  142. data/vendor/libgit2/src/config_mem.c +9 -9
  143. data/vendor/libgit2/src/config_parse.c +27 -23
  144. data/vendor/libgit2/src/crlf.c +24 -21
  145. data/vendor/libgit2/src/date.c +10 -17
  146. data/vendor/libgit2/src/date.h +33 -0
  147. data/vendor/libgit2/src/describe.c +27 -19
  148. data/vendor/libgit2/src/diff.c +25 -8
  149. data/vendor/libgit2/src/diff.h +2 -4
  150. data/vendor/libgit2/src/diff_driver.c +34 -36
  151. data/vendor/libgit2/src/diff_driver.h +3 -3
  152. data/vendor/libgit2/src/diff_file.c +29 -20
  153. data/vendor/libgit2/src/diff_generate.c +30 -6
  154. data/vendor/libgit2/src/diff_generate.h +5 -3
  155. data/vendor/libgit2/src/diff_print.c +102 -95
  156. data/vendor/libgit2/src/diff_stats.c +40 -29
  157. data/vendor/libgit2/src/{message.h → diff_stats.h} +7 -6
  158. data/vendor/libgit2/src/diff_tform.c +9 -8
  159. data/vendor/libgit2/src/diff_xdiff.c +3 -8
  160. data/vendor/libgit2/src/email.c +54 -38
  161. data/vendor/libgit2/src/email.h +1 -1
  162. data/vendor/libgit2/src/errors.c +18 -18
  163. data/vendor/libgit2/src/features.h.in +6 -1
  164. data/vendor/libgit2/src/fetch.c +69 -24
  165. data/vendor/libgit2/src/fetch.h +1 -1
  166. data/vendor/libgit2/src/fetchhead.c +19 -19
  167. data/vendor/libgit2/src/filebuf.c +28 -28
  168. data/vendor/libgit2/src/filebuf.h +1 -1
  169. data/vendor/libgit2/src/filter.c +96 -52
  170. data/vendor/libgit2/src/filter.h +26 -5
  171. data/vendor/libgit2/src/fs_path.c +1912 -0
  172. data/vendor/libgit2/src/fs_path.h +752 -0
  173. data/vendor/libgit2/src/futils.c +91 -85
  174. data/vendor/libgit2/src/futils.h +26 -14
  175. data/vendor/libgit2/src/hash/sha1/collisiondetect.c +2 -2
  176. data/vendor/libgit2/src/hash/sha1/common_crypto.c +2 -2
  177. data/vendor/libgit2/src/hash/sha1/generic.c +2 -2
  178. data/vendor/libgit2/src/hash/sha1/mbedtls.c +2 -2
  179. data/vendor/libgit2/src/hash/sha1/openssl.c +2 -2
  180. data/vendor/libgit2/src/hash/sha1/sha1dc/sha1.c +1 -1
  181. data/vendor/libgit2/src/hash/sha1/win32.c +6 -6
  182. data/vendor/libgit2/src/hash/sha1.h +3 -1
  183. data/vendor/libgit2/src/hash.c +67 -35
  184. data/vendor/libgit2/src/hash.h +12 -12
  185. data/vendor/libgit2/src/ident.c +18 -18
  186. data/vendor/libgit2/src/ignore.c +35 -34
  187. data/vendor/libgit2/src/ignore.h +2 -2
  188. data/vendor/libgit2/src/index.c +79 -80
  189. data/vendor/libgit2/src/index.h +6 -3
  190. data/vendor/libgit2/src/indexer.c +75 -57
  191. data/vendor/libgit2/src/iterator.c +64 -56
  192. data/vendor/libgit2/src/iterator.h +5 -5
  193. data/vendor/libgit2/src/khash.h +1 -1
  194. data/vendor/libgit2/src/libgit2.c +22 -19
  195. data/vendor/libgit2/src/mailmap.c +38 -36
  196. data/vendor/libgit2/src/merge.c +27 -27
  197. data/vendor/libgit2/src/merge.h +1 -14
  198. data/vendor/libgit2/src/merge_driver.c +2 -2
  199. data/vendor/libgit2/src/merge_file.c +13 -3
  200. data/vendor/libgit2/src/message.c +21 -10
  201. data/vendor/libgit2/src/midx.c +83 -66
  202. data/vendor/libgit2/src/midx.h +3 -3
  203. data/vendor/libgit2/src/mwindow.c +1 -1
  204. data/vendor/libgit2/src/net.c +278 -68
  205. data/vendor/libgit2/src/net.h +10 -3
  206. data/vendor/libgit2/src/netops.c +1 -1
  207. data/vendor/libgit2/src/netops.h +1 -1
  208. data/vendor/libgit2/src/notes.c +20 -29
  209. data/vendor/libgit2/src/object.c +49 -9
  210. data/vendor/libgit2/src/object.h +1 -1
  211. data/vendor/libgit2/src/odb.c +35 -32
  212. data/vendor/libgit2/src/odb.h +1 -1
  213. data/vendor/libgit2/src/odb_loose.c +68 -68
  214. data/vendor/libgit2/src/odb_mempack.c +18 -5
  215. data/vendor/libgit2/src/odb_pack.c +43 -43
  216. data/vendor/libgit2/src/oid.c +11 -4
  217. data/vendor/libgit2/src/oid.h +15 -0
  218. data/vendor/libgit2/src/pack-objects.c +41 -26
  219. data/vendor/libgit2/src/pack-objects.h +11 -6
  220. data/vendor/libgit2/src/pack.c +10 -10
  221. data/vendor/libgit2/src/patch.c +3 -3
  222. data/vendor/libgit2/src/patch.h +1 -0
  223. data/vendor/libgit2/src/patch_generate.c +27 -11
  224. data/vendor/libgit2/src/patch_generate.h +5 -5
  225. data/vendor/libgit2/src/patch_parse.c +24 -24
  226. data/vendor/libgit2/src/path.c +76 -1951
  227. data/vendor/libgit2/src/path.h +34 -741
  228. data/vendor/libgit2/src/pathspec.c +6 -6
  229. data/vendor/libgit2/src/pathspec.h +2 -2
  230. data/vendor/libgit2/src/posix.c +3 -3
  231. data/vendor/libgit2/src/posix.h +1 -0
  232. data/vendor/libgit2/src/pqueue.h +1 -1
  233. data/vendor/libgit2/src/proxy.c +4 -1
  234. data/vendor/libgit2/src/proxy.h +1 -1
  235. data/vendor/libgit2/src/push.c +30 -35
  236. data/vendor/libgit2/src/push.h +4 -16
  237. data/vendor/libgit2/src/rand.c +226 -0
  238. data/vendor/libgit2/src/rand.h +37 -0
  239. data/vendor/libgit2/src/reader.c +8 -8
  240. data/vendor/libgit2/src/reader.h +2 -2
  241. data/vendor/libgit2/src/rebase.c +89 -88
  242. data/vendor/libgit2/src/refdb_fs.c +447 -173
  243. data/vendor/libgit2/src/refs.c +32 -32
  244. data/vendor/libgit2/src/refs.h +2 -2
  245. data/vendor/libgit2/src/refspec.c +32 -37
  246. data/vendor/libgit2/src/refspec.h +5 -2
  247. data/vendor/libgit2/src/regexp.c +1 -1
  248. data/vendor/libgit2/src/remote.c +713 -419
  249. data/vendor/libgit2/src/remote.h +15 -10
  250. data/vendor/libgit2/src/repository.c +350 -467
  251. data/vendor/libgit2/src/repository.h +11 -10
  252. data/vendor/libgit2/src/reset.c +8 -5
  253. data/vendor/libgit2/src/revert.c +10 -10
  254. data/vendor/libgit2/src/revparse.c +48 -35
  255. data/vendor/libgit2/src/revwalk.c +7 -7
  256. data/vendor/libgit2/src/signature.c +12 -6
  257. data/vendor/libgit2/src/signature.h +1 -1
  258. data/vendor/libgit2/src/sortedcache.c +1 -1
  259. data/vendor/libgit2/src/sortedcache.h +1 -1
  260. data/vendor/libgit2/src/stash.c +36 -37
  261. data/vendor/libgit2/src/status.c +4 -1
  262. data/vendor/libgit2/src/{buffer.c → str.c} +157 -151
  263. data/vendor/libgit2/src/str.h +357 -0
  264. data/vendor/libgit2/src/streams/mbedtls.c +8 -6
  265. data/vendor/libgit2/src/streams/openssl_dynamic.h +3 -3
  266. data/vendor/libgit2/src/submodule.c +171 -159
  267. data/vendor/libgit2/src/submodule.h +1 -1
  268. data/vendor/libgit2/src/sysdir.c +68 -52
  269. data/vendor/libgit2/src/sysdir.h +15 -10
  270. data/vendor/libgit2/src/tag.c +29 -27
  271. data/vendor/libgit2/src/thread.h +3 -3
  272. data/vendor/libgit2/src/threadstate.c +3 -3
  273. data/vendor/libgit2/src/threadstate.h +1 -1
  274. data/vendor/libgit2/src/trace.c +1 -14
  275. data/vendor/libgit2/src/trace.h +5 -22
  276. data/vendor/libgit2/src/trailer.c +1 -1
  277. data/vendor/libgit2/src/transaction.c +1 -1
  278. data/vendor/libgit2/src/transport.c +10 -10
  279. data/vendor/libgit2/src/transports/auth.c +7 -9
  280. data/vendor/libgit2/src/transports/auth.h +2 -3
  281. data/vendor/libgit2/src/transports/auth_negotiate.c +12 -13
  282. data/vendor/libgit2/src/transports/auth_ntlm.c +10 -10
  283. data/vendor/libgit2/src/transports/auth_ntlm.h +0 -1
  284. data/vendor/libgit2/src/transports/git.c +9 -11
  285. data/vendor/libgit2/src/transports/http.c +37 -17
  286. data/vendor/libgit2/src/transports/http.h +2 -3
  287. data/vendor/libgit2/src/transports/httpclient.c +65 -65
  288. data/vendor/libgit2/src/transports/local.c +124 -116
  289. data/vendor/libgit2/src/transports/smart.c +51 -139
  290. data/vendor/libgit2/src/transports/smart.h +25 -31
  291. data/vendor/libgit2/src/transports/smart_pkt.c +33 -33
  292. data/vendor/libgit2/src/transports/smart_protocol.c +57 -39
  293. data/vendor/libgit2/src/transports/ssh.c +47 -112
  294. data/vendor/libgit2/src/transports/winhttp.c +50 -56
  295. data/vendor/libgit2/src/tree-cache.c +5 -5
  296. data/vendor/libgit2/src/tree-cache.h +2 -2
  297. data/vendor/libgit2/src/tree.c +59 -48
  298. data/vendor/libgit2/src/tree.h +1 -1
  299. data/vendor/libgit2/src/unix/map.c +0 -2
  300. data/vendor/libgit2/src/unix/posix.h +1 -4
  301. data/vendor/libgit2/src/unix/realpath.c +0 -2
  302. data/vendor/libgit2/src/util.c +14 -14
  303. data/vendor/libgit2/src/util.h +2 -28
  304. data/vendor/libgit2/src/vector.h +1 -1
  305. data/vendor/libgit2/src/win32/findfile.c +172 -116
  306. data/vendor/libgit2/src/win32/findfile.h +7 -4
  307. data/vendor/libgit2/src/win32/path_w32.c +140 -9
  308. data/vendor/libgit2/src/win32/path_w32.h +2 -0
  309. data/vendor/libgit2/src/win32/posix.h +0 -1
  310. data/vendor/libgit2/src/win32/posix_w32.c +11 -27
  311. data/vendor/libgit2/src/win32/w32_buffer.c +2 -3
  312. data/vendor/libgit2/src/win32/w32_buffer.h +2 -3
  313. data/vendor/libgit2/src/win32/w32_leakcheck.c +1 -1
  314. data/vendor/libgit2/src/worktree.c +116 -94
  315. data/vendor/libgit2/src/worktree.h +1 -1
  316. data/vendor/libgit2/src/xdiff/git-xdiff.h +53 -0
  317. data/vendor/libgit2/src/xdiff/xdiff.h +15 -15
  318. data/vendor/libgit2/src/xdiff/xdiffi.c +134 -108
  319. data/vendor/libgit2/src/xdiff/xemit.c +23 -7
  320. data/vendor/libgit2/src/xdiff/xhistogram.c +87 -78
  321. data/vendor/libgit2/src/xdiff/xinclude.h +1 -12
  322. data/vendor/libgit2/src/xdiff/xmerge.c +104 -117
  323. data/vendor/libgit2/src/xdiff/xpatience.c +6 -17
  324. data/vendor/libgit2/src/xdiff/xprepare.c +15 -20
  325. data/vendor/libgit2/src/xdiff/xutils.c +18 -7
  326. data/vendor/libgit2/src/zstream.c +5 -5
  327. data/vendor/libgit2/src/zstream.h +4 -4
  328. metadata +25 -10
  329. data/vendor/libgit2/src/buffer.h +0 -374
@@ -0,0 +1,357 @@
1
+ /*
2
+ * Copyright (C) the libgit2 contributors. All rights reserved.
3
+ *
4
+ * This file is part of libgit2, distributed under the GNU GPL v2 with
5
+ * a Linking Exception. For full terms see the included COPYING file.
6
+ */
7
+ #ifndef INCLUDE_str_h__
8
+ #define INCLUDE_str_h__
9
+
10
+ #include "common.h"
11
+
12
+ struct git_str {
13
+ char *ptr;
14
+ size_t asize;
15
+ size_t size;
16
+ };
17
+
18
+ typedef enum {
19
+ GIT_STR_BOM_NONE = 0,
20
+ GIT_STR_BOM_UTF8 = 1,
21
+ GIT_STR_BOM_UTF16_LE = 2,
22
+ GIT_STR_BOM_UTF16_BE = 3,
23
+ GIT_STR_BOM_UTF32_LE = 4,
24
+ GIT_STR_BOM_UTF32_BE = 5
25
+ } git_str_bom_t;
26
+
27
+ typedef struct {
28
+ git_str_bom_t bom; /* BOM found at head of text */
29
+ unsigned int nul, cr, lf, crlf; /* NUL, CR, LF and CRLF counts */
30
+ unsigned int printable, nonprintable; /* These are just approximations! */
31
+ } git_str_text_stats;
32
+
33
+ extern char git_str__initstr[];
34
+ extern char git_str__oom[];
35
+
36
+ /* Use to initialize string buffer structure when git_str is on stack */
37
+ #define GIT_STR_INIT { git_str__initstr, 0, 0 }
38
+
39
+ /**
40
+ * Static initializer for git_str from static string buffer
41
+ */
42
+ #define GIT_STR_INIT_CONST(str, len) { (char *)(str), 0, (size_t)(len) }
43
+
44
+ GIT_INLINE(bool) git_str_is_allocated(const git_str *str)
45
+ {
46
+ return (str->ptr != NULL && str->asize > 0);
47
+ }
48
+
49
+ /**
50
+ * Initialize a git_str structure.
51
+ *
52
+ * For the cases where GIT_STR_INIT cannot be used to do static
53
+ * initialization.
54
+ */
55
+ extern int git_str_init(git_str *str, size_t initial_size);
56
+
57
+ extern void git_str_dispose(git_str *str);
58
+
59
+ /**
60
+ * Resize the string buffer allocation to make more space.
61
+ *
62
+ * This will attempt to grow the string buffer to accommodate the target
63
+ * size. The bstring buffer's `ptr` will be replaced with a newly
64
+ * allocated block of data. Be careful so that memory allocated by the
65
+ * caller is not lost. As a special variant, if you pass `target_size` as
66
+ * 0 and the memory is not allocated by libgit2, this will allocate a new
67
+ * buffer of size `size` and copy the external data into it.
68
+ *
69
+ * Currently, this will never shrink a buffer, only expand it.
70
+ *
71
+ * If the allocation fails, this will return an error and the buffer will be
72
+ * marked as invalid for future operations, invaliding the contents.
73
+ *
74
+ * @param str The buffer to be resized; may or may not be allocated yet
75
+ * @param target_size The desired available size
76
+ * @return 0 on success, -1 on allocation failure
77
+ */
78
+ int git_str_grow(git_str *str, size_t target_size);
79
+
80
+ /**
81
+ * Resize the buffer allocation to make more space.
82
+ *
83
+ * This will attempt to grow the string buffer to accommodate the
84
+ * additional size. It is similar to `git_str_grow`, but performs the
85
+ * new size calculation, checking for overflow.
86
+ *
87
+ * Like `git_str_grow`, if this is a user-supplied string buffer,
88
+ * this will allocate a new string uffer.
89
+ */
90
+ extern int git_str_grow_by(git_str *str, size_t additional_size);
91
+
92
+ /**
93
+ * Attempt to grow the buffer to hold at least `target_size` bytes.
94
+ *
95
+ * If the allocation fails, this will return an error. If `mark_oom` is
96
+ * true, this will mark the string buffer as invalid for future
97
+ * operations; if false, existing string buffer content will be preserved,
98
+ * but calling code must handle that string buffer was not expanded. If
99
+ * `preserve_external` is true, then any existing data pointed to be
100
+ * `ptr` even if `asize` is zero will be copied into the newly allocated
101
+ * string buffer.
102
+ */
103
+ extern int git_str_try_grow(
104
+ git_str *str, size_t target_size, bool mark_oom);
105
+
106
+ extern void git_str_swap(git_str *str_a, git_str *str_b);
107
+ extern char *git_str_detach(git_str *str);
108
+ extern int git_str_attach(git_str *str, char *ptr, size_t asize);
109
+
110
+ /* Populates a `git_str` where the contents are not "owned" by the string
111
+ * buffer, and calls to `git_str_dispose` will not free the given str.
112
+ */
113
+ extern void git_str_attach_notowned(
114
+ git_str *str, const char *ptr, size_t size);
115
+
116
+ /**
117
+ * Test if there have been any reallocation failures with this git_str.
118
+ *
119
+ * Any function that writes to a git_str can fail due to memory allocation
120
+ * issues. If one fails, the git_str will be marked with an OOM error and
121
+ * further calls to modify the string buffer will fail. Check
122
+ * git_str_oom() at the end of your sequence and it will be true if you
123
+ * ran out of memory at any point with that string buffer.
124
+ *
125
+ * @return false if no error, true if allocation error
126
+ */
127
+ GIT_INLINE(bool) git_str_oom(const git_str *str)
128
+ {
129
+ return (str->ptr == git_str__oom);
130
+ }
131
+
132
+ /*
133
+ * Functions below that return int value error codes will return 0 on
134
+ * success or -1 on failure (which generally means an allocation failed).
135
+ * Using a git_str where the allocation has failed with result in -1 from
136
+ * all further calls using that string buffer. As a result, you can
137
+ * ignore the return code of these functions and call them in a series
138
+ * then just call git_str_oom at the end.
139
+ */
140
+
141
+ int git_str_set(git_str *str, const void *data, size_t datalen);
142
+
143
+ int git_str_sets(git_str *str, const char *string);
144
+ int git_str_putc(git_str *str, char c);
145
+ int git_str_putcn(git_str *str, char c, size_t len);
146
+ int git_str_put(git_str *str, const char *data, size_t len);
147
+ int git_str_puts(git_str *str, const char *string);
148
+ int git_str_printf(git_str *str, const char *format, ...) GIT_FORMAT_PRINTF(2, 3);
149
+ int git_str_vprintf(git_str *str, const char *format, va_list ap);
150
+ void git_str_clear(git_str *str);
151
+ void git_str_consume_bytes(git_str *str, size_t len);
152
+ void git_str_consume(git_str *str, const char *end);
153
+ void git_str_truncate(git_str *str, size_t len);
154
+ void git_str_shorten(git_str *str, size_t amount);
155
+ void git_str_truncate_at_char(git_str *path, char separator);
156
+ void git_str_rtruncate_at_char(git_str *path, char separator);
157
+
158
+ /** General join with separator */
159
+ int git_str_join_n(git_str *str, char separator, int len, ...);
160
+ /** Fast join of two strings - first may legally point into `str` data */
161
+ int git_str_join(git_str *str, char separator, const char *str_a, const char *str_b);
162
+ /** Fast join of three strings - cannot reference `str` data */
163
+ int git_str_join3(git_str *str, char separator, const char *str_a, const char *str_b, const char *str_c);
164
+
165
+ /**
166
+ * Join two strings as paths, inserting a slash between as needed.
167
+ * @return 0 on success, -1 on failure
168
+ */
169
+ GIT_INLINE(int) git_str_joinpath(git_str *str, const char *a, const char *b)
170
+ {
171
+ return git_str_join(str, '/', a, b);
172
+ }
173
+
174
+ GIT_INLINE(const char *) git_str_cstr(const git_str *str)
175
+ {
176
+ return str->ptr;
177
+ }
178
+
179
+ GIT_INLINE(size_t) git_str_len(const git_str *str)
180
+ {
181
+ return str->size;
182
+ }
183
+
184
+ int git_str_copy_cstr(char *data, size_t datasize, const git_str *str);
185
+
186
+ #define git_str_PUTS(str, cstr) git_str_put(str, cstr, sizeof(cstr) - 1)
187
+
188
+ GIT_INLINE(ssize_t) git_str_rfind_next(const git_str *str, char ch)
189
+ {
190
+ ssize_t idx = (ssize_t)str->size - 1;
191
+ while (idx >= 0 && str->ptr[idx] == ch) idx--;
192
+ while (idx >= 0 && str->ptr[idx] != ch) idx--;
193
+ return idx;
194
+ }
195
+
196
+ GIT_INLINE(ssize_t) git_str_rfind(const git_str *str, char ch)
197
+ {
198
+ ssize_t idx = (ssize_t)str->size - 1;
199
+ while (idx >= 0 && str->ptr[idx] != ch) idx--;
200
+ return idx;
201
+ }
202
+
203
+ GIT_INLINE(ssize_t) git_str_find(const git_str *str, char ch)
204
+ {
205
+ void *found = memchr(str->ptr, ch, str->size);
206
+ return found ? (ssize_t)((const char *)found - str->ptr) : -1;
207
+ }
208
+
209
+ /* Remove whitespace from the end of the string buffer */
210
+ void git_str_rtrim(git_str *str);
211
+
212
+ int git_str_cmp(const git_str *a, const git_str *b);
213
+
214
+ /* Quote and unquote a string buffer as specified in
215
+ * http://marc.info/?l=git&m=112927316408690&w=2
216
+ */
217
+ int git_str_quote(git_str *str);
218
+ int git_str_unquote(git_str *str);
219
+
220
+ /* Write data as a hex string */
221
+ int git_str_encode_hexstr(git_str *str, const char *data, size_t len);
222
+
223
+ /* Write data as base64 encoded in string buffer */
224
+ int git_str_encode_base64(git_str *str, const char *data, size_t len);
225
+ /* Decode the given bas64 and write the result to the string buffer */
226
+ int git_str_decode_base64(git_str *str, const char *base64, size_t len);
227
+
228
+ /* Write data as "base85" encoded in string buffer */
229
+ int git_str_encode_base85(git_str *str, const char *data, size_t len);
230
+ /* Decode the given "base85" and write the result to the string buffer */
231
+ int git_str_decode_base85(git_str *str, const char *base64, size_t len, size_t output_len);
232
+
233
+ /*
234
+ * Decode the given percent-encoded string and write the result to the
235
+ * string buffer.
236
+ */
237
+ int git_str_decode_percent(git_str *str, const char *encoded, size_t len);
238
+
239
+ /*
240
+ * Insert, remove or replace a portion of the string buffer.
241
+ *
242
+ * @param str The string buffer to work with
243
+ *
244
+ * @param where The location in the string buffer where the transformation
245
+ * should be applied.
246
+ *
247
+ * @param nb_to_remove The number of chars to be removed. 0 to not
248
+ * remove any character in the string buffer.
249
+ *
250
+ * @param data A pointer to the data which should be inserted.
251
+ *
252
+ * @param nb_to_insert The number of chars to be inserted. 0 to not
253
+ * insert any character from the string buffer.
254
+ *
255
+ * @return 0 or an error code.
256
+ */
257
+ int git_str_splice(
258
+ git_str *str,
259
+ size_t where,
260
+ size_t nb_to_remove,
261
+ const char *data,
262
+ size_t nb_to_insert);
263
+
264
+ /**
265
+ * Append string to string buffer, prefixing each character from
266
+ * `esc_chars` with `esc_with` string.
267
+ *
268
+ * @param str String buffer to append data to
269
+ * @param string String to escape and append
270
+ * @param esc_chars Characters to be escaped
271
+ * @param esc_with String to insert in from of each found character
272
+ * @return 0 on success, <0 on failure (probably allocation problem)
273
+ */
274
+ extern int git_str_puts_escaped(
275
+ git_str *str,
276
+ const char *string,
277
+ const char *esc_chars,
278
+ const char *esc_with);
279
+
280
+ /**
281
+ * Append string escaping characters that are regex special
282
+ */
283
+ GIT_INLINE(int) git_str_puts_escape_regex(git_str *str, const char *string)
284
+ {
285
+ return git_str_puts_escaped(str, string, "^.[]$()|*+?{}\\", "\\");
286
+ }
287
+
288
+ /**
289
+ * Unescape all characters in a string buffer in place
290
+ *
291
+ * I.e. remove backslashes
292
+ */
293
+ extern void git_str_unescape(git_str *str);
294
+
295
+ /**
296
+ * Replace all \r\n with \n.
297
+ *
298
+ * @return 0 on success, -1 on memory error
299
+ */
300
+ extern int git_str_crlf_to_lf(git_str *tgt, const git_str *src);
301
+
302
+ /**
303
+ * Replace all \n with \r\n. Does not modify existing \r\n.
304
+ *
305
+ * @return 0 on success, -1 on memory error
306
+ */
307
+ extern int git_str_lf_to_crlf(git_str *tgt, const git_str *src);
308
+
309
+ /**
310
+ * Fill string buffer with the common prefix of a array of strings
311
+ *
312
+ * String buffer will be set to empty if there is no common prefix
313
+ */
314
+ extern int git_str_common_prefix(git_str *buf, char *const *const strings, size_t count);
315
+
316
+ /**
317
+ * Check if a string buffer begins with a UTF BOM
318
+ *
319
+ * @param bom Set to the type of BOM detected or GIT_BOM_NONE
320
+ * @param str String buffer in which to check the first bytes for a BOM
321
+ * @return Number of bytes of BOM data (or 0 if no BOM found)
322
+ */
323
+ extern int git_str_detect_bom(git_str_bom_t *bom, const git_str *str);
324
+
325
+ /**
326
+ * Gather stats for a piece of text
327
+ *
328
+ * Fill the `stats` structure with counts of unreadable characters, carriage
329
+ * returns, etc, so it can be used in heuristics. This automatically skips
330
+ * a trailing EOF (\032 character). Also it will look for a BOM at the
331
+ * start of the text and can be told to skip that as well.
332
+ *
333
+ * @param stats Structure to be filled in
334
+ * @param str Text to process
335
+ * @param skip_bom Exclude leading BOM from stats if true
336
+ * @return Does the string buffer heuristically look like binary data
337
+ */
338
+ extern bool git_str_gather_text_stats(
339
+ git_str_text_stats *stats, const git_str *str, bool skip_bom);
340
+
341
+ /**
342
+ * Check quickly if string buffer looks like it contains binary data
343
+ *
344
+ * @param str string buffer to check
345
+ * @return 1 if string buffer looks like non-text data
346
+ */
347
+ int git_str_is_binary(const git_str *str);
348
+
349
+ /**
350
+ * Check quickly if buffer contains a NUL byte
351
+ *
352
+ * @param str string buffer to check
353
+ * @return 1 if string buffer contains a NUL byte
354
+ */
355
+ int git_str_contains_nul(const git_str *str);
356
+
357
+ #endif
@@ -23,12 +23,14 @@
23
23
  #endif
24
24
 
25
25
  /* Work around C90-conformance issues */
26
- #if defined(_MSC_VER)
27
- # define inline __inline
28
- #elif defined(__GNUC__)
29
- # define inline __inline__
30
- #else
31
- # define inline
26
+ #if !defined(__STDC_VERSION__) || (__STDC_VERSION__ < 199901L)
27
+ # if defined(_MSC_VER)
28
+ # define inline __inline
29
+ # elif defined(__GNUC__)
30
+ # define inline __inline__
31
+ # else
32
+ # define inline
33
+ # endif
32
34
  #endif
33
35
 
34
36
  #include <mbedtls/config.h>
@@ -13,7 +13,7 @@
13
13
  * The implementation was written so as to conform with Netscapes SSL.
14
14
  *
15
15
  * This library is free for commercial and non-commercial use as long as
16
- * the following conditions are aheared to. The following conditions
16
+ * the following conditions are adhered to. The following conditions
17
17
  * apply to all code found in this distribution, be it the RC4, RSA,
18
18
  * lhash, DES, etc., code; not just the SSL code. The SSL documentation
19
19
  * included with this distribution is covered by the same copyright terms
@@ -38,7 +38,7 @@
38
38
  * must display the following acknowledgement:
39
39
  * "This product includes cryptographic software written by
40
40
  * Eric Young (eay@cryptsoft.com)"
41
- * The word 'cryptographic' can be left out if the rouines from the library
41
+ * The word 'cryptographic' can be left out if the routines from the library
42
42
  * being used are not cryptographic related :-).
43
43
  * 4. If you include any Windows specific code (or a derivative thereof) from
44
44
  * the apps directory (application code) you must include an acknowledgement:
@@ -56,7 +56,7 @@
56
56
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
57
57
  * SUCH DAMAGE.
58
58
  *
59
- * The licence and distribution terms for any publically available version or
59
+ * The licence and distribution terms for any publicly available version or
60
60
  * derivative of this code cannot be changed. i.e. this code cannot simply be
61
61
  * copied and put under another distribution licence
62
62
  * [including the GNU Public Licence.]