[PATCHv2 0/5] sparse: Relicense from non-dfsg-free OSL 1.1 to MIT license

[PATCHv2 0/5] sparse: Relicense from non-dfsg-free OSL 1.1 to MIT license

[Franz Schrober]

Hi,

many different people (especially Dan Carpenter) worked quite hard to contact
all people with significant contributions. The two changes are the ones which
should change the license from the problematic OSL[1] to the more liberal MIT
license. The initial agreement was reached when Novafora (successor in
interest to Transmeta Corporation) accepted such a license [2]. The commit
provided by them is attached as "relicense.bundle" [3] and has to be 
unbundled+merged in the sparse repository before the following patches can be
applied.

The changes can also be pulled from

        git pull https://github.com/franzschrober/sparse.git master

Btw. when somebody has to ask me in the future about a license change of these
two patches: do whatever you want. They can be considered public domain.

The change of this patchset compared to the first version are:

 * Benjamin Herrenschmidt and Chris Wedgwood were added to the Acked-by list
   because they've also agreed to the license change
 * Reverts for James Westby's contributions were added because it seems that he
   is the only person not agreeing to the license change (he was not reachable
   over social media or any of his email accounts)
 * An alternative patch for the implicit casting bug found James Westby was
   added

[1] https://wiki.debian.org/DFSGLicenses#Open_Software_License_.28OSL.29_v1.1
[2] http://lwn.net/Articles/328560/
[3] http://marc.info/?l=linux-sparse&m=138548610116314&w=2

[PATCHv2 1/5] Revert "Update the information in README about using the library."

[Franz Schrober]

From: Franz Schrober <franzschrober@yahoo.de>

James Westby is the only person not reacting when asking him about the MIT
license change over email or social media. So he has to count as not accepting
and reverting his contributions is the only way to to avoid possible legal
problems. The contributions can be re-added later when they are rewritten from
scratch.

This reverts commit 34ac7df96dd9609d684b0c949a52bc07ab1fd8b5.

Cc: James Westby <jw+debian@jameswestby.net>
Signed-off-by: Franz Schrober <franzschrober@yahoo.de>
---
 README | 29 +++++++++++++++++++++--------
 1 file changed, 21 insertions(+), 8 deletions(-)

diff --git a/README b/README
index 63f752b..a731a82 100644
--- a/README
+++ b/README
@@ -47,22 +47,35 @@ requires the information.
 
 This means that a user of the library will literally just need to do
 
-  struct string_list *filelist = NULL;
-  char *file;
+	struct token *token;
+	int fd = open(filename, O_RDONLY);
+	struct symbol_list *list = NULL;
 
-  action(sparse_initialize(argc, argv, filelist));
+	if (fd < 0)
+		exit_with_complaint();
 
-  FOR_EACH_PTR_NOTAG(filelist, file) {
-    action(sparse(file));
-  } END_FOR_EACH_PTR_NOTAG(file);
+	// Initialize parse symbols
+	init_symbols();
+
+	// Tokenize the input stream
+	token = tokenize(filename, fd, NULL);
+
+	// Pre-process the stream
+	token = preprocess(token);
+
+	// Parse the resulting C code
+	translation_unit(token, &list);
+
+	// Evaluate the types now if we want to
+	// Or leave it until later.
+	symbol_iterate(list, evaluate_symbol, NULL);
 
 and he is now done - having a full C parse of the file he opened.  The
 library doesn't need any more setup, and once done does not impose any
 more requirements.  The user is free to do whatever he wants with the
 parse tree that got built up, and needs not worry about the library ever
 again.  There is no extra state, there are no parser callbacks, there is
-only the parse tree that is described by the header files. The action
-function takes a pointer to a symbol_list and does whatever it likes with it.
+only the parse tree that is described by the header files. 
 
 The library also contains (as an example user) a few clients that do the
 preprocessing, parsing and type evaluation and just print out the
-- 
1.8.4.4

[PATCHv2 2/5] Revert "Fix mistaken comparison that becomes a no-op."

[Franz Schrober]

From: Franz Schrober <franzschrober@yahoo.de>

James Westby is the only person not reacting when asking him about the MIT
license change over email or social media. So he has to count as not accepting
and reverting his contributions is the only way to to avoid possible legal
problems. The contributions can be re-added later when they are rewritten from
scratch.

This reverts commit 006eff06c7adcfb0d06c6fadf6e9b64f0488b2bf.

Cc: James Westby <jw+debian@jameswestby.net>
Signed-off-by: Franz Schrober <franzschrober@yahoo.de>
---
 evaluate.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/evaluate.c b/evaluate.c
index 19be637..4b4ea6e 100644
--- a/evaluate.c
+++ b/evaluate.c
@@ -175,7 +175,7 @@ left:
 
 static int same_cast_type(struct symbol *orig, struct symbol *new)
 {
-	return orig->bit_size == new->bit_size && orig->bit_offset == new->bit_offset;
+	return orig->bit_size == new->bit_size && orig->bit_offset == orig->bit_offset;
 }
 
 static struct symbol *base_type(struct symbol *node, unsigned long *modp, unsigned long *asp)
-- 
1.8.4.4

[PATCHv2 3/5] sparse: Relicense under the MIT license

[Franz Schrober]

