release
authortg <tg@mirbsd.org>
Mon, 7 Aug 2017 21:39:26 +0000 (21:39 +0000)
committertg <tg@mirbsd.org>
Mon, 7 Aug 2017 21:39:26 +0000 (21:39 +0000)
Makefile
misc.c
sh.h

index 067b284..7a014bf 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -1,4 +1,4 @@
-# $MirOS: src/bin/mksh/Makefile,v 1.160 2017/04/28 11:13:45 tg Exp $
+# $MirOS: src/bin/mksh/Makefile,v 1.161 2017/08/07 21:39:25 tg Exp $
 #-
 # Copyright (c) 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010,
 #              2011, 2012, 2013, 2014, 2015, 2016, 2017
@@ -52,12 +52,13 @@ CPPFLAGS+=  -DMKSH_ASSUME_UTF8 -DMKSH_DISABLE_DEPRECATED \
                -DHAVE_SYS_SIGLIST=1 -DHAVE_FLOCK=1 -DHAVE_LOCK_FCNTL=1 \
                -DHAVE_GETRUSAGE=1 -DHAVE_GETSID=1 -DHAVE_GETTIMEOFDAY=1 \
                -DHAVE_KILLPG=1 -DHAVE_MEMMOVE=1 -DHAVE_MKNOD=0 -DHAVE_MMAP=1 \
-               -DHAVE_NICE=1 -DHAVE_REVOKE=1 -DHAVE_SETLOCALE_CTYPE=0 \
-               -DHAVE_LANGINFO_CODESET=0 -DHAVE_SELECT=1 -DHAVE_SETRESUGID=1 \
-               -DHAVE_SETGROUPS=1 -DHAVE_STRERROR=0 -DHAVE_STRSIGNAL=0 \
-               -DHAVE_STRLCPY=1 -DHAVE_FLOCK_DECL=1 -DHAVE_REVOKE_DECL=1 \
+               -DHAVE_FTRUNCATE=1 -DHAVE_NICE=1 -DHAVE_REVOKE=1 \
+               -DHAVE_SETLOCALE_CTYPE=0 -DHAVE_LANGINFO_CODESET=0 \
+               -DHAVE_SELECT=1 -DHAVE_SETRESUGID=1 -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=551
+               -DHAVE_PERSISTENT_HISTORY=1 -DMKSH_BUILD_R=561
 CPPFLAGS+=     -D${${PROG:L}_tf:C/(Mir${MAN:E}{0,1}){2}/4/:S/x/mksh_BUILD/:U}
 CPPFLAGS+=     -I.
 COPTS+=                -std=c89 -Wall
@@ -94,7 +95,7 @@ CLEANFILES+=  ${GENERATED}
 
 ${PROG} beforedepend: ${GENERATED}
 
-REGRESS_CATEGORIES:=shell:legacy-no,int:32,shell:ebcdic-no,shell:ascii-yes,shell:textmode-no,shell:binmode-yes,fastbox
+REGRESS_CATEGORIES:=shell:legacy-no,int:32,shell:textmode-no,shell:binmode-yes,fastbox
 .if !empty(GCEXTRA:M-DMKSH_FAUX_EBCDIC)
 REGRESS_CATEGORIES:=${REGRESS_CATEGORIES},shell:faux-ebcdic
 .endif
diff --git a/misc.c b/misc.c
index fe9d309..1205072 100644 (file)
--- a/misc.c
+++ b/misc.c
@@ -32,7 +32,7 @@
 #include <grp.h>
 #endif
 
-__RCSID("$MirOS: src/bin/mksh/misc.c,v 1.278 2017/08/07 20:49:41 tg Exp $");
+__RCSID("$MirOS: src/bin/mksh/misc.c,v 1.279 2017/08/07 21:39:25 tg Exp $");
 
 #define KSH_CHVT_FLAG
 #ifdef MKSH_SMALL
@@ -272,7 +272,7 @@ change_flag(enum sh_flag f, int what, bool newset)
                /* Turning on -o posix or -o sh? */
                Flag(FBRACEEXPAND) = 0;
                /* Turning on -o posix? */
-               if (f == POSIX) {
+               if (f == FPOSIX) {
                        /* C locale required for compliance */
                        UTFMODE = 0;
                }
diff --git a/sh.h b/sh.h
index a3ebe52..f7218f8 100644 (file)
--- a/sh.h
+++ b/sh.h
 #endif
 
 #ifdef EXTERN
-__RCSID("$MirOS: src/bin/mksh/sh.h,v 1.837 2017/07/26 23:02:27 tg Exp $");
+__RCSID("$MirOS: src/bin/mksh/sh.h,v 1.838 2017/08/07 21:39:26 tg Exp $");
 #endif
-#define MKSH_VERSION "R55 2017/07/26"
+#define MKSH_VERSION "R56 2017/08/07"
 
 /* arithmetic types: C implementation */
 #if !HAVE_CAN_INTTYPES
@@ -636,7 +636,7 @@ char *ucstrstr(char *, const char *);
 #endif
 #endif
 
-#if (!defined(MKSH_BUILDMAKEFILE4BSD) && !defined(MKSH_BUILDSH)) || (MKSH_BUILD_R != 551)
+#if (!defined(MKSH_BUILDMAKEFILE4BSD) && !defined(MKSH_BUILDSH)) || (MKSH_BUILD_R != 561)
 #error Must run Build.sh to compile this.
 extern void thiswillneverbedefinedIhope(void);
 int