CONTRIBUTE 11 KB

123456789101112131415161718192021222324252627282930313233343536373839404142434445464748495051525354555657585960616263646566676869707172737475767778798081828384858687888990919293949596979899100101102103104105106107108109110111112113114115116117118119120121122123124125126127128129130131132133134135136137138139140141142143144145146147148149150151152153154155156157158159160161162163164165166167168169170171172173174175176177178179180181182183184185186187188189190191192193194195196197198199200201202203204205206207208209210211212213214215216217218219220221222223224225226227228229230231232233234235236237238239240241242243244245246247248249250251252253254255256257258259260261262263264265266267268269270271272273274275276277278
  1. _ _ ____ _
  2. ___| | | | _ \| |
  3. / __| | | | |_) | |
  4. | (__| |_| | _ <| |___
  5. \___|\___/|_| \_\_____|
  6. When Contributing Source Code
  7. This document is intended to offer guidelines that can be useful to keep in
  8. mind when you decide to contribute to the project. This concerns new features
  9. as well as corrections to existing flaws or bugs.
  10. 1. Learning cURL
  11. 1.1 Join the Community
  12. 1.2 License
  13. 1.3 What To Read
  14. 2. cURL Coding Standards
  15. 2.1 Naming
  16. 2.2 Indenting
  17. 2.3 Commenting
  18. 2.4 Line Lengths
  19. 2.5 General Style
  20. 2.6 Non-clobbering All Over
  21. 2.7 Platform Dependent Code
  22. 2.8 Write Separate Patches
  23. 2.9 Patch Against Recent Sources
  24. 2.10 Document
  25. 2.11 Test Cases
  26. 3. Pushing Out Your Changes
  27. 3.1 Write Access to git Repository
  28. 3.2 How To Make a Patch with git
  29. 3.3 How To Make a Patch without git
  30. 3.4 How to get your changes into the main sources
  31. 3.5 Write good commit messages
  32. ==============================================================================
  33. 1. Learning cURL
  34. 1.1 Join the Community
  35. Skip over to http://curl.haxx.se/mail/ and join the appropriate mailing
  36. list(s). Read up on details before you post questions. Read this file before
  37. you start sending patches! We prefer patches and discussions being held on
  38. the mailing list(s), not sent to individuals.
  39. Before posting to one of the curl mailing lists, please read up on the mailing
  40. list etiquette: http://curl.haxx.se/mail/etiquette.html
  41. We also hang out on IRC in #curl on irc.freenode.net
  42. 1.2. License
  43. When contributing with code, you agree to put your changes and new code under
  44. the same license curl and libcurl is already using unless stated and agreed
  45. otherwise.
  46. If you add a larger piece of code, you can opt to make that file or set of
  47. files to use a different license as long as they don't enforce any changes to
  48. the rest of the package and they make sense. Such "separate parts" can not be
  49. GPL licensed (as we don't want copyleft to affect users of libcurl) but they
  50. must use "GPL compatible" licenses (as we want to allow users to use libcurl
  51. properly in GPL licensed environments).
  52. When changing existing source code, you do not alter the copyright of the
  53. original file(s). The copyright will still be owned by the original
  54. creator(s) or those who have been assigned copyright by the original
  55. author(s).
  56. By submitting a patch to the curl project, you are assumed to have the right
  57. to the code and to be allowed by your employer or whatever to hand over that
  58. patch/code to us. We will credit you for your changes as far as possible, to
  59. give credit but also to keep a trace back to who made what changes. Please
  60. always provide us with your full real name when contributing!
  61. 1.3 What To Read
  62. Source code, the man pages, the INTERNALS document, TODO, KNOWN_BUGS, the
  63. most recent CHANGES. Just lurking on the libcurl mailing list is gonna give
  64. you a lot of insights on what's going on right now. Asking there is a good
  65. idea too.
  66. 2. cURL Coding Standards
  67. 2.1 Naming
  68. Try using a non-confusing naming scheme for your new functions and variable
  69. names. It doesn't necessarily have to mean that you should use the same as in
  70. other places of the code, just that the names should be logical,
  71. understandable and be named according to what they're used for. File-local
  72. functions should be made static. We like lower case names.
  73. See the INTERNALS document on how we name non-exported library-global
  74. symbols.
  75. 2.2 Indenting
  76. Please try using the same indenting levels and bracing method as all the
  77. other code already does. It makes the source code a lot easier to follow if
  78. all of it is written using the same style. We don't ask you to like it, we
  79. just ask you to follow the tradition! ;-) This mainly means: 2-level indents,
  80. using spaces only (no tabs) and having the opening brace ({) on the same line
  81. as the if() or while().
  82. Also note that we use if() and while() with no space before the parenthesis.
  83. 2.3 Commenting
  84. Comment your source code extensively using C comments (/* comment */), DO NOT
  85. use C++ comments (// this style). Commented code is quality code and enables
  86. future modifications much more. Uncommented code risk having to be completely
  87. replaced when someone wants to extend things, since other persons' source
  88. code can get quite hard to read.
  89. 2.4 Line Lengths
  90. We write source lines shorter than 80 columns.
  91. 2.5 General Style
  92. Keep your functions small. If they're small you avoid a lot of mistakes and
  93. you don't accidentally mix up variables etc.
  94. 2.6 Non-clobbering All Over
  95. When you write new functionality or fix bugs, it is important that you don't
  96. fiddle all over the source files and functions. Remember that it is likely
  97. that other people have done changes in the same source files as you have and
  98. possibly even in the same functions. If you bring completely new
  99. functionality, try writing it in a new source file. If you fix bugs, try to
  100. fix one bug at a time and send them as separate patches.
  101. 2.7 Platform Dependent Code
  102. Use #ifdef HAVE_FEATURE to do conditional code. We avoid checking for
  103. particular operating systems or hardware in the #ifdef lines. The
  104. HAVE_FEATURE shall be generated by the configure script for unix-like systems
  105. and they are hard-coded in the config-[system].h files for the others.
  106. 2.8 Write Separate Patches
  107. It is annoying when you get a huge patch from someone that is said to fix 511
  108. odd problems, but discussions and opinions don't agree with 510 of them - or
  109. 509 of them were already fixed in a different way. Then the patcher needs to
  110. extract the single interesting patch from somewhere within the huge pile of
  111. source, and that gives a lot of extra work. Preferably, all fixes that
  112. correct different problems should be in their own patch with an attached
  113. description exactly what they correct so that all patches can be selectively
  114. applied by the maintainer or other interested parties.
  115. 2.9 Patch Against Recent Sources
  116. Please try to get the latest available sources to make your patches
  117. against. It makes the life of the developers so much easier. The very best is
  118. if you get the most up-to-date sources from the git repository, but the
  119. latest release archive is quite OK as well!
  120. 2.10 Document
  121. Writing docs is dead boring and one of the big problems with many open source
  122. projects. Someone's gotta do it. It makes it a lot easier if you submit a
  123. small description of your fix or your new features with every contribution so
  124. that it can be swiftly added to the package documentation.
  125. The documentation is always made in man pages (nroff formatted) or plain
  126. ASCII files. All HTML files on the web site and in the release archives are
  127. generated from the nroff/ASCII versions.
  128. 2.11 Test Cases
  129. Since the introduction of the test suite, we can quickly verify that the main
  130. features are working as they're supposed to. To maintain this situation and
  131. improve it, all new features and functions that are added need to be tested
  132. in the test suite. Every feature that is added should get at least one valid
  133. test case that verifies that it works as documented. If every submitter also
  134. posts a few test cases, it won't end up as a heavy burden on a single person!
  135. 3. Pushing Out Your Changes
  136. 3.1 Write Access to git Repository
  137. If you are a frequent contributor, or have another good reason, you can of
  138. course get write access to the git repository and then you'll be able to push
  139. your changes straight into the git repo instead of sending changes by mail as
  140. patches. Just ask if this is what you'd want. You will be required to have
  141. posted a few quality patches first, before you can be granted push access.
  142. 3.2 How To Make a Patch with git
  143. You need to first checkout the repository:
  144. git clone git://github.com/bagder/curl.git
  145. You then proceed and edit all the files you like and you commit them to your
  146. local repository:
  147. git commit [file]
  148. As usual, group your commits so that you commit all changes that at once that
  149. constitutes a logical change. See also section "3.5 Write good commit
  150. messages".
  151. Once you have done all your commits and you're happy with what you see, you
  152. can make patches out of your changes that are suitable for mailing:
  153. git format-patch remotes/origin/master
  154. This creates files in your local directory named NNNN-[name].patch for each
  155. commit.
  156. Now send those patches off to the curl-library list. You can of course opt to
  157. do that with the 'get send-email' command.
  158. 3.3 How To Make a Patch without git
  159. Keep a copy of the unmodified curl sources. Make your changes in a separate
  160. source tree. When you think you have something that you want to offer the
  161. curl community, use GNU diff to generate patches.
  162. If you have modified a single file, try something like:
  163. diff -u unmodified-file.c my-changed-one.c > my-fixes.diff
  164. If you have modified several files, possibly in different directories, you
  165. can use diff recursively:
  166. diff -ur curl-original-dir curl-modified-sources-dir > my-fixes.diff
  167. The GNU diff and GNU patch tools exist for virtually all platforms, including
  168. all kinds of Unixes and Windows:
  169. For unix-like operating systems:
  170. http://www.gnu.org/software/patch/patch.html
  171. http://www.gnu.org/directory/diffutils.html
  172. For Windows:
  173. http://gnuwin32.sourceforge.net/packages/patch.htm
  174. http://gnuwin32.sourceforge.net/packages/diffutils.htm
  175. 3.4 How to get your changes into the main sources
  176. Submit your patch to the curl-library mailing list.
  177. Make the patch against as recent sources as possible.
  178. Make sure your patch adheres to the source indent and coding style of already
  179. existing source code. Failing to do so just adds more work for me.
  180. Respond to replies on the list about the patch and answer questions and/or
  181. fix nits/flaws. This is very important. I will take lack of replies as a sign
  182. that you're not very anxious to get your patch accepted and I tend to simply
  183. drop such patches from my TODO list.
  184. If you've followed the above paragraphs and your patch still hasn't been
  185. incorporated after some weeks, consider resubmitting it to the list.
  186. 3.5 Write good commit messages
  187. A short guide to how to do fine commit messages in the curl project.
  188. ---- start ----
  189. [area]: [short line describing the main effect]
  190. [separate the above single line from the rest with an empty line]
  191. [full description, no wider than 72 columns that describe as much as
  192. possible as to why this change is made, and possibly what things
  193. it fixes and everything else that is related]
  194. ---- stop ----
  195. Don't forget to use commit --author="" if you commit someone else's work,
  196. and make sure that you have your own user and email setup correctly in git
  197. before you commit