JehanneOS/mksh
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

even better on Haiku:

Browse Source 
* let ulimits work
* add a Haiku-specific ulimit
* always use UTF-8, they have no locales but a UTF-8 terminal
This commit is contained in:
tg
2010-03-14 11:58:33 +00:00
parent e0f952eeda
commit 50f081c369
4 changed files with 16 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
Build.sh
View File

@ -1,5 +1,5 @@
#!/bin/sh #!/bin/sh
srcversion='$MirOS: src/bin/mksh/Build.sh,v 1.445 2010/03/14 11:56:07 tg Exp $' srcversion='$MirOS: src/bin/mksh/Build.sh,v 1.446 2010/03/14 11:58:29 tg Exp $'
#- #-
# Copyright (c) 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010 # Copyright (c) 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010
# Thorsten Glaser <tg@mirbsd.org> # Thorsten Glaser <tg@mirbsd.org>
@ -361,7 +361,7 @@ AIX)
CPPFLAGS="$CPPFLAGS -D_ALL_SOURCE" CPPFLAGS="$CPPFLAGS -D_ALL_SOURCE"
: ${HAVE_SETLOCALE_CTYPE=0} : ${HAVE_SETLOCALE_CTYPE=0}
;; ;;
BeOS|Haiku) BeOS)
oswarn=' and will currently not work' oswarn=' and will currently not work'
;; ;;
BSD/OS) BSD/OS)
@ -383,6 +383,9 @@ GNU)
GNU/kFreeBSD) GNU/kFreeBSD)
CPPFLAGS="$CPPFLAGS -D_GNU_SOURCE" CPPFLAGS="$CPPFLAGS -D_GNU_SOURCE"
;; ;;
Haiku)
CPPFLAGS="$CPPFLAGS -DMKSH_ASSUME_UTF8"
;;
HP-UX) HP-UX)
;; ;;
Interix) Interix)

9
check.t
View File

@ -1,4 +1,4 @@
# $MirOS: src/bin/mksh/check.t,v 1.366 2010/03/01 17:28:05 tg Exp $ # $MirOS: src/bin/mksh/check.t,v 1.367 2010/03/14 11:58:30 tg Exp $
# $OpenBSD: bksl-nl.t,v 1.2 2001/01/28 23:04:56 niklas 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: 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 $ # $OpenBSD: read.t,v 1.3 2003/03/10 03:48:16 david Exp $
@ -25,7 +25,7 @@
# http://www.research.att.com/~gsf/public/ifs.sh # http://www.research.att.com/~gsf/public/ifs.sh
expected-stdout: expected-stdout:
@(#)MIRBSD KSH R39 2010/02/25 @(#)MIRBSD KSH R39 2010/03/14
description: description:
Check version of shell. Check version of shell.
stdin: stdin:
@ -6342,8 +6342,9 @@ name: ulimit-1
description: description:
Check if we can use a specific syntax idiom for ulimit Check if we can use a specific syntax idiom for ulimit
stdin: stdin:
if ! x=$(ulimit -d); then if ! x=$(ulimit -d) || [[ $x = unknown ]]; then
echo expected to fail on this OS #echo expected to fail on this OS
echo okay
else else
ulimit -dS $x && echo okay ulimit -dS $x && echo okay
fi fi

5
funcs.c
View File

@ -25,7 +25,7 @@
#include "sh.h" #include "sh.h"
__RCSID("$MirOS: src/bin/mksh/funcs.c,v 1.151 2010/02/23 18:13:03 tg Exp $"); __RCSID("$MirOS: src/bin/mksh/funcs.c,v 1.152 2010/03/14 11:58:32 tg Exp $");
#if HAVE_KILLPG #if HAVE_KILLPG
/* /*
@ -3161,6 +3161,9 @@ c_ulimit(const char **wp)
#endif #endif
#ifdef RLIMIT_TIME #ifdef RLIMIT_TIME
{ "humantime(seconds)", RLIMIT_TIME, 1, 'T' }, { "humantime(seconds)", RLIMIT_TIME, 1, 'T' },
#endif
#ifdef RLIMIT_NOVMON
{ "vnodemonitors", RLIMIT_NOVMON, 1, 'V' },
#endif #endif
{ NULL, 0, 0, 0 } { NULL, 0, 0, 0 }
}; };

4
sh.h
View File

@ -150,9 +150,9 @@
#endif #endif
#ifdef EXTERN #ifdef EXTERN
__RCSID("$MirOS: src/bin/mksh/sh.h,v 1.383 2010/02/25 20:18:17 tg Exp $"); __RCSID("$MirOS: src/bin/mksh/sh.h,v 1.384 2010/03/14 11:58:33 tg Exp $");
#endif #endif
#define MKSH_VERSION "R39 2010/02/25" #define MKSH_VERSION "R39 2010/03/14"
#ifndef MKSH_INCLUDES_ONLY #ifndef MKSH_INCLUDES_ONLY