base64: fix for unsigned chars (e.g. ARM).

[ccan] / tools / ccanlint / licenses.c

diff --git a/tools/ccanlint/licenses.c b/tools/ccanlint/licenses.c
index ac62ad3471a77fc376f2377317f56404d839db29..73651fcd657aaa01e460537232945c42d21f47f5 100644 (file)
--- a/tools/ccanlint/licenses.c
+++ b/tools/ccanlint/licenses.c
@@ -1,85 +1,98 @@
 #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  }
        },
 };
 
-/* 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)
@@ -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]);
@@ -215,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);
+}