[tarent-useful-scripts SCM] {wtf-mksh} branch master updated. mksh-56_wtf1-17-g3cd1ca7

mirabilos at evolvis.org mirabilos at evolvis.org
Tue Aug 29 16:39:36 CEST 2017 • <20170829143936.2B15C4A030B@evolvis.org>


This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "Supplemental git repository wtf-mksh for Evolvis project useful-scripts".

The branch, master has been updated
       via  3cd1ca700ad96ffc9c970bd006128d062f2188ff (commit)
       via  8be11301156205cc723bf37e706ad869a5569538 (commit)
       via  038ab5b9ce120bf88d8ca465b141da9e1887a16c (commit)
       via  70c6bf970c19c3dff857bdaf0f9acf86b95d5583 (commit)
       via  8658f05739a4fad3592796714029ddbf7c40d1b4 (commit)
       via  b17cc42044e5c713443c31062acff565b22051af (commit)
       via  cc9ea47b805206ad2203847291887509d86b798c (commit)
       via  2a874997f7856fa92353238764daa4041555a32d (commit)
       via  e52d1458da3aed905e2ca83f22c9faaf2a34a420 (commit)
       via  4d23a65454a9ae7d175c5647c321c56a4e0ce07d (commit)
       via  7cbce8f98edc000e346cd5dfb2fb5b21baa6ec72 (commit)
       via  c4acfa38ccf3f82226d630c87f687a478fc99b81 (commit)
       via  7656d3f02a38036b3a941848b03de73e1b3d707e (commit)
       via  3a4eaf6f5930231eb9d2b89e8b8533c62d469b7f (commit)
       via  53fbbc9693ef85a1dd7e139d729a9e08d174a043 (commit)
      from  2423541e47c2da2f3ccec24cf0879101f994b87d (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit 3cd1ca700ad96ffc9c970bd006128d062f2188ff
Author: mirabilos <t.glaser at tarent.de>
Date:   Tue Aug 29 16:32:20 2017 +0200

    bump

commit 8be11301156205cc723bf37e706ad869a5569538
Author: mirabilos <t.glaser at tarent.de>
Date:   Tue Aug 29 16:31:18 2017 +0200

    LC_CTYPE=C.UTF-8 is more reliable

commit 038ab5b9ce120bf88d8ca465b141da9e1887a16c
Merge: 70c6bf9 4d23a65
Author: mirabilos <t.glaser at tarent.de>
Date:   Tue Aug 29 16:29:37 2017 +0200

    Merge remote-tracking branch 'upstream/master'

commit 70c6bf970c19c3dff857bdaf0f9acf86b95d5583
Merge: 2423541 8658f05
Author: mirabilos <t.glaser at tarent.de>
Date:   Tue Aug 29 16:23:59 2017 +0200

    Merge branch 'master' of /home/tglase/mbsd/DEB/mksh/

commit 8658f05739a4fad3592796714029ddbf7c40d1b4
Author: mirabilos <m at mirbsd.org>
Date:   Tue Aug 29 16:11:57 2017 +0200

    bump policy

commit b17cc42044e5c713443c31062acff565b22051af
Author: mirabilos <m at mirbsd.org>
Date:   Tue Aug 29 16:11:13 2017 +0200

    bump

commit cc9ea47b805206ad2203847291887509d86b798c
Merge: e52d145 2a87499
Author: mirabilos <m at mirbsd.org>
Date:   Tue Aug 29 16:09:48 2017 +0200

    Merge tag 'mksh-56b'
    
    mksh-R56b.tgz

commit 2a874997f7856fa92353238764daa4041555a32d
Author: mirabilos <m at mirbsd.org>
Date:   Tue Aug 29 16:08:59 2017 +0200

    mksh-R56b.tgz

commit e52d1458da3aed905e2ca83f22c9faaf2a34a420
Author: mirabilos <m at mirbsd.org>
Date:   Tue Aug 29 16:06:12 2017 +0200

    ] conftest.c:6:5: note: in expansion of macro 'LARGE_OFF_T'

commit 4d23a65454a9ae7d175c5647c321c56a4e0ce07d
Author: tg <tg at mirbsd.org>
Date:   Tue Aug 29 13:38:31 2017 +0000

    monkey-patch offsetof for a klibc/dietlibc warning; bump to R56b (bugfixes)

