[1082] in BarnOwl Developers
[D-O-H] r1051 - trunk/owl
daemon@ATHENA.MIT.EDU (nelhage@MIT.EDU)
Thu Oct 29 18:12:50 2009
Resent-From: nelhage@mit.edu
Resent-To: barnowl-dev-mtg@charon.mit.edu
X-Original-To: nelhage@nelhage.com
To: dirty-owl-hackers@MIT.EDU
From: nelhage@MIT.EDU
Reply-to: dirty-owl-hackers@MIT.EDU
Date: Sun, 25 May 2008 00:28:38 -0400 (EDT)
Author: nelhage
Date: 2008-05-25 00:28:38 -0400 (Sun, 25 May 2008)
New Revision: 1051
Added:
trunk/owl/COPYING
Modified:
trunk/owl/functions.c
trunk/owl/owl.c
trunk/owl/owl.h
Log:
Clean up licensing information and add a COPYING file. We're going to
continue with Sleepycat for the moment.
Added: trunk/owl/COPYING
===================================================================
--- trunk/owl/COPYING (rev 0)
+++ trunk/owl/COPYING 2008-05-25 04:28:38 UTC (rev 1051)
@@ -0,0 +1,39 @@
+Copyright (c) 2006-2008 The BarnOwl Developers. All rights reserved.
+Copyright (c) 2004 James Kretchmar. All rights reserved.
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions are
+met:
+
+ * Redistributions of source code must retain the above copyright
+ notice, this list of conditions and the following disclaimer.
+
+ * Redistributions in binary form must reproduce the above copyright
+ notice, this list of conditions and the following disclaimer in
+ the documentation and/or other materials provided with the
+ distribution.
+
+ * Redistributions in any form must be accompanied by information on
+ how to obtain complete source code for the BarnOwl software and
+ any accompanying software that uses the BarnOwl software. The
+ source code must either be included in the distribution or be
+ available for no more than the cost of distribution plus a nominal
+ fee, and must be freely redistributable under reasonable
+ conditions. For an executable file, complete source code means the
+ source code for all modules it contains. It does not include
+ source code for modules or files that typically accompany the
+ major components of the operating system on which the executable
+ file runs.
+
+
+THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
+IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE, OR
+NON-INFRINGEMENT, ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR BE
+LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
+CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR
+BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
+WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE
+OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN
+IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
Modified: trunk/owl/functions.c
===================================================================
--- trunk/owl/functions.c 2008-05-25 04:28:35 UTC (rev 1050)
+++ trunk/owl/functions.c 2008-05-25 04:28:38 UTC (rev 1051)
@@ -1466,16 +1466,13 @@
strcat(buff, "between Witches and Wizards. The name 'barnowl' was chosen\n");
strcat(buff, "because we feel our owls should live closer to our ponies.\n");
strcat(buff, "\n");
+ strcat(buff, "Copyright (c) 2006-2008 The BarnOwl Developers. All rights reserved.\n");
+ strcat(buff, "Copyright (c) 2004 James Kretchmar. All rights reserved.\n");
strcat(buff, "Copyright 2002 Massachusetts Institute of Technology\n");
strcat(buff, "\n");
- strcat(buff, "Permission to use, copy, modify, and distribute this\n");
- strcat(buff, "software and its documentation for any purpose and without\n");
- strcat(buff, "fee is hereby granted, provided that the above copyright\n");
- strcat(buff, "notice and this permission notice appear in all copies\n");
- strcat(buff, "and in supporting documentation. No representation is\n");
- strcat(buff, "made about the suitability of this software for any\n");
- strcat(buff, "purpose. It is provided \"as is\" without express\n");
- strcat(buff, "or implied warranty.\n");
+ strcat(buff, "This program is free software. You can redistribute it and/or\n");
+ strcat(buff, "modify under the terms of the Sleepycat License. Use the \n");
+ strcat(buff, "':show license' command to display the full license\n");
owl_function_popless_text(buff);
}
Modified: trunk/owl/owl.c
===================================================================
--- trunk/owl/owl.c 2008-05-25 04:28:35 UTC (rev 1050)
+++ trunk/owl/owl.c 2008-05-25 04:28:38 UTC (rev 1051)
@@ -1,40 +1,9 @@
-/* Copyright (c) 2004 James Kretchmar. All rights reserved.
+/* Copyright (c) 2006-2008 The BarnOwl Developers. All rights reserved.
+ * Copyright (c) 2004 James Kretchmar. All rights reserved.
*
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are
- * met:
- *
- * * Redistributions of source code must retain the above copyright
- * notice, this list of conditions and the following disclaimer.
- *
- * * Redistributions in binary form must reproduce the above copyright
- * notice, this list of conditions and the following disclaimer in
- * the documentation and/or other materials provided with the
- * distribution.
- *
- * * Redistributions in any form must be accompanied by information on
- * how to obtain complete source code for the Owl software and any
- * accompanying software that uses the Owl software. The source code
- * must either be included in the distribution or be available for no
- * more than the cost of distribution plus a nominal fee, and must be
- * freely redistributable under reasonable conditions. For an
- * executable file, complete source code means the source code for
- * all modules it contains. It does not include source code for
- * modules or files that typically accompany the major components of
- * the operating system on which the executable file runs.
- *
- *
- * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
- * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
- * WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE, OR
- * NON-INFRINGEMENT, ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR BE
- * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
- * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
- * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR
- * BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
- * WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE
- * OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN
- * IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ * This program is free software. You can redistribute it and/or
+ * modify under the terms of the Sleepycat License. See the COPYING
+ * file included with the distribution for more information.
*/
#include <stdio.h>
Modified: trunk/owl/owl.h
===================================================================
--- trunk/owl/owl.h 2008-05-25 04:28:35 UTC (rev 1050)
+++ trunk/owl/owl.h 2008-05-25 04:28:38 UTC (rev 1051)
@@ -1,40 +1,9 @@
-/* Copyright (c) 2004 James Kretchmar. All rights reserved.
+/* Copyright (c) 2006-2008 The BarnOwl Developers. All rights reserved.
+ * Copyright (c) 2004 James Kretchmar. All rights reserved.
*
- * Redistribution and use in source and binary forms, with or without
- * modification, are permitted provided that the following conditions are
- * met:
- *
- * * Redistributions of source code must retain the above copyright
- * notice, this list of conditions and the following disclaimer.
- *
- * * Redistributions in binary form must reproduce the above copyright
- * notice, this list of conditions and the following disclaimer in
- * the documentation and/or other materials provided with the
- * distribution.
- *
- * * Redistributions in any form must be accompanied by information on
- * how to obtain complete source code for the Owl software and any
- * accompanying software that uses the Owl software. The source code
- * must either be included in the distribution or be available for no
- * more than the cost of distribution plus a nominal fee, and must be
- * freely redistributable under reasonable conditions. For an
- * executable file, complete source code means the source code for
- * all modules it contains. It does not include source code for
- * modules or files that typically accompany the major components of
- * the operating system on which the executable file runs.
- *
- *
- * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
- * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
- * WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE, OR
- * NON-INFRINGEMENT, ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR BE
- * LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR
- * CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
- * SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR
- * BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
- * WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE
- * OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN
- * IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ * This program is free software. You can redistribute it and/or
+ * modify under the terms of the Sleepycat License. See the COPYING
+ * file included with the distribution for more information.
*/
#ifndef INC_OWL_H
@@ -85,9 +54,7 @@
#define OWL_SVN_REVNO ????
#endif
-#ifndef OWL_VERSION_STRING
#define OWL_VERSION_STRING "r" BARNOWL_STRINGIFY(OWL_SVN_REVNO)
-#endif
/* Feature that is being tested to redirect stderr through a pipe.
