diff options
Diffstat (limited to 'xdelta3')
43 files changed, 737 insertions, 710 deletions
diff --git a/xdelta3/COPYING b/xdelta3/COPYING deleted file mode 100644 index 5b6e7c6..0000000 --- a/xdelta3/COPYING +++ /dev/null | |||
@@ -1,340 +0,0 @@ | |||
1 | GNU GENERAL PUBLIC LICENSE | ||
2 | Version 2, June 1991 | ||
3 | |||
4 | Copyright (C) 1989, 1991 Free Software Foundation, Inc. | ||
5 | 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA | ||
6 | Everyone is permitted to copy and distribute verbatim copies | ||
7 | of this license document, but changing it is not allowed. | ||
8 | |||
9 | Preamble | ||
10 | |||
11 | The licenses for most software are designed to take away your | ||
12 | freedom to share and change it. By contrast, the GNU General Public | ||
13 | License is intended to guarantee your freedom to share and change free | ||
14 | software--to make sure the software is free for all its users. This | ||
15 | General Public License applies to most of the Free Software | ||
16 | Foundation's software and to any other program whose authors commit to | ||
17 | using it. (Some other Free Software Foundation software is covered by | ||
18 | the GNU Library General Public License instead.) You can apply it to | ||
19 | your programs, too. | ||
20 | |||
21 | When we speak of free software, we are referring to freedom, not | ||
22 | price. Our General Public Licenses are designed to make sure that you | ||
23 | have the freedom to distribute copies of free software (and charge for | ||
24 | this service if you wish), that you receive source code or can get it | ||
25 | if you want it, that you can change the software or use pieces of it | ||
26 | in new free programs; and that you know you can do these things. | ||
27 | |||
28 | To protect your rights, we need to make restrictions that forbid | ||
29 | anyone to deny you these rights or to ask you to surrender the rights. | ||
30 | These restrictions translate to certain responsibilities for you if you | ||
31 | distribute copies of the software, or if you modify it. | ||
32 | |||
33 | For example, if you distribute copies of such a program, whether | ||
34 | gratis or for a fee, you must give the recipients all the rights that | ||
35 | you have. You must make sure that they, too, receive or can get the | ||
36 | source code. And you must show them these terms so they know their | ||
37 | rights. | ||
38 | |||
39 | We protect your rights with two steps: (1) copyright the software, and | ||
40 | (2) offer you this license which gives you legal permission to copy, | ||
41 | distribute and/or modify the software. | ||
42 | |||
43 | Also, for each author's protection and ours, we want to make certain | ||
44 | that everyone understands that there is no warranty for this free | ||
45 | software. If the software is modified by someone else and passed on, we | ||
46 | want its recipients to know that what they have is not the original, so | ||
47 | that any problems introduced by others will not reflect on the original | ||
48 | authors' reputations. | ||
49 | |||
50 | Finally, any free program is threatened constantly by software | ||
51 | patents. We wish to avoid the danger that redistributors of a free | ||
52 | program will individually obtain patent licenses, in effect making the | ||
53 | program proprietary. To prevent this, we have made it clear that any | ||
54 | patent must be licensed for everyone's free use or not licensed at all. | ||
55 | |||
56 | The precise terms and conditions for copying, distribution and | ||
57 | modification follow. | ||
58 | |||
59 | GNU GENERAL PUBLIC LICENSE | ||
60 | TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION | ||
61 | |||
62 | 0. This License applies to any program or other work which contains | ||
63 | a notice placed by the copyright holder saying it may be distributed | ||
64 | under the terms of this General Public License. The "Program", below, | ||
65 | refers to any such program or work, and a "work based on the Program" | ||
66 | means either the Program or any derivative work under copyright law: | ||
67 | that is to say, a work containing the Program or a portion of it, | ||
68 | either verbatim or with modifications and/or translated into another | ||
69 | language. (Hereinafter, translation is included without limitation in | ||
70 | the term "modification".) Each licensee is addressed as "you". | ||
71 | |||
72 | Activities other than copying, distribution and modification are not | ||
73 | covered by this License; they are outside its scope. The act of | ||
74 | running the Program is not restricted, and the output from the Program | ||
75 | is covered only if its contents constitute a work based on the | ||
76 | Program (independent of having been made by running the Program). | ||
77 | Whether that is true depends on what the Program does. | ||
78 | |||
79 | 1. You may copy and distribute verbatim copies of the Program's | ||
80 | source code as you receive it, in any medium, provided that you | ||
81 | conspicuously and appropriately publish on each copy an appropriate | ||
82 | copyright notice and disclaimer of warranty; keep intact all the | ||
83 | notices that refer to this License and to the absence of any warranty; | ||
84 | and give any other recipients of the Program a copy of this License | ||
85 | along with the Program. | ||
86 | |||
87 | You may charge a fee for the physical act of transferring a copy, and | ||
88 | you may at your option offer warranty protection in exchange for a fee. | ||
89 | |||
90 | 2. You may modify your copy or copies of the Program or any portion | ||
91 | of it, thus forming a work based on the Program, and copy and | ||
92 | distribute such modifications or work under the terms of Section 1 | ||
93 | above, provided that you also meet all of these conditions: | ||
94 | |||
95 | a) You must cause the modified files to carry prominent notices | ||
96 | stating that you changed the files and the date of any change. | ||
97 | |||
98 | b) You must cause any work that you distribute or publish, that in | ||
99 | whole or in part contains or is derived from the Program or any | ||
100 | part thereof, to be licensed as a whole at no charge to all third | ||
101 | parties under the terms of this License. | ||
102 | |||
103 | c) If the modified program normally reads commands interactively | ||
104 | when run, you must cause it, when started running for such | ||
105 | interactive use in the most ordinary way, to print or display an | ||
106 | announcement including an appropriate copyright notice and a | ||
107 | notice that there is no warranty (or else, saying that you provide | ||
108 | a warranty) and that users may redistribute the program under | ||
109 | these conditions, and telling the user how to view a copy of this | ||
110 | License. (Exception: if the Program itself is interactive but | ||
111 | does not normally print such an announcement, your work based on | ||
112 | the Program is not required to print an announcement.) | ||
113 | |||
114 | These requirements apply to the modified work as a whole. If | ||
115 | identifiable sections of that work are not derived from the Program, | ||
116 | and can be reasonably considered independent and separate works in | ||
117 | themselves, then this License, and its terms, do not apply to those | ||
118 | sections when you distribute them as separate works. But when you | ||
119 | distribute the same sections as part of a whole which is a work based | ||
120 | on the Program, the distribution of the whole must be on the terms of | ||
121 | this License, whose permissions for other licensees extend to the | ||
122 | entire whole, and thus to each and every part regardless of who wrote it. | ||
123 | |||
124 | Thus, it is not the intent of this section to claim rights or contest | ||
125 | your rights to work written entirely by you; rather, the intent is to | ||
126 | exercise the right to control the distribution of derivative or | ||
127 | collective works based on the Program. | ||
128 | |||
129 | In addition, mere aggregation of another work not based on the Program | ||
130 | with the Program (or with a work based on the Program) on a volume of | ||
131 | a storage or distribution medium does not bring the other work under | ||
132 | the scope of this License. | ||
133 | |||
134 | 3. You may copy and distribute the Program (or a work based on it, | ||
135 | under Section 2) in object code or executable form under the terms of | ||
136 | Sections 1 and 2 above provided that you also do one of the following: | ||
137 | |||
138 | a) Accompany it with the complete corresponding machine-readable | ||
139 | source code, which must be distributed under the terms of Sections | ||
140 | 1 and 2 above on a medium customarily used for software interchange; or, | ||
141 | |||
142 | b) Accompany it with a written offer, valid for at least three | ||
143 | years, to give any third party, for a charge no more than your | ||
144 | cost of physically performing source distribution, a complete | ||
145 | machine-readable copy of the corresponding source code, to be | ||
146 | distributed under the terms of Sections 1 and 2 above on a medium | ||
147 | customarily used for software interchange; or, | ||
148 | |||
149 | c) Accompany it with the information you received as to the offer | ||
150 | to distribute corresponding source code. (This alternative is | ||
151 | allowed only for noncommercial distribution and only if you | ||
152 | received the program in object code or executable form with such | ||
153 | an offer, in accord with Subsection b above.) | ||
154 | |||
155 | The source code for a work means the preferred form of the work for | ||
156 | making modifications to it. For an executable work, complete source | ||
157 | code means all the source code for all modules it contains, plus any | ||
158 | associated interface definition files, plus the scripts used to | ||
159 | control compilation and installation of the executable. However, as a | ||
160 | special exception, the source code distributed need not include | ||
161 | anything that is normally distributed (in either source or binary | ||
162 | form) with the major components (compiler, kernel, and so on) of the | ||
163 | operating system on which the executable runs, unless that component | ||
164 | itself accompanies the executable. | ||
165 | |||
166 | If distribution of executable or object code is made by offering | ||
167 | access to copy from a designated place, then offering equivalent | ||
168 | access to copy the source code from the same place counts as | ||
169 | distribution of the source code, even though third parties are not | ||
170 | compelled to copy the source along with the object code. | ||
171 | |||
172 | 4. You may not copy, modify, sublicense, or distribute the Program | ||
173 | except as expressly provided under this License. Any attempt | ||
174 | otherwise to copy, modify, sublicense or distribute the Program is | ||
175 | void, and will automatically terminate your rights under this License. | ||
176 | However, parties who have received copies, or rights, from you under | ||
177 | this License will not have their licenses terminated so long as such | ||
178 | parties remain in full compliance. | ||
179 | |||
180 | 5. You are not required to accept this License, since you have not | ||
181 | signed it. However, nothing else grants you permission to modify or | ||
182 | distribute the Program or its derivative works. These actions are | ||
183 | prohibited by law if you do not accept this License. Therefore, by | ||
184 | modifying or distributing the Program (or any work based on the | ||
185 | Program), you indicate your acceptance of this License to do so, and | ||
186 | all its terms and conditions for copying, distributing or modifying | ||
187 | the Program or works based on it. | ||
188 | |||
189 | 6. Each time you redistribute the Program (or any work based on the | ||
190 | Program), the recipient automatically receives a license from the | ||
191 | original licensor to copy, distribute or modify the Program subject to | ||
192 | these terms and conditions. You may not impose any further | ||
193 | restrictions on the recipients' exercise of the rights granted herein. | ||
194 | You are not responsible for enforcing compliance by third parties to | ||
195 | this License. | ||
196 | |||
197 | 7. If, as a consequence of a court judgment or allegation of patent | ||
198 | infringement or for any other reason (not limited to patent issues), | ||
199 | conditions are imposed on you (whether by court order, agreement or | ||
200 | otherwise) that contradict the conditions of this License, they do not | ||
201 | excuse you from the conditions of this License. If you cannot | ||
202 | distribute so as to satisfy simultaneously your obligations under this | ||
203 | License and any other pertinent obligations, then as a consequence you | ||
204 | may not distribute the Program at all. For example, if a patent | ||
205 | license would not permit royalty-free redistribution of the Program by | ||
206 | all those who receive copies directly or indirectly through you, then | ||
207 | the only way you could satisfy both it and this License would be to | ||
208 | refrain entirely from distribution of the Program. | ||
209 | |||
210 | If any portion of this section is held invalid or unenforceable under | ||
211 | any particular circumstance, the balance of the section is intended to | ||
212 | apply and the section as a whole is intended to apply in other | ||
213 | circumstances. | ||
214 | |||
215 | It is not the purpose of this section to induce you to infringe any | ||
216 | patents or other property right claims or to contest validity of any | ||
217 | such claims; this section has the sole purpose of protecting the | ||
218 | integrity of the free software distribution system, which is | ||
219 | implemented by public license practices. Many people have made | ||
220 | generous contributions to the wide range of software distributed | ||
221 | through that system in reliance on consistent application of that | ||
222 | system; it is up to the author/donor to decide if he or she is willing | ||
223 | to distribute software through any other system and a licensee cannot | ||
224 | impose that choice. | ||
225 | |||
226 | This section is intended to make thoroughly clear what is believed to | ||
227 | be a consequence of the rest of this License. | ||
228 | |||
229 | 8. If the distribution and/or use of the Program is restricted in | ||
230 | certain countries either by patents or by copyrighted interfaces, the | ||
231 | original copyright holder who places the Program under this License | ||
232 | may add an explicit geographical distribution limitation excluding | ||
233 | those countries, so that distribution is permitted only in or among | ||
234 | countries not thus excluded. In such case, this License incorporates | ||
235 | the limitation as if written in the body of this License. | ||
236 | |||
237 | 9. The Free Software Foundation may publish revised and/or new versions | ||
238 | of the General Public License from time to time. Such new versions will | ||
239 | be similar in spirit to the present version, but may differ in detail to | ||
240 | address new problems or concerns. | ||
241 | |||
242 | Each version is given a distinguishing version number. If the Program | ||
243 | specifies a version number of this License which applies to it and "any | ||
244 | later version", you have the option of following the terms and conditions | ||
245 | either of that version or of any later version published by the Free | ||
246 | Software Foundation. If the Program does not specify a version number of | ||
247 | this License, you may choose any version ever published by the Free Software | ||
248 | Foundation. | ||
249 | |||
250 | 10. If you wish to incorporate parts of the Program into other free | ||
251 | programs whose distribution conditions are different, write to the author | ||
252 | to ask for permission. For software which is copyrighted by the Free | ||
253 | Software Foundation, write to the Free Software Foundation; we sometimes | ||
254 | make exceptions for this. Our decision will be guided by the two goals | ||
255 | of preserving the free status of all derivatives of our free software and | ||
256 | of promoting the sharing and reuse of software generally. | ||
257 | |||
258 | NO WARRANTY | ||
259 | |||
260 | 11. BECAUSE THE PROGRAM IS LICENSED FREE OF CHARGE, THERE IS NO WARRANTY | ||
261 | FOR THE PROGRAM, TO THE EXTENT PERMITTED BY APPLICABLE LAW. EXCEPT WHEN | ||
262 | OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR OTHER PARTIES | ||
263 | PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED | ||
264 | OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF | ||
265 | MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. THE ENTIRE RISK AS | ||
266 | TO THE QUALITY AND PERFORMANCE OF THE PROGRAM IS WITH YOU. SHOULD THE | ||
267 | PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF ALL NECESSARY SERVICING, | ||
268 | REPAIR OR CORRECTION. | ||
269 | |||
270 | 12. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING | ||
271 | WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY AND/OR | ||
272 | REDISTRIBUTE THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, | ||
273 | INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING | ||
274 | OUT OF THE USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED | ||
275 | TO LOSS OF DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY | ||
276 | YOU OR THIRD PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER | ||
277 | PROGRAMS), EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE | ||
278 | POSSIBILITY OF SUCH DAMAGES. | ||
279 | |||
280 | END OF TERMS AND CONDITIONS | ||
281 | |||
282 | How to Apply These Terms to Your New Programs | ||
283 | |||
284 | If you develop a new program, and you want it to be of the greatest | ||
285 | possible use to the public, the best way to achieve this is to make it | ||
286 | free software which everyone can redistribute and change under these terms. | ||
287 | |||
288 | To do so, attach the following notices to the program. It is safest | ||
289 | to attach them to the start of each source file to most effectively | ||
290 | convey the exclusion of warranty; and each file should have at least | ||
291 | the "copyright" line and a pointer to where the full notice is found. | ||
292 | |||
293 | <one line to give the program's name and a brief idea of what it does.> | ||
294 | Copyright (C) <year> <name of author> | ||
295 | |||
296 | This program is free software; you can redistribute it and/or modify | ||
297 | it under the terms of the GNU General Public License as published by | ||
298 | the Free Software Foundation; either version 2 of the License, or | ||
299 | (at your option) any later version. | ||
300 | |||
301 | This program is distributed in the hope that it will be useful, | ||
302 | but WITHOUT ANY WARRANTY; without even the implied warranty of | ||
303 | MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the | ||
304 | GNU General Public License for more details. | ||
305 | |||
306 | You should have received a copy of the GNU General Public License | ||
307 | along with this program; if not, write to the Free Software | ||
308 | Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA | ||
309 | |||
310 | |||
311 | Also add information on how to contact you by electronic and paper mail. | ||
312 | |||
313 | If the program is interactive, make it output a short notice like this | ||
314 | when it starts in an interactive mode: | ||
315 | |||
316 | Gnomovision version 69, Copyright (C) year name of author | ||
317 | Gnomovision comes with ABSOLUTELY NO WARRANTY; for details type `show w'. | ||
318 | This is free software, and you are welcome to redistribute it | ||
319 | under certain conditions; type `show c' for details. | ||
320 | |||
321 | The hypothetical commands `show w' and `show c' should show the appropriate | ||
322 | parts of the General Public License. Of course, the commands you use may | ||
323 | be called something other than `show w' and `show c'; they could even be | ||
324 | mouse-clicks or menu items--whatever suits your program. | ||
325 | |||
326 | You should also get your employer (if you work as a programmer) or your | ||
327 | school, if any, to sign a "copyright disclaimer" for the program, if | ||
328 | necessary. Here is a sample; alter the names: | ||
329 | |||
330 | Yoyodyne, Inc., hereby disclaims all copyright interest in the program | ||
331 | `Gnomovision' (which makes passes at compilers) written by James Hacker. | ||
332 | |||
333 | <signature of Ty Coon>, 1 April 1989 | ||
334 | Ty Coon, President of Vice | ||
335 | |||
336 | This General Public License does not permit incorporating your program into | ||
337 | proprietary programs. If your program is a subroutine library, you may | ||
338 | consider it more useful to permit linking proprietary applications with the | ||
339 | library. If this is what you want to do, use the GNU Library General | ||
340 | Public License instead of this License. | ||
diff --git a/xdelta3/LICENSE b/xdelta3/LICENSE new file mode 100644 index 0000000..7a77415 --- /dev/null +++ b/xdelta3/LICENSE | |||
@@ -0,0 +1,176 @@ | |||
1 | Apache License | ||
2 | Version 2.0, January 2004 | ||
3 | http://www.apache.org/licenses/ | ||
4 | |||
5 | TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION | ||
6 | |||
7 | 1. Definitions. | ||
8 | |||
9 | "License" shall mean the terms and conditions for use, reproduction, | ||
10 | and distribution as defined by Sections 1 through 9 of this document. | ||
11 | |||
12 | "Licensor" shall mean the copyright owner or entity authorized by | ||
13 | the copyright owner that is granting the License. | ||
14 | |||
15 | "Legal Entity" shall mean the union of the acting entity and all | ||
16 | other entities that control, are controlled by, or are under common | ||
17 | control with that entity. For the purposes of this definition, | ||
18 | "control" means (i) the power, direct or indirect, to cause the | ||
19 | direction or management of such entity, whether by contract or | ||
20 | otherwise, or (ii) ownership of fifty percent (50%) or more of the | ||
21 | outstanding shares, or (iii) beneficial ownership of such entity. | ||
22 | |||
23 | "You" (or "Your") shall mean an individual or Legal Entity | ||
24 | exercising permissions granted by this License. | ||
25 | |||
26 | "Source" form shall mean the preferred form for making modifications, | ||
27 | including but not limited to software source code, documentation | ||
28 | source, and configuration files. | ||
29 | |||
30 | "Object" form shall mean any form resulting from mechanical | ||
31 | transformation or translation of a Source form, including but | ||
32 | not limited to compiled object code, generated documentation, | ||
33 | and conversions to other media types. | ||
34 | |||
35 | "Work" shall mean the work of authorship, whether in Source or | ||
36 | Object form, made available under the License, as indicated by a | ||
37 | copyright notice that is included in or attached to the work | ||
38 | (an example is provided in the Appendix below). | ||
39 | |||
40 | "Derivative Works" shall mean any work, whether in Source or Object | ||
41 | form, that is based on (or derived from) the Work and for which the | ||
42 | editorial revisions, annotations, elaborations, or other modifications | ||
43 | represent, as a whole, an original work of authorship. For the purposes | ||
44 | of this License, Derivative Works shall not include works that remain | ||
45 | separable from, or merely link (or bind by name) to the interfaces of, | ||
46 | the Work and Derivative Works thereof. | ||
47 | |||
48 | "Contribution" shall mean any work of authorship, including | ||
49 | the original version of the Work and any modifications or additions | ||
50 | to that Work or Derivative Works thereof, that is intentionally | ||
51 | submitted to Licensor for inclusion in the Work by the copyright owner | ||
52 | or by an individual or Legal Entity authorized to submit on behalf of | ||
53 | the copyright owner. For the purposes of this definition, "submitted" | ||
54 | means any form of electronic, verbal, or written communication sent | ||
55 | to the Licensor or its representatives, including but not limited to | ||
56 | communication on electronic mailing lists, source code control systems, | ||
57 | and issue tracking systems that are managed by, or on behalf of, the | ||
58 | Licensor for the purpose of discussing and improving the Work, but | ||
59 | excluding communication that is conspicuously marked or otherwise | ||
60 | designated in writing by the copyright owner as "Not a Contribution." | ||
61 | |||
62 | "Contributor" shall mean Licensor and any individual or Legal Entity | ||
63 | on behalf of whom a Contribution has been received by Licensor and | ||
64 | subsequently incorporated within the Work. | ||
65 | |||
66 | 2. Grant of Copyright License. Subject to the terms and conditions of | ||
67 | this License, each Contributor hereby grants to You a perpetual, | ||
68 | worldwide, non-exclusive, no-charge, royalty-free, irrevocable | ||
69 | copyright license to reproduce, prepare Derivative Works of, | ||
70 | publicly display, publicly perform, sublicense, and distribute the | ||
71 | Work and such Derivative Works in Source or Object form. | ||
72 | |||
73 | 3. Grant of Patent License. Subject to the terms and conditions of | ||
74 | this License, each Contributor hereby grants to You a perpetual, | ||
75 | worldwide, non-exclusive, no-charge, royalty-free, irrevocable | ||
76 | (except as stated in this section) patent license to make, have made, | ||
77 | use, offer to sell, sell, import, and otherwise transfer the Work, | ||
78 | where such license applies only to those patent claims licensable | ||
79 | by such Contributor that are necessarily infringed by their | ||
80 | Contribution(s) alone or by combination of their Contribution(s) | ||
81 | with the Work to which such Contribution(s) was submitted. If You | ||
82 | institute patent litigation against any entity (including a | ||
83 | cross-claim or counterclaim in a lawsuit) alleging that the Work | ||
84 | or a Contribution incorporated within the Work constitutes direct | ||
85 | or contributory patent infringement, then any patent licenses | ||
86 | granted to You under this License for that Work shall terminate | ||
87 | as of the date such litigation is filed. | ||
88 | |||
89 | 4. Redistribution. You may reproduce and distribute copies of the | ||
90 | Work or Derivative Works thereof in any medium, with or without | ||
91 | modifications, and in Source or Object form, provided that You | ||
92 | meet the following conditions: | ||
93 | |||
94 | (a) You must give any other recipients of the Work or | ||
95 | Derivative Works a copy of this License; and | ||
96 | |||
97 | (b) You must cause any modified files to carry prominent notices | ||
98 | stating that You changed the files; and | ||
99 | |||
100 | (c) You must retain, in the Source form of any Derivative Works | ||
101 | that You distribute, all copyright, patent, trademark, and | ||
102 | attribution notices from the Source form of the Work, | ||
103 | excluding those notices that do not pertain to any part of | ||
104 | the Derivative Works; and | ||
105 | |||
106 | (d) If the Work includes a "NOTICE" text file as part of its | ||
107 | distribution, then any Derivative Works that You distribute must | ||
108 | include a readable copy of the attribution notices contained | ||
109 | within such NOTICE file, excluding those notices that do not | ||
110 | pertain to any part of the Derivative Works, in at least one | ||
111 | of the following places: within a NOTICE text file distributed | ||
112 | as part of the Derivative Works; within the Source form or | ||
113 | documentation, if provided along with the Derivative Works; or, | ||
114 | within a display generated by the Derivative Works, if and | ||
115 | wherever such third-party notices normally appear. The contents | ||
116 | of the NOTICE file are for informational purposes only and | ||
117 | do not modify the License. You may add Your own attribution | ||
118 | notices within Derivative Works that You distribute, alongside | ||
119 | or as an addendum to the NOTICE text from the Work, provided | ||
120 | that such additional attribution notices cannot be construed | ||
121 | as modifying the License. | ||
122 | |||
123 | You may add Your own copyright statement to Your modifications and | ||
124 | may provide additional or different license terms and conditions | ||
125 | for use, reproduction, or distribution of Your modifications, or | ||
126 | for any such Derivative Works as a whole, provided Your use, | ||
127 | reproduction, and distribution of the Work otherwise complies with | ||
128 | the conditions stated in this License. | ||
129 | |||
130 | 5. Submission of Contributions. Unless You explicitly state otherwise, | ||
131 | any Contribution intentionally submitted for inclusion in the Work | ||
132 | by You to the Licensor shall be under the terms and conditions of | ||
133 | this License, without any additional terms or conditions. | ||
134 | Notwithstanding the above, nothing herein shall supersede or modify | ||
135 | the terms of any separate license agreement you may have executed | ||
136 | with Licensor regarding such Contributions. | ||
137 | |||
138 | 6. Trademarks. This License does not grant permission to use the trade | ||
139 | names, trademarks, service marks, or product names of the Licensor, | ||
140 | except as required for reasonable and customary use in describing the | ||
141 | origin of the Work and reproducing the content of the NOTICE file. | ||
142 | |||
143 | 7. Disclaimer of Warranty. Unless required by applicable law or | ||
144 | agreed to in writing, Licensor provides the Work (and each | ||
145 | Contributor provides its Contributions) on an "AS IS" BASIS, | ||
146 | WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or | ||
147 | implied, including, without limitation, any warranties or conditions | ||
148 | of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A | ||
149 | PARTICULAR PURPOSE. You are solely responsible for determining the | ||
150 | appropriateness of using or redistributing the Work and assume any | ||
151 | risks associated with Your exercise of permissions under this License. | ||
152 | |||
153 | 8. Limitation of Liability. In no event and under no legal theory, | ||
154 | whether in tort (including negligence), contract, or otherwise, | ||
155 | unless required by applicable law (such as deliberate and grossly | ||
156 | negligent acts) or agreed to in writing, shall any Contributor be | ||
157 | liable to You for damages, including any direct, indirect, special, | ||
158 | incidental, or consequential damages of any character arising as a | ||
159 | result of this License or out of the use or inability to use the | ||
160 | Work (including but not limited to damages for loss of goodwill, | ||
161 | work stoppage, computer failure or malfunction, or any and all | ||
162 | other commercial damages or losses), even if such Contributor | ||
163 | has been advised of the possibility of such damages. | ||
164 | |||
165 | 9. Accepting Warranty or Additional Liability. While redistributing | ||
166 | the Work or Derivative Works thereof, You may choose to offer, | ||
167 | and charge a fee for, acceptance of support, warranty, indemnity, | ||
168 | or other liability obligations and/or rights consistent with this | ||
169 | License. However, in accepting such obligations, You may act only | ||
170 | on Your own behalf and on Your sole responsibility, not on behalf | ||
171 | of any other Contributor, and only if You agree to indemnify, | ||
172 | defend, and hold each Contributor harmless for any liability | ||
173 | incurred by, or claims asserted against, such Contributor by reason | ||
174 | of your accepting any such warranty or additional liability. | ||
175 | |||
176 | END OF TERMS AND CONDITIONS | ||
diff --git a/xdelta3/README.md b/xdelta3/README.md index a713765..ba6f030 100644 --- a/xdelta3/README.md +++ b/xdelta3/README.md | |||
@@ -33,7 +33,5 @@ File bug reports and browse open support issues here: | |||
33 | https://github.com/jmacd/xdelta/issues | 33 | https://github.com/jmacd/xdelta/issues |
34 | 34 | ||
35 | The source distribution contains the C/C++/Python APIs, Unix, Microsoft VC++ | 35 | The source distribution contains the C/C++/Python APIs, Unix, Microsoft VC++ |
36 | and Cygwin builds. Xdelta3 is covered under the terms of the GPL, see | 36 | and Cygwin builds. Xdelta3 is covered under the terms of the APL, see |
37 | COPYING. | 37 | LICENSE. |
38 | |||
39 | Commercial inquiries welcome, please contact <josh.macdonald@gmail.com> | ||
diff --git a/xdelta3/configure.ac b/xdelta3/configure.ac index ce24045..23deab8 100644 --- a/xdelta3/configure.ac +++ b/xdelta3/configure.ac | |||
@@ -1,4 +1,4 @@ | |||
1 | AC_INIT([Xdelta3], [3.0.11], [josh.macdonald@gmail.com], | 1 | AC_INIT([Xdelta3], [3.0.12], [josh.macdonald@gmail.com], |
2 | [xdelta3], [http://xdelta.org/]) | 2 | [xdelta3], [http://xdelta.org/]) |
3 | AC_PREREQ([2.68]) | 3 | AC_PREREQ([2.68]) |
4 | AC_CONFIG_MACRO_DIR([m4]) | 4 | AC_CONFIG_MACRO_DIR([m4]) |
diff --git a/xdelta3/examples/README.md b/xdelta3/examples/README.md index 60840bf..ebaf522 100644 --- a/xdelta3/examples/README.md +++ b/xdelta3/examples/README.md | |||
@@ -1,5 +1,5 @@ | |||
1 | Files in this directory demonstrate how to use the Xdelta3 API. Copyrights | 1 | Files in this directory demonstrate how to use the Xdelta3 API. Copyrights |
2 | are held by the respective authors and these files are not covered by the GPL. | 2 | are held by the respective authors. |
3 | 3 | ||
4 | small_page_test.c -- how to use xdelta3 in an environment such as the kernel | 4 | small_page_test.c -- how to use xdelta3 in an environment such as the kernel |
5 | for small pages with little memory | 5 | for small pages with little memory |
diff --git a/xdelta3/examples/checksum_test.cc b/xdelta3/examples/checksum_test.cc index 028922b..6f02522 100644 --- a/xdelta3/examples/checksum_test.cc +++ b/xdelta3/examples/checksum_test.cc | |||
@@ -1,4 +1,18 @@ | |||
1 | /* Copyright (C) 2007 Josh MacDonald */ | 1 | /* xdelta3 - delta compression tools and library -*- Mode: C++ -*- |
2 | Copyright 2016 Joshua MacDonald | ||
3 | |||
4 | Licensed under the Apache License, Version 2.0 (the "License"); | ||
5 | you may not use this file except in compliance with the License. | ||
6 | You may obtain a copy of the License at | ||
7 | |||
8 | http://www.apache.org/licenses/LICENSE-2.0 | ||
9 | |||
10 | Unless required by applicable law or agreed to in writing, software | ||
11 | distributed under the License is distributed on an "AS IS" BASIS, | ||
12 | WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. | ||
13 | See the License for the specific language governing permissions and | ||
14 | limitations under the License. | ||
15 | */ | ||
2 | 16 | ||
3 | extern "C" { | 17 | extern "C" { |
4 | #include "test.h" | 18 | #include "test.h" |
diff --git a/xdelta3/examples/compare_test.c b/xdelta3/examples/compare_test.c index f3b3ea2..24f1cb8 100644 --- a/xdelta3/examples/compare_test.c +++ b/xdelta3/examples/compare_test.c | |||
@@ -1,3 +1,18 @@ | |||
1 | /* xdelta3 - delta compression tools and library | ||
2 | Copyright 2016 Joshua MacDonald | ||
3 | |||
4 | Licensed under the Apache License, Version 2.0 (the "License"); | ||
5 | you may not use this file except in compliance with the License. | ||
6 | You may obtain a copy of the License at | ||
7 | |||
8 | http://www.apache.org/licenses/LICENSE-2.0 | ||
9 | |||
10 | Unless required by applicable law or agreed to in writing, software | ||
11 | distributed under the License is distributed on an "AS IS" BASIS, | ||
12 | WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. | ||
13 | See the License for the specific language governing permissions and | ||
14 | limitations under the License. | ||
15 | */ | ||
1 | #include <stdio.h> | 16 | #include <stdio.h> |
2 | #include <stdlib.h> | 17 | #include <stdlib.h> |
3 | #include <time.h> | 18 | #include <time.h> |
diff --git a/xdelta3/examples/encode_decode_test.c b/xdelta3/examples/encode_decode_test.c index 9f43092..d516783 100644 --- a/xdelta3/examples/encode_decode_test.c +++ b/xdelta3/examples/encode_decode_test.c | |||
@@ -1,4 +1,3 @@ | |||
1 | // | ||
2 | // Permission to distribute this example by | 1 | // Permission to distribute this example by |
3 | // Copyright (C) 2007 Ralf Junker | 2 | // Copyright (C) 2007 Ralf Junker |
4 | // Ralf Junker <delphi@yunqa.de> | 3 | // Ralf Junker <delphi@yunqa.de> |
diff --git a/xdelta3/examples/iOS/xdelta3-ios-test/xdelta3-ios-test/Xd3iOSAppDelegate.h b/xdelta3/examples/iOS/xdelta3-ios-test/xdelta3-ios-test/Xd3iOSAppDelegate.h index 27c5229..b421071 100644 --- a/xdelta3/examples/iOS/xdelta3-ios-test/xdelta3-ios-test/Xd3iOSAppDelegate.h +++ b/xdelta3/examples/iOS/xdelta3-ios-test/xdelta3-ios-test/Xd3iOSAppDelegate.h | |||
@@ -1,10 +1,18 @@ | |||
1 | // | 1 | /* xdelta3 - delta compression tools and library -*- Mode: objc *-* |
2 | // Xd3iOSAppDelegate.h | 2 | Copyright 2016 Joshua MacDonald |
3 | // xdelta3-ios-test | 3 | |
4 | // | 4 | Licensed under the Apache License, Version 2.0 (the "License"); |
5 | // Created by Joshua MacDonald on 6/16/12. | 5 | you may not use this file except in compliance with the License. |
6 | // Copyright (c) 2011, 2012 Joshua MacDonald. All rights reserved. | 6 | You may obtain a copy of the License at |
7 | // | 7 | |
8 | http://www.apache.org/licenses/LICENSE-2.0 | ||
9 | |||
10 | Unless required by applicable law or agreed to in writing, software | ||
11 | distributed under the License is distributed on an "AS IS" BASIS, | ||
12 | WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. | ||
13 | See the License for the specific language governing permissions and | ||
14 | limitations under the License. | ||
15 | */ | ||
8 | 16 | ||
9 | #import <UIKit/UIKit.h> | 17 | #import <UIKit/UIKit.h> |
10 | 18 | ||
diff --git a/xdelta3/examples/iOS/xdelta3-ios-test/xdelta3-ios-test/Xd3iOSAppDelegate.m b/xdelta3/examples/iOS/xdelta3-ios-test/xdelta3-ios-test/Xd3iOSAppDelegate.m index ad3fd8a..629faea 100644 --- a/xdelta3/examples/iOS/xdelta3-ios-test/xdelta3-ios-test/Xd3iOSAppDelegate.m +++ b/xdelta3/examples/iOS/xdelta3-ios-test/xdelta3-ios-test/Xd3iOSAppDelegate.m | |||
@@ -1,10 +1,18 @@ | |||
1 | // | 1 | /* xdelta3 - delta compression tools and library -*- Mode: objc *-* |
2 | // Xd3iOSAppDelegate.m | 2 | Copyright 2016 Joshua MacDonald |
3 | // xdelta3-ios-test | 3 | |
4 | // | 4 | Licensed under the Apache License, Version 2.0 (the "License"); |
5 | // Created by Joshua MacDonald on 6/16/12. | 5 | you may not use this file except in compliance with the License. |
6 | // Copyright (c) 2011, 2012 Joshua MacDonald. All rights reserved. | 6 | You may obtain a copy of the License at |
7 | // | 7 | |
8 | http://www.apache.org/licenses/LICENSE-2.0 | ||
9 | |||
10 | Unless required by applicable law or agreed to in writing, software | ||
11 | distributed under the License is distributed on an "AS IS" BASIS, | ||
12 | WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. | ||
13 | See the License for the specific language governing permissions and | ||
14 | limitations under the License. | ||
15 | */ | ||
8 | 16 | ||
9 | #import "Xd3iOSAppDelegate.h" | 17 | #import "Xd3iOSAppDelegate.h" |
10 | 18 | ||
diff --git a/xdelta3/examples/iOS/xdelta3-ios-test/xdelta3-ios-test/Xd3iOSViewController.h b/xdelta3/examples/iOS/xdelta3-ios-test/xdelta3-ios-test/Xd3iOSViewController.h index 700f7f4..287a4be 100644 --- a/xdelta3/examples/iOS/xdelta3-ios-test/xdelta3-ios-test/Xd3iOSViewController.h +++ b/xdelta3/examples/iOS/xdelta3-ios-test/xdelta3-ios-test/Xd3iOSViewController.h | |||
@@ -1,10 +1,18 @@ | |||
1 | // | 1 | /* xdelta3 - delta compression tools and library -*- Mode: objc *-* |
2 | // Xd3iOSViewController.h | 2 | Copyright 2016 Joshua MacDonald |
3 | // xdelta3-ios-test | 3 | |
4 | // | 4 | Licensed under the Apache License, Version 2.0 (the "License"); |
5 | // Created by Joshua MacDonald on 6/16/12. | 5 | you may not use this file except in compliance with the License. |
6 | // Copyright (c) 2011, 2012 Joshua MacDonald. All rights reserved. | 6 | You may obtain a copy of the License at |
7 | // | 7 | |
8 | http://www.apache.org/licenses/LICENSE-2.0 | ||
9 | |||
10 | Unless required by applicable law or agreed to in writing, software | ||
11 | distributed under the License is distributed on an "AS IS" BASIS, | ||
12 | WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. | ||
13 | See the License for the specific language governing permissions and | ||
14 | limitations under the License. | ||
15 | */ | ||
8 | 16 | ||
9 | #import <UIKit/UIKit.h> | 17 | #import <UIKit/UIKit.h> |
10 | 18 | ||
diff --git a/xdelta3/examples/iOS/xdelta3-ios-test/xdelta3-ios-test/Xd3iOSViewController.m b/xdelta3/examples/iOS/xdelta3-ios-test/xdelta3-ios-test/Xd3iOSViewController.m index a874aca..0db7e39 100644 --- a/xdelta3/examples/iOS/xdelta3-ios-test/xdelta3-ios-test/Xd3iOSViewController.m +++ b/xdelta3/examples/iOS/xdelta3-ios-test/xdelta3-ios-test/Xd3iOSViewController.m | |||
@@ -1,10 +1,18 @@ | |||
1 | // | 1 | /* xdelta3 - delta compression tools and library -*- Mode: objc *-* |
2 | // Xd3iOSViewController.m | 2 | Copyright 2016 Joshua MacDonald |
3 | // xdelta3-ios-test | 3 | |
4 | // | 4 | Licensed under the Apache License, Version 2.0 (the "License"); |
5 | // Created by Joshua MacDonald on 6/16/12. | 5 | you may not use this file except in compliance with the License. |
6 | // Copyright (c) 2011, 2012 Joshua MacDonald. All rights reserved. | 6 | You may obtain a copy of the License at |
7 | // | 7 | |
8 | http://www.apache.org/licenses/LICENSE-2.0 | ||
9 | |||
10 | Unless required by applicable law or agreed to in writing, software | ||
11 | distributed under the License is distributed on an "AS IS" BASIS, | ||
12 | WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. | ||
13 | See the License for the specific language governing permissions and | ||
14 | limitations under the License. | ||
15 | */ | ||
8 | 16 | ||
9 | #import "Xd3iOSViewController.h" | 17 | #import "Xd3iOSViewController.h" |
10 | #include "xdelta3.h" | 18 | #include "xdelta3.h" |
diff --git a/xdelta3/examples/iOS/xdelta3-ios-test/xdelta3-ios-test/main.m b/xdelta3/examples/iOS/xdelta3-ios-test/xdelta3-ios-test/main.m index 4bd53ea..67f1e3d 100644 --- a/xdelta3/examples/iOS/xdelta3-ios-test/xdelta3-ios-test/main.m +++ b/xdelta3/examples/iOS/xdelta3-ios-test/xdelta3-ios-test/main.m | |||
@@ -1,11 +1,18 @@ | |||
1 | // | 1 | /* xdelta3 - delta compression tools and library -*- Mode: objc *-* |
2 | // main.m | 2 | Copyright 2016 Joshua MacDonald |
3 | // xdelta3-ios-test | ||
4 | // | ||
5 | // Created by Joshua MacDonald on 6/16/12. | ||
6 | // Copyright (c) 2011, 2012 Joshua MacDonald. All rights reserved. | ||
7 | // | ||
8 | 3 | ||
4 | Licensed under the Apache License, Version 2.0 (the "License"); | ||
5 | you may not use this file except in compliance with the License. | ||
6 | You may obtain a copy of the License at | ||
7 | |||
8 | http://www.apache.org/licenses/LICENSE-2.0 | ||
9 | |||
10 | Unless required by applicable law or agreed to in writing, software | ||
11 | distributed under the License is distributed on an "AS IS" BASIS, | ||
12 | WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. | ||
13 | See the License for the specific language governing permissions and | ||
14 | limitations under the License. | ||
15 | */ | ||
9 | #import <UIKit/UIKit.h> | 16 | #import <UIKit/UIKit.h> |
10 | 17 | ||
11 | #import "Xd3iOSAppDelegate.h" | 18 | #import "Xd3iOSAppDelegate.h" |
diff --git a/xdelta3/examples/small_page_test.c b/xdelta3/examples/small_page_test.c index e4b5a1b..0e33547 100755 --- a/xdelta3/examples/small_page_test.c +++ b/xdelta3/examples/small_page_test.c | |||
@@ -1,4 +1,18 @@ | |||
1 | /* Copyright (C) 2007 Josh MacDonald */ | 1 | /* xdelta3 - delta compression tools and library |
2 | Copyright 2016 Joshua MacDonald | ||
3 | |||
4 | Licensed under the Apache License, Version 2.0 (the "License"); | ||
5 | you may not use this file except in compliance with the License. | ||
6 | You may obtain a copy of the License at | ||
7 | |||
8 | http://www.apache.org/licenses/LICENSE-2.0 | ||
9 | |||
10 | Unless required by applicable law or agreed to in writing, software | ||
11 | distributed under the License is distributed on an "AS IS" BASIS, | ||
12 | WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. | ||
13 | See the License for the specific language governing permissions and | ||
14 | limitations under the License. | ||
15 | */ | ||
2 | 16 | ||
3 | #include <stdio.h> | 17 | #include <stdio.h> |
4 | 18 | ||
diff --git a/xdelta3/examples/speed_test.c b/xdelta3/examples/speed_test.c index d9ce5aa..f8fbbb7 100644 --- a/xdelta3/examples/speed_test.c +++ b/xdelta3/examples/speed_test.c | |||
@@ -1,4 +1,18 @@ | |||
1 | /* Copyright (C) 2007 Josh MacDonald */ | 1 | /* xdelta3 - delta compression tools and library |
2 | Copyright 2016 Joshua MacDonald | ||
3 | |||
4 | Licensed under the Apache License, Version 2.0 (the "License"); | ||
5 | you may not use this file except in compliance with the License. | ||
6 | You may obtain a copy of the License at | ||
7 | |||
8 | http://www.apache.org/licenses/LICENSE-2.0 | ||
9 | |||
10 | Unless required by applicable law or agreed to in writing, software | ||
11 | distributed under the License is distributed on an "AS IS" BASIS, | ||
12 | WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. | ||
13 | See the License for the specific language governing permissions and | ||
14 | limitations under the License. | ||
15 | */ | ||
2 | 16 | ||
3 | #include "test.h" | 17 | #include "test.h" |
4 | 18 | ||
diff --git a/xdelta3/examples/test.h b/xdelta3/examples/test.h index f31ae49..f7082f2 100644 --- a/xdelta3/examples/test.h +++ b/xdelta3/examples/test.h | |||
@@ -1,4 +1,18 @@ | |||
1 | /* Copyright (C) 2007 Josh MacDonald */ | 1 | /* xdelta3 - delta compression tools and library |
2 | Copyright 2016 Joshua MacDonald | ||
3 | |||
4 | Licensed under the Apache License, Version 2.0 (the "License"); | ||
5 | you may not use this file except in compliance with the License. | ||
6 | You may obtain a copy of the License at | ||
7 | |||
8 | http://www.apache.org/licenses/LICENSE-2.0 | ||
9 | |||
10 | Unless required by applicable law or agreed to in writing, software | ||
11 | distributed under the License is distributed on an "AS IS" BASIS, | ||
12 | WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. | ||
13 | See the License for the specific language governing permissions and | ||
14 | limitations under the License. | ||
15 | */ | ||
2 | 16 | ||
3 | #define NOT_MAIN 1 | 17 | #define NOT_MAIN 1 |
4 | 18 | ||
diff --git a/xdelta3/testing/cmp.h b/xdelta3/testing/cmp.h index 53ae671..60748cb 100644 --- a/xdelta3/testing/cmp.h +++ b/xdelta3/testing/cmp.h | |||
@@ -1,4 +1,18 @@ | |||
1 | /* -*- Mode: C++ -*- */ | 1 | /* xdelta3 - delta compression tools and library -*- Mode: C++ -*- |
2 | Copyright 2016 Joshua MacDonald | ||
3 | |||
4 | Licensed under the Apache License, Version 2.0 (the "License"); | ||
5 | you may not use this file except in compliance with the License. | ||
6 | You may obtain a copy of the License at | ||
7 | |||
8 | http://www.apache.org/licenses/LICENSE-2.0 | ||
9 | |||
10 | Unless required by applicable law or agreed to in writing, software | ||
11 | distributed under the License is distributed on an "AS IS" BASIS, | ||
12 | WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. | ||
13 | See the License for the specific language governing permissions and | ||
14 | limitations under the License. | ||
15 | */ | ||
2 | static size_t CmpDifferentBlockBytes(const Block &a, const Block &b) { | 16 | static size_t CmpDifferentBlockBytes(const Block &a, const Block &b) { |
3 | size_t total = 0; | 17 | size_t total = 0; |
4 | size_t i = 0; | 18 | size_t i = 0; |
diff --git a/xdelta3/testing/delta.h b/xdelta3/testing/delta.h index b0cca7c..af1b211 100644 --- a/xdelta3/testing/delta.h +++ b/xdelta3/testing/delta.h | |||
@@ -1,4 +1,18 @@ | |||
1 | // Mode: -*- C++ -*- | 1 | /* xdelta3 - delta compression tools and library -*- Mode: C++ -*- |
2 | Copyright 2016 Joshua MacDonald | ||
3 | |||
4 | Licensed under the Apache License, Version 2.0 (the "License"); | ||
5 | you may not use this file except in compliance with the License. | ||
6 | You may obtain a copy of the License at | ||
7 | |||
8 | http://www.apache.org/licenses/LICENSE-2.0 | ||
9 | |||
10 | Unless required by applicable law or agreed to in writing, software | ||
11 | distributed under the License is distributed on an "AS IS" BASIS, | ||
12 | WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. | ||
13 | See the License for the specific language governing permissions and | ||
14 | limitations under the License. | ||
15 | */ | ||
2 | 16 | ||
3 | class Delta { | 17 | class Delta { |
4 | public: | 18 | public: |
diff --git a/xdelta3/testing/file.h b/xdelta3/testing/file.h index 55b0eb8..9e8dee6 100644 --- a/xdelta3/testing/file.h +++ b/xdelta3/testing/file.h | |||
@@ -1,4 +1,18 @@ | |||
1 | /* -*- Mode: C++ -*- */ | 1 | /* xdelta3 - delta compression tools and library -*- Mode: C++ -*- |
2 | Copyright 2016 Joshua MacDonald | ||
3 | |||
4 | Licensed under the Apache License, Version 2.0 (the "License"); | ||
5 | you may not use this file except in compliance with the License. | ||
6 | You may obtain a copy of the License at | ||
7 | |||
8 | http://www.apache.org/licenses/LICENSE-2.0 | ||
9 | |||
10 | Unless required by applicable law or agreed to in writing, software | ||
11 | distributed under the License is distributed on an "AS IS" BASIS, | ||
12 | WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. | ||
13 | See the License for the specific language governing permissions and | ||
14 | limitations under the License. | ||
15 | */ | ||
2 | class Block; | 16 | class Block; |
3 | class BlockIterator; | 17 | class BlockIterator; |
4 | class TmpFile; | 18 | class TmpFile; |
diff --git a/xdelta3/testing/modify.h b/xdelta3/testing/modify.h index 93f7bde..6590ccd 100644 --- a/xdelta3/testing/modify.h +++ b/xdelta3/testing/modify.h | |||
@@ -1,4 +1,19 @@ | |||
1 | // -*- Mode: C++ -*- | 1 | /* xdelta3 - delta compression tools and library -*- Mode: C++ -*- |
2 | Copyright 2016 Joshua MacDonald | ||
3 | |||
4 | Licensed under the Apache License, Version 2.0 (the "License"); | ||
5 | you may not use this file except in compliance with the License. | ||
6 | You may obtain a copy of the License at | ||
7 | |||
8 | http://www.apache.org/licenses/LICENSE-2.0 | ||
9 | |||
10 | Unless required by applicable law or agreed to in writing, software | ||
11 | distributed under the License is distributed on an "AS IS" BASIS, | ||
12 | WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. | ||
13 | See the License for the specific language governing permissions and | ||
14 | limitations under the License. | ||
15 | */ | ||
16 | |||
2 | class Mutator { | 17 | class Mutator { |
3 | public: | 18 | public: |
4 | virtual ~Mutator() { } | 19 | virtual ~Mutator() { } |
diff --git a/xdelta3/testing/random.h b/xdelta3/testing/random.h index 8ff64db..6087f16 100644 --- a/xdelta3/testing/random.h +++ b/xdelta3/testing/random.h | |||
@@ -1,8 +1,19 @@ | |||
1 | /* -*- Mode: C++ -*- */ | 1 | /* xdelta3 - delta compression tools and library -*- Mode: C++ -*- |
2 | /* This is public-domain Mersenne Twister code, | 2 | Copyright 2016 Joshua MacDonald |
3 | * attributed to Michael Brundage. Thanks! | 3 | |
4 | * http://www.qbrundage.com/michaelb/pubs/essays/random_number_generation.html | 4 | Licensed under the Apache License, Version 2.0 (the "License"); |
5 | */ | 5 | you may not use this file except in compliance with the License. |
6 | You may obtain a copy of the License at | ||
7 | |||
8 | http://www.apache.org/licenses/LICENSE-2.0 | ||
9 | |||
10 | Unless required by applicable law or agreed to in writing, software | ||
11 | distributed under the License is distributed on an "AS IS" BASIS, | ||
12 | WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. | ||
13 | See the License for the specific language governing permissions and | ||
14 | limitations under the License. | ||
15 | */ | ||
16 | |||
6 | #undef MT_LEN | 17 | #undef MT_LEN |
7 | #undef MT_IA | 18 | #undef MT_IA |
8 | class MTRandom { | 19 | class MTRandom { |
@@ -25,6 +36,9 @@ class MTRandom { | |||
25 | Init(seed); | 36 | Init(seed); |
26 | } | 37 | } |
27 | 38 | ||
39 | /* This Mersenne Twister code is attributed to Michael Brundage. Thanks! | ||
40 | * http://www.qbrundage.com/michaelb/pubs/essays/random_number_generation.html | ||
41 | */ | ||
28 | uint32_t Rand32 () { | 42 | uint32_t Rand32 () { |
29 | uint32_t y; | 43 | uint32_t y; |
30 | static unsigned long mag01[2] = { | 44 | static unsigned long mag01[2] = { |
diff --git a/xdelta3/testing/regtest.cc b/xdelta3/testing/regtest.cc index b2cdaa5..49cfe5d 100644 --- a/xdelta3/testing/regtest.cc +++ b/xdelta3/testing/regtest.cc | |||
@@ -1,4 +1,19 @@ | |||
1 | /* -*- Mode: C++ -*- */ | 1 | /* xdelta3 - delta compression tools and library -*- Mode: C++ -*- |
2 | Copyright 2016 Joshua MacDonald | ||
3 | |||
4 | Licensed under the Apache License, Version 2.0 (the "License"); | ||
5 | you may not use this file except in compliance with the License. | ||
6 | You may obtain a copy of the License at | ||
7 | |||
8 | http://www.apache.org/licenses/LICENSE-2.0 | ||
9 | |||
10 | Unless required by applicable law or agreed to in writing, software | ||
11 | distributed under the License is distributed on an "AS IS" BASIS, | ||
12 | WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. | ||
13 | See the License for the specific language governing permissions and | ||
14 | limitations under the License. | ||
15 | */ | ||
16 | |||
2 | #include "test.h" | 17 | #include "test.h" |
3 | #include "random.h" | 18 | #include "random.h" |
4 | #include "sizes.h" | 19 | #include "sizes.h" |
diff --git a/xdelta3/testing/regtest_c.c b/xdelta3/testing/regtest_c.c index e2845ee..42e32ce 100644 --- a/xdelta3/testing/regtest_c.c +++ b/xdelta3/testing/regtest_c.c | |||
@@ -1,2 +1,17 @@ | |||
1 | /* -*- Mode: C++ -*- */ | 1 | /* xdelta3 - delta compression tools and library |
2 | Copyright 2016 Joshua MacDonald | ||
3 | |||
4 | Licensed under the Apache License, Version 2.0 (the "License"); | ||
5 | you may not use this file except in compliance with the License. | ||
6 | You may obtain a copy of the License at | ||
7 | |||
8 | http://www.apache.org/licenses/LICENSE-2.0 | ||
9 | |||
10 | Unless required by applicable law or agreed to in writing, software | ||
11 | distributed under the License is distributed on an "AS IS" BASIS, | ||
12 | WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. | ||
13 | See the License for the specific language governing permissions and | ||
14 | limitations under the License. | ||
15 | */ | ||
16 | |||
2 | #include "../xdelta3.c" | 17 | #include "../xdelta3.c" |
diff --git a/xdelta3/testing/segment.h b/xdelta3/testing/segment.h index ea3dcee..a242ad8 100644 --- a/xdelta3/testing/segment.h +++ b/xdelta3/testing/segment.h | |||
@@ -1,4 +1,18 @@ | |||
1 | // -*- Mode: C++ -*- | 1 | /* xdelta3 - delta compression tools and library -*- Mode: C++ -*- |
2 | Copyright 2016 Joshua MacDonald | ||
3 | |||
4 | Licensed under the Apache License, Version 2.0 (the "License"); | ||
5 | you may not use this file except in compliance with the License. | ||
6 | You may obtain a copy of the License at | ||
7 | |||
8 | http://www.apache.org/licenses/LICENSE-2.0 | ||
9 | |||
10 | Unless required by applicable law or agreed to in writing, software | ||
11 | distributed under the License is distributed on an "AS IS" BASIS, | ||
12 | WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. | ||
13 | See the License for the specific language governing permissions and | ||
14 | limitations under the License. | ||
15 | */ | ||
2 | 16 | ||
3 | class Segment { | 17 | class Segment { |
4 | public: | 18 | public: |
diff --git a/xdelta3/testing/sizes.h b/xdelta3/testing/sizes.h index 223d359..637208b 100644 --- a/xdelta3/testing/sizes.h +++ b/xdelta3/testing/sizes.h | |||
@@ -1,4 +1,19 @@ | |||
1 | // -*- Mode: C++ -*- | 1 | /* xdelta3 - delta compression tools and library -*- Mode: C++ -*- |
2 | Copyright 2016 Joshua MacDonald | ||
3 | |||
4 | Licensed under the Apache License, Version 2.0 (the "License"); | ||
5 | you may not use this file except in compliance with the License. | ||
6 | You may obtain a copy of the License at | ||
7 | |||
8 | http://www.apache.org/licenses/LICENSE-2.0 | ||
9 | |||
10 | Unless required by applicable law or agreed to in writing, software | ||
11 | distributed under the License is distributed on an "AS IS" BASIS, | ||
12 | WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. | ||
13 | See the License for the specific language governing permissions and | ||
14 | limitations under the License. | ||
15 | */ | ||
16 | |||
2 | template <typename T, typename U> | 17 | template <typename T, typename U> |
3 | class SizeIterator { | 18 | class SizeIterator { |
4 | public: | 19 | public: |
diff --git a/xdelta3/testing/test.h b/xdelta3/testing/test.h index 1eabcbd..2bf81d5 100644 --- a/xdelta3/testing/test.h +++ b/xdelta3/testing/test.h | |||
@@ -1,4 +1,18 @@ | |||
1 | // -*- Mode: C++ -*- | 1 | /* xdelta3 - delta compression tools and library -*- Mode: C++ -*- |
2 | Copyright 2016 Joshua MacDonald | ||
3 | |||
4 | Licensed under the Apache License, Version 2.0 (the "License"); | ||
5 | you may not use this file except in compliance with the License. | ||
6 | You may obtain a copy of the License at | ||
7 | |||
8 | http://www.apache.org/licenses/LICENSE-2.0 | ||
9 | |||
10 | Unless required by applicable law or agreed to in writing, software | ||
11 | distributed under the License is distributed on an "AS IS" BASIS, | ||
12 | WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. | ||
13 | See the License for the specific language governing permissions and | ||
14 | limitations under the License. | ||
15 | */ | ||
2 | 16 | ||
3 | extern "C" { | 17 | extern "C" { |
4 | #include "../xdelta3.h" | 18 | #include "../xdelta3.h" |
diff --git a/xdelta3/testing/xdelta3-regtest.py b/xdelta3/testing/xdelta3-regtest.py index cb07198..aa54c46 100755 --- a/xdelta3/testing/xdelta3-regtest.py +++ b/xdelta3/testing/xdelta3-regtest.py | |||
@@ -1,35 +1,26 @@ | |||
1 | #!/usr/bin/python2.6 | 1 | #!/usr/bin/python2.7 |
2 | # xdelta 3 - delta compression tools and library | 2 | # xdelta3 - delta compression tools and library -*- Mode: C++ -*- |
3 | # Copyright (C) 2003, 2006, 2007, 2008. Joshua P. MacDonald | 3 | # Copyright 2016 Joshua MacDonald |
4 | # | 4 | # |
5 | # This program is free software; you can redistribute it and/or modify | 5 | # Licensed under the Apache License, Version 2.0 (the "License"); |
6 | # it under the terms of the GNU General Public License as published by | 6 | # you may not use this file except in compliance with the License. |
7 | # the Free Software Foundation; either version 2 of the License, or | 7 | # You may obtain a copy of the License at |
8 | # (at your option) any later version. | ||
9 | # | 8 | # |
10 | # This program is distributed in the hope that it will be useful, | 9 | # http://www.apache.org/licenses/LICENSE-2.0 |
11 | # but WITHOUT ANY WARRANTY; without even the implied warranty of | ||
12 | # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the | ||
13 | # GNU General Public License for more details. | ||
14 | # | 10 | # |
15 | # You should have received a copy of the GNU General Public License | 11 | # Unless required by applicable law or agreed to in writing, software |
16 | # along with this program; if not, write to the Free Software | 12 | # distributed under the License is distributed on an "AS IS" BASIS, |
17 | # Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA | 13 | # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. |
14 | # See the License for the specific language governing permissions and | ||
15 | # limitations under the License. | ||
18 | 16 | ||
19 | # TODO: test 1.5 vs. greedy | 17 | # TODO This code is no longer maintained :( |
20 | 18 | ||
21 | import os, sys, math, re, time, types, array, random | 19 | import os, sys, math, re, time, types, array, random |
22 | import xdelta3 | 20 | import xdelta3 |
23 | 21 | ||
24 | #RCSDIR = '/mnt/polaroid/Polaroid/orbit_linux/home/jmacd/PRCS' | 22 | RCSDIR = '/tmp/rcs' |
25 | #RCSDIR = '/tmp/PRCS_read_copy' | 23 | SAMPLEDIR = "/tmp/diff" |
26 | #SAMPLEDIR = "/tmp/WESNOTH_tmp/diff" | ||
27 | |||
28 | #RCSDIR = 'G:/jmacd/PRCS_copy' | ||
29 | #SAMPLEDIR = "C:/sample_data/Wesnoth/tar" | ||
30 | |||
31 | RCSDIR = '/Users/jmacd/src/ftp.kernel.org' | ||
32 | SAMPLEDIR = '/Users/jmacd/src/xdelta3/linux' | ||
33 | 24 | ||
34 | # | 25 | # |
35 | MIN_SIZE = 0 | 26 | MIN_SIZE = 0 |
diff --git a/xdelta3/testing/xdelta3-test.py b/xdelta3/testing/xdelta3-test.py index 5f1a263..468db24 100755 --- a/xdelta3/testing/xdelta3-test.py +++ b/xdelta3/testing/xdelta3-test.py | |||
@@ -1,20 +1,18 @@ | |||
1 | #!/usr/bin/python2.7 | 1 | #!/usr/bin/python2.7 |
2 | # xdelta 3 - delta compression tools and library | 2 | # xdelta3 - delta compression tools and library -*- Mode: C++ -*- |
3 | # Copyright (C) 2003, 2006, 2007. Joshua P. MacDonald | 3 | # Copyright 2016 Joshua MacDonald |
4 | # | 4 | # |
5 | # This program is free software; you can redistribute it and/or modify | 5 | # Licensed under the Apache License, Version 2.0 (the "License"); |
6 | # it under the terms of the GNU General Public License as published by | 6 | # you may not use this file except in compliance with the License. |
7 | # the Free Software Foundation; either version 2 of the License, or | 7 | # You may obtain a copy of the License at |
8 | # (at your option) any later version. | ||
9 | # | 8 | # |
10 | # This program is distributed in the hope that it will be useful, | 9 | # http://www.apache.org/licenses/LICENSE-2.0 |
11 | # but WITHOUT ANY WARRANTY; without even the implied warranty of | ||
12 | # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the | ||
13 | # GNU General Public License for more details. | ||
14 | # | 10 | # |
15 | # You should have received a copy of the GNU General Public License | 11 | # Unless required by applicable law or agreed to in writing, software |
16 | # along with this program; if not, write to the Free Software | 12 | # distributed under the License is distributed on an "AS IS" BASIS, |
17 | # Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA | 13 | # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. |
14 | # See the License for the specific language governing permissions and | ||
15 | # limitations under the License. | ||
18 | 16 | ||
19 | import xdelta3 | 17 | import xdelta3 |
20 | 18 | ||
diff --git a/xdelta3/xdelta3-blkcache.h b/xdelta3/xdelta3-blkcache.h index f8fa8e2..ea668e3 100644 --- a/xdelta3/xdelta3-blkcache.h +++ b/xdelta3/xdelta3-blkcache.h | |||
@@ -1,25 +1,18 @@ | |||
1 | /* xdelta 3 - delta compression tools and library | 1 | /* xdelta3 - delta compression tools and library |
2 | * Copyright (C) 2001, 2002, 2003, 2004, 2005, 2006, 2007, | 2 | Copyright 2016 Joshua MacDonald |
3 | * 2008, 2009, 2010 | 3 | |
4 | * Joshua P. MacDonald | 4 | Licensed under the Apache License, Version 2.0 (the "License"); |
5 | * | 5 | you may not use this file except in compliance with the License. |
6 | * This program is free software; you can redistribute it and/or modify | 6 | You may obtain a copy of the License at |
7 | * it under the terms of the GNU General Public License as published by | 7 | |
8 | * the Free Software Foundation; either version 2 of the License, or | 8 | http://www.apache.org/licenses/LICENSE-2.0 |
9 | * (at your option) any later version. | ||
10 | * | ||
11 | * This program is distributed in the hope that it will be useful, | ||
12 | * but WITHOUT ANY WARRANTY; without even the implied warranty of | ||
13 | * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the | ||
14 | * GNU General Public License for more details. | ||
15 | * | ||
16 | * You should have received a copy of the GNU General Public License | ||
17 | * along with this program; if not, write to the Free Software | ||
18 | * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA | ||
19 | */ | ||
20 | 9 | ||
21 | /* TODO: This code is heavily revised from 3.0z but still needs major | 10 | Unless required by applicable law or agreed to in writing, software |
22 | * refactoring. */ | 11 | distributed under the License is distributed on an "AS IS" BASIS, |
12 | WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. | ||
13 | See the License for the specific language governing permissions and | ||
14 | limitations under the License. | ||
15 | */ | ||
23 | 16 | ||
24 | #include "xdelta3-internal.h" | 17 | #include "xdelta3-internal.h" |
25 | 18 | ||
diff --git a/xdelta3/xdelta3-cfgs.h b/xdelta3/xdelta3-cfgs.h index b13f7b0..84a2221 100644 --- a/xdelta3/xdelta3-cfgs.h +++ b/xdelta3/xdelta3-cfgs.h | |||
@@ -1,20 +1,18 @@ | |||
1 | /* xdelta 3 - delta compression tools and library | 1 | /* xdelta3 - delta compression tools and library |
2 | * Copyright (C) 2001, 2002, 2003, 2004, 2005, 2006, 2007. Joshua P. MacDonald | 2 | Copyright 2016 Joshua MacDonald |
3 | * | 3 | |
4 | * This program is free software; you can redistribute it and/or modify | 4 | Licensed under the Apache License, Version 2.0 (the "License"); |
5 | * it under the terms of the GNU General Public License as published by | 5 | you may not use this file except in compliance with the License. |
6 | * the Free Software Foundation; either version 2 of the License, or | 6 | You may obtain a copy of the License at |
7 | * (at your option) any later version. | 7 | |
8 | * | 8 | http://www.apache.org/licenses/LICENSE-2.0 |
9 | * This program is distributed in the hope that it will be useful, | 9 | |
10 | * but WITHOUT ANY WARRANTY; without even the implied warranty of | 10 | Unless required by applicable law or agreed to in writing, software |
11 | * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the | 11 | distributed under the License is distributed on an "AS IS" BASIS, |
12 | * GNU General Public License for more details. | 12 | WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. |
13 | * | 13 | See the License for the specific language governing permissions and |
14 | * You should have received a copy of the GNU General Public License | 14 | limitations under the License. |
15 | * along with this program; if not, write to the Free Software | 15 | */ |
16 | * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA | ||
17 | */ | ||
18 | 16 | ||
19 | /****************************************************************** | 17 | /****************************************************************** |
20 | SOFT string matcher | 18 | SOFT string matcher |
diff --git a/xdelta3/xdelta3-decode.h b/xdelta3/xdelta3-decode.h index 65877a4..3933b01 100644 --- a/xdelta3/xdelta3-decode.h +++ b/xdelta3/xdelta3-decode.h | |||
@@ -1,21 +1,18 @@ | |||
1 | /* xdelta 3 - delta compression tools and library | 1 | /* xdelta3 - delta compression tools and library |
2 | * Copyright (C) 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, | 2 | Copyright 2016 Joshua MacDonald |
3 | * 2011, 2012, 2013, 2014, 2015. Joshua P. MacDonald | 3 | |
4 | * | 4 | Licensed under the Apache License, Version 2.0 (the "License"); |
5 | * This program is free software; you can redistribute it and/or modify | 5 | you may not use this file except in compliance with the License. |
6 | * it under the terms of the GNU General Public License as published by | 6 | You may obtain a copy of the License at |
7 | * the Free Software Foundation; either version 2 of the License, or | 7 | |
8 | * (at your option) any later version. | 8 | http://www.apache.org/licenses/LICENSE-2.0 |
9 | * | 9 | |
10 | * This program is distributed in the hope that it will be useful, | 10 | Unless required by applicable law or agreed to in writing, software |
11 | * but WITHOUT ANY WARRANTY; without even the implied warranty of | 11 | distributed under the License is distributed on an "AS IS" BASIS, |
12 | * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the | 12 | WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. |
13 | * GNU General Public License for more details. | 13 | See the License for the specific language governing permissions and |
14 | * | 14 | limitations under the License. |
15 | * You should have received a copy of the GNU General Public License | 15 | */ |
16 | * along with this program; if not, write to the Free Software | ||
17 | * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA | ||
18 | */ | ||
19 | 16 | ||
20 | #ifndef _XDELTA3_DECODE_H_ | 17 | #ifndef _XDELTA3_DECODE_H_ |
21 | #define _XDELTA3_DECODE_H_ | 18 | #define _XDELTA3_DECODE_H_ |
diff --git a/xdelta3/xdelta3-djw.h b/xdelta3/xdelta3-djw.h index f69cb1d..020aa27 100644 --- a/xdelta3/xdelta3-djw.h +++ b/xdelta3/xdelta3-djw.h | |||
@@ -1,24 +1,18 @@ | |||
1 | /* xdelta 3 - delta compression tools and library | 1 | /* xdelta3 - delta compression tools and library |
2 | * Copyright (C) 2002, 2006, 2007. Joshua P. MacDonald | 2 | Copyright 2016 Joshua MacDonald |
3 | * | 3 | |
4 | * This program is free software; you can redistribute it and/or modify | 4 | Licensed under the Apache License, Version 2.0 (the "License"); |
5 | * it under the terms of the GNU General Public License as published by | 5 | you may not use this file except in compliance with the License. |
6 | * the Free Software Foundation; either version 2 of the License, or | 6 | You may obtain a copy of the License at |
7 | * (at your option) any later version. | 7 | |
8 | * | 8 | http://www.apache.org/licenses/LICENSE-2.0 |
9 | * This program is distributed in the hope that it will be useful, | 9 | |
10 | * but WITHOUT ANY WARRANTY; without even the implied warranty of | 10 | Unless required by applicable law or agreed to in writing, software |
11 | * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the | 11 | distributed under the License is distributed on an "AS IS" BASIS, |
12 | * GNU General Public License for more details. | 12 | WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. |
13 | * | 13 | See the License for the specific language governing permissions and |
14 | * You should have received a copy of the GNU General Public License | 14 | limitations under the License. |
15 | * along with this program; if not, write to the Free Software | 15 | */ |
16 | * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA | ||
17 | */ | ||
18 | |||
19 | /* TODO: This code needs a thorough round of commenting. There is | ||
20 | * some slop in the declaration of arrays, which are maybe one element | ||
21 | * larger than they need to be and comments would help clear it up. */ | ||
22 | 16 | ||
23 | #ifndef _XDELTA3_DJW_H_ | 17 | #ifndef _XDELTA3_DJW_H_ |
24 | #define _XDELTA3_DJW_H_ | 18 | #define _XDELTA3_DJW_H_ |
diff --git a/xdelta3/xdelta3-fgk.h b/xdelta3/xdelta3-fgk.h index 7011500..41365a6 100644 --- a/xdelta3/xdelta3-fgk.h +++ b/xdelta3/xdelta3-fgk.h | |||
@@ -1,22 +1,19 @@ | |||
1 | /* xdelta 3 - delta compression tools and library | 1 | /* xdelta3 - delta compression tools and library |
2 | * Copyright (C) 2002, 2006, 2007. Joshua P. MacDonald | 2 | Copyright 2016 Joshua MacDonald |
3 | * | 3 | |
4 | * This program is free software; you can redistribute it and/or modify | 4 | Licensed under the Apache License, Version 2.0 (the "License"); |
5 | * it under the terms of the GNU General Public License as published by | 5 | you may not use this file except in compliance with the License. |
6 | * the Free Software Foundation; either version 2 of the License, or | 6 | You may obtain a copy of the License at |
7 | * (at your option) any later version. | 7 | |
8 | * | 8 | http://www.apache.org/licenses/LICENSE-2.0 |
9 | * This program is distributed in the hope that it will be useful, | 9 | |
10 | * but WITHOUT ANY WARRANTY; without even the implied warranty of | 10 | Unless required by applicable law or agreed to in writing, software |
11 | * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the | 11 | distributed under the License is distributed on an "AS IS" BASIS, |
12 | * GNU General Public License for more details. | 12 | WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. |
13 | * | 13 | See the License for the specific language governing permissions and |
14 | * You should have received a copy of the GNU General Public License | 14 | limitations under the License. |
15 | * along with this program; if not, write to the Free Software | ||
16 | * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA | ||
17 | */ | ||
18 | 15 | ||
19 | /* For demonstration purposes only. | 16 | For demonstration purposes only. |
20 | */ | 17 | */ |
21 | 18 | ||
22 | #ifndef _XDELTA3_FGK_h_ | 19 | #ifndef _XDELTA3_FGK_h_ |
diff --git a/xdelta3/xdelta3-hash.h b/xdelta3/xdelta3-hash.h index e359436..a20017a 100644 --- a/xdelta3/xdelta3-hash.h +++ b/xdelta3/xdelta3-hash.h | |||
@@ -1,21 +1,18 @@ | |||
1 | /* xdelta 3 - delta compression tools and library | 1 | /* xdelta3 - delta compression tools and library |
2 | * Copyright (C) 2001, 2003, 2004, 2005, 2006, 2007. Joshua P. MacDonald | 2 | Copyright 2016 Joshua MacDonald |
3 | * | ||
4 | * This program is free software; you can redistribute it and/or modify | ||
5 | * it under the terms of the GNU General Public License as published by | ||
6 | * the Free Software Foundation; either version 2 of the License, or | ||
7 | * (at your option) any later version. | ||
8 | * | ||
9 | * This program is distributed in the hope that it will be useful, | ||
10 | * but WITHOUT ANY WARRANTY; without even the implied warranty of | ||
11 | * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the | ||
12 | * GNU General Public License for more details. | ||
13 | * | ||
14 | * You should have received a copy of the GNU General Public License | ||
15 | * along with this program; if not, write to the Free Software | ||
16 | * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA | ||
17 | */ | ||
18 | 3 | ||
4 | Licensed under the Apache License, Version 2.0 (the "License"); | ||
5 | you may not use this file except in compliance with the License. | ||
6 | You may obtain a copy of the License at | ||
7 | |||
8 | http://www.apache.org/licenses/LICENSE-2.0 | ||
9 | |||
10 | Unless required by applicable law or agreed to in writing, software | ||
11 | distributed under the License is distributed on an "AS IS" BASIS, | ||
12 | WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. | ||
13 | See the License for the specific language governing permissions and | ||
14 | limitations under the License. | ||
15 | */ | ||
19 | #ifndef _XDELTA3_HASH_H_ | 16 | #ifndef _XDELTA3_HASH_H_ |
20 | #define _XDELTA3_HASH_H_ | 17 | #define _XDELTA3_HASH_H_ |
21 | 18 | ||
diff --git a/xdelta3/xdelta3-internal.h b/xdelta3/xdelta3-internal.h index eb360be..661ce41 100644 --- a/xdelta3/xdelta3-internal.h +++ b/xdelta3/xdelta3-internal.h | |||
@@ -1,20 +1,18 @@ | |||
1 | /* xdelta3 - delta compression tools and library | 1 | /* xdelta3 - delta compression tools and library |
2 | * Copyright (C) 2011, 2012, 2013, 2014, 2015 Joshua P. MacDonald | 2 | Copyright 2016 Joshua MacDonald |
3 | * | 3 | |
4 | * This program is free software; you can redistribute it and/or modify | 4 | Licensed under the Apache License, Version 2.0 (the "License"); |
5 | * it under the terms of the GNU General Public License as published by | 5 | you may not use this file except in compliance with the License. |
6 | * the Free Software Foundation; either version 2 of the License, or | 6 | You may obtain a copy of the License at |
7 | * (at your option) any later version. | 7 | |
8 | * | 8 | http://www.apache.org/licenses/LICENSE-2.0 |
9 | * This program is distributed in the hope that it will be useful, | 9 | |
10 | * but WITHOUT ANY WARRANTY; without even the implied warranty of | 10 | Unless required by applicable law or agreed to in writing, software |
11 | * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the | 11 | distributed under the License is distributed on an "AS IS" BASIS, |
12 | * GNU General Public License for more details. | 12 | WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. |
13 | * | 13 | See the License for the specific language governing permissions and |
14 | * You should have received a copy of the GNU General Public License | 14 | limitations under the License. |
15 | * along with this program; if not, write to the Free Software | 15 | */ |
16 | * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA | ||
17 | */ | ||
18 | #ifndef XDELTA3_INTERNAL_H__ | 16 | #ifndef XDELTA3_INTERNAL_H__ |
19 | #define XDELTA3_INTERNAL_H__ | 17 | #define XDELTA3_INTERNAL_H__ |
20 | 18 | ||
diff --git a/xdelta3/xdelta3-list.h b/xdelta3/xdelta3-list.h index 6e3125f..23c925e 100644 --- a/xdelta3/xdelta3-list.h +++ b/xdelta3/xdelta3-list.h | |||
@@ -1,21 +1,18 @@ | |||
1 | /* xdelta 3 - delta compression tools and library | 1 | /* xdelta3 - delta compression tools and library |
2 | * Copyright (C) 2002, 2006, 2007. Joshua P. MacDonald | 2 | Copyright 2016 Joshua MacDonald |
3 | * | ||
4 | * This program is free software; you can redistribute it and/or modify | ||
5 | * it under the terms of the GNU General Public License as published by | ||
6 | * the Free Software Foundation; either version 2 of the License, or | ||
7 | * (at your option) any later version. | ||
8 | * | ||
9 | * This program is distributed in the hope that it will be useful, | ||
10 | * but WITHOUT ANY WARRANTY; without even the implied warranty of | ||
11 | * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the | ||
12 | * GNU General Public License for more details. | ||
13 | * | ||
14 | * You should have received a copy of the GNU General Public License | ||
15 | * along with this program; if not, write to the Free Software | ||
16 | * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA | ||
17 | */ | ||
18 | 3 | ||
4 | Licensed under the Apache License, Version 2.0 (the "License"); | ||
5 | you may not use this file except in compliance with the License. | ||
6 | You may obtain a copy of the License at | ||
7 | |||
8 | http://www.apache.org/licenses/LICENSE-2.0 | ||
9 | |||
10 | Unless required by applicable law or agreed to in writing, software | ||
11 | distributed under the License is distributed on an "AS IS" BASIS, | ||
12 | WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. | ||
13 | See the License for the specific language governing permissions and | ||
14 | limitations under the License. | ||
15 | */ | ||
19 | #ifndef __XDELTA3_LIST__ | 16 | #ifndef __XDELTA3_LIST__ |
20 | #define __XDELTA3_LIST__ | 17 | #define __XDELTA3_LIST__ |
21 | 18 | ||
diff --git a/xdelta3/xdelta3-lzma.h b/xdelta3/xdelta3-lzma.h index bcf2ddf..3b8bbad 100644 --- a/xdelta3/xdelta3-lzma.h +++ b/xdelta3/xdelta3-lzma.h | |||
@@ -1,20 +1,18 @@ | |||
1 | /* xdelta 3 - delta compression tools and library | 1 | /* xdelta3 - delta compression tools and library |
2 | * Copyright (C) 2012, 2013, 2014, 2015. Joshua P. MacDonald | 2 | Copyright 2016 Joshua MacDonald |
3 | * | 3 | |
4 | * This program is free software; you can redistribute it and/or modify | 4 | Licensed under the Apache License, Version 2.0 (the "License"); |
5 | * it under the terms of the GNU General Public License as published by | 5 | you may not use this file except in compliance with the License. |
6 | * the Free Software Foundation; either version 2 of the License, or | 6 | You may obtain a copy of the License at |
7 | * (at your option) any later version. | 7 | |
8 | * | 8 | http://www.apache.org/licenses/LICENSE-2.0 |
9 | * This program is distributed in the hope that it will be useful, | 9 | |
10 | * but WITHOUT ANY WARRANTY; without even the implied warranty of | 10 | Unless required by applicable law or agreed to in writing, software |
11 | * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the | 11 | distributed under the License is distributed on an "AS IS" BASIS, |
12 | * GNU General Public License for more details. | 12 | WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. |
13 | * | 13 | See the License for the specific language governing permissions and |
14 | * You should have received a copy of the GNU General Public License | 14 | limitations under the License. |
15 | * along with this program; if not, write to the Free Software | 15 | */ |
16 | * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA | ||
17 | */ | ||
18 | 16 | ||
19 | /* Note: The use of the _easy_ decoder means we're not calling the | 17 | /* Note: The use of the _easy_ decoder means we're not calling the |
20 | * xd3_stream malloc hooks. TODO(jmacd) Fix if anyone cares. */ | 18 | * xd3_stream malloc hooks. TODO(jmacd) Fix if anyone cares. */ |
diff --git a/xdelta3/xdelta3-main.h b/xdelta3/xdelta3-main.h index fac5d8d..f05bdab 100644 --- a/xdelta3/xdelta3-main.h +++ b/xdelta3/xdelta3-main.h | |||
@@ -1,21 +1,18 @@ | |||
1 | /* xdelta3 - delta compression tools and library | 1 | /* xdelta3 - delta compression tools and library |
2 | * Copyright (C) 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, | 2 | Copyright 2016 Joshua MacDonald |
3 | * 2009, 2010, 2011, 2012, 2013, 2014, 2015 Joshua P. MacDonald | 3 | |
4 | * | 4 | Licensed under the Apache License, Version 2.0 (the "License"); |
5 | * This program is free software; you can redistribute it and/or modify | 5 | you may not use this file except in compliance with the License. |
6 | * it under the terms of the GNU General Public License as published by | 6 | You may obtain a copy of the License at |
7 | * the Free Software Foundation; either version 2 of the License, or | 7 | |
8 | * (at your option) any later version. | 8 | http://www.apache.org/licenses/LICENSE-2.0 |
9 | * | 9 | |
10 | * This program is distributed in the hope that it will be useful, | 10 | Unless required by applicable law or agreed to in writing, software |
11 | * but WITHOUT ANY WARRANTY; without even the implied warranty of | 11 | distributed under the License is distributed on an "AS IS" BASIS, |
12 | * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the | 12 | WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. |
13 | * GNU General Public License for more details. | 13 | See the License for the specific language governing permissions and |
14 | * | 14 | limitations under the License. |
15 | * You should have received a copy of the GNU General Public License | 15 | */ |
16 | * along with this program; if not, write to the Free Software | ||
17 | * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA | ||
18 | */ | ||
19 | 16 | ||
20 | /* This is all the extra stuff you need for convenience to users in a | 17 | /* This is all the extra stuff you need for convenience to users in a |
21 | * command line application. It contains these major components: | 18 | * command line application. It contains these major components: |
@@ -337,11 +334,11 @@ xprintf (const char *fmt, ...) | |||
337 | static int | 334 | static int |
338 | main_version (void) | 335 | main_version (void) |
339 | { | 336 | { |
340 | /* $Format: " XPR(NTR \"Xdelta version $Xdelta3Version$, Copyright (C) 2007, 2008, 2009, 2010, 2011, 2012, 2013, 2014, 2015, Joshua MacDonald\\n\");" $ */ | 337 | /* $Format: " XPR(NTR \"Xdelta version $Xdelta3Version$, Copyright (C) Joshua MacDonald\\n\");" $ */ |
341 | XPR(NTR "Xdelta version 3.0.11, Copyright (C) 2007, 2008, 2009, 2010, 2011, 2012, 2013, 2014, 2015 Joshua MacDonald\n"); | 338 | XPR(NTR "Xdelta version 3.0.12, Copyright (C) Joshua MacDonald\n"); |
342 | XPR(NTR "Xdelta comes with ABSOLUTELY NO WARRANTY.\n"); | 339 | XPR(NTR "Xdelta comes with ABSOLUTELY NO WARRANTY.\n"); |
343 | XPR(NTR "This is free software, and you are welcome to redistribute it\n"); | 340 | XPR(NTR "Licensed under the Apache License, Version 2.0\n"); |
344 | XPR(NTR "under certain conditions; see \"COPYING\" for details.\n"); | 341 | XPR(NTR "See \"LICENSE\" for details.\n"); |
345 | return EXIT_SUCCESS; | 342 | return EXIT_SUCCESS; |
346 | } | 343 | } |
347 | 344 | ||
diff --git a/xdelta3/xdelta3-merge.h b/xdelta3/xdelta3-merge.h index a09f814..38cc9c3 100644 --- a/xdelta3/xdelta3-merge.h +++ b/xdelta3/xdelta3-merge.h | |||
@@ -1,21 +1,18 @@ | |||
1 | /* xdelta 3 - delta compression tools and library | 1 | /* xdelta3 - delta compression tools and library |
2 | * Copyright (C) 2007. Joshua P. MacDonald | 2 | Copyright 2016 Joshua MacDonald |
3 | * | ||
4 | * This program is free software; you can redistribute it and/or modify | ||
5 | * it under the terms of the GNU General Public License as published by | ||
6 | * the Free Software Foundation; either version 2 of the License, or | ||
7 | * (at your option) any later version. | ||
8 | * | ||
9 | * This program is distributed in the hope that it will be useful, | ||
10 | * but WITHOUT ANY WARRANTY; without even the implied warranty of | ||
11 | * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the | ||
12 | * GNU General Public License for more details. | ||
13 | * | ||
14 | * You should have received a copy of the GNU General Public License | ||
15 | * along with this program; if not, write to the Free Software | ||
16 | * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA | ||
17 | */ | ||
18 | 3 | ||
4 | Licensed under the Apache License, Version 2.0 (the "License"); | ||
5 | you may not use this file except in compliance with the License. | ||
6 | You may obtain a copy of the License at | ||
7 | |||
8 | http://www.apache.org/licenses/LICENSE-2.0 | ||
9 | |||
10 | Unless required by applicable law or agreed to in writing, software | ||
11 | distributed under the License is distributed on an "AS IS" BASIS, | ||
12 | WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. | ||
13 | See the License for the specific language governing permissions and | ||
14 | limitations under the License. | ||
15 | */ | ||
19 | #ifndef _XDELTA3_MERGE_H_ | 16 | #ifndef _XDELTA3_MERGE_H_ |
20 | #define _XDELTA3_MERGE_H_ | 17 | #define _XDELTA3_MERGE_H_ |
21 | 18 | ||
diff --git a/xdelta3/xdelta3-second.h b/xdelta3/xdelta3-second.h index e8a2c8f..5eb69f2 100644 --- a/xdelta3/xdelta3-second.h +++ b/xdelta3/xdelta3-second.h | |||
@@ -1,21 +1,18 @@ | |||
1 | /* xdelta 3 - delta compression tools and library | 1 | /* xdelta3 - delta compression tools and library |
2 | * Copyright (C) 2002, 2003, 2006, 2007, 2013. Joshua P. MacDonald | 2 | Copyright 2016 Joshua MacDonald |
3 | * | ||
4 | * This program is free software; you can redistribute it and/or modify | ||
5 | * it under the terms of the GNU General Public License as published by | ||
6 | * the Free Software Foundation; either version 2 of the License, or | ||
7 | * (at your option) any later version. | ||
8 | * | ||
9 | * This program is distributed in the hope that it will be useful, | ||
10 | * but WITHOUT ANY WARRANTY; without even the implied warranty of | ||
11 | * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the | ||
12 | * GNU General Public License for more details. | ||
13 | * | ||
14 | * You should have received a copy of the GNU General Public License | ||
15 | * along with this program; if not, write to the Free Software | ||
16 | * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA | ||
17 | */ | ||
18 | 3 | ||
4 | Licensed under the Apache License, Version 2.0 (the "License"); | ||
5 | you may not use this file except in compliance with the License. | ||
6 | You may obtain a copy of the License at | ||
7 | |||
8 | http://www.apache.org/licenses/LICENSE-2.0 | ||
9 | |||
10 | Unless required by applicable law or agreed to in writing, software | ||
11 | distributed under the License is distributed on an "AS IS" BASIS, | ||
12 | WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. | ||
13 | See the License for the specific language governing permissions and | ||
14 | limitations under the License. | ||
15 | */ | ||
19 | #ifndef _XDELTA3_SECOND_H_ | 16 | #ifndef _XDELTA3_SECOND_H_ |
20 | #define _XDELTA3_SECOND_H_ | 17 | #define _XDELTA3_SECOND_H_ |
21 | 18 | ||
diff --git a/xdelta3/xdelta3-test.h b/xdelta3/xdelta3-test.h index 6d7d85b..53b4883 100644 --- a/xdelta3/xdelta3-test.h +++ b/xdelta3/xdelta3-test.h | |||
@@ -1,26 +1,19 @@ | |||
1 | /* xdelta 3 - delta compression tools and library Copyright (C) 2001, | 1 | /* xdelta3 - delta compression tools and library |
2 | * 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012. | 2 | Copyright 2016 Joshua MacDonald |
3 | * Joshua P. MacDonald | 3 | |
4 | * | 4 | Licensed under the Apache License, Version 2.0 (the "License"); |
5 | * This program is free software; you can redistribute it and/or modify | 5 | you may not use this file except in compliance with the License. |
6 | * it under the terms of the GNU General Public License as published by | 6 | You may obtain a copy of the License at |
7 | * the Free Software Foundation; either version 2 of the License, or | 7 | |
8 | * (at your option) any later version. | 8 | http://www.apache.org/licenses/LICENSE-2.0 |
9 | * | 9 | |
10 | * This program is distributed in the hope that it will be useful, | 10 | Unless required by applicable law or agreed to in writing, software |
11 | * but WITHOUT ANY WARRANTY; without even the implied warranty of | 11 | distributed under the License is distributed on an "AS IS" BASIS, |
12 | * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the | 12 | WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. |
13 | * GNU General Public License for more details. | 13 | See the License for the specific language governing permissions and |
14 | * | 14 | limitations under the License. |
15 | * You should have received a copy of the GNU General Public License | 15 | */ |
16 | * along with this program; if not, write to the Free Software | ||
17 | * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA | ||
18 | */ | ||
19 | 16 | ||
20 | /* This is public-domain Mersenne Twister code, | ||
21 | * attributed to Michael Brundage. Thanks! | ||
22 | * http://www.qbrundage.com/michaelb/pubs/essays/random_number_generation.html | ||
23 | */ | ||
24 | static const uint32_t TEST_SEED1 = 5489UL; | 17 | static const uint32_t TEST_SEED1 = 5489UL; |
25 | #define MT_LEN 624 | 18 | #define MT_LEN 624 |
26 | #define MT_IA 397 | 19 | #define MT_IA 397 |
@@ -44,6 +37,9 @@ void mt_init(mtrand *mt, uint32_t seed); | |||
44 | uint32_t mt_random (mtrand *mt); | 37 | uint32_t mt_random (mtrand *mt); |
45 | int test_setup (void); | 38 | int test_setup (void); |
46 | 39 | ||
40 | /* The Mersenne Twister code used herein is code to Michael Brundage. Thanks! | ||
41 | * http://www.qbrundage.com/michaelb/pubs/essays/random_number_generation.html | ||
42 | */ | ||
47 | void mt_init(mtrand *mt, uint32_t seed) { | 43 | void mt_init(mtrand *mt, uint32_t seed) { |
48 | int i; | 44 | int i; |
49 | mt->mt_buffer_[0] = seed; | 45 | mt->mt_buffer_[0] = seed; |
diff --git a/xdelta3/xdelta3.c b/xdelta3/xdelta3.c index 976b219..ce4dada 100644 --- a/xdelta3/xdelta3.c +++ b/xdelta3/xdelta3.c | |||
@@ -1,20 +1,17 @@ | |||
1 | /* xdelta 3 - delta compression tools and library | 1 | /* xdelta3 - delta compression tools and library |
2 | * Copyright (C) 2001, 2003, 2004, 2005, 2006, 2007, | 2 | Copyright 2016 Joshua MacDonald |
3 | * 2008, 2009, 2010, 2011, 2012, 2013, 2014, 2015. Joshua P. MacDonald | 3 | |
4 | * | 4 | Licensed under the Apache License, Version 2.0 (the "License"); |
5 | * This program is free software; you can redistribute it and/or modify | 5 | you may not use this file except in compliance with the License. |
6 | * it under the terms of the GNU General Public License as published by | 6 | You may obtain a copy of the License at |
7 | * the Free Software Foundation; either version 2 of the License, or | 7 | |
8 | * (at your option) any later version. | 8 | http://www.apache.org/licenses/LICENSE-2.0 |
9 | * | 9 | |
10 | * This program is distributed in the hope that it will be useful, | 10 | Unless required by applicable law or agreed to in writing, software |
11 | * but WITHOUT ANY WARRANTY; without even the implied warranty of | 11 | distributed under the License is distributed on an "AS IS" BASIS, |
12 | * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the | 12 | WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. |
13 | * GNU General Public License for more details. | 13 | See the License for the specific language governing permissions and |
14 | * | 14 | limitations under the License. |
15 | * You should have received a copy of the GNU General Public License | ||
16 | * along with this program; if not, write to the Free Software | ||
17 | * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA | ||
18 | 15 | ||
19 | ------------------------------------------------------------------- | 16 | ------------------------------------------------------------------- |
20 | 17 | ||
diff --git a/xdelta3/xdelta3.h b/xdelta3/xdelta3.h index af83ea2..9fbda6f 100644 --- a/xdelta3/xdelta3.h +++ b/xdelta3/xdelta3.h | |||
@@ -1,20 +1,18 @@ | |||
1 | /* xdelta 3 - delta compression tools and library | 1 | /* xdelta3 - delta compression tools and library |
2 | * Copyright (C) Joshua P. MacDonald | 2 | Copyright 2016 Joshua MacDonald |
3 | * | 3 | |
4 | * This program is free software; you can redistribute it and/or modify | 4 | Licensed under the Apache License, Version 2.0 (the "License"); |
5 | * it under the terms of the GNU General Public License as published by | 5 | you may not use this file except in compliance with the License. |
6 | * the Free Software Foundation; either version 2 of the License, or | 6 | You may obtain a copy of the License at |
7 | * (at your option) any later version. | 7 | |
8 | * | 8 | http://www.apache.org/licenses/LICENSE-2.0 |
9 | * This program is distributed in the hope that it will be useful, | 9 | |
10 | * but WITHOUT ANY WARRANTY; without even the implied warranty of | 10 | Unless required by applicable law or agreed to in writing, software |
11 | * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the | 11 | distributed under the License is distributed on an "AS IS" BASIS, |
12 | * GNU General Public License for more details. | 12 | WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. |
13 | * | 13 | See the License for the specific language governing permissions and |
14 | * You should have received a copy of the GNU General Public License | 14 | limitations under the License. |
15 | * along with this program; if not, write to the Free Software | 15 | */ |
16 | * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA | ||
17 | */ | ||
18 | 16 | ||
19 | /* To know more about Xdelta, start by reading xdelta3.c. If you are | 17 | /* To know more about Xdelta, start by reading xdelta3.c. If you are |
20 | * ready to use the API, continue reading here. There are two | 18 | * ready to use the API, continue reading here. There are two |