[-- Warning: decoded text below may be mangled, UTF-8 assumed --]
[-- Attachment #1: Type: text/plain; charset=UTF-8, Size: 65610 bytes --]

From: Franz Schrober <franzschrober@yahoo.de>

The old code was relicensed by Novafora Corporation, successor in interest to
Transmeta Corporation, in 2009. Other authors were also asked about the change
of their contributions to the MIT license and all with copyrightable changes
agreed to it.

Signed-off-by: Franz Schrober <franzschrober@yahoo.de>
Acked-by: Adam DiCarlo <adam@bikko.org>
Acked-by: Al Viro <viro@ZenIV.linux.org.uk>
Acked-by: Alberto Bertogli <albertito@blitiri.com.ar>
Acked-by: Alecs King <alecs@perlchina.org>
Acked-by: Alexander Shishkin <alexander.shishckin@gmail.com>
Acked-by: Alexey Dobriyan <adobriyan@gmail.com>
Acked-by: Alexey Zaytsev <alexey.zaytsev@gmail.com>
Acked-by: Andries E. Brouwer <Andries.Brouwer@cwi.nl>
Acked-by: Arnaldo Carvalho de Melo <acme@ghostprotocols.net>
Acked-by: Atsushi Nemoto <anemo@mba.ocn.ne.jp>
Acked-by: Ben Pfaff <blp@nicira.com>
Acked-by: Benjamin Herrenschmidt <benh@kernel.crashing.org>
Acked-by: Bernd Petrovitsch <bernd@petrovitsch.priv.at>
Acked-by: Bernhard Reutner-Fischer <rep.dot.nop@gmail.com>
Acked-by: Blue Swirl <blauwirbel@gmail.com>
Acked-by: Chris Forbes <chrisf@ijw.co.nz>
Acked-by: Chris Wedgwood <cw@f00f.org>
Acked-by: Christopher Li <sparse@chrisli.org>
Acked-by: Damien Lespiau <damien.lespiau@gmail.com>
Acked-by: Dan Carpenter <error27@gmail.com>
Acked-by: Dan McGee <dan@archlinux.org>
Acked-by: Daniel De Graaf <danieldegraaf@gmail.com>
Acked-by: Daniel Sheridan <dan.sheridan@postman.org.uk>
Acked-by: Dave Jones <davej@redhat.com>
Acked-by: David Given <dg@cowlark.com>
Acked-by: David Miller <davem@redhat.com>
Acked-by: David Mosberger-Tang <dmosberger@gmail.com>
Acked-by: David Olien <David.Olien@lsi.com>
Acked-by: Diego Elio Pettenò <flameeyes@flameeyes.eu>
Acked-by: Emil Medve <Emilian.Medve@Freescale.com>
Acked-by: Ethan Jackson <jacksone@nicira.com>
Acked-by: Florian Fainelli <f.fainelli@gmail.com>
Acked-by: Frank Zago <fzago@systemfabricworks.com>
Acked-by: Frederic Crozat <fcrozat@suse.com>
Acked-by: Geoff Johnstone <geoff.johnstone@gmail.com>
Acked-by: Hannes Eder <hannes@hanneseder.net>
Acked-by: Jan Pokorný <pokorny_jan@seznam.cz>
Acked-by: Jeff Garzik <jgarzik@redhat.com>
Acked-by: Jiri Slaby <jslaby@suse.cz>
Acked-by: Joe Perches <joe@perches.com>
Acked-by: Joel Soete <rubisher@scarlet.be>
Acked-by: Johannes Berg <johannes@sipsolutions.net>
Acked-by: Jonathan Neuschäfer <j.neuschaefer@gmx.net>
Acked-by: Josh Triplett <josh@kernel.org>
Acked-by: Kamil Dudka <kdudka@redhat.com>
Acked-by: Kim Phillips <kim.phillips@linaro.org>
Acked-by: KOSAKI Motohiro <kosaki.motohiro@gmail.com>
Acked-by: Kovarththanan Rajaratnam <kovarththanan.rajaratnam@gmail.com>
Acked-by: Linus Torvalds <torvalds@linux-foundation.org>
Acked-by: Luc Van Oostenryck <luc.vanoostenryck@gmail.com>
Acked-by: Martin Nagy <nagy.martin@gmail.com>
Acked-by: Masatake YAMATO <yamato@redhat.com>
Acked-by: Mauro Dreissig <mukadr@gmail.com>
Acked-by: Michael Büsch <m@bues.ch>
Acked-by: Michael Stefaniuc <mstefani@redhat.com>
Acked-by: Michael S. Tsirkin <mst@redhat.com>
Acked-by: Mika Kukkonen <mikukkon@iki.fi>
Acked-by: Mike Frysinger <vapier@gentoo.org>
Acked-by: Mitesh Shah <Mitesh.Shah@synopsys.com>
Acked-by: Morten Welinder <mortenw@gnome.org>
Acked-by: Namhyung Kim <namhyung@gmail.com>
Acked-by: Nicolas Kaiser <nikai@nikai.net>
Acked-by: Oleg Nesterov <oleg@redhat.com>
Acked-by: Pavel Roskin <proski@gnu.org>
Acked-by: Pekka Enberg <penberg@cs.helsinki.fi>
Acked-by: Peter Jones <pjones@redhat.com>
Acked-by: Peter A Jonsson <pj@sics.se>
Acked-by: Ralf Wildenhues <Ralf.Wildenhues@gmx.de>
Acked-by: Ramsay Jones <ramsay@ramsay1.demon.co.uk>
Acked-by: Randy Dunlap <rdunlap@xenotime.net>
Acked-by: Reinhard Tartler <siretart@tauware.de>
Ached-by: Richard Knutsson <richard.knutsson@gmail.com>
Acked-by: Rob Taylor <rob.taylor@codethink.co.uk>
Acked-by: Rui Saraiva <rmpsaraiva@gmail.com>
Acked-by: Ryan Anderson <ryan@michonline.com>
Acked-by: Sam Ravnborg <sam@ravnborg.org>
Acked-by: Samuel Bronson <naesten@gmail.com>
Acked-by: Santtu Hyrkkö <santtu.hyrkko@gmail.com>
Acked-by: Shakthi Kannan <shakthimaan@gmail.com>
Acked-by: Stephen Hemminger <shemminger@linux-foundation.org>
Acked-by: Thomas Schmid <Thomas.Schmid@br-automation.com>
Acked-by: Tilman Sauerbeck <tilman@code-monkey.de>
Acked-by: Vegard Nossum <vegardno@ifi.uio.no>
Acked-by: Xi Wang <xi.wang@gmail.com>
Acked-by: Yura Pakhuchiy <pakhuchiy@gmail.com>
---
These Acks are about the change to the MIT license and not about the patch
itself.
---
 LICENSE          | 243 +++++--------------------------------------------------
 allocate.c       |  18 ++++-
 c2xml.c          |  18 ++++-
 compat-bsd.c     |  18 ++++-
 compat-cygwin.c  |  18 ++++-
 compat-mingw.c   |  18 ++++-
 compile-i386.c   |  18 ++++-
 compile.c        |  18 ++++-
 ctags.c          |  18 ++++-
 dissect.c        |  18 ++++-
 evaluate.c       |  18 ++++-
 expand.c         |  18 ++++-
 expression.c     |  18 ++++-
 expression.h     |  18 ++++-
 graph.c          |  18 ++++-
 inline.c         |  18 ++++-
 lib.c            |  18 ++++-
 lib.h            |  18 ++++-
 obfuscate.c      |  18 ++++-
 parse.c          |  18 ++++-
 parse.h          |  18 ++++-
 pre-process.c    |  18 ++++-
 scope.c          |  18 ++++-
 scope.h          |  18 ++++-
 show-parse.c     |  18 ++++-
 sparse.c         |  18 ++++-
 symbol.c         |  18 ++++-
 symbol.h         |  18 ++++-
 test-lexing.c    |  18 ++++-
 test-linearize.c |  18 ++++-
 test-parsing.c   |  18 ++++-
 token.h          |  18 ++++-
 tokenize.c       |  18 ++++-
 33 files changed, 563 insertions(+), 256 deletions(-)

diff --git a/LICENSE b/LICENSE
index 8f1a148..95e6770 100644
--- a/LICENSE
+++ b/LICENSE
@@ -1,239 +1,34 @@
-
-Novafora Corporation, successor in interest to Transmeta Corporation,
-hereby licenses any portions of the program "sparse", a C semantic
-parser, for which the copyright previously was held by Transmeta
-Corporation and which were present in checkin
-1bcc92138dcdf718dc3e0c694565f56e669d6ee3 with an author timestamp date
-of June 24, 2003 of the git repository at
-git://git.kernel.org/pub/scm/devel/sparse/sparse.git as retrieved on
-March 1, 2009, under the following license:
-
-Copyright (c) 2003 Transmeta Corporation
-
-Permission is hereby granted, free of charge, to any person obtaining a
-copy of this software and associated documentation files (the
-"Software"), to deal in the Software without restriction, including
-without limitation the rights to use, copy, modify, merge, publish,
-distribute, sublicense, and/or sell copies of the Software, and to
-permit persons to whom the Software is furnished to do so, subject to
-the following conditions:
-
-The above copyright notice and this permission notice shall be included
-in all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
-OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
-IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY
-CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,
-TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
-SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-
-
-Robert Bedichek
-Vice President of Engineering
-Novafora Corporation
-San Jose, CA
-April 14, 2009
-
-
-The original file follows:
-
-
 The 'sparse' C parser front-end library is copyrighted by Transmeta Corp
-and other authors and licensed under the "Open Software License v1.1" as
+and other authors and licensed under the "MIT License" as
 obtained from www.opensource.org (and included here-in for easy
-reference) (that license itself is copyrighted by Larry Rosen). 
-
-Note that the "Original Work" that this license covers is only the
-front-end library itself, ie the code required to parse the source file
-and annotate the resulting parse tree with the semantic meaning (aka
-"types") of the sources.  Thus just the act of linking this library into
-another program (aka "back-end") does NOT in itself make that back-end
-be considered a derivative work of this Original Work. 
-
-However, any modifications, callbacks or other functionality that is
-added and run either directly or indirectly by the front-end are to be
-considered derived works of this library, and as such fall under the
-requirements of this license.
-
-				Linus Torvalds
-				Santa Clara, CA
-				April 15th, 2003
-
+reference).
 
 [ This copy of the license is the flat-text version of original,
   available in its full glory at
 
-	 http://www.opensource.org/licenses/osl.php
+	 http://opensource.org/licenses/MIT
 
   please refer to there for the authoritative and slightly more
   pretty-printed version ]
 
 ------
 
