tools: use tal instead of talloc.

[ccan] / tools / ccanlint / licenses.c

diff --git a/tools/ccanlint/licenses.c b/tools/ccanlint/licenses.c
index 962412ccd8ef09f00f71c9e6a775e68b58595dd4..45684974f528a506ef2a7be9b09db2ea877ce434 100644 (file)
--- a/tools/ccanlint/licenses.c
+++ b/tools/ccanlint/licenses.c
@@ -1,8 +1,8 @@
 #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",
@@ -65,6 +65,12 @@ const struct license_info licenses[] = {
            "without warranty"
          }
        },
+       { "CC0", "CC0",
+         { "Waiver.",
+           "unconditionally waives",
+           NULL
+         }
+       },
        { "Public domain", "Public domain",
          { NULL, NULL, NULL  }
        },
@@ -75,33 +81,40 @@ const struct license_info licenses[] = {
 
 /* License compatibilty chart (simplified: we don't test that licenses between
  * files are compatible). */
+#define O true
+#define X false
 bool license_compatible[LICENSE_UNKNOWN+1][LICENSE_UNKNOWN] = {
-/*       LGPL2+ LGPL2 LGPL3 LGPL  GPL2+ GPL2  GPL3  GPL   BSD   MIT   PD   */
+/*     LGPL2+   LGPL3   GPL2+   GPL3     BSD     CC0
+            LGPL2    LGPL   GPL2     GPL     MIT     PD   */
 /* _info says: LGPL2+ */
-       { true, false,false,true, false,false,false,false,true, true, true },
+       { O,  X,  X,  O,  X,  X,  X,  X,  O,  O,  O,  O },
 /* _info says: LGPL2 only */
-       { true, true, false,true, false,false,false,false,true, true, true },
+       { O,  O,  X,  O,  X,  X,  X,  X,  O,  O,  O,  O },
 /* _info says: LGPL3 (or any later version) */
-       { true, false,true, true, false,false,false,false,true, true, true },
+       { O,  X,  O,  O,  X,  X,  X,  X,  O,  O,  O,  O },
 /* _info says: LGPL (no version specified) */
-       { true, true, true, true, false,false,false,false,true, true, true },
+       { O,  O,  O,  O,  X,  X,  X,  X,  O,  O,  O,  O },
 /* _info says: GPL2+ */
-       { true, true, true, true, true, false,false,true, true, true, true },
+       { O,  O,  O,  O,  O,  X,  X,  O,  O,  O,  O,  O },
 /* _info says: GPL2 only */
-       { true, true, true, true, true, true, false,true, true, true, true },
+       { O,  O,  O,  O,  O,  O,  X,  O,  O,  O,  O,  O },
 /* _info says: GPL3 (or any later version) */
-       { true, true, true, true, true, false,true, true, true, true, true },
+       { O,  O,  O,  O,  O,  X,  O,  O,  O,  O,  O,  O },
 /* _info says: GPL (unknown version) */
-       { true, true, true, true, true, true, true, true, true, true, true },
+       { O,  O,  O,  O,  O,  O,  O,  O,  O,  O,  O,  O },
 /* _info says: BSD (3-clause) */
-       { false,false,false,false,false,false,false,false,true, true, true },
+       { X,  X,  X,  X,  X,  X,  X,  X,  O,  O,  O,  O },
 /* _info says: MIT */
-       { false,false,false,false,false,false,false,false,false,true, true },
+       { X,  X,  X,  X,  X,  X,  X,  X,  X,  O,  O,  O },
+/* _info says: CC0 */
+       { X,  X,  X,  X,  X,  X,  X,  X,  X,  X,  O,  O },
 /* _info says: Public domain */
-       { false,false,false,false,false,false,false,false,false,false,true },
+       { X,  X,  X,  X,  X,  X,  X,  X,  X,  X,  O,  O },
 /* _info says something we don't understand */
-       { false,false,false,false,false,false,false,false,false,false,true }
+       { X,  X,  X,  X,  X,  X,  X,  X,  X,  X,  O,  O }
 };
+#undef X
+#undef O
 
 /* See GPLv2 and v2 (basically same wording) for interpreting versions:
  * the "any later version" means the recepient can choose. */
@@ -140,7 +153,12 @@ enum license which_license(struct doc_section *d)
                return LICENSE_MIT;
        if (streq(d->lines[0], "BSD (3 clause)"))
                return LICENSE_BSD;
-       if (strreg(NULL, d->lines[0], "[Pp]ublic [Dd]omain"))
+       if (streq(d->lines[0], "CC0"))
+               return LICENSE_CC0;
+       if (tal_strreg(NULL, d->lines[0], "CC0 \\([Pp]ublic [Dd]omain\\)",
+                      NULL))
+               return LICENSE_CC0;
+       if (tal_strreg(NULL, d->lines[0], "[Pp]ublic [Dd]omain"))
                return LICENSE_PUBLIC_DOMAIN;
 
        return LICENSE_UNKNOWN;
@@ -152,7 +170,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]);
@@ -191,7 +209,7 @@ 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;