summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog3
-rw-r--r--openbsd-compat/bsd-cygwin_util.c26
-rw-r--r--openbsd-compat/bsd-cygwin_util.h28
3 files changed, 45 insertions, 12 deletions
diff --git a/ChangeLog b/ChangeLog
index 986059291..ef57b994c 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,6 @@
120020415 120020415
2 - (djm) Unbreak "make install". Fix from Darren Tucker <dtucker@zip.com.au> 2 - (djm) Unbreak "make install". Fix from Darren Tucker <dtucker@zip.com.au>
3 - (stevesk) bsd-cygwin_util.[ch] BSD license from Corinna Vinschen
3 4
420020414 520020414
5 - (djm) ssh-rand-helper improvements 6 - (djm) ssh-rand-helper improvements
@@ -8244,4 +8245,4 @@
8244 - Wrote replacements for strlcpy and mkdtemp 8245 - Wrote replacements for strlcpy and mkdtemp
8245 - Released 1.0pre1 8246 - Released 1.0pre1
8246 8247
8247$Id: ChangeLog,v 1.2054 2002/04/15 03:23:59 djm Exp $ 8248$Id: ChangeLog,v 1.2055 2002/04/15 22:00:51 stevesk Exp $
diff --git a/openbsd-compat/bsd-cygwin_util.c b/openbsd-compat/bsd-cygwin_util.c
index b12725773..2396a6e6b 100644
--- a/openbsd-compat/bsd-cygwin_util.c
+++ b/openbsd-compat/bsd-cygwin_util.c
@@ -1,11 +1,27 @@
1/* 1/*
2 *
3 * cygwin_util.c 2 * cygwin_util.c
4 * 3 *
5 * Author: Corinna Vinschen <vinschen@cygnus.com> 4 * Copyright (c) 2000, 2001, Corinna Vinschen <vinschen@cygnus.com>
5 *
6 * Redistribution and use in source and binary forms, with or without
7 * modification, are permitted provided that the following conditions
8 * are met:
9 * 1. Redistributions of source code must retain the above copyright
10 * notice, this list of conditions and the following disclaimer.
11 * 2. Redistributions in binary form must reproduce the above copyright
12 * notice, this list of conditions and the following disclaimer in the
13 * documentation and/or other materials provided with the distribution.
6 * 14 *
7 * Copyright (c) 2000 Corinna Vinschen <vinschen@cygnus.com>, Duisburg, Germany 15 * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
8 * All rights reserved 16 * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
17 * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
18 * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
19 * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
20 * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
21 * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
22 * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
23 * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
24 * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
9 * 25 *
10 * Created: Sat Sep 02 12:17:00 2000 cv 26 * Created: Sat Sep 02 12:17:00 2000 cv
11 * 27 *
@@ -15,7 +31,7 @@
15 31
16#include "includes.h" 32#include "includes.h"
17 33
18RCSID("$Id: bsd-cygwin_util.c,v 1.7 2001/12/29 03:08:30 djm Exp $"); 34RCSID("$Id: bsd-cygwin_util.c,v 1.8 2002/04/15 22:00:52 stevesk Exp $");
19 35
20#ifdef HAVE_CYGWIN 36#ifdef HAVE_CYGWIN
21 37
diff --git a/openbsd-compat/bsd-cygwin_util.h b/openbsd-compat/bsd-cygwin_util.h
index c3d90518f..af470bdd8 100644
--- a/openbsd-compat/bsd-cygwin_util.h
+++ b/openbsd-compat/bsd-cygwin_util.h
@@ -1,11 +1,29 @@
1/* $Id: bsd-cygwin_util.h,v 1.7 2002/04/15 22:00:52 stevesk Exp $ */
2
1/* 3/*
2 *
3 * cygwin_util.c 4 * cygwin_util.c
4 * 5 *
5 * Author: Corinna Vinschen <vinschen@cygnus.com> 6 * Copyright (c) 2000, 2001, Corinna Vinschen <vinschen@cygnus.com>
6 * 7 *
7 * Copyright (c) 2000 Corinna Vinschen <vinschen@cygnus.com>, Duisburg, Germany 8 * Redistribution and use in source and binary forms, with or without
8 * All rights reserved 9 * modification, are permitted provided that the following conditions
10 * are met:
11 * 1. Redistributions of source code must retain the above copyright
12 * notice, this list of conditions and the following disclaimer.
13 * 2. Redistributions in binary form must reproduce the above copyright
14 * notice, this list of conditions and the following disclaimer in the
15 * documentation and/or other materials provided with the distribution.
16 *
17 * THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
18 * IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
19 * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
20 * IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
21 * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
22 * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
23 * DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
24 * THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
25 * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
26 * THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
9 * 27 *
10 * Created: Sat Sep 02 12:17:00 2000 cv 28 * Created: Sat Sep 02 12:17:00 2000 cv
11 * 29 *
@@ -13,8 +31,6 @@
13 * binary mode on Windows systems. 31 * binary mode on Windows systems.
14 */ 32 */
15 33
16/* $Id: bsd-cygwin_util.h,v 1.6 2001/12/29 03:08:30 djm Exp $ */
17
18#ifndef _BSD_CYGWIN_UTIL_H 34#ifndef _BSD_CYGWIN_UTIL_H
19#define _BSD_CYGWIN_UTIL_H 35#define _BSD_CYGWIN_UTIL_H
20 36