commit 7cbce8f98edc000e346cd5dfb2fb5b21baa6ec72
Author: tg <tg at mirbsd.org>
Date:   Mon Aug 28 23:27:51 2017 +0000

    quell a Fink compiler warning; not entirely correct but no harm done either

commit c4acfa38ccf3f82226d630c87f687a478fc99b81
Author: tg <tg at mirbsd.org>
Date:   Sun Aug 27 23:33:50 2017 +0000

    unbreak vi mode '0' movement, bug introduced in r1.323
    reported by Larry Hynes <larry at larryhynes.com>

commit 7656d3f02a38036b3a941848b03de73e1b3d707e
Author: mirabilos <m at mirbsd.org>
Date:   Thu Aug 24 16:27:44 2017 +0200

    Since we use sensible-editor, might as well…

commit 3a4eaf6f5930231eb9d2b89e8b8533c62d469b7f
Author: tg <tg at mirbsd.org>
Date:   Wed Aug 16 21:40:14 2017 +0000

    fix documentation bug, thanks panpo and Riviera for spotting

commit 53fbbc9693ef85a1dd7e139d729a9e08d174a043
Author: tg <tg at mirbsd.org>
Date:   Thu Aug 10 19:25:12 2017 +0000

    we have a FAQ now! (well, two of them, different scope though)

-----------------------------------------------------------------------

Summary of changes:
 Build.sh         |  4 ++--
 Makefile         |  4 ++--
 check.t          |  6 +++---
 debian/.mkshrc   |  4 ++--
 debian/changelog | 20 ++++++++++++++++++++
 debian/control   |  2 +-
 debian/meat      |  1 +
 edit.c           |  6 +++---
 eval.c           |  4 ++--
 mksh.1           | 17 ++++++++++++-----
 sh.h             | 13 ++++++++++---
 11 files changed, 58 insertions(+), 23 deletions(-)

diff --git a/Build.sh b/Build.sh
index eaf27af..78fe347 100644
--- a/Build.sh
+++ b/Build.sh
@@ -1,5 +1,5 @@
 #!/bin/sh
-srcversion='$MirOS: src/bin/mksh/Build.sh,v 1.726 2017/08/07 20:40:56 tg Exp $'
+srcversion='$MirOS: src/bin/mksh/Build.sh,v 1.727 2017/08/29 13:38:28 tg Exp $'
 #-
 # Copyright (c) 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010,
 #		2011, 2012, 2013, 2014, 2015, 2016, 2017
@@ -2409,7 +2409,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=561
+add_cppflags -DMKSH_BUILD_R=562
 
 $e $bi$me: Finished configuration testing, now producing output.$ao
 
diff --git a/Makefile b/Makefile
index 7a014bf..ab625f2 100644
--- a/Makefile
+++ b/Makefile
@@ -1,4 +1,4 @@
-# $MirOS: src/bin/mksh/Makefile,v 1.161 2017/08/07 21:39:25 tg Exp $
+# $MirOS: src/bin/mksh/Makefile,v 1.162 2017/08/29 13:38:29 tg Exp $
 #-
 # Copyright (c) 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010,
 #		2011, 2012, 2013, 2014, 2015, 2016, 2017
@@ -58,7 +58,7 @@ CPPFLAGS+=	-DMKSH_ASSUME_UTF8 -DMKSH_DISABLE_DEPRECATED \
 		-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=561
+		-DHAVE_PERSISTENT_HISTORY=1 -DMKSH_BUILD_R=562
 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 21938e9..4473c08 100644
--- a/check.t
+++ b/check.t
@@ -1,4 +1,4 @@
-# $MirOS: src/bin/mksh/check.t,v 1.796 2017/08/08 21:11:18 tg Exp $
+# $MirOS: src/bin/mksh/check.t,v 1.797 2017/08/29 13:38:29 tg Exp $
 # -*- mode: sh -*-
 #-
 # Copyright © 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010,
@@ -30,7 +30,7 @@
 # (2013/12/02 20:39:44) http://cvsweb.openbsd.org/cgi-bin/cvsweb/src/regress/bin/ksh/?sortby=date
 
 expected-stdout:
