aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMarc André Tanner <mat@brain-dump.org>2016-09-25 10:39:03 +0200
committerMarc André Tanner <mat@brain-dump.org>2016-09-25 11:53:12 +0200
commitd3798ba58d3f8ebef9a024c8d538d7bebb0b6931 (patch)
tree39714a7105e4826a0093304499119b8a275de1a8
parent9eaa8fd045c72f7c8a59a53538cfa206b7878022 (diff)
downloadvis-d3798ba58d3f8ebef9a024c8d538d7bebb0b6931.tar.gz
vis-d3798ba58d3f8ebef9a024c8d538d7bebb0b6931.tar.xz
sam: change license header
We use an adapted variant of sam's structural regular expression based command language. The initial implementation was partially based upon the following functions from sam / acme: * parse.h / edit.h (struct definitions) * cmd.c / edit.c (functions parsecmd, simpleaddr, compoundaddr) * xec.c / ecmd.c (cmdexec) * address.c / addr.c (address) It turns out the relevant code can be traced back to the initial X11 port of sam which is distributed under an ISC-like license instead of the Lucent Public License Version 1.02 used for Plan 9, plan9port and 9base. http://www.netlib.org/research/ http://www.netlib.org/research/sam.shar Hence we switch to the simpler license variant. Close #238
-rw-r--r--LICENSE5
-rw-r--r--sam.c17
2 files changed, 17 insertions, 5 deletions
diff --git a/LICENSE b/LICENSE
index 7c79698..83c1c6e 100644
--- a/LICENSE
+++ b/LICENSE
@@ -26,8 +26,9 @@ under terms compatible with the above ISC license:
- libutf.[ch] originate from libutf a port of Plan 9's Unicode library
to Unix and are MIT licensed
- - sam.[ch] is based on Rob Pike's sam text editor for Plan 9.
- Licensed under the Lucent Public License Version 1.02.
+ - sam.[ch] is heavily inspired (and partially based upon) the X11
+ version of Rob Pike's sam text editor originally written for Plan 9
+ and distributed under an ISC-like license
- lexers/* the LPeg based lexers used for syntax highlighting are
imported from the Scintillua project licensed under the MIT license
diff --git a/sam.c b/sam.c
index 662eb7d..6c77861 100644
--- a/sam.c
+++ b/sam.c
@@ -1,9 +1,20 @@
/*
- * Heavily inspired (and partially based upon) Rob Pike's sam text editor
- * for Plan 9. Licensed under the Lucent Public License Version 1.02.
+ * Heavily inspired (and partially based upon) the X11 version of
+ * Rob Pike's sam text editor originally written for Plan 9.
*
- * Copyright © 2000-2009 Lucent Technologies
* Copyright © 2016 Marc André Tanner <mat at brain-dump.org>
+ * Copyright © 1998 by Lucent Technologies
+ *
+ * Permission to use, copy, modify, and distribute this software for any
+ * purpose without fee is hereby granted, provided that this entire notice
+ * is included in all copies of any software which is or includes a copy
+ * or modification of this software and in all copies of the supporting
+ * documentation for such software.
+ *
+ * THIS SOFTWARE IS BEING PROVIDED "AS IS", WITHOUT ANY EXPRESS OR IMPLIED
+ * WARRANTY. IN PARTICULAR, NEITHER THE AUTHORS NOR LUCENT TECHNOLOGIES MAKE ANY
+ * REPRESENTATION OR WARRANTY OF ANY KIND CONCERNING THE MERCHANTABILITY
+ * OF THIS SOFTWARE OR ITS FITNESS FOR ANY PARTICULAR PURPOSE.
*/
#include <string.h>
#include <strings.h>