Many hyperlinks are disabled.
Use anonymous login
to enable hyperlinks.
Changes In Branch clear-title Excluding Merge-Ins
This is equivalent to a diff from 4c931047ef to c06edd231f
|
2010-05-16
| ||
| 19:16 | Rename the "clear-title" branch as the new trunk. The trunk is now relicensed using the Simplified BSD License. check-in: bf1c21ba16 user: drh tags: trunk | |
| 19:14 | Move what used to be the called the trunk into a separate branch named "gpl". The trunk will be modified to contain only code to which we hold clear title and which is licensed using the 2-clause BSD License. Closed-Leaf check-in: ccc7701cc6 user: drh tags: gpl | |
| 19:08 | Change from GPL to the Simplified BSD License. Closed-Leaf check-in: c06edd231f user: drh tags: clear-title | |
| 11:18 | Pull the latest trunk changes into clear-title. check-in: 96722b6d01 user: drh tags: clear-title | |
|
2010-05-14
| ||
| 17:02 | On the timeline graph, strive to put the "trunk" to the far left. Closed-Leaf check-in: 4c931047ef user: drh tags: trunk | |
|
2010-05-12
| ||
| 14:08 | fix ticket [fc428d2107d6b810fff67892896137c66abd3484] check-in: b24b2e1bba user: rwilson tags: trunk | |
Added COPYRIGHT-BSD2.txt.
1 +Copyright 2007 D. Richard Hipp. All rights reserved. 2 + 3 +Redistribution and use in source and binary forms, with or 4 +without modification, are permitted provided that the 5 +following conditions are met: 6 + 7 + 1. Redistributions of source code must retain the above 8 + copyright notice, this list of conditions and the 9 + following disclaimer. 10 + 11 + 2. Redistributions in binary form must reproduce the above 12 + copyright notice, this list of conditions and the 13 + following disclaimer in the documentation and/or other 14 + materials provided with the distribution. 15 + 16 +THIS SOFTWARE IS PROVIDED BY THE AUTHORS ``AS IS'' AND ANY EXPRESS 17 +OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED 18 +WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE 19 +ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHORS OR CONTRIBUTORS BE 20 +LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR 21 +CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF 22 +SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR 23 +BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, 24 +WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE 25 +OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, 26 +EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. 27 + 28 +The views and conclusions contained in the software and documentation 29 +are those of the authors and contributors and should not be interpreted 30 +as representing official policies, either expressed or implied, of anybody 31 +else.
Deleted COPYRIGHT-GPL2.txt.
1 -Fossil is licensed under the terms of the GPLv2 shown below. In 2 -addition, permission is granted to link Fossil against the OpenSSL 3 -project's "OpenSSL" library (or with modified versions of that 4 -library that use the same license), and distribute the linked 5 -executables. If you modify Fossil, you may extend the exception 6 -described in this paragraph to your modifications, or not, at your 7 -discretion. 8 - 9 -The "clear-title" branch of Fossil is available for more liberal 10 -licenses such as Berkeley-style licenses or the Apache license. 11 - 12 -The original text of GPLv2 follows. 13 --------------------------------------------------------------------------- 14 - 15 - GNU GENERAL PUBLIC LICENSE 16 - Version 2, June 1991 17 - 18 - Copyright (C) 1989, 1991 Free Software Foundation, Inc., 19 - 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA 20 - Everyone is permitted to copy and distribute verbatim copies 21 - of this license document, but changing it is not allowed. 22 - 23 - Preamble 24 - 25 - The licenses for most software are designed to take away your 26 -freedom to share and change it. By contrast, the GNU General Public 27 -License is intended to guarantee your freedom to share and change free 28 -software--to make sure the software is free for all its users. This 29 -General Public License applies to most of the Free Software 30 -Foundation's software and to any other program whose authors commit to 31 -using it. (Some other Free Software Foundation software is covered by 32 -the GNU Lesser General Public License instead.) You can apply it to 33 -your programs, too. 34 - 35 - When we speak of free software, we are referring to freedom, not 36 -price. Our General Public Licenses are designed to make sure that you 37 -have the freedom to distribute copies of free software (and charge for 38 -this service if you wish), that you receive source code or can get it 39 -if you want it, that you can change the software or use pieces of it 40 -in new free programs; and that you know you can do these things. 41 - 42 - To protect your rights, we need to make restrictions that forbid 43 -anyone to deny you these rights or to ask you to surrender the rights. 44 -These restrictions translate to certain responsibilities for you if you 45 -distribute copies of the software, or if you modify it. 46 - 47 - For example, if you distribute copies of such a program, whether 48 -gratis or for a fee, you must give the recipients all the rights that 49 -you have. You must make sure that they, too, receive or can get the 50 -source code. And you must show them these terms so they know their 51 -rights. 52 - 53 - We protect your rights with two steps: (1) copyright the software, and 54 -(2) offer you this license which gives you legal permission to copy, 55 -distribute and/or modify the software. 56 - 57 - Also, for each author's protection and ours, we want to make certain 58 -that everyone understands that there is no warranty for this free 59 -software. If the software is modified by someone else and passed on, we 60 -want its recipients to know that what they have is not the original, so 61 -that any problems introduced by others will not reflect on the original 62 -authors' reputations. 63 - 64 - Finally, any free program is threatened constantly by software 65 -patents. We wish to avoid the danger that redistributors of a free 66 -program will individually obtain patent licenses, in effect making the 67 -program proprietary. To prevent this, we have made it clear that any 68 -patent must be licensed for everyone's free use or not licensed at all. 69 - 70 - The precise terms and conditions for copying, distribution and 71 -modification follow. 72 - 73 - GNU GENERAL PUBLIC LICENSE 74 - TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION 75 - 76 - 0. This License applies to any program or other work which contains 77 -a notice placed by the copyright holder saying it may be distributed 78 -under the terms of this General Public License. The "Program", below, 79 -refers to any such program or work, and a "work based on the Program" 80 -means either the Program or any derivative work under copyright law: 81 -that is to say, a work containing the Program or a portion of it, 82 -either verbatim or with modifications and/or translated into another 83 -language. (Hereinafter, translation is included without limitation in 84 -the term "modification".) Each licensee is addressed as "you". 85 - 86 -Activities other than copying, distribution and modification are not 87 -covered by this License; they are outside its scope. The act of 88 -running the Program is not restricted, and the output from the Program 89 -is covered only if its contents constitute a work based on the 90 -Program (independent of having been made by running the Program). 91 -Whether that is true depends on what the Program does. 92 - 93 - 1. You may copy and distribute verbatim copies of the Program's 94 -source code as you receive it, in any medium, provided that you 95 -conspicuously and appropriately publish on each copy an appropriate 96 -copyright notice and disclaimer of warranty; keep intact all the 97 -notices that refer to this License and to the absence of any warranty; 98 -and give any other recipients of the Program a copy of this License 99 -along with the Program. 100 - 101 -You may charge a fee for the physical act of transferring a copy, and 102 -you may at your option offer warranty protection in exchange for a fee. 103 - 104 - 2. You may modify your copy or copies of the Program or any portion 105 -of it, thus forming a work based on the Program, and copy and 106 -distribute such modifications or work under the terms of Section 1 107 -above, provided that you also meet all of these conditions: 108 - 109 - a) You must cause the modified files to carry prominent notices 110 - stating that you changed the files and the date of any change. 111 - 112 - b) You must cause any work that you distribute or publish, that in 113 - whole or in part contains or is derived from the Program or any 114 - part thereof, to be licensed as a whole at no charge to all third 115 - parties under the terms of this License. 116 - 117 - c) If the modified program normally reads commands interactively 118 - when run, you must cause it, when started running for such 119 - interactive use in the most ordinary way, to print or display an 120 - announcement including an appropriate copyright notice and a 121 - notice that there is no warranty (or else, saying that you provide 122 - a warranty) and that users may redistribute the program under 123 - these conditions, and telling the user how to view a copy of this 124 - License. (Exception: if the Program itself is interactive but 125 - does not normally print such an announcement, your work based on 126 - the Program is not required to print an announcement.) 127 - 128 -These requirements apply to the modified work as a whole. If 129 -identifiable sections of that work are not derived from the Program, 130 -and can be reasonably considered independent and separate works in 131 -themselves, then this License, and its terms, do not apply to those 132 -sections when you distribute them as separate works. But when you 133 -distribute the same sections as part of a whole which is a work based 134 -on the Program, the distribution of the whole must be on the terms of 135 -this License, whose permissions for other licensees extend to the 136 -entire whole, and thus to each and every part regardless of who wrote it. 137 - 138 -Thus, it is not the intent of this section to claim rights or contest 139 -your rights to work written entirely by you; rather, the intent is to 140 -exercise the right to control the distribution of derivative or 141 -collective works based on the Program. 142 - 143 -In addition, mere aggregation of another work not based on the Program 144 -with the Program (or with a work based on the Program) on a volume of 145 -a storage or distribution medium does not bring the other work under 146 -the scope of this License. 147 - 148 - 3. You may copy and distribute the Program (or a work based on it, 149 -under Section 2) in object code or executable form under the terms of 150 -Sections 1 and 2 above provided that you also do one of the following: 151 - 152 - a) Accompany it with the complete corresponding machine-readable 153 - source code, which must be distributed under the terms of Sections 154 - 1 and 2 above on a medium customarily used for software interchange; or, 155 - 156 - b) Accompany it with a written offer, valid for at least three 157 - years, to give any third party, for a charge no more than your 158 - cost of physically performing source distribution, a complete 159 - machine-readable copy of the corresponding source code, to be 160 - distributed under the terms of Sections 1 and 2 above on a medium 161 - customarily used for software interchange; or, 162 - 163 - c) Accompany it with the information you received as to the offer 164 - to distribute corresponding source code. (This alternative is 165 - allowed only for noncommercial distribution and only if you 166 - received the program in object code or executable form with such 167 - an offer, in accord with Subsection b above.) 168 - 169 -The source code for a work means the preferred form of the work for 170 -making modifications to it. For an executable work, complete source 171 -code means all the source code for all modules it contains, plus any 172 -associated interface definition files, plus the scripts used to 173 -control compilation and installation of the executable. However, as a 174 -special exception, the source code distributed need not include 175 -anything that is normally distributed (in either source or binary 176 -form) with the major components (compiler, kernel, and so on) of the 177 -operating system on which the executable runs, unless that component 178 -itself accompanies the executable. 179 - 180 -If distribution of executable or object code is made by offering 181 -access to copy from a designated place, then offering equivalent 182 -access to copy the source code from the same place counts as 183 -distribution of the source code, even though third parties are not 184 -compelled to copy the source along with the object code. 185 - 186 - 4. You may not copy, modify, sublicense, or distribute the Program 187 -except as expressly provided under this License. Any attempt 188 -otherwise to copy, modify, sublicense or distribute the Program is 189 -void, and will automatically terminate your rights under this License. 190 -However, parties who have received copies, or rights, from you under 191 -this License will not have their licenses terminated so long as such 192 -parties remain in full compliance. 193 - 194 - 5. You are not required to accept this License, since you have not 195 -signed it. However, nothing else grants you permission to modify or 196 -distribute the Program or its derivative works. These actions are 197 -prohibited by law if you do not accept this License. Therefore, by 198 -modifying or distributing the Program (or any work based on the 199 -Program), you indicate your acceptance of this License to do so, and 200 -all its terms and conditions for copying, distributing or modifying 201 -the Program or works based on it. 202 - 203 - 6. Each time you redistribute the Program (or any work based on the 204 -Program), the recipient automatically receives a license from the 205 -original licensor to copy, distribute or modify the Program subject to 206 -these terms and conditions. You may not impose any further 207 -restrictions on the recipients' exercise of the rights granted herein. 208 -You are not responsible for enforcing compliance by third parties to 209 -this License. 210 - 211 - 7. If, as a consequence of a court judgment or allegation of patent 212 -infringement or for any other reason (not limited to patent issues), 213 -conditions are imposed on you (whether by court order, agreement or 214 -otherwise) that contradict the conditions of this License, they do not 215 -excuse you from the conditions of this License. If you cannot 216 -distribute so as to satisfy simultaneously your obligations under this 217 -License and any other pertinent obligations, then as a consequence you 218 -may not distribute the Program at all. For example, if a patent 219 -license would not permit royalty-free redistribution of the Program by 220 -all those who receive copies directly or indirectly through you, then 221 -the only way you could satisfy both it and this License would be to 222 -refrain entirely from distribution of the Program. 223 - 224 -If any portion of this section is held invalid or unenforceable under 225 -any particular circumstance, the balance of the section is intended to 226 -apply and the section as a whole is intended to apply in other 227 -circumstances. 228 - 229 -It is not the purpose of this section to induce you to infringe any 230 -patents or other property right claims or to contest validity of any 231 -such claims; this section has the sole purpose of protecting the 232 -integrity of the free software distribution system, which is 233 -implemented by public license practices. Many people have made 234 -generous contributions to the wide range of software distributed 235 -through that system in reliance on consistent application of that 236 -system; it is up to the author/donor to decide if he or she is willing 237 -to distribute software through any other system and a licensee cannot 238 -impose that choice. 239 - 240 -This section is intended to make thoroughly clear what is believed to 241 -be a consequence of the rest of this License. 242 - 243 - 8. If the distribution and/or use of the Program is restricted in 244 -certain countries either by patents or by copyrighted interfaces, the 245 -original copyright holder who places the Program under this License 246 -may add an explicit geographical distribution limitation excluding 247 -those countries, so that distribution is permitted only in or among 248 -countries not thus excluded. In such case, this License incorporates 249 -the limitation as if written in the body of this License. 250 - 251 - 9. The Free Software Foundation may publish revised and/or new versions 252 -of the General Public License from time to time. Such new versions will 253 -be similar in spirit to the present version, but may differ in detail to 254 -address new problems or concerns. 255 - 256 -Each version is given a distinguishing version number. If the Program 257 -specifies a version number of this License which applies to it and "any 258 -later version", you have the option of following the terms and conditions 259 -either of that version or of any later version published by the Free 260 -Software Foundation. If the Program does not specify a version number of 261 -this License, you may choose any version ever published by the Free Software 262 -Foundation. 263 - 264 - 10. If you wish to incorporate parts of the Program into other free 265 -programs whose distribution conditions are different, write to the author 266 -to ask for permission. For software which is copyrighted by the Free 267 -Software Foundation, write to the Free Software Foundation; we sometimes 268 -make exceptions for this. Our decision will be guided by the two goals 269 -of preserving the free status of all derivatives of our free software and 270 -of promoting the sharing and reuse of software generally. 271 - 272 - NO WARRANTY 273 - 274 - 11. BECAUSE THE PROGRAM IS LICENSED FREE OF CHARGE, THERE IS NO WARRANTY 275 -FOR THE PROGRAM, TO THE EXTENT PERMITTED BY APPLICABLE LAW. EXCEPT WHEN 276 -OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR OTHER PARTIES 277 -PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED 278 -OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF 279 -MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. THE ENTIRE RISK AS 280 -TO THE QUALITY AND PERFORMANCE OF THE PROGRAM IS WITH YOU. SHOULD THE 281 -PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF ALL NECESSARY SERVICING, 282 -REPAIR OR CORRECTION. 283 - 284 - 12. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING 285 -WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY AND/OR 286 -REDISTRIBUTE THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, 287 -INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING 288 -OUT OF THE USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED 289 -TO LOSS OF DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY 290 -YOU OR THIRD PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER 291 -PROGRAMS), EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE 292 -POSSIBILITY OF SUCH DAMAGES. 293 - 294 - END OF TERMS AND CONDITIONS 295 - 296 - How to Apply These Terms to Your New Programs 297 - 298 - If you develop a new program, and you want it to be of the greatest 299 -possible use to the public, the best way to achieve this is to make it 300 -free software which everyone can redistribute and change under these terms. 301 - 302 - To do so, attach the following notices to the program. It is safest 303 -to attach them to the start of each source file to most effectively 304 -convey the exclusion of warranty; and each file should have at least 305 -the "copyright" line and a pointer to where the full notice is found. 306 - 307 - <one line to give the program's name and a brief idea of what it does.> 308 - Copyright (C) <year> <name of author> 309 - 310 - This program is free software; you can redistribute it and/or modify 311 - it under the terms of the GNU General Public License as published by 312 - the Free Software Foundation; either version 2 of the License, or 313 - (at your option) any later version. 314 - 315 - This program is distributed in the hope that it will be useful, 316 - but WITHOUT ANY WARRANTY; without even the implied warranty of 317 - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the 318 - GNU General Public License for more details. 319 - 320 - You should have received a copy of the GNU General Public License along 321 - with this program; if not, write to the Free Software Foundation, Inc., 322 - 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. 323 - 324 -Also add information on how to contact you by electronic and paper mail. 325 - 326 -If the program is interactive, make it output a short notice like this 327 -when it starts in an interactive mode: 328 - 329 - Gnomovision version 69, Copyright (C) year name of author 330 - Gnomovision comes with ABSOLUTELY NO WARRANTY; for details type `show w'. 331 - This is free software, and you are welcome to redistribute it 332 - under certain conditions; type `show c' for details. 333 - 334 -The hypothetical commands `show w' and `show c' should show the appropriate 335 -parts of the General Public License. Of course, the commands you use may 336 -be called something other than `show w' and `show c'; they could even be 337 -mouse-clicks or menu items--whatever suits your program. 338 - 339 -You should also get your employer (if you work as a programmer) or your 340 -school, if any, to sign a "copyright disclaimer" for the program, if 341 -necessary. Here is a sample; alter the names: 342 - 343 - Yoyodyne, Inc., hereby disclaims all copyright interest in the program 344 - `Gnomovision' (which makes passes at compilers) written by James Hacker. 345 - 346 - <signature of Ty Coon>, 1 April 1989 347 - Ty Coon, President of Vice 348 - 349 -This General Public License does not permit incorporating your program into 350 -proprietary programs. If your program is a subroutine library, you may 351 -consider it more useful to permit linking proprietary applications with the 352 -library. If this is what you want to do, use the GNU Lesser General 353 -Public License instead of this License.
Changes to Makefile.
28 28 # as BCC, unless you are cross-compiling. This C compiler builds 29 29 # the finished binary for fossil. The BCC compiler above is used 30 30 # for building intermediate code-generator tools. 31 31 # 32 32 #TCC = gcc -O6 33 33 #TCC = gcc -g -O0 -Wall -fprofile-arcs -ftest-coverage 34 34 TCC = gcc -g -Os -Wall 35 -TCC += -DFOSSIL_ENABLE_SSL 36 35 37 36 #### Extra arguments for linking the finished binary. Fossil needs 38 37 # to link against the Z-Lib compression library. There are no 39 38 # other dependencies. We sometimes add the -static option here 40 39 # so that we can build a static executable that will run in a 41 40 # chroot jail. 42 41 # ................................................................................ 43 42 LIB = -lz $(LDFLAGS) 44 43 # If you're on OpenSolaris: 45 44 # LIB += lsocket 46 45 # Solaris 10 needs: 47 46 # LIB += -lsocket -lnsl 48 47 # My assumption is that the Sol10 flags will work for Sol8/9 and possibly 11. 49 48 # 50 -# If using FOSSIL_ENABLE_SSL, also enable the following: 51 -LIB += -lssl -lcrypto 52 49 53 50 #### Tcl shell for use in running the fossil testsuite. 54 51 # 55 52 TCLSH = tclsh 56 53 57 54 # You should not need to change anything below this line 58 55 ############################################################################### 59 56 include $(SRCDIR)/main.mk
Changes to src/add.c.
1 1 /* 2 2 ** Copyright (c) 2007 D. Richard Hipp 3 3 ** 4 4 ** This program is free software; you can redistribute it and/or 5 -** modify it under the terms of the GNU General Public 6 -** License version 2 as published by the Free Software Foundation. 7 -** 5 +** modify it under the terms of the Simplified BSD License (also 6 +** known as the "2-Clause License" or "FreeBSD License".) 7 + 8 8 ** This program is distributed in the hope that it will be useful, 9 -** but WITHOUT ANY WARRANTY; without even the implied warranty of 10 -** MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU 11 -** General Public License for more details. 12 -** 13 -** You should have received a copy of the GNU General Public 14 -** License along with this library; if not, write to the 15 -** Free Software Foundation, Inc., 59 Temple Place - Suite 330, 16 -** Boston, MA 02111-1307, USA. 9 +** but without any warranty; without even the implied warranty of 10 +** merchantability or fitness for a particular purpose. 17 11 ** 18 12 ** Author contact information: 19 13 ** drh@hwaci.com 20 14 ** http://www.hwaci.com/drh/ 21 15 ** 22 16 ******************************************************************************* 23 17 ** ................................................................................ 296 290 ** COMMAND: rename 297 291 ** 298 292 ** Usage: %fossil mv|rename OLDNAME NEWNAME 299 293 ** or: %fossil mv|rename OLDNAME... DIR 300 294 ** 301 295 ** Move or rename one or more files within the tree 302 296 ** 303 -** This command does not rename the files on disk. All this command does is 304 -** record the fact that filenames have changed so that appropriate notations 297 +** This command does not rename the files on disk. This command merely 298 +** records the fact that filenames have changed so that appropriate notations 305 299 ** can be made at the next commit/checkin. 306 300 */ 307 301 void mv_cmd(void){ 308 302 int i; 309 303 int vid; 310 304 char *zDest; 311 305 Blob dest;
Changes to src/allrepo.c.
1 1 /* 2 2 ** Copyright (c) 2008 D. Richard Hipp 3 3 ** 4 4 ** This program is free software; you can redistribute it and/or 5 -** modify it under the terms of the GNU General Public 6 -** License version 2 as published by the Free Software Foundation. 7 -** 5 +** modify it under the terms of the Simplified BSD License (also 6 +** known as the "2-Clause License" or "FreeBSD License".) 7 + 8 8 ** This program is distributed in the hope that it will be useful, 9 -** but WITHOUT ANY WARRANTY; without even the implied warranty of 10 -** MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU 11 -** General Public License for more details. 12 -** 13 -** You should have received a copy of the GNU General Public 14 -** License along with this library; if not, write to the 15 -** Free Software Foundation, Inc., 59 Temple Place - Suite 330, 16 -** Boston, MA 02111-1307, USA. 9 +** but without any warranty; without even the implied warranty of 10 +** merchantability or fitness for a particular purpose. 17 11 ** 18 12 ** Author contact information: 19 13 ** drh@hwaci.com 20 14 ** http://www.hwaci.com/drh/ 21 15 ** 22 16 ******************************************************************************* 23 17 ** ................................................................................ 60 54 ** Usage: %fossil all (list|ls|pull|push|rebuild|sync) 61 55 ** 62 56 ** The ~/.fossil file records the location of all repositories for a 63 57 ** user. This command performs certain operations on all repositories 64 58 ** that can be useful before or after a period of disconnection operation. 65 59 ** Available operations are: 66 60 ** 67 -** list Display the location of all repositories 68 -** 69 -** ls An alias for "list" 61 +** list | ls Display the location of all repositories 70 62 ** 71 63 ** pull Run a "pull" operation on all repositories 72 64 ** 73 65 ** push Run a "push" on all repositories 74 66 ** 75 67 ** rebuild Rebuild on all repositories 76 68 ** ................................................................................ 91 83 92 84 if( g.argc<3 ){ 93 85 usage("list|ls|pull|push|rebuild|sync"); 94 86 } 95 87 n = strlen(g.argv[2]); 96 88 db_open_config(1); 97 89 zCmd = g.argv[2]; 98 - if( strncmp(zCmd, "list", n)==0 ){ 99 - zCmd = "list"; 100 - }else if( strncmp(zCmd, "ls", n)==0 ){ /* alias for "list" above */ 90 + if( strncmp(zCmd, "list", n)==0 || strncmp(zCmd,"ls",n)==0 ){ 101 91 zCmd = "list"; 102 92 }else if( strncmp(zCmd, "push", n)==0 ){ 103 93 zCmd = "push -autourl -R"; 104 94 }else if( strncmp(zCmd, "pull", n)==0 ){ 105 95 zCmd = "pull -autourl -R"; 106 96 }else if( strncmp(zCmd, "rebuild", n)==0 ){ 107 97 zCmd = "rebuild";
Changes to src/attach.c.
1 1 /* 2 2 ** Copyright (c) 2010 D. Richard Hipp 3 3 ** 4 4 ** This program is free software; you can redistribute it and/or 5 -** modify it under the terms of the GNU General Public 6 -** License version 2 as published by the Free Software Foundation. 7 -** 5 +** modify it under the terms of the Simplified BSD License (also 6 +** known as the "2-Clause License" or "FreeBSD License".) 7 + 8 8 ** This program is distributed in the hope that it will be useful, 9 -** but WITHOUT ANY WARRANTY; without even the implied warranty of 10 -** MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU 11 -** General Public License for more details. 12 -** 13 -** You should have received a copy of the GNU General Public 14 -** License along with this library; if not, write to the 15 -** Free Software Foundation, Inc., 59 Temple Place - Suite 330, 16 -** Boston, MA 02111-1307, USA. 9 +** but without any warranty; without even the implied warranty of 10 +** merchantability or fitness for a particular purpose. 17 11 ** 18 12 ** Author contact information: 19 13 ** drh@hwaci.com 20 14 ** http://www.hwaci.com/drh/ 21 15 ** 22 16 ******************************************************************************* 23 17 **
Changes to src/bag.c.
1 1 /* 2 2 ** Copyright (c) 2007 D. Richard Hipp 3 3 ** 4 4 ** This program is free software; you can redistribute it and/or 5 -** modify it under the terms of the GNU General Public 6 -** License version 2 as published by the Free Software Foundation. 7 -** 5 +** modify it under the terms of the Simplified BSD License (also 6 +** known as the "2-Clause License" or "FreeBSD License".) 7 + 8 8 ** This program is distributed in the hope that it will be useful, 9 -** but WITHOUT ANY WARRANTY; without even the implied warranty of 10 -** MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU 11 -** General Public License for more details. 12 -** 13 -** You should have received a copy of the GNU General Public 14 -** License along with this library; if not, write to the 15 -** Free Software Foundation, Inc., 59 Temple Place - Suite 330, 16 -** Boston, MA 02111-1307, USA. 9 +** but without any warranty; without even the implied warranty of 10 +** merchantability or fitness for a particular purpose. 17 11 ** 18 12 ** Author contact information: 19 13 ** drh@hwaci.com 20 14 ** http://www.hwaci.com/drh/ 21 15 ** 22 16 ******************************************************************************* 23 17 **
Changes to src/blob.c.
1 1 /* 2 2 ** Copyright (c) 2006 D. Richard Hipp 3 3 ** 4 4 ** This program is free software; you can redistribute it and/or 5 -** modify it under the terms of the GNU General Public 6 -** License version 2 as published by the Free Software Foundation. 7 -** 5 +** modify it under the terms of the Simplified BSD License (also 6 +** known as the "2-Clause License" or "FreeBSD License".) 7 + 8 8 ** This program is distributed in the hope that it will be useful, 9 -** but WITHOUT ANY WARRANTY; without even the implied warranty of 10 -** MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU 11 -** General Public License for more details. 12 -** 13 -** You should have received a copy of the GNU General Public 14 -** License along with this library; if not, write to the 15 -** Free Software Foundation, Inc., 59 Temple Place - Suite 330, 16 -** Boston, MA 02111-1307, USA. 9 +** but without any warranty; without even the implied warranty of 10 +** merchantability or fitness for a particular purpose. 17 11 ** 18 12 ** Author contact information: 19 13 ** drh@hwaci.com 20 14 ** http://www.hwaci.com/drh/ 21 15 ** 22 16 ******************************************************************************* 23 17 **
Changes to src/branch.c.
1 1 /* 2 2 ** Copyright (c) 2007 D. Richard Hipp 3 3 ** 4 4 ** This program is free software; you can redistribute it and/or 5 -** modify it under the terms of the GNU General Public 6 -** License version 2 as published by the Free Software Foundation. 7 -** 5 +** modify it under the terms of the Simplified BSD License (also 6 +** known as the "2-Clause License" or "FreeBSD License".) 7 + 8 8 ** This program is distributed in the hope that it will be useful, 9 -** but WITHOUT ANY WARRANTY; without even the implied warranty of 10 -** MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU 11 -** General Public License for more details. 12 -** 13 -** You should have received a copy of the GNU General Public 14 -** License along with this library; if not, write to the 15 -** Free Software Foundation, Inc., 59 Temple Place - Suite 330, 16 -** Boston, MA 02111-1307, USA. 9 +** but without any warranty; without even the implied warranty of 10 +** merchantability or fitness for a particular purpose. 17 11 ** 18 12 ** Author contact information: 19 13 ** drh@hwaci.com 20 14 ** http://www.hwaci.com/drh/ 21 15 ** 22 16 ******************************************************************************* 23 17 ** ................................................................................ 47 41 Manifest mParent; /* Parsed parent manifest */ 48 42 Blob mcksum; /* Self-checksum on the manifest */ 49 43 50 44 noSign = find_option("nosign","",0)!=0; 51 45 zColor = find_option("bgcolor","c",1); 52 46 verify_all_options(); 53 47 if( g.argc<5 ){ 54 - usage("new BRANCH-NAME BASE-CHECK-IN ?-bgcolor COLOR?"); 48 + usage("new BRANCH-NAME CHECK-IN ?-bgcolor COLOR?"); 55 49 } 56 50 db_find_and_open_repository(1); 57 51 noSign = db_get_int("omitsign", 0)|noSign; 58 52 59 53 /* fossil branch new name */ 60 54 zBranch = g.argv[3]; 61 55 if( zBranch==0 || zBranch[0]==0 ){ ................................................................................ 172 166 } 173 167 174 168 /* 175 169 ** COMMAND: branch 176 170 ** 177 171 ** Usage: %fossil branch SUBCOMMAND ... ?-R|--repository FILE? 178 172 ** 179 -** Run various subcommands on the branches of the open repository or 173 +** Run various subcommands to manage branches of the open repository or 180 174 ** of the repository identified by the -R or --repository option. 181 175 ** 182 176 ** %fossil branch new BRANCH-NAME BASIS ?-bgcolor COLOR? 183 177 ** 184 178 ** Create a new branch BRANCH-NAME off of check-in BASIS. 185 179 ** You can optionally give the branch a default color. 186 180 **
Changes to src/browse.c.
1 1 /* 2 2 ** Copyright (c) 2008 D. Richard Hipp 3 3 ** 4 4 ** This program is free software; you can redistribute it and/or 5 -** modify it under the terms of the GNU General Public 6 -** License version 2 as published by the Free Software Foundation. 7 -** 5 +** modify it under the terms of the Simplified BSD License (also 6 +** known as the "2-Clause License" or "FreeBSD License".) 7 + 8 8 ** This program is distributed in the hope that it will be useful, 9 -** but WITHOUT ANY WARRANTY; without even the implied warranty of 10 -** MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU 11 -** General Public License for more details. 12 -** 13 -** You should have received a copy of the GNU General Public 14 -** License along with this library; if not, write to the 15 -** Free Software Foundation, Inc., 59 Temple Place - Suite 330, 16 -** Boston, MA 02111-1307, USA. 9 +** but without any warranty; without even the implied warranty of 10 +** merchantability or fitness for a particular purpose. 17 11 ** 18 12 ** Author contact information: 19 13 ** drh@hwaci.com 20 14 ** http://www.hwaci.com/drh/ 21 15 ** 22 16 ******************************************************************************* 23 17 **
Changes to src/captcha.c.
1 1 /* 2 2 ** Copyright (c) 2009 D. Richard Hipp 3 3 ** 4 4 ** This program is free software; you can redistribute it and/or 5 -** modify it under the terms of the GNU General Public 6 -** License version 2 as published by the Free Software Foundation. 7 -** 5 +** modify it under the terms of the Simplified BSD License (also 6 +** known as the "2-Clause License" or "FreeBSD License".) 7 + 8 8 ** This program is distributed in the hope that it will be useful, 9 -** but WITHOUT ANY WARRANTY; without even the implied warranty of 10 -** MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU 11 -** General Public License for more details. 12 -** 13 -** You should have received a copy of the GNU General Public 14 -** License along with this library; if not, write to the 15 -** Free Software Foundation, Inc., 59 Temple Place - Suite 330, 16 -** Boston, MA 02111-1307, USA. 9 +** but without any warranty; without even the implied warranty of 10 +** merchantability or fitness for a particular purpose. 17 11 ** 18 12 ** Author contact information: 19 13 ** drh@hwaci.com 20 14 ** http://www.hwaci.com/drh/ 21 15 ** 22 16 ******************************************************************************* 23 17 **
Changes to src/cgi.c.
1 1 /* 2 2 ** Copyright (c) 2006 D. Richard Hipp 3 3 ** 4 4 ** This program is free software; you can redistribute it and/or 5 -** modify it under the terms of the GNU General Public 6 -** License version 2 as published by the Free Software Foundation. 7 -** 5 +** modify it under the terms of the Simplified BSD License (also 6 +** known as the "2-Clause License" or "FreeBSD License".) 7 + 8 8 ** This program is distributed in the hope that it will be useful, 9 -** but WITHOUT ANY WARRANTY; without even the implied warranty of 10 -** MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU 11 -** General Public License for more details. 12 -** 13 -** You should have received a copy of the GNU General Public 14 -** License along with this library; if not, write to the 15 -** Free Software Foundation, Inc., 59 Temple Place - Suite 330, 16 -** Boston, MA 02111-1307, USA. 9 +** but without any warranty; without even the implied warranty of 10 +** merchantability or fitness for a particular purpose. 17 11 ** 18 12 ** Author contact information: 19 13 ** drh@hwaci.com 20 14 ** http://www.hwaci.com/drh/ 21 15 ** 22 16 ******************************************************************************* 23 17 ** ................................................................................ 25 19 ** services to CGI programs. There are procedures for parsing and 26 20 ** dispensing QUERY_STRING parameters and cookies, the "mprintf()" 27 21 ** formatting function and its cousins, and routines to encode and 28 22 ** decode strings in HTML or HTTP. 29 23 */ 30 24 #include "config.h" 31 25 #ifdef __MINGW32__ 32 -# include <windows.h> /* for Sleep once server works again */ 33 -# include <winsock2.h> /* socket operations */ 34 -# define sleep Sleep /* windows does not have sleep, but Sleep */ 35 -# include <ws2tcpip.h> 26 +# include <windows.h> /* for Sleep once server works again */ 27 +# include <winsock2.h> /* socket operations */ 28 +# define sleep Sleep /* windows does not have sleep, but Sleep */ 29 +# include <ws2tcpip.h> 36 30 #else 37 -# include <sys/socket.h> 38 -# include <netinet/in.h> 39 -# include <arpa/inet.h> 40 -# include <sys/times.h> 41 -# include <sys/time.h> 42 -# include <sys/wait.h> 43 -# include <sys/select.h> 31 +# include <sys/socket.h> 32 +# include <netinet/in.h> 33 +# include <arpa/inet.h> 34 +# include <sys/times.h> 35 +# include <sys/time.h> 36 +# include <sys/wait.h> 37 +# include <sys/select.h> 44 38 #endif 45 39 #ifdef __EMX__ 46 - typedef int socklen_t; 40 + typedef int socklen_t; 47 41 #endif 48 42 #include <time.h> 49 43 #include <stdio.h> 50 44 #include <stdlib.h> 51 45 #include <unistd.h> 52 46 #include "cgi.h" 53 47 ................................................................................ 193 187 const char *zName, /* Name of the cookie */ 194 188 const char *zValue, /* Value of the cookie. Automatically escaped */ 195 189 const char *zPath, /* Path cookie applies to. NULL means "/" */ 196 190 int lifetime /* Expiration of the cookie in seconds from now */ 197 191 ){ 198 192 if( zPath==0 ) zPath = g.zTop; 199 193 if( lifetime>0 ){ 200 - char *zDate; 201 194 lifetime += (int)time(0); 202 - zDate = cgi_rfc822_datestamp(lifetime); 203 195 blob_appendf(&extraHeader, 204 - "Set-Cookie: %s=%t; Path=%s; expires=%s; Version=1\r\n", 205 - zName, zValue, zPath, zDate); 206 - if( zDate[0] ) free( zDate ); 196 + "Set-Cookie: %s=%t; Path=%s; expires=%z; Version=1\r\n", 197 + zName, zValue, zPath, cgi_rfc822_datestamp(lifetime)); 207 198 }else{ 208 199 blob_appendf(&extraHeader, 209 200 "Set-Cookie: %s=%t; Path=%s; Version=1\r\n", 210 201 zName, zValue, zPath); 211 202 } 212 203 } 213 204 ................................................................................ 264 255 } 265 256 #endif 266 257 267 258 /* 268 259 ** Do a normal HTTP reply 269 260 */ 270 261 void cgi_reply(void){ 271 - int total_size = 0; 262 + int total_size; 272 263 if( iReplyStatus<=0 ){ 273 264 iReplyStatus = 200; 274 265 zReplyStatus = "OK"; 275 266 } 276 267 277 268 #if 0 278 269 if( iReplyStatus==200 && check_cache_control() ) { ................................................................................ 282 273 */ 283 274 iReplyStatus = 304; 284 275 zReplyStatus = "Not Modified"; 285 276 } 286 277 #endif 287 278 288 279 if( g.fullHttpReply ){ 289 - char *zDate = cgi_rfc822_datestamp(time(0)); 290 280 fprintf(g.httpOut, "HTTP/1.0 %d %s\r\n", iReplyStatus, zReplyStatus); 291 - fprintf(g.httpOut, "Date: %s\r\n", zDate ); 292 - if( zDate[0] ) free( zDate ); 281 + fprintf(g.httpOut, "Date: %s\r\n", cgi_rfc822_datestamp(time(0))); 293 282 fprintf(g.httpOut, "Connection: close\r\n"); 294 283 }else{ 295 284 fprintf(g.httpOut, "Status: %d %s\r\n", iReplyStatus, zReplyStatus); 296 285 } 297 286 298 287 if( blob_size(&extraHeader)>0 ){ 299 288 fprintf(g.httpOut, "%s", blob_buffer(&extraHeader)); ................................................................................ 306 295 ** case of most /getfile calls for specific versions, the only way the 307 296 ** content changes is if someone breaks the SCM. And if that happens, a 308 297 ** stale cache is the least of the problem. So we provide an Expires 309 298 ** header set to a reasonable period (default: one week). 310 299 */ 311 300 /*time_t expires = time(0) + atoi(db_config("constant_expires","604800"));*/ 312 301 time_t expires = time(0) + 604800; 313 - char * zDate = cgi_rfc822_datestamp(expires); 314 - fprintf(g.httpOut, "Expires: %s\r\n", zDate ); 315 - if( zDate[0] ) free( zDate ); 302 + fprintf(g.httpOut, "Expires: %s\r\n", cgi_rfc822_datestamp(expires)); 316 303 }else{ 317 304 fprintf(g.httpOut, "Cache-control: no-cache, no-store\r\n"); 318 305 } 319 306 320 307 /* Content intended for logged in users should only be cached in 321 308 ** the browser, not some shared location. 322 309 */ ................................................................................ 325 312 cgi_combine_header_and_body(); 326 313 blob_compress(&cgiContent[0], &cgiContent[0]); 327 314 } 328 315 329 316 if( iReplyStatus != 304 ) { 330 317 total_size = blob_size(&cgiContent[0]) + blob_size(&cgiContent[1]); 331 318 fprintf(g.httpOut, "Content-Length: %d\r\n", total_size); 319 + }else{ 320 + total_size = 0; 332 321 } 333 322 fprintf(g.httpOut, "\r\n"); 334 323 if( total_size>0 && iReplyStatus != 304 ){ 335 324 int i, size; 336 325 for(i=0; i<2; i++){ 337 326 size = blob_size(&cgiContent[i]); 338 327 if( size>0 ){ ................................................................................ 1278 1267 {"Sun", "Mon", "Tue", "Wed", "Thu", "Fri", "Sat", 0}; 1279 1268 static const char *azMonths[] = 1280 1269 {"Jan", "Feb", "Mar", "Apr", "May", "Jun", 1281 1270 "Jul", "Aug", "Sep", "Oct", "Nov", "Dec", 0}; 1282 1271 1283 1272 1284 1273 /* 1285 -** Returns an RFC822-formatted time string suitable for HTTP headers, among 1286 -** other things. 1287 -** Returned timezone is always GMT as required by HTTP/1.1 specification. 1288 -** The returned string is allocated with malloc() and must be freed 1289 -** with free(). 1274 +** Returns an RFC822-formatted time string suitable for HTTP headers. 1275 +** The timezone is always GMT. The value returned is always a 1276 +** string obtained from mprintf() and must be freed using free() to 1277 +** avoid a memory leak. 1290 1278 ** 1291 1279 ** See http://www.faqs.org/rfcs/rfc822.html, section 5 1292 1280 ** and http://www.faqs.org/rfcs/rfc2616.html, section 3.3. 1293 1281 */ 1294 1282 char *cgi_rfc822_datestamp(time_t now){ 1295 1283 struct tm *pTm; 1296 1284 pTm = gmtime(&now); 1297 - if( pTm==0 ) return ""; 1298 - return mprintf("%s, %d %s %02d %02d:%02d:%02d GMT", 1299 - azDays[pTm->tm_wday], pTm->tm_mday, azMonths[pTm->tm_mon], 1300 - pTm->tm_year+1900, pTm->tm_hour, pTm->tm_min, pTm->tm_sec); 1285 + if( pTm==0 ){ 1286 + return mprintf(""); 1287 + }else{ 1288 + return mprintf("%s, %d %s %02d %02d:%02d:%02d GMT", 1289 + azDays[pTm->tm_wday], pTm->tm_mday, azMonths[pTm->tm_mon], 1290 + pTm->tm_year+1900, pTm->tm_hour, pTm->tm_min, pTm->tm_sec); 1291 + } 1301 1292 } 1302 1293 1303 1294 /* 1304 1295 ** Parse an RFC822-formatted timestamp as we'd expect from HTTP and return 1305 1296 ** a Unix epoch time. <= zero is returned on failure. 1306 1297 ** 1307 1298 ** Note that this won't handle all the _allowed_ HTTP formats, just the
Changes to src/checkin.c.
1 1 /* 2 2 ** Copyright (c) 2007 D. Richard Hipp 3 3 ** 4 4 ** This program is free software; you can redistribute it and/or 5 -** modify it under the terms of the GNU General Public 6 -** License version 2 as published by the Free Software Foundation. 7 -** 5 +** modify it under the terms of the Simplified BSD License (also 6 +** known as the "2-Clause License" or "FreeBSD License".) 7 + 8 8 ** This program is distributed in the hope that it will be useful, 9 -** but WITHOUT ANY WARRANTY; without even the implied warranty of 10 -** MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU 11 -** General Public License for more details. 12 -** 13 -** You should have received a copy of the GNU General Public 14 -** License along with this library; if not, write to the 15 -** Free Software Foundation, Inc., 59 Temple Place - Suite 330, 16 -** Boston, MA 02111-1307, USA. 9 +** but without any warranty; without even the implied warranty of 10 +** merchantability or fitness for a particular purpose. 17 11 ** 18 12 ** Author contact information: 19 13 ** drh@hwaci.com 20 14 ** http://www.hwaci.com/drh/ 21 15 ** 22 16 ******************************************************************************* 23 17 ** ................................................................................ 527 521 ** COMMAND: ci 528 522 ** COMMAND: commit 529 523 ** 530 524 ** Usage: %fossil commit ?OPTIONS? ?FILE...? 531 525 ** 532 526 ** Create a new version containing all of the changes in the current 533 527 ** checkout. You will be prompted to enter a check-in comment unless 534 -** one of the "-m" or "-M" options are used to specify a comment. 535 -** "-m" takes a single string for the commit message and "-M" requires 536 -** a filename from which to read the commit message. If neither "-m" 537 -** nor "-M" are specified then the editor defined in the "editor" 538 -** fossil option (see %fossil help set) will be used, or from the 539 -** "VISUAL" or "EDITOR" environment variables (in that order) if no 540 -** editor is set. 528 +** the comment has been specified on the command-line using "-m". 529 +** The editor defined in the "editor" fossil option (see %fossil help set) 530 +** will be used, or from the "VISUAL" or "EDITOR" environment variables 531 +** (in that order) if no editor is set. 541 532 ** 542 533 ** You will be prompted for your GPG passphrase in order to sign the 543 534 ** new manifest unless the "--nosign" options is used. All files that 544 535 ** have changed will be committed unless some subset of files is 545 536 ** specified on the command line. 546 537 ** 547 538 ** The --branch option followed by a branch name cases the new check-in ................................................................................ 559 550 ** 560 551 ** --comment|-m COMMENT-TEXT 561 552 ** --branch NEW-BRANCH-NAME 562 553 ** --bgcolor COLOR 563 554 ** --nosign 564 555 ** --force|-f 565 556 ** --private 566 -** --message-file|-M COMMENT-FILE 567 557 ** 568 558 */ 569 559 void commit_cmd(void){ 570 560 int rc; 571 561 int vid, nrid, nvid; 572 562 Blob comment; 573 563 const char *zComment; ................................................................................ 579 569 int forceFlag = 0; /* Force a fork */ 580 570 char *zManifestFile; /* Name of the manifest file */ 581 571 int nBasename; /* Length of "g.zLocalRoot/" */ 582 572 const char *zBranch; /* Create a new branch with this name */ 583 573 const char *zBgColor; /* Set background color when branching */ 584 574 const char *zDateOvrd; /* Override date string */ 585 575 const char *zUserOvrd; /* Override user name */ 586 - const char *zCommentFile; /* Read commit message from this file */ 576 + const char *zComFile; /* Read commit message from this file */ 587 577 Blob filename; /* complete filename */ 588 578 Blob manifest; 589 579 Blob muuid; /* Manifest uuid */ 590 580 Blob mcksum; /* Self-checksum on the manifest */ 591 581 Blob cksum1, cksum2; /* Before and after commit checksums */ 592 582 Blob cksum1b; /* Checksum recorded in the manifest */ 593 583 594 584 url_proxy_options(); 595 585 noSign = find_option("nosign",0,0)!=0; 596 586 zComment = find_option("comment","m",1); 597 587 forceFlag = find_option("force", "f", 0)!=0; 598 588 zBranch = find_option("branch","b",1); 599 589 zBgColor = find_option("bgcolor",0,1); 600 - zCommentFile = find_option("message-file", "M", 1); 590 + zComFile = find_option("message-file", "M", 1); 601 591 if( find_option("private",0,0) ){ 602 592 g.markPrivate = 1; 603 593 if( zBranch==0 ) zBranch = "private"; 604 594 if( zBgColor==0 ) zBgColor = "#fec084"; /* Orange */ 605 595 } 606 596 zDateOvrd = find_option("date-override",0,1); 607 597 zUserOvrd = find_option("user-override",0,1); ................................................................................ 686 676 fossil_fatal("cannot commit against a closed leaf"); 687 677 } 688 678 689 679 vfile_aggregate_checksum_disk(vid, &cksum1); 690 680 if( zComment ){ 691 681 blob_zero(&comment); 692 682 blob_append(&comment, zComment, -1); 693 - }else if( zCommentFile ){ 683 + }else if( zComFile ){ 694 684 blob_zero(&comment); 695 - blob_read_from_file(&comment, zCommentFile); 685 + blob_read_from_file(&comment, zComFile); 696 686 }else{ 697 687 char *zInit = db_text(0, "SELECT value FROM vvar WHERE name='ci-comment'"); 698 688 prepare_commit_comment(&comment, zInit, zBranch, vid); 699 689 free(zInit); 700 690 } 701 691 if( blob_size(&comment)==0 ){ 702 692 Blob ans; ................................................................................ 913 903 if( !g.markPrivate ){ 914 904 autosync(AUTOSYNC_PUSH); 915 905 } 916 906 if( count_nonbranch_children(vid)>1 ){ 917 907 printf("**** warning: a fork has occurred *****\n"); 918 908 } 919 909 } 920 - 921 -/* 922 -** COMMAND: test-import-manifest 923 -** 924 -** Usage: %fossil test-import-manifest DATE COMMENT ?-p PARENT_RECORDID?... ?-f (FILE_RECORDID PATH)?... 925 -** 926 -** Create a new version containing the specified file 927 -** revisions (if any), and child of the given PARENT version. 928 -*/ 929 -void import_manifest_cmd(void){ 930 - const char* zDate; /* argument - timestamp, as seconds since epoch (int) */ 931 - const char* zComment; /* argument - manifest comment */ 932 - char* zDateFmt; /* timestamp formatted for the manifest */ 933 - int* zParents; /* arguments - array of parent references */ 934 - int zParentCount; /* number of found parent references */ 935 - Blob manifest; /* container for the manifest to be generated */ 936 - Blob mcksum; /* Self-checksum on the manifest */ 937 - Blob cksum, cksum2; /* Before and after commit checksums */ 938 - Blob cksum1b; /* Checksum recorded in the manifest */ 939 - const char* parent; /* loop variable when collecting parent references */ 940 - int i, mid; /* Another loop index, and id of new manifest */ 941 - Stmt q; /* sql statement to query table of files */ 942 - char* zMidUuid; /* Uuid for the newly generated manifest */ 943 - 944 - 945 -#define USAGE ("DATE COMMENT ?-p|-parent PARENT_RID...? ?-f|-file (FILE_RID PATH)...?") 946 - 947 - /* 948 - ** Validate and process arguments, collect information. 949 - */ 950 - 951 - db_must_be_within_tree(); 952 - 953 - /* Mandatory arguments */ 954 - if (g.argc < 4) { 955 - usage (USAGE); 956 - } 957 - 958 - zDate = g.argv[2]; 959 - zComment = g.argv[3]; 960 - 961 - remove_from_argv (2,2); 962 - 963 - /* Pull the optional parent arguments 964 - ** 965 - ** Note: In principle it is possible that the loop below extracts 966 - ** the wrong arguments, if we ever try to import a file whose path 967 - ** starts with -p/-parent. In that case however the removal of two 968 - ** arguments will leave the file bereft of an argument and the 969 - ** recheck of the number of arguments below should catch that. 970 - ** 971 - ** For a test command this is acceptable, it won't have lots of 972 - ** safety nets. 973 - */ 974 - 975 - zParentCount = 0; 976 - zParents = (int*)malloc(sizeof(int)*(1+g.argc)); 977 - /* 1+, to be ok with the default even if no arguments around */ 978 - 979 - while ((parent = find_option("parent","p",1)) != NULL) { 980 - /* Check and store ... */ 981 - zParents [zParentCount] = name_to_rid (parent); 982 - zParentCount ++; 983 - } 984 - 985 - /* 986 - ** Fall back to the root manifest as parent if none were specified 987 - ** explicitly. 988 - */ 989 - 990 - if (!zParentCount) { 991 - zParents [zParentCount] = 1; /* HACK: rid 1 is the baseline manifest 992 - ** which was entered when the repository 993 - ** was created via 'new'. It always has 994 - ** rid 1. 995 - */ 996 - zParentCount ++; 997 - } 998 - 999 - /* Pull the file arguments, at least one has to be present. They are 1000 - ** the only things we can have here, now, and they are triples of 1001 - ** '-f FID PATH', so use of find_option is out, and we can check the 1002 - ** number of arguments. 1003 - ** 1004 - ** Note: We store the data in a temp. table, so that we later can 1005 - ** pull it sorted, and also easily get the associated hash 1006 - ** identifiers. 1007 - ** 1008 - ** Note 2: We expect at least one file, otherwise the manifest won't 1009 - ** be recognized as a baseline by the manifest parser. 1010 - */ 1011 - 1012 - if (((g.argc-2) % 3 != 0) || (g.argc < 5)) { 1013 - usage (USAGE); 1014 - } 1015 - 1016 - db_begin_transaction(); 1017 - db_multi_exec ("CREATE TEMP TABLE __im (" 1018 - "rid INTEGER NOT NULL," 1019 - "pathname TEXT NOT NULL)" ); 1020 - 1021 - while (g.argc > 2) { 1022 - /* Check and store ... */ 1023 - if (strcmp("-f", g.argv[2]) && 1024 - strcmp("-file",g.argv[2])) { 1025 - usage (USAGE); 1026 - } 1027 - 1028 - /* DANGER The %s for the path might lead itself to an injection 1029 - ** attack. For now (i.e. testing) this is ok, but do something 1030 - ** better in the future. 1031 - */ 1032 - 1033 - db_multi_exec("INSERT INTO __im VALUES(%d,'%s')", 1034 - name_to_rid (g.argv[3]), g.argv[4] ); 1035 - remove_from_argv (2,3); 1036 - } 1037 - 1038 - verify_all_options(); 1039 - 1040 - /* 1041 - ** Determine the user the manifest will belong to, and check that 1042 - ** this user exists. 1043 - */ 1044 - 1045 - user_select(); 1046 - if( !db_exists("SELECT 1 FROM user WHERE login=%Q", g.zLogin) ){ 1047 - fossil_fatal("no such user: %s", g.zLogin); 1048 - } 1049 - 1050 - /* 1051 - ** Now generate the manifest in memory. 1052 - ** 1053 - ** Start with comment and date. The latter is converted to the 1054 - ** proper format before insertion. 1055 - */ 1056 - 1057 - blob_zero(&manifest); 1058 - 1059 - if (!strlen(zComment)) { 1060 - blob_appendf(&manifest, "C %F\n", "(no comment)"); 1061 - } else { 1062 - blob_appendf(&manifest, "C %F\n", zComment); 1063 - } 1064 - 1065 - zDateFmt = db_text(0, "SELECT datetime(%Q,'unixepoch')",zDate); 1066 - zDateFmt[10] = 'T'; 1067 - blob_appendf(&manifest, "D %s\n", zDateFmt); 1068 - free(zDateFmt); 1069 - 1070 - /* 1071 - ** Follow with all the collected files, properly sorted. Here were 1072 - ** also compute the checksum over the files (paths, sizes, 1073 - ** contents), similar to what 'vfile_aggregate_checksum_repository' 1074 - ** does. 1075 - */ 1076 - 1077 - md5sum_init(); 1078 - db_prepare(&q, 1079 - "SELECT pathname, uuid, __im.rid" 1080 - " FROM __im JOIN blob ON __im.rid=blob.rid" 1081 - " ORDER BY 1"); 1082 - 1083 - while( db_step(&q)==SQLITE_ROW ){ 1084 - char zBuf[100]; 1085 - Blob file; 1086 - const char *zName = db_column_text(&q, 0); 1087 - const char *zUuid = db_column_text(&q, 1); 1088 - int zRid = db_column_int (&q, 2); 1089 - 1090 - /* Extend the manifest */ 1091 - blob_appendf(&manifest, "F %F %s\n", zName, zUuid); 1092 - 1093 - /* Update the checksum */ 1094 - md5sum_step_text(zName, -1); 1095 - blob_zero(&file); 1096 - content_get(zRid, &file); 1097 - sprintf(zBuf, " %d\n", blob_size(&file)); 1098 - md5sum_step_text(zBuf, -1); 1099 - md5sum_step_blob(&file); 1100 - blob_reset(&file); 1101 - } 1102 - db_finalize(&q); 1103 - md5sum_finish (&cksum); 1104 - 1105 - /* 1106 - ** Follow with all the specified parents. We know that there is at 1107 - ** least one. 1108 - */ 1109 - 1110 - blob_appendf(&manifest, "P"); 1111 - for (i=0;i<zParentCount;i++) { 1112 - char* zUuid = db_text(0, "SELECT uuid FROM blob WHERE rid=%d", zParents[i]); 1113 - blob_appendf(&manifest, " %s", zUuid); 1114 - free(zUuid); 1115 - } 1116 - blob_appendf(&manifest, "\n"); 1117 - 1118 - /* 1119 - ** Complete the manifest with user name and the various checksums 1120 - */ 1121 - 1122 - blob_appendf(&manifest, "R %b\n", &cksum); 1123 - blob_appendf(&manifest, "U %F\n", g.zLogin); 1124 - md5sum_blob(&manifest, &mcksum); 1125 - blob_appendf(&manifest, "Z %b\n", &mcksum); 1126 - 1127 - /* 1128 - ** Now insert the new manifest, try to compress it relative to first 1129 - ** parent (primary). 1130 - */ 1131 - 1132 - /*blob_write_to_file (&manifest, "TEST_MANIFEST");*/ 1133 - 1134 - mid = content_put(&manifest, 0, 0); 1135 - if( mid==0 ){ 1136 - fossil_panic("trouble committing manifest: %s", g.zErrMsg); 1137 - } 1138 - 1139 - content_deltify(zParents[0], mid, 0); 1140 - 1141 - /* Verify that the repository checksum matches the expected checksum 1142 - ** calculated before the checkin started (and stored as the R record 1143 - ** of the manifest file). 1144 - */ 1145 - 1146 - vfile_aggregate_checksum_manifest(mid, &cksum2, &cksum1b); 1147 - if( blob_compare(&cksum, &cksum1b) ){ 1148 - fossil_panic("manifest checksum does not agree with manifest: " 1149 - "%b versus %b", &cksum, &cksum1b); 1150 - } 1151 - if( blob_compare(&cksum, &cksum2) ){ 1152 - fossil_panic("tree checksum does not match manifest after commit: " 1153 - "%b versus %b", &cksum, &cksum2); 1154 - } 1155 - 1156 - /* 1157 - ** At last commit all changes, after getting rid of the temp 1158 - ** holder for the files, and release allocated memory. 1159 - */ 1160 - 1161 - db_multi_exec("DROP TABLE __im"); 1162 - zMidUuid = db_text(0, "SELECT uuid FROM blob WHERE rid=%d", mid); 1163 - db_end_transaction(0); 1164 - free(zParents); 1165 - 1166 - /* 1167 - ** At the very last inform the caller about the id and uuid of the 1168 - ** new manifest. 1169 - */ 1170 - 1171 - 1172 - printf("inserted as record %d, %s\n", mid, zMidUuid); 1173 - free(zMidUuid); 1174 - return; 1175 - 1176 -#undef USAGE 1177 -}
Changes to src/checkout.c.
1 1 /* 2 2 ** Copyright (c) 2007 D. Richard Hipp 3 3 ** 4 4 ** This program is free software; you can redistribute it and/or 5 -** modify it under the terms of the GNU General Public 6 -** License version 2 as published by the Free Software Foundation. 7 -** 5 +** modify it under the terms of the Simplified BSD License (also 6 +** known as the "2-Clause License" or "FreeBSD License".) 7 + 8 8 ** This program is distributed in the hope that it will be useful, 9 -** but WITHOUT ANY WARRANTY; without even the implied warranty of 10 -** MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU 11 -** General Public License for more details. 12 -** 13 -** You should have received a copy of the GNU General Public 14 -** License along with this library; if not, write to the 15 -** Free Software Foundation, Inc., 59 Temple Place - Suite 330, 16 -** Boston, MA 02111-1307, USA. 9 +** but without any warranty; without even the implied warranty of 10 +** merchantability or fitness for a particular purpose. 17 11 ** 18 12 ** Author contact information: 19 13 ** drh@hwaci.com 20 14 ** http://www.hwaci.com/drh/ 21 15 ** 22 16 ******************************************************************************* 23 17 ** ................................................................................ 143 137 } 144 138 blob_reset(&filename); 145 139 manifest_clear(&m); 146 140 } 147 141 148 142 /* 149 143 ** COMMAND: checkout 150 -** COMMAND: co 151 144 ** 152 145 ** Usage: %fossil checkout VERSION ?-f|--force? ?--keep? 153 146 ** 154 147 ** Check out a version specified on the command-line. This command 155 148 ** will abort if there are edited files in the current checkout unless 156 149 ** the --force option appears on the command-line. The --keep option 157 150 ** leaves files on disk unchanged, except the manifest and manifest.uuid
Changes to src/clearsign.c.
1 1 /* 2 2 ** Copyright (c) 2007 D. Richard Hipp 3 3 ** 4 4 ** This program is free software; you can redistribute it and/or 5 -** modify it under the terms of the GNU General Public 6 -** License version 2 as published by the Free Software Foundation. 7 -** 5 +** modify it under the terms of the Simplified BSD License (also 6 +** known as the "2-Clause License" or "FreeBSD License".) 7 + 8 8 ** This program is distributed in the hope that it will be useful, 9 -** but WITHOUT ANY WARRANTY; without even the implied warranty of 10 -** MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU 11 -** General Public License for more details. 12 -** 13 -** You should have received a copy of the GNU General Public 14 -** License along with this library; if not, write to the 15 -** Free Software Foundation, Inc., 59 Temple Place - Suite 330, 16 -** Boston, MA 02111-1307, USA. 9 +** but without any warranty; without even the implied warranty of 10 +** merchantability or fitness for a particular purpose. 17 11 ** 18 12 ** Author contact information: 19 13 ** drh@hwaci.com 20 14 ** http://www.hwaci.com/drh/ 21 15 ** 22 16 ******************************************************************************* 23 17 **
Changes to src/clone.c.
1 1 /* 2 2 ** Copyright (c) 2007 D. Richard Hipp 3 3 ** 4 4 ** This program is free software; you can redistribute it and/or 5 -** modify it under the terms of the GNU General Public 6 -** License version 2 as published by the Free Software Foundation. 7 -** 5 +** modify it under the terms of the Simplified BSD License (also 6 +** known as the "2-Clause License" or "FreeBSD License".) 7 + 8 8 ** This program is distributed in the hope that it will be useful, 9 -** but WITHOUT ANY WARRANTY; without even the implied warranty of 10 -** MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU 11 -** General Public License for more details. 12 -** 13 -** You should have received a copy of the GNU General Public 14 -** License along with this library; if not, write to the 15 -** Free Software Foundation, Inc., 59 Temple Place - Suite 330, 16 -** Boston, MA 02111-1307, USA. 9 +** but without any warranty; without even the implied warranty of 10 +** merchantability or fitness for a particular purpose. 17 11 ** 18 12 ** Author contact information: 19 13 ** drh@hwaci.com 20 14 ** http://www.hwaci.com/drh/ 21 15 ** 22 16 ******************************************************************************* 23 17 **
Changes to src/comformat.c.
1 1 /* 2 2 ** Copyright (c) 2007 D. Richard Hipp 3 3 ** 4 4 ** This program is free software; you can redistribute it and/or 5 -** modify it under the terms of the GNU General Public 6 -** License version 2 as published by the Free Software Foundation. 7 -** 5 +** modify it under the terms of the Simplified BSD License (also 6 +** known as the "2-Clause License" or "FreeBSD License".) 7 + 8 8 ** This program is distributed in the hope that it will be useful, 9 -** but WITHOUT ANY WARRANTY; without even the implied warranty of 10 -** MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU 11 -** General Public License for more details. 12 -** 13 -** You should have received a copy of the GNU General Public 14 -** License along with this library; if not, write to the 15 -** Free Software Foundation, Inc., 59 Temple Place - Suite 330, 16 -** Boston, MA 02111-1307, USA. 9 +** but without any warranty; without even the implied warranty of 10 +** merchantability or fitness for a particular purpose. 17 11 ** 18 12 ** Author contact information: 19 13 ** drh@hwaci.com 20 14 ** http://www.hwaci.com/drh/ 21 15 ** 22 16 ******************************************************************************* 23 17 **
Changes to src/config.h.
1 1 /* 2 2 ** Copyright (c) 2006 D. Richard Hipp 3 3 ** 4 4 ** This program is free software; you can redistribute it and/or 5 -** modify it under the terms of the GNU General Public 6 -** License version 2 as published by the Free Software Foundation. 7 -** 5 +** modify it under the terms of the Simplified BSD License (also 6 +** known as the "2-Clause License" or "FreeBSD License".) 7 + 8 8 ** This program is distributed in the hope that it will be useful, 9 -** but WITHOUT ANY WARRANTY; without even the implied warranty of 10 -** MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU 11 -** General Public License for more details. 12 -** 13 -** You should have received a copy of the GNU General Public 14 -** License along with this library; if not, write to the 15 -** Free Software Foundation, Inc., 59 Temple Place - Suite 330, 16 -** Boston, MA 02111-1307, USA. 9 +** but without any warranty; without even the implied warranty of 10 +** merchantability or fitness for a particular purpose. 17 11 ** 18 12 ** Author contact information: 19 13 ** drh@hwaci.com 20 14 ** http://www.hwaci.com/drh/ 21 15 ** 22 16 ******************************************************************************* 23 17 ** ................................................................................ 30 24 #include <unistd.h> 31 25 #include <stdio.h> 32 26 #include <stdlib.h> 33 27 #include <ctype.h> 34 28 #include <string.h> 35 29 #include <stdarg.h> 36 30 #include <assert.h> 31 +#ifdef __MINGW32__ 32 +# include <windows.h> 33 +#else 34 +# include <pwd.h> 35 +#endif 36 + 37 37 #include "sqlite3.h" 38 38 39 39 /* 40 40 ** Typedef for a 64-bit integer 41 41 */ 42 42 typedef sqlite_int64 i64; 43 43 typedef sqlite_uint64 u64;
Changes to src/configure.c.
1 1 /* 2 2 ** Copyright (c) 2008 D. Richard Hipp 3 3 ** 4 4 ** This program is free software; you can redistribute it and/or 5 -** modify it under the terms of the GNU General Public 6 -** License version 2 as published by the Free Software Foundation. 7 -** 5 +** modify it under the terms of the Simplified BSD License (also 6 +** known as the "2-Clause License" or "FreeBSD License".) 7 + 8 8 ** This program is distributed in the hope that it will be useful, 9 -** but WITHOUT ANY WARRANTY; without even the implied warranty of 10 -** MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU 11 -** General Public License for more details. 12 -** 13 -** You should have received a copy of the GNU General Public 14 -** License along with this library; if not, write to the 15 -** Free Software Foundation, Inc., 59 Temple Place - Suite 330, 16 -** Boston, MA 02111-1307, USA. 9 +** but without any warranty; without even the implied warranty of 10 +** merchantability or fitness for a particular purpose. 17 11 ** 18 12 ** Author contact information: 19 13 ** drh@hwaci.com 20 14 ** http://www.hwaci.com/drh/ 21 15 ** 22 16 ******************************************************************************* 23 17 **
Deleted src/construct.c.
1 -/* 2 -** Copyright (c) 2007 Andreas Kupries 3 -** 4 -** This program is free software; you can redistribute it and/or 5 -** modify it under the terms of the GNU General Public 6 -** License version 2 as published by the Free Software Foundation. 7 -** 8 -** This program is distributed in the hope that it will be useful, 9 -** but WITHOUT ANY WARRANTY; without even the implied warranty of 10 -** MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU 11 -** General Public License for more details. 12 -** 13 -** You should have received a copy of the GNU General Public 14 -** License along with this library; if not, write to the 15 -** Free Software Foundation, Inc., 59 Temple Place - Suite 330, 16 -** Boston, MA 02111-1307, USA. 17 -** 18 -** Author contact information: 19 -** akupries@shaw.ca 20 -** 21 -** 22 -******************************************************************************* 23 -** 24 -** This file contains code used to de- and reconstruct a repository 25 -** into and from an indicated directory. 26 -*/ 27 -#include "config.h" 28 -#include "construct.h" 29 -#include <assert.h> 30 -#include <sys/types.h> 31 -#include <dirent.h> 32 - 33 -/* This function recursively scans the directory hierarchy starting at 34 -** zOrigin and enters all found files into the repository. The uuid is 35 -** generated from the file contents, and not taken from the, possibly 36 -** modified, file name. While function is able to handle the directory 37 -** structure created by 'deconstruct' it can actually much more. 38 -*/ 39 - 40 -static int import_origin(const char* zOrigin){ 41 - DIR *d; 42 - int count = 0; 43 - const char *zFormat; 44 - const char *zDir = zOrigin; 45 - struct dirent *pEntry; 46 - 47 - if( zDir[0]==0 ){ 48 - zDir = "."; 49 - zFormat = "%s%s"; 50 - }else{ 51 - zFormat = "%s/%s"; 52 - } 53 - 54 - d = opendir(zDir); 55 - if( d ){ 56 - while( (pEntry=readdir(d))!=0 ){ 57 - char *zPath; 58 - if( pEntry->d_name[0]=='.' ) continue; 59 - zPath = mprintf(zFormat, zOrigin, pEntry->d_name); 60 - if( file_isdir(zPath)==1 ){ 61 - count += import_origin(zPath); 62 - }else if( file_isfile(zPath) ){ 63 - Blob zIn; 64 - blob_read_from_file (&zIn,zPath); 65 - content_put (&zIn, 0, 0); 66 - blob_reset (&zIn); 67 - count++; 68 - } 69 - free (zPath); 70 - } 71 - } 72 - closedir(d); 73 - return count; 74 -} 75 - 76 -/* 77 -** COMMAND: deconstruct 78 -** Usage %fossil deconstruct ?-R|--repository REPOSITORY? DESTINATION 79 -** 80 -** Populates the indicated DESTINATION directory with copies of all 81 -** artifcats contained within the repository. Artifacts are named AA/bbbbb 82 -** where AA is the first 2 characters of the artifact ID and bbbbb is the 83 -** remaining 38 characters. 84 -*/ 85 - 86 -void deconstruct_cmd(void){ 87 - const char* zDestination; 88 - Blob zOut; 89 - Stmt q; 90 - if( (g.argc != 3) && (g.argc != 5) ){ 91 - usage ("?-R|--repository REPOSITORY? DESTINATION"); 92 - } 93 - db_find_and_open_repository(1); 94 - zDestination = g.argv[g.argc-1]; 95 - if( !file_isdir (zDestination) ){ 96 - fossil_panic("not a directory: %s", zDestination); 97 - } 98 - /* Iterate over all blobs in the repository, retrieve their 99 - * contents, and write them to a file with a name based on their 100 - * uuid. Note: Non-writable destination causes bail-out in the first 101 - * call of blob_write_to_file. 102 - */ 103 - db_prepare(&q, "SELECT rid,uuid FROM blob"); 104 - while( db_step(&q)==SQLITE_ROW ){ 105 - int rid = db_column_int (&q, 0); 106 - const char *zUuid = db_column_text(&q, 1); 107 - char *zFile = mprintf ("%s/%.2s/%s", zDestination, zUuid, zUuid + 2); 108 - content_get (rid,&zOut); 109 - blob_write_to_file (&zOut,zFile); 110 - blob_reset (&zOut); 111 - free(zFile); 112 - } 113 - db_finalize(&q); 114 -} 115 - 116 -/* 117 -** COMMAND: reconstruct 118 -** Usage %fossil reconstruct REPOSITORY ORIGIN 119 -** 120 -** Creates the REPOSITORY and populates it with the artifacts in the 121 -** indicated ORIGIN directory. 122 -*/ 123 - 124 -void reconstruct_cmd(void){ 125 - const char* zOrigin; 126 - const char* zRepository; 127 - int fileCnt; 128 - int errCnt; 129 - 130 - if( g.argc != 4 ){ 131 - usage ("REPOSITORY ORIGIN"); 132 - } 133 - zRepository = g.argv[2]; 134 - zOrigin = g.argv[3]; 135 - if( !file_isdir (zOrigin) ){ 136 - fossil_panic("not a directory: %s", zOrigin); 137 - } 138 - 139 - /* Create the foundation */ 140 - db_create_repository(zRepository); 141 - db_open_repository(zRepository); 142 - db_open_config(0); 143 - db_begin_transaction(); 144 - 145 - db_initial_setup(0, 0, 1); 146 - 147 - printf("project-id: %s\n", db_get("project-code", 0)); 148 - printf("server-id: %s\n", db_get("server-code", 0)); 149 - printf("admin-user: %s (no password set yet!)\n", g.zLogin); 150 - printf("baseline: %s\n", db_text(0, "SELECT uuid FROM blob")); 151 - 152 - /* Scan origin and insert all files found inside */ 153 - fileCnt = import_origin (zOrigin); 154 - 155 - printf("imported: %d %s\n", fileCnt, fileCnt == 1 ? 156 - "file" : "files"); 157 - 158 - /* Finalize the repository, rebuild the derived tables */ 159 - errCnt = rebuild_db(0, 0); 160 - 161 - if( errCnt ){ 162 - printf("%d %s. Rolling back changes.\n", errCnt, errCnt == 1 ? 163 - "error" : "errors"); 164 - db_end_transaction(1); 165 - }else{ 166 - db_end_transaction(0); 167 - } 168 -}
Changes to src/content.c.
1 1 /* 2 2 ** Copyright (c) 2006 D. Richard Hipp 3 3 ** 4 4 ** This program is free software; you can redistribute it and/or 5 -** modify it under the terms of the GNU General Public 6 -** License version 2 as published by the Free Software Foundation. 7 -** 5 +** modify it under the terms of the Simplified BSD License (also 6 +** known as the "2-Clause License" or "FreeBSD License".) 7 + 8 8 ** This program is distributed in the hope that it will be useful, 9 -** but WITHOUT ANY WARRANTY; without even the implied warranty of 10 -** MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU 11 -** General Public License for more details. 12 -** 13 -** You should have received a copy of the GNU General Public 14 -** License along with this library; if not, write to the 15 -** Free Software Foundation, Inc., 59 Temple Place - Suite 330, 16 -** Boston, MA 02111-1307, USA. 9 +** but without any warranty; without even the implied warranty of 10 +** merchantability or fitness for a particular purpose. 17 11 ** 18 12 ** Author contact information: 19 13 ** drh@hwaci.com 20 14 ** http://www.hwaci.com/drh/ 21 15 ** 22 16 ******************************************************************************* 23 17 **
Changes to src/db.c.
1 1 /* 2 2 ** Copyright (c) 2006 D. Richard Hipp 3 3 ** 4 4 ** This program is free software; you can redistribute it and/or 5 -** modify it under the terms of the GNU General Public 6 -** License version 2 as published by the Free Software Foundation. 7 -** 5 +** modify it under the terms of the Simplified BSD License (also 6 +** known as the "2-Clause License" or "FreeBSD License".) 7 + 8 8 ** This program is distributed in the hope that it will be useful, 9 -** but WITHOUT ANY WARRANTY; without even the implied warranty of 10 -** MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU 11 -** General Public License for more details. 12 -** 13 -** You should have received a copy of the GNU General Public 14 -** License along with this library; if not, write to the 15 -** Free Software Foundation, Inc., 59 Temple Place - Suite 330, 16 -** Boston, MA 02111-1307, USA. 9 +** but without any warranty; without even the implied warranty of 10 +** merchantability or fitness for a particular purpose. 17 11 ** 18 12 ** Author contact information: 19 13 ** drh@hwaci.com 20 14 ** http://www.hwaci.com/drh/ 21 15 ** 22 16 ******************************************************************************* 23 17 ** ................................................................................ 31 25 ** (2) The "repository" database 32 26 ** 33 27 ** (3) A local checkout database named "_FOSSIL_" or ".fos" 34 28 ** and located at the root of the local copy of the source tree. 35 29 ** 36 30 */ 37 31 #include "config.h" 38 -#ifndef __MINGW32__ 39 -# include <pwd.h> 40 -#endif 41 -#ifdef __MINGW32__ 42 -# include <windows.h> 43 -#endif 44 32 #include <sqlite3.h> 45 33 #include <sys/types.h> 46 34 #include <sys/stat.h> 47 35 #include <unistd.h> 48 36 #include "db.h" 49 37 50 38 #if INTERFACE ................................................................................ 1469 1457 ** The "setting" command with no arguments lists all properties and their 1470 1458 ** values. With just a property name it shows the value of that property. 1471 1459 ** With a value argument it changes the property for the current repository. 1472 1460 ** 1473 1461 ** The "unset" command clears a property setting. 1474 1462 ** 1475 1463 ** 1476 -** auto-captcha If enabled, the Login page will provide a button 1477 -** which uses JavaScript to fill out the captcha for 1478 -** the "anonymous" user. (Most bots cannot use JavaScript.) 1479 -** 1480 1464 ** autosync If enabled, automatically pull prior to commit 1481 1465 ** or update and automatically push after commit or 1482 1466 ** tag or branch creation. If the the value is "pullonly" 1483 1467 ** then only pull operations occur automatically. 1484 1468 ** 1485 1469 ** binary-glob The VALUE is a comma-separated list of GLOB patterns 1486 1470 ** that should be treated as binary files for merging ................................................................................ 1527 1511 ** web-browser A shell command used to launch your preferred 1528 1512 ** web browser when given a URL as an argument. 1529 1513 ** Defaults to "start" on windows, "open" on Mac, 1530 1514 ** and "firefox" on Unix. 1531 1515 */ 1532 1516 void setting_cmd(void){ 1533 1517 static const char *azName[] = { 1534 - "auto-captcha", 1535 1518 "autosync", 1536 1519 "binary-glob", 1537 1520 "clearsign", 1538 1521 "diff-command", 1539 1522 "dont-push", 1540 1523 "editor", 1541 1524 "gdiff-command",
Changes to src/delta.c.
1 1 /* 2 2 ** Copyright (c) 2006 D. Richard Hipp 3 3 ** 4 4 ** This program is free software; you can redistribute it and/or 5 -** modify it under the terms of the GNU General Public 6 -** License version 2 as published by the Free Software Foundation. 7 -** 5 +** modify it under the terms of the Simplified BSD License (also 6 +** known as the "2-Clause License" or "FreeBSD License".) 7 + 8 8 ** This program is distributed in the hope that it will be useful, 9 -** but WITHOUT ANY WARRANTY; without even the implied warranty of 10 -** MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU 11 -** General Public License for more details. 12 -** 13 -** You should have received a copy of the GNU General Public 14 -** License along with this library; if not, write to the 15 -** Free Software Foundation, Inc., 59 Temple Place - Suite 330, 16 -** Boston, MA 02111-1307, USA. 9 +** but without any warranty; without even the implied warranty of 10 +** merchantability or fitness for a particular purpose. 17 11 ** 18 12 ** Author contact information: 19 13 ** drh@hwaci.com 20 14 ** http://www.hwaci.com/drh/ 21 15 ** 22 16 ******************************************************************************* 23 17 **
Changes to src/deltacmd.c.
1 1 /* 2 2 ** Copyright (c) 2006 D. Richard Hipp 3 3 ** 4 4 ** This program is free software; you can redistribute it and/or 5 -** modify it under the terms of the GNU General Public 6 -** License version 2 as published by the Free Software Foundation. 7 -** 5 +** modify it under the terms of the Simplified BSD License (also 6 +** known as the "2-Clause License" or "FreeBSD License".) 7 + 8 8 ** This program is distributed in the hope that it will be useful, 9 -** but WITHOUT ANY WARRANTY; without even the implied warranty of 10 -** MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU 11 -** General Public License for more details. 12 -** 13 -** You should have received a copy of the GNU General Public 14 -** License along with this library; if not, write to the 15 -** Free Software Foundation, Inc., 59 Temple Place - Suite 330, 16 -** Boston, MA 02111-1307, USA. 9 +** but without any warranty; without even the implied warranty of 10 +** merchantability or fitness for a particular purpose. 17 11 ** 18 12 ** Author contact information: 19 13 ** drh@hwaci.com 20 14 ** http://www.hwaci.com/drh/ 21 15 ** 22 16 ******************************************************************************* 23 17 **
Changes to src/descendants.c.
1 1 /* 2 2 ** Copyright (c) 2007 D. Richard Hipp 3 3 ** 4 4 ** This program is free software; you can redistribute it and/or 5 -** modify it under the terms of the GNU General Public 6 -** License version 2 as published by the Free Software Foundation. 7 -** 5 +** modify it under the terms of the Simplified BSD License (also 6 +** known as the "2-Clause License" or "FreeBSD License".) 7 + 8 8 ** This program is distributed in the hope that it will be useful, 9 -** but WITHOUT ANY WARRANTY; without even the implied warranty of 10 -** MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU 11 -** General Public License for more details. 12 -** 13 -** You should have received a copy of the GNU General Public 14 -** License along with this library; if not, write to the 15 -** Free Software Foundation, Inc., 59 Temple Place - Suite 330, 16 -** Boston, MA 02111-1307, USA. 9 +** but without any warranty; without even the implied warranty of 10 +** merchantability or fitness for a particular purpose. 17 11 ** 18 12 ** Author contact information: 19 13 ** drh@hwaci.com 20 14 ** http://www.hwaci.com/drh/ 21 15 ** 22 16 ******************************************************************************* 23 17 **
Changes to src/diff.c.
1 1 /* 2 2 ** Copyright (c) 2007 D. Richard Hipp 3 3 ** 4 4 ** This program is free software; you can redistribute it and/or 5 -** modify it under the terms of the GNU General Public 6 -** License version 2 as published by the Free Software Foundation. 7 -** 5 +** modify it under the terms of the Simplified BSD License (also 6 +** known as the "2-Clause License" or "FreeBSD License".) 7 + 8 8 ** This program is distributed in the hope that it will be useful, 9 -** but WITHOUT ANY WARRANTY; without even the implied warranty of 10 -** MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU 11 -** General Public License for more details. 12 -** 13 -** You should have received a copy of the GNU General Public 14 -** License along with this library; if not, write to the 15 -** Free Software Foundation, Inc., 59 Temple Place - Suite 330, 16 -** Boston, MA 02111-1307, USA. 9 +** but without any warranty; without even the implied warranty of 10 +** merchantability or fitness for a particular purpose. 17 11 ** 18 12 ** Author contact information: 19 13 ** drh@hwaci.com 20 14 ** http://www.hwaci.com/drh/ 21 15 ** 22 16 ******************************************************************************* 23 17 **
Changes to src/diffcmd.c.
1 1 /* 2 2 ** Copyright (c) 2007 D. Richard Hipp 3 3 ** 4 4 ** This program is free software; you can redistribute it and/or 5 -** modify it under the terms of the GNU General Public 6 -** License version 2 as published by the Free Software Foundation. 7 -** 5 +** modify it under the terms of the Simplified BSD License (also 6 +** known as the "2-Clause License" or "FreeBSD License".) 7 + 8 8 ** This program is distributed in the hope that it will be useful, 9 -** but WITHOUT ANY WARRANTY; without even the implied warranty of 10 -** MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU 11 -** General Public License for more details. 12 -** 13 -** You should have received a copy of the GNU General Public 14 -** License along with this library; if not, write to the 15 -** Free Software Foundation, Inc., 59 Temple Place - Suite 330, 16 -** Boston, MA 02111-1307, USA. 9 +** but without any warranty; without even the implied warranty of 10 +** merchantability or fitness for a particular purpose. 17 11 ** 18 12 ** Author contact information: 19 13 ** drh@hwaci.com 20 14 ** http://www.hwaci.com/drh/ 21 15 ** 22 16 ******************************************************************************* 23 17 **
Changes to src/doc.c.
1 1 /* 2 2 ** Copyright (c) 2007 D. Richard Hipp 3 3 ** 4 4 ** This program is free software; you can redistribute it and/or 5 -** modify it under the terms of the GNU General Public 6 -** License version 2 as published by the Free Software Foundation. 7 -** 5 +** modify it under the terms of the Simplified BSD License (also 6 +** known as the "2-Clause License" or "FreeBSD License".) 7 + 8 8 ** This program is distributed in the hope that it will be useful, 9 -** but WITHOUT ANY WARRANTY; without even the implied warranty of 10 -** MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU 11 -** General Public License for more details. 12 -** 13 -** You should have received a copy of the GNU General Public 14 -** License along with this library; if not, write to the 15 -** Free Software Foundation, Inc., 59 Temple Place - Suite 330, 16 -** Boston, MA 02111-1307, USA. 9 +** but without any warranty; without even the implied warranty of 10 +** merchantability or fitness for a particular purpose. 17 11 ** 18 12 ** Author contact information: 19 13 ** drh@hwaci.com 20 14 ** http://www.hwaci.com/drh/ 21 15 ** 22 16 ******************************************************************************* 23 17 **
Changes to src/encode.c.
1 1 /* 2 2 ** Copyright (c) 2006 D. Richard Hipp 3 3 ** 4 4 ** This program is free software; you can redistribute it and/or 5 -** modify it under the terms of the GNU General Public 6 -** License version 2 as published by the Free Software Foundation. 7 -** 5 +** modify it under the terms of the Simplified BSD License (also 6 +** known as the "2-Clause License" or "FreeBSD License".) 7 + 8 8 ** This program is distributed in the hope that it will be useful, 9 -** but WITHOUT ANY WARRANTY; without even the implied warranty of 10 -** MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU 11 -** General Public License for more details. 12 -** 13 -** You should have received a copy of the GNU General Public 14 -** License along with this library; if not, write to the 15 -** Free Software Foundation, Inc., 59 Temple Place - Suite 330, 16 -** Boston, MA 02111-1307, USA. 9 +** but without any warranty; without even the implied warranty of 10 +** merchantability or fitness for a particular purpose. 17 11 ** 18 12 ** Author contact information: 19 13 ** drh@hwaci.com 20 14 ** http://www.hwaci.com/drh/ 21 15 ** 22 16 ******************************************************************************* 23 17 **
Changes to src/file.c.
1 1 /* 2 2 ** Copyright (c) 2006 D. Richard Hipp 3 3 ** 4 4 ** This program is free software; you can redistribute it and/or 5 -** modify it under the terms of the GNU General Public 6 -** License version 2 as published by the Free Software Foundation. 7 -** 5 +** modify it under the terms of the Simplified BSD License (also 6 +** known as the "2-Clause License" or "FreeBSD License".) 7 + 8 8 ** This program is distributed in the hope that it will be useful, 9 -** but WITHOUT ANY WARRANTY; without even the implied warranty of 10 -** MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU 11 -** General Public License for more details. 12 -** 13 -** You should have received a copy of the GNU General Public 14 -** License along with this library; if not, write to the 15 -** Free Software Foundation, Inc., 59 Temple Place - Suite 330, 16 -** Boston, MA 02111-1307, USA. 9 +** but without any warranty; without even the implied warranty of 10 +** merchantability or fitness for a particular purpose. 17 11 ** 18 12 ** Author contact information: 19 13 ** drh@hwaci.com 20 14 ** http://www.hwaci.com/drh/ 21 15 ** 22 16 ******************************************************************************* 23 17 **
Changes to src/finfo.c.
1 1 /* 2 2 ** Copyright (c) 2009 D. Richard Hipp 3 3 ** 4 4 ** This program is free software; you can redistribute it and/or 5 -** modify it under the terms of the GNU General Public 6 -** License version 2 as published by the Free Software Foundation. 7 -** 5 +** modify it under the terms of the Simplified BSD License (also 6 +** known as the "2-Clause License" or "FreeBSD License".) 7 + 8 8 ** This program is distributed in the hope that it will be useful, 9 -** but WITHOUT ANY WARRANTY; without even the implied warranty of 10 -** MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU 11 -** General Public License for more details. 12 -** 13 -** You should have received a copy of the GNU General Public 14 -** License along with this library; if not, write to the 15 -** Free Software Foundation, Inc., 59 Temple Place - Suite 330, 16 -** Boston, MA 02111-1307, USA. 9 +** but without any warranty; without even the implied warranty of 10 +** merchantability or fitness for a particular purpose. 17 11 ** 18 12 ** Author contact information: 19 13 ** drh@hwaci.com 20 14 ** http://www.hwaci.com/drh/ 21 15 ** 22 16 ******************************************************************************* 23 17 **
Changes to src/graph.c.
1 1 /* 2 2 ** Copyright (c) 2010 D. Richard Hipp 3 3 ** 4 4 ** This program is free software; you can redistribute it and/or 5 -** modify it under the terms of the GNU General Public 6 -** License version 2 as published by the Free Software Foundation. 7 -** 5 +** modify it under the terms of the Simplified BSD License (also 6 +** known as the "2-Clause License" or "FreeBSD License".) 7 + 8 8 ** This program is distributed in the hope that it will be useful, 9 -** but WITHOUT ANY WARRANTY; without even the implied warranty of 10 -** MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU 11 -** General Public License for more details. 12 -** 13 -** You should have received a copy of the GNU General Public 14 -** License along with this library; if not, write to the 15 -** Free Software Foundation, Inc., 59 Temple Place - Suite 330, 16 -** Boston, MA 02111-1307, USA. 9 +** but without any warranty; without even the implied warranty of 10 +** merchantability or fitness for a particular purpose. 17 11 ** 18 12 ** Author contact information: 19 13 ** drh@hwaci.com 20 14 ** http://www.hwaci.com/drh/ 21 15 ** 22 16 ******************************************************************************* 23 17 **
Changes to src/http.c.
1 1 /* 2 2 ** Copyright (c) 2007 D. Richard Hipp 3 3 ** 4 4 ** This program is free software; you can redistribute it and/or 5 -** modify it under the terms of the GNU General Public 6 -** License version 2 as published by the Free Software Foundation. 7 -** 5 +** modify it under the terms of the Simplified BSD License (also 6 +** known as the "2-Clause License" or "FreeBSD License".) 7 + 8 8 ** This program is distributed in the hope that it will be useful, 9 -** but WITHOUT ANY WARRANTY; without even the implied warranty of 10 -** MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU 11 -** General Public License for more details. 12 -** 13 -** You should have received a copy of the GNU General Public 14 -** License along with this library; if not, write to the 15 -** Free Software Foundation, Inc., 59 Temple Place - Suite 330, 16 -** Boston, MA 02111-1307, USA. 9 +** but without any warranty; without even the implied warranty of 10 +** merchantability or fitness for a particular purpose. 17 11 ** 18 12 ** Author contact information: 19 13 ** drh@hwaci.com 20 14 ** http://www.hwaci.com/drh/ 21 15 ** 22 16 ******************************************************************************* 23 17 **
Changes to src/http_socket.c.
1 1 /* 2 2 ** Copyright (c) 2009 D. Richard Hipp 3 3 ** 4 4 ** This program is free software; you can redistribute it and/or 5 -** modify it under the terms of the GNU General Public 6 -** License version 2 as published by the Free Software Foundation. 7 -** 5 +** modify it under the terms of the Simplified BSD License (also 6 +** known as the "2-Clause License" or "FreeBSD License".) 7 + 8 8 ** This program is distributed in the hope that it will be useful, 9 -** but WITHOUT ANY WARRANTY; without even the implied warranty of 10 -** MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU 11 -** General Public License for more details. 12 -** 13 -** You should have received a copy of the GNU General Public 14 -** License along with this library; if not, write to the 15 -** Free Software Foundation, Inc., 59 Temple Place - Suite 330, 16 -** Boston, MA 02111-1307, USA. 9 +** but without any warranty; without even the implied warranty of 10 +** merchantability or fitness for a particular purpose. 17 11 ** 18 12 ** Author contact information: 19 13 ** drh@hwaci.com 20 14 ** http://www.hwaci.com/drh/ 21 15 ** 22 16 ******************************************************************************* 23 17 **
Deleted src/http_ssl.c.
1 -/* 2 -** Copyright (c) 2009 D. Richard Hipp 3 -** 4 -** This program is free software; you can redistribute it and/or 5 -** modify it under the terms of the GNU General Public 6 -** License version 2 as published by the Free Software Foundation. 7 -** 8 -** This program is distributed in the hope that it will be useful, 9 -** but WITHOUT ANY WARRANTY; without even the implied warranty of 10 -** MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU 11 -** General Public License for more details. 12 -** 13 -** You should have received a copy of the GNU General Public 14 -** License along with this library; if not, write to the 15 -** Free Software Foundation, Inc., 59 Temple Place - Suite 330, 16 -** Boston, MA 02111-1307, USA. 17 -** 18 -** Author contact information: 19 -** drh@hwaci.com 20 -** http://www.hwaci.com/drh/ 21 -** 22 -******************************************************************************* 23 -** 24 -** This file manages low-level SSL communications. 25 -** 26 -** This file implements a singleton. A single SSL connection may be active 27 -** at a time. State information is stored in static variables. The identity 28 -** of the server is held in global variables that are set by url_parse(). 29 -** 30 -** SSL support is abstracted out into this module because Fossil can 31 -** be compiled without SSL support (which requires OpenSSL library) 32 -*/ 33 - 34 -#include "config.h" 35 - 36 -#ifdef FOSSIL_ENABLE_SSL 37 - 38 -#include <openssl/bio.h> 39 -#include <openssl/ssl.h> 40 -#include <openssl/err.h> 41 - 42 -#include "http_ssl.h" 43 -#include <assert.h> 44 -#include <sys/types.h> 45 - 46 -/* 47 -** There can only be a single OpenSSL IO connection open at a time. 48 -** State information about that IO is stored in the following 49 -** local variables: 50 -*/ 51 -static int sslIsInit = 0; /* True after global initialization */ 52 -static BIO *iBio; /* OpenSSL I/O abstraction */ 53 -static char *sslErrMsg = 0; /* Text of most recent OpenSSL error */ 54 -static SSL_CTX *sslCtx; /* SSL context */ 55 -static SSL *ssl; 56 - 57 - 58 -/* 59 -** Clear the SSL error message 60 -*/ 61 -static void ssl_clear_errmsg(void){ 62 - free(sslErrMsg); 63 - sslErrMsg = 0; 64 -} 65 - 66 -/* 67 -** Set the SSL error message. 68 -*/ 69 -void ssl_set_errmsg(char *zFormat, ...){ 70 - va_list ap; 71 - ssl_clear_errmsg(); 72 - va_start(ap, zFormat); 73 - sslErrMsg = vmprintf(zFormat, ap); 74 - va_end(ap); 75 -} 76 - 77 -/* 78 -** Return the current SSL error message 79 -*/ 80 -const char *ssl_errmsg(void){ 81 - return sslErrMsg; 82 -} 83 - 84 -/* 85 -** Call this routine once before any other use of the SSL interface. 86 -** This routine does initial configuration of the SSL module. 87 -*/ 88 -void ssl_global_init(void){ 89 - if( sslIsInit==0 ){ 90 - SSL_library_init(); 91 - SSL_load_error_strings(); 92 - ERR_load_BIO_strings(); 93 - OpenSSL_add_all_algorithms(); 94 - sslCtx = SSL_CTX_new(SSLv23_client_method()); 95 - sslIsInit = 1; 96 - } 97 -} 98 - 99 -/* 100 -** Call this routine to shutdown the SSL module prior to program exit. 101 -*/ 102 -void ssl_global_shutdown(void){ 103 - if( sslIsInit ){ 104 - SSL_CTX_free(sslCtx); 105 - ssl_clear_errmsg(); 106 - sslIsInit = 0; 107 - } 108 -} 109 - 110 -/* 111 -** Close the currently open SSL connection. If no connection is open, 112 -** this routine is a no-op. 113 -*/ 114 -void ssl_close(void){ 115 - if( iBio!=NULL ){ 116 - (void)BIO_reset(iBio); 117 - BIO_free_all(iBio); 118 - } 119 -} 120 - 121 -/* 122 -** Open an SSL connection. The identify of the server is determined 123 -** by global varibles that are set using url_parse(): 124 -** 125 -** g.urlName Name of the server. Ex: www.fossil-scm.org 126 -** g.urlPort TCP/IP port to use. Ex: 80 127 -** 128 -** Return the number of errors. 129 -*/ 130 -int ssl_open(void){ 131 - X509 *cert; 132 - int hasSavedCertificate = 0; 133 - 134 - ssl_global_init(); 135 - 136 - /* Get certificate for current server from global config and 137 - * (if we have it in config) add it to certificate store. 138 - */ 139 - cert = ssl_get_certificate(); 140 - if ( cert!=NULL ){ 141 - X509_STORE_add_cert(SSL_CTX_get_cert_store(sslCtx), cert); 142 - X509_free(cert); 143 - hasSavedCertificate = 1; 144 - } 145 - 146 - iBio = BIO_new_ssl_connect(sslCtx); 147 - BIO_get_ssl(iBio, &ssl); 148 - SSL_set_mode(ssl, SSL_MODE_AUTO_RETRY); 149 - if( iBio==NULL ) { 150 - ssl_set_errmsg("SSL: cannot open SSL (%s)", 151 - ERR_reason_error_string(ERR_get_error())); 152 - return 1; 153 - } 154 - 155 - char *connStr = mprintf("%s:%d", g.urlName, g.urlPort); 156 - BIO_set_conn_hostname(iBio, connStr); 157 - free(connStr); 158 - 159 - if( BIO_do_connect(iBio)<=0 ){ 160 - ssl_set_errmsg("SSL: cannot connect to host %s:%d (%s)", 161 - g.urlName, g.urlPort, ERR_reason_error_string(ERR_get_error())); 162 - ssl_close(); 163 - return 1; 164 - } 165 - 166 - if( BIO_do_handshake(iBio)<=0 ) { 167 - ssl_set_errmsg("Error establishing SSL connection %s:%d (%s)", 168 - g.urlName, g.urlPort, ERR_reason_error_string(ERR_get_error())); 169 - ssl_close(); 170 - return 1; 171 - } 172 - /* Check if certificate is valid */ 173 - cert = SSL_get_peer_certificate(ssl); 174 - 175 - if ( cert==NULL ){ 176 - ssl_set_errmsg("No SSL certificate was presented by the peer"); 177 - ssl_close(); 178 - return 1; 179 - } 180 - 181 - if( SSL_get_verify_result(ssl) != X509_V_OK ){ 182 - char *desc, *prompt; 183 - BIO *mem; 184 - 185 - mem = BIO_new(BIO_s_mem()); 186 - X509_NAME_print_ex(mem, X509_get_subject_name(cert), 2, XN_FLAG_MULTILINE); 187 - BIO_puts(mem, "\n\nIssued By:\n\n"); 188 - X509_NAME_print_ex(mem, X509_get_issuer_name(cert), 2, XN_FLAG_MULTILINE); 189 - BIO_write(mem, "", 1); // null-terminate mem buffer 190 - BIO_get_mem_data(mem, &desc); 191 - 192 - char *warning = ""; 193 - if( hasSavedCertificate ){ 194 - warning = "WARNING: Certificate doesn't match the " 195 - "saved certificate for this host!"; 196 - } 197 - prompt = mprintf("\nUnknown SSL certificate:\n\n%s\n\n%s\n" 198 - "Accept certificate [a=always/y/N]? ", desc, warning); 199 - BIO_free(mem); 200 - 201 - Blob ans; 202 - blob_zero(&ans); 203 - prompt_user(prompt, &ans); 204 - free(prompt); 205 - if( blob_str(&ans)[0]!='y' && blob_str(&ans)[0]!='a' ) { 206 - X509_free(cert); 207 - ssl_set_errmsg("SSL certificate declined"); 208 - ssl_close(); 209 - return 1; 210 - } 211 - if( blob_str(&ans)[0]=='a' ) { 212 - ssl_save_certificate(cert); 213 - } 214 - } 215 - X509_free(cert); 216 - return 0; 217 -} 218 - 219 -/* 220 -** Save certificate to global config. 221 -*/ 222 -void ssl_save_certificate(X509 *cert){ 223 - BIO *mem; 224 - char *zCert, *zHost; 225 - 226 - mem = BIO_new(BIO_s_mem()); 227 - PEM_write_bio_X509(mem, cert); 228 - BIO_write(mem, "", 1); // null-terminate mem buffer 229 - BIO_get_mem_data(mem, &zCert); 230 - zHost = mprintf("cert:%s", g.urlName); 231 - db_set(zHost, zCert, 1); 232 - free(zHost); 233 - BIO_free(mem); 234 -} 235 - 236 -/* 237 -** Get certificate for g.urlName from global config. 238 -** Return NULL if no certificate found. 239 -*/ 240 -X509 *ssl_get_certificate(void){ 241 - char *zHost, *zCert; 242 - BIO *mem; 243 - X509 *cert; 244 - 245 - zHost = mprintf("cert:%s", g.urlName); 246 - zCert = db_get(zHost, NULL); 247 - free(zHost); 248 - if ( zCert==NULL ) 249 - return NULL; 250 - mem = BIO_new(BIO_s_mem()); 251 - BIO_puts(mem, zCert); 252 - cert = PEM_read_bio_X509(mem, NULL, 0, NULL); 253 - free(zCert); 254 - BIO_free(mem); 255 - return cert; 256 -} 257 - 258 -/* 259 -** Send content out over the SSL connection. 260 -*/ 261 -size_t ssl_send(void *NotUsed, void *pContent, size_t N){ 262 - size_t sent; 263 - size_t total = 0; 264 - while( N>0 ){ 265 - sent = BIO_write(iBio, pContent, N); 266 - if( sent<=0 ) break; 267 - total += sent; 268 - N -= sent; 269 - pContent = (void*)&((char*)pContent)[sent]; 270 - } 271 - return total; 272 -} 273 - 274 -/* 275 -** Receive content back from the SSL connection. 276 -*/ 277 -size_t ssl_receive(void *NotUsed, void *pContent, size_t N){ 278 - size_t got; 279 - size_t total = 0; 280 - while( N>0 ){ 281 - got = BIO_read(iBio, pContent, N); 282 - if( got<=0 ) break; 283 - total += got; 284 - N -= got; 285 - pContent = (void*)&((char*)pContent)[got]; 286 - } 287 - return total; 288 -} 289 - 290 -#endif /* FOSSIL_ENABLE_SSL */
Changes to src/http_transport.c.
1 1 /* 2 2 ** Copyright (c) 2009 D. Richard Hipp 3 3 ** 4 4 ** This program is free software; you can redistribute it and/or 5 -** modify it under the terms of the GNU General Public 6 -** License version 2 as published by the Free Software Foundation. 7 -** 5 +** modify it under the terms of the Simplified BSD License (also 6 +** known as the "2-Clause License" or "FreeBSD License".) 7 + 8 8 ** This program is distributed in the hope that it will be useful, 9 -** but WITHOUT ANY WARRANTY; without even the implied warranty of 10 -** MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU 11 -** General Public License for more details. 12 -** 13 -** You should have received a copy of the GNU General Public 14 -** License along with this library; if not, write to the 15 -** Free Software Foundation, Inc., 59 Temple Place - Suite 330, 16 -** Boston, MA 02111-1307, USA. 9 +** but without any warranty; without even the implied warranty of 10 +** merchantability or fitness for a particular purpose. 17 11 ** 18 12 ** Author contact information: 19 13 ** drh@hwaci.com 20 14 ** http://www.hwaci.com/drh/ 21 15 ** 22 16 ******************************************************************************* 23 17 **
Changes to src/info.c.
1 1 /* 2 2 ** Copyright (c) 2007 D. Richard Hipp 3 3 ** 4 4 ** This program is free software; you can redistribute it and/or 5 -** modify it under the terms of the GNU General Public 6 -** License version 2 as published by the Free Software Foundation. 7 -** 5 +** modify it under the terms of the Simplified BSD License (also 6 +** known as the "2-Clause License" or "FreeBSD License".) 7 + 8 8 ** This program is distributed in the hope that it will be useful, 9 -** but WITHOUT ANY WARRANTY; without even the implied warranty of 10 -** MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU 11 -** General Public License for more details. 12 -** 13 -** You should have received a copy of the GNU General Public 14 -** License along with this library; if not, write to the 15 -** Free Software Foundation, Inc., 59 Temple Place - Suite 330, 16 -** Boston, MA 02111-1307, USA. 9 +** but without any warranty; without even the implied warranty of 10 +** merchantability or fitness for a particular purpose. 17 11 ** 18 12 ** Author contact information: 19 13 ** drh@hwaci.com 20 14 ** http://www.hwaci.com/drh/ 21 15 ** 22 16 ******************************************************************************* 23 17 **
Changes to src/login.c.
1 1 /* 2 2 ** Copyright (c) 2007 D. Richard Hipp 3 3 ** 4 4 ** This program is free software; you can redistribute it and/or 5 -** modify it under the terms of the GNU General Public 6 -** License as published by the Free Software Foundation; either 7 -** version 2 of the License, or (at your option) any later version. 8 -** 5 +** modify it under the terms of the Simplified BSD License (also 6 +** known as the "2-Clause License" or "FreeBSD License".) 7 + 9 8 ** This program is distributed in the hope that it will be useful, 10 -** but WITHOUT ANY WARRANTY; without even the implied warranty of 11 -** MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU 12 -** General Public License for more details. 13 -** 14 -** You should have received a copy of the GNU General Public 15 -** License along with this library; if not, write to the 16 -** Free Software Foundation, Inc., 59 Temple Place - Suite 330, 17 -** Boston, MA 02111-1307, USA. 9 +** but without any warranty; without even the implied warranty of 10 +** merchantability or fitness for a particular purpose. 18 11 ** 19 12 ** Author contact information: 20 13 ** drh@hwaci.com 21 14 ** http://www.hwaci.com/drh/ 22 15 ** 23 16 ******************************************************************************* 24 17 **
Changes to src/main.c.
1 1 /* 2 2 ** Copyright (c) 2006 D. Richard Hipp 3 3 ** 4 4 ** This program is free software; you can redistribute it and/or 5 -** modify it under the terms of the GNU General Public 6 -** License version 2 as published by the Free Software Foundation. 7 -** 5 +** modify it under the terms of the Simplified BSD License (also 6 +** known as the "2-Clause License" or "FreeBSD License".) 7 + 8 8 ** This program is distributed in the hope that it will be useful, 9 -** but WITHOUT ANY WARRANTY; without even the implied warranty of 10 -** MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU 11 -** General Public License for more details. 12 -** 13 -** You should have received a copy of the GNU General Public 14 -** License along with this library; if not, write to the 15 -** Free Software Foundation, Inc., 59 Temple Place - Suite 330, 16 -** Boston, MA 02111-1307, USA. 9 +** but without any warranty; without even the implied warranty of 10 +** merchantability or fitness for a particular purpose. 17 11 ** 18 12 ** Author contact information: 19 13 ** drh@hwaci.com 20 14 ** http://www.hwaci.com/drh/ 21 15 ** 22 16 ******************************************************************************* 23 17 **
Changes to src/main.mk.
24 24 $(SRCDIR)/cgi.c \ 25 25 $(SRCDIR)/checkin.c \ 26 26 $(SRCDIR)/checkout.c \ 27 27 $(SRCDIR)/clearsign.c \ 28 28 $(SRCDIR)/clone.c \ 29 29 $(SRCDIR)/comformat.c \ 30 30 $(SRCDIR)/configure.c \ 31 - $(SRCDIR)/construct.c \ 32 31 $(SRCDIR)/content.c \ 33 32 $(SRCDIR)/db.c \ 34 33 $(SRCDIR)/delta.c \ 35 34 $(SRCDIR)/deltacmd.c \ 36 35 $(SRCDIR)/descendants.c \ 37 36 $(SRCDIR)/diff.c \ 38 37 $(SRCDIR)/diffcmd.c \ ................................................................................ 39 38 $(SRCDIR)/doc.c \ 40 39 $(SRCDIR)/encode.c \ 41 40 $(SRCDIR)/file.c \ 42 41 $(SRCDIR)/finfo.c \ 43 42 $(SRCDIR)/graph.c \ 44 43 $(SRCDIR)/http.c \ 45 44 $(SRCDIR)/http_socket.c \ 46 - $(SRCDIR)/http_ssl.c \ 47 45 $(SRCDIR)/http_transport.c \ 48 46 $(SRCDIR)/info.c \ 49 47 $(SRCDIR)/login.c \ 50 48 $(SRCDIR)/main.c \ 51 49 $(SRCDIR)/manifest.c \ 52 50 $(SRCDIR)/md5.c \ 53 51 $(SRCDIR)/merge.c \ ................................................................................ 55 53 $(SRCDIR)/name.c \ 56 54 $(SRCDIR)/pivot.c \ 57 55 $(SRCDIR)/pqueue.c \ 58 56 $(SRCDIR)/printf.c \ 59 57 $(SRCDIR)/rebuild.c \ 60 58 $(SRCDIR)/report.c \ 61 59 $(SRCDIR)/rss.c \ 62 - $(SRCDIR)/rstats.c \ 63 60 $(SRCDIR)/schema.c \ 64 61 $(SRCDIR)/search.c \ 65 62 $(SRCDIR)/setup.c \ 66 63 $(SRCDIR)/sha1.c \ 67 64 $(SRCDIR)/shun.c \ 68 65 $(SRCDIR)/skins.c \ 69 66 $(SRCDIR)/stat.c \ ................................................................................ 98 95 cgi_.c \ 99 96 checkin_.c \ 100 97 checkout_.c \ 101 98 clearsign_.c \ 102 99 clone_.c \ 103 100 comformat_.c \ 104 101 configure_.c \ 105 - construct_.c \ 106 102 content_.c \ 107 103 db_.c \ 108 104 delta_.c \ 109 105 deltacmd_.c \ 110 106 descendants_.c \ 111 107 diff_.c \ 112 108 diffcmd_.c \ ................................................................................ 113 109 doc_.c \ 114 110 encode_.c \ 115 111 file_.c \ 116 112 finfo_.c \ 117 113 graph_.c \ 118 114 http_.c \ 119 115 http_socket_.c \ 120 - http_ssl_.c \ 121 116 http_transport_.c \ 122 117 info_.c \ 123 118 login_.c \ 124 119 main_.c \ 125 120 manifest_.c \ 126 121 md5_.c \ 127 122 merge_.c \ ................................................................................ 129 124 name_.c \ 130 125 pivot_.c \ 131 126 pqueue_.c \ 132 127 printf_.c \ 133 128 rebuild_.c \ 134 129 report_.c \ 135 130 rss_.c \ 136 - rstats_.c \ 137 131 schema_.c \ 138 132 search_.c \ 139 133 setup_.c \ 140 134 sha1_.c \ 141 135 shun_.c \ 142 136 skins_.c \ 143 137 stat_.c \ ................................................................................ 172 166 $(OBJDIR)/cgi.o \ 173 167 $(OBJDIR)/checkin.o \ 174 168 $(OBJDIR)/checkout.o \ 175 169 $(OBJDIR)/clearsign.o \ 176 170 $(OBJDIR)/clone.o \ 177 171 $(OBJDIR)/comformat.o \ 178 172 $(OBJDIR)/configure.o \ 179 - $(OBJDIR)/construct.o \ 180 173 $(OBJDIR)/content.o \ 181 174 $(OBJDIR)/db.o \ 182 175 $(OBJDIR)/delta.o \ 183 176 $(OBJDIR)/deltacmd.o \ 184 177 $(OBJDIR)/descendants.o \ 185 178 $(OBJDIR)/diff.o \ 186 179 $(OBJDIR)/diffcmd.o \ ................................................................................ 187 180 $(OBJDIR)/doc.o \ 188 181 $(OBJDIR)/encode.o \ 189 182 $(OBJDIR)/file.o \ 190 183 $(OBJDIR)/finfo.o \ 191 184 $(OBJDIR)/graph.o \ 192 185 $(OBJDIR)/http.o \ 193 186 $(OBJDIR)/http_socket.o \ 194 - $(OBJDIR)/http_ssl.o \ 195 187 $(OBJDIR)/http_transport.o \ 196 188 $(OBJDIR)/info.o \ 197 189 $(OBJDIR)/login.o \ 198 190 $(OBJDIR)/main.o \ 199 191 $(OBJDIR)/manifest.o \ 200 192 $(OBJDIR)/md5.o \ 201 193 $(OBJDIR)/merge.o \ ................................................................................ 203 195 $(OBJDIR)/name.o \ 204 196 $(OBJDIR)/pivot.o \ 205 197 $(OBJDIR)/pqueue.o \ 206 198 $(OBJDIR)/printf.o \ 207 199 $(OBJDIR)/rebuild.o \ 208 200 $(OBJDIR)/report.o \ 209 201 $(OBJDIR)/rss.o \ 210 - $(OBJDIR)/rstats.o \ 211 202 $(OBJDIR)/schema.o \ 212 203 $(OBJDIR)/search.o \ 213 204 $(OBJDIR)/setup.o \ 214 205 $(OBJDIR)/sha1.o \ 215 206 $(OBJDIR)/shun.o \ 216 207 $(OBJDIR)/skins.o \ 217 208 $(OBJDIR)/stat.o \ ................................................................................ 274 265 # 275 266 $(SRCDIR)/../manifest: 276 267 # noop 277 268 278 269 clean: 279 270 rm -f $(OBJDIR)/*.o *_.c $(APPNAME) VERSION.h 280 271 rm -f translate makeheaders mkindex page_index.h headers 281 - rm -f add.h allrepo.h attach.h bag.h blob.h branch.h browse.h captcha.h cgi.h checkin.h checkout.h clearsign.h clone.h comformat.h configure.h construct.h content.h db.h delta.h deltacmd.h descendants.h diff.h diffcmd.h doc.h encode.h file.h finfo.h graph.h http.h http_socket.h http_ssl.h http_transport.h info.h login.h main.h manifest.h md5.h merge.h merge3.h name.h pivot.h pqueue.h printf.h rebuild.h report.h rss.h rstats.h schema.h search.h setup.h sha1.h shun.h skins.h stat.h style.h sync.h tag.h th_main.h timeline.h tkt.h tktsetup.h undo.h update.h url.h user.h verify.h vfile.h wiki.h wikiformat.h winhttp.h xfer.h zip.h 272 + rm -f add.h allrepo.h attach.h bag.h blob.h branch.h browse.h captcha.h cgi.h checkin.h checkout.h clearsign.h clone.h comformat.h configure.h content.h db.h delta.h deltacmd.h descendants.h diff.h diffcmd.h doc.h encode.h file.h finfo.h graph.h http.h http_socket.h http_transport.h info.h login.h main.h manifest.h md5.h merge.h merge3.h name.h pivot.h pqueue.h printf.h rebuild.h report.h rss.h schema.h search.h setup.h sha1.h shun.h skins.h stat.h style.h sync.h tag.h th_main.h timeline.h tkt.h tktsetup.h undo.h update.h url.h user.h verify.h vfile.h wiki.h wikiformat.h winhttp.h xfer.h zip.h 282 273 283 274 page_index.h: $(TRANS_SRC) mkindex 284 275 ./mkindex $(TRANS_SRC) >$@ 285 276 headers: page_index.h makeheaders VERSION.h 286 - ./makeheaders add_.c:add.h allrepo_.c:allrepo.h attach_.c:attach.h bag_.c:bag.h blob_.c:blob.h branch_.c:branch.h browse_.c:browse.h captcha_.c:captcha.h cgi_.c:cgi.h checkin_.c:checkin.h checkout_.c:checkout.h clearsign_.c:clearsign.h clone_.c:clone.h comformat_.c:comformat.h configure_.c:configure.h construct_.c:construct.h content_.c:content.h db_.c:db.h delta_.c:delta.h deltacmd_.c:deltacmd.h descendants_.c:descendants.h diff_.c:diff.h diffcmd_.c:diffcmd.h doc_.c:doc.h encode_.c:encode.h file_.c:file.h finfo_.c:finfo.h graph_.c:graph.h http_.c:http.h http_socket_.c:http_socket.h http_ssl_.c:http_ssl.h http_transport_.c:http_transport.h info_.c:info.h login_.c:login.h main_.c:main.h manifest_.c:manifest.h md5_.c:md5.h merge_.c:merge.h merge3_.c:merge3.h name_.c:name.h pivot_.c:pivot.h pqueue_.c:pqueue.h printf_.c:printf.h rebuild_.c:rebuild.h report_.c:report.h rss_.c:rss.h rstats_.c:rstats.h schema_.c:schema.h search_.c:search.h setup_.c:setup.h sha1_.c:sha1.h shun_.c:shun.h skins_.c:skins.h stat_.c:stat.h style_.c:style.h sync_.c:sync.h tag_.c:tag.h th_main_.c:th_main.h timeline_.c:timeline.h tkt_.c:tkt.h tktsetup_.c:tktsetup.h undo_.c:undo.h update_.c:update.h url_.c:url.h user_.c:user.h verify_.c:verify.h vfile_.c:vfile.h wiki_.c:wiki.h wikiformat_.c:wikiformat.h winhttp_.c:winhttp.h xfer_.c:xfer.h zip_.c:zip.h $(SRCDIR)/sqlite3.h $(SRCDIR)/th.h VERSION.h 277 + ./makeheaders add_.c:add.h allrepo_.c:allrepo.h attach_.c:attach.h bag_.c:bag.h blob_.c:blob.h branch_.c:branch.h browse_.c:browse.h captcha_.c:captcha.h cgi_.c:cgi.h checkin_.c:checkin.h checkout_.c:checkout.h clearsign_.c:clearsign.h clone_.c:clone.h comformat_.c:comformat.h configure_.c:configure.h content_.c:content.h db_.c:db.h delta_.c:delta.h deltacmd_.c:deltacmd.h descendants_.c:descendants.h diff_.c:diff.h diffcmd_.c:diffcmd.h doc_.c:doc.h encode_.c:encode.h file_.c:file.h finfo_.c:finfo.h graph_.c:graph.h http_.c:http.h http_socket_.c:http_socket.h http_transport_.c:http_transport.h info_.c:info.h login_.c:login.h main_.c:main.h manifest_.c:manifest.h md5_.c:md5.h merge_.c:merge.h merge3_.c:merge3.h name_.c:name.h pivot_.c:pivot.h pqueue_.c:pqueue.h printf_.c:printf.h rebuild_.c:rebuild.h report_.c:report.h rss_.c:rss.h schema_.c:schema.h search_.c:search.h setup_.c:setup.h sha1_.c:sha1.h shun_.c:shun.h skins_.c:skins.h stat_.c:stat.h style_.c:style.h sync_.c:sync.h tag_.c:tag.h th_main_.c:th_main.h timeline_.c:timeline.h tkt_.c:tkt.h tktsetup_.c:tktsetup.h undo_.c:undo.h update_.c:update.h url_.c:url.h user_.c:user.h verify_.c:verify.h vfile_.c:vfile.h wiki_.c:wiki.h wikiformat_.c:wikiformat.h winhttp_.c:winhttp.h xfer_.c:xfer.h zip_.c:zip.h $(SRCDIR)/sqlite3.h $(SRCDIR)/th.h VERSION.h 287 278 touch headers 288 279 headers: Makefile 289 280 Makefile: 290 281 add_.c: $(SRCDIR)/add.c translate 291 282 ./translate $(SRCDIR)/add.c >add_.c 292 283 293 284 $(OBJDIR)/add.o: add_.c add.h $(SRCDIR)/config.h ................................................................................ 388 379 configure_.c: $(SRCDIR)/configure.c translate 389 380 ./translate $(SRCDIR)/configure.c >configure_.c 390 381 391 382 $(OBJDIR)/configure.o: configure_.c configure.h $(SRCDIR)/config.h 392 383 $(XTCC) -o $(OBJDIR)/configure.o -c configure_.c 393 384 394 385 configure.h: headers 395 -construct_.c: $(SRCDIR)/construct.c translate 396 - ./translate $(SRCDIR)/construct.c >construct_.c 397 - 398 -$(OBJDIR)/construct.o: construct_.c construct.h $(SRCDIR)/config.h 399 - $(XTCC) -o $(OBJDIR)/construct.o -c construct_.c 400 - 401 -construct.h: headers 402 386 content_.c: $(SRCDIR)/content.c translate 403 387 ./translate $(SRCDIR)/content.c >content_.c 404 388 405 389 $(OBJDIR)/content.o: content_.c content.h $(SRCDIR)/config.h 406 390 $(XTCC) -o $(OBJDIR)/content.o -c content_.c 407 391 408 392 content.h: headers ................................................................................ 493 477 http_socket_.c: $(SRCDIR)/http_socket.c translate 494 478 ./translate $(SRCDIR)/http_socket.c >http_socket_.c 495 479 496 480 $(OBJDIR)/http_socket.o: http_socket_.c http_socket.h $(SRCDIR)/config.h 497 481 $(XTCC) -o $(OBJDIR)/http_socket.o -c http_socket_.c 498 482 499 483 http_socket.h: headers 500 -http_ssl_.c: $(SRCDIR)/http_ssl.c translate 501 - ./translate $(SRCDIR)/http_ssl.c >http_ssl_.c 502 - 503 -$(OBJDIR)/http_ssl.o: http_ssl_.c http_ssl.h $(SRCDIR)/config.h 504 - $(XTCC) -o $(OBJDIR)/http_ssl.o -c http_ssl_.c 505 - 506 -http_ssl.h: headers 507 484 http_transport_.c: $(SRCDIR)/http_transport.c translate 508 485 ./translate $(SRCDIR)/http_transport.c >http_transport_.c 509 486 510 487 $(OBJDIR)/http_transport.o: http_transport_.c http_transport.h $(SRCDIR)/config.h 511 488 $(XTCC) -o $(OBJDIR)/http_transport.o -c http_transport_.c 512 489 513 490 http_transport.h: headers ................................................................................ 605 582 rss_.c: $(SRCDIR)/rss.c translate 606 583 ./translate $(SRCDIR)/rss.c >rss_.c 607 584 608 585 $(OBJDIR)/rss.o: rss_.c rss.h $(SRCDIR)/config.h 609 586 $(XTCC) -o $(OBJDIR)/rss.o -c rss_.c 610 587 611 588 rss.h: headers 612 -rstats_.c: $(SRCDIR)/rstats.c translate 613 - ./translate $(SRCDIR)/rstats.c >rstats_.c 614 - 615 -$(OBJDIR)/rstats.o: rstats_.c rstats.h $(SRCDIR)/config.h 616 - $(XTCC) -o $(OBJDIR)/rstats.o -c rstats_.c 617 - 618 -rstats.h: headers 619 589 schema_.c: $(SRCDIR)/schema.c translate 620 590 ./translate $(SRCDIR)/schema.c >schema_.c 621 591 622 592 $(OBJDIR)/schema.o: schema_.c schema.h $(SRCDIR)/config.h 623 593 $(XTCC) -o $(OBJDIR)/schema.o -c schema_.c 624 594 625 595 schema.h: headers
Changes to src/makeheaders.c.
1 1 static const char ident[] = "@(#) $Header: /cvstrac/cvstrac/makeheaders.c,v 1.4 2005/03/16 22:17:51 drh Exp $"; 2 2 /* 3 -** This program scans C and C++ source files and automatically generates 3 +** This program is free software; you can redistribute it and/or 4 +** modify it under the terms of the Simplified BSD License (also 5 +** known as the "2-Clause License" or "FreeBSD License".) 6 + 7 +** This program is distributed in the hope that it will be useful, 8 +** but without any warranty; without even the implied warranty of 9 +** merchantability or fitness for a particular purpose. 4 10 ** appropriate header files. 5 11 */ 6 12 #include <stdio.h> 7 13 #include <stdlib.h> 8 14 #include <ctype.h> 9 15 #include <memory.h> 10 16 #include <sys/stat.h>
Changes to src/makemake.tcl.
18 18 cgi 19 19 checkin 20 20 checkout 21 21 clearsign 22 22 clone 23 23 comformat 24 24 configure 25 - construct 26 25 content 27 26 db 28 27 delta 29 28 deltacmd 30 29 descendants 31 30 diff 32 31 diffcmd ................................................................................ 48 47 name 49 48 pivot 50 49 pqueue 51 50 printf 52 51 rebuild 53 52 report 54 53 rss 55 - rstats 56 54 schema 57 55 search 58 56 setup 59 57 sha1 60 58 shun 61 59 skins 62 60 stat ................................................................................ 74 72 verify 75 73 vfile 76 74 wiki 77 75 wikiformat 78 76 winhttp 79 77 xfer 80 78 zip 81 - http_ssl 82 79 } 83 80 84 81 # Name of the final application 85 82 # 86 83 set name fossil 87 84 88 85 puts {# DO NOT EDIT
Changes to src/manifest.c.
1 1 /* 2 2 ** Copyright (c) 2007 D. Richard Hipp 3 3 ** 4 4 ** This program is free software; you can redistribute it and/or 5 -** modify it under the terms of the GNU General Public 6 -** License version 2 as published by the Free Software Foundation. 7 -** 5 +** modify it under the terms of the Simplified BSD License (also 6 +** known as the "2-Clause License" or "FreeBSD License".) 7 + 8 8 ** This program is distributed in the hope that it will be useful, 9 -** but WITHOUT ANY WARRANTY; without even the implied warranty of 10 -** MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU 11 -** General Public License for more details. 12 -** 13 -** You should have received a copy of the GNU General Public 14 -** License along with this library; if not, write to the 15 -** Free Software Foundation, Inc., 59 Temple Place - Suite 330, 16 -** Boston, MA 02111-1307, USA. 9 +** but without any warranty; without even the implied warranty of 10 +** merchantability or fitness for a particular purpose. 17 11 ** 18 12 ** Author contact information: 19 13 ** drh@hwaci.com 20 14 ** http://www.hwaci.com/drh/ 21 15 ** 22 16 ******************************************************************************* 23 17 **
Changes to src/merge.c.
1 1 /* 2 2 ** Copyright (c) 2007 D. Richard Hipp 3 3 ** 4 4 ** This program is free software; you can redistribute it and/or 5 -** modify it under the terms of the GNU General Public 6 -** License version 2 as published by the Free Software Foundation. 7 -** 5 +** modify it under the terms of the Simplified BSD License (also 6 +** known as the "2-Clause License" or "FreeBSD License".) 7 + 8 8 ** This program is distributed in the hope that it will be useful, 9 -** but WITHOUT ANY WARRANTY; without even the implied warranty of 10 -** MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU 11 -** General Public License for more details. 12 -** 13 -** You should have received a copy of the GNU General Public 14 -** License along with this library; if not, write to the 15 -** Free Software Foundation, Inc., 59 Temple Place - Suite 330, 16 -** Boston, MA 02111-1307, USA. 9 +** but without any warranty; without even the implied warranty of 10 +** merchantability or fitness for a particular purpose. 17 11 ** 18 12 ** Author contact information: 19 13 ** drh@hwaci.com 20 14 ** http://www.hwaci.com/drh/ 21 15 ** 22 16 ******************************************************************************* 23 17 **
Changes to src/merge3.c.
1 1 /* 2 2 ** Copyright (c) 2007 D. Richard Hipp 3 3 ** 4 4 ** This program is free software; you can redistribute it and/or 5 -** modify it under the terms of the GNU General Public 6 -** License version 2 as published by the Free Software Foundation. 7 -** 5 +** modify it under the terms of the Simplified BSD License (also 6 +** known as the "2-Clause License" or "FreeBSD License".) 7 + 8 8 ** This program is distributed in the hope that it will be useful, 9 -** but WITHOUT ANY WARRANTY; without even the implied warranty of 10 -** MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU 11 -** General Public License for more details. 12 -** 13 -** You should have received a copy of the GNU General Public 14 -** License along with this library; if not, write to the 15 -** Free Software Foundation, Inc., 59 Temple Place - Suite 330, 16 -** Boston, MA 02111-1307, USA. 9 +** but without any warranty; without even the implied warranty of 10 +** merchantability or fitness for a particular purpose. 17 11 ** 18 12 ** Author contact information: 19 13 ** drh@hwaci.com 20 14 ** http://www.hwaci.com/drh/ 21 15 ** 22 16 ******************************************************************************* 23 17 **
Changes to src/mkindex.c.
1 1 /* 2 2 ** Copyright (c) 2002 D. Richard Hipp 3 3 ** 4 4 ** This program is free software; you can redistribute it and/or 5 -** modify it under the terms of the GNU General Public 6 -** License as published by the Free Software Foundation; either 7 -** version 2 of the License, or (at your option) any later version. 8 -** 5 +** modify it under the terms of the Simplified BSD License (also 6 +** known as the "2-Clause License" or "FreeBSD License".) 7 + 9 8 ** This program is distributed in the hope that it will be useful, 10 -** but WITHOUT ANY WARRANTY; without even the implied warranty of 11 -** MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU 12 -** General Public License for more details. 13 -** 14 -** You should have received a copy of the GNU General Public 15 -** License along with this library; if not, write to the 16 -** Free Software Foundation, Inc., 59 Temple Place - Suite 330, 17 -** Boston, MA 02111-1307, USA. 9 +** but without any warranty; without even the implied warranty of 10 +** merchantability or fitness for a particular purpose. 18 11 ** 19 12 ** Author contact information: 20 13 ** drh@hwaci.com 21 14 ** http://www.hwaci.com/drh/ 22 15 ** 23 16 ******************************************************************************* 24 17 **
Changes to src/name.c.
1 1 /* 2 2 ** Copyright (c) 2006 D. Richard Hipp 3 3 ** 4 4 ** This program is free software; you can redistribute it and/or 5 -** modify it under the terms of the GNU General Public 6 -** License version 2 as published by the Free Software Foundation. 7 -** 5 +** modify it under the terms of the Simplified BSD License (also 6 +** known as the "2-Clause License" or "FreeBSD License".) 7 + 8 8 ** This program is distributed in the hope that it will be useful, 9 -** but WITHOUT ANY WARRANTY; without even the implied warranty of 10 -** MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU 11 -** General Public License for more details. 12 -** 13 -** You should have received a copy of the GNU General Public 14 -** License along with this library; if not, write to the 15 -** Free Software Foundation, Inc., 59 Temple Place - Suite 330, 16 -** Boston, MA 02111-1307, USA. 9 +** but without any warranty; without even the implied warranty of 10 +** merchantability or fitness for a particular purpose. 17 11 ** 18 12 ** Author contact information: 19 13 ** drh@hwaci.com 20 14 ** http://www.hwaci.com/drh/ 21 15 ** 22 16 ******************************************************************************* 23 17 **
Changes to src/pivot.c.
1 1 /* 2 2 ** Copyright (c) 2007 D. Richard Hipp 3 3 ** 4 4 ** This program is free software; you can redistribute it and/or 5 -** modify it under the terms of the GNU General Public 6 -** License version 2 as published by the Free Software Foundation. 7 -** 5 +** modify it under the terms of the Simplified BSD License (also 6 +** known as the "2-Clause License" or "FreeBSD License".) 7 + 8 8 ** This program is distributed in the hope that it will be useful, 9 -** but WITHOUT ANY WARRANTY; without even the implied warranty of 10 -** MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU 11 -** General Public License for more details. 12 -** 13 -** You should have received a copy of the GNU General Public 14 -** License along with this library; if not, write to the 15 -** Free Software Foundation, Inc., 59 Temple Place - Suite 330, 16 -** Boston, MA 02111-1307, USA. 9 +** but without any warranty; without even the implied warranty of 10 +** merchantability or fitness for a particular purpose. 17 11 ** 18 12 ** Author contact information: 19 13 ** drh@hwaci.com 20 14 ** http://www.hwaci.com/drh/ 21 15 ** 22 16 ******************************************************************************* 23 17 **
Changes to src/pqueue.c.
1 1 /* 2 2 ** Copyright (c) 2007 D. Richard Hipp 3 3 ** 4 4 ** This program is free software; you can redistribute it and/or 5 -** modify it under the terms of the GNU General Public 6 -** License version 2 as published by the Free Software Foundation. 7 -** 5 +** modify it under the terms of the Simplified BSD License (also 6 +** known as the "2-Clause License" or "FreeBSD License".) 7 + 8 8 ** This program is distributed in the hope that it will be useful, 9 -** but WITHOUT ANY WARRANTY; without even the implied warranty of 10 -** MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU 11 -** General Public License for more details. 12 -** 13 -** You should have received a copy of the GNU General Public 14 -** License along with this library; if not, write to the 15 -** Free Software Foundation, Inc., 59 Temple Place - Suite 330, 16 -** Boston, MA 02111-1307, USA. 9 +** but without any warranty; without even the implied warranty of 10 +** merchantability or fitness for a particular purpose. 17 11 ** 18 12 ** Author contact information: 19 13 ** drh@hwaci.com 20 14 ** http://www.hwaci.com/drh/ 21 15 ** 22 16 ******************************************************************************* 23 17 **
Changes to src/printf.c.
1 1 /* 2 2 ** Copyright (c) 2006 D. Richard Hipp 3 3 ** 4 4 ** This program is free software; you can redistribute it and/or 5 -** modify it under the terms of the GNU General Public 6 -** License version 2 as published by the Free Software Foundation. 7 -** 5 +** modify it under the terms of the Simplified BSD License (also 6 +** known as the "2-Clause License" or "FreeBSD License".) 7 + 8 8 ** This program is distributed in the hope that it will be useful, 9 -** but WITHOUT ANY WARRANTY; without even the implied warranty of 10 -** MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU 11 -** General Public License for more details. 12 -** 13 -** You should have received a copy of the GNU General Public 14 -** License along with this library; if not, write to the 15 -** Free Software Foundation, Inc., 59 Temple Place - Suite 330, 16 -** Boston, MA 02111-1307, USA. 9 +** but without any warranty; without even the implied warranty of 10 +** merchantability or fitness for a particular purpose. 17 11 ** 18 12 ** Author contact information: 19 13 ** drh@hwaci.com 20 14 ** http://www.hwaci.com/drh/ 21 15 ** 22 16 ******************************************************************************* 23 17 **
Changes to src/rebuild.c.
1 1 /* 2 2 ** Copyright (c) 2007 D. Richard Hipp 3 3 ** 4 4 ** This program is free software; you can redistribute it and/or 5 -** modify it under the terms of the GNU General Public 6 -** License version 2 as published by the Free Software Foundation. 7 -** 5 +** modify it under the terms of the Simplified BSD License (also 6 +** known as the "2-Clause License" or "FreeBSD License".) 7 + 8 8 ** This program is distributed in the hope that it will be useful, 9 -** but WITHOUT ANY WARRANTY; without even the implied warranty of 10 -** MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU 11 -** General Public License for more details. 12 -** 13 -** You should have received a copy of the GNU General Public 14 -** License along with this library; if not, write to the 15 -** Free Software Foundation, Inc., 59 Temple Place - Suite 330, 16 -** Boston, MA 02111-1307, USA. 9 +** but without any warranty; without even the implied warranty of 10 +** merchantability or fitness for a particular purpose. 17 11 ** 18 12 ** Author contact information: 19 13 ** drh@hwaci.com 20 14 ** http://www.hwaci.com/drh/ 21 15 ** 22 16 ******************************************************************************* 23 17 **
Changes to src/report.c.
1 1 /* 2 2 ** Copyright (c) 2007 D. Richard Hipp 3 3 ** 4 4 ** This program is free software; you can redistribute it and/or 5 -** modify it under the terms of the GNU General Public 6 -** License as published by the Free Software Foundation; either 7 -** version 2 of the License, or (at your option) any later version. 8 -** 5 +** modify it under the terms of the Simplified BSD License (also 6 +** known as the "2-Clause License" or "FreeBSD License".) 7 + 9 8 ** This program is distributed in the hope that it will be useful, 10 -** but WITHOUT ANY WARRANTY; without even the implied warranty of 11 -** MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU 12 -** General Public License for more details. 13 -** 14 -** You should have received a copy of the GNU General Public 15 -** License along with this library; if not, write to the 16 -** Free Software Foundation, Inc., 59 Temple Place - Suite 330, 17 -** Boston, MA 02111-1307, USA. 9 +** but without any warranty; without even the implied warranty of 10 +** merchantability or fitness for a particular purpose. 18 11 ** 19 12 ** Author contact information: 20 13 ** drh@hwaci.com 21 14 ** http://www.hwaci.com/drh/ 22 15 ** 23 16 ******************************************************************************* 24 17 **
Changes to src/rss.c.
1 1 /* 2 2 ** Copyright (c) 2007 D. Richard Hipp 3 3 ** 4 4 ** This program is free software; you can redistribute it and/or 5 -** modify it under the terms of the GNU General Public 6 -** License version 2 as published by the Free Software Foundation. 7 -** 5 +** modify it under the terms of the Simplified BSD License (also 6 +** known as the "2-Clause License" or "FreeBSD License".) 7 + 8 8 ** This program is distributed in the hope that it will be useful, 9 -** but WITHOUT ANY WARRANTY; without even the implied warranty of 10 -** MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU 11 -** General Public License for more details. 12 -** 13 -** You should have received a copy of the GNU General Public 14 -** License along with this library; if not, write to the 15 -** Free Software Foundation, Inc., 59 Temple Place - Suite 330, 16 -** Boston, MA 02111-1307, USA. 9 +** but without any warranty; without even the implied warranty of 10 +** merchantability or fitness for a particular purpose. 17 11 ** 18 12 ** Author contact information: 19 13 ** drh@hwaci.com 20 14 ** http://www.hwaci.com/drh/ 21 15 ** 22 16 ******************************************************************************* 23 17 **
Deleted src/rstats.c.
1 -/* 2 -** Copyright (c) 2008 D. Richard Hipp, Kevin Kinnell 3 -** 4 -** This program is free software; you can redistribute it and/or 5 -** modify it under the terms of the GNU General Public 6 -** License version 2 as published by the Free Software Foundation. 7 -** 8 -** This program is distributed in the hope that it will be useful, 9 -** but WITHOUT ANY WARRANTY; without even the implied warranty of 10 -** MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU 11 -** General Public License for more details. 12 -** 13 -** You should have received a copy of the GNU General Public 14 -** License along with this library; if not, write to the 15 -** Free Software Foundation, Inc., 59 Temple Place - Suite 330, 16 -** Boston, MA 02111-1307, USA. 17 -** 18 -** Author contact information: 19 -** drh@hwaci.com 20 -** http://www.hwaci.com/drh/ 21 -** 22 -** kkinnell@megagate.com 23 -** 24 -******************************************************************************* 25 -** 26 -** This file contains code to implement the metrics command. This is a 27 -** command-line version of the stats page. 28 -** 29 -*/ 30 -#include <string.h> 31 -#include "config.h" 32 -#include "rstats.h" 33 - 34 -/* 35 -** COMMAND: rstats 36 -** 37 -** Usage: %fossil rstats 38 -** 39 -** Deliver a report of the repository statistics for the 40 -** current checkout. 41 -*/ 42 -void rstats_cmd(void){ 43 - i64 t; 44 - int n, m, fsize, vid; 45 - char zBuf[100]; 46 - 47 - db_must_be_within_tree(); 48 - vid = db_lget_int("checkout",0); 49 - if( vid==0 ){ 50 - fossil_panic("no checkout"); 51 - } 52 - fsize = file_size(g.zRepositoryName); 53 - n = db_int(0, "SELECT count(*) FROM blob"); 54 - m = db_int(0, "SELECT count(*) FROM delta"); 55 - printf(" Number of Artifacts: %d\n", n); 56 - printf(" %d full text + %d delta blobs\n", (n-m), m); 57 - if( n>0 ){ 58 - int a, b; 59 - t = db_int64(0, "SELECT total(size) FROM blob WHERE size>0"); 60 - sqlite3_snprintf(sizeof(zBuf), zBuf, "%lld", t); 61 - if( t/fsize < 5 ){ 62 - b = 10; 63 - fsize /= 10; 64 - }else{ 65 - b = 1; 66 - } 67 - a = t/fsize; 68 - printf(" %d bytes average, %s bytes total\n\n", 69 - ((int)(((double)t)/(double)n)), 70 - (zBuf)); 71 - } 72 - n = db_int(0, "SELECT count(distinct mid) FROM mlink"); 73 - printf(" Number Of Checkins: %d\n", n); 74 - n = db_int(0, "SELECT count(*) FROM filename"); 75 - printf(" Number Of Files: %d\n", n); 76 - n = db_int(0, "SELECT count(*) FROM tag WHERE +tagname GLOB 'wiki-*'"); 77 - printf("Number Of Wiki Pages: %d\n", n); 78 - n = db_int(0, "SELECT count(*) FROM tag WHERE +tagname GLOB 'tkt-*'"); 79 - printf(" Number Of Tickets: %d\n", n); 80 - n = db_int(0, "SELECT julianday('now') - (SELECT min(mtime) FROM event) + 0.99"); 81 - printf(" Duration Of Project: %d days\n", n); 82 -}
Changes to src/schema.c.
1 1 /* 2 2 ** Copyright (c) 2007 D. Richard Hipp 3 3 ** 4 4 ** This program is free software; you can redistribute it and/or 5 -** modify it under the terms of the GNU General Public 6 -** License version 2 as published by the Free Software Foundation. 7 -** 5 +** modify it under the terms of the Simplified BSD License (also 6 +** known as the "2-Clause License" or "FreeBSD License".) 7 + 8 8 ** This program is distributed in the hope that it will be useful, 9 -** but WITHOUT ANY WARRANTY; without even the implied warranty of 10 -** MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU 11 -** General Public License for more details. 12 -** 13 -** You should have received a copy of the GNU General Public 14 -** License along with this library; if not, write to the 15 -** Free Software Foundation, Inc., 59 Temple Place - Suite 330, 16 -** Boston, MA 02111-1307, USA. 9 +** but without any warranty; without even the implied warranty of 10 +** merchantability or fitness for a particular purpose. 17 11 ** 18 12 ** Author contact information: 19 13 ** drh@hwaci.com 20 14 ** http://www.hwaci.com/drh/ 21 15 ** 22 16 ******************************************************************************* 23 17 **
Changes to src/search.c.
1 1 /* 2 2 ** Copyright (c) 2009 D. Richard Hipp 3 3 ** 4 4 ** This program is free software; you can redistribute it and/or 5 -** modify it under the terms of the GNU General Public 6 -** License version 2 as published by the Free Software Foundation. 7 -** 5 +** modify it under the terms of the Simplified BSD License (also 6 +** known as the "2-Clause License" or "FreeBSD License".) 7 + 8 8 ** This program is distributed in the hope that it will be useful, 9 -** but WITHOUT ANY WARRANTY; without even the implied warranty of 10 -** MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU 11 -** General Public License for more details. 12 -** 13 -** You should have received a copy of the GNU General Public 14 -** License along with this library; if not, write to the 15 -** Free Software Foundation, Inc., 59 Temple Place - Suite 330, 16 -** Boston, MA 02111-1307, USA. 9 +** but without any warranty; without even the implied warranty of 10 +** merchantability or fitness for a particular purpose. 17 11 ** 18 12 ** Author contact information: 19 13 ** drh@hwaci.com 20 14 ** http://www.hwaci.com/drh/ 21 15 ** 22 16 ******************************************************************************* 23 17 **
Changes to src/setup.c.
1 1 /* 2 2 ** Copyright (c) 2007 D. Richard Hipp 3 3 ** 4 4 ** This program is free software; you can redistribute it and/or 5 -** modify it under the terms of the GNU General Public 6 -** License as published by the Free Software Foundation; either 7 -** version 2 of the License, or (at your option) any later version. 8 -** 5 +** modify it under the terms of the Simplified BSD License (also 6 +** known as the "2-Clause License" or "FreeBSD License".) 7 + 9 8 ** This program is distributed in the hope that it will be useful, 10 -** but WITHOUT ANY WARRANTY; without even the implied warranty of 11 -** MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU 12 -** General Public License for more details. 13 -** 14 -** You should have received a copy of the GNU General Public 15 -** License along with this library; if not, write to the 16 -** Free Software Foundation, Inc., 59 Temple Place - Suite 330, 17 -** Boston, MA 02111-1307, USA. 9 +** but without any warranty; without even the implied warranty of 10 +** merchantability or fitness for a particular purpose. 18 11 ** 19 12 ** Author contact information: 20 13 ** drh@hwaci.com 21 14 ** http://www.hwaci.com/drh/ 22 15 ** 23 16 ******************************************************************************* 24 17 ** ................................................................................ 62 55 @ <table border="0" cellspacing="20"> 63 56 setup_menu_entry("Users", "setup_ulist", 64 57 "Grant privileges to individual users."); 65 58 setup_menu_entry("Access", "setup_access", 66 59 "Control access settings."); 67 60 setup_menu_entry("Configuration", "setup_config", 68 61 "Configure the WWW components of the repository"); 69 - setup_menu_entry("Behavior", "setup_behavior", 70 - "Configure the SCM behavior of the repository"); 71 62 setup_menu_entry("Timeline", "setup_timeline", 72 63 "Timeline display preferences"); 73 64 setup_menu_entry("Tickets", "tktsetup", 74 65 "Configure the trouble-ticketing system for this repository"); 75 66 setup_menu_entry("Skins", "setup_skin", 76 67 "Select from a menu of prepackaged \"skins\" for the web interface"); 77 68 setup_menu_entry("CSS", "setup_editcss", ................................................................................ 179 170 @ <tr><td valign="top"><b>r</b></td> 180 171 @ <td><i>Read-Tkt:</i> View tickets</td></tr> 181 172 @ <tr><td valign="top"><b>s</b></td> 182 173 @ <td><i>Setup/Super-user:</i> Setup and configure this website</td></tr> 183 174 @ <tr><td valign="top"><b>t</b></td> 184 175 @ <td><i>Tkt-Report:</i> Create new bug summary reports</td></tr> 185 176 @ <tr><td valign="top"><b>u</b></td> 186 - @ <td><i>Reader:</i> Inherit privileges of 177 + @ <td><i>Reader:</i> Inherit privileges of 187 178 @ user <tt>reader</tt></td></tr> 188 179 @ <tr><td valign="top"><b>v</b></td> 189 - @ <td><i>Developer:</i> Inherit privileges of 180 + @ <td><i>Developer:</i> Inherit privileges of 190 181 @ user <tt>developer</tt></td></tr> 191 182 @ <tr><td valign="top"><b>w</b></td> 192 183 @ <td><i>Write-Tkt:</i> Edit tickets</td></tr> 193 184 @ <tr><td valign="top"><b>z</b></td> 194 185 @ <td><i>Zip download:</i> Download a baseline via the 195 186 @ <tt>/zip</tt> URL even without check<b>o</b>ut 196 187 @ and <b>h</b>istory permissions</td></tr> ................................................................................ 596 587 @ 597 588 @ <li><p> 598 589 @ Login is prohibited if the password is an empty string. 599 590 @ </p></li> 600 591 @ </ul> 601 592 @ 602 593 @ <h2>Special Logins</h2> 603 - @ 594 + @ 604 595 @ <ul> 605 596 @ <li><p> 606 597 @ No login is required for user "<b>nobody</b>". The capabilities 607 598 @ of the <b>nobody</b> user are inherited by all users, regardless of 608 599 @ whether or not they are logged in. To disable universal access 609 600 @ to the repository, make sure no user named "<b>nobody</b>" exists or 610 601 @ that the <b>nobody</b> user has no capabilities enabled. ................................................................................ 753 744 754 745 @ <hr> 755 746 entry_attribute("Download packet limit", 10, "max-download", "mxdwn", 756 747 "5000000"); 757 748 @ <p>Fossil tries to limit out-bound sync, clone, and pull packets 758 749 @ to this many bytes, uncompressed. If the client requires more data 759 750 @ than this, then the client will issue multiple HTTP requests. 760 - @ Values below 1 million are not recommended. 5 million is a 751 + @ Values below 1 million are not recommended. 5 million is a 761 752 @ reasonable number.</p> 762 753 763 754 @ <hr> 764 755 onoff_attribute("Show javascript button to fill in CAPTCHA", 765 756 "auto-captcha", "autocaptcha", 0); 766 757 @ <p>When enabled, a button appears on the login screen for user 767 758 @ "anonymous" that will automatically fill in the CAPTCHA password. ................................................................................ 807 798 "show-version-diffs", "vdiff", 0); 808 799 @ <p>On the version-information pages linked from the timeline can either 809 800 @ show complete diffs of all file changes, or can just list the names of 810 801 @ the files that have changed. Users can get to either page by 811 802 @ clicking. This setting selects the default.</p> 812 803 813 804 @ <hr> 814 - entry_attribute("Max timeline comment length", 6, 805 + entry_attribute("Max timeline comment length", 6, 815 806 "timeline-max-comment", "tmc", "0"); 816 807 @ <p>The maximum length of a comment to be displayed in a timeline. 817 808 @ "0" there is no length limit.</p> 818 809 819 - @ <hr> 820 - @ <p><input type="submit" name="submit" value="Apply Changes"></p> 821 - @ </form> 822 - db_end_transaction(0); 823 - style_footer(); 824 -} 825 - 826 -/* 827 -** WEBPAGE: setup_behavior 828 -*/ 829 -void setup_behavior(void){ 830 - login_check_credentials(); 831 - if( !g.okSetup ){ 832 - login_needed(); 833 - } 834 - 835 - style_header("Fossil SCM Behavior"); 836 - db_begin_transaction(); 837 - @ <form action="%s(g.zBaseURL)/setup_behavior" method="POST"> 838 - login_insert_csrf_secret(); 839 - 840 - @ <hr> 841 - onoff_attribute("Automatically synchronize with repository", 842 - "autosync", "autosync", 1); 843 - @ <p>Automatically keeps your work in sync with a centralized server.</p> 844 - 845 - @ <hr> 846 - onoff_attribute("Show javascript button to fill in CAPTCHA", 847 - "auto-captcha", "autocaptcha", 0); 848 - @ <p>When enabled, a button appears on the login screen for user 849 - @ "anonymous" that will automatically fill in the CAPTCHA password. 850 - @ This is less secure that forcing the user to do it manually, but is 851 - @ probably secure enough and it is certainly more convenient for 852 - @ anonymous users.</p> 853 - 854 - @ <hr> 855 - onoff_attribute("Sign all commits with GPG", 856 - "clearsign", "clearsign", 0); 857 - @ <p>When enabled (the default), fossil will attempt to 858 - @ sign all commits with GPG. When disabled, commits will 859 - @ be unsigned.</p> 860 - 861 - @ <hr> 862 - onoff_attribute("Require local authentication", 863 - "localauth", "localauth", 0); 864 - @ <p>If enabled, require that HTTP connections from 865 - @ 127.0.0.1 be authenticated by password. If 866 - @ false, all HTTP requests from localhost have 867 - @ unrestricted access to the repository.</p> 868 - 869 - @ <hr> 870 - onoff_attribute("Modification times used to detect changes", 871 - "mtime-changes", "mtime-changes", 0); 872 - @ <p>Use file modification times (mtimes) to detect when files have been modified.</p> 873 - 874 - @ <hr> 875 - entry_attribute("File Ignore Glob", 40, 876 - "ignore-glob", "ignore-glob", ""); 877 - @ <p>Cause the 'extra' command to ignore files matching the glob. Example: 878 - @ '*.o,*.a,*.bck,*~'</p> 879 - 880 - @ <hr> 881 - entry_attribute("Diff Command", 16, 882 - "diff-command", "diff-command", "diff"); 883 - @ <p>External command used to generate a textual diff</p> 884 - 885 - @ <hr> 886 - entry_attribute("Gdiff Command", 16, 887 - "gdiff-command", "gdiff-command", "gdiff"); 888 - @ <p>External command to run when performing a graphical diff. If undefined, text diff will be used.</p> 889 - 890 - @ <hr> 891 - entry_attribute("Editor", 16, 892 - "editor", "editor", ""); 893 - @ <p>Text editor command used for check-in comments.</p> 894 - 895 - @ <hr> 896 - entry_attribute("HTTP port", 16, 897 - "http-port", "http-port", "8080"); 898 - @ <p>The TCP/IP port number to use by the "server" and "ui" commands. Default: 8080</p> 899 - 900 - @ <hr> 901 - entry_attribute("PGP Command", 32, 902 - "pgp-command", "pgp-command", "gpg --clearsign -o "); 903 - @ <p>Command used to clear-sign manifests at check-in.The default is "gpg --clearsign -o ".</p> 904 - 905 - @ <hr> 906 - entry_attribute("Proxy", 32, 907 - "proxy", "proxy", "off"); 908 - @ <p>URL of the HTTP proxy.</p> 909 - 910 - @ <hr> 911 - entry_attribute("Web browser", 32, 912 - "web-browser", "web-browser", ""); 913 - @ <p>Default web browser for "fossil ui".</p> 914 - 915 810 @ <hr> 916 811 @ <p><input type="submit" name="submit" value="Apply Changes"></p> 917 812 @ </form> 918 813 db_end_transaction(0); 919 814 style_footer(); 920 815 } 921 816 ................................................................................ 1008 903 @ <input type="submit" name="clear" value="Revert To Default"> 1009 904 @ </form> 1010 905 @ <p><b>Note:</b> Press your browser Reload button after modifying the 1011 906 @ CSS in order to pull in the modified CSS file.</p> 1012 907 @ <hr> 1013 908 @ The default CSS is shown below for reference. Other examples 1014 909 @ of CSS files can be seen on the <a href="setup_skin">skins page</a>. 1015 - @ See also the <a href="setup_header">header</a> and 910 + @ See also the <a href="setup_header">header</a> and 1016 911 @ <a href="setup_footer">footer</a> editing screens. 1017 912 @ <blockquote><pre> 1018 913 @ %h(zDefaultCSS) 1019 914 @ </pre></blockquote> 1020 915 style_footer(); 1021 916 db_end_transaction(0); 1022 917 } ................................................................................ 1111 1006 login_needed(); 1112 1007 } 1113 1008 db_begin_transaction(); 1114 1009 if( P("set")!=0 && zMime && zMime[0] && szImg>0 ){ 1115 1010 Blob img; 1116 1011 Stmt ins; 1117 1012 blob_init(&img, aImg, szImg); 1118 - db_prepare(&ins, 1013 + db_prepare(&ins, 1119 1014 "REPLACE INTO config(name, value)" 1120 1015 " VALUES('logo-image',:bytes)" 1121 1016 ); 1122 1017 db_bind_blob(&ins, ":bytes", &img); 1123 1018 db_step(&ins); 1124 1019 db_finalize(&ins); 1125 1020 db_multi_exec( ................................................................................ 1135 1030 db_end_transaction(0); 1136 1031 cgi_redirect("setup_logo"); 1137 1032 } 1138 1033 style_header("Edit Project Logo"); 1139 1034 @ <p>The current project logo has a MIME-Type of <b>%h(zMime)</b> and looks 1140 1035 @ like this:</p> 1141 1036 @ <blockquote><img src="%s(g.zTop)/logo" alt="logo"></blockquote> 1142 - @ 1037 + @ 1143 1038 @ <p>The logo is accessible to all users at this URL: 1144 1039 @ <a href="%s(g.zBaseURL)/logo">%s(g.zBaseURL)/logo</a>. 1145 1040 @ The logo may or may not appear on each 1146 1041 @ page depending on the <a href="setup_editcss">CSS</a> and 1147 1042 @ <a href="setup_header">header setup</a>.</p> 1148 1043 @ 1149 1044 @ <form action="%s(g.zBaseURL)/setup_logo" method="POST"
Changes to src/shun.c.
1 1 /* 2 2 ** Copyright (c) 2008 D. Richard Hipp 3 3 ** 4 4 ** This program is free software; you can redistribute it and/or 5 -** modify it under the terms of the GNU General Public 6 -** License version 2 as published by the Free Software Foundation. 7 -** 5 +** modify it under the terms of the Simplified BSD License (also 6 +** known as the "2-Clause License" or "FreeBSD License".) 7 + 8 8 ** This program is distributed in the hope that it will be useful, 9 -** but WITHOUT ANY WARRANTY; without even the implied warranty of 10 -** MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU 11 -** General Public License for more details. 12 -** 13 -** You should have received a copy of the GNU General Public 14 -** License along with this library; if not, write to the 15 -** Free Software Foundation, Inc., 59 Temple Place - Suite 330, 16 -** Boston, MA 02111-1307, USA. 9 +** but without any warranty; without even the implied warranty of 10 +** merchantability or fitness for a particular purpose. 17 11 ** 18 12 ** Author contact information: 19 13 ** drh@hwaci.com 20 14 ** http://www.hwaci.com/drh/ 21 15 ** 22 16 ******************************************************************************* 23 17 **
Changes to src/skins.c.
1 1 /* 2 2 ** Copyright (c) 2009 D. Richard Hipp 3 3 ** 4 4 ** This program is free software; you can redistribute it and/or 5 -** modify it under the terms of the GNU General Public 6 -** License as published by the Free Software Foundation; either 7 -** version 2 of the License, or (at your option) any later version. 8 -** 5 +** modify it under the terms of the Simplified BSD License (also 6 +** known as the "2-Clause License" or "FreeBSD License".) 7 + 9 8 ** This program is distributed in the hope that it will be useful, 10 -** but WITHOUT ANY WARRANTY; without even the implied warranty of 11 -** MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU 12 -** General Public License for more details. 13 -** 14 -** You should have received a copy of the GNU General Public 15 -** License along with this library; if not, write to the 16 -** Free Software Foundation, Inc., 59 Temple Place - Suite 330, 17 -** Boston, MA 02111-1307, USA. 9 +** but without any warranty; without even the implied warranty of 10 +** merchantability or fitness for a particular purpose. 18 11 ** 19 12 ** Author contact information: 20 13 ** drh@hwaci.com 21 14 ** http://www.hwaci.com/drh/ 22 15 ** 23 16 ******************************************************************************* 24 17 **
Changes to src/stat.c.
1 1 /* 2 2 ** Copyright (c) 2007 D. Richard Hipp 3 3 ** 4 4 ** This program is free software; you can redistribute it and/or 5 -** modify it under the terms of the GNU General Public 6 -** License version 2 as published by the Free Software Foundation. 7 -** 5 +** modify it under the terms of the Simplified BSD License (also 6 +** known as the "2-Clause License" or "FreeBSD License".) 7 + 8 8 ** This program is distributed in the hope that it will be useful, 9 -** but WITHOUT ANY WARRANTY; without even the implied warranty of 10 -** MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU 11 -** General Public License for more details. 12 -** 13 -** You should have received a copy of the GNU General Public 14 -** License along with this library; if not, write to the 15 -** Free Software Foundation, Inc., 59 Temple Place - Suite 330, 16 -** Boston, MA 02111-1307, USA. 9 +** but without any warranty; without even the implied warranty of 10 +** merchantability or fitness for a particular purpose. 17 11 ** 18 12 ** Author contact information: 19 13 ** drh@hwaci.com 20 14 ** http://www.hwaci.com/drh/ 21 15 ** 22 16 ******************************************************************************* 23 17 **
Changes to src/style.c.
1 1 /* 2 2 ** Copyright (c) 2006,2007 D. Richard Hipp 3 3 ** 4 4 ** This program is free software; you can redistribute it and/or 5 -** modify it under the terms of the GNU General Public 6 -** License version 2 as published by the Free Software Foundation. 7 -** 5 +** modify it under the terms of the Simplified BSD License (also 6 +** known as the "2-Clause License" or "FreeBSD License".) 7 + 8 8 ** This program is distributed in the hope that it will be useful, 9 -** but WITHOUT ANY WARRANTY; without even the implied warranty of 10 -** MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU 11 -** General Public License for more details. 12 -** 13 -** You should have received a copy of the GNU General Public 14 -** License along with this library; if not, write to the 15 -** Free Software Foundation, Inc., 59 Temple Place - Suite 330, 16 -** Boston, MA 02111-1307, USA. 9 +** but without any warranty; without even the implied warranty of 10 +** merchantability or fitness for a particular purpose. 17 11 ** 18 12 ** Author contact information: 19 13 ** drh@hwaci.com 20 14 ** http://www.hwaci.com/drh/ 21 15 ** 22 16 ******************************************************************************* 23 17 **
Changes to src/sync.c.
1 1 /* 2 2 ** Copyright (c) 2007 D. Richard Hipp 3 3 ** 4 4 ** This program is free software; you can redistribute it and/or 5 -** modify it under the terms of the GNU General Public 6 -** License version 2 as published by the Free Software Foundation. 7 -** 5 +** modify it under the terms of the Simplified BSD License (also 6 +** known as the "2-Clause License" or "FreeBSD License".) 7 + 8 8 ** This program is distributed in the hope that it will be useful, 9 -** but WITHOUT ANY WARRANTY; without even the implied warranty of 10 -** MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU 11 -** General Public License for more details. 12 -** 13 -** You should have received a copy of the GNU General Public 14 -** License along with this library; if not, write to the 15 -** Free Software Foundation, Inc., 59 Temple Place - Suite 330, 16 -** Boston, MA 02111-1307, USA. 9 +** but without any warranty; without even the implied warranty of 10 +** merchantability or fitness for a particular purpose. 17 11 ** 18 12 ** Author contact information: 19 13 ** drh@hwaci.com 20 14 ** http://www.hwaci.com/drh/ 21 15 ** 22 16 ******************************************************************************* 23 17 **
Changes to src/tag.c.
1 1 /* 2 2 ** Copyright (c) 2007 D. Richard Hipp 3 3 ** 4 4 ** This program is free software; you can redistribute it and/or 5 -** modify it under the terms of the GNU General Public 6 -** License version 2 as published by the Free Software Foundation. 7 -** 5 +** modify it under the terms of the Simplified BSD License (also 6 +** known as the "2-Clause License" or "FreeBSD License".) 7 + 8 8 ** This program is distributed in the hope that it will be useful, 9 -** but WITHOUT ANY WARRANTY; without even the implied warranty of 10 -** MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU 11 -** General Public License for more details. 12 -** 13 -** You should have received a copy of the GNU General Public 14 -** License along with this library; if not, write to the 15 -** Free Software Foundation, Inc., 59 Temple Place - Suite 330, 16 -** Boston, MA 02111-1307, USA. 9 +** but without any warranty; without even the implied warranty of 10 +** merchantability or fitness for a particular purpose. 17 11 ** 18 12 ** Author contact information: 19 13 ** drh@hwaci.com 20 14 ** http://www.hwaci.com/drh/ 21 15 ** 22 16 ******************************************************************************* 23 17 **
Changes to src/th_main.c.
1 1 /* 2 2 ** Copyright (c) 2008 D. Richard Hipp 3 3 ** 4 4 ** This program is free software; you can redistribute it and/or 5 -** modify it under the terms of the GNU General Public 6 -** License version 2 as published by the Free Software Foundation. 7 -** 5 +** modify it under the terms of the Simplified BSD License (also 6 +** known as the "2-Clause License" or "FreeBSD License".) 7 + 8 8 ** This program is distributed in the hope that it will be useful, 9 -** but WITHOUT ANY WARRANTY; without even the implied warranty of 10 -** MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU 11 -** General Public License for more details. 12 -** 13 -** You should have received a copy of the GNU General Public 14 -** License along with this library; if not, write to the 15 -** Free Software Foundation, Inc., 59 Temple Place - Suite 330, 16 -** Boston, MA 02111-1307, USA. 9 +** but without any warranty; without even the implied warranty of 10 +** merchantability or fitness for a particular purpose. 17 11 ** 18 12 ** Author contact information: 19 13 ** drh@hwaci.com 20 14 ** http://www.hwaci.com/drh/ 21 15 ** 22 16 ******************************************************************************* 23 17 **
Changes to src/timeline.c.
1 1 /* 2 2 ** Copyright (c) 2007 D. Richard Hipp 3 3 ** 4 4 ** This program is free software; you can redistribute it and/or 5 -** modify it under the terms of the GNU General Public 6 -** License version 2 as published by the Free Software Foundation. 7 -** 5 +** modify it under the terms of the Simplified BSD License (also 6 +** known as the "2-Clause License" or "FreeBSD License".) 7 + 8 8 ** This program is distributed in the hope that it will be useful, 9 -** but WITHOUT ANY WARRANTY; without even the implied warranty of 10 -** MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU 11 -** General Public License for more details. 12 -** 13 -** You should have received a copy of the GNU General Public 14 -** License along with this library; if not, write to the 15 -** Free Software Foundation, Inc., 59 Temple Place - Suite 330, 16 -** Boston, MA 02111-1307, USA. 9 +** but without any warranty; without even the implied warranty of 10 +** merchantability or fitness for a particular purpose. 17 11 ** 18 12 ** Author contact information: 19 13 ** drh@hwaci.com 20 14 ** http://www.hwaci.com/drh/ 21 15 ** 22 16 ******************************************************************************* 23 17 **
Changes to src/tkt.c.
1 1 /* 2 2 ** Copyright (c) 2007 D. Richard Hipp 3 3 ** 4 4 ** This program is free software; you can redistribute it and/or 5 -** modify it under the terms of the GNU General Public 6 -** License version 2 as published by the Free Software Foundation. 7 -** 5 +** modify it under the terms of the Simplified BSD License (also 6 +** known as the "2-Clause License" or "FreeBSD License".) 7 + 8 8 ** This program is distributed in the hope that it will be useful, 9 -** but WITHOUT ANY WARRANTY; without even the implied warranty of 10 -** MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU 11 -** General Public License for more details. 12 -** 13 -** You should have received a copy of the GNU General Public 14 -** License along with this library; if not, write to the 15 -** Free Software Foundation, Inc., 59 Temple Place - Suite 330, 16 -** Boston, MA 02111-1307, USA. 9 +** but without any warranty; without even the implied warranty of 10 +** merchantability or fitness for a particular purpose. 17 11 ** 18 12 ** Author contact information: 19 13 ** drh@hwaci.com 20 14 ** http://www.hwaci.com/drh/ 21 15 ** 22 16 ******************************************************************************* 23 17 **
Changes to src/tktsetup.c.
1 1 /* 2 2 ** Copyright (c) 2007 D. Richard Hipp 3 3 ** 4 4 ** This program is free software; you can redistribute it and/or 5 -** modify it under the terms of the GNU General Public 6 -** License version 2 as published by the Free Software Foundation. 7 -** 5 +** modify it under the terms of the Simplified BSD License (also 6 +** known as the "2-Clause License" or "FreeBSD License".) 7 + 8 8 ** This program is distributed in the hope that it will be useful, 9 -** but WITHOUT ANY WARRANTY; without even the implied warranty of 10 -** MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU 11 -** General Public License for more details. 12 -** 13 -** You should have received a copy of the GNU General Public 14 -** License along with this library; if not, write to the 15 -** Free Software Foundation, Inc., 59 Temple Place - Suite 330, 16 -** Boston, MA 02111-1307, USA. 9 +** but without any warranty; without even the implied warranty of 10 +** merchantability or fitness for a particular purpose. 17 11 ** 18 12 ** Author contact information: 19 13 ** drh@hwaci.com 20 14 ** http://www.hwaci.com/drh/ 21 15 ** 22 16 ******************************************************************************* 23 17 **
Changes to src/translate.c.
1 1 /* 2 2 ** Copyright (c) 2002 D. Richard Hipp 3 3 ** 4 4 ** This program is free software; you can redistribute it and/or 5 -** modify it under the terms of the GNU General Public 6 -** License as published by the Free Software Foundation; either 7 -** version 2 of the License, or (at your option) any later version. 8 -** 5 +** modify it under the terms of the Simplified BSD License (also 6 +** known as the "2-Clause License" or "FreeBSD License".) 7 + 9 8 ** This program is distributed in the hope that it will be useful, 10 -** but WITHOUT ANY WARRANTY; without even the implied warranty of 11 -** MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU 12 -** General Public License for more details. 13 -** 14 -** You should have received a copy of the GNU General Public 15 -** License along with this library; if not, write to the 16 -** Free Software Foundation, Inc., 59 Temple Place - Suite 330, 17 -** Boston, MA 02111-1307, USA. 9 +** but without any warranty; without even the implied warranty of 10 +** merchantability or fitness for a particular purpose. 18 11 ** 19 12 ** Author contact information: 20 13 ** drh@hwaci.com 21 14 ** http://www.hwaci.com/drh/ 22 15 ** 23 16 ******************************************************************************* 24 17 ** 25 -** This program reads C source code from standard input. Lines that 26 18 ** begin with the "@" character are translated into cgi_printf() statements 27 19 ** and the translated code is written on standard output. 28 20 ** 29 21 ** The problem this program is attempt to solve is as follows: When 30 22 ** writing CGI programs in C, we typically want to output a lot of HTML 31 23 ** text to standard output. In pure C code, this involves doing a 32 24 ** printf() with a big string containing all that text. But we have
Changes to src/undo.c.
1 1 /* 2 2 ** Copyright (c) 2007 D. Richard Hipp 3 3 ** 4 4 ** This program is free software; you can redistribute it and/or 5 -** modify it under the terms of the GNU General Public 6 -** License version 2 as published by the Free Software Foundation. 7 -** 5 +** modify it under the terms of the Simplified BSD License (also 6 +** known as the "2-Clause License" or "FreeBSD License".) 7 + 8 8 ** This program is distributed in the hope that it will be useful, 9 -** but WITHOUT ANY WARRANTY; without even the implied warranty of 10 -** MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU 11 -** General Public License for more details. 12 -** 13 -** You should have received a copy of the GNU General Public 14 -** License along with this library; if not, write to the 15 -** Free Software Foundation, Inc., 59 Temple Place - Suite 330, 16 -** Boston, MA 02111-1307, USA. 9 +** but without any warranty; without even the implied warranty of 10 +** merchantability or fitness for a particular purpose. 17 11 ** 18 12 ** Author contact information: 19 13 ** drh@hwaci.com 20 14 ** http://www.hwaci.com/drh/ 21 15 ** 22 16 ******************************************************************************* 23 17 **
Changes to src/update.c.
1 1 /* 2 2 ** Copyright (c) 2007 D. Richard Hipp 3 3 ** 4 4 ** This program is free software; you can redistribute it and/or 5 -** modify it under the terms of the GNU General Public 6 -** License version 2 as published by the Free Software Foundation. 7 -** 5 +** modify it under the terms of the Simplified BSD License (also 6 +** known as the "2-Clause License" or "FreeBSD License".) 7 + 8 8 ** This program is distributed in the hope that it will be useful, 9 -** but WITHOUT ANY WARRANTY; without even the implied warranty of 10 -** MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU 11 -** General Public License for more details. 12 -** 13 -** You should have received a copy of the GNU General Public 14 -** License along with this library; if not, write to the 15 -** Free Software Foundation, Inc., 59 Temple Place - Suite 330, 16 -** Boston, MA 02111-1307, USA. 9 +** but without any warranty; without even the implied warranty of 10 +** merchantability or fitness for a particular purpose. 17 11 ** 18 12 ** Author contact information: 19 13 ** drh@hwaci.com 20 14 ** http://www.hwaci.com/drh/ 21 15 ** 22 16 ******************************************************************************* 23 17 **
Changes to src/url.c.
1 1 /* 2 2 ** Copyright (c) 2007 D. Richard Hipp 3 3 ** 4 4 ** This program is free software; you can redistribute it and/or 5 -** modify it under the terms of the GNU General Public 6 -** License version 2 as published by the Free Software Foundation. 7 -** 5 +** modify it under the terms of the Simplified BSD License (also 6 +** known as the "2-Clause License" or "FreeBSD License".) 7 + 8 8 ** This program is distributed in the hope that it will be useful, 9 -** but WITHOUT ANY WARRANTY; without even the implied warranty of 10 -** MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU 11 -** General Public License for more details. 12 -** 13 -** You should have received a copy of the GNU General Public 14 -** License along with this library; if not, write to the 15 -** Free Software Foundation, Inc., 59 Temple Place - Suite 330, 16 -** Boston, MA 02111-1307, USA. 9 +** but without any warranty; without even the implied warranty of 10 +** merchantability or fitness for a particular purpose. 17 11 ** 18 12 ** Author contact information: 19 13 ** drh@hwaci.com 20 14 ** http://www.hwaci.com/drh/ 21 15 ** 22 16 ******************************************************************************* 23 17 **
Changes to src/user.c.
1 1 /* 2 2 ** Copyright (c) 2006 D. Richard Hipp 3 3 ** 4 4 ** This program is free software; you can redistribute it and/or 5 -** modify it under the terms of the GNU General Public 6 -** License version 2 as published by the Free Software Foundation. 7 -** 5 +** modify it under the terms of the Simplified BSD License (also 6 +** known as the "2-Clause License" or "FreeBSD License".) 7 + 8 8 ** This program is distributed in the hope that it will be useful, 9 -** but WITHOUT ANY WARRANTY; without even the implied warranty of 10 -** MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU 11 -** General Public License for more details. 12 -** 13 -** You should have received a copy of the GNU General Public 14 -** License along with this library; if not, write to the 15 -** Free Software Foundation, Inc., 59 Temple Place - Suite 330, 16 -** Boston, MA 02111-1307, USA. 9 +** but without any warranty; without even the implied warranty of 10 +** merchantability or fitness for a particular purpose. 17 11 ** 18 12 ** Author contact information: 19 13 ** drh@hwaci.com 20 14 ** http://www.hwaci.com/drh/ 21 15 ** 22 16 ******************************************************************************* 23 17 **
Changes to src/verify.c.
1 1 /* 2 2 ** Copyright (c) 2007 D. Richard Hipp 3 3 ** 4 4 ** This program is free software; you can redistribute it and/or 5 -** modify it under the terms of the GNU General Public 6 -** License version 2 as published by the Free Software Foundation. 7 -** 5 +** modify it under the terms of the Simplified BSD License (also 6 +** known as the "2-Clause License" or "FreeBSD License".) 7 + 8 8 ** This program is distributed in the hope that it will be useful, 9 -** but WITHOUT ANY WARRANTY; without even the implied warranty of 10 -** MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU 11 -** General Public License for more details. 12 -** 13 -** You should have received a copy of the GNU General Public 14 -** License along with this library; if not, write to the 15 -** Free Software Foundation, Inc., 59 Temple Place - Suite 330, 16 -** Boston, MA 02111-1307, USA. 9 +** but without any warranty; without even the implied warranty of 10 +** merchantability or fitness for a particular purpose. 17 11 ** 18 12 ** Author contact information: 19 13 ** drh@hwaci.com 20 14 ** http://www.hwaci.com/drh/ 21 15 ** 22 16 ******************************************************************************* 23 17 **
Changes to src/vfile.c.
1 1 /* 2 2 ** Copyright (c) 2007 D. Richard Hipp 3 3 ** 4 4 ** This program is free software; you can redistribute it and/or 5 -** modify it under the terms of the GNU General Public 6 -** License version 2 as published by the Free Software Foundation. 7 -** 5 +** modify it under the terms of the Simplified BSD License (also 6 +** known as the "2-Clause License" or "FreeBSD License".) 7 + 8 8 ** This program is distributed in the hope that it will be useful, 9 -** but WITHOUT ANY WARRANTY; without even the implied warranty of 10 -** MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU 11 -** General Public License for more details. 12 -** 13 -** You should have received a copy of the GNU General Public 14 -** License along with this library; if not, write to the 15 -** Free Software Foundation, Inc., 59 Temple Place - Suite 330, 16 -** Boston, MA 02111-1307, USA. 9 +** but without any warranty; without even the implied warranty of 10 +** merchantability or fitness for a particular purpose. 17 11 ** 18 12 ** Author contact information: 19 13 ** drh@hwaci.com 20 14 ** http://www.hwaci.com/drh/ 21 15 ** 22 16 ******************************************************************************* 23 17 **
Changes to src/wiki.c.
1 1 /* 2 2 ** Copyright (c) 2007 D. Richard Hipp 3 3 ** Copyright (c) 2008 Stephan Beal 4 4 ** 5 5 ** This program is free software; you can redistribute it and/or 6 -** modify it under the terms of the GNU General Public 7 -** License version 2 as published by the Free Software Foundation. 8 -** 6 +** modify it under the terms of the Simplified BSD License (also 7 +** known as the "2-Clause License" or "FreeBSD License".) 8 + 9 9 ** This program is distributed in the hope that it will be useful, 10 -** but WITHOUT ANY WARRANTY; without even the implied warranty of 11 -** MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU 12 -** General Public License for more details. 13 -** 14 -** You should have received a copy of the GNU General Public 15 -** License along with this library; if not, write to the 16 -** Free Software Foundation, Inc., 59 Temple Place - Suite 330, 17 -** Boston, MA 02111-1307, USA. 10 +** but without any warranty; without even the implied warranty of 11 +** merchantability or fitness for a particular purpose. 18 12 ** 19 13 ** Author contact information: 20 14 ** drh@hwaci.com 21 15 ** http://www.hwaci.com/drh/ 22 16 ** 23 17 ******************************************************************************* 24 18 **
Changes to src/wikiformat.c.
1 1 /* 2 2 ** Copyright (c) 2007 D. Richard Hipp 3 3 ** 4 4 ** This program is free software; you can redistribute it and/or 5 -** modify it under the terms of the GNU General Public 6 -** License version 2 as published by the Free Software Foundation. 7 -** 5 +** modify it under the terms of the Simplified BSD License (also 6 +** known as the "2-Clause License" or "FreeBSD License".) 7 + 8 8 ** This program is distributed in the hope that it will be useful, 9 -** but WITHOUT ANY WARRANTY; without even the implied warranty of 10 -** MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU 11 -** General Public License for more details. 12 -** 13 -** You should have received a copy of the GNU General Public 14 -** License along with this library; if not, write to the 15 -** Free Software Foundation, Inc., 59 Temple Place - Suite 330, 16 -** Boston, MA 02111-1307, USA. 9 +** but without any warranty; without even the implied warranty of 10 +** merchantability or fitness for a particular purpose. 17 11 ** 18 12 ** Author contact information: 19 13 ** drh@hwaci.com 20 14 ** http://www.hwaci.com/drh/ 21 15 ** 22 16 ******************************************************************************* 23 17 **
Changes to src/winhttp.c.
1 1 /* 2 2 ** Copyright (c) 2008 D. Richard Hipp 3 3 ** 4 4 ** This program is free software; you can redistribute it and/or 5 -** modify it under the terms of the GNU General Public 6 -** License version 2 as published by the Free Software Foundation. 7 -** 5 +** modify it under the terms of the Simplified BSD License (also 6 +** known as the "2-Clause License" or "FreeBSD License".) 7 + 8 8 ** This program is distributed in the hope that it will be useful, 9 -** but WITHOUT ANY WARRANTY; without even the implied warranty of 10 -** MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU 11 -** General Public License for more details. 12 -** 13 -** You should have received a copy of the GNU General Public 14 -** License along with this library; if not, write to the 15 -** Free Software Foundation, Inc., 59 Temple Place - Suite 330, 16 -** Boston, MA 02111-1307, USA. 9 +** but without any warranty; without even the implied warranty of 10 +** merchantability or fitness for a particular purpose. 17 11 ** 18 12 ** Author contact information: 19 13 ** drh@hwaci.com 20 14 ** http://www.hwaci.com/drh/ 21 15 ** 22 16 ******************************************************************************* 23 17 **
Changes to src/xfer.c.
1 1 /* 2 2 ** Copyright (c) 2007 D. Richard Hipp 3 3 ** 4 4 ** This program is free software; you can redistribute it and/or 5 -** modify it under the terms of the GNU General Public 6 -** License version 2 as published by the Free Software Foundation. 7 -** 5 +** modify it under the terms of the Simplified BSD License (also 6 +** known as the "2-Clause License" or "FreeBSD License".) 7 + 8 8 ** This program is distributed in the hope that it will be useful, 9 -** but WITHOUT ANY WARRANTY; without even the implied warranty of 10 -** MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU 11 -** General Public License for more details. 12 -** 13 -** You should have received a copy of the GNU General Public 14 -** License along with this library; if not, write to the 15 -** Free Software Foundation, Inc., 59 Temple Place - Suite 330, 16 -** Boston, MA 02111-1307, USA. 9 +** but without any warranty; without even the implied warranty of 10 +** merchantability or fitness for a particular purpose. 17 11 ** 18 12 ** Author contact information: 19 13 ** drh@hwaci.com 20 14 ** http://www.hwaci.com/drh/ 21 15 ** 22 16 ******************************************************************************* 23 17 **
Changes to src/zip.c.
1 1 /* 2 2 ** Copyright (c) 2007 D. Richard Hipp 3 3 ** 4 4 ** This program is free software; you can redistribute it and/or 5 -** modify it under the terms of the GNU General Public 6 -** License version 2 as published by the Free Software Foundation. 7 -** 5 +** modify it under the terms of the Simplified BSD License (also 6 +** known as the "2-Clause License" or "FreeBSD License".) 7 + 8 8 ** This program is distributed in the hope that it will be useful, 9 -** but WITHOUT ANY WARRANTY; without even the implied warranty of 10 -** MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU 11 -** General Public License for more details. 12 -** 13 -** You should have received a copy of the GNU General Public 14 -** License along with this library; if not, write to the 15 -** Free Software Foundation, Inc., 59 Temple Place - Suite 330, 16 -** Boston, MA 02111-1307, USA. 9 +** but without any warranty; without even the implied warranty of 10 +** merchantability or fitness for a particular purpose. 17 11 ** 18 12 ** Author contact information: 19 13 ** drh@hwaci.com 20 14 ** http://www.hwaci.com/drh/ 21 15 ** 22 16 ******************************************************************************* 23 17 **