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

mh… all I’m gonna hack on upstream today… fix -t for manpage generation and cleanup code snippets; bump vsn; sync clog

Browse Source
This commit is contained in:
tg
2012-06-26 19:33:33 +00:00
parent cbeac6b381
commit 1fa4453946
3 changed files with 17 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
Build.sh
View File

@@ -1,5 +1,5 @@
#!/bin/sh #!/bin/sh
srcversion='$MirOS: src/bin/mksh/Build.sh,v 1.575 2012/06/26 19:15:11 tg Exp $' srcversion='$MirOS: src/bin/mksh/Build.sh,v 1.576 2012/06/26 19:33:29 tg Exp $'
#- #-
# Copyright (c) 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, # Copyright (c) 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010,
# 2011, 2012 # 2011, 2012
@@ -58,9 +58,9 @@ vq() {
rmf() { rmf() {
for _f in "$@"; do for _f in "$@"; do
case ${_f} in case $_f in
mksh.1) ;; Build.sh|check.pl|check.t|dot.mkshrc|*.c|*.h|mksh.1) ;;
*) rm -f "${_f}" ;; *) rm -f "$_f" ;;
esac esac
done done
} }
@@ -439,7 +439,7 @@ oswarn=
ccpc=-Wc, ccpc=-Wc,
ccpl=-Wl, ccpl=-Wl,
tsts= tsts=
ccpr='|| for _f in ${tcfn}*; do test x"${_f}" = x"mksh.1" || rm -f "${_f}"; done' ccpr='|| for _f in ${tcfn}*; do case $_f in Build.sh|check.pl|check.t|dot.mkshrc|*.c|*.h|mksh.1) ;; *) rm -f "$_f" ;; esac; done'
# Evil hack # Evil hack
if test x"$TARGET_OS" = x"Android"; then if test x"$TARGET_OS" = x"Android"; then
@@ -1485,7 +1485,7 @@ else
#define EXTERN #define EXTERN
#define MKSH_INCLUDES_ONLY #define MKSH_INCLUDES_ONLY
#include "sh.h" #include "sh.h"
__RCSID("$MirOS: src/bin/mksh/Build.sh,v 1.575 2012/06/26 19:15:11 tg Exp $"); __RCSID("$MirOS: src/bin/mksh/Build.sh,v 1.576 2012/06/26 19:33:29 tg Exp $");
int main(void) { printf("Hello, World!\n"); return (0); } int main(void) { printf("Hello, World!\n"); return (0); }
EOF EOF
case $cm in case $cm in
@@ -2155,8 +2155,8 @@ esac
tcfn=$mkshexe tcfn=$mkshexe
test $cm = combine || v "$CC $CFLAGS $LDFLAGS -o $tcfn $lobjs $LIBS $ccpr" test $cm = combine || v "$CC $CFLAGS $LDFLAGS -o $tcfn $lobjs $LIBS $ccpr"
test -f $tcfn || exit 1 test -f $tcfn || exit 1
test 1 = $r || v "$NROFF -mdoc <'$srcdir/mksh.1' >mksh.cat1" || \ test 1 = $r || v "$NROFF -mdoc <'$srcdir/mksh.1' >$tfn.cat1" || \
rmf mksh.cat1 rmf $tfn.cat1
test 0 = $eq && v size $tcfn test 0 = $eq && v size $tcfn
i=install i=install
test -f /usr/ucb/$i && i=/usr/ucb/$i test -f /usr/ucb/$i && i=/usr/ucb/$i
@@ -2168,12 +2168,12 @@ $e "# grep -x /bin/$tfn /etc/shells >/dev/null || echo /bin/$tfn >>/etc/shells"
$e "# $i -c -o root -g bin -m 444 dot.mkshrc /usr/share/doc/mksh/examples/" $e "# $i -c -o root -g bin -m 444 dot.mkshrc /usr/share/doc/mksh/examples/"
$e $e
$e Installing the manual: $e Installing the manual:
if test -f mksh.cat1; then if test -f $tfn.cat1; then
$e "# $i -c -o root -g bin -m 444 mksh.cat1" \ $e "# $i -c -o root -g bin -m 444 $tfn.cat1" \
"/usr/share/man/cat1/mksh.0" "/usr/share/man/cat1/$tfn.0"
$e or $e or
fi fi
$e "# $i -c -o root -g bin -m 444 mksh.1 /usr/share/man/man1/mksh.1" $e "# $i -c -o root -g bin -m 444 mksh.1 /usr/share/man/man1/$tfn.1"
$e $e
$e Run the regression test suite: ./test.sh $e Run the regression test suite: ./test.sh
$e Please also read the sample file dot.mkshrc and the fine manual. $e Please also read the sample file dot.mkshrc and the fine manual.

6
check.t
View File

@@ -1,4 +1,4 @@
# $MirOS: src/bin/mksh/check.t,v 1.543 2012/06/26 18:11:01 tg Exp $ # $MirOS: src/bin/mksh/check.t,v 1.544 2012/06/26 19:33: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 $
@@ -29,7 +29,7 @@
# http://www.freebsd.org/cgi/cvsweb.cgi/src/tools/regression/bin/test/regress.sh?rev=HEAD # http://www.freebsd.org/cgi/cvsweb.cgi/src/tools/regression/bin/test/regress.sh?rev=HEAD
expected-stdout: expected-stdout:
@(#)MIRBSD KSH R40 2012/06/25 @(#)MIRBSD KSH R40 2012/06/26
description: description:
Check version of shell. Check version of shell.
stdin: stdin:
@@ -38,7 +38,7 @@ name: KSH_VERSION
category: shell:legacy-no category: shell:legacy-no
--- ---
expected-stdout: expected-stdout:
@(#)LEGACY KSH R40 2012/06/25 @(#)LEGACY KSH R40 2012/06/26
description: description:
Check version of legacy shell. Check version of legacy shell.
stdin: stdin:

4
sh.h
View File

@@ -157,9 +157,9 @@
#endif #endif
#ifdef EXTERN #ifdef EXTERN
__RCSID("$MirOS: src/bin/mksh/sh.h,v 1.563 2012/06/26 18:11:05 tg Exp $"); __RCSID("$MirOS: src/bin/mksh/sh.h,v 1.564 2012/06/26 19:33:33 tg Exp $");
#endif #endif
#define MKSH_VERSION "R40 2012/06/25" #define MKSH_VERSION "R40 2012/06/26"
/* arithmetic types: C implementation */ /* arithmetic types: C implementation */
#if !HAVE_CAN_INTTYPES #if !HAVE_CAN_INTTYPES