JehanneOS/mksh
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

unbreak MKSH_SMALL after x_histp related changes

Browse Source
This commit is contained in:
tg 2008-10-05 16:06:43 +00:00
parent 52339e8a77
commit 5d9e4c9e16
3 changed files with 24 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
check.t
View File

@ -1,4 +1,4 @@
# $MirOS: src/bin/mksh/check.t,v 1.227 2008/10/04 23:08:01 tg Exp $ # $MirOS: src/bin/mksh/check.t,v 1.228 2008/10/05 16:06:42 tg Exp $
# $OpenBSD: bksl-nl.t,v 1.2 2001/01/28 23:04:56 niklas Exp $ # $OpenBSD: bksl-nl.t,v 1.2 2001/01/28 23:04:56 niklas Exp $
# $OpenBSD: history.t,v 1.5 2001/01/28 23:04:56 niklas Exp $ # $OpenBSD: history.t,v 1.5 2001/01/28 23:04:56 niklas Exp $
# $OpenBSD: read.t,v 1.3 2003/03/10 03:48:16 david Exp $ # $OpenBSD: read.t,v 1.3 2003/03/10 03:48:16 david Exp $
@ -7,7 +7,7 @@
# http://www.research.att.com/~gsf/public/ifs.sh # http://www.research.att.com/~gsf/public/ifs.sh
expected-stdout: expected-stdout:
@(#)MIRBSD KSH R35 2008/10/04 @(#)MIRBSD KSH R35 2008/10/05
description: description:
Check version of shell. Check version of shell.
stdin: stdin:

40
edit.c
View File

@ -5,7 +5,7 @@
#include "sh.h" #include "sh.h"
__RCSID("$MirOS: src/bin/mksh/edit.c,v 1.136 2008/10/04 23:08:03 tg Exp $"); __RCSID("$MirOS: src/bin/mksh/edit.c,v 1.137 2008/10/05 16:06:43 tg Exp $");
/* tty driver characters we are interested in */ /* tty driver characters we are interested in */
typedef struct { typedef struct {
@ -28,25 +28,6 @@ X_chars edchars;
static int modified; /* buffer has been "modified" */ static int modified; /* buffer has been "modified" */
static char holdbuf[LINE]; /* place to hold last edit buffer */ static char holdbuf[LINE]; /* place to hold last edit buffer */
#ifdef MKSH_SMALL
static void x_modified(void);
static void
x_modified(void)
{
if (!modified) {
x_histp = histptr + 1;
modified = 1;
}
}
#else
#define x_modified() do { \
if (!modified) { \
x_histp = histptr + 1; \
modified = 1; \
} \
} while (/* CONSTCOND */ 0)
#endif
static int x_getc(void); static int x_getc(void);
static void x_putcf(int); static void x_putcf(int);
static bool x_mode(bool); static bool x_mode(bool);
@ -1421,6 +1402,25 @@ static struct x_defbindings const x_defbindings[] = {
{ XFUNC_edit_line, 2, 'e' } { XFUNC_edit_line, 2, 'e' }
}; };
#ifdef MKSH_SMALL
static void x_modified(void);
static void
x_modified(void)
{
if (!modified) {
x_histp = histptr + 1;
modified = 1;
}
}
#else
#define x_modified() do { \
if (!modified) { \
x_histp = histptr + 1; \
modified = 1; \
} \
} while (/* CONSTCOND */ 0)
#endif
static int static int
x_e_getmbc(char *sbuf) x_e_getmbc(char *sbuf)
{ {

4
sh.h
View File

@ -100,9 +100,9 @@
#define __SCCSID(x) __IDSTRING(sccsid,x) #define __SCCSID(x) __IDSTRING(sccsid,x)
#ifdef EXTERN #ifdef EXTERN
__RCSID("$MirOS: src/bin/mksh/sh.h,v 1.237 2008/10/04 23:08:04 tg Exp $"); __RCSID("$MirOS: src/bin/mksh/sh.h,v 1.238 2008/10/05 16:06:43 tg Exp $");
#endif #endif
#define MKSH_VERSION "R35 2008/10/04" #define MKSH_VERSION "R35 2008/10/05"
#ifndef MKSH_INCLUDES_ONLY #ifndef MKSH_INCLUDES_ONLY