-			The Open Software License
-			v. 1.1
+			The MIT License (MIT)
 
-This Open Software License (the "License") applies to any original work of 
-authorship (the "Original Work") whose owner (the "Licensor") has placed the 
-following notice immediately following the copyright notice for the Original 
-Work:
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
 
-	Licensed under the Open Software License version 1.1
+The above copyright notice and this permission notice shall be included in
+all copies or substantial portions of the Software.
 
-
-1) Grant of Copyright License. Licensor hereby grants You a world-wide, 
-royalty-free, non-exclusive, perpetual, non-sublicenseable license to do the 
-following:
-
-  a) to reproduce the Original Work in copies;
-
-  b) to prepare derivative works ("Derivative Works") based upon the
-     Original Work;
-
-  c) to distribute copies of the Original Work and Derivative Works to
-     the public, with the proviso that copies of Original Work or
-     Derivative Works that You distribute shall be licensed under the
-     Open Software License;
-
-  d) to perform the Original Work publicly; and
-
-  e) to display the Original Work publicly. 
-
-2) Grant of Patent License. Licensor hereby grants You a world-wide, 
-royalty-free, non-exclusive, perpetual, non-sublicenseable license, under 
-patent claims owned or controlled by the Licensor that are embodied in the 
-Original Work as furnished by the Licensor ("Licensed Claims") to make, use, 
-sell and offer for sale the Original Work. Licensor hereby grants You a 
-world-wide, royalty-free, non-exclusive, perpetual, non-sublicenseable license 
-under the Licensed Claims to make, use, sell and offer for sale Derivative Works.
-
-3) Grant of Source Code License. The term "Source Code" means the preferred 
-form of the Original Work for making modifications to it and all available 
-documentation describing how to modify the Original Work. Licensor hereby 
-agrees to provide a machine-readable copy of the Source Code of the Original 
-Work along with each copy of the Original Work that Licensor distributes. 
-Licensor reserves the right to satisfy this obligation by placing a 
-machine-readable copy of the Source Code in an information repository reasonably 
-calculated to permit inexpensive and convenient access by You for as long as
- Licensor continues to distribute the Original Work, and by publishing the 
-address of that information repository in a notice immediately following the 
-copyright notice that applies to the Original Work.
-
-
-4) Exclusions From License Grant. Nothing in this License shall be deemed to 
-grant any rights to trademarks, copyrights, patents, trade secrets or any 
-other intellectual property of Licensor except as expressly stated herein. No 
-patent license is granted to make, use, sell or offer to sell embodiments of 
-any patent claims other than the Licensed Claims defined in Section 2. No 
-right is granted to the trademarks of Licensor even if such marks are included 
-in the Original Work. Nothing in this License shall be interpreted to prohibit 
-Licensor from licensing under different terms from this License any Original 
-Work that Licensor otherwise would have a right to license.
-
-5) External Deployment. The term "External Deployment" means the use or 
-distribution of the Original Work or Derivative Works in any way such that the 
-Original Work or Derivative Works may be used by anyone other than You, 
-whether the Original Work or Derivative Works are distributed to those persons 
-or made available as an application intended for use over a computer network. 
-As an express condition for the grants of license hereunder, You agree that 
-any External Deployment by You of a Derivative Work shall be deemed a 
-distribution and shall be licensed to all under the terms of this License, as 
-prescribed in section 1(c) herein.
-
-6) Attribution Rights. You must retain, in the Source Code of any Derivative 
-Works that You create, all copyright, patent or trademark notices from the 
-Source Code of the Original Work, as well as any notices of licensing and any 
-descriptive text identified therein as an "Attribution Notice." You must cause 
-the Source Code for any Derivative Works that You create to carry a prominent 
-Attribution Notice reasonably calculated to inform recipients that You have 
-modified the Original Work.
-
-7) Warranty and Disclaimer of Warranty. Licensor warrants that the copyright 
-in and to the Original Work is owned by the Licensor or that the Original Work 
-is distributed by Licensor under a valid current license from the copyright 
-owner. Except as expressly stated in the immediately proceeding sentence, the 
-Original Work is provided under this License on an "AS IS" BASIS and WITHOUT 
-WARRANTY, either express or implied, including, without limitation, the 
-warranties of NON-INFRINGEMENT, MERCHANTABILITY or FITNESS FOR A PARTICULAR 
-PURPOSE. THE ENTIRE RISK AS TO THE QUALITY OF THE ORIGINAL WORK IS WITH YOU. 
-This DISCLAIMER OF WARRANTY constitutes an essential part of this License. No 
-license to Original Work is granted hereunder except under this disclaimer.
-
-8) Limitation of Liability. Under no circumstances and under no legal theory, 
-whether in tort (including negligence), contract, or otherwise, shall the 
-Licensor be liable to any person for any direct, indirect, special, incidental, 
-or consequential damages of any character arising as a result of this License 
-or the use of the Original Work including, without limitation, damages for 
-loss of goodwill, work stoppage, computer failure or malfunction, or any and 
-all other commercial damages or losses. This limitation of liability shall not 
-apply to liability for death or personal injury resulting from Licensor's 
-negligence to the extent applicable law prohibits such limitation. Some 
-jurisdictions do not allow the exclusion or limitation of incidental or 
-consequential damages, so this exclusion and limitation may not apply to You.
-
-
-9) Acceptance and Termination. If You distribute copies of the Original Work 
-or a Derivative Work, You must make a reasonable effort under the circumstances 
-to obtain the express and volitional assent of recipients to the terms of this 
-License. Nothing else but this License (or another written agreement between 
-Licensor and You) grants You permission to create Derivative Works based upon 
-the Original Work or to exercise any of the rights granted in Sections 1 herein, 
-and any attempt to do so except under the terms of this License (or another 
-written agreement between Licensor and You) is expressly prohibited by U.S. 
-copyright law, the equivalent laws of other countries, and by international 
-treaty. Therefore, by exercising any of the rights granted to You in Sections 
-1 herein, You indicate Your acceptance of this License and all of its terms and 
-conditions. This License shall terminate immediately and you may no longer 
-exercise any of the rights granted to You by this License upon Your failure to 
-honor the proviso in Section 1(c) herein.
-
-10) Mutual Termination for Patent Action. This License shall terminate 
-automatically and You may no longer exercise any of the rights granted to You 
-by this License if You file a lawsuit in any court alleging that any OSI 
-Certified open source software that is licensed under any license containing 
-this "Mutual Termination for Patent Action" clause infringes any patent claims 
-that are essential to use that software.
-
-11) Jurisdiction, Venue and Governing Law. Any action or suit relating to this 
-License may be brought only in the courts of a jurisdiction wherein the Licensor 
-resides or in which Licensor conducts its primary business, and under the laws 
-of that jurisdiction excluding its conflict-of-law provisions. The application 
-of the United Nations Convention on Contracts for the International Sale of 
-Goods is expressly excluded. Any use of the Original Work outside the scope of 
-this License or after its termination shall be subject to the requirements and 
-penalties of the U.S. Copyright Act, 17 U.S.C. å¤ 101 et seq., the equivalent 
-laws of other countries, and international treaty. This section shall survive 
-the termination of this License.
-
-12) Attorneys Fees. In any action to enforce the terms of this License or 
-seeking damages relating thereto, the prevailing party shall be entitled to 
-recover its costs and expenses, including, without limitation, reasonable 
-attorneys' fees and costs incurred in connection with such action, including 
-any appeal of such action. This section shall survive the termination of this 
-License.
-
-13) Miscellaneous. This License represents the complete agreement concerning 
-the subject matter hereof. If any provision of this License is held to be 
-unenforceable, such provision shall be reformed only to the extent necessary 
-to make it enforceable.
-
-14) Definition of "You" in This License. "You" throughout this License, 
-whether in upper or lower case, means an individual or a legal entity exercising 
-rights under, and complying with all of the terms of, this License. For legal 
-entities, "You" includes any entity that controls, is controlled by, or is under 
-common control with you. For purposes of this definition, "control" means (i) 
-the power, direct or indirect, to cause the direction or management of such 
-entity, whether by contract or otherwise, or (ii) ownership of fifty percent 
-(50%) or more of the outstanding shares, or (iii) beneficial ownership of such 
-entity.
-
-15) Right to Use. You may use the Original Work in all ways not otherwise 
-restricted or conditioned by this License or by law, and Licensor promises not 
-to interfere with or be responsible for such uses by You.
-
-This license is Copyright (C) 2002 Lawrence E. Rosen. All rights reserved. 
-Permission is hereby granted to copy and distribute this license without 
-modification. This license may not be modified without the express written 
-permission of its copyright owner.
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+THE SOFTWARE.
diff --git a/allocate.c b/allocate.c
index 5cc52a9..f597caf 100644
--- a/allocate.c
+++ b/allocate.c
@@ -4,7 +4,23 @@
  * Copyright (C) 2003 Transmeta Corp.
  *               2003-2004 Linus Torvalds
  *
