ADDED COPYRIGHT-BSD2.txt Index: COPYRIGHT-BSD2.txt ================================================================== --- /dev/null +++ COPYRIGHT-BSD2.txt @@ -0,0 +1,31 @@ +Copyright 2007 D. Richard Hipp. All rights reserved. + +Redistribution and use in source and binary forms, with or +without modification, are permitted provided that the +following conditions are met: + + 1. Redistributions of source code must retain the above + copyright notice, this list of conditions and the + following disclaimer. + + 2. Redistributions in binary form must reproduce the above + copyright notice, this list of conditions and the + following disclaimer in the documentation and/or other + materials provided with the distribution. + +THIS SOFTWARE IS PROVIDED BY THE AUTHORS ``AS IS'' AND ANY EXPRESS +OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED +WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE +ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHORS OR CONTRIBUTORS BE +LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR +CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF +SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR +BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, +WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE +OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, +EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + +The views and conclusions contained in the software and documentation +are those of the authors and contributors and should not be interpreted +as representing official policies, either expressed or implied, of anybody +else. DELETED COPYRIGHT-GPL2.txt Index: COPYRIGHT-GPL2.txt ================================================================== --- COPYRIGHT-GPL2.txt +++ /dev/null @@ -1,353 +0,0 @@ -Fossil is licensed under the terms of the GPLv2 shown below. In -addition, permission is granted to link Fossil against the OpenSSL -project's "OpenSSL" library (or with modified versions of that -library that use the same license), and distribute the linked -executables. If you modify Fossil, you may extend the exception -described in this paragraph to your modifications, or not, at your -discretion. - -The "clear-title" branch of Fossil is available for more liberal -licenses such as Berkeley-style licenses or the Apache license. - -The original text of GPLv2 follows. --------------------------------------------------------------------------- - - GNU GENERAL PUBLIC LICENSE - Version 2, June 1991 - - Copyright (C) 1989, 1991 Free Software Foundation, Inc., - 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA - Everyone is permitted to copy and distribute verbatim copies - of this license document, but changing it is not allowed. - - Preamble - - The licenses for most software are designed to take away your -freedom to share and change it. By contrast, the GNU General Public -License is intended to guarantee your freedom to share and change free -software--to make sure the software is free for all its users. This -General Public License applies to most of the Free Software -Foundation's software and to any other program whose authors commit to -using it. (Some other Free Software Foundation software is covered by -the GNU Lesser General Public License instead.) You can apply it to -your programs, too. - - When we speak of free software, we are referring to freedom, not -price. Our General Public Licenses are designed to make sure that you -have the freedom to distribute copies of free software (and charge for -this service if you wish), that you receive source code or can get it -if you want it, that you can change the software or use pieces of it -in new free programs; and that you know you can do these things. - - To protect your rights, we need to make restrictions that forbid -anyone to deny you these rights or to ask you to surrender the rights. -These restrictions translate to certain responsibilities for you if you -distribute copies of the software, or if you modify it. - - For example, if you distribute copies of such a program, whether -gratis or for a fee, you must give the recipients all the rights that -you have. You must make sure that they, too, receive or can get the -source code. And you must show them these terms so they know their -rights. - - We protect your rights with two steps: (1) copyright the software, and -(2) offer you this license which gives you legal permission to copy, -distribute and/or modify the software. - - Also, for each author's protection and ours, we want to make certain -that everyone understands that there is no warranty for this free -software. If the software is modified by someone else and passed on, we -want its recipients to know that what they have is not the original, so -that any problems introduced by others will not reflect on the original -authors' reputations. - - Finally, any free program is threatened constantly by software -patents. We wish to avoid the danger that redistributors of a free -program will individually obtain patent licenses, in effect making the -program proprietary. To prevent this, we have made it clear that any -patent must be licensed for everyone's free use or not licensed at all. - - The precise terms and conditions for copying, distribution and -modification follow. - - GNU GENERAL PUBLIC LICENSE - TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION - - 0. This License applies to any program or other work which contains -a notice placed by the copyright holder saying it may be distributed -under the terms of this General Public License. The "Program", below, -refers to any such program or work, and a "work based on the Program" -means either the Program or any derivative work under copyright law: -that is to say, a work containing the Program or a portion of it, -either verbatim or with modifications and/or translated into another -language. (Hereinafter, translation is included without limitation in -the term "modification".) Each licensee is addressed as "you". - -Activities other than copying, distribution and modification are not -covered by this License; they are outside its scope. The act of -running the Program is not restricted, and the output from the Program -is covered only if its contents constitute a work based on the -Program (independent of having been made by running the Program). -Whether that is true depends on what the Program does. - - 1. You may copy and distribute verbatim copies of the Program's -source code as you receive it, in any medium, provided that you -conspicuously and appropriately publish on each copy an appropriate -copyright notice and disclaimer of warranty; keep intact all the -notices that refer to this License and to the absence of any warranty; -and give any other recipients of the Program a copy of this License -along with the Program. - -You may charge a fee for the physical act of transferring a copy, and -you may at your option offer warranty protection in exchange for a fee. - - 2. You may modify your copy or copies of the Program or any portion -of it, thus forming a work based on the Program, and copy and -distribute such modifications or work under the terms of Section 1 -above, provided that you also meet all of these conditions: - - a) You must cause the modified files to carry prominent notices - stating that you changed the files and the date of any change. - - b) You must cause any work that you distribute or publish, that in - whole or in part contains or is derived from the Program or any - part thereof, to be licensed as a whole at no charge to all third - parties under the terms of this License. - - c) If the modified program normally reads commands interactively - when run, you must cause it, when started running for such - interactive use in the most ordinary way, to print or display an - announcement including an appropriate copyright notice and a - notice that there is no warranty (or else, saying that you provide - a warranty) and that users may redistribute the program under - these conditions, and telling the user how to view a copy of this - License. (Exception: if the Program itself is interactive but - does not normally print such an announcement, your work based on - the Program is not required to print an announcement.) - -These requirements apply to the modified work as a whole. If -identifiable sections of that work are not derived from the Program, -and can be reasonably considered independent and separate works in -themselves, then this License, and its terms, do not apply to those -sections when you distribute them as separate works. But when you -distribute the same sections as part of a whole which is a work based -on the Program, the distribution of the whole must be on the terms of -this License, whose permissions for other licensees extend to the -entire whole, and thus to each and every part regardless of who wrote it. - -Thus, it is not the intent of this section to claim rights or contest -your rights to work written entirely by you; rather, the intent is to -exercise the right to control the distribution of derivative or -collective works based on the Program. - -In addition, mere aggregation of another work not based on the Program -with the Program (or with a work based on the Program) on a volume of -a storage or distribution medium does not bring the other work under -the scope of this License. - - 3. You may copy and distribute the Program (or a work based on it, -under Section 2) in object code or executable form under the terms of -Sections 1 and 2 above provided that you also do one of the following: - - a) Accompany it with the complete corresponding machine-readable - source code, which must be distributed under the terms of Sections - 1 and 2 above on a medium customarily used for software interchange; or, - - b) Accompany it with a written offer, valid for at least three - years, to give any third party, for a charge no more than your - cost of physically performing source distribution, a complete - machine-readable copy of the corresponding source code, to be - distributed under the terms of Sections 1 and 2 above on a medium - customarily used for software interchange; or, - - c) Accompany it with the information you received as to the offer - to distribute corresponding source code. (This alternative is - allowed only for noncommercial distribution and only if you - received the program in object code or executable form with such - an offer, in accord with Subsection b above.) - -The source code for a work means the preferred form of the work for -making modifications to it. For an executable work, complete source -code means all the source code for all modules it contains, plus any -associated interface definition files, plus the scripts used to -control compilation and installation of the executable. However, as a -special exception, the source code distributed need not include -anything that is normally distributed (in either source or binary -form) with the major components (compiler, kernel, and so on) of the -operating system on which the executable runs, unless that component -itself accompanies the executable. - -If distribution of executable or object code is made by offering -access to copy from a designated place, then offering equivalent -access to copy the source code from the same place counts as -distribution of the source code, even though third parties are not -compelled to copy the source along with the object code. - - 4. You may not copy, modify, sublicense, or distribute the Program -except as expressly provided under this License. Any attempt -otherwise to copy, modify, sublicense or distribute the Program is -void, and will automatically terminate your rights under this License. -However, parties who have received copies, or rights, from you under -this License will not have their licenses terminated so long as such -parties remain in full compliance. - - 5. You are not required to accept this License, since you have not -signed it. However, nothing else grants you permission to modify or -distribute the Program or its derivative works. These actions are -prohibited by law if you do not accept this License. Therefore, by -modifying or distributing the Program (or any work based on the -Program), you indicate your acceptance of this License to do so, and -all its terms and conditions for copying, distributing or modifying -the Program or works based on it. - - 6. Each time you redistribute the Program (or any work based on the -Program), the recipient automatically receives a license from the -original licensor to copy, distribute or modify the Program subject to -these terms and conditions. You may not impose any further -restrictions on the recipients' exercise of the rights granted herein. -You are not responsible for enforcing compliance by third parties to -this License. - - 7. If, as a consequence of a court judgment or allegation of patent -infringement or for any other reason (not limited to patent issues), -conditions are imposed on you (whether by court order, agreement or -otherwise) that contradict the conditions of this License, they do not -excuse you from the conditions of this License. If you cannot -distribute so as to satisfy simultaneously your obligations under this -License and any other pertinent obligations, then as a consequence you -may not distribute the Program at all. For example, if a patent -license would not permit royalty-free redistribution of the Program by -all those who receive copies directly or indirectly through you, then -the only way you could satisfy both it and this License would be to -refrain entirely from distribution of the Program. - -If any portion of this section is held invalid or unenforceable under -any particular circumstance, the balance of the section is intended to -apply and the section as a whole is intended to apply in other -circumstances. - -It is not the purpose of this section to induce you to infringe any -patents or other property right claims or to contest validity of any -such claims; this section has the sole purpose of protecting the -integrity of the free software distribution system, which is -implemented by public license practices. Many people have made -generous contributions to the wide range of software distributed -through that system in reliance on consistent application of that -system; it is up to the author/donor to decide if he or she is willing -to distribute software through any other system and a licensee cannot -impose that choice. - -This section is intended to make thoroughly clear what is believed to -be a consequence of the rest of this License. - - 8. If the distribution and/or use of the Program is restricted in -certain countries either by patents or by copyrighted interfaces, the -original copyright holder who places the Program under this License -may add an explicit geographical distribution limitation excluding -those countries, so that distribution is permitted only in or among -countries not thus excluded. In such case, this License incorporates -the limitation as if written in the body of this License. - - 9. The Free Software Foundation may publish revised and/or new versions -of the General Public License from time to time. Such new versions will -be similar in spirit to the present version, but may differ in detail to -address new problems or concerns. - -Each version is given a distinguishing version number. If the Program -specifies a version number of this License which applies to it and "any -later version", you have the option of following the terms and conditions -either of that version or of any later version published by the Free -Software Foundation. If the Program does not specify a version number of -this License, you may choose any version ever published by the Free Software -Foundation. - - 10. If you wish to incorporate parts of the Program into other free -programs whose distribution conditions are different, write to the author -to ask for permission. For software which is copyrighted by the Free -Software Foundation, write to the Free Software Foundation; we sometimes -make exceptions for this. Our decision will be guided by the two goals -of preserving the free status of all derivatives of our free software and -of promoting the sharing and reuse of software generally. - - NO WARRANTY - - 11. BECAUSE THE PROGRAM IS LICENSED FREE OF CHARGE, THERE IS NO WARRANTY -FOR THE PROGRAM, TO THE EXTENT PERMITTED BY APPLICABLE LAW. EXCEPT WHEN -OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR OTHER PARTIES -PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED -OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF -MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. THE ENTIRE RISK AS -TO THE QUALITY AND PERFORMANCE OF THE PROGRAM IS WITH YOU. SHOULD THE -PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF ALL NECESSARY SERVICING, -REPAIR OR CORRECTION. - - 12. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING -WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY AND/OR -REDISTRIBUTE THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, -INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING -OUT OF THE USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED -TO LOSS OF DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY -YOU OR THIRD PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER -PROGRAMS), EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE -POSSIBILITY OF SUCH DAMAGES. - - END OF TERMS AND CONDITIONS - - How to Apply These Terms to Your New Programs - - If you develop a new program, and you want it to be of the greatest -possible use to the public, the best way to achieve this is to make it -free software which everyone can redistribute and change under these terms. - - To do so, attach the following notices to the program. It is safest -to attach them to the start of each source file to most effectively -convey the exclusion of warranty; and each file should have at least -the "copyright" line and a pointer to where the full notice is found. - - - Copyright (C) - - This program is free software; you can redistribute it and/or modify - it under the terms of the GNU General Public License as published by - the Free Software Foundation; either version 2 of the License, or - (at your option) any later version. - - This program is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - GNU General Public License for more details. - - You should have received a copy of the GNU General Public License along - with this program; if not, write to the Free Software Foundation, Inc., - 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. - -Also add information on how to contact you by electronic and paper mail. - -If the program is interactive, make it output a short notice like this -when it starts in an interactive mode: - - Gnomovision version 69, Copyright (C) year name of author - Gnomovision comes with ABSOLUTELY NO WARRANTY; for details type `show w'. - This is free software, and you are welcome to redistribute it - under certain conditions; type `show c' for details. - -The hypothetical commands `show w' and `show c' should show the appropriate -parts of the General Public License. Of course, the commands you use may -be called something other than `show w' and `show c'; they could even be -mouse-clicks or menu items--whatever suits your program. - -You should also get your employer (if you work as a programmer) or your -school, if any, to sign a "copyright disclaimer" for the program, if -necessary. Here is a sample; alter the names: - - Yoyodyne, Inc., hereby disclaims all copyright interest in the program - `Gnomovision' (which makes passes at compilers) written by James Hacker. - - , 1 April 1989 - Ty Coon, President of Vice - -This General Public License does not permit incorporating your program into -proprietary programs. If your program is a subroutine library, you may -consider it more useful to permit linking proprietary applications with the -library. If this is what you want to do, use the GNU Lesser General -Public License instead of this License. Index: Makefile ================================================================== --- Makefile +++ Makefile @@ -30,11 +30,10 @@ # for building intermediate code-generator tools. # #TCC = gcc -O6 #TCC = gcc -g -O0 -Wall -fprofile-arcs -ftest-coverage TCC = gcc -g -Os -Wall -TCC += -DFOSSIL_ENABLE_SSL #### Extra arguments for linking the finished binary. Fossil needs # to link against the Z-Lib compression library. There are no # other dependencies. We sometimes add the -static option here # so that we can build a static executable that will run in a @@ -45,15 +44,13 @@ # LIB += lsocket # Solaris 10 needs: # LIB += -lsocket -lnsl # My assumption is that the Sol10 flags will work for Sol8/9 and possibly 11. # -# If using FOSSIL_ENABLE_SSL, also enable the following: -LIB += -lssl -lcrypto #### Tcl shell for use in running the fossil testsuite. # TCLSH = tclsh # You should not need to change anything below this line ############################################################################### include $(SRCDIR)/main.mk Index: src/add.c ================================================================== --- src/add.c +++ src/add.c @@ -1,21 +1,15 @@ /* ** Copyright (c) 2007 D. Richard Hipp ** ** This program is free software; you can redistribute it and/or -** modify it under the terms of the GNU General Public -** License version 2 as published by the Free Software Foundation. -** +** modify it under the terms of the Simplified BSD License (also +** known as the "2-Clause License" or "FreeBSD License".) + ** This program is distributed in the hope that it will be useful, -** but WITHOUT ANY WARRANTY; without even the implied warranty of -** MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -** General Public License for more details. -** -** You should have received a copy of the GNU General Public -** License along with this library; if not, write to the -** Free Software Foundation, Inc., 59 Temple Place - Suite 330, -** Boston, MA 02111-1307, USA. +** but without any warranty; without even the implied warranty of +** merchantability or fitness for a particular purpose. ** ** Author contact information: ** drh@hwaci.com ** http://www.hwaci.com/drh/ ** @@ -298,12 +292,12 @@ ** Usage: %fossil mv|rename OLDNAME NEWNAME ** or: %fossil mv|rename OLDNAME... DIR ** ** Move or rename one or more files within the tree ** -** This command does not rename the files on disk. All this command does is -** record the fact that filenames have changed so that appropriate notations +** This command does not rename the files on disk. This command merely +** records the fact that filenames have changed so that appropriate notations ** can be made at the next commit/checkin. */ void mv_cmd(void){ int i; int vid; Index: src/allrepo.c ================================================================== --- src/allrepo.c +++ src/allrepo.c @@ -1,21 +1,15 @@ /* ** Copyright (c) 2008 D. Richard Hipp ** ** This program is free software; you can redistribute it and/or -** modify it under the terms of the GNU General Public -** License version 2 as published by the Free Software Foundation. -** +** modify it under the terms of the Simplified BSD License (also +** known as the "2-Clause License" or "FreeBSD License".) + ** This program is distributed in the hope that it will be useful, -** but WITHOUT ANY WARRANTY; without even the implied warranty of -** MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -** General Public License for more details. -** -** You should have received a copy of the GNU General Public -** License along with this library; if not, write to the -** Free Software Foundation, Inc., 59 Temple Place - Suite 330, -** Boston, MA 02111-1307, USA. +** but without any warranty; without even the implied warranty of +** merchantability or fitness for a particular purpose. ** ** Author contact information: ** drh@hwaci.com ** http://www.hwaci.com/drh/ ** @@ -62,13 +56,11 @@ ** The ~/.fossil file records the location of all repositories for a ** user. This command performs certain operations on all repositories ** that can be useful before or after a period of disconnection operation. ** Available operations are: ** -** list Display the location of all repositories -** -** ls An alias for "list" +** list | ls Display the location of all repositories ** ** pull Run a "pull" operation on all repositories ** ** push Run a "push" on all repositories ** @@ -93,13 +85,11 @@ usage("list|ls|pull|push|rebuild|sync"); } n = strlen(g.argv[2]); db_open_config(1); zCmd = g.argv[2]; - if( strncmp(zCmd, "list", n)==0 ){ - zCmd = "list"; - }else if( strncmp(zCmd, "ls", n)==0 ){ /* alias for "list" above */ + if( strncmp(zCmd, "list", n)==0 || strncmp(zCmd,"ls",n)==0 ){ zCmd = "list"; }else if( strncmp(zCmd, "push", n)==0 ){ zCmd = "push -autourl -R"; }else if( strncmp(zCmd, "pull", n)==0 ){ zCmd = "pull -autourl -R"; Index: src/attach.c ================================================================== --- src/attach.c +++ src/attach.c @@ -1,21 +1,15 @@ /* ** Copyright (c) 2010 D. Richard Hipp ** ** This program is free software; you can redistribute it and/or -** modify it under the terms of the GNU General Public -** License version 2 as published by the Free Software Foundation. -** +** modify it under the terms of the Simplified BSD License (also +** known as the "2-Clause License" or "FreeBSD License".) + ** This program is distributed in the hope that it will be useful, -** but WITHOUT ANY WARRANTY; without even the implied warranty of -** MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -** General Public License for more details. -** -** You should have received a copy of the GNU General Public -** License along with this library; if not, write to the -** Free Software Foundation, Inc., 59 Temple Place - Suite 330, -** Boston, MA 02111-1307, USA. +** but without any warranty; without even the implied warranty of +** merchantability or fitness for a particular purpose. ** ** Author contact information: ** drh@hwaci.com ** http://www.hwaci.com/drh/ ** Index: src/bag.c ================================================================== --- src/bag.c +++ src/bag.c @@ -1,21 +1,15 @@ /* ** Copyright (c) 2007 D. Richard Hipp ** ** This program is free software; you can redistribute it and/or -** modify it under the terms of the GNU General Public -** License version 2 as published by the Free Software Foundation. -** +** modify it under the terms of the Simplified BSD License (also +** known as the "2-Clause License" or "FreeBSD License".) + ** This program is distributed in the hope that it will be useful, -** but WITHOUT ANY WARRANTY; without even the implied warranty of -** MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -** General Public License for more details. -** -** You should have received a copy of the GNU General Public -** License along with this library; if not, write to the -** Free Software Foundation, Inc., 59 Temple Place - Suite 330, -** Boston, MA 02111-1307, USA. +** but without any warranty; without even the implied warranty of +** merchantability or fitness for a particular purpose. ** ** Author contact information: ** drh@hwaci.com ** http://www.hwaci.com/drh/ ** Index: src/blob.c ================================================================== --- src/blob.c +++ src/blob.c @@ -1,21 +1,15 @@ /* ** Copyright (c) 2006 D. Richard Hipp ** ** This program is free software; you can redistribute it and/or -** modify it under the terms of the GNU General Public -** License version 2 as published by the Free Software Foundation. -** +** modify it under the terms of the Simplified BSD License (also +** known as the "2-Clause License" or "FreeBSD License".) + ** This program is distributed in the hope that it will be useful, -** but WITHOUT ANY WARRANTY; without even the implied warranty of -** MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -** General Public License for more details. -** -** You should have received a copy of the GNU General Public -** License along with this library; if not, write to the -** Free Software Foundation, Inc., 59 Temple Place - Suite 330, -** Boston, MA 02111-1307, USA. +** but without any warranty; without even the implied warranty of +** merchantability or fitness for a particular purpose. ** ** Author contact information: ** drh@hwaci.com ** http://www.hwaci.com/drh/ ** Index: src/branch.c ================================================================== --- src/branch.c +++ src/branch.c @@ -1,21 +1,15 @@ /* ** Copyright (c) 2007 D. Richard Hipp ** ** This program is free software; you can redistribute it and/or -** modify it under the terms of the GNU General Public -** License version 2 as published by the Free Software Foundation. -** +** modify it under the terms of the Simplified BSD License (also +** known as the "2-Clause License" or "FreeBSD License".) + ** This program is distributed in the hope that it will be useful, -** but WITHOUT ANY WARRANTY; without even the implied warranty of -** MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -** General Public License for more details. -** -** You should have received a copy of the GNU General Public -** License along with this library; if not, write to the -** Free Software Foundation, Inc., 59 Temple Place - Suite 330, -** Boston, MA 02111-1307, USA. +** but without any warranty; without even the implied warranty of +** merchantability or fitness for a particular purpose. ** ** Author contact information: ** drh@hwaci.com ** http://www.hwaci.com/drh/ ** @@ -49,11 +43,11 @@ noSign = find_option("nosign","",0)!=0; zColor = find_option("bgcolor","c",1); verify_all_options(); if( g.argc<5 ){ - usage("new BRANCH-NAME BASE-CHECK-IN ?-bgcolor COLOR?"); + usage("new BRANCH-NAME CHECK-IN ?-bgcolor COLOR?"); } db_find_and_open_repository(1); noSign = db_get_int("omitsign", 0)|noSign; /* fossil branch new name */ @@ -174,11 +168,11 @@ /* ** COMMAND: branch ** ** Usage: %fossil branch SUBCOMMAND ... ?-R|--repository FILE? ** -** Run various subcommands on the branches of the open repository or +** Run various subcommands to manage branches of the open repository or ** of the repository identified by the -R or --repository option. ** ** %fossil branch new BRANCH-NAME BASIS ?-bgcolor COLOR? ** ** Create a new branch BRANCH-NAME off of check-in BASIS. Index: src/browse.c ================================================================== --- src/browse.c +++ src/browse.c @@ -1,21 +1,15 @@ /* ** Copyright (c) 2008 D. Richard Hipp ** ** This program is free software; you can redistribute it and/or -** modify it under the terms of the GNU General Public -** License version 2 as published by the Free Software Foundation. -** +** modify it under the terms of the Simplified BSD License (also +** known as the "2-Clause License" or "FreeBSD License".) + ** This program is distributed in the hope that it will be useful, -** but WITHOUT ANY WARRANTY; without even the implied warranty of -** MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -** General Public License for more details. -** -** You should have received a copy of the GNU General Public -** License along with this library; if not, write to the -** Free Software Foundation, Inc., 59 Temple Place - Suite 330, -** Boston, MA 02111-1307, USA. +** but without any warranty; without even the implied warranty of +** merchantability or fitness for a particular purpose. ** ** Author contact information: ** drh@hwaci.com ** http://www.hwaci.com/drh/ ** Index: src/captcha.c ================================================================== --- src/captcha.c +++ src/captcha.c @@ -1,21 +1,15 @@ /* ** Copyright (c) 2009 D. Richard Hipp ** ** This program is free software; you can redistribute it and/or -** modify it under the terms of the GNU General Public -** License version 2 as published by the Free Software Foundation. -** +** modify it under the terms of the Simplified BSD License (also +** known as the "2-Clause License" or "FreeBSD License".) + ** This program is distributed in the hope that it will be useful, -** but WITHOUT ANY WARRANTY; without even the implied warranty of -** MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -** General Public License for more details. -** -** You should have received a copy of the GNU General Public -** License along with this library; if not, write to the -** Free Software Foundation, Inc., 59 Temple Place - Suite 330, -** Boston, MA 02111-1307, USA. +** but without any warranty; without even the implied warranty of +** merchantability or fitness for a particular purpose. ** ** Author contact information: ** drh@hwaci.com ** http://www.hwaci.com/drh/ ** Index: src/cgi.c ================================================================== --- src/cgi.c +++ src/cgi.c @@ -1,21 +1,15 @@ /* ** Copyright (c) 2006 D. Richard Hipp ** ** This program is free software; you can redistribute it and/or -** modify it under the terms of the GNU General Public -** License version 2 as published by the Free Software Foundation. -** +** modify it under the terms of the Simplified BSD License (also +** known as the "2-Clause License" or "FreeBSD License".) + ** This program is distributed in the hope that it will be useful, -** but WITHOUT ANY WARRANTY; without even the implied warranty of -** MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -** General Public License for more details. -** -** You should have received a copy of the GNU General Public -** License along with this library; if not, write to the -** Free Software Foundation, Inc., 59 Temple Place - Suite 330, -** Boston, MA 02111-1307, USA. +** but without any warranty; without even the implied warranty of +** merchantability or fitness for a particular purpose. ** ** Author contact information: ** drh@hwaci.com ** http://www.hwaci.com/drh/ ** @@ -27,25 +21,25 @@ ** formatting function and its cousins, and routines to encode and ** decode strings in HTML or HTTP. */ #include "config.h" #ifdef __MINGW32__ -# include /* for Sleep once server works again */ -# include /* socket operations */ -# define sleep Sleep /* windows does not have sleep, but Sleep */ -# include +# include /* for Sleep once server works again */ +# include /* socket operations */ +# define sleep Sleep /* windows does not have sleep, but Sleep */ +# include #else -# include -# include -# include -# include -# include -# include -# include +# include +# include +# include +# include +# include +# include +# include #endif #ifdef __EMX__ - typedef int socklen_t; + typedef int socklen_t; #endif #include #include #include #include @@ -195,17 +189,14 @@ const char *zPath, /* Path cookie applies to. NULL means "/" */ int lifetime /* Expiration of the cookie in seconds from now */ ){ if( zPath==0 ) zPath = g.zTop; if( lifetime>0 ){ - char *zDate; lifetime += (int)time(0); - zDate = cgi_rfc822_datestamp(lifetime); blob_appendf(&extraHeader, - "Set-Cookie: %s=%t; Path=%s; expires=%s; Version=1\r\n", - zName, zValue, zPath, zDate); - if( zDate[0] ) free( zDate ); + "Set-Cookie: %s=%t; Path=%s; expires=%z; Version=1\r\n", + zName, zValue, zPath, cgi_rfc822_datestamp(lifetime)); }else{ blob_appendf(&extraHeader, "Set-Cookie: %s=%t; Path=%s; Version=1\r\n", zName, zValue, zPath); } @@ -266,11 +257,11 @@ /* ** Do a normal HTTP reply */ void cgi_reply(void){ - int total_size = 0; + int total_size; if( iReplyStatus<=0 ){ iReplyStatus = 200; zReplyStatus = "OK"; } @@ -284,14 +275,12 @@ zReplyStatus = "Not Modified"; } #endif if( g.fullHttpReply ){ - char *zDate = cgi_rfc822_datestamp(time(0)); fprintf(g.httpOut, "HTTP/1.0 %d %s\r\n", iReplyStatus, zReplyStatus); - fprintf(g.httpOut, "Date: %s\r\n", zDate ); - if( zDate[0] ) free( zDate ); + fprintf(g.httpOut, "Date: %s\r\n", cgi_rfc822_datestamp(time(0))); fprintf(g.httpOut, "Connection: close\r\n"); }else{ fprintf(g.httpOut, "Status: %d %s\r\n", iReplyStatus, zReplyStatus); } @@ -308,13 +297,11 @@ ** stale cache is the least of the problem. So we provide an Expires ** header set to a reasonable period (default: one week). */ /*time_t expires = time(0) + atoi(db_config("constant_expires","604800"));*/ time_t expires = time(0) + 604800; - char * zDate = cgi_rfc822_datestamp(expires); - fprintf(g.httpOut, "Expires: %s\r\n", zDate ); - if( zDate[0] ) free( zDate ); + fprintf(g.httpOut, "Expires: %s\r\n", cgi_rfc822_datestamp(expires)); }else{ fprintf(g.httpOut, "Cache-control: no-cache, no-store\r\n"); } /* Content intended for logged in users should only be cached in @@ -327,10 +314,12 @@ } if( iReplyStatus != 304 ) { total_size = blob_size(&cgiContent[0]) + blob_size(&cgiContent[1]); fprintf(g.httpOut, "Content-Length: %d\r\n", total_size); + }else{ + total_size = 0; } fprintf(g.httpOut, "\r\n"); if( total_size>0 && iReplyStatus != 304 ){ int i, size; for(i=0; i<2; i++){ @@ -1280,26 +1269,28 @@ {"Jan", "Feb", "Mar", "Apr", "May", "Jun", "Jul", "Aug", "Sep", "Oct", "Nov", "Dec", 0}; /* -** Returns an RFC822-formatted time string suitable for HTTP headers, among -** other things. -** Returned timezone is always GMT as required by HTTP/1.1 specification. -** The returned string is allocated with malloc() and must be freed -** with free(). +** Returns an RFC822-formatted time string suitable for HTTP headers. +** The timezone is always GMT. The value returned is always a +** string obtained from mprintf() and must be freed using free() to +** avoid a memory leak. ** ** See http://www.faqs.org/rfcs/rfc822.html, section 5 ** and http://www.faqs.org/rfcs/rfc2616.html, section 3.3. */ char *cgi_rfc822_datestamp(time_t now){ struct tm *pTm; pTm = gmtime(&now); - if( pTm==0 ) return ""; - return mprintf("%s, %d %s %02d %02d:%02d:%02d GMT", - azDays[pTm->tm_wday], pTm->tm_mday, azMonths[pTm->tm_mon], - pTm->tm_year+1900, pTm->tm_hour, pTm->tm_min, pTm->tm_sec); + if( pTm==0 ){ + return mprintf(""); + }else{ + return mprintf("%s, %d %s %02d %02d:%02d:%02d GMT", + azDays[pTm->tm_wday], pTm->tm_mday, azMonths[pTm->tm_mon], + pTm->tm_year+1900, pTm->tm_hour, pTm->tm_min, pTm->tm_sec); + } } /* ** Parse an RFC822-formatted timestamp as we'd expect from HTTP and return ** a Unix epoch time. <= zero is returned on failure. Index: src/checkin.c ================================================================== --- src/checkin.c +++ src/checkin.c @@ -1,21 +1,15 @@ /* ** Copyright (c) 2007 D. Richard Hipp ** ** This program is free software; you can redistribute it and/or -** modify it under the terms of the GNU General Public -** License version 2 as published by the Free Software Foundation. -** +** modify it under the terms of the Simplified BSD License (also +** known as the "2-Clause License" or "FreeBSD License".) + ** This program is distributed in the hope that it will be useful, -** but WITHOUT ANY WARRANTY; without even the implied warranty of -** MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -** General Public License for more details. -** -** You should have received a copy of the GNU General Public -** License along with this library; if not, write to the -** Free Software Foundation, Inc., 59 Temple Place - Suite 330, -** Boston, MA 02111-1307, USA. +** but without any warranty; without even the implied warranty of +** merchantability or fitness for a particular purpose. ** ** Author contact information: ** drh@hwaci.com ** http://www.hwaci.com/drh/ ** @@ -529,17 +523,14 @@ ** ** Usage: %fossil commit ?OPTIONS? ?FILE...? ** ** Create a new version containing all of the changes in the current ** checkout. You will be prompted to enter a check-in comment unless -** one of the "-m" or "-M" options are used to specify a comment. -** "-m" takes a single string for the commit message and "-M" requires -** a filename from which to read the commit message. If neither "-m" -** nor "-M" are specified then the editor defined in the "editor" -** fossil option (see %fossil help set) will be used, or from the -** "VISUAL" or "EDITOR" environment variables (in that order) if no -** editor is set. +** the comment has been specified on the command-line using "-m". +** The editor defined in the "editor" fossil option (see %fossil help set) +** will be used, or from the "VISUAL" or "EDITOR" environment variables +** (in that order) if no editor is set. ** ** You will be prompted for your GPG passphrase in order to sign the ** new manifest unless the "--nosign" options is used. All files that ** have changed will be committed unless some subset of files is ** specified on the command line. @@ -561,11 +552,10 @@ ** --branch NEW-BRANCH-NAME ** --bgcolor COLOR ** --nosign ** --force|-f ** --private -** --message-file|-M COMMENT-FILE ** */ void commit_cmd(void){ int rc; int vid, nrid, nvid; @@ -581,11 +571,11 @@ int nBasename; /* Length of "g.zLocalRoot/" */ const char *zBranch; /* Create a new branch with this name */ const char *zBgColor; /* Set background color when branching */ const char *zDateOvrd; /* Override date string */ const char *zUserOvrd; /* Override user name */ - const char *zCommentFile; /* Read commit message from this file */ + const char *zComFile; /* Read commit message from this file */ Blob filename; /* complete filename */ Blob manifest; Blob muuid; /* Manifest uuid */ Blob mcksum; /* Self-checksum on the manifest */ Blob cksum1, cksum2; /* Before and after commit checksums */ @@ -595,11 +585,11 @@ noSign = find_option("nosign",0,0)!=0; zComment = find_option("comment","m",1); forceFlag = find_option("force", "f", 0)!=0; zBranch = find_option("branch","b",1); zBgColor = find_option("bgcolor",0,1); - zCommentFile = find_option("message-file", "M", 1); + zComFile = find_option("message-file", "M", 1); if( find_option("private",0,0) ){ g.markPrivate = 1; if( zBranch==0 ) zBranch = "private"; if( zBgColor==0 ) zBgColor = "#fec084"; /* Orange */ } @@ -688,13 +678,13 @@ vfile_aggregate_checksum_disk(vid, &cksum1); if( zComment ){ blob_zero(&comment); blob_append(&comment, zComment, -1); - }else if( zCommentFile ){ + }else if( zComFile ){ blob_zero(&comment); - blob_read_from_file(&comment, zCommentFile); + blob_read_from_file(&comment, zComFile); }else{ char *zInit = db_text(0, "SELECT value FROM vvar WHERE name='ci-comment'"); prepare_commit_comment(&comment, zInit, zBranch, vid); free(zInit); } @@ -915,263 +905,5 @@ } if( count_nonbranch_children(vid)>1 ){ printf("**** warning: a fork has occurred *****\n"); } } - -/* -** COMMAND: test-import-manifest -** -** Usage: %fossil test-import-manifest DATE COMMENT ?-p PARENT_RECORDID?... ?-f (FILE_RECORDID PATH)?... -** -** Create a new version containing the specified file -** revisions (if any), and child of the given PARENT version. -*/ -void import_manifest_cmd(void){ - const char* zDate; /* argument - timestamp, as seconds since epoch (int) */ - const char* zComment; /* argument - manifest comment */ - char* zDateFmt; /* timestamp formatted for the manifest */ - int* zParents; /* arguments - array of parent references */ - int zParentCount; /* number of found parent references */ - Blob manifest; /* container for the manifest to be generated */ - Blob mcksum; /* Self-checksum on the manifest */ - Blob cksum, cksum2; /* Before and after commit checksums */ - Blob cksum1b; /* Checksum recorded in the manifest */ - const char* parent; /* loop variable when collecting parent references */ - int i, mid; /* Another loop index, and id of new manifest */ - Stmt q; /* sql statement to query table of files */ - char* zMidUuid; /* Uuid for the newly generated manifest */ - - -#define USAGE ("DATE COMMENT ?-p|-parent PARENT_RID...? ?-f|-file (FILE_RID PATH)...?") - - /* - ** Validate and process arguments, collect information. - */ - - db_must_be_within_tree(); - - /* Mandatory arguments */ - if (g.argc < 4) { - usage (USAGE); - } - - zDate = g.argv[2]; - zComment = g.argv[3]; - - remove_from_argv (2,2); - - /* Pull the optional parent arguments - ** - ** Note: In principle it is possible that the loop below extracts - ** the wrong arguments, if we ever try to import a file whose path - ** starts with -p/-parent. In that case however the removal of two - ** arguments will leave the file bereft of an argument and the - ** recheck of the number of arguments below should catch that. - ** - ** For a test command this is acceptable, it won't have lots of - ** safety nets. - */ - - zParentCount = 0; - zParents = (int*)malloc(sizeof(int)*(1+g.argc)); - /* 1+, to be ok with the default even if no arguments around */ - - while ((parent = find_option("parent","p",1)) != NULL) { - /* Check and store ... */ - zParents [zParentCount] = name_to_rid (parent); - zParentCount ++; - } - - /* - ** Fall back to the root manifest as parent if none were specified - ** explicitly. - */ - - if (!zParentCount) { - zParents [zParentCount] = 1; /* HACK: rid 1 is the baseline manifest - ** which was entered when the repository - ** was created via 'new'. It always has - ** rid 1. - */ - zParentCount ++; - } - - /* Pull the file arguments, at least one has to be present. They are - ** the only things we can have here, now, and they are triples of - ** '-f FID PATH', so use of find_option is out, and we can check the - ** number of arguments. - ** - ** Note: We store the data in a temp. table, so that we later can - ** pull it sorted, and also easily get the associated hash - ** identifiers. - ** - ** Note 2: We expect at least one file, otherwise the manifest won't - ** be recognized as a baseline by the manifest parser. - */ - - if (((g.argc-2) % 3 != 0) || (g.argc < 5)) { - usage (USAGE); - } - - db_begin_transaction(); - db_multi_exec ("CREATE TEMP TABLE __im (" - "rid INTEGER NOT NULL," - "pathname TEXT NOT NULL)" ); - - while (g.argc > 2) { - /* Check and store ... */ - if (strcmp("-f", g.argv[2]) && - strcmp("-file",g.argv[2])) { - usage (USAGE); - } - - /* DANGER The %s for the path might lead itself to an injection - ** attack. For now (i.e. testing) this is ok, but do something - ** better in the future. - */ - - db_multi_exec("INSERT INTO __im VALUES(%d,'%s')", - name_to_rid (g.argv[3]), g.argv[4] ); - remove_from_argv (2,3); - } - - verify_all_options(); - - /* - ** Determine the user the manifest will belong to, and check that - ** this user exists. - */ - - user_select(); - if( !db_exists("SELECT 1 FROM user WHERE login=%Q", g.zLogin) ){ - fossil_fatal("no such user: %s", g.zLogin); - } - - /* - ** Now generate the manifest in memory. - ** - ** Start with comment and date. The latter is converted to the - ** proper format before insertion. - */ - - blob_zero(&manifest); - - if (!strlen(zComment)) { - blob_appendf(&manifest, "C %F\n", "(no comment)"); - } else { - blob_appendf(&manifest, "C %F\n", zComment); - } - - zDateFmt = db_text(0, "SELECT datetime(%Q,'unixepoch')",zDate); - zDateFmt[10] = 'T'; - blob_appendf(&manifest, "D %s\n", zDateFmt); - free(zDateFmt); - - /* - ** Follow with all the collected files, properly sorted. Here were - ** also compute the checksum over the files (paths, sizes, - ** contents), similar to what 'vfile_aggregate_checksum_repository' - ** does. - */ - - md5sum_init(); - db_prepare(&q, - "SELECT pathname, uuid, __im.rid" - " FROM __im JOIN blob ON __im.rid=blob.rid" - " ORDER BY 1"); - - while( db_step(&q)==SQLITE_ROW ){ - char zBuf[100]; - Blob file; - const char *zName = db_column_text(&q, 0); - const char *zUuid = db_column_text(&q, 1); - int zRid = db_column_int (&q, 2); - - /* Extend the manifest */ - blob_appendf(&manifest, "F %F %s\n", zName, zUuid); - - /* Update the checksum */ - md5sum_step_text(zName, -1); - blob_zero(&file); - content_get(zRid, &file); - sprintf(zBuf, " %d\n", blob_size(&file)); - md5sum_step_text(zBuf, -1); - md5sum_step_blob(&file); - blob_reset(&file); - } - db_finalize(&q); - md5sum_finish (&cksum); - - /* - ** Follow with all the specified parents. We know that there is at - ** least one. - */ - - blob_appendf(&manifest, "P"); - for (i=0;i #include #include #include #include +#ifdef __MINGW32__ +# include +#else +# include +#endif + #include "sqlite3.h" /* ** Typedef for a 64-bit integer */ Index: src/configure.c ================================================================== --- src/configure.c +++ src/configure.c @@ -1,21 +1,15 @@ /* ** Copyright (c) 2008 D. Richard Hipp ** ** This program is free software; you can redistribute it and/or -** modify it under the terms of the GNU General Public -** License version 2 as published by the Free Software Foundation. -** +** modify it under the terms of the Simplified BSD License (also +** known as the "2-Clause License" or "FreeBSD License".) + ** This program is distributed in the hope that it will be useful, -** but WITHOUT ANY WARRANTY; without even the implied warranty of -** MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -** General Public License for more details. -** -** You should have received a copy of the GNU General Public -** License along with this library; if not, write to the -** Free Software Foundation, Inc., 59 Temple Place - Suite 330, -** Boston, MA 02111-1307, USA. +** but without any warranty; without even the implied warranty of +** merchantability or fitness for a particular purpose. ** ** Author contact information: ** drh@hwaci.com ** http://www.hwaci.com/drh/ ** DELETED src/construct.c Index: src/construct.c ================================================================== --- src/construct.c +++ /dev/null @@ -1,168 +0,0 @@ -/* -** Copyright (c) 2007 Andreas Kupries -** -** This program is free software; you can redistribute it and/or -** modify it under the terms of the GNU General Public -** License version 2 as published by the Free Software Foundation. -** -** This program is distributed in the hope that it will be useful, -** but WITHOUT ANY WARRANTY; without even the implied warranty of -** MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -** General Public License for more details. -** -** You should have received a copy of the GNU General Public -** License along with this library; if not, write to the -** Free Software Foundation, Inc., 59 Temple Place - Suite 330, -** Boston, MA 02111-1307, USA. -** -** Author contact information: -** akupries@shaw.ca -** -** -******************************************************************************* -** -** This file contains code used to de- and reconstruct a repository -** into and from an indicated directory. -*/ -#include "config.h" -#include "construct.h" -#include -#include -#include - -/* This function recursively scans the directory hierarchy starting at -** zOrigin and enters all found files into the repository. The uuid is -** generated from the file contents, and not taken from the, possibly -** modified, file name. While function is able to handle the directory -** structure created by 'deconstruct' it can actually much more. -*/ - -static int import_origin(const char* zOrigin){ - DIR *d; - int count = 0; - const char *zFormat; - const char *zDir = zOrigin; - struct dirent *pEntry; - - if( zDir[0]==0 ){ - zDir = "."; - zFormat = "%s%s"; - }else{ - zFormat = "%s/%s"; - } - - d = opendir(zDir); - if( d ){ - while( (pEntry=readdir(d))!=0 ){ - char *zPath; - if( pEntry->d_name[0]=='.' ) continue; - zPath = mprintf(zFormat, zOrigin, pEntry->d_name); - if( file_isdir(zPath)==1 ){ - count += import_origin(zPath); - }else if( file_isfile(zPath) ){ - Blob zIn; - blob_read_from_file (&zIn,zPath); - content_put (&zIn, 0, 0); - blob_reset (&zIn); - count++; - } - free (zPath); - } - } - closedir(d); - return count; -} - -/* -** COMMAND: deconstruct -** Usage %fossil deconstruct ?-R|--repository REPOSITORY? DESTINATION -** -** Populates the indicated DESTINATION directory with copies of all -** artifcats contained within the repository. Artifacts are named AA/bbbbb -** where AA is the first 2 characters of the artifact ID and bbbbb is the -** remaining 38 characters. -*/ - -void deconstruct_cmd(void){ - const char* zDestination; - Blob zOut; - Stmt q; - if( (g.argc != 3) && (g.argc != 5) ){ - usage ("?-R|--repository REPOSITORY? DESTINATION"); - } - db_find_and_open_repository(1); - zDestination = g.argv[g.argc-1]; - if( !file_isdir (zDestination) ){ - fossil_panic("not a directory: %s", zDestination); - } - /* Iterate over all blobs in the repository, retrieve their - * contents, and write them to a file with a name based on their - * uuid. Note: Non-writable destination causes bail-out in the first - * call of blob_write_to_file. - */ - db_prepare(&q, "SELECT rid,uuid FROM blob"); - while( db_step(&q)==SQLITE_ROW ){ - int rid = db_column_int (&q, 0); - const char *zUuid = db_column_text(&q, 1); - char *zFile = mprintf ("%s/%.2s/%s", zDestination, zUuid, zUuid + 2); - content_get (rid,&zOut); - blob_write_to_file (&zOut,zFile); - blob_reset (&zOut); - free(zFile); - } - db_finalize(&q); -} - -/* -** COMMAND: reconstruct -** Usage %fossil reconstruct REPOSITORY ORIGIN -** -** Creates the REPOSITORY and populates it with the artifacts in the -** indicated ORIGIN directory. -*/ - -void reconstruct_cmd(void){ - const char* zOrigin; - const char* zRepository; - int fileCnt; - int errCnt; - - if( g.argc != 4 ){ - usage ("REPOSITORY ORIGIN"); - } - zRepository = g.argv[2]; - zOrigin = g.argv[3]; - if( !file_isdir (zOrigin) ){ - fossil_panic("not a directory: %s", zOrigin); - } - - /* Create the foundation */ - db_create_repository(zRepository); - db_open_repository(zRepository); - db_open_config(0); - db_begin_transaction(); - - db_initial_setup(0, 0, 1); - - printf("project-id: %s\n", db_get("project-code", 0)); - printf("server-id: %s\n", db_get("server-code", 0)); - printf("admin-user: %s (no password set yet!)\n", g.zLogin); - printf("baseline: %s\n", db_text(0, "SELECT uuid FROM blob")); - - /* Scan origin and insert all files found inside */ - fileCnt = import_origin (zOrigin); - - printf("imported: %d %s\n", fileCnt, fileCnt == 1 ? - "file" : "files"); - - /* Finalize the repository, rebuild the derived tables */ - errCnt = rebuild_db(0, 0); - - if( errCnt ){ - printf("%d %s. Rolling back changes.\n", errCnt, errCnt == 1 ? - "error" : "errors"); - db_end_transaction(1); - }else{ - db_end_transaction(0); - } -} Index: src/content.c ================================================================== --- src/content.c +++ src/content.c @@ -1,21 +1,15 @@ /* ** Copyright (c) 2006 D. Richard Hipp ** ** This program is free software; you can redistribute it and/or -** modify it under the terms of the GNU General Public -** License version 2 as published by the Free Software Foundation. -** +** modify it under the terms of the Simplified BSD License (also +** known as the "2-Clause License" or "FreeBSD License".) + ** This program is distributed in the hope that it will be useful, -** but WITHOUT ANY WARRANTY; without even the implied warranty of -** MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -** General Public License for more details. -** -** You should have received a copy of the GNU General Public -** License along with this library; if not, write to the -** Free Software Foundation, Inc., 59 Temple Place - Suite 330, -** Boston, MA 02111-1307, USA. +** but without any warranty; without even the implied warranty of +** merchantability or fitness for a particular purpose. ** ** Author contact information: ** drh@hwaci.com ** http://www.hwaci.com/drh/ ** Index: src/db.c ================================================================== --- src/db.c +++ src/db.c @@ -1,21 +1,15 @@ /* ** Copyright (c) 2006 D. Richard Hipp ** ** This program is free software; you can redistribute it and/or -** modify it under the terms of the GNU General Public -** License version 2 as published by the Free Software Foundation. -** +** modify it under the terms of the Simplified BSD License (also +** known as the "2-Clause License" or "FreeBSD License".) + ** This program is distributed in the hope that it will be useful, -** but WITHOUT ANY WARRANTY; without even the implied warranty of -** MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -** General Public License for more details. -** -** You should have received a copy of the GNU General Public -** License along with this library; if not, write to the -** Free Software Foundation, Inc., 59 Temple Place - Suite 330, -** Boston, MA 02111-1307, USA. +** but without any warranty; without even the implied warranty of +** merchantability or fitness for a particular purpose. ** ** Author contact information: ** drh@hwaci.com ** http://www.hwaci.com/drh/ ** @@ -33,16 +27,10 @@ ** (3) A local checkout database named "_FOSSIL_" or ".fos" ** and located at the root of the local copy of the source tree. ** */ #include "config.h" -#ifndef __MINGW32__ -# include -#endif -#ifdef __MINGW32__ -# include -#endif #include #include #include #include #include "db.h" @@ -1471,14 +1459,10 @@ ** With a value argument it changes the property for the current repository. ** ** The "unset" command clears a property setting. ** ** -** auto-captcha If enabled, the Login page will provide a button -** which uses JavaScript to fill out the captcha for -** the "anonymous" user. (Most bots cannot use JavaScript.) -** ** autosync If enabled, automatically pull prior to commit ** or update and automatically push after commit or ** tag or branch creation. If the the value is "pullonly" ** then only pull operations occur automatically. ** @@ -1529,11 +1513,10 @@ ** Defaults to "start" on windows, "open" on Mac, ** and "firefox" on Unix. */ void setting_cmd(void){ static const char *azName[] = { - "auto-captcha", "autosync", "binary-glob", "clearsign", "diff-command", "dont-push", Index: src/delta.c ================================================================== --- src/delta.c +++ src/delta.c @@ -1,21 +1,15 @@ /* ** Copyright (c) 2006 D. Richard Hipp ** ** This program is free software; you can redistribute it and/or -** modify it under the terms of the GNU General Public -** License version 2 as published by the Free Software Foundation. -** +** modify it under the terms of the Simplified BSD License (also +** known as the "2-Clause License" or "FreeBSD License".) + ** This program is distributed in the hope that it will be useful, -** but WITHOUT ANY WARRANTY; without even the implied warranty of -** MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -** General Public License for more details. -** -** You should have received a copy of the GNU General Public -** License along with this library; if not, write to the -** Free Software Foundation, Inc., 59 Temple Place - Suite 330, -** Boston, MA 02111-1307, USA. +** but without any warranty; without even the implied warranty of +** merchantability or fitness for a particular purpose. ** ** Author contact information: ** drh@hwaci.com ** http://www.hwaci.com/drh/ ** Index: src/deltacmd.c ================================================================== --- src/deltacmd.c +++ src/deltacmd.c @@ -1,21 +1,15 @@ /* ** Copyright (c) 2006 D. Richard Hipp ** ** This program is free software; you can redistribute it and/or -** modify it under the terms of the GNU General Public -** License version 2 as published by the Free Software Foundation. -** +** modify it under the terms of the Simplified BSD License (also +** known as the "2-Clause License" or "FreeBSD License".) + ** This program is distributed in the hope that it will be useful, -** but WITHOUT ANY WARRANTY; without even the implied warranty of -** MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -** General Public License for more details. -** -** You should have received a copy of the GNU General Public -** License along with this library; if not, write to the -** Free Software Foundation, Inc., 59 Temple Place - Suite 330, -** Boston, MA 02111-1307, USA. +** but without any warranty; without even the implied warranty of +** merchantability or fitness for a particular purpose. ** ** Author contact information: ** drh@hwaci.com ** http://www.hwaci.com/drh/ ** Index: src/descendants.c ================================================================== --- src/descendants.c +++ src/descendants.c @@ -1,21 +1,15 @@ /* ** Copyright (c) 2007 D. Richard Hipp ** ** This program is free software; you can redistribute it and/or -** modify it under the terms of the GNU General Public -** License version 2 as published by the Free Software Foundation. -** +** modify it under the terms of the Simplified BSD License (also +** known as the "2-Clause License" or "FreeBSD License".) + ** This program is distributed in the hope that it will be useful, -** but WITHOUT ANY WARRANTY; without even the implied warranty of -** MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -** General Public License for more details. -** -** You should have received a copy of the GNU General Public -** License along with this library; if not, write to the -** Free Software Foundation, Inc., 59 Temple Place - Suite 330, -** Boston, MA 02111-1307, USA. +** but without any warranty; without even the implied warranty of +** merchantability or fitness for a particular purpose. ** ** Author contact information: ** drh@hwaci.com ** http://www.hwaci.com/drh/ ** Index: src/diff.c ================================================================== --- src/diff.c +++ src/diff.c @@ -1,21 +1,15 @@ /* ** Copyright (c) 2007 D. Richard Hipp ** ** This program is free software; you can redistribute it and/or -** modify it under the terms of the GNU General Public -** License version 2 as published by the Free Software Foundation. -** +** modify it under the terms of the Simplified BSD License (also +** known as the "2-Clause License" or "FreeBSD License".) + ** This program is distributed in the hope that it will be useful, -** but WITHOUT ANY WARRANTY; without even the implied warranty of -** MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -** General Public License for more details. -** -** You should have received a copy of the GNU General Public -** License along with this library; if not, write to the -** Free Software Foundation, Inc., 59 Temple Place - Suite 330, -** Boston, MA 02111-1307, USA. +** but without any warranty; without even the implied warranty of +** merchantability or fitness for a particular purpose. ** ** Author contact information: ** drh@hwaci.com ** http://www.hwaci.com/drh/ ** Index: src/diffcmd.c ================================================================== --- src/diffcmd.c +++ src/diffcmd.c @@ -1,21 +1,15 @@ /* ** Copyright (c) 2007 D. Richard Hipp ** ** This program is free software; you can redistribute it and/or -** modify it under the terms of the GNU General Public -** License version 2 as published by the Free Software Foundation. -** +** modify it under the terms of the Simplified BSD License (also +** known as the "2-Clause License" or "FreeBSD License".) + ** This program is distributed in the hope that it will be useful, -** but WITHOUT ANY WARRANTY; without even the implied warranty of -** MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -** General Public License for more details. -** -** You should have received a copy of the GNU General Public -** License along with this library; if not, write to the -** Free Software Foundation, Inc., 59 Temple Place - Suite 330, -** Boston, MA 02111-1307, USA. +** but without any warranty; without even the implied warranty of +** merchantability or fitness for a particular purpose. ** ** Author contact information: ** drh@hwaci.com ** http://www.hwaci.com/drh/ ** Index: src/doc.c ================================================================== --- src/doc.c +++ src/doc.c @@ -1,21 +1,15 @@ /* ** Copyright (c) 2007 D. Richard Hipp ** ** This program is free software; you can redistribute it and/or -** modify it under the terms of the GNU General Public -** License version 2 as published by the Free Software Foundation. -** +** modify it under the terms of the Simplified BSD License (also +** known as the "2-Clause License" or "FreeBSD License".) + ** This program is distributed in the hope that it will be useful, -** but WITHOUT ANY WARRANTY; without even the implied warranty of -** MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -** General Public License for more details. -** -** You should have received a copy of the GNU General Public -** License along with this library; if not, write to the -** Free Software Foundation, Inc., 59 Temple Place - Suite 330, -** Boston, MA 02111-1307, USA. +** but without any warranty; without even the implied warranty of +** merchantability or fitness for a particular purpose. ** ** Author contact information: ** drh@hwaci.com ** http://www.hwaci.com/drh/ ** Index: src/encode.c ================================================================== --- src/encode.c +++ src/encode.c @@ -1,21 +1,15 @@ /* ** Copyright (c) 2006 D. Richard Hipp ** ** This program is free software; you can redistribute it and/or -** modify it under the terms of the GNU General Public -** License version 2 as published by the Free Software Foundation. -** +** modify it under the terms of the Simplified BSD License (also +** known as the "2-Clause License" or "FreeBSD License".) + ** This program is distributed in the hope that it will be useful, -** but WITHOUT ANY WARRANTY; without even the implied warranty of -** MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -** General Public License for more details. -** -** You should have received a copy of the GNU General Public -** License along with this library; if not, write to the -** Free Software Foundation, Inc., 59 Temple Place - Suite 330, -** Boston, MA 02111-1307, USA. +** but without any warranty; without even the implied warranty of +** merchantability or fitness for a particular purpose. ** ** Author contact information: ** drh@hwaci.com ** http://www.hwaci.com/drh/ ** Index: src/file.c ================================================================== --- src/file.c +++ src/file.c @@ -1,21 +1,15 @@ /* ** Copyright (c) 2006 D. Richard Hipp ** ** This program is free software; you can redistribute it and/or -** modify it under the terms of the GNU General Public -** License version 2 as published by the Free Software Foundation. -** +** modify it under the terms of the Simplified BSD License (also +** known as the "2-Clause License" or "FreeBSD License".) + ** This program is distributed in the hope that it will be useful, -** but WITHOUT ANY WARRANTY; without even the implied warranty of -** MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -** General Public License for more details. -** -** You should have received a copy of the GNU General Public -** License along with this library; if not, write to the -** Free Software Foundation, Inc., 59 Temple Place - Suite 330, -** Boston, MA 02111-1307, USA. +** but without any warranty; without even the implied warranty of +** merchantability or fitness for a particular purpose. ** ** Author contact information: ** drh@hwaci.com ** http://www.hwaci.com/drh/ ** Index: src/finfo.c ================================================================== --- src/finfo.c +++ src/finfo.c @@ -1,21 +1,15 @@ /* ** Copyright (c) 2009 D. Richard Hipp ** ** This program is free software; you can redistribute it and/or -** modify it under the terms of the GNU General Public -** License version 2 as published by the Free Software Foundation. -** +** modify it under the terms of the Simplified BSD License (also +** known as the "2-Clause License" or "FreeBSD License".) + ** This program is distributed in the hope that it will be useful, -** but WITHOUT ANY WARRANTY; without even the implied warranty of -** MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -** General Public License for more details. -** -** You should have received a copy of the GNU General Public -** License along with this library; if not, write to the -** Free Software Foundation, Inc., 59 Temple Place - Suite 330, -** Boston, MA 02111-1307, USA. +** but without any warranty; without even the implied warranty of +** merchantability or fitness for a particular purpose. ** ** Author contact information: ** drh@hwaci.com ** http://www.hwaci.com/drh/ ** Index: src/graph.c ================================================================== --- src/graph.c +++ src/graph.c @@ -1,21 +1,15 @@ /* ** Copyright (c) 2010 D. Richard Hipp ** ** This program is free software; you can redistribute it and/or -** modify it under the terms of the GNU General Public -** License version 2 as published by the Free Software Foundation. -** +** modify it under the terms of the Simplified BSD License (also +** known as the "2-Clause License" or "FreeBSD License".) + ** This program is distributed in the hope that it will be useful, -** but WITHOUT ANY WARRANTY; without even the implied warranty of -** MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -** General Public License for more details. -** -** You should have received a copy of the GNU General Public -** License along with this library; if not, write to the -** Free Software Foundation, Inc., 59 Temple Place - Suite 330, -** Boston, MA 02111-1307, USA. +** but without any warranty; without even the implied warranty of +** merchantability or fitness for a particular purpose. ** ** Author contact information: ** drh@hwaci.com ** http://www.hwaci.com/drh/ ** Index: src/http.c ================================================================== --- src/http.c +++ src/http.c @@ -1,21 +1,15 @@ /* ** Copyright (c) 2007 D. Richard Hipp ** ** This program is free software; you can redistribute it and/or -** modify it under the terms of the GNU General Public -** License version 2 as published by the Free Software Foundation. -** +** modify it under the terms of the Simplified BSD License (also +** known as the "2-Clause License" or "FreeBSD License".) + ** This program is distributed in the hope that it will be useful, -** but WITHOUT ANY WARRANTY; without even the implied warranty of -** MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -** General Public License for more details. -** -** You should have received a copy of the GNU General Public -** License along with this library; if not, write to the -** Free Software Foundation, Inc., 59 Temple Place - Suite 330, -** Boston, MA 02111-1307, USA. +** but without any warranty; without even the implied warranty of +** merchantability or fitness for a particular purpose. ** ** Author contact information: ** drh@hwaci.com ** http://www.hwaci.com/drh/ ** Index: src/http_socket.c ================================================================== --- src/http_socket.c +++ src/http_socket.c @@ -1,21 +1,15 @@ /* ** Copyright (c) 2009 D. Richard Hipp ** ** This program is free software; you can redistribute it and/or -** modify it under the terms of the GNU General Public -** License version 2 as published by the Free Software Foundation. -** +** modify it under the terms of the Simplified BSD License (also +** known as the "2-Clause License" or "FreeBSD License".) + ** This program is distributed in the hope that it will be useful, -** but WITHOUT ANY WARRANTY; without even the implied warranty of -** MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -** General Public License for more details. -** -** You should have received a copy of the GNU General Public -** License along with this library; if not, write to the -** Free Software Foundation, Inc., 59 Temple Place - Suite 330, -** Boston, MA 02111-1307, USA. +** but without any warranty; without even the implied warranty of +** merchantability or fitness for a particular purpose. ** ** Author contact information: ** drh@hwaci.com ** http://www.hwaci.com/drh/ ** DELETED src/http_ssl.c Index: src/http_ssl.c ================================================================== --- src/http_ssl.c +++ /dev/null @@ -1,290 +0,0 @@ -/* -** Copyright (c) 2009 D. Richard Hipp -** -** This program is free software; you can redistribute it and/or -** modify it under the terms of the GNU General Public -** License version 2 as published by the Free Software Foundation. -** -** This program is distributed in the hope that it will be useful, -** but WITHOUT ANY WARRANTY; without even the implied warranty of -** MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -** General Public License for more details. -** -** You should have received a copy of the GNU General Public -** License along with this library; if not, write to the -** Free Software Foundation, Inc., 59 Temple Place - Suite 330, -** Boston, MA 02111-1307, USA. -** -** Author contact information: -** drh@hwaci.com -** http://www.hwaci.com/drh/ -** -******************************************************************************* -** -** This file manages low-level SSL communications. -** -** This file implements a singleton. A single SSL connection may be active -** at a time. State information is stored in static variables. The identity -** of the server is held in global variables that are set by url_parse(). -** -** SSL support is abstracted out into this module because Fossil can -** be compiled without SSL support (which requires OpenSSL library) -*/ - -#include "config.h" - -#ifdef FOSSIL_ENABLE_SSL - -#include -#include -#include - -#include "http_ssl.h" -#include -#include - -/* -** There can only be a single OpenSSL IO connection open at a time. -** State information about that IO is stored in the following -** local variables: -*/ -static int sslIsInit = 0; /* True after global initialization */ -static BIO *iBio; /* OpenSSL I/O abstraction */ -static char *sslErrMsg = 0; /* Text of most recent OpenSSL error */ -static SSL_CTX *sslCtx; /* SSL context */ -static SSL *ssl; - - -/* -** Clear the SSL error message -*/ -static void ssl_clear_errmsg(void){ - free(sslErrMsg); - sslErrMsg = 0; -} - -/* -** Set the SSL error message. -*/ -void ssl_set_errmsg(char *zFormat, ...){ - va_list ap; - ssl_clear_errmsg(); - va_start(ap, zFormat); - sslErrMsg = vmprintf(zFormat, ap); - va_end(ap); -} - -/* -** Return the current SSL error message -*/ -const char *ssl_errmsg(void){ - return sslErrMsg; -} - -/* -** Call this routine once before any other use of the SSL interface. -** This routine does initial configuration of the SSL module. -*/ -void ssl_global_init(void){ - if( sslIsInit==0 ){ - SSL_library_init(); - SSL_load_error_strings(); - ERR_load_BIO_strings(); - OpenSSL_add_all_algorithms(); - sslCtx = SSL_CTX_new(SSLv23_client_method()); - sslIsInit = 1; - } -} - -/* -** Call this routine to shutdown the SSL module prior to program exit. -*/ -void ssl_global_shutdown(void){ - if( sslIsInit ){ - SSL_CTX_free(sslCtx); - ssl_clear_errmsg(); - sslIsInit = 0; - } -} - -/* -** Close the currently open SSL connection. If no connection is open, -** this routine is a no-op. -*/ -void ssl_close(void){ - if( iBio!=NULL ){ - (void)BIO_reset(iBio); - BIO_free_all(iBio); - } -} - -/* -** Open an SSL connection. The identify of the server is determined -** by global varibles that are set using url_parse(): -** -** g.urlName Name of the server. Ex: www.fossil-scm.org -** g.urlPort TCP/IP port to use. Ex: 80 -** -** Return the number of errors. -*/ -int ssl_open(void){ - X509 *cert; - int hasSavedCertificate = 0; - - ssl_global_init(); - - /* Get certificate for current server from global config and - * (if we have it in config) add it to certificate store. - */ - cert = ssl_get_certificate(); - if ( cert!=NULL ){ - X509_STORE_add_cert(SSL_CTX_get_cert_store(sslCtx), cert); - X509_free(cert); - hasSavedCertificate = 1; - } - - iBio = BIO_new_ssl_connect(sslCtx); - BIO_get_ssl(iBio, &ssl); - SSL_set_mode(ssl, SSL_MODE_AUTO_RETRY); - if( iBio==NULL ) { - ssl_set_errmsg("SSL: cannot open SSL (%s)", - ERR_reason_error_string(ERR_get_error())); - return 1; - } - - char *connStr = mprintf("%s:%d", g.urlName, g.urlPort); - BIO_set_conn_hostname(iBio, connStr); - free(connStr); - - if( BIO_do_connect(iBio)<=0 ){ - ssl_set_errmsg("SSL: cannot connect to host %s:%d (%s)", - g.urlName, g.urlPort, ERR_reason_error_string(ERR_get_error())); - ssl_close(); - return 1; - } - - if( BIO_do_handshake(iBio)<=0 ) { - ssl_set_errmsg("Error establishing SSL connection %s:%d (%s)", - g.urlName, g.urlPort, ERR_reason_error_string(ERR_get_error())); - ssl_close(); - return 1; - } - /* Check if certificate is valid */ - cert = SSL_get_peer_certificate(ssl); - - if ( cert==NULL ){ - ssl_set_errmsg("No SSL certificate was presented by the peer"); - ssl_close(); - return 1; - } - - if( SSL_get_verify_result(ssl) != X509_V_OK ){ - char *desc, *prompt; - BIO *mem; - - mem = BIO_new(BIO_s_mem()); - X509_NAME_print_ex(mem, X509_get_subject_name(cert), 2, XN_FLAG_MULTILINE); - BIO_puts(mem, "\n\nIssued By:\n\n"); - X509_NAME_print_ex(mem, X509_get_issuer_name(cert), 2, XN_FLAG_MULTILINE); - BIO_write(mem, "", 1); // null-terminate mem buffer - BIO_get_mem_data(mem, &desc); - - char *warning = ""; - if( hasSavedCertificate ){ - warning = "WARNING: Certificate doesn't match the " - "saved certificate for this host!"; - } - prompt = mprintf("\nUnknown SSL certificate:\n\n%s\n\n%s\n" - "Accept certificate [a=always/y/N]? ", desc, warning); - BIO_free(mem); - - Blob ans; - blob_zero(&ans); - prompt_user(prompt, &ans); - free(prompt); - if( blob_str(&ans)[0]!='y' && blob_str(&ans)[0]!='a' ) { - X509_free(cert); - ssl_set_errmsg("SSL certificate declined"); - ssl_close(); - return 1; - } - if( blob_str(&ans)[0]=='a' ) { - ssl_save_certificate(cert); - } - } - X509_free(cert); - return 0; -} - -/* -** Save certificate to global config. -*/ -void ssl_save_certificate(X509 *cert){ - BIO *mem; - char *zCert, *zHost; - - mem = BIO_new(BIO_s_mem()); - PEM_write_bio_X509(mem, cert); - BIO_write(mem, "", 1); // null-terminate mem buffer - BIO_get_mem_data(mem, &zCert); - zHost = mprintf("cert:%s", g.urlName); - db_set(zHost, zCert, 1); - free(zHost); - BIO_free(mem); -} - -/* -** Get certificate for g.urlName from global config. -** Return NULL if no certificate found. -*/ -X509 *ssl_get_certificate(void){ - char *zHost, *zCert; - BIO *mem; - X509 *cert; - - zHost = mprintf("cert:%s", g.urlName); - zCert = db_get(zHost, NULL); - free(zHost); - if ( zCert==NULL ) - return NULL; - mem = BIO_new(BIO_s_mem()); - BIO_puts(mem, zCert); - cert = PEM_read_bio_X509(mem, NULL, 0, NULL); - free(zCert); - BIO_free(mem); - return cert; -} - -/* -** Send content out over the SSL connection. -*/ -size_t ssl_send(void *NotUsed, void *pContent, size_t N){ - size_t sent; - size_t total = 0; - while( N>0 ){ - sent = BIO_write(iBio, pContent, N); - if( sent<=0 ) break; - total += sent; - N -= sent; - pContent = (void*)&((char*)pContent)[sent]; - } - return total; -} - -/* -** Receive content back from the SSL connection. -*/ -size_t ssl_receive(void *NotUsed, void *pContent, size_t N){ - size_t got; - size_t total = 0; - while( N>0 ){ - got = BIO_read(iBio, pContent, N); - if( got<=0 ) break; - total += got; - N -= got; - pContent = (void*)&((char*)pContent)[got]; - } - return total; -} - -#endif /* FOSSIL_ENABLE_SSL */ Index: src/http_transport.c ================================================================== --- src/http_transport.c +++ src/http_transport.c @@ -1,21 +1,15 @@ /* ** Copyright (c) 2009 D. Richard Hipp ** ** This program is free software; you can redistribute it and/or -** modify it under the terms of the GNU General Public -** License version 2 as published by the Free Software Foundation. -** +** modify it under the terms of the Simplified BSD License (also +** known as the "2-Clause License" or "FreeBSD License".) + ** This program is distributed in the hope that it will be useful, -** but WITHOUT ANY WARRANTY; without even the implied warranty of -** MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -** General Public License for more details. -** -** You should have received a copy of the GNU General Public -** License along with this library; if not, write to the -** Free Software Foundation, Inc., 59 Temple Place - Suite 330, -** Boston, MA 02111-1307, USA. +** but without any warranty; without even the implied warranty of +** merchantability or fitness for a particular purpose. ** ** Author contact information: ** drh@hwaci.com ** http://www.hwaci.com/drh/ ** Index: src/info.c ================================================================== --- src/info.c +++ src/info.c @@ -1,21 +1,15 @@ /* ** Copyright (c) 2007 D. Richard Hipp ** ** This program is free software; you can redistribute it and/or -** modify it under the terms of the GNU General Public -** License version 2 as published by the Free Software Foundation. -** +** modify it under the terms of the Simplified BSD License (also +** known as the "2-Clause License" or "FreeBSD License".) + ** This program is distributed in the hope that it will be useful, -** but WITHOUT ANY WARRANTY; without even the implied warranty of -** MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -** General Public License for more details. -** -** You should have received a copy of the GNU General Public -** License along with this library; if not, write to the -** Free Software Foundation, Inc., 59 Temple Place - Suite 330, -** Boston, MA 02111-1307, USA. +** but without any warranty; without even the implied warranty of +** merchantability or fitness for a particular purpose. ** ** Author contact information: ** drh@hwaci.com ** http://www.hwaci.com/drh/ ** Index: src/login.c ================================================================== --- src/login.c +++ src/login.c @@ -1,22 +1,15 @@ /* ** Copyright (c) 2007 D. Richard Hipp ** ** This program is free software; you can redistribute it and/or -** modify it under the terms of the GNU General Public -** License as published by the Free Software Foundation; either -** version 2 of the License, or (at your option) any later version. -** +** modify it under the terms of the Simplified BSD License (also +** known as the "2-Clause License" or "FreeBSD License".) + ** This program is distributed in the hope that it will be useful, -** but WITHOUT ANY WARRANTY; without even the implied warranty of -** MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -** General Public License for more details. -** -** You should have received a copy of the GNU General Public -** License along with this library; if not, write to the -** Free Software Foundation, Inc., 59 Temple Place - Suite 330, -** Boston, MA 02111-1307, USA. +** but without any warranty; without even the implied warranty of +** merchantability or fitness for a particular purpose. ** ** Author contact information: ** drh@hwaci.com ** http://www.hwaci.com/drh/ ** Index: src/main.c ================================================================== --- src/main.c +++ src/main.c @@ -1,21 +1,15 @@ /* ** Copyright (c) 2006 D. Richard Hipp ** ** This program is free software; you can redistribute it and/or -** modify it under the terms of the GNU General Public -** License version 2 as published by the Free Software Foundation. -** +** modify it under the terms of the Simplified BSD License (also +** known as the "2-Clause License" or "FreeBSD License".) + ** This program is distributed in the hope that it will be useful, -** but WITHOUT ANY WARRANTY; without even the implied warranty of -** MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -** General Public License for more details. -** -** You should have received a copy of the GNU General Public -** License along with this library; if not, write to the -** Free Software Foundation, Inc., 59 Temple Place - Suite 330, -** Boston, MA 02111-1307, USA. +** but without any warranty; without even the implied warranty of +** merchantability or fitness for a particular purpose. ** ** Author contact information: ** drh@hwaci.com ** http://www.hwaci.com/drh/ ** Index: src/main.mk ================================================================== --- src/main.mk +++ src/main.mk @@ -26,11 +26,10 @@ $(SRCDIR)/checkout.c \ $(SRCDIR)/clearsign.c \ $(SRCDIR)/clone.c \ $(SRCDIR)/comformat.c \ $(SRCDIR)/configure.c \ - $(SRCDIR)/construct.c \ $(SRCDIR)/content.c \ $(SRCDIR)/db.c \ $(SRCDIR)/delta.c \ $(SRCDIR)/deltacmd.c \ $(SRCDIR)/descendants.c \ @@ -41,11 +40,10 @@ $(SRCDIR)/file.c \ $(SRCDIR)/finfo.c \ $(SRCDIR)/graph.c \ $(SRCDIR)/http.c \ $(SRCDIR)/http_socket.c \ - $(SRCDIR)/http_ssl.c \ $(SRCDIR)/http_transport.c \ $(SRCDIR)/info.c \ $(SRCDIR)/login.c \ $(SRCDIR)/main.c \ $(SRCDIR)/manifest.c \ @@ -57,11 +55,10 @@ $(SRCDIR)/pqueue.c \ $(SRCDIR)/printf.c \ $(SRCDIR)/rebuild.c \ $(SRCDIR)/report.c \ $(SRCDIR)/rss.c \ - $(SRCDIR)/rstats.c \ $(SRCDIR)/schema.c \ $(SRCDIR)/search.c \ $(SRCDIR)/setup.c \ $(SRCDIR)/sha1.c \ $(SRCDIR)/shun.c \ @@ -100,11 +97,10 @@ checkout_.c \ clearsign_.c \ clone_.c \ comformat_.c \ configure_.c \ - construct_.c \ content_.c \ db_.c \ delta_.c \ deltacmd_.c \ descendants_.c \ @@ -115,11 +111,10 @@ file_.c \ finfo_.c \ graph_.c \ http_.c \ http_socket_.c \ - http_ssl_.c \ http_transport_.c \ info_.c \ login_.c \ main_.c \ manifest_.c \ @@ -131,11 +126,10 @@ pqueue_.c \ printf_.c \ rebuild_.c \ report_.c \ rss_.c \ - rstats_.c \ schema_.c \ search_.c \ setup_.c \ sha1_.c \ shun_.c \ @@ -174,11 +168,10 @@ $(OBJDIR)/checkout.o \ $(OBJDIR)/clearsign.o \ $(OBJDIR)/clone.o \ $(OBJDIR)/comformat.o \ $(OBJDIR)/configure.o \ - $(OBJDIR)/construct.o \ $(OBJDIR)/content.o \ $(OBJDIR)/db.o \ $(OBJDIR)/delta.o \ $(OBJDIR)/deltacmd.o \ $(OBJDIR)/descendants.o \ @@ -189,11 +182,10 @@ $(OBJDIR)/file.o \ $(OBJDIR)/finfo.o \ $(OBJDIR)/graph.o \ $(OBJDIR)/http.o \ $(OBJDIR)/http_socket.o \ - $(OBJDIR)/http_ssl.o \ $(OBJDIR)/http_transport.o \ $(OBJDIR)/info.o \ $(OBJDIR)/login.o \ $(OBJDIR)/main.o \ $(OBJDIR)/manifest.o \ @@ -205,11 +197,10 @@ $(OBJDIR)/pqueue.o \ $(OBJDIR)/printf.o \ $(OBJDIR)/rebuild.o \ $(OBJDIR)/report.o \ $(OBJDIR)/rss.o \ - $(OBJDIR)/rstats.o \ $(OBJDIR)/schema.o \ $(OBJDIR)/search.o \ $(OBJDIR)/setup.o \ $(OBJDIR)/sha1.o \ $(OBJDIR)/shun.o \ @@ -276,16 +267,16 @@ # noop clean: rm -f $(OBJDIR)/*.o *_.c $(APPNAME) VERSION.h rm -f translate makeheaders mkindex page_index.h headers - 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 + 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 page_index.h: $(TRANS_SRC) mkindex ./mkindex $(TRANS_SRC) >$@ headers: page_index.h makeheaders VERSION.h - ./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 + ./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 touch headers headers: Makefile Makefile: add_.c: $(SRCDIR)/add.c translate ./translate $(SRCDIR)/add.c >add_.c @@ -390,17 +381,10 @@ $(OBJDIR)/configure.o: configure_.c configure.h $(SRCDIR)/config.h $(XTCC) -o $(OBJDIR)/configure.o -c configure_.c configure.h: headers -construct_.c: $(SRCDIR)/construct.c translate - ./translate $(SRCDIR)/construct.c >construct_.c - -$(OBJDIR)/construct.o: construct_.c construct.h $(SRCDIR)/config.h - $(XTCC) -o $(OBJDIR)/construct.o -c construct_.c - -construct.h: headers content_.c: $(SRCDIR)/content.c translate ./translate $(SRCDIR)/content.c >content_.c $(OBJDIR)/content.o: content_.c content.h $(SRCDIR)/config.h $(XTCC) -o $(OBJDIR)/content.o -c content_.c @@ -495,17 +479,10 @@ $(OBJDIR)/http_socket.o: http_socket_.c http_socket.h $(SRCDIR)/config.h $(XTCC) -o $(OBJDIR)/http_socket.o -c http_socket_.c http_socket.h: headers -http_ssl_.c: $(SRCDIR)/http_ssl.c translate - ./translate $(SRCDIR)/http_ssl.c >http_ssl_.c - -$(OBJDIR)/http_ssl.o: http_ssl_.c http_ssl.h $(SRCDIR)/config.h - $(XTCC) -o $(OBJDIR)/http_ssl.o -c http_ssl_.c - -http_ssl.h: headers http_transport_.c: $(SRCDIR)/http_transport.c translate ./translate $(SRCDIR)/http_transport.c >http_transport_.c $(OBJDIR)/http_transport.o: http_transport_.c http_transport.h $(SRCDIR)/config.h $(XTCC) -o $(OBJDIR)/http_transport.o -c http_transport_.c @@ -607,17 +584,10 @@ $(OBJDIR)/rss.o: rss_.c rss.h $(SRCDIR)/config.h $(XTCC) -o $(OBJDIR)/rss.o -c rss_.c rss.h: headers -rstats_.c: $(SRCDIR)/rstats.c translate - ./translate $(SRCDIR)/rstats.c >rstats_.c - -$(OBJDIR)/rstats.o: rstats_.c rstats.h $(SRCDIR)/config.h - $(XTCC) -o $(OBJDIR)/rstats.o -c rstats_.c - -rstats.h: headers schema_.c: $(SRCDIR)/schema.c translate ./translate $(SRCDIR)/schema.c >schema_.c $(OBJDIR)/schema.o: schema_.c schema.h $(SRCDIR)/config.h $(XTCC) -o $(OBJDIR)/schema.o -c schema_.c Index: src/makeheaders.c ================================================================== --- src/makeheaders.c +++ src/makeheaders.c @@ -1,8 +1,14 @@ static const char ident[] = "@(#) $Header: /cvstrac/cvstrac/makeheaders.c,v 1.4 2005/03/16 22:17:51 drh Exp $"; /* -** This program scans C and C++ source files and automatically generates +** This program is free software; you can redistribute it and/or +** modify it under the terms of the Simplified BSD License (also +** known as the "2-Clause License" or "FreeBSD License".) + +** This program is distributed in the hope that it will be useful, +** but without any warranty; without even the implied warranty of +** merchantability or fitness for a particular purpose. ** appropriate header files. */ #include #include #include Index: src/makemake.tcl ================================================================== --- src/makemake.tcl +++ src/makemake.tcl @@ -20,11 +20,10 @@ checkout clearsign clone comformat configure - construct content db delta deltacmd descendants @@ -50,11 +49,10 @@ pqueue printf rebuild report rss - rstats schema search setup sha1 shun @@ -76,11 +74,10 @@ wiki wikiformat winhttp xfer zip - http_ssl } # Name of the final application # set name fossil Index: src/manifest.c ================================================================== --- src/manifest.c +++ src/manifest.c @@ -1,21 +1,15 @@ /* ** Copyright (c) 2007 D. Richard Hipp ** ** This program is free software; you can redistribute it and/or -** modify it under the terms of the GNU General Public -** License version 2 as published by the Free Software Foundation. -** +** modify it under the terms of the Simplified BSD License (also +** known as the "2-Clause License" or "FreeBSD License".) + ** This program is distributed in the hope that it will be useful, -** but WITHOUT ANY WARRANTY; without even the implied warranty of -** MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -** General Public License for more details. -** -** You should have received a copy of the GNU General Public -** License along with this library; if not, write to the -** Free Software Foundation, Inc., 59 Temple Place - Suite 330, -** Boston, MA 02111-1307, USA. +** but without any warranty; without even the implied warranty of +** merchantability or fitness for a particular purpose. ** ** Author contact information: ** drh@hwaci.com ** http://www.hwaci.com/drh/ ** Index: src/merge.c ================================================================== --- src/merge.c +++ src/merge.c @@ -1,21 +1,15 @@ /* ** Copyright (c) 2007 D. Richard Hipp ** ** This program is free software; you can redistribute it and/or -** modify it under the terms of the GNU General Public -** License version 2 as published by the Free Software Foundation. -** +** modify it under the terms of the Simplified BSD License (also +** known as the "2-Clause License" or "FreeBSD License".) + ** This program is distributed in the hope that it will be useful, -** but WITHOUT ANY WARRANTY; without even the implied warranty of -** MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -** General Public License for more details. -** -** You should have received a copy of the GNU General Public -** License along with this library; if not, write to the -** Free Software Foundation, Inc., 59 Temple Place - Suite 330, -** Boston, MA 02111-1307, USA. +** but without any warranty; without even the implied warranty of +** merchantability or fitness for a particular purpose. ** ** Author contact information: ** drh@hwaci.com ** http://www.hwaci.com/drh/ ** Index: src/merge3.c ================================================================== --- src/merge3.c +++ src/merge3.c @@ -1,21 +1,15 @@ /* ** Copyright (c) 2007 D. Richard Hipp ** ** This program is free software; you can redistribute it and/or -** modify it under the terms of the GNU General Public -** License version 2 as published by the Free Software Foundation. -** +** modify it under the terms of the Simplified BSD License (also +** known as the "2-Clause License" or "FreeBSD License".) + ** This program is distributed in the hope that it will be useful, -** but WITHOUT ANY WARRANTY; without even the implied warranty of -** MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -** General Public License for more details. -** -** You should have received a copy of the GNU General Public -** License along with this library; if not, write to the -** Free Software Foundation, Inc., 59 Temple Place - Suite 330, -** Boston, MA 02111-1307, USA. +** but without any warranty; without even the implied warranty of +** merchantability or fitness for a particular purpose. ** ** Author contact information: ** drh@hwaci.com ** http://www.hwaci.com/drh/ ** Index: src/mkindex.c ================================================================== --- src/mkindex.c +++ src/mkindex.c @@ -1,22 +1,15 @@ /* ** Copyright (c) 2002 D. Richard Hipp ** ** This program is free software; you can redistribute it and/or -** modify it under the terms of the GNU General Public -** License as published by the Free Software Foundation; either -** version 2 of the License, or (at your option) any later version. -** +** modify it under the terms of the Simplified BSD License (also +** known as the "2-Clause License" or "FreeBSD License".) + ** This program is distributed in the hope that it will be useful, -** but WITHOUT ANY WARRANTY; without even the implied warranty of -** MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -** General Public License for more details. -** -** You should have received a copy of the GNU General Public -** License along with this library; if not, write to the -** Free Software Foundation, Inc., 59 Temple Place - Suite 330, -** Boston, MA 02111-1307, USA. +** but without any warranty; without even the implied warranty of +** merchantability or fitness for a particular purpose. ** ** Author contact information: ** drh@hwaci.com ** http://www.hwaci.com/drh/ ** Index: src/name.c ================================================================== --- src/name.c +++ src/name.c @@ -1,21 +1,15 @@ /* ** Copyright (c) 2006 D. Richard Hipp ** ** This program is free software; you can redistribute it and/or -** modify it under the terms of the GNU General Public -** License version 2 as published by the Free Software Foundation. -** +** modify it under the terms of the Simplified BSD License (also +** known as the "2-Clause License" or "FreeBSD License".) + ** This program is distributed in the hope that it will be useful, -** but WITHOUT ANY WARRANTY; without even the implied warranty of -** MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -** General Public License for more details. -** -** You should have received a copy of the GNU General Public -** License along with this library; if not, write to the -** Free Software Foundation, Inc., 59 Temple Place - Suite 330, -** Boston, MA 02111-1307, USA. +** but without any warranty; without even the implied warranty of +** merchantability or fitness for a particular purpose. ** ** Author contact information: ** drh@hwaci.com ** http://www.hwaci.com/drh/ ** Index: src/pivot.c ================================================================== --- src/pivot.c +++ src/pivot.c @@ -1,21 +1,15 @@ /* ** Copyright (c) 2007 D. Richard Hipp ** ** This program is free software; you can redistribute it and/or -** modify it under the terms of the GNU General Public -** License version 2 as published by the Free Software Foundation. -** +** modify it under the terms of the Simplified BSD License (also +** known as the "2-Clause License" or "FreeBSD License".) + ** This program is distributed in the hope that it will be useful, -** but WITHOUT ANY WARRANTY; without even the implied warranty of -** MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -** General Public License for more details. -** -** You should have received a copy of the GNU General Public -** License along with this library; if not, write to the -** Free Software Foundation, Inc., 59 Temple Place - Suite 330, -** Boston, MA 02111-1307, USA. +** but without any warranty; without even the implied warranty of +** merchantability or fitness for a particular purpose. ** ** Author contact information: ** drh@hwaci.com ** http://www.hwaci.com/drh/ ** Index: src/pqueue.c ================================================================== --- src/pqueue.c +++ src/pqueue.c @@ -1,21 +1,15 @@ /* ** Copyright (c) 2007 D. Richard Hipp ** ** This program is free software; you can redistribute it and/or -** modify it under the terms of the GNU General Public -** License version 2 as published by the Free Software Foundation. -** +** modify it under the terms of the Simplified BSD License (also +** known as the "2-Clause License" or "FreeBSD License".) + ** This program is distributed in the hope that it will be useful, -** but WITHOUT ANY WARRANTY; without even the implied warranty of -** MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -** General Public License for more details. -** -** You should have received a copy of the GNU General Public -** License along with this library; if not, write to the -** Free Software Foundation, Inc., 59 Temple Place - Suite 330, -** Boston, MA 02111-1307, USA. +** but without any warranty; without even the implied warranty of +** merchantability or fitness for a particular purpose. ** ** Author contact information: ** drh@hwaci.com ** http://www.hwaci.com/drh/ ** Index: src/printf.c ================================================================== --- src/printf.c +++ src/printf.c @@ -1,21 +1,15 @@ /* ** Copyright (c) 2006 D. Richard Hipp ** ** This program is free software; you can redistribute it and/or -** modify it under the terms of the GNU General Public -** License version 2 as published by the Free Software Foundation. -** +** modify it under the terms of the Simplified BSD License (also +** known as the "2-Clause License" or "FreeBSD License".) + ** This program is distributed in the hope that it will be useful, -** but WITHOUT ANY WARRANTY; without even the implied warranty of -** MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -** General Public License for more details. -** -** You should have received a copy of the GNU General Public -** License along with this library; if not, write to the -** Free Software Foundation, Inc., 59 Temple Place - Suite 330, -** Boston, MA 02111-1307, USA. +** but without any warranty; without even the implied warranty of +** merchantability or fitness for a particular purpose. ** ** Author contact information: ** drh@hwaci.com ** http://www.hwaci.com/drh/ ** Index: src/rebuild.c ================================================================== --- src/rebuild.c +++ src/rebuild.c @@ -1,21 +1,15 @@ /* ** Copyright (c) 2007 D. Richard Hipp ** ** This program is free software; you can redistribute it and/or -** modify it under the terms of the GNU General Public -** License version 2 as published by the Free Software Foundation. -** +** modify it under the terms of the Simplified BSD License (also +** known as the "2-Clause License" or "FreeBSD License".) + ** This program is distributed in the hope that it will be useful, -** but WITHOUT ANY WARRANTY; without even the implied warranty of -** MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -** General Public License for more details. -** -** You should have received a copy of the GNU General Public -** License along with this library; if not, write to the -** Free Software Foundation, Inc., 59 Temple Place - Suite 330, -** Boston, MA 02111-1307, USA. +** but without any warranty; without even the implied warranty of +** merchantability or fitness for a particular purpose. ** ** Author contact information: ** drh@hwaci.com ** http://www.hwaci.com/drh/ ** Index: src/report.c ================================================================== --- src/report.c +++ src/report.c @@ -1,22 +1,15 @@ /* ** Copyright (c) 2007 D. Richard Hipp ** ** This program is free software; you can redistribute it and/or -** modify it under the terms of the GNU General Public -** License as published by the Free Software Foundation; either -** version 2 of the License, or (at your option) any later version. -** +** modify it under the terms of the Simplified BSD License (also +** known as the "2-Clause License" or "FreeBSD License".) + ** This program is distributed in the hope that it will be useful, -** but WITHOUT ANY WARRANTY; without even the implied warranty of -** MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -** General Public License for more details. -** -** You should have received a copy of the GNU General Public -** License along with this library; if not, write to the -** Free Software Foundation, Inc., 59 Temple Place - Suite 330, -** Boston, MA 02111-1307, USA. +** but without any warranty; without even the implied warranty of +** merchantability or fitness for a particular purpose. ** ** Author contact information: ** drh@hwaci.com ** http://www.hwaci.com/drh/ ** Index: src/rss.c ================================================================== --- src/rss.c +++ src/rss.c @@ -1,21 +1,15 @@ /* ** Copyright (c) 2007 D. Richard Hipp ** ** This program is free software; you can redistribute it and/or -** modify it under the terms of the GNU General Public -** License version 2 as published by the Free Software Foundation. -** +** modify it under the terms of the Simplified BSD License (also +** known as the "2-Clause License" or "FreeBSD License".) + ** This program is distributed in the hope that it will be useful, -** but WITHOUT ANY WARRANTY; without even the implied warranty of -** MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -** General Public License for more details. -** -** You should have received a copy of the GNU General Public -** License along with this library; if not, write to the -** Free Software Foundation, Inc., 59 Temple Place - Suite 330, -** Boston, MA 02111-1307, USA. +** but without any warranty; without even the implied warranty of +** merchantability or fitness for a particular purpose. ** ** Author contact information: ** drh@hwaci.com ** http://www.hwaci.com/drh/ ** DELETED src/rstats.c Index: src/rstats.c ================================================================== --- src/rstats.c +++ /dev/null @@ -1,82 +0,0 @@ -/* -** Copyright (c) 2008 D. Richard Hipp, Kevin Kinnell -** -** This program is free software; you can redistribute it and/or -** modify it under the terms of the GNU General Public -** License version 2 as published by the Free Software Foundation. -** -** This program is distributed in the hope that it will be useful, -** but WITHOUT ANY WARRANTY; without even the implied warranty of -** MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -** General Public License for more details. -** -** You should have received a copy of the GNU General Public -** License along with this library; if not, write to the -** Free Software Foundation, Inc., 59 Temple Place - Suite 330, -** Boston, MA 02111-1307, USA. -** -** Author contact information: -** drh@hwaci.com -** http://www.hwaci.com/drh/ -** -** kkinnell@megagate.com -** -******************************************************************************* -** -** This file contains code to implement the metrics command. This is a -** command-line version of the stats page. -** -*/ -#include -#include "config.h" -#include "rstats.h" - -/* -** COMMAND: rstats -** -** Usage: %fossil rstats -** -** Deliver a report of the repository statistics for the -** current checkout. -*/ -void rstats_cmd(void){ - i64 t; - int n, m, fsize, vid; - char zBuf[100]; - - db_must_be_within_tree(); - vid = db_lget_int("checkout",0); - if( vid==0 ){ - fossil_panic("no checkout"); - } - fsize = file_size(g.zRepositoryName); - n = db_int(0, "SELECT count(*) FROM blob"); - m = db_int(0, "SELECT count(*) FROM delta"); - printf(" Number of Artifacts: %d\n", n); - printf(" %d full text + %d delta blobs\n", (n-m), m); - if( n>0 ){ - int a, b; - t = db_int64(0, "SELECT total(size) FROM blob WHERE size>0"); - sqlite3_snprintf(sizeof(zBuf), zBuf, "%lld", t); - if( t/fsize < 5 ){ - b = 10; - fsize /= 10; - }else{ - b = 1; - } - a = t/fsize; - printf(" %d bytes average, %s bytes total\n\n", - ((int)(((double)t)/(double)n)), - (zBuf)); - } - n = db_int(0, "SELECT count(distinct mid) FROM mlink"); - printf(" Number Of Checkins: %d\n", n); - n = db_int(0, "SELECT count(*) FROM filename"); - printf(" Number Of Files: %d\n", n); - n = db_int(0, "SELECT count(*) FROM tag WHERE +tagname GLOB 'wiki-*'"); - printf("Number Of Wiki Pages: %d\n", n); - n = db_int(0, "SELECT count(*) FROM tag WHERE +tagname GLOB 'tkt-*'"); - printf(" Number Of Tickets: %d\n", n); - n = db_int(0, "SELECT julianday('now') - (SELECT min(mtime) FROM event) + 0.99"); - printf(" Duration Of Project: %d days\n", n); -} Index: src/schema.c ================================================================== --- src/schema.c +++ src/schema.c @@ -1,21 +1,15 @@ /* ** Copyright (c) 2007 D. Richard Hipp ** ** This program is free software; you can redistribute it and/or -** modify it under the terms of the GNU General Public -** License version 2 as published by the Free Software Foundation. -** +** modify it under the terms of the Simplified BSD License (also +** known as the "2-Clause License" or "FreeBSD License".) + ** This program is distributed in the hope that it will be useful, -** but WITHOUT ANY WARRANTY; without even the implied warranty of -** MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -** General Public License for more details. -** -** You should have received a copy of the GNU General Public -** License along with this library; if not, write to the -** Free Software Foundation, Inc., 59 Temple Place - Suite 330, -** Boston, MA 02111-1307, USA. +** but without any warranty; without even the implied warranty of +** merchantability or fitness for a particular purpose. ** ** Author contact information: ** drh@hwaci.com ** http://www.hwaci.com/drh/ ** Index: src/search.c ================================================================== --- src/search.c +++ src/search.c @@ -1,21 +1,15 @@ /* ** Copyright (c) 2009 D. Richard Hipp ** ** This program is free software; you can redistribute it and/or -** modify it under the terms of the GNU General Public -** License version 2 as published by the Free Software Foundation. -** +** modify it under the terms of the Simplified BSD License (also +** known as the "2-Clause License" or "FreeBSD License".) + ** This program is distributed in the hope that it will be useful, -** but WITHOUT ANY WARRANTY; without even the implied warranty of -** MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -** General Public License for more details. -** -** You should have received a copy of the GNU General Public -** License along with this library; if not, write to the -** Free Software Foundation, Inc., 59 Temple Place - Suite 330, -** Boston, MA 02111-1307, USA. +** but without any warranty; without even the implied warranty of +** merchantability or fitness for a particular purpose. ** ** Author contact information: ** drh@hwaci.com ** http://www.hwaci.com/drh/ ** Index: src/setup.c ================================================================== --- src/setup.c +++ src/setup.c @@ -1,22 +1,15 @@ /* ** Copyright (c) 2007 D. Richard Hipp ** ** This program is free software; you can redistribute it and/or -** modify it under the terms of the GNU General Public -** License as published by the Free Software Foundation; either -** version 2 of the License, or (at your option) any later version. -** +** modify it under the terms of the Simplified BSD License (also +** known as the "2-Clause License" or "FreeBSD License".) + ** This program is distributed in the hope that it will be useful, -** but WITHOUT ANY WARRANTY; without even the implied warranty of -** MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -** General Public License for more details. -** -** You should have received a copy of the GNU General Public -** License along with this library; if not, write to the -** Free Software Foundation, Inc., 59 Temple Place - Suite 330, -** Boston, MA 02111-1307, USA. +** but without any warranty; without even the implied warranty of +** merchantability or fitness for a particular purpose. ** ** Author contact information: ** drh@hwaci.com ** http://www.hwaci.com/drh/ ** @@ -64,12 +57,10 @@ "Grant privileges to individual users."); setup_menu_entry("Access", "setup_access", "Control access settings."); setup_menu_entry("Configuration", "setup_config", "Configure the WWW components of the repository"); - setup_menu_entry("Behavior", "setup_behavior", - "Configure the SCM behavior of the repository"); setup_menu_entry("Timeline", "setup_timeline", "Timeline display preferences"); setup_menu_entry("Tickets", "tktsetup", "Configure the trouble-ticketing system for this repository"); setup_menu_entry("Skins", "setup_skin", @@ -181,14 +172,14 @@ @ s @ Setup/Super-user: Setup and configure this website @ t @ Tkt-Report: Create new bug summary reports @ u - @ Reader: Inherit privileges of + @ Reader: Inherit privileges of @ user reader @ v - @ Developer: Inherit privileges of + @ Developer: Inherit privileges of @ user developer @ w @ Write-Tkt: Edit tickets @ z @ Zip download: Download a baseline via the @@ -598,11 +589,11 @@ @ Login is prohibited if the password is an empty string. @

