1 files changed, 27 insertions, 34 deletions
diff --git a/bsd-misc.h b/bsd-misc.h
index 9d499c805..cdf8e2b67 100644
--- a/bsd-misc.h
+++ b/bsd-misc.h
@@ -1,38 +1,31 @@
 /*
-**
+ * Copyright (c) 1999-2000 Damien Miller.  All rights reserved.
-** OpenBSD replacement routines
+ *
-**
+ * Redistribution and use in source and binary forms, with or without
-** Damien Miller <djm@ibs.com.au>
+ * modification, are permitted provided that the following conditions
-** 
+ * are met:
-** Copyright 1999 Damien Miller
+ * 1. Redistributions of source code must retain the above copyright
-** Copyright 1999 Internet Business Solutions
+ *    notice, this list of conditions and the following disclaimer.
-**
+ * 2. Redistributions in binary form must reproduce the above copyright
-** Permission is hereby granted, free of charge, to any person
+ *    notice, this list of conditions and the following disclaimer in the
-** obtaining a copy of this software and associated documentation
+ *    documentation and/or other materials provided with the distribution.
-** files (the "Software"), to deal in the Software without
+ * 3. All advertising materials mentioning features or use of this software
-** restriction, including without limitation the rights to use, copy,
+ *    must display the following acknowledgement:
-** modify, merge, publish, distribute, sublicense, and/or sell copies
+ *      This product includes software developed by Markus Friedl.
-** of the Software, and to permit persons to whom the Software is
+ * 4. The name of the author may not be used to endorse or promote products
-** furnished to do so, subject to the following conditions:
+ *    derived from this software without specific prior written permission.
-**
+ *
-** The above copyright notice and this permission notice shall be
+ * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
-** included in all copies or substantial portions of the Software.
+ * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
-**
+ * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
-** THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY
+ * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
-** KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE
+ * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
-** WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE
+ * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
-** AND NONINFRINGEMENT.  IN NO EVENT SHALL DAMIEN MILLER OR INTERNET
+ * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
-** BUSINESS SOLUTIONS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
-** LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE,
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
-** ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE
+ * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-** OR OTHER DEALINGS IN THE SOFTWARE.
+ */
-**
-** Except as contained in this notice, the name of Internet Business
-** Solutions shall not be used in advertising or otherwise to promote
-** the sale, use or other dealings in this Software without prior
-** written authorization from Internet Business Solutions.
-**
-*/
 #ifndef _BSD_MISC_H
 #define _BSD_MISC_H

diff --git a/bsd-misc.h b/bsd-misc.h index 9d499c805..cdf8e2b67 100644 --- a/bsd-misc.h +++ b/bsd-misc.h
@@ -1,38 +1,31 @@
1	/*	1	/*
2	**	2	* Copyright (c) 1999-2000 Damien Miller. All rights reserved.
3	** OpenBSD replacement routines	3	*
4	**	4	* Redistribution and use in source and binary forms, with or without
5	** Damien Miller <djm@ibs.com.au>	5	* modification, are permitted provided that the following conditions
6	**	6	* are met:
7	** Copyright 1999 Damien Miller	7	* 1. Redistributions of source code must retain the above copyright
8	** Copyright 1999 Internet Business Solutions	8	* notice, this list of conditions and the following disclaimer.
9	**	9	* 2. Redistributions in binary form must reproduce the above copyright
10	** Permission is hereby granted, free of charge, to any person	10	* notice, this list of conditions and the following disclaimer in the
11	** obtaining a copy of this software and associated documentation	11	* documentation and/or other materials provided with the distribution.
12	** files (the "Software"), to deal in the Software without	12	* 3. All advertising materials mentioning features or use of this software
13	** restriction, including without limitation the rights to use, copy,	13	* must display the following acknowledgement:
14	** modify, merge, publish, distribute, sublicense, and/or sell copies	14	* This product includes software developed by Markus Friedl.
15	** of the Software, and to permit persons to whom the Software is	15	* 4. The name of the author may not be used to endorse or promote products
16	** furnished to do so, subject to the following conditions:	16	* derived from this software without specific prior written permission.
17	**	17	*
18	** The above copyright notice and this permission notice shall be	18	* THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
19	** included in all copies or substantial portions of the Software.	19	* IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
20	**	20	* OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
21	** THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY	21	* IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
22	** KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE	22	* INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
23	** WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE	23	* NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
24	** AND NONINFRINGEMENT. IN NO EVENT SHALL DAMIEN MILLER OR INTERNET	24	* DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
25	** BUSINESS SOLUTIONS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER	25	* THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
26	** LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE,	26	* (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
27	** ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE	27	* THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
28	** OR OTHER DEALINGS IN THE SOFTWARE.	28	*/
29	**
30	** Except as contained in this notice, the name of Internet Business
31	** Solutions shall not be used in advertising or otherwise to promote
32	** the sale, use or other dealings in this Software without prior
33	** written authorization from Internet Business Solutions.
34	**
35	*/
36		29
37	#ifndef _BSD_MISC_H	30	#ifndef _BSD_MISC_H
38	#define _BSD_MISC_H	31	#define _BSD_MISC_H