X-Git-Url: http://git.ozlabs.org/?p=ccan;a=blobdiff_plain;f=tools%2Fccanlint%2Flicenses.c;h=ca8bc73d0d58e0be508ab6e5f4cc5352a0af1072;hp=ff786de88c70f201f17110ac83df342bc063c210;hb=2ea90b45cf37292aba7c81b34736661c080497de;hpb=4fc1f40b58ec470a89d95e8790956a4967a87cb1

diff --git a/tools/ccanlint/licenses.c b/tools/ccanlint/licenses.c
index ff786de8..ca8bc73d 100644
--- a/tools/ccanlint/licenses.c
+++ b/tools/ccanlint/licenses.c
@@ -1,80 +1,93 @@
 #include "licenses.h"
 #include "ccanlint.h"
-#include <ccan/talloc/talloc.h>
 #include <ccan/str/str.h>
-#include <ccan/str_talloc/str_talloc.h>
+#include <ccan/tal/tal.h>
+#include <ccan/tal/str/str.h>
 
 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  }
 	},
 };
@@ -155,9 +168,10 @@ enum license which_license(struct doc_section *d)
 		return LICENSE_BSD;
 	if (streq(d->lines[0], "CC0"))
 		return LICENSE_CC0;
-	if (strreg(NULL, d->lines[0], "CC0 \\([Pp]ublic [Dd]omain\\)", NULL))
+	if (tal_strreg(NULL, d->lines[0], "CC0 \\([Pp]ublic [Dd]omain\\)",
+		       NULL))
 		return LICENSE_CC0;
-	if (strreg(NULL, d->lines[0], "[Pp]ublic [Dd]omain"))
+	if (tal_strreg(NULL, d->lines[0], "[Pp]ublic [Dd]omain"))
 		return LICENSE_PUBLIC_DOMAIN;
 
 	return LICENSE_UNKNOWN;
@@ -169,7 +183,7 @@ const char *get_ccan_simplified(struct ccan_file *f)
 		unsigned int i, j;
 
 		/* Simplify for easy matching: only alnum and single spaces. */
-		f->simplified = talloc_strdup(f, get_ccan_file_contents(f));
+		f->simplified = tal_strdup(f, get_ccan_file_contents(f));
 		for (i = 0, j = 0; f->simplified[i]; i++) {
 			if (cisupper(f->simplified[i]))
 				f->simplified[j++] = tolower(f->simplified[i]);
@@ -208,10 +222,16 @@ struct doc_section *find_license_tag(const struct manifest *m)
 	struct doc_section *d;
 
 	list_for_each(get_ccan_file_docs(m->info_file), d, list) {
-		if (!streq(d->function, m->basename))
+		if (!streq(d->function, m->modname))
 			continue;
 		if (streq(d->type, "license"))
 			return d;
 	}
 	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);
+}