X-Git-Url: https://git.ozlabs.org/?p=ccan;a=blobdiff_plain;f=tools%2Fccanlint%2Ftests%2Flicense_exists.c;h=09a9b7e68c7054fe010f19418511663f4021d1ef;hp=a841d665b2e8f683ca61f831e8b9f794b347ec52;hb=aa6b7489835d9bca43049ab6dc7f79d460539345;hpb=678cd10db6d6b81d97f3b98ea0a54657141632ad

diff --git a/tools/ccanlint/tests/license_exists.c b/tools/ccanlint/tests/license_exists.c
index a841d665..09a9b7e6 100644
--- a/tools/ccanlint/tests/license_exists.c
+++ b/tools/ccanlint/tests/license_exists.c
@@ -11,57 +11,40 @@
 #include <ccan/talloc/talloc.h>
 #include <ccan/str/str.h>
 
-static struct doc_section *find_license(const struct manifest *m)
+static const char *expected_link(enum license license)
 {
-	struct doc_section *d;
+	switch (license) {
+	case LICENSE_LGPLv2_PLUS:
+	case LICENSE_LGPLv2:
+		return "../../licenses/LGPL-2.1";
+	case LICENSE_LGPLv3:
+	case LICENSE_LGPL:
+		return "../../licenses/LGPL-3";
 
-	list_for_each(m->info_file->doc_sections, d, list) {
-		if (!streq(d->function, m->basename))
-			continue;
-		if (streq(d->type, "license"))
-			return d;
-	}
-	return NULL;
-}
+	case LICENSE_GPLv2_PLUS:
+	case LICENSE_GPLv2:
+		return "../../licenses/GPL-2";
 
-static const char *expected_link(const struct manifest *m,
-				 struct doc_section *d)
-{
-	if (streq(d->lines[0], "GPL")
-	    || streq(d->lines[0], "GPLv3")
-	    || streq(d->lines[0], "GPLv3 or later")
-	    || streq(d->lines[0], "GPLv3 (or later)")
-	    || streq(d->lines[0], "GPL (3 or any later version)"))
+	case LICENSE_GPLv3:
+	case LICENSE_GPL:
 		return "../../licenses/GPL-3";
-	if (streq(d->lines[0], "GPLv2")
-	    || streq(d->lines[0], "GPLv2 or later")
-	    || streq(d->lines[0], "GPLv2 (or later)")
-	    || streq(d->lines[0], "GPL (2 or any later version)"))
-		return "../../licenses/GPL-3";
-	if (streq(d->lines[0], "LGPL")
-	    || streq(d->lines[0], "LGPLv3")
-	    || streq(d->lines[0], "LGPLv3 or later")
-	    || streq(d->lines[0], "LGPLv3 (or later)")
-	    || streq(d->lines[0], "LGPL (3 or any later version)"))
-		return "../../licenses/LGPL-3";
-	if (streq(d->lines[0], "LGPLv2")
-	    || streq(d->lines[0], "LGPLv2 or later")
-	    || streq(d->lines[0], "LGPLv2 (or later)")
-	    || streq(d->lines[0], "LGPL (2 or any later version)"))
-		return "../../licenses/LGPL-2.1";
-	if (streq(d->lines[0], "BSD-MIT")
-	    || streq(d->lines[0], "MIT"))
-		return "../../licenses/BSD-MIT";
-	if (streq(d->lines[0], "BSD (3 clause)"))
+
+	case LICENSE_BSD:
 		return "../../licenses/BSD-3CLAUSE";
-	return NULL;
+
+	case LICENSE_MIT:
+		return "../../licenses/BSD-MIT";
+
+	default:
+		return NULL;
+	}
 }
 
 static void handle_license_link(struct manifest *m, struct score *score)
 {
+	struct doc_section *d = find_license_tag(m);
 	const char *link = talloc_asprintf(m, "%s/LICENSE", m->dir);
-	struct doc_section *d = find_license(m);
-	const char *ldest = expected_link(m, d);
+	const char *ldest = expected_link(m->license);
 	char *q;
 
 	printf(
@@ -89,22 +72,33 @@ static void check_has_license(struct manifest *m,
 	const char *expected;
 	struct doc_section *d;
 
-	d = find_license(m);
+	d = find_license_tag(m);
 	if (!d) {
 		score->error = talloc_strdup(score, "No License: tag in _info");
 		return;
 	}
+
+	m->license = which_license(d);
+	if (m->license == LICENSE_UNKNOWN) {
+		score_file_error(score, m->info_file, d->srcline,
+				 "WARNING: unknown License: in _info: %s",
+				 d->lines[0]);
+		/* FIXME: For historical reasons, don't fail here. */
+		score->pass = true;
+		return;
+	}
+
 	/* If they have a license tag at all, we pass. */
 	score->pass = true;
 
-	expected = expected_link(m, d);
+	expected = expected_link(m->license);
 
 	len = readlink(license, buf, sizeof(buf));
 	if (len < 0) {
 		/* Could be a real file... OK if not a standard license. */
 		if (errno == EINVAL) {
 			if (!expected) {
-				score->pass = true;
+				score->score = score->total;
 				return;
 			}
 			score->error
@@ -115,6 +109,11 @@ static void check_has_license(struct manifest *m,
 			return;
 		}
 		if (errno == ENOENT) {
+			/* Public domain doesn't really need a file. */
+			if (m->license == LICENSE_PUBLIC_DOMAIN) {
+				score->score = score->total;
+				return;
+			}
 			score->error = talloc_strdup(score,
 						     "LICENSE does not exist");
 			if (expected)