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

restore ‘.’ as allowed char in alias names

Browse Source
This commit is contained in:
tg 2017-04-20 20:50:14 +00:00
parent efc7856c46
commit c35a5db0ac
3 changed files with 14 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
check.t
View File

@ -1,4 +1,4 @@
# $MirOS: src/bin/mksh/check.t,v 1.777 2017/04/20 18:44:07 tg Exp $ # $MirOS: src/bin/mksh/check.t,v 1.778 2017/04/20 20:50:09 tg Exp $
# -*- mode: sh -*- # -*- mode: sh -*-
#- #-
# Copyright © 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, # 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 # (2013/12/02 20:39:44) http://cvsweb.openbsd.org/cgi-bin/cvsweb/src/regress/bin/ksh/?sortby=date
expected-stdout: expected-stdout:
@(#)MIRBSD KSH R55 2017/04/17 @(#)MIRBSD KSH R55 2017/04/20
description: description:
Check version of shell. Check version of shell.
stdin: stdin:
@ -39,7 +39,7 @@ name: KSH_VERSION
category: !shell:legacy-yes,!shell:textmode-yes category: !shell:legacy-yes,!shell:textmode-yes
--- ---
expected-stdout: expected-stdout:
@(#)LEGACY KSH R55 2017/04/17 @(#)LEGACY KSH R55 2017/04/20
description: description:
Check version of legacy shell. Check version of legacy shell.
stdin: stdin:
@ -48,7 +48,7 @@ name: KSH_VERSION-legacy
category: !shell:legacy-no,!shell:textmode-yes category: !shell:legacy-no,!shell:textmode-yes
--- ---
expected-stdout: expected-stdout:
@(#)MIRBSD KSH R55 2017/04/17 +TEXTMODE @(#)MIRBSD KSH R55 2017/04/20 +TEXTMODE
description: description:
Check version of shell. Check version of shell.
stdin: stdin:
@ -57,7 +57,7 @@ name: KSH_VERSION-textmode
category: !shell:legacy-yes,!shell:textmode-no category: !shell:legacy-yes,!shell:textmode-no
--- ---
expected-stdout: expected-stdout:
@(#)LEGACY KSH R55 2017/04/17 +TEXTMODE @(#)LEGACY KSH R55 2017/04/20 +TEXTMODE
description: description:
Check version of legacy shell. Check version of legacy shell.
stdin: stdin:

10
mksh.1
View File

@ -1,4 +1,4 @@
.\" $MirOS: src/bin/mksh/mksh.1,v 1.442 2017/04/12 18:30:58 tg Exp $ .\" $MirOS: src/bin/mksh/mksh.1,v 1.443 2017/04/20 20:50:12 tg Exp $
.\" $OpenBSD: ksh.1,v 1.160 2015/07/04 13:27:04 feinerer Exp $ .\" $OpenBSD: ksh.1,v 1.160 2015/07/04 13:27:04 feinerer Exp $
.\"- .\"-
.\" Copyright © 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, .\" Copyright © 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009,
@ -76,7 +76,7 @@
.\" with -mandoc, it might implement .Mx itself, but we want to .\" with -mandoc, it might implement .Mx itself, but we want to
.\" use our own definition. And .Dd must come *first*, always. .\" use our own definition. And .Dd must come *first*, always.
.\" .\"
.Dd $Mdocdate: April 12 2017 $ .Dd $Mdocdate: April 20 2017 $
.\" .\"
.\" Check which macro package we use, and do other -mdoc setup. .\" Check which macro package we use, and do other -mdoc setup.
.\" .\"
@ -3066,10 +3066,10 @@ Without arguments,
.Ic alias .Ic alias
lists all aliases. lists all aliases.
For any name without a value, the existing alias is listed. For any name without a value, the existing alias is listed.
Any name with a value defines an alias (see Any name with a value defines an alias; see
.Sx Aliases .Sx Aliases
above). above.
.Li \&[A\-Za\-z0\-9_!%,@\-] .Li \&[A\-Za\-z0\-9_!%,.@\-]
are valid in names except they may not begin with a hyphen-minus. are valid in names except they may not begin with a hyphen-minus.
.Pp .Pp
When listing aliases, one of two formats is used. When listing aliases, one of two formats is used.

7
sh.h
View File

@ -175,9 +175,9 @@
#endif #endif
#ifdef EXTERN #ifdef EXTERN
__RCSID("$MirOS: src/bin/mksh/sh.h,v 1.810 2017/04/20 16:50:48 tg Exp $"); __RCSID("$MirOS: src/bin/mksh/sh.h,v 1.811 2017/04/20 20:50:14 tg Exp $");
#endif #endif
#define MKSH_VERSION "R55 2017/04/17" #define MKSH_VERSION "R55 2017/04/20"
/* arithmetic types: C implementation */ /* arithmetic types: C implementation */
#if !HAVE_CAN_INTTYPES #if !HAVE_CAN_INTTYPES
@ -1304,7 +1304,8 @@ extern unsigned char chtypes[];
#define ksh_issubop2(c) tobool((c) == ord('#') || (c) == ord('%')) #define ksh_issubop2(c) tobool((c) == ord('#') || (c) == ord('%'))
#define ksh_isalias(c) (ctype((c), C_ALPHX | C_DIGIT) || (c) == ord('!') || \ #define ksh_isalias(c) (ctype((c), C_ALPHX | C_DIGIT) || (c) == ord('!') || \
(c) == ord('%') || (c) == ord(',') || \ (c) == ord('%') || (c) == ord(',') || \
(c) == ord('@') || (c) == ord('-')) (c) == ord('.') || (c) == ord('@') || \
(c) == ord('-'))
#define ksh_isalpha(c) (ctype((c), C_ALPHX) && (c) != ord('_')) #define ksh_isalpha(c) (ctype((c), C_ALPHX) && (c) != ord('_'))
#define ksh_isalphx(c) ctype((c), C_ALPHX) #define ksh_isalphx(c) ctype((c), C_ALPHX)
#define ksh_isalnux(c) ctype((c), C_ALPHX | C_DIGIT) #define ksh_isalnux(c) ctype((c), C_ALPHX | C_DIGIT)