diff --git a/Build.sh b/Build.sh index fbea7db..6613d60 100644 --- a/Build.sh +++ b/Build.sh @@ -1,5 +1,5 @@ #!/bin/sh -srcversion='$MirOS: src/bin/mksh/Build.sh,v 1.660 2014/06/09 13:25:49 tg Exp $' +srcversion='$MirOS: src/bin/mksh/Build.sh,v 1.661 2014/06/24 20:47:40 tg Exp $' #- # Copyright (c) 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, # 2011, 2012, 2013, 2014 @@ -1782,7 +1782,7 @@ else #define EXTERN #define MKSH_INCLUDES_ONLY #include "sh.h" - __RCSID("$MirOS: src/bin/mksh/Build.sh,v 1.660 2014/06/09 13:25:49 tg Exp $"); + __RCSID("$MirOS: src/bin/mksh/Build.sh,v 1.661 2014/06/24 20:47:40 tg Exp $"); int main(void) { printf("Hello, World!\n"); return (isatty(0)); } EOF case $cm in @@ -2308,7 +2308,7 @@ addsrcs '!' HAVE_STRLCPY strlcpy.c addsrcs USE_PRINTF_BUILTIN printf.c test 1 = "$USE_PRINTF_BUILTIN" && add_cppflags -DMKSH_PRINTF_BUILTIN test 1 = "$HAVE_CAN_VERB" && CFLAGS="$CFLAGS -verbose" -add_cppflags -DMKSH_BUILD_R=500 +add_cppflags -DMKSH_BUILD_R=501 $e $bi$me: Finished configuration testing, now producing output.$ao diff --git a/Makefile b/Makefile index 32e0126..fd3bd20 100644 --- a/Makefile +++ b/Makefile @@ -1,4 +1,4 @@ -# $MirOS: src/bin/mksh/Makefile,v 1.134 2014/06/09 13:25:50 tg Exp $ +# $MirOS: src/bin/mksh/Makefile,v 1.135 2014/06/24 20:47:42 tg Exp $ #- # Copyright (c) 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, # 2011, 2012, 2013, 2014 @@ -55,7 +55,7 @@ CPPFLAGS+= -DMKSH_ASSUME_UTF8 -DMKSH_DISABLE_DEPRECATED \ -DHAVE_SETGROUPS=1 -DHAVE_STRERROR=0 -DHAVE_STRSIGNAL=0 \ -DHAVE_STRLCPY=1 -DHAVE_FLOCK_DECL=1 -DHAVE_REVOKE_DECL=1 \ -DHAVE_SYS_ERRLIST_DECL=1 -DHAVE_SYS_SIGLIST_DECL=1 \ - -DHAVE_PERSISTENT_HISTORY=1 -DMKSH_BUILD_R=500 + -DHAVE_PERSISTENT_HISTORY=1 -DMKSH_BUILD_R=501 CPPFLAGS+= -D${${PROG:L}_tf:C/(Mir${MAN:E}{0,1}){2}/4/:S/x/mksh_BUILD/:U} CPPFLAGS+= -I. COPTS+= -std=c89 -Wall diff --git a/check.t b/check.t index be6cdb6..007945a 100644 --- a/check.t +++ b/check.t @@ -1,4 +1,4 @@ -# $MirOS: src/bin/mksh/check.t,v 1.652 2014/06/10 22:17:07 tg Exp $ +# $MirOS: src/bin/mksh/check.t,v 1.653 2014/06/24 20:47:42 tg Exp $ # OpenBSD src/regress/bin/ksh updated: 2013/12/02 20:39:44 #- # Copyright © 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, @@ -27,7 +27,7 @@ # http://www.freebsd.org/cgi/cvsweb.cgi/src/tools/regression/bin/test/regress.sh?rev=HEAD expected-stdout: - @(#)MIRBSD KSH R50 2014/06/10 + @(#)MIRBSD KSH R50 2014/06/24 description: Check version of shell. stdin: @@ -36,7 +36,7 @@ name: KSH_VERSION category: shell:legacy-no --- expected-stdout: - @(#)LEGACY KSH R50 2014/06/10 + @(#)LEGACY KSH R50 2014/06/24 description: Check version of legacy shell. stdin: diff --git a/mksh.1 b/mksh.1 index e987dc1..19291ce 100644 --- a/mksh.1 +++ b/mksh.1 @@ -1,4 +1,4 @@ -.\" $MirOS: src/bin/mksh/mksh.1,v 1.335 2014/06/09 12:28:17 tg Exp $ +.\" $MirOS: src/bin/mksh/mksh.1,v 1.336 2014/06/24 20:47:44 tg Exp $ .\" $OpenBSD: ksh.1,v 1.152 2014/02/12 16:28:13 schwarze Exp $ .\"- .\" Copyright © 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, @@ -74,7 +74,7 @@ .\" with -mandoc, it might implement .Mx itself, but we want to .\" use our own definition. And .Dd must come *first*, always. .\" -.Dd $Mdocdate: June 9 2014 $ +.Dd $Mdocdate: June 24 2014 $ .\" .\" Check which macro package we use, and do other -mdoc setup. .\" @@ -6366,6 +6366,7 @@ contains the system and suid profile. .%O "ISBN 978\-0\-201\-56324\-5 (0\-201\-56324\-X)" .Re .Sh AUTHORS +.An -nosplit .Nm "The MirBSD Korn Shell" is developed by .An Thorsten Glaser Aq tg@mirbsd.org diff --git a/sh.h b/sh.h index db3a085..3a8c4b8 100644 --- a/sh.h +++ b/sh.h @@ -169,9 +169,9 @@ #endif #ifdef EXTERN -__RCSID("$MirOS: src/bin/mksh/sh.h,v 1.689 2014/06/24 18:51:37 tg Exp $"); +__RCSID("$MirOS: src/bin/mksh/sh.h,v 1.690 2014/06/24 20:47:47 tg Exp $"); #endif -#define MKSH_VERSION "R50 2014/06/10" +#define MKSH_VERSION "R50 2014/06/24" /* arithmetic types: C implementation */ #if !HAVE_CAN_INTTYPES @@ -533,7 +533,7 @@ char *ucstrstr(char *, const char *); #define mkssert(e) do { } while (/* CONSTCOND */ 0) #endif -#if (!defined(MKSH_BUILDMAKEFILE4BSD) && !defined(MKSH_BUILDSH)) || (MKSH_BUILD_R != 500) +#if (!defined(MKSH_BUILDMAKEFILE4BSD) && !defined(MKSH_BUILDSH)) || (MKSH_BUILD_R != 501) #error Must run Build.sh to compile this. extern void thiswillneverbedefinedIhope(void); int