- *  Licensed under the Open Software License version 1.1
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+ * THE SOFTWARE.
  *
  * Simple allocator for data that doesn't get partially free'd.
  * The tokenizer and parser allocate a _lot_ of small data structures
diff --git a/c2xml.c b/c2xml.c
index af995b1..67486c7 100644
--- a/c2xml.c
+++ b/c2xml.c
@@ -5,7 +5,23 @@
  *
  * Copyright (C) 2007 Rob Taylor
  *
- * Licensed under the Open Software License version 1.1
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+ * THE SOFTWARE.
  */
 #include <stdlib.h>
 #include <stdio.h>
diff --git a/compat-bsd.c b/compat-bsd.c
index 4f3c8c0..d8acf40 100644
--- a/compat-bsd.c
+++ b/compat-bsd.c
@@ -2,7 +2,23 @@
  * BSD Compatibility functions
  *
  *
- *  Licensed under the Open Software License version 1.1
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+ * THE SOFTWARE.
  */
 
 #include <sys/types.h>
diff --git a/compat-cygwin.c b/compat-cygwin.c
index e65b538..40f291e 100644
--- a/compat-cygwin.c
+++ b/compat-cygwin.c
@@ -2,7 +2,23 @@
  * Cygwin Compatibility functions	
  *	
  *	
