diff options
Diffstat (limited to 'usr.bin/patch')
| -rw-r--r-- | usr.bin/patch/README | 19 | ||||
| -rw-r--r-- | usr.bin/patch/patch.c | 23 |
2 files changed, 36 insertions, 6 deletions
diff --git a/usr.bin/patch/README b/usr.bin/patch/README index 5bd4744802a..72c10644d17 100644 --- a/usr.bin/patch/README +++ b/usr.bin/patch/README @@ -50,8 +50,23 @@ bug-gnu-utils@prep.ai.mit.edu as well as to Larry Wall (lwall@netlabs.com). Copyright (c) 1988, Larry Wall -You may copy the patch kit in whole or in part as long as you don't try to -make money off it, or pretend that you wrote it. +Redistribution and use in source and binary forms, with or without +modification, are permitted provided that the following condition +is met: + 1. Redistributions of source code must retain the above copyright + notice, this condition and the following disclaimer. + +THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND +ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE +IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE +ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS 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. -------------------------------------------------------------------------- Please read all the directions below before you proceed any further, and diff --git a/usr.bin/patch/patch.c b/usr.bin/patch/patch.c index e5a75225391..75a33895a86 100644 --- a/usr.bin/patch/patch.c +++ b/usr.bin/patch/patch.c @@ -1,18 +1,33 @@ -/* $OpenBSD: patch.c,v 1.13 1999/12/04 01:01:06 provos Exp $ */ +/* $OpenBSD: patch.c,v 1.14 2002/03/05 08:56:55 niklas Exp $ */ /* patch - a program to apply diffs to original files * * Copyright 1986, Larry Wall * - * This program may be copied as long as you don't try to make any - * money off of it, or pretend that you wrote it. + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following condition + * is met: + * 1. Redistributions of source code must retain the above copyright + * notice, this condition and the following disclaimer. + * + * THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND + * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE + * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE + * ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS 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. * * -C option added in 1998, original code by Marc Espie, * based on FreeBSD behaviour */ #ifndef lint -static char rcsid[] = "$OpenBSD: patch.c,v 1.13 1999/12/04 01:01:06 provos Exp $"; +static char rcsid[] = "$OpenBSD: patch.c,v 1.14 2002/03/05 08:56:55 niklas Exp $"; #endif /* not lint */ #include "INTERN.h" |