X-Git-Url: https://git.ozlabs.org/?a=blobdiff_plain;f=tools%2Fccanlint%2Flicenses.c;h=73651fcd657aaa01e460537232945c42d21f47f5;hb=d1a951b82386391b82e48b32403891f85e253565;hp=45684974f528a506ef2a7be9b09db2ea877ce434;hpb=dc8042b42500f79f613b1197df6cdf739615a89f;p=ccan

diff --git a/tools/ccanlint/licenses.c b/tools/ccanlint/licenses.c
index 45684974..73651fcd 100644
--- a/tools/ccanlint/licenses.c
+++ b/tools/ccanlint/licenses.c
@@ -6,80 +6,93 @@
 
 const struct license_info licenses[] = {
 	{ "LGPLv2+", "LGPL",
+	  "GNU LGPL version 2 (or later)",
 	  { "gnu lesser general public license",
 	    "version 2",
 	    "or at your option any later version"
 	  }
 	},
 	{ "LGPLv2", "LGPL",
+	  "GNU LGPL version 2",
 	  { "gnu lesser general public license",
 	    "version 2",
 	    NULL
 	  }
 	},
 	{ "LGPLv3", "LGPL",
+	  "GNU LGPL version 3",
 	  { "gnu lesser general public license",
 	    "version 3",
 	    NULL
 	  }
 	},
 	{ "LGPL", "LGPL",
+	  "GNU LGPL",
 	  { "gnu lesser general public license",
 	    NULL,
 	    NULL
 	  }
 	},
 	{ "GPLv2+", "GPL",
+	  "GNU GPL version 2 (or later)",
 	  { "gnu general public license",
 	    "version 2",
 	    "or at your option any later version"
 	  }
 	},
 	{ "GPLv2", "GPL",
+	  "GNU GPL version 2",
 	  { "gnu general public license",
 	    "version 2",
 	    NULL
 	  }
 	},
 	{ "GPLv3", "GPL",
+	  "GNU GPL version 3 (or later)",
 	  { "gnu general public license",
 	    "version 3",
 	    NULL
 	  }
 	},
 	{ "GPL", "GPL",
+	  "GNU GPL",
 	  { "gnu general public license",
 	    NULL,
 	    NULL
 	  }
 	},
 	{ "BSD-3CLAUSE", "BSD",
+	  "3-clause BSD license",
 	  { "redistributions of source code must retain",
 	    "redistributions in binary form must reproduce",
 	    "endorse or promote"
 	  }
 	},
 	{ "BSD-MIT", "MIT",
+	  "MIT (BSD) license",
 	  { "without restriction",
 	    "above copyright notice",
 	    "without warranty"
 	  }
 	},
 	{ "CC0", "CC0",
+	  "CC0 license (public domain)",
 	  { "Waiver.",
 	    "unconditionally waives",
 	    NULL
 	  }
 	},
 	{ "Public domain", "Public domain",
+	  NULL,
 	  { NULL, NULL, NULL  }
 	},
 	{ "Unknown license", "Unknown license",
+	  NULL,
 	  { NULL, NULL, NULL  }
 	},
 };
 
-/* License compatibilty chart (simplified: we don't test that licenses between
+/* License compatibility chart (simplified: we don't test that licenses between
  * files are compatible). */
 #define O true
 #define X false
@@ -117,7 +130,7 @@ bool license_compatible[LICENSE_UNKNOWN+1][LICENSE_UNKNOWN] = {
 #undef O
 
 /* See GPLv2 and v2 (basically same wording) for interpreting versions:
- * the "any later version" means the recepient can choose. */
+ * the "any later version" means the recipient can choose. */
 enum license which_license(struct doc_section *d)
 {
 	if (!d)
@@ -216,3 +229,9 @@ struct doc_section *find_license_tag(const struct manifest *m)
 	}
 	return NULL;
 }
+
+const char *get_license_oneliner(const tal_t *ctx, enum license license)
+{
+	return tal_fmt(ctx, "/* %s - see LICENSE file for details */",
+		       licenses[license].describe);
+}