fix English (thanks to Andreas Buschka); TIL:
• to start ⇒ a start • to begin ⇒ a beginning
This commit is contained in:
tg
parent
a838564cec
commit
d18f9133c8
8
Build.sh
8
Build.sh
|
|
@ -1,5 +1,5 @@
|
|||
#!/bin/sh
|
||||
srcversion='$MirOS: src/bin/mksh/Build.sh,v 1.704 2016/08/25 16:21:28 tg Exp $'
|
||||
srcversion='$MirOS: src/bin/mksh/Build.sh,v 1.705 2016/09/01 12:59:04 tg Exp $'
|
||||
#-
|
||||
# Copyright (c) 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010,
|
||||
# 2011, 2012, 2013, 2014, 2015, 2016
|
||||
|
|
@ -120,7 +120,7 @@ do_genopt() {
|
|||
state=3
|
||||
;;
|
||||
1:@@)
|
||||
# begin of data block
|
||||
# start of data block
|
||||
o_gen=$o_gen$nl"#endif"
|
||||
o_gen=$o_gen$nl"#ifndef F0"
|
||||
o_gen=$o_gen$nl"#define F0 FN"
|
||||
|
|
@ -133,7 +133,7 @@ do_genopt() {
|
|||
o_hdr=$o_hdr$nl$line
|
||||
;;
|
||||
0:@*|1:@*)
|
||||
# begin of a definition block
|
||||
# start of a definition block
|
||||
sym=`echo "$line" | sed 's/^@//'`
|
||||
if test $state = 0; then
|
||||
o_gen=$o_gen$nl"#if defined($sym)"
|
||||
|
|
@ -980,7 +980,7 @@ drop us a success or failure notice or even send in diffs.
|
|||
$e "$bi$me: Building the MirBSD Korn Shell$ao $ui$dstversion$ao on $TARGET_OS ${TARGET_OSREV}..."
|
||||
|
||||
#
|
||||
# Begin of mirtoconf checks
|
||||
# Start of mirtoconf checks
|
||||
#
|
||||
$e $bi$me: Scanning for functions... please ignore any errors.$ao
|
||||
|
||||
|
|
|
|||
10
check.t
10
check.t
|
|
@ -1,4 +1,4 @@
|
|||
# $MirOS: src/bin/mksh/check.t,v 1.752 2016/08/25 16:21:30 tg Exp $
|
||||
# $MirOS: src/bin/mksh/check.t,v 1.753 2016/09/01 12:59:05 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 R53 2016/08/25
|
||||
@(#)MIRBSD KSH R53 2016/09/01
|
||||
description:
|
||||
Check version of shell.
|
||||
stdin:
|
||||
|
|
@ -39,7 +39,7 @@ name: KSH_VERSION
|
|||
category: shell:legacy-no
|
||||
---
|
||||
expected-stdout:
|
||||
@(#)LEGACY KSH R53 2016/08/25
|
||||
@(#)LEGACY KSH R53 2016/09/01
|
||||
description:
|
||||
Check version of legacy shell.
|
||||
stdin:
|
||||
|
|
@ -11754,7 +11754,7 @@ stdin:
|
|||
echo "before: x<$x> y<$y> z<$z> R<$REPLY>"
|
||||
x=${|
|
||||
local y
|
||||
echo "begin: x<$x> y<$y> z<$z> R<$REPLY>"
|
||||
echo "start: x<$x> y<$y> z<$z> R<$REPLY>"
|
||||
x=5
|
||||
y=6
|
||||
z=7
|
||||
|
|
@ -11769,7 +11769,7 @@ stdin:
|
|||
echo ${|true;}$(true).
|
||||
expected-stdout:
|
||||
before: x<1> y<2> z<3> R<4>
|
||||
begin: x<1> y<> z<3> R<>
|
||||
start: x<1> y<> z<3> R<>
|
||||
end: x<5> y<6> z<7> R<8>
|
||||
after: x<8> y<2> z<7> R<4>
|
||||
typeset t=$'foo\n\n'
|
||||
|
|
|
|||
18
edit.c
18
edit.c
|
|
@ -28,7 +28,7 @@
|
|||
|
||||
#ifndef MKSH_NO_CMDLINE_EDITING
|
||||
|
||||
__RCSID("$MirOS: src/bin/mksh/edit.c,v 1.306 2016/08/01 18:42:40 tg Exp $");
|
||||
__RCSID("$MirOS: src/bin/mksh/edit.c,v 1.307 2016/09/01 12:59:08 tg Exp $");
|
||||
|
||||
/*
|
||||
* in later versions we might use libtermcap for this, but since external
|
||||
|
|
@ -1048,7 +1048,7 @@ static struct x_defbindings const x_defbindings[] = {
|
|||
{ XFUNC_end_hist, 1, '>' },
|
||||
{ XFUNC_goto_hist, 1, 'g' },
|
||||
{ XFUNC_mv_end, 0, CTRL('E') },
|
||||
{ XFUNC_mv_begin, 0, CTRL('A') },
|
||||
{ XFUNC_mv_beg, 0, CTRL('A') },
|
||||
{ XFUNC_draw_line, 0, CTRL('L') },
|
||||
{ XFUNC_cls, 1, CTRL('L') },
|
||||
{ XFUNC_meta1, 0, CTRL('[') },
|
||||
|
|
@ -1106,8 +1106,8 @@ static struct x_defbindings const x_defbindings[] = {
|
|||
{ XFUNC_mv_back, 2, 'D' },
|
||||
#ifndef MKSH_SMALL
|
||||
{ XFUNC_vt_hack, 2, '1' },
|
||||
{ XFUNC_mv_begin | 0x80, 2, '7' },
|
||||
{ XFUNC_mv_begin, 2, 'H' },
|
||||
{ XFUNC_mv_beg | 0x80, 2, '7' },
|
||||
{ XFUNC_mv_beg, 2, 'H' },
|
||||
{ XFUNC_mv_end | 0x80, 2, '4' },
|
||||
{ XFUNC_mv_end | 0x80, 2, '8' },
|
||||
{ XFUNC_mv_end, 2, 'F' },
|
||||
|
|
@ -1119,7 +1119,7 @@ static struct x_defbindings const x_defbindings[] = {
|
|||
/* PC scancodes */
|
||||
#if !defined(MKSH_SMALL) || defined(__OS2__)
|
||||
{ XFUNC_meta3, 0, 0 },
|
||||
{ XFUNC_mv_begin, 3, 71 },
|
||||
{ XFUNC_mv_beg, 3, 71 },
|
||||
{ XFUNC_prev_com, 3, 72 },
|
||||
#ifndef MKSH_SMALL
|
||||
{ XFUNC_search_hist_up, 3, 73 },
|
||||
|
|
@ -2044,7 +2044,7 @@ x_mv_end(int c MKSH_A_UNUSED)
|
|||
}
|
||||
|
||||
static int
|
||||
x_mv_begin(int c MKSH_A_UNUSED)
|
||||
x_mv_beg(int c MKSH_A_UNUSED)
|
||||
{
|
||||
x_goto(xbuf);
|
||||
return (KSTD);
|
||||
|
|
@ -2328,7 +2328,7 @@ x_vt_hack(int c)
|
|||
case '~':
|
||||
x_arg = 1;
|
||||
x_arg_defaulted = true;
|
||||
return (x_mv_begin(0));
|
||||
return (x_mv_beg(0));
|
||||
case ';':
|
||||
/* "interesting" sequence detected */
|
||||
break;
|
||||
|
|
@ -4016,7 +4016,7 @@ vi_insert(int ch)
|
|||
else
|
||||
return (redo_insert(lastac - 1));
|
||||
|
||||
/* { Begin nonstandard vi commands */
|
||||
/* { start nonstandard vi commands */
|
||||
case CTRL('x'):
|
||||
expand_word(0);
|
||||
break;
|
||||
|
|
@ -4035,7 +4035,7 @@ vi_insert(int ch)
|
|||
break;
|
||||
}
|
||||
/* FALLTHROUGH */
|
||||
/* End nonstandard vi commands } */
|
||||
/* end nonstandard vi commands } */
|
||||
|
||||
default:
|
||||
if (es->linelen >= es->cbufsize - 1)
|
||||
|
|
|
|||
|
|
@ -19,7 +19,7 @@
|
|||
*/
|
||||
|
||||
#if defined(EMACSFN_DEFNS)
|
||||
__RCSID("$MirOS: src/bin/mksh/emacsfn.h,v 1.9 2016/07/26 21:50:30 tg Exp $");
|
||||
__RCSID("$MirOS: src/bin/mksh/emacsfn.h,v 1.10 2016/09/01 12:59:09 tg Exp $");
|
||||
#define FN(cname,sname,flags) static int x_##cname(int);
|
||||
#elif defined(EMACSFN_ENUMS)
|
||||
#define FN(cname,sname,flags) XFUNC_##cname,
|
||||
|
|
@ -78,7 +78,7 @@ FN(meta2, "prefix-2", XF_PREFIX)
|
|||
FN(meta3, "prefix-3", XF_PREFIX)
|
||||
FN(meta_yank, "yank-pop", 0)
|
||||
FN(mv_back, "backward-char", XF_ARG)
|
||||
FN(mv_begin, "beginning-of-line", 0)
|
||||
FN(mv_beg, "beginning-of-line", 0)
|
||||
FN(mv_bword, "backward-word", XF_ARG)
|
||||
FN(mv_end, "end-of-line", 0)
|
||||
FN(mv_forw, "forward-char", XF_ARG)
|
||||
|
|
|
|||
6
eval.c
6
eval.c
|
|
@ -23,7 +23,7 @@
|
|||
|
||||
#include "sh.h"
|
||||
|
||||
__RCSID("$MirOS: src/bin/mksh/eval.c,v 1.192 2016/08/01 21:38:01 tg Exp $");
|
||||
__RCSID("$MirOS: src/bin/mksh/eval.c,v 1.193 2016/09/01 12:59:09 tg Exp $");
|
||||
|
||||
/*
|
||||
* string expansion
|
||||
|
|
@ -62,7 +62,7 @@ typedef struct {
|
|||
#define IFS_WORD 0 /* word has chars (or quotes except "$@") */
|
||||
#define IFS_WS 1 /* have seen IFS white-space */
|
||||
#define IFS_NWS 2 /* have seen IFS non-white-space */
|
||||
#define IFS_IWS 3 /* begin of word, ignore IFS WS */
|
||||
#define IFS_IWS 3 /* beginning of word, ignore IFS WS */
|
||||
#define IFS_QUOTE 4 /* beg.w/quote, become IFS_WORD unless "$@" */
|
||||
|
||||
static int varsub(Expand *, const char *, const char *, int *, int *);
|
||||
|
|
@ -198,7 +198,7 @@ typedef struct SubType {
|
|||
struct tbl *var; /* variable for ${var..} */
|
||||
struct SubType *prev; /* old type */
|
||||
struct SubType *next; /* poped type (to avoid re-allocating) */
|
||||
size_t base; /* begin position of expanded word */
|
||||
size_t base; /* start position of expanded word */
|
||||
short stype; /* [=+-?%#] action after expanded word */
|
||||
short f; /* saved value of f (DOPAT, etc) */
|
||||
uint8_t quotep; /* saved value of quote (for ${..[%#]..}) */
|
||||
|
|
|
|||
4
exec.c
4
exec.c
|
|
@ -23,7 +23,7 @@
|
|||
|
||||
#include "sh.h"
|
||||
|
||||
__RCSID("$MirOS: src/bin/mksh/exec.c,v 1.180 2016/08/24 20:40:00 tg Exp $");
|
||||
__RCSID("$MirOS: src/bin/mksh/exec.c,v 1.181 2016/09/01 12:59:09 tg Exp $");
|
||||
|
||||
#ifndef MKSH_DEFAULT_EXECSHELL
|
||||
#define MKSH_DEFAULT_EXECSHELL MKSH_UNIXROOT "/bin/sh"
|
||||
|
|
@ -911,7 +911,7 @@ scriptexec(struct op *tp, const char **ap)
|
|||
/* replace newline by NUL */
|
||||
*cp = '\0';
|
||||
|
||||
/* restore begin of shebang position (buf+0 or buf+3) */
|
||||
/* restore start of shebang position (buf+0 or buf+3) */
|
||||
cp = buf + n;
|
||||
/* bail out if no shebang magic found */
|
||||
if (cp[0] == '#' && cp[1] == '!')
|
||||
|
|
|
|||
6
main.c
6
main.c
|
|
@ -34,7 +34,7 @@
|
|||
#include <locale.h>
|
||||
#endif
|
||||
|
||||
__RCSID("$MirOS: src/bin/mksh/main.c,v 1.317 2016/08/04 20:51:35 tg Exp $");
|
||||
__RCSID("$MirOS: src/bin/mksh/main.c,v 1.318 2016/09/01 12:59:10 tg Exp $");
|
||||
|
||||
extern char **environ;
|
||||
|
||||
|
|
@ -222,11 +222,11 @@ main_init(int argc, const char *argv[], Source **sp, struct block **lp)
|
|||
|
||||
/* determine the basename (without '-' or path) of the executable */
|
||||
ccp = kshname;
|
||||
goto begin_parse_kshname;
|
||||
goto begin_parsing_kshname;
|
||||
while ((i = ccp[argi++])) {
|
||||
if (i == '/') {
|
||||
ccp += argi;
|
||||
begin_parse_kshname:
|
||||
begin_parsing_kshname:
|
||||
argi = 0;
|
||||
if (*ccp == '-')
|
||||
++ccp;
|
||||
|
|
|
|||
10
sh.h
10
sh.h
|
|
@ -175,9 +175,9 @@
|
|||
#endif
|
||||
|
||||
#ifdef EXTERN
|
||||
__RCSID("$MirOS: src/bin/mksh/sh.h,v 1.787 2016/08/25 16:21:34 tg Exp $");
|
||||
__RCSID("$MirOS: src/bin/mksh/sh.h,v 1.788 2016/09/01 12:59:11 tg Exp $");
|
||||
#endif
|
||||
#define MKSH_VERSION "R53 2016/08/25"
|
||||
#define MKSH_VERSION "R53 2016/09/01"
|
||||
|
||||
/* arithmetic types: C implementation */
|
||||
#if !HAVE_CAN_INTTYPES
|
||||
|
|
@ -1738,7 +1738,7 @@ struct ioword {
|
|||
#define X_EXTRA 20 /* this many extra bytes in X string */
|
||||
|
||||
typedef struct XString {
|
||||
/* begin of string */
|
||||
/* beginning of string */
|
||||
char *beg;
|
||||
/* length of allocated area, minus safety margin */
|
||||
size_t len;
|
||||
|
|
@ -1781,7 +1781,7 @@ typedef char *XStringP;
|
|||
/* close, return string */
|
||||
#define Xclose(xs, xp) aresize((xs).beg, (xp) - (xs).beg, (xs).areap)
|
||||
|
||||
/* begin of string */
|
||||
/* beginning of string */
|
||||
#define Xstring(xs, xp) ((xs).beg)
|
||||
|
||||
#define Xnleft(xs, xp) ((xs).end - (xp)) /* may be less than 0 */
|
||||
|
|
@ -1797,7 +1797,7 @@ char *Xcheck_grow(XString *, const char *, size_t);
|
|||
*/
|
||||
|
||||
typedef struct {
|
||||
/* begin of allocated area */
|
||||
/* beginning of allocated area */
|
||||
void **beg;
|
||||
/* currently used number of entries */
|
||||
size_t len;
|
||||
|
|
|
|||
6
syn.c
6
syn.c
|
|
@ -23,7 +23,7 @@
|
|||
|
||||
#include "sh.h"
|
||||
|
||||
__RCSID("$MirOS: src/bin/mksh/syn.c,v 1.114 2016/08/04 20:32:14 tg Exp $");
|
||||
__RCSID("$MirOS: src/bin/mksh/syn.c,v 1.115 2016/09/01 12:59:12 tg Exp $");
|
||||
|
||||
struct nesting_state {
|
||||
int start_token; /* token than began nesting (eg, FOR) */
|
||||
|
|
@ -287,12 +287,12 @@ get_command(int cf)
|
|||
syniocf &= ~(KEYWORD|sALIAS);
|
||||
t = newtp(TCOM);
|
||||
t->lineno = source->line;
|
||||
goto get_command_begin;
|
||||
goto get_command_start;
|
||||
while (/* CONSTCOND */ 1) {
|
||||
bool check_assign_cmd;
|
||||
|
||||
if (XPsize(args) == 0) {
|
||||
get_command_begin:
|
||||
get_command_start:
|
||||
check_assign_cmd = true;
|
||||
cf = sALIAS | CMDASN;
|
||||
} else if (t->u.evalflags)
|
||||
|
|
|
|||
Loading…
Reference in New Issue