Skip to content

Commit

Permalink
Pull in updates from OpenBSD; fixes build with gcc-10.
Browse files Browse the repository at this point in the history
  • Loading branch information
@ibara
ibara committed Feb 15, 2020
1 parent f3bbc26 commit f3ed5a8
Show file tree
Hide file tree
Showing 5 changed files with 69 additions and 67 deletions.
92 changes: 46 additions & 46 deletions CVS/Entries
View file
Original file line number Diff line number Diff line change
@@ -1,54 +1,54 @@
/version.c/1.10/Thu Mar 19 21:22:15 2015//
/word.c/1.19/Sun Jan 3 04:14:49 2016//
/tags.c/1.16/Result of merge//
/Makefile/1.35/Thu Oct 3 02:58:58 2019//
/README/1.14/Thu Oct 3 02:58:58 2019//
/autoexec.c/1.17/Thu Oct 3 02:58:54 2019//
/basic.c/1.49/Thu Oct 3 02:58:58 2019//
/bell.c/1.5/Thu Oct 3 02:58:58 2019//
/buffer.c/1.107/Thu Oct 3 02:58:58 2019//
/chrdef.h/1.10/Thu Oct 3 02:58:54 2019//
/cinfo.c/1.18/Thu Oct 3 02:58:54 2019//
/cmode.c/1.17/Thu Oct 3 02:58:58 2019//
/cscope.c/1.18/Thu Oct 3 02:58:58 2019//
/def.h/1.165/Result of merge//
/dir.c/1.31/Thu Oct 3 02:58:58 2019//
/dired.c/1.93/Thu Oct 3 02:58:58 2019//
/display.c/1.48/Thu Oct 3 02:58:54 2019//
/echo.c/1.66/Thu Oct 3 02:58:54 2019//
/extend.c/1.71/Result of merge//
/file.c/1.102/Thu Oct 3 02:58:58 2019//
/fileio.c/1.106/Result of merge+Thu Oct 3 02:58:58 2019//
/funmap.c/1.59/Result of merge+Thu Oct 3 02:58:58 2019//
/funmap.h/1.8/Thu Oct 3 02:58:58 2019//
/grep.c/1.48/Thu Oct 3 02:58:58 2019//
/help.c/1.35/Thu Oct 3 02:58:54 2019//
/interpreter.c/1.5/Sat Jul 20 11:06:33 2019//
/kbd.c/1.33/Thu Oct 3 02:58:58 2019//
/kbd.h/1.19/Thu Oct 3 02:58:54 2019//
/key.h/1.6/Thu Oct 3 02:58:58 2019//
/keymap.c/1.58/Thu Oct 3 02:58:54 2019//
/line.c/1.61/Thu Oct 3 02:58:54 2019//
/log.c/1.11/Thu Jul 18 10:50:24 2019//
/log.h/1.5/Thu Jul 18 10:50:24 2019//
/macro.c/1.16/Thu Oct 3 02:58:54 2019//
/macro.h/1.7/Thu Oct 3 02:58:54 2019//
/main.c/1.87/Result of merge//
/match.c/1.21/Thu Oct 3 02:58:59 2019//
/mg.1/1.117/Thu Oct 3 02:58:59 2019//
/modes.c/1.21/Thu Oct 3 02:58:54 2019//
/paragraph.c/1.46/Thu Oct 3 02:58:54 2019//
/pathnames.h/1.1/Thu Oct 3 02:58:54 2019//
/re_search.c/1.33/Thu Oct 3 02:58:54 2019//
/region.c/1.38/Thu Oct 3 02:58:59 2019//
/search.c/1.47/Thu Oct 3 02:58:54 2019//
/spawn.c/1.12/Thu Oct 3 02:58:54 2019//
/tty.c/1.36/Thu Oct 3 02:58:54 2019//
/ttyio.c/1.38/Thu Oct 3 02:58:59 2019//
/ttykbd.c/1.19/Thu Oct 3 02:58:54 2019//
/tutorial/1.18/Thu Oct 3 02:58:54 2019//
/undo.c/1.58/Thu Oct 3 02:58:54 2019//
/util.c/1.42/Thu Oct 3 02:58:59 2019//
/window.c/1.36/Thu Oct 3 02:58:54 2019//
/yank.c/1.14/Thu Oct 3 02:58:54 2019//
/Makefile/1.35/Sat Feb 15 17:07:09 2020//
/README/1.14/Sat Feb 15 17:07:09 2020//
/autoexec.c/1.17/Sat Feb 15 17:07:00 2020//
/basic.c/1.49/Sat Feb 15 17:07:00 2020//
/bell.c/1.5/Sat Feb 15 17:07:00 2020//
/buffer.c/1.107/Sat Feb 15 17:07:00 2020//
/chrdef.h/1.10/Sat Feb 15 17:07:00 2020//
/cinfo.c/1.18/Sat Feb 15 17:07:00 2020//
/cmode.c/1.17/Sat Feb 15 17:07:00 2020//
/cscope.c/1.18/Sat Feb 15 17:07:00 2020//
/dir.c/1.31/Sat Feb 15 17:07:00 2020//
/dired.c/1.93/Sat Feb 15 17:07:00 2020//
/display.c/1.48/Sat Feb 15 17:07:00 2020//
/echo.c/1.66/Sat Feb 15 17:07:00 2020//
/file.c/1.102/Sat Feb 15 17:07:00 2020//
/funmap.h/1.8/Sat Feb 15 17:07:00 2020//
/grep.c/1.48/Sat Feb 15 17:07:00 2020//
/help.c/1.35/Sat Feb 15 17:07:00 2020//
/interpreter.c/1.5/Sat Feb 15 17:07:00 2020//
/kbd.c/1.34/Sat Feb 15 17:07:09 2020//
/kbd.h/1.19/Sat Feb 15 17:07:00 2020//
/key.h/1.6/Sat Feb 15 17:07:00 2020//
/keymap.c/1.58/Sat Feb 15 17:07:00 2020//
/line.c/1.61/Sat Feb 15 17:07:00 2020//
/log.c/1.11/Sat Feb 15 17:07:00 2020//
/log.h/1.5/Sat Feb 15 17:07:00 2020//
/macro.c/1.16/Sat Feb 15 17:07:00 2020//
/macro.h/1.7/Sat Feb 15 17:07:00 2020//
/match.c/1.21/Sat Feb 15 17:07:00 2020//
/mg.1/1.118/Sat Feb 15 17:07:09 2020//
/modes.c/1.21/Sat Feb 15 17:07:00 2020//
/paragraph.c/1.46/Sat Feb 15 17:07:00 2020//
/pathnames.h/1.1/Sat Feb 15 17:07:00 2020//
/re_search.c/1.33/Sat Feb 15 17:07:00 2020//
/region.c/1.38/Sat Feb 15 17:07:00 2020//
/search.c/1.47/Sat Feb 15 17:07:00 2020//
/spawn.c/1.12/Sat Feb 15 17:07:00 2020//
/tty.c/1.37/Sat Feb 15 17:07:09 2020//
/ttyio.c/1.38/Sat Feb 15 17:07:00 2020//
/ttykbd.c/1.19/Sat Feb 15 17:07:00 2020//
/tutorial/1.18/Sat Feb 15 17:07:00 2020//
/undo.c/1.58/Sat Feb 15 17:07:00 2020//
/util.c/1.42/Sat Feb 15 17:07:00 2020//
/window.c/1.36/Sat Feb 15 17:07:00 2020//
/yank.c/1.14/Sat Feb 15 17:07:00 2020//
/def.h/1.166/Sat Feb 15 17:08:22 2020//
D
20 changes: 8 additions & 12 deletions def.h
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
/* $OpenBSD: def.h,v 1.165 2019/07/18 10:55:11 lum Exp $ */
/* $OpenBSD: def.h,v 1.166 2020/02/09 10:13:13 florian Exp $ */

