mksh R22d

This commit is contained in:
tg 2005-06-05 16:38:20 +00:00
parent 0ee7babfdf
commit 0df992276b
4 changed files with 14 additions and 14 deletions

View File

@ -1,5 +1,5 @@
#!/bin/sh
# $MirOS: src/bin/mksh/Build.sh,v 1.8 2005/06/05 16:34:59 tg Exp $
# $MirOS: src/bin/mksh/Build.sh,v 1.9 2005/06/05 16:38:19 tg Exp $
#-
# Recognised command line parameters and their defaults:
# CC gcc
@ -12,7 +12,7 @@
# Hints (don't take tgem seriously, WFM rather):
# GNU/Linux CPPFLAGS='-D_FILE_OFFSET_BITS=64'
# Mac OSX LDFLAGS=
# Solaris LDFLAGS=
# Solaris LDFLAGS=
SHELL="${SHELL:-/bin/sh}"
srcdir="${srcdir:-`dirname $0`}"

View File

@ -1,5 +1,5 @@
#!/usr/bin/perl
# $MirOS: src/bin/mksh/check.pl,v 1.3 2005/05/30 07:05:29 tg Exp $
# $MirOS: src/bin/mksh/check.pl,v 1.4 2005/06/05 16:38:19 tg Exp $
# $OpenBSD: th,v 1.11 2004/11/29 06:20:02 jsg Exp $
#-
# Test harness for pdksh tests.
@ -87,11 +87,11 @@
# newline in the file contents.
# The permissions, user and group fields
# may be * meaning accept any value.
# time-limit Time limit - the program is sent a
# time-limit Time limit - the program is sent a
# SIGKILL N seconds. Default is no
# limit.
# expected-fail 'yes' if the test is expected to fail.
# expected-exit expected exit code. Can be a number,
# expected-fail 'yes' if the test is expected to fail.
# expected-exit expected exit code. Can be a number,
# or a C expression using the variables
# e, s and w (exit code, termination
# signal, and status code).
@ -265,7 +265,7 @@ die "$prog: couldn't cd to $pwd - $!\n" if !chdir($pwd);
if (!$program_kludge) {
$test_prog = "$pwd/$test_prog" if substr($test_prog, 0, 1) ne '/';
die "$prog: $test_prog is not executable - bye\n"
if (! -x $test_prog && $os ne 'os2');
if (! -x $test_prog && $os ne 'os2');
}
@trap_sigs = ('TERM', 'QUIT', 'INT', 'PIPE', 'HUP');
@ -943,7 +943,7 @@ read_test
}
if ($field eq 'file-result') {
local($type, $perm, $uid, $gid, $matchType,
$rest, $c, $len, $name);
$rest, $c, $len, $name);
#
# format is: type perm uid gid matchType "name"
#

View File

@ -1,4 +1,4 @@
# $MirOS: src/bin/mksh/check.t,v 1.15 2005/05/28 21:02:02 tg Exp $
# $MirOS: src/bin/mksh/check.t,v 1.16 2005/06/05 16:38:19 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 $
@ -3734,5 +3734,5 @@ category: pdksh
stdin:
echo $KSH_VERSION
expected-stdout:
@(#)MIRBSD KSH R22 2005/05/28
@(#)MIRBSD KSH R22 2005/06/05
---

8
main.c
View File

@ -1,4 +1,4 @@
/** $MirOS: src/bin/mksh/main.c,v 1.9 2005/05/28 21:02:02 tg Exp $ */
/** $MirOS: src/bin/mksh/main.c,v 1.10 2005/06/05 16:38:20 tg Exp $ */
/* $OpenBSD: main.c,v 1.38 2005/03/30 17:16:37 deraadt Exp $ */
/* $OpenBSD: tty.c,v 1.8 2005/03/30 17:16:37 deraadt Exp $ */
/* $OpenBSD: io.c,v 1.21 2005/03/30 17:16:37 deraadt Exp $ */
@ -13,7 +13,9 @@
#include <time.h>
#endif
__RCSID("$MirOS: src/bin/mksh/main.c,v 1.9 2005/05/28 21:02:02 tg Exp $");
__RCSID("$MirOS: src/bin/mksh/main.c,v 1.10 2005/06/05 16:38:20 tg Exp $");
const char ksh_version[] = "@(#)MIRBSD KSH R22 2005/06/05";
extern char **environ;
@ -21,8 +23,6 @@ static void reclaim(void);
static void remove_temps(struct temp *tp);
static int is_restricted(char *name);
const char ksh_version[] = "@(#)MIRBSD KSH R22 2005/05/28";
static const char initifs[] = "IFS= \t\n";
static const char initsubs[] = "${PS2=> } ${PS3=#? } ${PS4=+ }";