- *  Licensed under the Open Software License version 1.1	
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+ * THE SOFTWARE.
  */	
 	
 	
diff --git a/compat-mingw.c b/compat-mingw.c
index c978e04..43f0036 100644
--- a/compat-mingw.c
+++ b/compat-mingw.c
@@ -2,7 +2,23 @@
  * MinGW Compatibility functions	
  *	
  *	
- *  Licensed under the Open Software License version 1.1	
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+ * THE SOFTWARE.
  */	
 	
 	
diff --git a/compile-i386.c b/compile-i386.c
index b470952..88169ec 100644
--- a/compile-i386.c
+++ b/compile-i386.c
@@ -5,7 +5,23 @@
  *               2003 Linus Torvalds
  * Copyright 2003 Jeff Garzik
  *
- * Licensed under the Open Software License version 1.1
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+ * THE SOFTWARE.
  *
  * x86 backend
  *
diff --git a/compile.c b/compile.c
index d405b22..48f9c70 100644
--- a/compile.c
+++ b/compile.c
@@ -6,7 +6,23 @@
  *               2003 Linus Torvalds
  * Copyright 2003 Jeff Garzik
  *
- *  Licensed under the Open Software License version 1.1
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+ * THE SOFTWARE.
  *
  */
 #include <stdarg.h>
diff --git a/ctags.c b/ctags.c
index 7e129a6..9ec6b3c 100644
--- a/ctags.c
+++ b/ctags.c
@@ -5,7 +5,23 @@
  *
  * Copyright (C) 2006 Christopher Li
  *
- * Licensed under the Open Software License version 1.1
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+ * THE SOFTWARE.
  */
 #include <stdlib.h>
 #include <stdio.h>
diff --git a/dissect.c b/dissect.c
index 61240d7..d211bca 100644
--- a/dissect.c
+++ b/dissect.c
@@ -3,7 +3,23 @@
  *
  * Started by Oleg Nesterov <oleg@tv-sign.ru>
  *
- * Licensed under the Open Software License version 1.1
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+ * THE SOFTWARE.
  */
 
 #include "dissect.h"
diff --git a/evaluate.c b/evaluate.c
index 4b4ea6e..5b643d8 100644
--- a/evaluate.c
+++ b/evaluate.c
@@ -4,7 +4,23 @@
  * Copyright (C) 2003 Transmeta Corp.
  *               2003-2004 Linus Torvalds
  *
- *  Licensed under the Open Software License version 1.1
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+ * THE SOFTWARE.
  *
  * Evaluate constant expressions.
  */
diff --git a/expand.c b/expand.c
index 2dfa5e5..0f6720c 100644
--- a/expand.c
+++ b/expand.c
@@ -4,7 +4,23 @@
  * Copyright (C) 2003 Transmeta Corp.
  *               2003-2004 Linus Torvalds
  *
- *  Licensed under the Open Software License version 1.1
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+ * THE SOFTWARE.
  *
  * expand constant expressions.
  */
diff --git a/expression.c b/expression.c
index 836c2ee..4353dbe 100644
--- a/expression.c
+++ b/expression.c
@@ -4,7 +4,23 @@
  * Copyright (C) 2003 Transmeta Corp.
  *               2003-2004 Linus Torvalds
  *
- *  Licensed under the Open Software License version 1.1
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+ * THE SOFTWARE.
  *
  * This is the expression parsing part of parsing C.
  */
diff --git a/expression.h b/expression.h
index 7a9641b..e31d140 100644
--- a/expression.h
+++ b/expression.h
@@ -6,7 +6,23 @@
  * Copyright (C) 2003 Transmeta Corp.
  *               2003 Linus Torvalds
  *
- *  Licensed under the Open Software License version 1.1
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+ * THE SOFTWARE.
  *
  * Declarations and helper functions for expression parsing.
  */
diff --git a/graph.c b/graph.c
index 3633783..8cbc220 100644
--- a/graph.c
+++ b/graph.c
@@ -4,7 +4,23 @@
  * Author: Josh Triplett <josh@freedesktop.org>
  *         Dan Sheridan <djs@adelard.com>
  *
- * Licensed under the Open Software License version 1.1
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+ * THE SOFTWARE.
  */
 #include <stdarg.h>
 #include <stdlib.h>
diff --git a/inline.c b/inline.c
index 9ed4570..a3002c6 100644
--- a/inline.c
+++ b/inline.c
@@ -4,7 +4,23 @@
  * Copyright (C) 2003 Transmeta Corp.
  *               2003-2004 Linus Torvalds
  *
- *  Licensed under the Open Software License version 1.1
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+ * THE SOFTWARE.
  */
 
 #include <stdlib.h>
diff --git a/lib.c b/lib.c
index 3f687ae..fe20f93 100644
--- a/lib.c
+++ b/lib.c
@@ -4,7 +4,23 @@
  * Copyright (C) 2003 Transmeta Corp.
  *               2003-2004 Linus Torvalds
  *
- *  Licensed under the Open Software License version 1.1
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+ * THE SOFTWARE.
  */
 #include <ctype.h>
 #include <fcntl.h>