-	@(#)MIRBSD KSH R56 2017/08/08
+	@(#)MIRBSD KSH R56 2017/08/29
 description:
 	Check base version of full shell
 stdin:
@@ -39,7 +39,7 @@ name: KSH_VERSION
 category: !shell:legacy-yes
 ---
 expected-stdout:
-	@(#)LEGACY KSH R56 2017/08/08
+	@(#)LEGACY KSH R56 2017/08/29
 description:
 	Check base version of legacy shell
 stdin:
diff --git a/debian/.mkshrc b/debian/.mkshrc
index e9cdc79..e580dcd 100644
--- a/debian/.mkshrc
+++ b/debian/.mkshrc
@@ -8,7 +8,7 @@ case ${KSH_VERSION:-} in
 esac				# }
 
 # customise your favourite editor here; first one found is used
-for EDITOR in "${EDITOR:-}" sensible-editor jupp jstar mcedit ed vi; do
+for EDITOR in "${EDITOR:-}" sensible-editor jupp jstar mcedit ed vi editor; do
 	EDITOR=$(\\builtin whence -p "$EDITOR") || EDITOR=
 	[[ -n $EDITOR && -x $EDITOR ]] && break
 	EDITOR=
@@ -41,7 +41,7 @@ PS1=$p$'\r${debian_chroot:+'$p$'\e[0;1m'$p'($debian_chroot)'$p$'\e[0m'$p'}'$PS1
 \\builtin unset LANGUAGE LC_ADDRESS LC_ALL LC_COLLATE LC_IDENTIFICATION LC_MONETARY \
     LC_NAME LC_NUMERIC LC_TELEPHONE LC_TIME
 p=en_GB.UTF-8
-\\builtin export LANG=C LC_CTYPE=$p LC_MEASUREMENT=$p LC_MESSAGES=$p LC_PAPER=$p
+\\builtin export LANG=C LC_CTYPE=C.UTF-8 LC_MEASUREMENT=$p LC_MESSAGES=$p LC_PAPER=$p
 
 # in either case: sync mksh UTF-8 mode to current locale (expected on GNU)
 \\builtin set -U; [[ ${LC_ALL:-${LC_CTYPE:-${LANG:-}}} = *[Uu][Tt][Ff]?(-)8* ]] || \\builtin set +U
diff --git a/debian/changelog b/debian/changelog
index c0cd76d..fa9b909 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+mksh (56b+wtf1) wtf; urgency=medium
+
+  * New release to match 56b-1 celebrating MirBSD’s 15ᵗʰ anniversary
+  * Setting LC_CTYPE=C.UTF-8 is more reliable in the general case
+
+ -- Thorsten Glaser <tg at mirbsd.de>  Tue, 29 Aug 2017 16:31:25 +0200
+
 mksh (56a+wtf1) wtf; urgency=medium
 
   * New release to match 56-1
@@ -437,6 +444,19 @@ mksh (50j20141215wtf1) wtf; urgency=high
 
  -- Thorsten Glaser <t.glaser at tarent.de>  Tue, 16 Dec 2014 16:38:09 +0100
 
+mksh (56b-1) unstable; urgency=medium
+
+  * Add $(which editor) to the fallback editor list, lowest priority
+  * New upstream bugfix-only release, celebrating 15 years of MirBSD:
+    - [tg] Reference the FAQ webpage
+    - [panpo, Riviera] Fix documentation bug wrt. Esc+Ctrl-L
+    - [tg, Larry Hynes] Fix “0” movement in vi mode
+    - [tg] Replace broken libcs’ offsetof macro with MirBSD’s
+  * Handle “note:” compiler output for mirtoconf consistently
+  * Bump S-V, no relevant changes
+
+ -- Thorsten Glaser <tg at mirbsd.de>  Tue, 29 Aug 2017 16:11:40 +0200
+
 mksh (56-1) unstable; urgency=medium
 
   * Upload to unstable
diff --git a/debian/control b/debian/control
index a1589e9..a7dba8b 100644
--- a/debian/control
+++ b/debian/control
@@ -20,7 +20,7 @@ Build-Depends: bsdmainutils, debhelper (>= 10), ed,
   locales [!avr32] | belocs-locales-bin [!avr32]
 # # hard to test against bug
 Build-Conflicts: dietlibc-dev (<< 0.33~cvs20111108-5~) [hppa]
-Standards-Version: 4.0.1
+Standards-Version: 4.1.0
 VCS-git: https://evolvis.org/anonscm/git/useful-scripts/wtf-mksh.git -b master
 VCS-Browser: https://evolvis.org/plugins/scmgit/cgi-bin/gitweb.cgi?p=useful-scripts/wtf-mksh.git;a=shortlog;h=refs/heads/master
 
diff --git a/debian/meat b/debian/meat
index 9d7cab1..70493ce 100644
--- a/debian/meat
+++ b/debian/meat
@@ -41,6 +41,7 @@ buildmeat() {
 	(set -x; env "$@"; echo $? >buildmeat.tmp) 2>&1 | sed \
 	    -e 's!conftest.c:\([0-9]*\(:[0-9]*\)*\): error:!cE(\1) -!g' \
 	    -e 's!conftest.c:\([0-9]*\(:[0-9]*\)*\): warning:!cW(\1) -!g' \
+	    -e 's!conftest.c:\([0-9]*\(:[0-9]*\)*\): note:!cN(\1) -!g' \
 
 	test -s buildmeat.tmp || return 255
 	return $(cat buildmeat.tmp)
diff --git a/edit.c b/edit.c
index 383e6c4..8bccf13 100644
--- a/edit.c
+++ b/edit.c
@@ -28,7 +28,7 @@
 
 #ifndef MKSH_NO_CMDLINE_EDITING
 
-__RCSID("$MirOS: src/bin/mksh/edit.c,v 1.339 2017/08/08 00:03:56 tg Exp $");
+__RCSID("$MirOS: src/bin/mksh/edit.c,v 1.340 2017/08/27 23:33:50 tg Exp $");
 
 /*
  * in later versions we might use libtermcap for this, but since external
@@ -3688,7 +3688,7 @@ vi_hook(int ch)
 				return (1);
 			cmdlen = 0;
 			argc1 = 0;
-			if (ctype(ch, C_DIGIT)) {
+			if (ctype(ch, C_DIGIT) && ord(ch) != ord('0')) {
 				argc1 = ksh_numdig(ch);
 				state = VARG1;
 			} else {
@@ -3743,7 +3743,7 @@ vi_hook(int ch)
 
 	case VEXTCMD:
 		argc2 = 0;
-		if (ctype(ch, C_DIGIT)) {
+		if (ctype(ch, C_DIGIT) && ord(ch) != ord('0')) {
 			argc2 = ksh_numdig(ch);
 			state = VARG2;
 			return (0);
diff --git a/eval.c b/eval.c
index 2a70e04..7a892c0 100644
--- a/eval.c
+++ b/eval.c
@@ -23,7 +23,7 @@
 
 #include "sh.h"
 
-__RCSID("$MirOS: src/bin/mksh/eval.c,v 1.214 2017/05/05 22:53:27 tg Exp $");
+__RCSID("$MirOS: src/bin/mksh/eval.c,v 1.215 2017/08/28 23:27:51 tg Exp $");
 
 /*
  * string expansion
@@ -637,7 +637,7 @@ expand(
 						 */
 						if (!Flag(FSH)) {
 							*dp++ = MAGIC;
-							*dp++ = 0x80 | '@';
+							*dp++ = ord(0x80 | '@');
 						}
 						break;
 					case ord('='):
diff --git a/mksh.1 b/mksh.1
index b805775..aa67ac9 100644
--- a/mksh.1
+++ b/mksh.1
@@ -1,4 +1,4 @@
-.\" $MirOS: src/bin/mksh/mksh.1,v 1.449 2017/08/07 21:16:32 tg Exp $
+.\" $MirOS: src/bin/mksh/mksh.1,v 1.451 2017/08/16 21:40:14 tg Exp $
 .\" $OpenBSD: ksh.1,v 1.160 2015/07/04 13:27:04 feinerer Exp $
 .\"-
 .\" Copyright © 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009,
@@ -76,7 +76,7 @@
 .\" with -mandoc, it might implement .Mx itself, but we want to
 .\" use our own definition. And .Dd must come *first*, always.
 .\"
-.Dd $Mdocdate: August 7 2017 $
+.Dd $Mdocdate: August 16 2017 $
 .\"
 .\" Check which macro package we use, and do other -mdoc setup.
 .\"
@@ -2091,7 +2091,7 @@ this hack; it's derived from the original
 which did print the delimiter character so you were out of luck
 if you did not have any non-printing characters.
 .Pp
-Since Backslashes and other special characters may be
+Since backslashes and other special characters may be
 interpreted by the shell, to set
 .Ev PS1
 either escape the backslash itself
@@ -2106,7 +2106,7 @@ in reverse video
 .Pq colour would work, too ,
 in the prompt string:
 .Bd -literal -offset indent
-x=$(print \e\e001)
+x=$(print \e\e001) # otherwise unused char
 PS1="$x$(print \e\er)$x$(tput so)$x\e$PWD$x$(tput se)$x\*(Gt "
 .Ed
 .Pp
@@ -5582,7 +5582,8 @@ Uppercase the first ASCII character in the next
 words, leaving the cursor past the end of the last word.
 .It clear\-screen: \*(ha[\*(haL
 Prints a compile-time configurable sequence to clear the screen and home
-the cursor, redraws the entire prompt and the currently edited input line.
+the cursor, redraws the last line of the prompt string and the currently
+edited input line.
 The default sequence works for almost all standard terminals.
 .It comment: \*(ha[#
 If the current line does not begin with a comment character, one is added at
@@ -6897,3 +6898,9 @@ commands starting with what was already entered.
 .Nm
 separates the shortcuts: Cursor Up goes up one command
 and PgUp searches the history as described above.
+.Ss "My question is not answered here!"
+Check
+.Pa http://www.mirbsd.org/mksh\-faq.htm
+which contains a collection of frequently asked questions about
+.Nm
+in general, for packagers, etc. while these above are in user scope.
diff --git a/sh.h b/sh.h
index 1f1adb4..88883cb 100644
--- a/sh.h
+++ b/sh.h
@@ -112,6 +112,13 @@
 #include <wchar.h>
 #endif
 
+/* monkey-patch known-bad offsetof versions to quell a warning */
+#if (defined(__KLIBC__) || defined(__dietlibc__)) && \
+    ((defined(__GNUC__) && (__GNUC__ > 3)) || defined(__NWCC__))
+#undef offsetof
+#define offsetof(s, e)		__builtin_offsetof(s, e)
+#endif
+
 #undef __attribute__
 #if HAVE_ATTRIBUTE_BOUNDED
 #define MKSH_A_BOUNDED(x,y,z)	__attribute__((__bounded__(x, y, z)))
@@ -175,9 +182,9 @@
 #endif
 
 #ifdef EXTERN
-__RCSID("$MirOS: src/bin/mksh/sh.h,v 1.840 2017/08/08 21:11:20 tg Exp $");
+__RCSID("$MirOS: src/bin/mksh/sh.h,v 1.841 2017/08/29 13:38:31 tg Exp $");
 #endif
-#define MKSH_VERSION "R56 2017/08/08"
+#define MKSH_VERSION "R56 2017/08/29"
 
 /* arithmetic types: C implementation */
 #if !HAVE_CAN_INTTYPES
@@ -636,7 +643,7 @@ char *ucstrstr(char *, const char *);
 #endif
 #endif
 
-#if (!defined(MKSH_BUILDMAKEFILE4BSD) && !defined(MKSH_BUILDSH)) || (MKSH_BUILD_R != 561)
+#if (!defined(MKSH_BUILDMAKEFILE4BSD) && !defined(MKSH_BUILDSH)) || (MKSH_BUILD_R != 562)
 #error Must run Build.sh to compile this.
 extern void thiswillneverbedefinedIhope(void);
 int


hooks/post-receive
-- 
Supplemental git repository wtf-mksh for Evolvis project useful-scripts
(Evolvis project useful-scripts repository wtf-mksh)


More information about the useful-scripts-commits mailing list