diff -pruN 20210609-1/basic.c 20220614-1/basic.c --- 20210609-1/basic.c 2021-05-16 19:52:42.000000000 +0000 +++ 20220614-1/basic.c 2022-06-14 20:34:39.000000000 +0000 @@ -1,4 +1,4 @@ -/* $OpenBSD: basic.c,v 1.50 2021/02/27 13:24:52 lum Exp $ */ +/* $OpenBSD: basic.c,v 1.51 2022/05/24 16:42:19 op Exp $ */ /* This file is in the public domain */ @@ -536,7 +536,7 @@ gotoline(int f, int n) return (ABORT); n = (int)strtonum(buf, INT_MIN, INT_MAX, &err); if (err) - return(dobeep_msgs("Line number %s", err)); + return(dobeep_msgs("Line number", err)); } return(setlineno(n)); } diff -pruN 20210609-1/cmode.c 20220614-1/cmode.c --- 20210609-1/cmode.c 2021-05-16 19:52:42.000000000 +0000 +++ 20220614-1/cmode.c 2022-06-14 20:34:39.000000000 +0000 @@ -1,4 +1,4 @@ -/* $OpenBSD: cmode.c,v 1.17 2019/07/11 18:20:18 lum Exp $ */ +/* $OpenBSD: cmode.c,v 1.18 2022/05/24 16:24:31 op Exp $ */ /* * This file is in the public domain. * @@ -205,6 +205,8 @@ cc_lfindent(int f, int n) { if (n < 0) return (FALSE); + if (cc_strip_trailp) + (void)delwhite(FFRAND, 1); if (enewline(FFRAND, 1) == FALSE) return (FALSE); return (cc_indent(FFRAND, n)); diff -pruN 20210609-1/cscope.c 20220614-1/cscope.c --- 20210609-1/cscope.c 2021-05-16 19:52:42.000000000 +0000 +++ 20220614-1/cscope.c 2022-06-14 20:34:39.000000000 +0000 @@ -1,4 +1,4 @@ -/* $OpenBSD: cscope.c,v 1.20 2021/03/01 10:51:14 lum Exp $ */ +/* $OpenBSD: cscope.c,v 1.21 2022/05/24 16:42:19 op Exp $ */ /* * This file is in the public domain. @@ -185,9 +185,9 @@ cscreatelist(int f, int n) return (FALSE); if (stat(dir, &sb) == -1) - return(dobeep_msgs("stat: %s", strerror(errno))); + return(dobeep_msgs("stat:", strerror(errno))); else if (S_ISDIR(sb.st_mode) == 0) - return(dobeep_msgs("%s: Not a directory", dir)); + return(dobeep_msgs(dir, "Not a directory")); if (csexists("cscope-indexer") == FALSE) return(dobeep_msg("no such file or directory, cscope-indexer")); diff -pruN 20210609-1/CVS/Entries 20220614-1/CVS/Entries --- 20210609-1/CVS/Entries 2021-05-16 19:52:42.000000000 +0000 +++ 20220614-1/CVS/Entries 2022-06-14 20:34:39.000000000 +0000 @@ -1,54 +1,54 @@ -/tags.c/1.16/Result of merge// /undo.c/1.58/Tue Apr 10 04:57:08 2018// /Makefile/1.35/Result of merge// /fileio.c/1.108/Result of merge// /region.c/1.39/Result of merge// -/README/1.14/Wed Apr 14 01:24:37 2021// -/basic.c/1.50/Wed Apr 14 01:24:37 2021// -/buffer.c/1.112/Wed Apr 14 01:24:42 2021// -/chrdef.h/1.10/Wed Apr 14 01:24:37 2021// -/cinfo.c/1.18/Wed Apr 14 01:24:37 2021// -/cmode.c/1.17/Wed Apr 14 01:24:37 2021// -/cscope.c/1.20/Wed Apr 14 01:24:37 2021// -/dir.c/1.31/Wed Apr 14 01:24:37 2021// -/display.c/1.48/Wed Apr 14 01:24:37 2021// -/echo.c/1.68/Wed Apr 14 01:24:37 2021// -/file.c/1.102/Wed Apr 14 01:24:37 2021// -/funmap.h/1.8/Wed Apr 14 01:24:37 2021// -/grep.c/1.49/Wed Apr 14 01:24:37 2021// -/help.c/1.35/Wed Apr 14 01:24:37 2021// -/kbd.c/1.35/Wed Apr 14 01:24:37 2021// -/kbd.h/1.19/Wed Apr 14 01:24:37 2021// -/key.h/1.6/Wed Apr 14 01:24:37 2021// -/line.c/1.63/Wed Apr 14 01:24:37 2021// -/log.c/1.12/Wed Apr 14 01:24:37 2021// -/log.h/1.6/Wed Apr 14 01:24:37 2021// -/macro.c/1.16/Wed Apr 14 01:24:37 2021// -/macro.h/1.7/Wed Apr 14 01:24:37 2021// -/match.c/1.22/Wed Apr 14 01:24:37 2021// -/modes.c/1.21/Wed Apr 14 01:24:37 2021// -/paragraph.c/1.46/Wed Apr 14 01:24:37 2021// -/pathnames.h/1.1/Wed Apr 14 01:24:37 2021// -/search.c/1.47/Wed Apr 14 01:24:37 2021// -/spawn.c/1.12/Wed Apr 14 01:24:37 2021// -/tty.c/1.39/Wed Apr 14 01:24:42 2021// /ttyio.c/1.40/Result of merge// -/ttykbd.c/1.20/Wed Apr 14 01:24:37 2021// -/tutorial/1.18/Wed Apr 14 01:24:37 2021// -/util.c/1.43/Wed Apr 14 01:24:37 2021// -/version.c/1.10/Wed Apr 14 01:24:37 2021// -/window.c/1.36/Wed Apr 14 01:24:37 2021// -/word.c/1.19/Wed Apr 14 01:24:37 2021// -/yank.c/1.15/Wed Apr 14 01:24:37 2021// -/autoexec.c/1.18/Sun May 16 16:01:23 2021// -/bell.c/1.6/Sun May 16 16:01:23 2021// /def.h/1.176/Result of merge// /dired.c/1.100/Result of merge// -/extend.c/1.75/Sun May 16 16:01:23 2021// -/funmap.c/1.63/Sun May 16 16:01:23 2021// -/interpreter.c/1.32/Sun May 16 16:01:23 2021// -/keymap.c/1.59/Sun May 16 16:01:23 2021// /main.c/1.90/Result of merge// -/mg.1/1.125/Sun May 16 16:01:24 2021// /re_search.c/1.36/Result of merge// +/README/1.14/Sun Aug 1 20:42:15 2021// +/chrdef.h/1.10/Sun Aug 1 20:42:15 2021// +/cinfo.c/1.18/Sun Aug 1 20:42:15 2021// +/display.c/1.48/Sun Aug 1 20:42:15 2021// +/extend.c/1.75/Sun Aug 1 20:42:15 2021// +/file.c/1.102/Sun Aug 1 20:42:15 2021// +/funmap.h/1.8/Sun Aug 1 20:42:15 2021// +/kbd.h/1.19/Sun Aug 1 20:42:15 2021// +/key.h/1.6/Sun Aug 1 20:42:15 2021// +/macro.c/1.16/Sun Aug 1 20:42:15 2021// +/macro.h/1.7/Sun Aug 1 20:42:15 2021// +/modes.c/1.21/Sun Aug 1 20:42:15 2021// +/paragraph.c/1.46/Sun Aug 1 20:42:15 2021// +/pathnames.h/1.1/Sun Aug 1 20:42:15 2021// +/search.c/1.47/Sun Aug 1 20:42:15 2021// +/spawn.c/1.12/Sun Aug 1 20:42:15 2021// +/tutorial/1.18/Sun Aug 1 20:42:15 2021// +/version.c/1.10/Sun Aug 1 20:42:15 2021// +/window.c/1.36/Sun Aug 1 20:42:15 2021// +/word.c/1.19/Sun Aug 1 20:42:15 2021// +/autoexec.c/1.18/Sun Nov 21 22:19:09 2021// +/bell.c/1.6/Sun Nov 21 22:19:09 2021// +/buffer.c/1.112/Sun Nov 21 22:19:09 2021// +/dir.c/1.32/Sat Feb 12 21:09:39 2022// +/echo.c/1.68/Sun Nov 21 22:19:09 2021// +/funmap.c/1.63/Sun Nov 21 22:19:09 2021// +/grep.c/1.49/Sun Nov 21 22:19:09 2021// +/help.c/1.36/Sat Feb 12 21:09:39 2022// +/interpreter.c/1.34/Result of merge+Sat Feb 12 21:09:39 2022// +/kbd.c/1.35/Sun Nov 21 22:19:09 2021// +/keymap.c/1.59/Sun Nov 21 22:19:09 2021// +/line.c/1.63/Sun Nov 21 22:19:09 2021// +/log.c/1.12/Sun Nov 21 22:19:09 2021// +/log.h/1.6/Sun Nov 21 22:19:09 2021// +/match.c/1.22/Sun Nov 21 22:19:09 2021// +/tags.c/1.17/Result of merge// +/tty.c/1.39/Sun Nov 21 22:19:09 2021// +/ttykbd.c/1.20/Sun Nov 21 22:19:09 2021// +/yank.c/1.15/Sun Nov 21 22:19:09 2021// +/mg.1/1.126/Thu Mar 31 20:05:13 2022// +/basic.c/1.51/Sat Jun 11 23:27:52 2022// +/cmode.c/1.18/Sat Jun 11 23:27:52 2022// +/cscope.c/1.21/Sat Jun 11 23:27:52 2022// +/util.c/1.44/Sat Jun 11 23:27:52 2022// D diff -pruN 20210609-1/debian/changelog 20220614-1/debian/changelog --- 20210609-1/debian/changelog 2022-04-30 11:58:44.000000000 +0000 +++ 20220614-1/debian/changelog 2022-08-06 09:59:58.000000000 +0000 @@ -1,3 +1,10 @@ +mg (20220614-1) unstable; urgency=medium + + [ Harald Dunkel ] + * new upstream version 20220614 + + -- Tomasz Buchert Sat, 06 Aug 2022 11:59:58 +0200 + mg (20210609-1) unstable; urgency=medium * new upstream version 20210609 diff -pruN 20210609-1/dir.c 20220614-1/dir.c --- 20210609-1/dir.c 2021-05-16 19:52:42.000000000 +0000 +++ 20220614-1/dir.c 2022-06-14 20:34:39.000000000 +0000 @@ -1,4 +1,4 @@ -/* $OpenBSD: dir.c,v 1.31 2019/06/28 13:35:02 deraadt Exp $ */ +/* $OpenBSD: dir.c,v 1.32 2022/01/28 06:18:41 guenther Exp $ */ /* This file is in the public domain. */ @@ -86,7 +86,7 @@ getcwdir(char *buf, size_t len) return (TRUE); } -/* Create the directory and it's parents. */ +/* Create the directory and its parents. */ /* ARGSUSED */ int makedir(int f, int n) diff -pruN 20210609-1/extend.c 20220614-1/extend.c --- 20210609-1/extend.c 2021-05-16 19:52:42.000000000 +0000 +++ 20220614-1/extend.c 2022-06-14 20:34:39.000000000 +0000 @@ -695,7 +695,7 @@ excline(char *line, int llen, int lnum) char *argp = NULL; long nl; int bind; - KEYMAP *curmap; + KEYMAP *curmap = NULL; #define BINDARG 0 /* this arg is key to bind (local/global set key) */ #define BINDNO 1 /* not binding or non-quoted BINDARG */ #define BINDNEXT 2 /* next arg " (define-key) */ diff -pruN 20210609-1/fileio.c 20220614-1/fileio.c --- 20210609-1/fileio.c 2021-05-16 19:52:42.000000000 +0000 +++ 20220614-1/fileio.c 2022-06-14 20:34:39.000000000 +0000 @@ -350,7 +350,7 @@ startupfile(char *suffix, char *conffile goto nohome; if (conffile != NULL) { - (void)strncpy(file, conffile, NFILEN); + (void)strncpy(file, conffile, NFILEN - 1); } else if (suffix == NULL) { ret = snprintf(file, sizeof(file), _PATH_MG_STARTUP, home); if (ret < 0 || ret >= sizeof(file)) diff -pruN 20210609-1/.gitignore 20220614-1/.gitignore --- 20210609-1/.gitignore 2021-05-16 19:52:42.000000000 +0000 +++ 20220614-1/.gitignore 2022-06-14 20:34:39.000000000 +0000 @@ -1,3 +1,4 @@ packages *.o mg +mg-static/mg-* diff -pruN 20210609-1/help.c 20220614-1/help.c --- 20210609-1/help.c 2021-05-16 19:52:42.000000000 +0000 +++ 20220614-1/help.c 2022-06-14 20:34:39.000000000 +0000 @@ -1,4 +1,4 @@ -/* $OpenBSD: help.c,v 1.35 2015/03/19 21:22:15 bcallah Exp $ */ +/* $OpenBSD: help.c,v 1.36 2022/01/28 06:18:41 guenther Exp $ */ /* This file is in the public domain. */ @@ -97,7 +97,7 @@ found: /* * This function creates a table, listing all of the command * keys and their current bindings, and stores the table in the - * *help* pop-up buffer. This lets Mg produce it's own wall chart. + * *help* pop-up buffer. This lets Mg produce its own wall chart. */ /* ARGSUSED */ int diff -pruN 20210609-1/interpreter.c 20220614-1/interpreter.c --- 20210609-1/interpreter.c 2021-05-16 19:52:42.000000000 +0000 +++ 20220614-1/interpreter.c 2022-06-14 20:34:39.000000000 +0000 @@ -1,4 +1,4 @@ -/* $OpenBSD: interpreter.c,v 1.32 2021/05/12 11:13:23 lum Exp $ */ +/* $OpenBSD: interpreter.c,v 1.34 2022/01/28 06:18:41 guenther Exp $ */ /* * This file is in the public domain. * @@ -8,7 +8,7 @@ /* * This file attempts to add some 'scripting' functionality into mg. * - * The initial goal is to give mg the ability to use it's existing functions + * The initial goal is to give mg the ability to use its existing functions * and structures in a linked-up way. Hopefully resulting in user definable * functions. The syntax is 'scheme' like but currently it is not a scheme * interpreter. @@ -125,9 +125,9 @@ int foundparen(char *funstr, int llen, int lnum) { const char *lrp = NULL; - char *p, *begp = NULL, *endp = NULL, *prechr; + char *p, *begp = NULL, *endp = NULL, *prechr = NULL; char *lastchr = NULL; - int i, ret, pctr, expctr, blkid, inquote, esc; + int i, ret = 255, pctr, expctr, blkid, inquote, esc; int elen, spc, ns; pctr = expctr = inquote = esc = elen = spc = ns = 0; @@ -492,9 +492,8 @@ multiarg(char *cmdp, char *argbuf, int n if (!doregex(regs, argp)) { const char *errstr; - int iters; - iters = strtonum(argp, 0, INT_MAX, &errstr); + strtonum(argp, 0, INT_MAX, &errstr); if (errstr != NULL) return (dobeep_msgs("Var not found:", argp)); @@ -628,7 +627,7 @@ expandvals(char *cmdp, char *valp, char char *argp, *endp, *p, *v, *s = " "; char *regs; int spc, cnt; - int inlist, sizof, fin, inquote; + int sizof, fin, inquote; /* now find the first argument */ p = skipwhite(valp); @@ -637,7 +636,7 @@ expandvals(char *cmdp, char *valp, char return (dobeep_msg("strlcpy error")); argp = argbuf; spc = 1; /* initially fake a space so we find first argument */ - inlist = fin = inquote = cnt = spc = 0; + fin = inquote = cnt = spc = 0; for (p = argbuf; *p != '\0'; p++) { if (*(p + 1) == '\0') @@ -693,9 +692,8 @@ expandvals(char *cmdp, char *valp, char continue; } else { const char *errstr; - int iters; - iters = strtonum(argp, 0, INT_MAX, &errstr); + strtonum(argp, 0, INT_MAX, &errstr); if (errstr != NULL) return (dobeep_msgs("Var not found:", argp)); diff -pruN 20210609-1/main.c 20220614-1/main.c --- 20210609-1/main.c 2021-05-16 19:52:42.000000000 +0000 +++ 20220614-1/main.c 2022-06-14 20:34:39.000000000 +0000 @@ -19,6 +19,7 @@ #if HAVE_PTY_H #include +#include #elif HAVE_UTIL_H #include #endif diff -pruN 20210609-1/mg.1 20220614-1/mg.1 --- 20210609-1/mg.1 2021-05-16 19:52:42.000000000 +0000 +++ 20220614-1/mg.1 2022-06-14 20:34:39.000000000 +0000 @@ -1,7 +1,7 @@ -.\" $OpenBSD: mg.1,v 1.125 2021/05/02 14:13:17 lum Exp $ +.\" $OpenBSD: mg.1,v 1.126 2022/03/31 17:27:25 naddy Exp $ .\" This file is in the public domain. .\" -.Dd $Mdocdate: May 2 2021 $ +.Dd $Mdocdate: March 31 2022 $ .Dt MG 1 .Os .Sh NAME @@ -1044,7 +1044,7 @@ Replace the current dired buffer with an by the position of the cursor in the dired buffer. .It dired-find-file Open the file on the current line of the dired buffer. -If the cursor is on a directory it will be opened in dired mode. +If the cursor is on a directory, it will be opened in dired mode. .It dired-flag-file-deletion Flag the file listed on the current line for deletion. This is indicated in the buffer by putting a D at the left margin. diff -pruN 20210609-1/mg-static/generate-mg-static 20220614-1/mg-static/generate-mg-static --- 20210609-1/mg-static/generate-mg-static 1970-01-01 00:00:00.000000000 +0000 +++ 20220614-1/mg-static/generate-mg-static 2022-06-14 20:34:39.000000000 +0000 @@ -0,0 +1,87 @@ +#!/bin/sh + +# This Makefile has been written by Han Boetes +# and is released in Public Domain. + +isinpath () { + command -v $1 >&/dev/null +} + +for i in podman buildah; do + if ! isinpath $i; then + echo "$0: $i is a required dependency for this script" >&2 + EXIT=true + fi +done + +if [ "$EXIT" = true ]; then + exit 1 +fi + +usage() { + name=${0##*/} + cat << EOF >&2 +This script can build a static binary for mg, like this: +./$name tag -- build the latest tagged 64-bit version +./$name latest -- build the latest 64-bit version +./$name tag32 -- build the latest tagged 32-bit version +./$name latest32 -- build the latest 32-bit version +EOF + exit 1 +} + +case $1 in + latest|latest64) + ext=_64 + TCMD=':' + IMPTH=library + ;; + tag|tag64) + ext=_64 + TCMD='git tag|tail -n 1' + IMPTH=library + ;; + latest32) + ext= + TCMD=':' + IMPTH=i386 + ;; + tag32) + ext= + TCMD='git tag|tail -n 1' + IMPTH=i386 + ;; + *) + usage + ;; +esac + +# Create the Containerfile +cat << EOF > Containerfile +FROM docker.io/$IMPTH/alpine +RUN apk update +RUN apk add git libbsd-dev ncurses-dev musl-dev ncurses-static gcc make +RUN git clone https://github.com/hboetes/mg.git +WORKDIR mg +RUN TAG=\$($TCMD); \ + git checkout \$TAG; \ + make STATIC=1; \ + strip mg; \ + ln mg mg-\$TAG-static-x86$ext +EOF + + +cat << EOF > ./helper-script +#!/bin/sh +mnt=\$(podman image mount localhost/mg-static) +cp \$mnt/mg/mg-*static-x86* . +EOF +chmod 755 ./helper-script + +podman image rm localhost/mg-static +buildah build -f Containerfile -t mg-static +podman unshare ./helper-script + +# Clean up the mess +rm -f Containerfile helper-script +podman image rm localhost/mg-static diff -pruN 20210609-1/mg-static/README.md 20220614-1/mg-static/README.md --- 20210609-1/mg-static/README.md 1970-01-01 00:00:00.000000000 +0000 +++ 20220614-1/mg-static/README.md 2022-06-14 20:34:39.000000000 +0000 @@ -0,0 +1,3 @@ +generate-mg-static is a little helper script with which I generate static binararies for mg. + +Alas, it only works on Linux. diff -pruN 20210609-1/README.md 20220614-1/README.md --- 20210609-1/README.md 2021-05-16 19:52:42.000000000 +0000 +++ 20220614-1/README.md 2022-06-14 20:34:39.000000000 +0000 @@ -1,25 +1,25 @@ # PORTING MG AND USING LIBBSD I've maintained and ported mg for quite some time now and at first it -was easy recently it got harder and harder since it was a moving +was easy recently it got harder and harder, since it was a moving target. Especially the inclusion of some system specific libraries since about 2 years ago made it too much of an effort for my humble coding skills. So recently Jasper Lievisse Adriaanse asked me to try it again and I restarted working on the project and ran into exactly the same problems -again. While googling for solutions I ran into libbsd: +again. While googling for solutions, I ran into libbsd: http://libbsd.freedesktop.org/wiki/ -It's a porting library for OpenBSD code! And after installing that it +It's a porting library for OpenBSD code! And after installing that, it was a piece of pie to get mg ported again. ## PORTING TO ALL OTHER PLATFORMS -Okay, that was debian. Now I have to get the rest of all the previously +Okay, that was Debian. Now I have to get the rest of all the previously supported platforms working again. All help is welcome and as always: -Please provide patches that do not break stuff for other platforms. +Please provide patches, that do not break stuff for other platforms. ## BUILDING MG @@ -50,7 +50,7 @@ sudo make install *Kudos to Leonid Bobrov(@mazocomp) for adding CMAKE support.* -## STATIC BUILDS +## STATIC BUILDS (on Linux) I recently figured out how to make really portable static builds: On an alpine linux system, build with the command: @@ -60,12 +60,15 @@ make STATIC=yesplease glibc does not really support static binaries. https://www.musl-libc.org/ does not have this problem. +To make building static binaries more easy, check the mg-static directory, there +is a script which can build static binaries with support of podman and buildah. + ## USING CVS -This code is the cvs checkout from the OpenBSD project so if you install +This code is the cvs checkout from the OpenBSD project, so if you install cvs you can see what I changed to port mg. Like this: ``` -cvs diff -uw +CVS_RSH=ssh cvs diff -uw ``` diff -pruN 20210609-1/tags.c 20220614-1/tags.c --- 20210609-1/tags.c 2021-05-16 19:52:42.000000000 +0000 +++ 20220614-1/tags.c 2022-06-14 20:34:39.000000000 +0000 @@ -1,4 +1,4 @@ -/* $OpenBSD: tags.c,v 1.16 2017/08/06 04:39:45 bcallah Exp $ */ +/* $OpenBSD: tags.c,v 1.17 2022/01/28 06:18:41 guenther Exp $ */ /* * This file is in the public domain. @@ -460,7 +460,7 @@ curtoken(int f, int n, char *token) /* Underscore character is to be treated as "inword" while * processing tokens unlike mg's default word traversal. Save - * and restore it's cinfo value so that tag matching works for + * and restore its cinfo value so that tag matching works for * identifier with underscore. */ c = cinfo['_']; diff -pruN 20210609-1/util.c 20220614-1/util.c --- 20210609-1/util.c 2021-05-16 19:52:42.000000000 +0000 +++ 20220614-1/util.c 2022-06-14 20:34:39.000000000 +0000 @@ -1,4 +1,4 @@ -/* $OpenBSD: util.c,v 1.43 2021/03/01 10:51:14 lum Exp $ */ +/* $OpenBSD: util.c,v 1.44 2022/05/24 16:24:31 op Exp $ */ /* This file is in the public domain. */ @@ -373,6 +373,7 @@ lfindent(int f, int n) nicol |= 0x07; ++nicol; } + (void)delwhite(FFRAND, 1); if (lnewline() == FALSE || (( #ifdef NOTAB curbp->b_flag & BFNOTAB) ? linsert(nicol, ' ') == FALSE : ( diff -pruN 20210609-1/version.c 20220614-1/version.c --- 20210609-1/version.c 2021-05-16 19:52:42.000000000 +0000 +++ 20220614-1/version.c 2022-06-14 20:34:39.000000000 +0000 @@ -13,7 +13,7 @@ #include "def.h" -const char version[] = "Mg 2a"; +const char version[] = "Mg 2a (hboetes-20220212)"; /* * Display the version. All this does