diff --git a/lib.h b/lib.h
index 5ab2bd9..f09b338 100644
--- a/lib.h
+++ b/lib.h
@@ -11,7 +11,23 @@
  *               2003 Linus Torvalds
  *               2004 Christopher Li
  *
- *  Licensed under the Open Software License version 1.1
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+ * THE SOFTWARE.
  */
 
 #include "compat.h"
diff --git a/obfuscate.c b/obfuscate.c
index 1015510..18cbd0e 100644
--- a/obfuscate.c
+++ b/obfuscate.c
@@ -6,7 +6,23 @@
  * Copyright (C) 2003 Transmeta Corp.
  *               2003-2004 Linus Torvalds
  *
- *  Licensed under the Open Software License version 1.1
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+ * THE SOFTWARE.
  */
 #include <stdarg.h>
 #include <stdlib.h>
diff --git a/parse.c b/parse.c
index 890e56b..9cc5f65 100644
--- a/parse.c
+++ b/parse.c
@@ -7,7 +7,23 @@
  *               2003-2004 Linus Torvalds
  * Copyright (C) 2004 Christopher Li
  *
- *  Licensed under the Open Software License version 1.1
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+ * THE SOFTWARE.
  */
 
 #include <stdarg.h>
diff --git a/parse.h b/parse.h
index b26bd03..0c34ec2 100644
--- a/parse.h
+++ b/parse.h
@@ -6,7 +6,23 @@
  * Copyright (C) 2003 Transmeta Corp.
  *               2003 Linus Torvalds
  *
- *  Licensed under the Open Software License version 1.1
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+ * THE SOFTWARE.
  */
 
 #include "symbol.h"
diff --git a/pre-process.c b/pre-process.c
index d521318..1aa3d2c 100644
--- a/pre-process.c
+++ b/pre-process.c
@@ -7,7 +7,23 @@
  * Copyright (C) 2003 Transmeta Corp.
  *               2003-2004 Linus Torvalds
  *
- *  Licensed under the Open Software License version 1.1
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+ * THE SOFTWARE.
  */
 #include <stdio.h>
 #include <stdlib.h>
diff --git a/scope.c b/scope.c
index 27e38bc..b415ace 100644
--- a/scope.c
+++ b/scope.c
@@ -6,7 +6,23 @@
  * Copyright (C) 2003 Transmeta Corp.
  *               2003-2004 Linus Torvalds
  *
- *  Licensed under the Open Software License version 1.1
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+ * THE SOFTWARE.
  */
 #include <stdlib.h>
 #include <string.h>
diff --git a/scope.h b/scope.h
index 0fab286..045c356 100644
--- a/scope.h
+++ b/scope.h
@@ -6,7 +6,23 @@
  * Copyright (C) 2003 Transmeta Corp.
  *               2003 Linus Torvalds
  *
- *  Licensed under the Open Software License version 1.1
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+ * THE SOFTWARE.
  */
 
 struct symbol;
diff --git a/show-parse.c b/show-parse.c
index 1333e30..fb54375 100644
--- a/show-parse.c
+++ b/show-parse.c
@@ -4,7 +4,23 @@
  * Copyright (C) 2003 Transmeta Corp.
  *               2003-2004 Linus Torvalds
  *
- *  Licensed under the Open Software License version 1.1
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+ * THE SOFTWARE.
  *
  * Print out results of parsing for debugging and testing.
  */
diff --git a/sparse.c b/sparse.c
index 67b7d9e..233585b 100644
--- a/sparse.c
+++ b/sparse.c
@@ -6,7 +6,23 @@
  * Copyright (C) 2003 Transmeta Corp.
  *               2003-2004 Linus Torvalds
  *
- *  Licensed under the Open Software License version 1.1
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+ * THE SOFTWARE.
  */
 #include <stdarg.h>
 #include <stdlib.h>
diff --git a/symbol.c b/symbol.c
index 2ec6200..eb6e121 100644
--- a/symbol.c
+++ b/symbol.c
@@ -4,7 +4,23 @@
  * Copyright (C) 2003 Transmeta Corp.
  *               2003-2004 Linus Torvalds
  *
- *  Licensed under the Open Software License version 1.1
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+ * THE SOFTWARE.
  */
 #include <stdlib.h>
 #include <stdio.h>
diff --git a/symbol.h b/symbol.h
index 1c6ad66..43c165b 100644
--- a/symbol.h
+++ b/symbol.h
@@ -6,7 +6,23 @@
  * Copyright (C) 2003 Transmeta Corp.
  *               2003 Linus Torvalds
  *
- *  Licensed under the Open Software License version 1.1
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+ * THE SOFTWARE.
  */
 
 #include "token.h"
diff --git a/test-lexing.c b/test-lexing.c
index f4639ec..5c7ab2a 100644
--- a/test-lexing.c
+++ b/test-lexing.c
@@ -5,7 +5,23 @@
  * Copyright (C) 2003 Transmeta Corp.
  *               2003 Linus Torvalds
  *
- *  Licensed under the Open Software License version 1.1
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+ * THE SOFTWARE.
  */
 #include <stdarg.h>
 #include <stdlib.h>
diff --git a/test-linearize.c b/test-linearize.c
index 5cc54cd..dd2eaec 100644
--- a/test-linearize.c
+++ b/test-linearize.c
@@ -4,7 +4,23 @@
  * Copyright (C) 2003 Transmeta Corp.
  *               2003-2004 Linus Torvalds
  *
- * Licensed under the Open Software License version 1.1
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+ * THE SOFTWARE.
  */
 #include <stdarg.h>
 #include <stdlib.h>
diff --git a/test-parsing.c b/test-parsing.c
index 0a0b1d4..7642205 100644
--- a/test-parsing.c
+++ b/test-parsing.c
@@ -6,7 +6,23 @@
  * Copyright (C) 2003 Transmeta Corp.
  *               2003 Linus Torvalds
  *
- *  Licensed under the Open Software License version 1.1
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+ * THE SOFTWARE.
  */
 #include <stdarg.h>
 #include <stdlib.h>
diff --git a/token.h b/token.h
index 401bf5e..8dbd80f 100644
--- a/token.h
+++ b/token.h
@@ -8,7 +8,23 @@
  * Copyright (C) 2003 Transmeta Corp.
  *               2003 Linus Torvalds
  *
- *  Licensed under the Open Software License version 1.1
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+ * THE SOFTWARE.
  */
 
 #include <sys/types.h>