@ @ @

Special Logins

- @ + @ @
    @

  • @ No login is required for user "nobody". The capabilities @ of the nobody user are inherited by all users, regardless of @ whether or not they are logged in. To disable universal access @@ -755,11 +746,11 @@ entry_attribute("Download packet limit", 10, "max-download", "mxdwn", "5000000"); @

    Fossil tries to limit out-bound sync, clone, and pull packets @ to this many bytes, uncompressed. If the client requires more data @ than this, then the client will issue multiple HTTP requests. - @ Values below 1 million are not recommended. 5 million is a + @ Values below 1 million are not recommended. 5 million is a @ reasonable number.

    @
    onoff_attribute("Show javascript button to fill in CAPTCHA", "auto-captcha", "autocaptcha", 0); @@ -809,111 +800,15 @@ @ show complete diffs of all file changes, or can just list the names of @ the files that have changed. Users can get to either page by @ clicking. This setting selects the default.

    @
    - entry_attribute("Max timeline comment length", 6, + entry_attribute("Max timeline comment length", 6, "timeline-max-comment", "tmc", "0"); @

    The maximum length of a comment to be displayed in a timeline. @ "0" there is no length limit.

    - @
    - @

    - @ - db_end_transaction(0); - style_footer(); -} - -/* -** WEBPAGE: setup_behavior -*/ -void setup_behavior(void){ - login_check_credentials(); - if( !g.okSetup ){ - login_needed(); - } - - style_header("Fossil SCM Behavior"); - db_begin_transaction(); - @
    - login_insert_csrf_secret(); - - @
    - onoff_attribute("Automatically synchronize with repository", - "autosync", "autosync", 1); - @

    Automatically keeps your work in sync with a centralized server.

    - - @
    - onoff_attribute("Show javascript button to fill in CAPTCHA", - "auto-captcha", "autocaptcha", 0); - @

    When enabled, a button appears on the login screen for user - @ "anonymous" that will automatically fill in the CAPTCHA password. - @ This is less secure that forcing the user to do it manually, but is - @ probably secure enough and it is certainly more convenient for - @ anonymous users.

    - - @
    - onoff_attribute("Sign all commits with GPG", - "clearsign", "clearsign", 0); - @

    When enabled (the default), fossil will attempt to - @ sign all commits with GPG. When disabled, commits will - @ be unsigned.

    - - @
    - onoff_attribute("Require local authentication", - "localauth", "localauth", 0); - @

    If enabled, require that HTTP connections from - @ 127.0.0.1 be authenticated by password. If - @ false, all HTTP requests from localhost have - @ unrestricted access to the repository.

    - - @
    - onoff_attribute("Modification times used to detect changes", - "mtime-changes", "mtime-changes", 0); - @

    Use file modification times (mtimes) to detect when files have been modified.

    - - @
    - entry_attribute("File Ignore Glob", 40, - "ignore-glob", "ignore-glob", ""); - @

    Cause the 'extra' command to ignore files matching the glob. Example: - @ '*.o,*.a,*.bck,*~'

    - - @
    - entry_attribute("Diff Command", 16, - "diff-command", "diff-command", "diff"); - @

    External command used to generate a textual diff

    - - @
    - entry_attribute("Gdiff Command", 16, - "gdiff-command", "gdiff-command", "gdiff"); - @

    External command to run when performing a graphical diff. If undefined, text diff will be used.

    - - @
    - entry_attribute("Editor", 16, - "editor", "editor", ""); - @

    Text editor command used for check-in comments.

    - - @
    - entry_attribute("HTTP port", 16, - "http-port", "http-port", "8080"); - @

    The TCP/IP port number to use by the "server" and "ui" commands. Default: 8080

    - - @
    - entry_attribute("PGP Command", 32, - "pgp-command", "pgp-command", "gpg --clearsign -o "); - @

    Command used to clear-sign manifests at check-in.The default is "gpg --clearsign -o ".

    - - @
    - entry_attribute("Proxy", 32, - "proxy", "proxy", "off"); - @

    URL of the HTTP proxy.

    - - @
    - entry_attribute("Web browser", 32, - "web-browser", "web-browser", ""); - @

    Default web browser for "fossil ui".

    - @
    @

    @
    db_end_transaction(0); style_footer(); @@ -1010,11 +905,11 @@ @

    Note: Press your browser Reload button after modifying the @ CSS in order to pull in the modified CSS file.

    @
    @ The default CSS is shown below for reference. Other examples @ of CSS files can be seen on the skins page. - @ See also the header and + @ See also the header and @ footer editing screens. @ 
       @ %h(zDefaultCSS)
   @
    style_footer(); @@ -1113,11 +1008,11 @@ db_begin_transaction(); if( P("set")!=0 && zMime && zMime[0] && szImg>0 ){ Blob img; Stmt ins; blob_init(&img, aImg, szImg); - db_prepare(&ins, + db_prepare(&ins, "REPLACE INTO config(name, value)" " VALUES('logo-image',:bytes)" ); db_bind_blob(&ins, ":bytes", &img); db_step(&ins); @@ -1137,11 +1032,11 @@ } style_header("Edit Project Logo"); @

    The current project logo has a MIME-Type of %h(zMime) and looks @ like this:

    @
    logo
    - @ + @ @

    The logo is accessible to all users at this URL: @ %s(g.zBaseURL)/logo. @ The logo may or may not appear on each @ page depending on the CSS and @ header setup.

    Index: src/shun.c ================================================================== --- src/shun.c +++ src/shun.c @@ -1,21 +1,15 @@ /* ** Copyright (c) 2008 D. Richard Hipp ** ** This program is free software; you can redistribute it and/or -** modify it under the terms of the GNU General Public -** License version 2 as published by the Free Software Foundation. -** +** modify it under the terms of the Simplified BSD License (also +** known as the "2-Clause License" or "FreeBSD License".) + ** This program is distributed in the hope that it will be useful, -** but WITHOUT ANY WARRANTY; without even the implied warranty of -** MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -** General Public License for more details. -** -** You should have received a copy of the GNU General Public -** License along with this library; if not, write to the -** Free Software Foundation, Inc., 59 Temple Place - Suite 330, -** Boston, MA 02111-1307, USA. +** but without any warranty; without even the implied warranty of +** merchantability or fitness for a particular purpose. ** ** Author contact information: ** drh@hwaci.com ** http://www.hwaci.com/drh/ ** Index: src/skins.c ================================================================== --- src/skins.c +++ src/skins.c @@ -1,22 +1,15 @@ /* ** Copyright (c) 2009 D. Richard Hipp ** ** This program is free software; you can redistribute it and/or -** modify it under the terms of the GNU General Public -** License as published by the Free Software Foundation; either -** version 2 of the License, or (at your option) any later version. -** +** modify it under the terms of the Simplified BSD License (also +** known as the "2-Clause License" or "FreeBSD License".) + ** This program is distributed in the hope that it will be useful, -** but WITHOUT ANY WARRANTY; without even the implied warranty of -** MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -** General Public License for more details. -** -** You should have received a copy of the GNU General Public -** License along with this library; if not, write to the -** Free Software Foundation, Inc., 59 Temple Place - Suite 330, -** Boston, MA 02111-1307, USA. +** but without any warranty; without even the implied warranty of +** merchantability or fitness for a particular purpose. ** ** Author contact information: ** drh@hwaci.com ** http://www.hwaci.com/drh/ ** Index: src/stat.c ================================================================== --- src/stat.c +++ src/stat.c @@ -1,21 +1,15 @@ /* ** Copyright (c) 2007 D. Richard Hipp ** ** This program is free software; you can redistribute it and/or -** modify it under the terms of the GNU General Public -** License version 2 as published by the Free Software Foundation. -** +** modify it under the terms of the Simplified BSD License (also +** known as the "2-Clause License" or "FreeBSD License".) + ** This program is distributed in the hope that it will be useful, -** but WITHOUT ANY WARRANTY; without even the implied warranty of -** MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -** General Public License for more details. -** -** You should have received a copy of the GNU General Public -** License along with this library; if not, write to the -** Free Software Foundation, Inc., 59 Temple Place - Suite 330, -** Boston, MA 02111-1307, USA. +** but without any warranty; without even the implied warranty of +** merchantability or fitness for a particular purpose. ** ** Author contact information: ** drh@hwaci.com ** http://www.hwaci.com/drh/ ** Index: src/style.c ================================================================== --- src/style.c +++ src/style.c @@ -1,21 +1,15 @@ /* ** Copyright (c) 2006,2007 D. Richard Hipp ** ** This program is free software; you can redistribute it and/or -** modify it under the terms of the GNU General Public -** License version 2 as published by the Free Software Foundation. -** +** modify it under the terms of the Simplified BSD License (also +** known as the "2-Clause License" or "FreeBSD License".) + ** This program is distributed in the hope that it will be useful, -** but WITHOUT ANY WARRANTY; without even the implied warranty of -** MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -** General Public License for more details. -** -** You should have received a copy of the GNU General Public -** License along with this library; if not, write to the -** Free Software Foundation, Inc., 59 Temple Place - Suite 330, -** Boston, MA 02111-1307, USA. +** but without any warranty; without even the implied warranty of +** merchantability or fitness for a particular purpose. ** ** Author contact information: ** drh@hwaci.com ** http://www.hwaci.com/drh/ ** Index: src/sync.c ================================================================== --- src/sync.c +++ src/sync.c @@ -1,21 +1,15 @@ /* ** Copyright (c) 2007 D. Richard Hipp ** ** This program is free software; you can redistribute it and/or -** modify it under the terms of the GNU General Public -** License version 2 as published by the Free Software Foundation. -** +** modify it under the terms of the Simplified BSD License (also +** known as the "2-Clause License" or "FreeBSD License".) + ** This program is distributed in the hope that it will be useful, -** but WITHOUT ANY WARRANTY; without even the implied warranty of -** MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -** General Public License for more details. -** -** You should have received a copy of the GNU General Public -** License along with this library; if not, write to the -** Free Software Foundation, Inc., 59 Temple Place - Suite 330, -** Boston, MA 02111-1307, USA. +** but without any warranty; without even the implied warranty of +** merchantability or fitness for a particular purpose. ** ** Author contact information: ** drh@hwaci.com ** http://www.hwaci.com/drh/ ** Index: src/tag.c ================================================================== --- src/tag.c +++ src/tag.c @@ -1,21 +1,15 @@ /* ** Copyright (c) 2007 D. Richard Hipp ** ** This program is free software; you can redistribute it and/or -** modify it under the terms of the GNU General Public -** License version 2 as published by the Free Software Foundation. -** +** modify it under the terms of the Simplified BSD License (also +** known as the "2-Clause License" or "FreeBSD License".) + ** This program is distributed in the hope that it will be useful, -** but WITHOUT ANY WARRANTY; without even the implied warranty of -** MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -** General Public License for more details. -** -** You should have received a copy of the GNU General Public -** License along with this library; if not, write to the -** Free Software Foundation, Inc., 59 Temple Place - Suite 330, -** Boston, MA 02111-1307, USA. +** but without any warranty; without even the implied warranty of +** merchantability or fitness for a particular purpose. ** ** Author contact information: ** drh@hwaci.com ** http://www.hwaci.com/drh/ ** Index: src/th_main.c ================================================================== --- src/th_main.c +++ src/th_main.c @@ -1,21 +1,15 @@ /* ** Copyright (c) 2008 D. Richard Hipp ** ** This program is free software; you can redistribute it and/or -** modify it under the terms of the GNU General Public -** License version 2 as published by the Free Software Foundation. -** +** modify it under the terms of the Simplified BSD License (also +** known as the "2-Clause License" or "FreeBSD License".) + ** This program is distributed in the hope that it will be useful, -** but WITHOUT ANY WARRANTY; without even the implied warranty of -** MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -** General Public License for more details. -** -** You should have received a copy of the GNU General Public -** License along with this library; if not, write to the -** Free Software Foundation, Inc., 59 Temple Place - Suite 330, -** Boston, MA 02111-1307, USA. +** but without any warranty; without even the implied warranty of +** merchantability or fitness for a particular purpose. ** ** Author contact information: ** drh@hwaci.com ** http://www.hwaci.com/drh/ ** Index: src/timeline.c ================================================================== --- src/timeline.c +++ src/timeline.c @@ -1,21 +1,15 @@ /* ** Copyright (c) 2007 D. Richard Hipp ** ** This program is free software; you can redistribute it and/or -** modify it under the terms of the GNU General Public -** License version 2 as published by the Free Software Foundation. -** +** modify it under the terms of the Simplified BSD License (also +** known as the "2-Clause License" or "FreeBSD License".) + ** This program is distributed in the hope that it will be useful, -** but WITHOUT ANY WARRANTY; without even the implied warranty of -** MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -** General Public License for more details. -** -** You should have received a copy of the GNU General Public -** License along with this library; if not, write to the -** Free Software Foundation, Inc., 59 Temple Place - Suite 330, -** Boston, MA 02111-1307, USA. +** but without any warranty; without even the implied warranty of +** merchantability or fitness for a particular purpose. ** ** Author contact information: ** drh@hwaci.com ** http://www.hwaci.com/drh/ ** Index: src/tkt.c ================================================================== --- src/tkt.c +++ src/tkt.c @@ -1,21 +1,15 @@ /* ** Copyright (c) 2007 D. Richard Hipp ** ** This program is free software; you can redistribute it and/or -** modify it under the terms of the GNU General Public -** License version 2 as published by the Free Software Foundation. -** +** modify it under the terms of the Simplified BSD License (also +** known as the "2-Clause License" or "FreeBSD License".) + ** This program is distributed in the hope that it will be useful, -** but WITHOUT ANY WARRANTY; without even the implied warranty of -** MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -** General Public License for more details. -** -** You should have received a copy of the GNU General Public -** License along with this library; if not, write to the -** Free Software Foundation, Inc., 59 Temple Place - Suite 330, -** Boston, MA 02111-1307, USA. +** but without any warranty; without even the implied warranty of +** merchantability or fitness for a particular purpose. ** ** Author contact information: ** drh@hwaci.com ** http://www.hwaci.com/drh/ ** Index: src/tktsetup.c ================================================================== --- src/tktsetup.c +++ src/tktsetup.c @@ -1,21 +1,15 @@ /* ** Copyright (c) 2007 D. Richard Hipp ** ** This program is free software; you can redistribute it and/or -** modify it under the terms of the GNU General Public -** License version 2 as published by the Free Software Foundation. -** +** modify it under the terms of the Simplified BSD License (also +** known as the "2-Clause License" or "FreeBSD License".) + ** This program is distributed in the hope that it will be useful, -** but WITHOUT ANY WARRANTY; without even the implied warranty of -** MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -** General Public License for more details. -** -** You should have received a copy of the GNU General Public -** License along with this library; if not, write to the -** Free Software Foundation, Inc., 59 Temple Place - Suite 330, -** Boston, MA 02111-1307, USA. +** but without any warranty; without even the implied warranty of +** merchantability or fitness for a particular purpose. ** ** Author contact information: ** drh@hwaci.com ** http://www.hwaci.com/drh/ ** Index: src/translate.c ================================================================== --- src/translate.c +++ src/translate.c @@ -1,30 +1,22 @@ /* ** Copyright (c) 2002 D. Richard Hipp ** ** This program is free software; you can redistribute it and/or -** modify it under the terms of the GNU General Public -** License as published by the Free Software Foundation; either -** version 2 of the License, or (at your option) any later version. -** +** modify it under the terms of the Simplified BSD License (also +** known as the "2-Clause License" or "FreeBSD License".) + ** This program is distributed in the hope that it will be useful, -** but WITHOUT ANY WARRANTY; without even the implied warranty of -** MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -** General Public License for more details. -** -** You should have received a copy of the GNU General Public -** License along with this library; if not, write to the -** Free Software Foundation, Inc., 59 Temple Place - Suite 330, -** Boston, MA 02111-1307, USA. +** but without any warranty; without even the implied warranty of +** merchantability or fitness for a particular purpose. ** ** Author contact information: ** drh@hwaci.com ** http://www.hwaci.com/drh/ ** ******************************************************************************* ** -** This program reads C source code from standard input. Lines that ** begin with the "@" character are translated into cgi_printf() statements ** and the translated code is written on standard output. ** ** The problem this program is attempt to solve is as follows: When ** writing CGI programs in C, we typically want to output a lot of HTML Index: src/undo.c ================================================================== --- src/undo.c +++ src/undo.c @@ -1,21 +1,15 @@ /* ** Copyright (c) 2007 D. Richard Hipp ** ** This program is free software; you can redistribute it and/or -** modify it under the terms of the GNU General Public -** License version 2 as published by the Free Software Foundation. -** +** modify it under the terms of the Simplified BSD License (also +** known as the "2-Clause License" or "FreeBSD License".) + ** This program is distributed in the hope that it will be useful, -** but WITHOUT ANY WARRANTY; without even the implied warranty of -** MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -** General Public License for more details. -** -** You should have received a copy of the GNU General Public -** License along with this library; if not, write to the -** Free Software Foundation, Inc., 59 Temple Place - Suite 330, -** Boston, MA 02111-1307, USA. +** but without any warranty; without even the implied warranty of +** merchantability or fitness for a particular purpose. ** ** Author contact information: ** drh@hwaci.com ** http://www.hwaci.com/drh/ ** Index: src/update.c ================================================================== --- src/update.c +++ src/update.c @@ -1,21 +1,15 @@ /* ** Copyright (c) 2007 D. Richard Hipp ** ** This program is free software; you can redistribute it and/or -** modify it under the terms of the GNU General Public -** License version 2 as published by the Free Software Foundation. -** +** modify it under the terms of the Simplified BSD License (also +** known as the "2-Clause License" or "FreeBSD License".) + ** This program is distributed in the hope that it will be useful, -** but WITHOUT ANY WARRANTY; without even the implied warranty of -** MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -** General Public License for more details. -** -** You should have received a copy of the GNU General Public -** License along with this library; if not, write to the -** Free Software Foundation, Inc., 59 Temple Place - Suite 330, -** Boston, MA 02111-1307, USA. +** but without any warranty; without even the implied warranty of +** merchantability or fitness for a particular purpose. ** ** Author contact information: ** drh@hwaci.com ** http://www.hwaci.com/drh/ ** Index: src/url.c ================================================================== --- src/url.c +++ src/url.c @@ -1,21 +1,15 @@ /* ** Copyright (c) 2007 D. Richard Hipp ** ** This program is free software; you can redistribute it and/or -** modify it under the terms of the GNU General Public -** License version 2 as published by the Free Software Foundation. -** +** modify it under the terms of the Simplified BSD License (also +** known as the "2-Clause License" or "FreeBSD License".) + ** This program is distributed in the hope that it will be useful, -** but WITHOUT ANY WARRANTY; without even the implied warranty of -** MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -** General Public License for more details. -** -** You should have received a copy of the GNU General Public -** License along with this library; if not, write to the -** Free Software Foundation, Inc., 59 Temple Place - Suite 330, -** Boston, MA 02111-1307, USA. +** but without any warranty; without even the implied warranty of +** merchantability or fitness for a particular purpose. ** ** Author contact information: ** drh@hwaci.com ** http://www.hwaci.com/drh/ ** Index: src/user.c ================================================================== --- src/user.c +++ src/user.c @@ -1,21 +1,15 @@ /* ** Copyright (c) 2006 D. Richard Hipp ** ** This program is free software; you can redistribute it and/or -** modify it under the terms of the GNU General Public -** License version 2 as published by the Free Software Foundation. -** +** modify it under the terms of the Simplified BSD License (also +** known as the "2-Clause License" or "FreeBSD License".) + ** This program is distributed in the hope that it will be useful, -** but WITHOUT ANY WARRANTY; without even the implied warranty of -** MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -** General Public License for more details. -** -** You should have received a copy of the GNU General Public -** License along with this library; if not, write to the -** Free Software Foundation, Inc., 59 Temple Place - Suite 330, -** Boston, MA 02111-1307, USA. +** but without any warranty; without even the implied warranty of +** merchantability or fitness for a particular purpose. ** ** Author contact information: ** drh@hwaci.com ** http://www.hwaci.com/drh/ ** Index: src/verify.c ================================================================== --- src/verify.c +++ src/verify.c @@ -1,21 +1,15 @@ /* ** Copyright (c) 2007 D. Richard Hipp ** ** This program is free software; you can redistribute it and/or -** modify it under the terms of the GNU General Public -** License version 2 as published by the Free Software Foundation. -** +** modify it under the terms of the Simplified BSD License (also +** known as the "2-Clause License" or "FreeBSD License".) + ** This program is distributed in the hope that it will be useful, -** but WITHOUT ANY WARRANTY; without even the implied warranty of -** MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -** General Public License for more details. -** -** You should have received a copy of the GNU General Public -** License along with this library; if not, write to the -** Free Software Foundation, Inc., 59 Temple Place - Suite 330, -** Boston, MA 02111-1307, USA. +** but without any warranty; without even the implied warranty of +** merchantability or fitness for a particular purpose. ** ** Author contact information: ** drh@hwaci.com ** http://www.hwaci.com/drh/ ** Index: src/vfile.c ================================================================== --- src/vfile.c +++ src/vfile.c @@ -1,21 +1,15 @@ /* ** Copyright (c) 2007 D. Richard Hipp ** ** This program is free software; you can redistribute it and/or -** modify it under the terms of the GNU General Public -** License version 2 as published by the Free Software Foundation. -** +** modify it under the terms of the Simplified BSD License (also +** known as the "2-Clause License" or "FreeBSD License".) + ** This program is distributed in the hope that it will be useful, -** but WITHOUT ANY WARRANTY; without even the implied warranty of -** MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -** General Public License for more details. -** -** You should have received a copy of the GNU General Public -** License along with this library; if not, write to the -** Free Software Foundation, Inc., 59 Temple Place - Suite 330, -** Boston, MA 02111-1307, USA. +** but without any warranty; without even the implied warranty of +** merchantability or fitness for a particular purpose. ** ** Author contact information: ** drh@hwaci.com ** http://www.hwaci.com/drh/ ** Index: src/wiki.c ================================================================== --- src/wiki.c +++ src/wiki.c @@ -1,22 +1,16 @@ /* ** Copyright (c) 2007 D. Richard Hipp ** Copyright (c) 2008 Stephan Beal ** ** This program is free software; you can redistribute it and/or -** modify it under the terms of the GNU General Public -** License version 2 as published by the Free Software Foundation. -** +** modify it under the terms of the Simplified BSD License (also +** known as the "2-Clause License" or "FreeBSD License".) + ** This program is distributed in the hope that it will be useful, -** but WITHOUT ANY WARRANTY; without even the implied warranty of -** MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -** General Public License for more details. -** -** You should have received a copy of the GNU General Public -** License along with this library; if not, write to the -** Free Software Foundation, Inc., 59 Temple Place - Suite 330, -** Boston, MA 02111-1307, USA. +** but without any warranty; without even the implied warranty of +** merchantability or fitness for a particular purpose. ** ** Author contact information: ** drh@hwaci.com ** http://www.hwaci.com/drh/ ** Index: src/wikiformat.c ================================================================== --- src/wikiformat.c +++ src/wikiformat.c @@ -1,21 +1,15 @@ /* ** Copyright (c) 2007 D. Richard Hipp ** ** This program is free software; you can redistribute it and/or -** modify it under the terms of the GNU General Public -** License version 2 as published by the Free Software Foundation. -** +** modify it under the terms of the Simplified BSD License (also +** known as the "2-Clause License" or "FreeBSD License".) + ** This program is distributed in the hope that it will be useful, -** but WITHOUT ANY WARRANTY; without even the implied warranty of -** MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -** General Public License for more details. -** -** You should have received a copy of the GNU General Public -** License along with this library; if not, write to the -** Free Software Foundation, Inc., 59 Temple Place - Suite 330, -** Boston, MA 02111-1307, USA. +** but without any warranty; without even the implied warranty of +** merchantability or fitness for a particular purpose. ** ** Author contact information: ** drh@hwaci.com ** http://www.hwaci.com/drh/ ** Index: src/winhttp.c ================================================================== --- src/winhttp.c +++ src/winhttp.c @@ -1,21 +1,15 @@ /* ** Copyright (c) 2008 D. Richard Hipp ** ** This program is free software; you can redistribute it and/or -** modify it under the terms of the GNU General Public -** License version 2 as published by the Free Software Foundation. -** +** modify it under the terms of the Simplified BSD License (also +** known as the "2-Clause License" or "FreeBSD License".) + ** This program is distributed in the hope that it will be useful, -** but WITHOUT ANY WARRANTY; without even the implied warranty of -** MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -** General Public License for more details. -** -** You should have received a copy of the GNU General Public -** License along with this library; if not, write to the -** Free Software Foundation, Inc., 59 Temple Place - Suite 330, -** Boston, MA 02111-1307, USA. +** but without any warranty; without even the implied warranty of +** merchantability or fitness for a particular purpose. ** ** Author contact information: ** drh@hwaci.com ** http://www.hwaci.com/drh/ ** Index: src/xfer.c ================================================================== --- src/xfer.c +++ src/xfer.c @@ -1,21 +1,15 @@ /* ** Copyright (c) 2007 D. Richard Hipp ** ** This program is free software; you can redistribute it and/or -** modify it under the terms of the GNU General Public -** License version 2 as published by the Free Software Foundation. -** +** modify it under the terms of the Simplified BSD License (also +** known as the "2-Clause License" or "FreeBSD License".) + ** This program is distributed in the hope that it will be useful, -** but WITHOUT ANY WARRANTY; without even the implied warranty of -** MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -** General Public License for more details. -** -** You should have received a copy of the GNU General Public -** License along with this library; if not, write to the -** Free Software Foundation, Inc., 59 Temple Place - Suite 330, -** Boston, MA 02111-1307, USA. +** but without any warranty; without even the implied warranty of +** merchantability or fitness for a particular purpose. ** ** Author contact information: ** drh@hwaci.com ** http://www.hwaci.com/drh/ ** Index: src/zip.c ================================================================== --- src/zip.c +++ src/zip.c @@ -1,21 +1,15 @@ /* ** Copyright (c) 2007 D. Richard Hipp ** ** This program is free software; you can redistribute it and/or -** modify it under the terms of the GNU General Public -** License version 2 as published by the Free Software Foundation. -** +** modify it under the terms of the Simplified BSD License (also +** known as the "2-Clause License" or "FreeBSD License".) + ** This program is distributed in the hope that it will be useful, -** but WITHOUT ANY WARRANTY; without even the implied warranty of -** MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -** General Public License for more details. -** -** You should have received a copy of the GNU General Public -** License along with this library; if not, write to the -** Free Software Foundation, Inc., 59 Temple Place - Suite 330, -** Boston, MA 02111-1307, USA. +** but without any warranty; without even the implied warranty of +** merchantability or fitness for a particular purpose. ** ** Author contact information: ** drh@hwaci.com ** http://www.hwaci.com/drh/ **