From daa40b4e454bc3a38ddd65f4bba24e8ff924c7fa Mon Sep 17 00:00:00 2001 From: tg Date: Fri, 26 May 2006 23:36:19 +0000 Subject: [PATCH] this is mksh R27, tested on * MirOS HEAD (i386, gcc 3.4) * Debian GNU/Linux 3.1 (i386, gcc 3.3) * Interix 3.5 (i386, gcc 3.3) - perl too old for regression tests * GNU/Cygwin 2006-03-* (i386, gcc 3.4) - no perl installed * Solaris 8 (sparc64, gcc 3.4) no testing been done on * Mac * other BSDs * gcc 4.1.1 * Solaris 10 because I asked for community feedback but... --- check.t | 4 ++-- copyright | 12 +++--------- main.c | 4 ++-- 3 files changed, 7 insertions(+), 13 deletions(-) diff --git a/check.t b/check.t index 6659817..093dbbf 100644 --- a/check.t +++ b/check.t @@ -1,4 +1,4 @@ -# $MirOS: src/bin/mksh/check.t,v 1.40 2006/05/10 19:30:32 tg Exp $ +# $MirOS: src/bin/mksh/check.t,v 1.41 2006/05/26 23:36:18 tg Exp $ # $OpenBSD: bksl-nl.t,v 1.2 2001/01/28 23:04:56 niklas Exp $ # $OpenBSD: history.t,v 1.5 2001/01/28 23:04:56 niklas Exp $ # $OpenBSD: read.t,v 1.3 2003/03/10 03:48:16 david Exp $ @@ -3769,5 +3769,5 @@ category: pdksh stdin: echo $KSH_VERSION expected-stdout: - @(#)MIRBSD KSH R27 2006/05/10 + @(#)MIRBSD KSH R27 2006/05/26 --- diff --git a/copyright b/copyright index 64187dd..deeb62d 100644 --- a/copyright +++ b/copyright @@ -1,4 +1,4 @@ -$MirOS: src/bin/mksh/copyright,v 1.11 2006/01/30 12:39:14 tg Exp $ +$MirOS: src/bin/mksh/copyright,v 1.12 2006/05/26 23:36:19 tg Exp $ mksh is a collective work under the following licence: @@ -28,11 +28,5 @@ mksh is a collective work under the following licence: The author recognises the contributions of the pdksh authors who have dedicated their work into the Public Domain. -The file "alloc.c" is covered by a 2-clause UCB-style BSD licence in- -stead, please look at the file for the complete terms. - -On systems which use the GNU libc, an additional file (strlfun.c) has -to be built. It is covered by the ISC/OpenBSD licence. - -On GNU/Cygwin, GNU/Linux, Solaris, mksh builds setmode.c which is co- -vered by a three-clause UCB licence. +The files "alloc.c" (always), "strlfun.c", "setmode.c" (portable) are +covered by different BSD-style licences, see the files for details. diff --git a/main.c b/main.c index 1a8dbeb..aed488a 100644 --- a/main.c +++ b/main.c @@ -6,9 +6,9 @@ #define EXTERN /* define EXTERNs in sh.h */ #include "sh.h" -__RCSID("$MirOS: src/bin/mksh/main.c,v 1.37 2006/05/10 19:30:33 tg Exp $"); +__RCSID("$MirOS: src/bin/mksh/main.c,v 1.38 2006/05/26 23:36:19 tg Exp $"); -#define MKSH_VERSION "@(#)MIRBSD KSH R27 2006/05/10" +#define MKSH_VERSION "@(#)MIRBSD KSH R27 2006/05/26" extern char **environ;