/* This file is in the public domain. */

Expand Down Expand Up @@ -342,7 +342,7 @@ void ttnowindow(void);
void ttcolor(int);
void ttresize(void);

volatile sig_atomic_t winch_flag;
extern volatile sig_atomic_t winch_flag;

/* ttyio.c */
void ttopen(void);
Expand Down Expand Up @@ -757,17 +757,13 @@ extern char cinfo[];
extern char *keystrings[];
extern char pat[NPAT];
extern char prompt[];

/*
* Globals.
*/
int tceeol;
int tcinsl;
int tcdell;
int rptcount; /* successive invocation count */
extern int tceeol;
extern int tcinsl;
extern int tcdell;
extern int rptcount; /* successive invocation count */

/*
* Extensions.
*/
extern int shownlprompt;
int togglenewlineprompt(int, int);
extern int shownlprompt;
int togglenewlineprompt(int, int);
12 changes: 6 additions & 6 deletions kbd.c
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
/* $OpenBSD: kbd.c,v 1.33 2019/07/03 18:11:07 lum Exp $ */
/* $OpenBSD: kbd.c,v 1.34 2020/02/09 10:13:13 florian Exp $ */

/* This file is in the public domain. */

Expand Down Expand Up @@ -26,13 +26,13 @@ char prompt[PROMPTL] = "", *promptp = prompt;

static int mgwrap(PF, int, int);

static int use_metakey = TRUE;
static int pushed = FALSE;
static int pushedc;
static int use_metakey = TRUE;
static int pushed = FALSE;
static int pushedc;

struct map_element *ele;

struct key key;
struct key key;
int rptcount;

/*
* Toggle the value of use_metakey
Expand Down
5 changes: 3 additions & 2 deletions mg.1
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
.\" $OpenBSD: mg.1,v 1.117 2019/07/02 16:25:39 lum Exp $
.\" $OpenBSD: mg.1,v 1.118 2019/11/08 19:54:40 solene Exp $
.\" This file is in the public domain.
.\"
.Dd $Mdocdate: July 2 2019 $
.Dd $Mdocdate: November 8 2019 $
.Dt MG 1
.Os
.Sh NAME
Expand Down Expand Up @@ -688,6 +688,7 @@ Bind a key mapping in the local (topmost) mode.
Unbind a key mapping in the local (topmost) mode.
.It make-backup-files
Toggle generation of backup files.
Enabled by default.
.It make-directory
Prompt the user for a path or directory name which is then created.
.It mark-paragraph
Expand Down
7 changes: 6 additions & 1 deletion tty.c
View file
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
/* $OpenBSD: tty.c,v 1.36 2015/11/18 18:44:50 jasper Exp $ */
/* $OpenBSD: tty.c,v 1.37 2020/02/09 10:13:13 florian Exp $ */

/* This file is in the public domain. */

Expand Down Expand Up @@ -45,6 +45,11 @@ static const char *scroll_fwd; /* How to scroll forward. */

static void winchhandler(int);

volatile sig_atomic_t winch_flag;
int tceeol;
int tcinsl;
int tcdell;

/* ARGSUSED */
static void
winchhandler(int sig)
Expand Down

0 comments on commit f3ed5a8

Please sign in to comment.