tools: don't assume modules are immediately below ccan/ dir.

[ccan] / tools / ccanlint / tests / license_exists.c

diff --git a/tools/ccanlint/tests/license_exists.c b/tools/ccanlint/tests/license_exists.c
index dbfe29b5d7e450498c881a98dca6e81eb7ffc2bf..6305d61c02881a7fef67780d58067f1c80a2c9b0 100644 (file)
--- a/tools/ccanlint/tests/license_exists.c
+++ b/tools/ccanlint/tests/license_exists.c
@@ -10,100 +10,73 @@
 #include <err.h>
 #include <ccan/talloc/talloc.h>
 #include <ccan/str/str.h>
-#include <ccan/str_talloc/str_talloc.h>
 
-static struct doc_section *find_license_tag(const struct manifest *m)
+/* We might need more ../ for nested modules. */
+static const char *link_prefix(struct manifest *m)
 {
-       struct doc_section *d;
+       char *prefix = talloc_strdup(m, "../../");
+       unsigned int i;
 
-       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;
-}
+       for (i = 0; i < strcount(m->modname, "/"); i++)
+               prefix = talloc_append_string(prefix, "../");
 
-/* See GPLv2 and v2 (basically same wording) for interpreting versions:
- * the "any later version" means the recepient can choose. */
-static enum license which_license(struct doc_section *d)
-{
-       /* This means "user chooses what version", including GPLv1! */
-       if (streq(d->lines[0], "GPL"))
-               return LICENSE_GPL;
-       /* This means "v2 only". */
-       if (streq(d->lines[0], "GPLv2"))
-               return LICENSE_GPLv2;
-       /* This means "v2 or above" at user's choice. */
-       if (streq(d->lines[0], "GPL (v2 or any later version)"))
-               return LICENSE_GPLv2_PLUS;
-       /* This means "v3 or above" at user's choice. */
-       if (streq(d->lines[0], "GPL (v3 or any later version)"))
-               return LICENSE_GPLv3;
-
-       /* This means "user chooses what version" */
-       if (streq(d->lines[0], "LGPL"))
-               return LICENSE_LGPL;
-       /* This means "v2.1 only". */
-       if (streq(d->lines[0], "LGPLv2.1"))
-               return LICENSE_LGPLv2;
-       /* This means "v2.1 or above" at user's choice. */
-       if (streq(d->lines[0], "LGPL (v2.1 or any later version)"))
-               return LICENSE_LGPLv2_PLUS;
-       /* This means "v3 or above" at user's choice. */
-       if (streq(d->lines[0], "LGPL (v3 or any later version)"))
-               return LICENSE_LGPLv3;
-
-       if (streq(d->lines[0], "BSD-MIT") || streq(d->lines[0], "MIT"))
-               return LICENSE_MIT;
-       if (streq(d->lines[0], "BSD (3 clause)"))
-               return LICENSE_BSD;
-       if (strreg(NULL, d->lines[0], "[Pp]ublic [Dd]omain"))
-               return LICENSE_PUBLIC_DOMAIN;
-
-       return LICENSE_UNKNOWN;
+       return talloc_append_string(prefix, "licenses/");
 }
 
-static const char *expected_link(enum license license)
+static const char *expected_link(const char *prefix, enum license license)
 {
+       const char *shortname;
+
        switch (license) {
        case LICENSE_LGPLv2_PLUS:
        case LICENSE_LGPLv2:
-               return "../../licenses/LGPL-2.1";
+               shortname = "LGPL-2.1";
+               break;
        case LICENSE_LGPLv3:
        case LICENSE_LGPL:
-               return "../../licenses/LGPL-3";
+               shortname = "LGPL-3";
+               break;
 
        case LICENSE_GPLv2_PLUS:
        case LICENSE_GPLv2:
-               return "../../licenses/GPL-2";
+               shortname = "GPL-2";
+               break;
 
        case LICENSE_GPLv3:
        case LICENSE_GPL:
-               return "../../licenses/GPL-3";
+               shortname = "GPL-3";
+               break;
 
        case LICENSE_BSD:
-               return "../../licenses/BSD-3CLAUSE";
+               shortname = "BSD-3CLAUSE";
+               break;
 
        case LICENSE_MIT:
-               return "../../licenses/BSD-MIT";
+               shortname = "BSD-MIT";
+               break;
+
+       case LICENSE_CC0:
+               shortname = "CC0";
+               break;
 
        default:
                return NULL;
        }
+
+       return talloc_append_string(talloc_strdup(prefix, prefix), shortname);
 }
 
 static void handle_license_link(struct manifest *m, struct score *score)
 {
        struct doc_section *d = find_license_tag(m);
+       const char *prefix = link_prefix(m);
        const char *link = talloc_asprintf(m, "%s/LICENSE", m->dir);
-       const char *ldest = expected_link(m->license);
+       const char *ldest = expected_link(prefix, m->license);
        char *q;
 
        printf(
        "Most modules want a copy of their license, so usually we create a\n"
-       "LICENSE symlink into ../../licenses to avoid too many copies.\n");
+       "LICENSE symlink into %s to avoid too many copies.\n", prefix);
 
        /* FIXME: make ask printf-like */
        q = talloc_asprintf(m, "Set up link to %s (license is %s)?",
@@ -117,7 +90,6 @@ static void handle_license_link(struct manifest *m, struct score *score)
 extern struct ccanlint license_exists;
 
 static void check_has_license(struct manifest *m,
-                             bool keep,
                              unsigned int *timeleft, struct score *score)
 {
        char buf[PATH_MAX];
@@ -125,6 +97,7 @@ static void check_has_license(struct manifest *m,
        char *license = talloc_asprintf(m, "%s/LICENSE", m->dir);
        const char *expected;
        struct doc_section *d;
+       const char *prefix = link_prefix(m);
 
        d = find_license_tag(m);
        if (!d) {
@@ -145,7 +118,7 @@ static void check_has_license(struct manifest *m,
        /* If they have a license tag at all, we pass. */
        score->pass = true;
 
-       expected = expected_link(m->license);
+       expected = expected_link(prefix, m->license);
 
        len = readlink(license, buf, sizeof(buf));
        if (len < 0) {
@@ -181,11 +154,10 @@ static void check_has_license(struct manifest *m,
 
        buf[len] = '\0';
 
-       if (!strstarts(buf, "../../licenses/")) {
+       if (!strstarts(buf, prefix)) {
                score->error = talloc_asprintf(score,
-                                              "Expected symlink to"
-                                              " ../../licenses/..."
-                                              " not %s", buf);
+                                              "Expected symlink into"
+                                              " %s not %s", prefix, buf);
                return;
        }