diff --git a/tokenize.c b/tokenize.c
index 3eb643d..f93ce46 100644
--- a/tokenize.c
+++ b/tokenize.c
@@ -5,7 +5,23 @@
  * Copyright (C) 2003 Transmeta Corp.
  *               2003 Linus Torvalds
  *
- *  Licensed under the Open Software License version 1.1
+ * Permission is hereby granted, free of charge, to any person obtaining a copy
+ * of this software and associated documentation files (the "Software"), to deal
+ * in the Software without restriction, including without limitation the rights
+ * to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ * copies of the Software, and to permit persons to whom the Software is
+ * furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ * AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+ * THE SOFTWARE.
  */
 #include <stdio.h>
 #include <stdlib.h>
-- 
1.8.4.4

--
To unsubscribe from this list: send the line "unsubscribe linux-sparse" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html

[PATCHv2 4/5] FAQ: Remove outdated section about the license

[Franz Schrober]

From: Franz Schrober <franzschrober@yahoo.de>

Signed-off-by: Franz Schrober <franzschrober@yahoo.de>
---
 FAQ | 17 -----------------
 1 file changed, 17 deletions(-)

diff --git a/FAQ b/FAQ
index 290de0e..56a2618 100644
--- a/FAQ
+++ b/FAQ
@@ -50,23 +50,6 @@ A.  See the previous question: I personally think that the front end
     improvements back. That's your "quid" to my "quo".
 
 
-Q.  So what _is_ the license?
-
-A.  I don't know yet.  I originally thought it would be LGPL, but I'm
-    possibly going for a license that is _not_ subsumable by the GPL. 
-    In other words, I don't want to see a GPL'd project suck in the
-    LGPL'd front-end, and then make changes to the front end under the
-    GPL (this is something that the LGPL expressly allows, and see the
-    previous question for why I think it's the _only_ thing that I will
-    not allow). 
-
-    The current front-runner is the OSL ("Open Software License", see
-    http://www.opensource.org/licenses/osl.php), together with a note on
-    what makes source derivative and what does not to make it clear that
-    people can write back-ends for it without having to make those
-    back-ends available under the OSL. 
-

Re: [PATCHv2 4/5] FAQ: Remove outdated section about the license

[Josh Triplett]

On Thu, Nov 28, 2013 at 11:16:21AM +0100, Franz Schrober wrote:
> From: Franz Schrober <franzschrober@yahoo.de>
> 
> Signed-off-by: Franz Schrober <franzschrober@yahoo.de>
> ---
>  FAQ | 17 -----------------
>  1 file changed, 17 deletions(-)
> 
> diff --git a/FAQ b/FAQ
> index 290de0e..56a2618 100644
> --- a/FAQ
> +++ b/FAQ
> @@ -50,23 +50,6 @@ A.  See the previous question: I personally think that the front end
>      improvements back. That's your "quid" to my "quo".

This previous section on "Why not GPL?" is now inaccurate as well; the
last paragraph no longer applies, given the MIT license.

- Josh Triplett

Re: [PATCHv2 4/5] FAQ: Remove outdated section about the license

[Schrober]

On Thursday 28 November 2013 13:05:38 Josh Triplett wrote:
> This previous section on "Why not GPL?" is now inaccurate as well; the
> last paragraph no longer applies, given the MIT license.

Yes, you are completely right. I've missed it because I've only searched for 
references to the OSL 1.1
-- 
Franz Schrober

[PATCHv3 4/5] FAQ: Remove outdated sections about the license

[Franz Schrober]

From: Franz Schrober <franzschrober@yahoo.de>

Reported-by: Josh Triplett <josh@joshtriplett.org>
Signed-off-by: Franz Schrober <franzschrober@yahoo.de>
---
Changes since v2

 * Removed paragraph in "Why not GPL?" about "give-back" parts of the license
   which no longer applies

 FAQ | 24 ------------------------
 1 file changed, 24 deletions(-)

diff --git a/FAQ b/FAQ
index 290de0e..8ef6e84 100644
--- a/FAQ
+++ b/FAQ
@@ -42,30 +42,6 @@ A.  See the previous question: I personally think that the front end
     they want to have a proprietary back-end, that's ok by me too. It's
     their loss, not mine.
 
-    At the same time, I'm a big believer in "quid pro quo". I wrote the
-    front-end, and if you make improvements to the semantic parsing part
-    (as opposed to just using the resulting parse tree), you'd better
-    cough up.  The front-end is intended to be an open-source project in
-    its own right, and if you improve the front end, you must give those
-    improvements back. That's your "quid" to my "quo".
-
-
-Q.  So what _is_ the license?
-
-A.  I don't know yet.  I originally thought it would be LGPL, but I'm
-    possibly going for a license that is _not_ subsumable by the GPL. 
-    In other words, I don't want to see a GPL'd project suck in the
-    LGPL'd front-end, and then make changes to the front end under the
-    GPL (this is something that the LGPL expressly allows, and see the
-    previous question for why I think it's the _only_ thing that I will
-    not allow). 
-
-    The current front-runner is the OSL ("Open Software License", see
-    http://www.opensource.org/licenses/osl.php), together with a note on
-    what makes source derivative and what does not to make it clear that
-    people can write back-ends for it without having to make those
-    back-ends available under the OSL. 

[PATCHv2 5/5] sparse: Also check bit_offset when checking implicit casts

[Franz Schrober]

From: Franz Schrober <franzschrober@yahoo.de>

The comparison in same_cast_type only checked the bit_size of the new and the
old symbol. The bit_offset was only compared with itself and thus would always
be true. Instead Linus most likely wanted to compare the bit_offset of the new
and the old symbol. This regression was introduced in
47f53396a1d62719c44941f84370ead80181728e ("If two implied casts end up undoing
each other, just remove them.").

Reported-by: James Westby <jw+debian@jameswestby.net>
Signed-off-by: Franz Schrober <franzschrober@yahoo.de>
---
 evaluate.c | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/evaluate.c b/evaluate.c
index 5b643d8..6655615 100644
--- a/evaluate.c
+++ b/evaluate.c
@@ -191,7 +191,8 @@ left:
 
 static int same_cast_type(struct symbol *orig, struct symbol *new)
 {
-	return orig->bit_size == new->bit_size && orig->bit_offset == orig->bit_offset;
+	return orig->bit_size == new->bit_size &&
+	       orig->bit_offset == new->bit_offset;
 }
 
 static struct symbol *base_type(struct symbol *node, unsigned long *modp, unsigned long *asp)
-- 
1.8.4.4

Re: [PATCHv2 0/5] sparse: Relicense from non-dfsg-free OSL 1.1 to MIT license

[Franz Schrober]

[-- Attachment #1: Type: text/plain, Size: 1681 bytes --]

And here are the mails from everyone with their agreement.
--
Franz Schrober

On Thu, Nov 28, 2013 at 11:16 AM, Franz Schrober
<franzschrober@gmail.com> wrote:
> Hi,
>
> many different people (especially Dan Carpenter) worked quite hard to contact
> all people with significant contributions. The two changes are the ones which
> should change the license from the problematic OSL[1] to the more liberal MIT
> license. The initial agreement was reached when Novafora (successor in
> interest to Transmeta Corporation) accepted such a license [2]. The commit
> provided by them is attached as "relicense.bundle" [3] and has to be
> unbundled+merged in the sparse repository before the following patches can be
> applied.
>
> The changes can also be pulled from
>
>         git pull https://github.com/franzschrober/sparse.git master
>
> Btw. when somebody has to ask me in the future about a license change of these
> two patches: do whatever you want. They can be considered public domain.
>
> The change of this patchset compared to the first version are:
>
>  * Benjamin Herrenschmidt and Chris Wedgwood were added to the Acked-by list
>    because they've also agreed to the license change
>  * Reverts for James Westby's contributions were added because it seems that he
>    is the only person not agreeing to the license change (he was not reachable
>    over social media or any of his email accounts)
>  * An alternative patch for the implicit casting bug found James Westby was
>    added
>
> [1] https://wiki.debian.org/DFSGLicenses#Open_Software_License_.28OSL.29_v1.1
> [2] http://lwn.net/Articles/328560/
> [3] http://marc.info/?l=linux-sparse&m=138548610116314&w=2
>

[-- Attachment #2: relicense.tar.xz --]
[-- Type: application/x-xz, Size: 43972 bytes --]

[-- Attachment #3: relicense.bundle --]
[-- Type: application/octet-stream, Size: 1757 bytes --]

Fwd: [PATCHv2 0/5] sparse: Relicense from non-dfsg-free OSL 1.1 to MIT license

[Christopher Li]

Forget to turn on plain text mode, the previous email get bounce off
vger.

---------- Forwarded message ----------
From: Christopher Li <sparse@chrisli.org>
Date: Fri, Nov 29, 2013 at 3:13 PM
Subject: Re: [PATCHv2 0/5] sparse: Relicense from non-dfsg-free OSL
1.1 to MIT license
To: Franz Schrober <franzschrober@gmail.com>
Cc: Linux-Sparse <linux-sparse@vger.kernel.org>, jw+debian@jameswestby.net





On Thu, Nov 28, 2013 at 2:16 AM, Franz Schrober <franzschrober@gmail.com> wrote:
>
> Hi,
>
> many different people (especially Dan Carpenter) worked quite hard to contact
> all people with significant contributions. The two changes are the ones which
> should change the license from the problematic OSL[1] to the more liberal MIT
> license. The initial agreement was reached when Novafora (successor in
> interest to Transmeta Corporation) accepted such a license [2]. The commit
> provided by them is attached as "relicense.bundle" [3] and has to be
> unbundled+merged in the sparse repository before the following patches can be
> applied.
>

Thanks for the hard work.

I just apply your 5 patches on top of the merge of the Novofora branch.

I push the result on the chrisl repository. Please check if I did any thing
wrong. I will shortly push it to the official repository and cut a new release.

Chris

Re: [PATCHv2 0/5] sparse: Relicense from non-dfsg-free OSL 1.1 to MIT license

[Franz Schrober]

On Sat, Nov 30, 2013 at 12:13 AM, Christopher Li <sparse@chrisli.org> wrote:
> I push the result on the chrisl repository. Please check if I did any thing
> wrong. I will shortly push it to the official repository and cut a new
> release.

I think everything looks fine.

Thanks
--
Franz Schrober

Re: [PATCHv2 0/5] sparse: Relicense from non-dfsg-free OSL 1.1 to MIT license

[Franz Schrober]

[-- Attachment #1: Type: text/plain, Size: 444 bytes --]

>  * Reverts for James Westby's contributions were added because it seems that he
>    is the only person not agreeing to the license change (he was not reachable
>    over social media or any of his email accounts)

It seems James Westby detected that his changes were removed (at least it is my
personal explanation) and now started to respond. I've attached his response and
will resubmit his README patch in some minutes.
--
Franz Schrober

[-- Attachment #2: relicense.tar.xz --]
[-- Type: application/x-xz, Size: 44544 bytes --]

Re: [PATCHv2 0/5] sparse: Relicense from non-dfsg-free OSL 1.1 to MIT license

[Dan Carpenter]

On Tue, Dec 03, 2013 at 09:17:59AM +0100, Franz Schrober wrote:
> >  * Reverts for James Westby's contributions were added because it seems that he
> >    is the only person not agreeing to the license change (he was not reachable
> >    over social media or any of his email accounts)
> 
> It seems James Westby detected that his changes were removed (at least it is my
> personal explanation) and now started to respond. I've attached his response and
> will resubmit his README patch in some minutes.

Actually I kept on harrassing him via his co-workers.  :P

regards,
dan carpenter

Re: [PATCHv2 0/5] sparse: Relicense from non-dfsg-free OSL 1.1 to MIT license

[Schrober]

On Tuesday 03 December 2013 13:37:00 Dan Carpenter wrote:
> On Tue, Dec 03, 2013 at 09:17:59AM +0100, Franz Schrober wrote:
> > >  * Reverts for James Westby's contributions were added because it seems
> > >  that he> >  
> > >    is the only person not agreeing to the license change (he was not
> > >    reachable
> > >    over social media or any of his email accounts)
> > 
> > It seems James Westby detected that his changes were removed (at least it
> > is my personal explanation) and now started to respond. I've attached his
> > response and will resubmit his README patch in some minutes.
> 
> Actually I kept on harrassing him via his co-workers.  :P

Good job :D
--
Franz Schrober