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

1186 lines
24 KiB
C
Raw Normal View History

oksh sync RCSIDs only: • expr.c long done already • mksh.1 does not apply to us (no character classes)
2014-12-16 00:26:36 +01:00
/* $OpenBSD: expr.c,v 1.24 2014/12/08 14:26:31 otto Exp $ */
Add mirbsdksh R21, which was developed in a temporary external CVS repo- sitory whose ChangeLog follows. mksh R21 is licenced under the MirOS li- cence, shown in "sh.h", and a two-clause UCB-style licence by Marc Espie as shown in "alloc.c". This executable is a fair bit smaller and shorter than our /bin/ksh that it is designed to eventually replace (as /bin/sh hardlink), with the old /bin/ksh to completely vanish. It is still in beta testing though, and I don't think it will compile on other operating systems. mksh R21 is a completely new port, bringing together the OpenBSD-current /bin/ksh, the MirOS-current /bin/ksh and the older mksh R20 (which still was portable, ocvs-based).
2005-05-23 05:06:10 +02:00
• sync distrib/special/mksh/Makefile with bin/mksh/Build.sh and fix the regression test’s results while here, which have been broken since cid 10049D9BE5254CE65B8 • get rid of separate copyright file which was intended for De- bian; track down commits in all files of oksh-mirbsd and mksh to get correct copyright years per-file, as is BSD custom
2009-05-16 18:59:42 +02:00
/*-
couple of minor/cosmetic fixes from RT’s compile farm: • promote SCO OpenServer and UnixWare to !oswarn • omit trying -O2/-O on OpenServer 5 and USL C • cast mksh_ari_t to int, mksh_uari_t to unsigned int for printf • skip ulimit-1 on syllable (which is still too broken) • write ((mksh_ari_t)-2147483648) ipv UB ((mksh_ari_t)1 << 31) and add a comment that that is actually meant • rewrite functions returning !void ending in NOTREACHED so they’ve got a jump target returning an error at the end, to aid older compilers and just to be safe • cast struct stat.st_size to off_t or size_t explicitly when needed • shorten struct env by two bytes and an alignment, at least also, optimise control flow and fix more paren matching cases
2012-03-29 21:23:01 +02:00
* Copyright (c) 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010,
small character classes overhaul: • make fast character classes even faster by removing the C_SUBOP2 hack in favour of a separate seldom-used ksh_issubop2 macro (which also makes ctype() side-effect-safe) which is a slower class (no change there) • optimise cases of ksh_isalphx followed by a ksh_isalnux loop (used parsing variable names) • remove a misleading comment in initctypes() about \0 from pdksh • rename C_ALPHA to C_ALPHX to make it more clear the underscore is included • sprinkle a few ord() in there • add new ksh_isalpha() which tests for [A-Za-z] (slow character class) • there is no '_:\' drive on OS/2 (which inspired the whole changeset)
2017-03-26 01:10:26 +01:00
* 2011, 2012, 2013, 2014, 2016, 2017
janitorial work
2015-11-29 18:05:02 +01:00
* mirabilos <m@mirbsd.org>
• sync distrib/special/mksh/Makefile with bin/mksh/Build.sh and fix the regression test’s results while here, which have been broken since cid 10049D9BE5254CE65B8 • get rid of separate copyright file which was intended for De- bian; track down commits in all files of oksh-mirbsd and mksh to get correct copyright years per-file, as is BSD custom
2009-05-16 18:59:42 +02:00
*
* Provided that these terms and disclaimer and all copyright notices
* are retained or reproduced in an accompanying document, permission
* is granted to deal in this work without restriction, including un-
* limited rights to use, publicly perform, distribute, sell, modify,
* merge, give away, or sublicence.
*
* This work is provided "AS IS" and WITHOUT WARRANTY of any kind, to
* the utmost extent permitted by applicable law, neither express nor
* implied; without malicious intent or gross negligence. In no event
* may a licensor, author or contributor be held liable for indirect,
* direct, other damage, loss, or other issues arising in any way out
* of dealing in the work, even if advised of the possibility of such
* damage or existence of a defect, except proven that it results out
* of said person's immediate fault when using the work as intended.
*/
Add mirbsdksh R21, which was developed in a temporary external CVS repo- sitory whose ChangeLog follows. mksh R21 is licenced under the MirOS li- cence, shown in "sh.h", and a two-clause UCB-style licence by Marc Espie as shown in "alloc.c". This executable is a fair bit smaller and shorter than our /bin/ksh that it is designed to eventually replace (as /bin/sh hardlink), with the old /bin/ksh to completely vanish. It is still in beta testing though, and I don't think it will compile on other operating systems. mksh R21 is a completely new port, bringing together the OpenBSD-current /bin/ksh, the MirOS-current /bin/ksh and the older mksh R20 (which still was portable, ocvs-based).
2005-05-23 05:06:10 +02:00
#include "sh.h"
small character classes overhaul: • make fast character classes even faster by removing the C_SUBOP2 hack in favour of a separate seldom-used ksh_issubop2 macro (which also makes ctype() side-effect-safe) which is a slower class (no change there) • optimise cases of ksh_isalphx followed by a ksh_isalnux loop (used parsing variable names) • remove a misleading comment in initctypes() about \0 from pdksh • rename C_ALPHA to C_ALPHX to make it more clear the underscore is included • sprinkle a few ord() in there • add new ksh_isalpha() which tests for [A-Za-z] (slow character class) • there is no '_:\' drive on OS/2 (which inspired the whole changeset)
2017-03-26 01:10:26 +01:00
__RCSID("$MirOS: src/bin/mksh/expr.c,v 1.91 2017/03/26 00:10:23 tg Exp $");
Add mirbsdksh R21, which was developed in a temporary external CVS repo- sitory whose ChangeLog follows. mksh R21 is licenced under the MirOS li- cence, shown in "sh.h", and a two-clause UCB-style licence by Marc Espie as shown in "alloc.c". This executable is a fair bit smaller and shorter than our /bin/ksh that it is designed to eventually replace (as /bin/sh hardlink), with the old /bin/ksh to completely vanish. It is still in beta testing though, and I don't think it will compile on other operating systems. mksh R21 is a completely new port, bringing together the OpenBSD-current /bin/ksh, the MirOS-current /bin/ksh and the older mksh R20 (which still was portable, ocvs-based).
2005-05-23 05:06:10 +02:00
shave off 12 bytes (with fixed gcc) by making the definitions more legible (and dropping struct padding, tbh)
2016-07-27 02:55:27 +02:00
#define EXPRTOK_DEFNS
#include "exprtok.h"
Add mirbsdksh R21, which was developed in a temporary external CVS repo- sitory whose ChangeLog follows. mksh R21 is licenced under the MirOS li- cence, shown in "sh.h", and a two-clause UCB-style licence by Marc Espie as shown in "alloc.c". This executable is a fair bit smaller and shorter than our /bin/ksh that it is designed to eventually replace (as /bin/sh hardlink), with the old /bin/ksh to completely vanish. It is still in beta testing though, and I don't think it will compile on other operating systems. mksh R21 is a completely new port, bringing together the OpenBSD-current /bin/ksh, the MirOS-current /bin/ksh and the older mksh R20 (which still was portable, ocvs-based).
2005-05-23 05:06:10 +02:00
don’t do arithmetics on an enumerated type, sez the MIPSpro complainer
2008-03-28 14:33:37 +01:00
/* precisions; used to be enum prec but we do arithmetics on it */
another intermediate step/commit to get arithmetics right: do the correct operations for comparisons (just keep using the signed/unsigned switch from bivui for them), division (by working on absolutes and adding the sign at the end), modulo (stupidly by divising in signed, multiplying and subtracting, to get the sign of the result right) also adds rotation XXX to check: do we need to AND before assigning the result in division?
2013-04-14 15:36:53 +02:00
#define P_PRIMARY 0 /* VAR, LIT, (), ! ~ ++ -- */
don’t do arithmetics on an enumerated type, sez the MIPSpro complainer
2008-03-28 14:33:37 +01:00
#define P_MULT 1 /* * / % */
#define P_ADD 2 /* + - */
use ^< and ^> for ROL and ROR in R53, schedule >>> as SAR for R54 cf. http://david.tribble.com/text/c0xrot.htm
2016-07-25 22:41:23 +02:00
#define P_SHIFT 3 /* ^< ^> << >> */
don’t do arithmetics on an enumerated type, sez the MIPSpro complainer
2008-03-28 14:33:37 +01:00
#define P_RELATION 4 /* < <= > >= */
#define P_EQUALITY 5 /* == != */
#define P_BAND 6 /* & */
#define P_BXOR 7 /* ^ */
#define P_BOR 8 /* | */
#define P_LAND 9 /* && */
#define P_LOR 10 /* || */
#define P_TERN 11 /* ?: */
use ^< and ^> for ROL and ROR in R53, schedule >>> as SAR for R54 cf. http://david.tribble.com/text/c0xrot.htm
2016-07-25 22:41:23 +02:00
/* = += -= *= /= %= ^<= ^>= <<= >>= &= ^= |= */
another intermediate step/commit to get arithmetics right: do the correct operations for comparisons (just keep using the signed/unsigned switch from bivui for them), division (by working on absolutes and adding the sign at the end), modulo (stupidly by divising in signed, multiplying and subtracting, to get the sign of the result right) also adds rotation XXX to check: do we need to AND before assigning the result in division?
2013-04-14 15:36:53 +02:00
#define P_ASSIGN 12
don’t do arithmetics on an enumerated type, sez the MIPSpro complainer
2008-03-28 14:33:37 +01:00
#define P_COMMA 13 /* , */
Add mirbsdksh R21, which was developed in a temporary external CVS repo- sitory whose ChangeLog follows. mksh R21 is licenced under the MirOS li- cence, shown in "sh.h", and a two-clause UCB-style licence by Marc Espie as shown in "alloc.c". This executable is a fair bit smaller and shorter than our /bin/ksh that it is designed to eventually replace (as /bin/sh hardlink), with the old /bin/ksh to completely vanish. It is still in beta testing though, and I don't think it will compile on other operating systems. mksh R21 is a completely new port, bringing together the OpenBSD-current /bin/ksh, the MirOS-current /bin/ksh and the older mksh R20 (which still was portable, ocvs-based).
2005-05-23 05:06:10 +02:00
#define MAX_PREC P_COMMA
shave off 12 bytes (with fixed gcc) by making the definitions more legible (and dropping struct padding, tbh)
2016-07-27 02:55:27 +02:00
enum token {
#define EXPRTOK_ENUM
#include "exprtok.h"
Add mirbsdksh R21, which was developed in a temporary external CVS repo- sitory whose ChangeLog follows. mksh R21 is licenced under the MirOS li- cence, shown in "sh.h", and a two-clause UCB-style licence by Marc Espie as shown in "alloc.c". This executable is a fair bit smaller and shorter than our /bin/ksh that it is designed to eventually replace (as /bin/sh hardlink), with the old /bin/ksh to completely vanish. It is still in beta testing though, and I don't think it will compile on other operating systems. mksh R21 is a completely new port, bringing together the OpenBSD-current /bin/ksh, the MirOS-current /bin/ksh and the older mksh R20 (which still was portable, ocvs-based).
2005-05-23 05:06:10 +02:00
};
shave off 12 bytes (with fixed gcc) by making the definitions more legible (and dropping struct padding, tbh)
2016-07-27 02:55:27 +02:00
static const char opname[][4] = {
#define EXPRTOK_NAME
#include "exprtok.h"
};
static const uint8_t oplen[] = {
#define EXPRTOK_LEN
#include "exprtok.h"
};
static const uint8_t opprec[] = {
#define EXPRTOK_PREC
#include "exprtok.h"
Add mirbsdksh R21, which was developed in a temporary external CVS repo- sitory whose ChangeLog follows. mksh R21 is licenced under the MirOS li- cence, shown in "sh.h", and a two-clause UCB-style licence by Marc Espie as shown in "alloc.c". This executable is a fair bit smaller and shorter than our /bin/ksh that it is designed to eventually replace (as /bin/sh hardlink), with the old /bin/ksh to completely vanish. It is still in beta testing though, and I don't think it will compile on other operating systems. mksh R21 is a completely new port, bringing together the OpenBSD-current /bin/ksh, the MirOS-current /bin/ksh and the older mksh R20 (which still was portable, ocvs-based).
2005-05-23 05:06:10 +02:00
};
prevent more access to invalid memories (Debian #700604)
2013-02-15 19:36:48 +01:00
typedef struct expr_state {
/* expression being evaluated */
const char *expression;
/* lexical position */
const char *tokp;
/* value from token() */
struct tbl *val;
/* variable that is being recursively expanded (EXPRINEVAL flag set) */
struct tbl *evaling;
/* token from token() */
enum token tok;
/* don't do assignments (for ?:, &&, ||) */
fix remaining signed int nonsense I am aware of
2013-04-26 21:10:58 +02:00
uint8_t noassign;
prevent more access to invalid memories (Debian #700604)
2013-02-15 19:36:48 +01:00
/* evaluating an $(()) expression? */
bool arith;
/* unsigned arithmetic calculation */
bool natural;
} Expr_state;
Add mirbsdksh R21, which was developed in a temporary external CVS repo- sitory whose ChangeLog follows. mksh R21 is licenced under the MirOS li- cence, shown in "sh.h", and a two-clause UCB-style licence by Marc Espie as shown in "alloc.c". This executable is a fair bit smaller and shorter than our /bin/ksh that it is designed to eventually replace (as /bin/sh hardlink), with the old /bin/ksh to completely vanish. It is still in beta testing though, and I don't think it will compile on other operating systems. mksh R21 is a completely new port, bringing together the OpenBSD-current /bin/ksh, the MirOS-current /bin/ksh and the older mksh R20 (which still was portable, ocvs-based).
2005-05-23 05:06:10 +02:00
enum error_type {
ET_UNEXPECTED, ET_BADLIT, ET_RECURSIVE,
ET_LVALUE, ET_RDONLY, ET_STR
};
* support old environments without libgen.h (ancient GNU/Linux) and stdbool.h (ancient GNU/Linux; NetBSD® 1.6.1) * __dead must come after, not before, to accomodate gcc 2.7.2.3
2007-01-17 23:51:47 +01:00
static void evalerr(Expr_state *, enum error_type, const char *)
re-vamp __attribute__ handling; let this pass on HP-UX bundled compiler as well as HP aCC
2009-12-12 23:27:10 +01:00
MKSH_A_NORETURN;
another intermediate step/commit to get arithmetics right: do the correct operations for comparisons (just keep using the signed/unsigned switch from bivui for them), division (by working on absolutes and adding the sign at the end), modulo (stupidly by divising in signed, multiplying and subtracting, to get the sign of the result right) also adds rotation XXX to check: do we need to AND before assigning the result in division?
2013-04-14 15:36:53 +02:00
static struct tbl *evalexpr(Expr_state *, unsigned int);
• remove strcasestr.c, use home-grown implementation¹, call it stricmp, and have it return an API-correct const char * • enhance and stylify comments • a little KNF and simplifications • #ifdef DEBUG: replace strchr and strstr with ucstrchr and ucstrstr that take and return a non-const char *, and fix the violations • new cstrchr, cstrstr (take and give const char *) • new vstrchr, vstrstr (take const or not, give boolean value) • new afreechk(x) = afreechv(x,x) = if (x1) afree(x2, ATEMP) • new ksh_isdash(str) = (str != NULL) && !strcmp(str, "-") • replace the only use of strrchr with inlined code to shrink • minor man page fixes • Minix 3 signames are autogenerated with gcc • rename strlfun.c to strlcpy.c since we don't do strlcat(3) anyway, only strlcpy(3), and shorten it • dot.mkshrc: move MKSH=… down to the export line to not disturb the PS1 visual impression ☺ • dot.mkshrc: Lstripcom(): optimise • bump version ¹) side effect from creating API-correct cstrchr, cstrstr, etc. uses goto so it must be better ☻ tested on mirbsd-current via both Makefile and Build.sh
2007-03-04 04:04:28 +01:00
static void exprtoken(Expr_state *);
Add mirbsdksh R21, which was developed in a temporary external CVS repo- sitory whose ChangeLog follows. mksh R21 is licenced under the MirOS li- cence, shown in "sh.h", and a two-clause UCB-style licence by Marc Espie as shown in "alloc.c". This executable is a fair bit smaller and shorter than our /bin/ksh that it is designed to eventually replace (as /bin/sh hardlink), with the old /bin/ksh to completely vanish. It is still in beta testing though, and I don't think it will compile on other operating systems. mksh R21 is a completely new port, bringing together the OpenBSD-current /bin/ksh, the MirOS-current /bin/ksh and the older mksh R20 (which still was portable, ocvs-based).
2005-05-23 05:06:10 +02:00
static struct tbl *do_ppmm(Expr_state *, enum token, struct tbl *, bool);
• remove strcasestr.c, use home-grown implementation¹, call it stricmp, and have it return an API-correct const char * • enhance and stylify comments • a little KNF and simplifications • #ifdef DEBUG: replace strchr and strstr with ucstrchr and ucstrstr that take and return a non-const char *, and fix the violations • new cstrchr, cstrstr (take and give const char *) • new vstrchr, vstrstr (take const or not, give boolean value) • new afreechk(x) = afreechv(x,x) = if (x1) afree(x2, ATEMP) • new ksh_isdash(str) = (str != NULL) && !strcmp(str, "-") • replace the only use of strrchr with inlined code to shrink • minor man page fixes • Minix 3 signames are autogenerated with gcc • rename strlfun.c to strlcpy.c since we don't do strlcat(3) anyway, only strlcpy(3), and shorten it • dot.mkshrc: move MKSH=… down to the export line to not disturb the PS1 visual impression ☺ • dot.mkshrc: Lstripcom(): optimise • bump version ¹) side effect from creating API-correct cstrchr, cstrstr, etc. uses goto so it must be better ☻ tested on mirbsd-current via both Makefile and Build.sh
2007-03-04 04:04:28 +01:00
static void assign_check(Expr_state *, enum token, struct tbl *);
Add mirbsdksh R21, which was developed in a temporary external CVS repo- sitory whose ChangeLog follows. mksh R21 is licenced under the MirOS li- cence, shown in "sh.h", and a two-clause UCB-style licence by Marc Espie as shown in "alloc.c". This executable is a fair bit smaller and shorter than our /bin/ksh that it is designed to eventually replace (as /bin/sh hardlink), with the old /bin/ksh to completely vanish. It is still in beta testing though, and I don't think it will compile on other operating systems. mksh R21 is a completely new port, bringing together the OpenBSD-current /bin/ksh, the MirOS-current /bin/ksh and the older mksh R20 (which still was portable, ocvs-based).
2005-05-23 05:06:10 +02:00
static struct tbl *intvar(Expr_state *, struct tbl *);
/*
* parse and evaluate expression
*/
int
sprinkle mksh_ari_t to limit arithmetics to 32 bit even on Debian Lenny/amd64 (XXX need more verification; this can be used for 64 bit arithmetics later too) PPID, PGRP, RANDOM, USER_ID are now unsigned by default
2009-03-14 19:12:55 +01:00
evaluate(const char *expr, mksh_ari_t *rval, int error_ok, bool arith)
Add mirbsdksh R21, which was developed in a temporary external CVS repo- sitory whose ChangeLog follows. mksh R21 is licenced under the MirOS li- cence, shown in "sh.h", and a two-clause UCB-style licence by Marc Espie as shown in "alloc.c". This executable is a fair bit smaller and shorter than our /bin/ksh that it is designed to eventually replace (as /bin/sh hardlink), with the old /bin/ksh to completely vanish. It is still in beta testing though, and I don't think it will compile on other operating systems. mksh R21 is a completely new port, bringing together the OpenBSD-current /bin/ksh, the MirOS-current /bin/ksh and the older mksh R20 (which still was portable, ocvs-based).
2005-05-23 05:06:10 +02:00
{
struct tbl v;
int ret;
another intermediate step/commit to get arithmetics right: do the correct operations for comparisons (just keep using the signed/unsigned switch from bivui for them), division (by working on absolutes and adding the sign at the end), modulo (stupidly by divising in signed, multiplying and subtracting, to get the sign of the result right) also adds rotation XXX to check: do we need to AND before assigning the result in division?
2013-04-14 15:36:53 +02:00
v.flag = DEFINED | INTEGER;
Add mirbsdksh R21, which was developed in a temporary external CVS repo- sitory whose ChangeLog follows. mksh R21 is licenced under the MirOS li- cence, shown in "sh.h", and a two-clause UCB-style licence by Marc Espie as shown in "alloc.c". This executable is a fair bit smaller and shorter than our /bin/ksh that it is designed to eventually replace (as /bin/sh hardlink), with the old /bin/ksh to completely vanish. It is still in beta testing though, and I don't think it will compile on other operating systems. mksh R21 is a completely new port, bringing together the OpenBSD-current /bin/ksh, the MirOS-current /bin/ksh and the older mksh R20 (which still was portable, ocvs-based).
2005-05-23 05:06:10 +02:00
v.type = 0;
ret = v_evaluate(&v, expr, error_ok, arith);
*rval = v.val.i;
• remove strcasestr.c, use home-grown implementation¹, call it stricmp, and have it return an API-correct const char * • enhance and stylify comments • a little KNF and simplifications • #ifdef DEBUG: replace strchr and strstr with ucstrchr and ucstrstr that take and return a non-const char *, and fix the violations • new cstrchr, cstrstr (take and give const char *) • new vstrchr, vstrstr (take const or not, give boolean value) • new afreechk(x) = afreechv(x,x) = if (x1) afree(x2, ATEMP) • new ksh_isdash(str) = (str != NULL) && !strcmp(str, "-") • replace the only use of strrchr with inlined code to shrink • minor man page fixes • Minix 3 signames are autogenerated with gcc • rename strlfun.c to strlcpy.c since we don't do strlcat(3) anyway, only strlcpy(3), and shorten it • dot.mkshrc: move MKSH=… down to the export line to not disturb the PS1 visual impression ☺ • dot.mkshrc: Lstripcom(): optimise • bump version ¹) side effect from creating API-correct cstrchr, cstrstr, etc. uses goto so it must be better ☻ tested on mirbsd-current via both Makefile and Build.sh
2007-03-04 04:04:28 +01:00
return (ret);
Add mirbsdksh R21, which was developed in a temporary external CVS repo- sitory whose ChangeLog follows. mksh R21 is licenced under the MirOS li- cence, shown in "sh.h", and a two-clause UCB-style licence by Marc Espie as shown in "alloc.c". This executable is a fair bit smaller and shorter than our /bin/ksh that it is designed to eventually replace (as /bin/sh hardlink), with the old /bin/ksh to completely vanish. It is still in beta testing though, and I don't think it will compile on other operating systems. mksh R21 is a completely new port, bringing together the OpenBSD-current /bin/ksh, the MirOS-current /bin/ksh and the older mksh R20 (which still was portable, ocvs-based).
2005-05-23 05:06:10 +02:00
}
/*
* parse and evaluate expression, storing result in vp.
*/
int
v_evaluate(struct tbl *vp, const char *expr, volatile int error_ok,
bool arith)
{
struct tbl *v;
Expr_state curstate;
Expr_state * const es = &curstate;
int i;
/* save state to allow recursive calls */
prevent more access to invalid memories (Debian #700604)
2013-02-15 19:36:48 +01:00
memset(&curstate, 0, sizeof(curstate));
Add mirbsdksh R21, which was developed in a temporary external CVS repo- sitory whose ChangeLog follows. mksh R21 is licenced under the MirOS li- cence, shown in "sh.h", and a two-clause UCB-style licence by Marc Espie as shown in "alloc.c". This executable is a fair bit smaller and shorter than our /bin/ksh that it is designed to eventually replace (as /bin/sh hardlink), with the old /bin/ksh to completely vanish. It is still in beta testing though, and I don't think it will compile on other operating systems. mksh R21 is a completely new port, bringing together the OpenBSD-current /bin/ksh, the MirOS-current /bin/ksh and the older mksh R20 (which still was portable, ocvs-based).
2005-05-23 05:06:10 +02:00
curstate.expression = curstate.tokp = expr;
prevent more access to invalid memories (Debian #700604)
2013-02-15 19:36:48 +01:00
curstate.tok = BAD;
Add mirbsdksh R21, which was developed in a temporary external CVS repo- sitory whose ChangeLog follows. mksh R21 is licenced under the MirOS li- cence, shown in "sh.h", and a two-clause UCB-style licence by Marc Espie as shown in "alloc.c". This executable is a fair bit smaller and shorter than our /bin/ksh that it is designed to eventually replace (as /bin/sh hardlink), with the old /bin/ksh to completely vanish. It is still in beta testing though, and I don't think it will compile on other operating systems. mksh R21 is a completely new port, bringing together the OpenBSD-current /bin/ksh, the MirOS-current /bin/ksh and the older mksh R20 (which still was portable, ocvs-based).
2005-05-23 05:06:10 +02:00
curstate.arith = arith;
newenv(E_ERRH);
use _setjmp/_longjmp on NeXTstep: its Intel port always restores the signal mask on siglongjmp, which we never have
2012-03-31 19:30:00 +02:00
if ((i = kshsetjmp(e->jbuf))) {
Add mirbsdksh R21, which was developed in a temporary external CVS repo- sitory whose ChangeLog follows. mksh R21 is licenced under the MirOS li- cence, shown in "sh.h", and a two-clause UCB-style licence by Marc Espie as shown in "alloc.c". This executable is a fair bit smaller and shorter than our /bin/ksh that it is designed to eventually replace (as /bin/sh hardlink), with the old /bin/ksh to completely vanish. It is still in beta testing though, and I don't think it will compile on other operating systems. mksh R21 is a completely new port, bringing together the OpenBSD-current /bin/ksh, the MirOS-current /bin/ksh and the older mksh R20 (which still was portable, ocvs-based).
2005-05-23 05:06:10 +02:00
/* Clear EXPRINEVAL in of any variables we were playing with */
if (curstate.evaling)
curstate.evaling->flag &= ~EXPRINEVAL;
quitenv(NULL);
if (i == LAEXPR) {
if (error_ok == KSH_RETURN_ERROR)
• remove strcasestr.c, use home-grown implementation¹, call it stricmp, and have it return an API-correct const char * • enhance and stylify comments • a little KNF and simplifications • #ifdef DEBUG: replace strchr and strstr with ucstrchr and ucstrstr that take and return a non-const char *, and fix the violations • new cstrchr, cstrstr (take and give const char *) • new vstrchr, vstrstr (take const or not, give boolean value) • new afreechk(x) = afreechv(x,x) = if (x1) afree(x2, ATEMP) • new ksh_isdash(str) = (str != NULL) && !strcmp(str, "-") • replace the only use of strrchr with inlined code to shrink • minor man page fixes • Minix 3 signames are autogenerated with gcc • rename strlfun.c to strlcpy.c since we don't do strlcat(3) anyway, only strlcpy(3), and shorten it • dot.mkshrc: move MKSH=… down to the export line to not disturb the PS1 visual impression ☺ • dot.mkshrc: Lstripcom(): optimise • bump version ¹) side effect from creating API-correct cstrchr, cstrstr, etc. uses goto so it must be better ☻ tested on mirbsd-current via both Makefile and Build.sh
2007-03-04 04:04:28 +01:00
return (0);
• we had an unused variable leftover • make warning-free for both gcc and xlC
2007-07-22 16:01:50 +02:00
errorfz();
Add mirbsdksh R21, which was developed in a temporary external CVS repo- sitory whose ChangeLog follows. mksh R21 is licenced under the MirOS li- cence, shown in "sh.h", and a two-clause UCB-style licence by Marc Espie as shown in "alloc.c". This executable is a fair bit smaller and shorter than our /bin/ksh that it is designed to eventually replace (as /bin/sh hardlink), with the old /bin/ksh to completely vanish. It is still in beta testing though, and I don't think it will compile on other operating systems. mksh R21 is a completely new port, bringing together the OpenBSD-current /bin/ksh, the MirOS-current /bin/ksh and the older mksh R20 (which still was portable, ocvs-based).
2005-05-23 05:06:10 +02:00
}
unwind(i);
apply some fixes from OpenBSD and don't apply some others but sync RCS IDs for easier future adaption: * Simplify savefd() by removing the "noclose" flag and make noclose behavior the default. Almost all uses of savefd() are followed by an implicit or explicit close. * fix typos * might as well make ksh_getopt() match real getopt(), ie. get rid of that stupid EOF concept that was never true. adobriyan@gmail * use SEEK_* for lseek() * fix lint comments, no functional changes * remove excessive optimization; from adobriyan@gmail * only santa checks things twice; from adobriyan@gmail * Interpret zero-filled numbers as decimal; PR 4213; from Alexey Dobriyan
2006-05-10 20:54:13 +02:00
/* NOTREACHED */
Add mirbsdksh R21, which was developed in a temporary external CVS repo- sitory whose ChangeLog follows. mksh R21 is licenced under the MirOS li- cence, shown in "sh.h", and a two-clause UCB-style licence by Marc Espie as shown in "alloc.c". This executable is a fair bit smaller and shorter than our /bin/ksh that it is designed to eventually replace (as /bin/sh hardlink), with the old /bin/ksh to completely vanish. It is still in beta testing though, and I don't think it will compile on other operating systems. mksh R21 is a completely new port, bringing together the OpenBSD-current /bin/ksh, the MirOS-current /bin/ksh and the older mksh R20 (which still was portable, ocvs-based).
2005-05-23 05:06:10 +02:00
}
don't have two functions token(), helps ctags
2007-03-03 22:12:51 +01:00
exprtoken(es);
Add mirbsdksh R21, which was developed in a temporary external CVS repo- sitory whose ChangeLog follows. mksh R21 is licenced under the MirOS li- cence, shown in "sh.h", and a two-clause UCB-style licence by Marc Espie as shown in "alloc.c". This executable is a fair bit smaller and shorter than our /bin/ksh that it is designed to eventually replace (as /bin/sh hardlink), with the old /bin/ksh to completely vanish. It is still in beta testing though, and I don't think it will compile on other operating systems. mksh R21 is a completely new port, bringing together the OpenBSD-current /bin/ksh, the MirOS-current /bin/ksh and the older mksh R20 (which still was portable, ocvs-based).
2005-05-23 05:06:10 +02:00
if (es->tok == END) {
es->tok = LIT;
plug a few display problems with special parameter name expansions reported by Stéphane Chazelas
2016-02-26 19:48:14 +01:00
es->val = tempvar("");
Add mirbsdksh R21, which was developed in a temporary external CVS repo- sitory whose ChangeLog follows. mksh R21 is licenced under the MirOS li- cence, shown in "sh.h", and a two-clause UCB-style licence by Marc Espie as shown in "alloc.c". This executable is a fair bit smaller and shorter than our /bin/ksh that it is designed to eventually replace (as /bin/sh hardlink), with the old /bin/ksh to completely vanish. It is still in beta testing though, and I don't think it will compile on other operating systems. mksh R21 is a completely new port, bringing together the OpenBSD-current /bin/ksh, the MirOS-current /bin/ksh and the older mksh R20 (which still was portable, ocvs-based).
2005-05-23 05:06:10 +02:00
}
v = intvar(es, evalexpr(es, MAX_PREC));
if (es->tok != END)
evalerr(es, ET_UNEXPECTED, NULL);
implement unsigned arithmetics as an mksh extension
2008-12-17 20:39:23 +01:00
if (es->arith && es->natural)
vp->flag |= INT_U;
Add mirbsdksh R21, which was developed in a temporary external CVS repo- sitory whose ChangeLog follows. mksh R21 is licenced under the MirOS li- cence, shown in "sh.h", and a two-clause UCB-style licence by Marc Espie as shown in "alloc.c". This executable is a fair bit smaller and shorter than our /bin/ksh that it is designed to eventually replace (as /bin/sh hardlink), with the old /bin/ksh to completely vanish. It is still in beta testing though, and I don't think it will compile on other operating systems. mksh R21 is a completely new port, bringing together the OpenBSD-current /bin/ksh, the MirOS-current /bin/ksh and the older mksh R20 (which still was portable, ocvs-based).
2005-05-23 05:06:10 +02:00
if (vp->flag & INTEGER)
setint_v(vp, v, es->arith);
else
/* can fail if readonly */
setstr(vp, str_val(v), error_ok);
quitenv(NULL);
• remove strcasestr.c, use home-grown implementation¹, call it stricmp, and have it return an API-correct const char * • enhance and stylify comments • a little KNF and simplifications • #ifdef DEBUG: replace strchr and strstr with ucstrchr and ucstrstr that take and return a non-const char *, and fix the violations • new cstrchr, cstrstr (take and give const char *) • new vstrchr, vstrstr (take const or not, give boolean value) • new afreechk(x) = afreechv(x,x) = if (x1) afree(x2, ATEMP) • new ksh_isdash(str) = (str != NULL) && !strcmp(str, "-") • replace the only use of strrchr with inlined code to shrink • minor man page fixes • Minix 3 signames are autogenerated with gcc • rename strlfun.c to strlcpy.c since we don't do strlcat(3) anyway, only strlcpy(3), and shorten it • dot.mkshrc: move MKSH=… down to the export line to not disturb the PS1 visual impression ☺ • dot.mkshrc: Lstripcom(): optimise • bump version ¹) side effect from creating API-correct cstrchr, cstrstr, etc. uses goto so it must be better ☻ tested on mirbsd-current via both Makefile and Build.sh
2007-03-04 04:04:28 +01:00
return (1);
Add mirbsdksh R21, which was developed in a temporary external CVS repo- sitory whose ChangeLog follows. mksh R21 is licenced under the MirOS li- cence, shown in "sh.h", and a two-clause UCB-style licence by Marc Espie as shown in "alloc.c". This executable is a fair bit smaller and shorter than our /bin/ksh that it is designed to eventually replace (as /bin/sh hardlink), with the old /bin/ksh to completely vanish. It is still in beta testing though, and I don't think it will compile on other operating systems. mksh R21 is a completely new port, bringing together the OpenBSD-current /bin/ksh, the MirOS-current /bin/ksh and the older mksh R20 (which still was portable, ocvs-based).
2005-05-23 05:06:10 +02:00
}
static void
evalerr(Expr_state *es, enum error_type type, const char *str)
{
char tbuf[2];
const char *s;
es->arith = false;
switch (type) {
case ET_UNEXPECTED:
switch (es->tok) {
case VAR:
s = es->val->name;
break;
case LIT:
s = str_val(es->val);
break;
case END:
s = "end of expression";
break;
case BAD:
tbuf[0] = *es->tokp;
tbuf[1] = '\0';
s = tbuf;
break;
default:
shave off 12 bytes (with fixed gcc) by making the definitions more legible (and dropping struct padding, tbh)
2016-07-27 02:55:27 +02:00
s = opname[(int)es->tok];
Add mirbsdksh R21, which was developed in a temporary external CVS repo- sitory whose ChangeLog follows. mksh R21 is licenced under the MirOS li- cence, shown in "sh.h", and a two-clause UCB-style licence by Marc Espie as shown in "alloc.c". This executable is a fair bit smaller and shorter than our /bin/ksh that it is designed to eventually replace (as /bin/sh hardlink), with the old /bin/ksh to completely vanish. It is still in beta testing though, and I don't think it will compile on other operating systems. mksh R21 is a completely new port, bringing together the OpenBSD-current /bin/ksh, the MirOS-current /bin/ksh and the older mksh R20 (which still was portable, ocvs-based).
2005-05-23 05:06:10 +02:00
}
rework string pooling; disable our own (rely on compiler’s)… • if HAVE_STRING_POOLING is set to 1 • if HAVE_STRING_POOLING is set to 2 and not GCC < 4 is used • if HAVE_STRING_POOLING is not set to 0 and LLVM or GCC >= 4 is used Closes: LP#1580348
2016-07-25 02:04:48 +02:00
warningf(true, Tf_sD_s_qs, es->expression,
Tunexpected, s);
Add mirbsdksh R21, which was developed in a temporary external CVS repo- sitory whose ChangeLog follows. mksh R21 is licenced under the MirOS li- cence, shown in "sh.h", and a two-clause UCB-style licence by Marc Espie as shown in "alloc.c". This executable is a fair bit smaller and shorter than our /bin/ksh that it is designed to eventually replace (as /bin/sh hardlink), with the old /bin/ksh to completely vanish. It is still in beta testing though, and I don't think it will compile on other operating systems. mksh R21 is a completely new port, bringing together the OpenBSD-current /bin/ksh, the MirOS-current /bin/ksh and the older mksh R20 (which still was portable, ocvs-based).
2005-05-23 05:06:10 +02:00
break;
case ET_BADLIT:
rework string pooling; disable our own (rely on compiler’s)… • if HAVE_STRING_POOLING is set to 1 • if HAVE_STRING_POOLING is set to 2 and not GCC < 4 is used • if HAVE_STRING_POOLING is not set to 0 and LLVM or GCC >= 4 is used Closes: LP#1580348
2016-07-25 02:04:48 +02:00
warningf(true, Tf_sD_s_qs, es->expression,
improve string pooling: saves 316 bytes in .text
2010-08-28 20:50:58 +02:00
"bad number", str);
Add mirbsdksh R21, which was developed in a temporary external CVS repo- sitory whose ChangeLog follows. mksh R21 is licenced under the MirOS li- cence, shown in "sh.h", and a two-clause UCB-style licence by Marc Espie as shown in "alloc.c". This executable is a fair bit smaller and shorter than our /bin/ksh that it is designed to eventually replace (as /bin/sh hardlink), with the old /bin/ksh to completely vanish. It is still in beta testing though, and I don't think it will compile on other operating systems. mksh R21 is a completely new port, bringing together the OpenBSD-current /bin/ksh, the MirOS-current /bin/ksh and the older mksh R20 (which still was portable, ocvs-based).
2005-05-23 05:06:10 +02:00
break;
case ET_RECURSIVE:
rework string pooling; disable our own (rely on compiler’s)… • if HAVE_STRING_POOLING is set to 1 • if HAVE_STRING_POOLING is set to 2 and not GCC < 4 is used • if HAVE_STRING_POOLING is not set to 0 and LLVM or GCC >= 4 is used Closes: LP#1580348
2016-07-25 02:04:48 +02:00
warningf(true, Tf_sD_s_qs, es->expression,
improve string pooling: saves 316 bytes in .text
2010-08-28 20:50:58 +02:00
"expression recurses on parameter", str);
Add mirbsdksh R21, which was developed in a temporary external CVS repo- sitory whose ChangeLog follows. mksh R21 is licenced under the MirOS li- cence, shown in "sh.h", and a two-clause UCB-style licence by Marc Espie as shown in "alloc.c". This executable is a fair bit smaller and shorter than our /bin/ksh that it is designed to eventually replace (as /bin/sh hardlink), with the old /bin/ksh to completely vanish. It is still in beta testing though, and I don't think it will compile on other operating systems. mksh R21 is a completely new port, bringing together the OpenBSD-current /bin/ksh, the MirOS-current /bin/ksh and the older mksh R20 (which still was portable, ocvs-based).
2005-05-23 05:06:10 +02:00
break;
case ET_LVALUE:
rework string pooling; disable our own (rely on compiler’s)… • if HAVE_STRING_POOLING is set to 1 • if HAVE_STRING_POOLING is set to 2 and not GCC < 4 is used • if HAVE_STRING_POOLING is not set to 0 and LLVM or GCC >= 4 is used Closes: LP#1580348
2016-07-25 02:04:48 +02:00
warningf(true, Tf_sD_s_s,
improve string pooling: saves 316 bytes in .text
2010-08-28 20:50:58 +02:00
es->expression, str, "requires lvalue");
Add mirbsdksh R21, which was developed in a temporary external CVS repo- sitory whose ChangeLog follows. mksh R21 is licenced under the MirOS li- cence, shown in "sh.h", and a two-clause UCB-style licence by Marc Espie as shown in "alloc.c". This executable is a fair bit smaller and shorter than our /bin/ksh that it is designed to eventually replace (as /bin/sh hardlink), with the old /bin/ksh to completely vanish. It is still in beta testing though, and I don't think it will compile on other operating systems. mksh R21 is a completely new port, bringing together the OpenBSD-current /bin/ksh, the MirOS-current /bin/ksh and the older mksh R20 (which still was portable, ocvs-based).
2005-05-23 05:06:10 +02:00
break;
case ET_RDONLY:
rework string pooling; disable our own (rely on compiler’s)… • if HAVE_STRING_POOLING is set to 1 • if HAVE_STRING_POOLING is set to 2 and not GCC < 4 is used • if HAVE_STRING_POOLING is not set to 0 and LLVM or GCC >= 4 is used Closes: LP#1580348
2016-07-25 02:04:48 +02:00
warningf(true, Tf_sD_s_s,
skip R/O check in an unevaluated ternary part; 10x jilles
2011-12-16 21:03:02 +01:00
es->expression, str, "applied to read-only variable");
Add mirbsdksh R21, which was developed in a temporary external CVS repo- sitory whose ChangeLog follows. mksh R21 is licenced under the MirOS li- cence, shown in "sh.h", and a two-clause UCB-style licence by Marc Espie as shown in "alloc.c". This executable is a fair bit smaller and shorter than our /bin/ksh that it is designed to eventually replace (as /bin/sh hardlink), with the old /bin/ksh to completely vanish. It is still in beta testing though, and I don't think it will compile on other operating systems. mksh R21 is a completely new port, bringing together the OpenBSD-current /bin/ksh, the MirOS-current /bin/ksh and the older mksh R20 (which still was portable, ocvs-based).
2005-05-23 05:06:10 +02:00
break;
default: /* keep gcc happy */
case ET_STR:
rework string pooling; disable our own (rely on compiler’s)… • if HAVE_STRING_POOLING is set to 1 • if HAVE_STRING_POOLING is set to 2 and not GCC < 4 is used • if HAVE_STRING_POOLING is not set to 0 and LLVM or GCC >= 4 is used Closes: LP#1580348
2016-07-25 02:04:48 +02:00
warningf(true, Tf_sD_s, es->expression, str);
Add mirbsdksh R21, which was developed in a temporary external CVS repo- sitory whose ChangeLog follows. mksh R21 is licenced under the MirOS li- cence, shown in "sh.h", and a two-clause UCB-style licence by Marc Espie as shown in "alloc.c". This executable is a fair bit smaller and shorter than our /bin/ksh that it is designed to eventually replace (as /bin/sh hardlink), with the old /bin/ksh to completely vanish. It is still in beta testing though, and I don't think it will compile on other operating systems. mksh R21 is a completely new port, bringing together the OpenBSD-current /bin/ksh, the MirOS-current /bin/ksh and the older mksh R20 (which still was portable, ocvs-based).
2005-05-23 05:06:10 +02:00
break;
}
unwind(LAEXPR);
}
begin using unsigned arithmetics internally as much as possible (i.e. where signedness doesn’t matter, given -fwrapv) and note where there’s work to do; note future improvements and additions; optimise a little mostly untested
2013-03-31 20:33:13 +02:00
/* do a ++ or -- operation */
static struct tbl *
do_ppmm(Expr_state *es, enum token op, struct tbl *vasn, bool is_prefix)
{
struct tbl *vl;
mksh_uari_t oval;
assign_check(es, op, vasn);
vl = intvar(es, vasn);
oval = vl->val.u;
if (op == O_PLUSPLUS)
++vl->val.u;
else
--vl->val.u;
fix postun in not evaluated side of e.g. ternary operator (LP#1187729)
2013-07-21 20:38:56 +02:00
if (!es->noassign) {
if (vasn->flag & INTEGER)
setint_v(vasn, vl, es->arith);
else
setint(vasn, vl->val.i);
}
begin using unsigned arithmetics internally as much as possible (i.e. where signedness doesn’t matter, given -fwrapv) and note where there’s work to do; note future improvements and additions; optimise a little mostly untested
2013-03-31 20:33:13 +02:00
if (!is_prefix)
/* undo the increment/decrement */
vl->val.u = oval;
return (vl);
}
Add mirbsdksh R21, which was developed in a temporary external CVS repo- sitory whose ChangeLog follows. mksh R21 is licenced under the MirOS li- cence, shown in "sh.h", and a two-clause UCB-style licence by Marc Espie as shown in "alloc.c". This executable is a fair bit smaller and shorter than our /bin/ksh that it is designed to eventually replace (as /bin/sh hardlink), with the old /bin/ksh to completely vanish. It is still in beta testing though, and I don't think it will compile on other operating systems. mksh R21 is a completely new port, bringing together the OpenBSD-current /bin/ksh, the MirOS-current /bin/ksh and the older mksh R20 (which still was portable, ocvs-based).
2005-05-23 05:06:10 +02:00
static struct tbl *
another intermediate step/commit to get arithmetics right: do the correct operations for comparisons (just keep using the signed/unsigned switch from bivui for them), division (by working on absolutes and adding the sign at the end), modulo (stupidly by divising in signed, multiplying and subtracting, to get the sign of the result right) also adds rotation XXX to check: do we need to AND before assigning the result in division?
2013-04-14 15:36:53 +02:00
evalexpr(Expr_state *es, unsigned int prec)
Add mirbsdksh R21, which was developed in a temporary external CVS repo- sitory whose ChangeLog follows. mksh R21 is licenced under the MirOS li- cence, shown in "sh.h", and a two-clause UCB-style licence by Marc Espie as shown in "alloc.c". This executable is a fair bit smaller and shorter than our /bin/ksh that it is designed to eventually replace (as /bin/sh hardlink), with the old /bin/ksh to completely vanish. It is still in beta testing though, and I don't think it will compile on other operating systems. mksh R21 is a completely new port, bringing together the OpenBSD-current /bin/ksh, the MirOS-current /bin/ksh and the older mksh R20 (which still was portable, ocvs-based).
2005-05-23 05:06:10 +02:00
{
struct tbl *vl, *vr = NULL, *vasn;
enum token op;
another intermediate step/commit to get arithmetics right: do the correct operations for comparisons (just keep using the signed/unsigned switch from bivui for them), division (by working on absolutes and adding the sign at the end), modulo (stupidly by divising in signed, multiplying and subtracting, to get the sign of the result right) also adds rotation XXX to check: do we need to AND before assigning the result in division?
2013-04-14 15:36:53 +02:00
mksh_uari_t res = 0, t1, t2, t3;
Add mirbsdksh R21, which was developed in a temporary external CVS repo- sitory whose ChangeLog follows. mksh R21 is licenced under the MirOS li- cence, shown in "sh.h", and a two-clause UCB-style licence by Marc Espie as shown in "alloc.c". This executable is a fair bit smaller and shorter than our /bin/ksh that it is designed to eventually replace (as /bin/sh hardlink), with the old /bin/ksh to completely vanish. It is still in beta testing though, and I don't think it will compile on other operating systems. mksh R21 is a completely new port, bringing together the OpenBSD-current /bin/ksh, the MirOS-current /bin/ksh and the older mksh R20 (which still was portable, ocvs-based).
2005-05-23 05:06:10 +02:00
if (prec == P_PRIMARY) {
begin using unsigned arithmetics internally as much as possible (i.e. where signedness doesn’t matter, given -fwrapv) and note where there’s work to do; note future improvements and additions; optimise a little mostly untested
2013-03-31 20:33:13 +02:00
switch ((int)(op = es->tok)) {
case O_BNOT:
case O_LNOT:
case O_MINUS:
case O_PLUS:
don't have two functions token(), helps ctags
2007-03-03 22:12:51 +01:00
exprtoken(es);
Add mirbsdksh R21, which was developed in a temporary external CVS repo- sitory whose ChangeLog follows. mksh R21 is licenced under the MirOS li- cence, shown in "sh.h", and a two-clause UCB-style licence by Marc Espie as shown in "alloc.c". This executable is a fair bit smaller and shorter than our /bin/ksh that it is designed to eventually replace (as /bin/sh hardlink), with the old /bin/ksh to completely vanish. It is still in beta testing though, and I don't think it will compile on other operating systems. mksh R21 is a completely new port, bringing together the OpenBSD-current /bin/ksh, the MirOS-current /bin/ksh and the older mksh R20 (which still was portable, ocvs-based).
2005-05-23 05:06:10 +02:00
vl = intvar(es, evalexpr(es, P_PRIMARY));
begin using unsigned arithmetics internally as much as possible (i.e. where signedness doesn’t matter, given -fwrapv) and note where there’s work to do; note future improvements and additions; optimise a little mostly untested
2013-03-31 20:33:13 +02:00
switch ((int)op) {
case O_BNOT:
vl->val.u = ~vl->val.u;
break;
case O_LNOT:
vl->val.u = !vl->val.u;
break;
case O_MINUS:
vl->val.u = -vl->val.u;
break;
case O_PLUS:
/* nop */
break;
}
break;
case OPEN_PAREN:
don't have two functions token(), helps ctags
2007-03-03 22:12:51 +01:00
exprtoken(es);
Add mirbsdksh R21, which was developed in a temporary external CVS repo- sitory whose ChangeLog follows. mksh R21 is licenced under the MirOS li- cence, shown in "sh.h", and a two-clause UCB-style licence by Marc Espie as shown in "alloc.c". This executable is a fair bit smaller and shorter than our /bin/ksh that it is designed to eventually replace (as /bin/sh hardlink), with the old /bin/ksh to completely vanish. It is still in beta testing though, and I don't think it will compile on other operating systems. mksh R21 is a completely new port, bringing together the OpenBSD-current /bin/ksh, the MirOS-current /bin/ksh and the older mksh R20 (which still was portable, ocvs-based).
2005-05-23 05:06:10 +02:00
vl = evalexpr(es, MAX_PREC);
if (es->tok != CLOSE_PAREN)
evalerr(es, ET_STR, "missing )");
don't have two functions token(), helps ctags
2007-03-03 22:12:51 +01:00
exprtoken(es);
begin using unsigned arithmetics internally as much as possible (i.e. where signedness doesn’t matter, given -fwrapv) and note where there’s work to do; note future improvements and additions; optimise a little mostly untested
2013-03-31 20:33:13 +02:00
break;
case O_PLUSPLUS:
case O_MINUSMINUS:
don't have two functions token(), helps ctags
2007-03-03 22:12:51 +01:00
exprtoken(es);
Add mirbsdksh R21, which was developed in a temporary external CVS repo- sitory whose ChangeLog follows. mksh R21 is licenced under the MirOS li- cence, shown in "sh.h", and a two-clause UCB-style licence by Marc Espie as shown in "alloc.c". This executable is a fair bit smaller and shorter than our /bin/ksh that it is designed to eventually replace (as /bin/sh hardlink), with the old /bin/ksh to completely vanish. It is still in beta testing though, and I don't think it will compile on other operating systems. mksh R21 is a completely new port, bringing together the OpenBSD-current /bin/ksh, the MirOS-current /bin/ksh and the older mksh R20 (which still was portable, ocvs-based).
2005-05-23 05:06:10 +02:00
vl = do_ppmm(es, op, es->val, true);
don't have two functions token(), helps ctags
2007-03-03 22:12:51 +01:00
exprtoken(es);
begin using unsigned arithmetics internally as much as possible (i.e. where signedness doesn’t matter, given -fwrapv) and note where there’s work to do; note future improvements and additions; optimise a little mostly untested
2013-03-31 20:33:13 +02:00
break;
case VAR:
case LIT:
Add mirbsdksh R21, which was developed in a temporary external CVS repo- sitory whose ChangeLog follows. mksh R21 is licenced under the MirOS li- cence, shown in "sh.h", and a two-clause UCB-style licence by Marc Espie as shown in "alloc.c". This executable is a fair bit smaller and shorter than our /bin/ksh that it is designed to eventually replace (as /bin/sh hardlink), with the old /bin/ksh to completely vanish. It is still in beta testing though, and I don't think it will compile on other operating systems. mksh R21 is a completely new port, bringing together the OpenBSD-current /bin/ksh, the MirOS-current /bin/ksh and the older mksh R20 (which still was portable, ocvs-based).
2005-05-23 05:06:10 +02:00
vl = es->val;
don't have two functions token(), helps ctags
2007-03-03 22:12:51 +01:00
exprtoken(es);
begin using unsigned arithmetics internally as much as possible (i.e. where signedness doesn’t matter, given -fwrapv) and note where there’s work to do; note future improvements and additions; optimise a little mostly untested
2013-03-31 20:33:13 +02:00
break;
default:
Add mirbsdksh R21, which was developed in a temporary external CVS repo- sitory whose ChangeLog follows. mksh R21 is licenced under the MirOS li- cence, shown in "sh.h", and a two-clause UCB-style licence by Marc Espie as shown in "alloc.c". This executable is a fair bit smaller and shorter than our /bin/ksh that it is designed to eventually replace (as /bin/sh hardlink), with the old /bin/ksh to completely vanish. It is still in beta testing though, and I don't think it will compile on other operating systems. mksh R21 is a completely new port, bringing together the OpenBSD-current /bin/ksh, the MirOS-current /bin/ksh and the older mksh R20 (which still was portable, ocvs-based).
2005-05-23 05:06:10 +02:00
evalerr(es, ET_UNEXPECTED, NULL);
apply some fixes from OpenBSD and don't apply some others but sync RCS IDs for easier future adaption: * Simplify savefd() by removing the "noclose" flag and make noclose behavior the default. Almost all uses of savefd() are followed by an implicit or explicit close. * fix typos * might as well make ksh_getopt() match real getopt(), ie. get rid of that stupid EOF concept that was never true. adobriyan@gmail * use SEEK_* for lseek() * fix lint comments, no functional changes * remove excessive optimization; from adobriyan@gmail * only santa checks things twice; from adobriyan@gmail * Interpret zero-filled numbers as decimal; PR 4213; from Alexey Dobriyan
2006-05-10 20:54:13 +02:00
/* NOTREACHED */
Add mirbsdksh R21, which was developed in a temporary external CVS repo- sitory whose ChangeLog follows. mksh R21 is licenced under the MirOS li- cence, shown in "sh.h", and a two-clause UCB-style licence by Marc Espie as shown in "alloc.c". This executable is a fair bit smaller and shorter than our /bin/ksh that it is designed to eventually replace (as /bin/sh hardlink), with the old /bin/ksh to completely vanish. It is still in beta testing though, and I don't think it will compile on other operating systems. mksh R21 is a completely new port, bringing together the OpenBSD-current /bin/ksh, the MirOS-current /bin/ksh and the older mksh R20 (which still was portable, ocvs-based).
2005-05-23 05:06:10 +02:00
}
begin using unsigned arithmetics internally as much as possible (i.e. where signedness doesn’t matter, given -fwrapv) and note where there’s work to do; note future improvements and additions; optimise a little mostly untested
2013-03-31 20:33:13 +02:00
Add mirbsdksh R21, which was developed in a temporary external CVS repo- sitory whose ChangeLog follows. mksh R21 is licenced under the MirOS li- cence, shown in "sh.h", and a two-clause UCB-style licence by Marc Espie as shown in "alloc.c". This executable is a fair bit smaller and shorter than our /bin/ksh that it is designed to eventually replace (as /bin/sh hardlink), with the old /bin/ksh to completely vanish. It is still in beta testing though, and I don't think it will compile on other operating systems. mksh R21 is a completely new port, bringing together the OpenBSD-current /bin/ksh, the MirOS-current /bin/ksh and the older mksh R20 (which still was portable, ocvs-based).
2005-05-23 05:06:10 +02:00
if (es->tok == O_PLUSPLUS || es->tok == O_MINUSMINUS) {
vl = do_ppmm(es, es->tok, vl, false);
don't have two functions token(), helps ctags
2007-03-03 22:12:51 +01:00
exprtoken(es);
Add mirbsdksh R21, which was developed in a temporary external CVS repo- sitory whose ChangeLog follows. mksh R21 is licenced under the MirOS li- cence, shown in "sh.h", and a two-clause UCB-style licence by Marc Espie as shown in "alloc.c". This executable is a fair bit smaller and shorter than our /bin/ksh that it is designed to eventually replace (as /bin/sh hardlink), with the old /bin/ksh to completely vanish. It is still in beta testing though, and I don't think it will compile on other operating systems. mksh R21 is a completely new port, bringing together the OpenBSD-current /bin/ksh, the MirOS-current /bin/ksh and the older mksh R20 (which still was portable, ocvs-based).
2005-05-23 05:06:10 +02:00
}
begin using unsigned arithmetics internally as much as possible (i.e. where signedness doesn’t matter, given -fwrapv) and note where there’s work to do; note future improvements and additions; optimise a little mostly untested
2013-03-31 20:33:13 +02:00
• remove strcasestr.c, use home-grown implementation¹, call it stricmp, and have it return an API-correct const char * • enhance and stylify comments • a little KNF and simplifications • #ifdef DEBUG: replace strchr and strstr with ucstrchr and ucstrstr that take and return a non-const char *, and fix the violations • new cstrchr, cstrstr (take and give const char *) • new vstrchr, vstrstr (take const or not, give boolean value) • new afreechk(x) = afreechv(x,x) = if (x1) afree(x2, ATEMP) • new ksh_isdash(str) = (str != NULL) && !strcmp(str, "-") • replace the only use of strrchr with inlined code to shrink • minor man page fixes • Minix 3 signames are autogenerated with gcc • rename strlfun.c to strlcpy.c since we don't do strlcat(3) anyway, only strlcpy(3), and shorten it • dot.mkshrc: move MKSH=… down to the export line to not disturb the PS1 visual impression ☺ • dot.mkshrc: Lstripcom(): optimise • bump version ¹) side effect from creating API-correct cstrchr, cstrstr, etc. uses goto so it must be better ☻ tested on mirbsd-current via both Makefile and Build.sh
2007-03-04 04:04:28 +01:00
return (vl);
begin using unsigned arithmetics internally as much as possible (i.e. where signedness doesn’t matter, given -fwrapv) and note where there’s work to do; note future improvements and additions; optimise a little mostly untested
2013-03-31 20:33:13 +02:00
/* prec == P_PRIMARY */
Add mirbsdksh R21, which was developed in a temporary external CVS repo- sitory whose ChangeLog follows. mksh R21 is licenced under the MirOS li- cence, shown in "sh.h", and a two-clause UCB-style licence by Marc Espie as shown in "alloc.c". This executable is a fair bit smaller and shorter than our /bin/ksh that it is designed to eventually replace (as /bin/sh hardlink), with the old /bin/ksh to completely vanish. It is still in beta testing though, and I don't think it will compile on other operating systems. mksh R21 is a completely new port, bringing together the OpenBSD-current /bin/ksh, the MirOS-current /bin/ksh and the older mksh R20 (which still was portable, ocvs-based).
2005-05-23 05:06:10 +02:00
}
begin using unsigned arithmetics internally as much as possible (i.e. where signedness doesn’t matter, given -fwrapv) and note where there’s work to do; note future improvements and additions; optimise a little mostly untested
2013-03-31 20:33:13 +02:00
don’t do arithmetics on an enumerated type, sez the MIPSpro complainer
2008-03-28 14:33:37 +01:00
vl = evalexpr(es, prec - 1);
begin using unsigned arithmetics internally as much as possible (i.e. where signedness doesn’t matter, given -fwrapv) and note where there’s work to do; note future improvements and additions; optimise a little mostly untested
2013-03-31 20:33:13 +02:00
while ((int)(op = es->tok) >= (int)O_EQ && (int)op <= (int)O_COMMA &&
shave off 12 bytes (with fixed gcc) by making the definitions more legible (and dropping struct padding, tbh)
2016-07-27 02:55:27 +02:00
opprec[(int)op] == prec) {
fix lazy evaluation with side effects; spotted by ormaaj via IRC
2016-11-07 17:58:48 +01:00
switch ((int)op) {
case O_TERN:
case O_LAND:
case O_LOR:
break;
default:
exprtoken(es);
}
Add mirbsdksh R21, which was developed in a temporary external CVS repo- sitory whose ChangeLog follows. mksh R21 is licenced under the MirOS li- cence, shown in "sh.h", and a two-clause UCB-style licence by Marc Espie as shown in "alloc.c". This executable is a fair bit smaller and shorter than our /bin/ksh that it is designed to eventually replace (as /bin/sh hardlink), with the old /bin/ksh to completely vanish. It is still in beta testing though, and I don't think it will compile on other operating systems. mksh R21 is a completely new port, bringing together the OpenBSD-current /bin/ksh, the MirOS-current /bin/ksh and the older mksh R20 (which still was portable, ocvs-based).
2005-05-23 05:06:10 +02:00
vasn = vl;
actually, behave with silent wraparound; results validated by bc(1)
2011-12-11 02:56:43 +01:00
if (op != O_ASN)
/* vl may not have a value yet */
Add mirbsdksh R21, which was developed in a temporary external CVS repo- sitory whose ChangeLog follows. mksh R21 is licenced under the MirOS li- cence, shown in "sh.h", and a two-clause UCB-style licence by Marc Espie as shown in "alloc.c". This executable is a fair bit smaller and shorter than our /bin/ksh that it is designed to eventually replace (as /bin/sh hardlink), with the old /bin/ksh to completely vanish. It is still in beta testing though, and I don't think it will compile on other operating systems. mksh R21 is a completely new port, bringing together the OpenBSD-current /bin/ksh, the MirOS-current /bin/ksh and the older mksh R20 (which still was portable, ocvs-based).
2005-05-23 05:06:10 +02:00
vl = intvar(es, vl);
if (IS_ASSIGNOP(op)) {
skip R/O check in an unevaluated ternary part; 10x jilles
2011-12-16 21:03:02 +01:00
if (!es->noassign)
assign_check(es, op, vasn);
Add mirbsdksh R21, which was developed in a temporary external CVS repo- sitory whose ChangeLog follows. mksh R21 is licenced under the MirOS li- cence, shown in "sh.h", and a two-clause UCB-style licence by Marc Espie as shown in "alloc.c". This executable is a fair bit smaller and shorter than our /bin/ksh that it is designed to eventually replace (as /bin/sh hardlink), with the old /bin/ksh to completely vanish. It is still in beta testing though, and I don't think it will compile on other operating systems. mksh R21 is a completely new port, bringing together the OpenBSD-current /bin/ksh, the MirOS-current /bin/ksh and the older mksh R20 (which still was portable, ocvs-based).
2005-05-23 05:06:10 +02:00
vr = intvar(es, evalexpr(es, P_ASSIGN));
begin using unsigned arithmetics internally as much as possible (i.e. where signedness doesn’t matter, given -fwrapv) and note where there’s work to do; note future improvements and additions; optimise a little mostly untested
2013-03-31 20:33:13 +02:00
} else if (op == O_TERN) {
bool ev = vl->val.u != 0;
if (!ev)
es->noassign++;
fix lazy evaluation with side effects; spotted by ormaaj via IRC
2016-11-07 17:58:48 +01:00
exprtoken(es);
begin using unsigned arithmetics internally as much as possible (i.e. where signedness doesn’t matter, given -fwrapv) and note where there’s work to do; note future improvements and additions; optimise a little mostly untested
2013-03-31 20:33:13 +02:00
vl = evalexpr(es, MAX_PREC);
if (!ev)
es->noassign--;
if (es->tok != CTERN)
evalerr(es, ET_STR, "missing :");
if (ev)
es->noassign++;
fix lazy evaluation with side effects; spotted by ormaaj via IRC
2016-11-07 17:58:48 +01:00
exprtoken(es);
begin using unsigned arithmetics internally as much as possible (i.e. where signedness doesn’t matter, given -fwrapv) and note where there’s work to do; note future improvements and additions; optimise a little mostly untested
2013-03-31 20:33:13 +02:00
vr = evalexpr(es, P_TERN);
if (ev)
es->noassign--;
vl = ev ? vl : vr;
continue;
} else if (op != O_LAND && op != O_LOR)
don’t do arithmetics on an enumerated type, sez the MIPSpro complainer
2008-03-28 14:33:37 +01:00
vr = intvar(es, evalexpr(es, prec - 1));
begin using unsigned arithmetics internally as much as possible (i.e. where signedness doesn’t matter, given -fwrapv) and note where there’s work to do; note future improvements and additions; optimise a little mostly untested
2013-03-31 20:33:13 +02:00
another intermediate step/commit to get arithmetics right: do the correct operations for comparisons (just keep using the signed/unsigned switch from bivui for them), division (by working on absolutes and adding the sign at the end), modulo (stupidly by divising in signed, multiplying and subtracting, to get the sign of the result right) also adds rotation XXX to check: do we need to AND before assigning the result in division?
2013-04-14 15:36:53 +02:00
/* common ops setup */
implement unsigned arithmetics as an mksh extension
2008-12-17 20:39:23 +01:00
switch ((int)op) {
Add mirbsdksh R21, which was developed in a temporary external CVS repo- sitory whose ChangeLog follows. mksh R21 is licenced under the MirOS li- cence, shown in "sh.h", and a two-clause UCB-style licence by Marc Espie as shown in "alloc.c". This executable is a fair bit smaller and shorter than our /bin/ksh that it is designed to eventually replace (as /bin/sh hardlink), with the old /bin/ksh to completely vanish. It is still in beta testing though, and I don't think it will compile on other operating systems. mksh R21 is a completely new port, bringing together the OpenBSD-current /bin/ksh, the MirOS-current /bin/ksh and the older mksh R20 (which still was portable, ocvs-based).
2005-05-23 05:06:10 +02:00
case O_DIV:
case O_DIVASN:
case O_MOD:
case O_MODASN:
another intermediate step/commit to get arithmetics right: do the correct operations for comparisons (just keep using the signed/unsigned switch from bivui for them), division (by working on absolutes and adding the sign at the end), modulo (stupidly by divising in signed, multiplying and subtracting, to get the sign of the result right) also adds rotation XXX to check: do we need to AND before assigning the result in division?
2013-04-14 15:36:53 +02:00
if (vr->val.u == 0) {
if (!es->noassign)
evalerr(es, ET_STR, "zero divisor");
vr->val.u = 1;
begin using unsigned arithmetics internally as much as possible (i.e. where signedness doesn’t matter, given -fwrapv) and note where there’s work to do; note future improvements and additions; optimise a little mostly untested
2013-03-31 20:33:13 +02:00
}
another intermediate step/commit to get arithmetics right: do the correct operations for comparisons (just keep using the signed/unsigned switch from bivui for them), division (by working on absolutes and adding the sign at the end), modulo (stupidly by divising in signed, multiplying and subtracting, to get the sign of the result right) also adds rotation XXX to check: do we need to AND before assigning the result in division?
2013-04-14 15:36:53 +02:00
/* calculate the absolute values */
t1 = vl->val.i < 0 ? -vl->val.u : vl->val.u;
t2 = vr->val.i < 0 ? -vr->val.u : vr->val.u;
break;
#ifndef MKSH_LEGACY_MODE
case O_LSHIFT:
case O_LSHIFTASN:
case O_RSHIFT:
case O_RSHIFTASN:
case O_ROL:
case O_ROLASN:
case O_ROR:
case O_RORASN:
t1 = vl->val.u;
t2 = vr->val.u & 31;
break;
#endif
case O_LAND:
case O_LOR:
t1 = vl->val.u;
t2 = 0; /* gcc */
break;
default:
t1 = vl->val.u;
t2 = vr->val.u;
begin using unsigned arithmetics internally as much as possible (i.e. where signedness doesn’t matter, given -fwrapv) and note where there’s work to do; note future improvements and additions; optimise a little mostly untested
2013-03-31 20:33:13 +02:00
break;
another intermediate step/commit to get arithmetics right: do the correct operations for comparisons (just keep using the signed/unsigned switch from bivui for them), division (by working on absolutes and adding the sign at the end), modulo (stupidly by divising in signed, multiplying and subtracting, to get the sign of the result right) also adds rotation XXX to check: do we need to AND before assigning the result in division?
2013-04-14 15:36:53 +02:00
}
#define cmpop(op) (es->natural ? \
(mksh_uari_t)(vl->val.u op vr->val.u) : \
(mksh_uari_t)(vl->val.i op vr->val.i) \
)
/* op calculation */
switch ((int)op) {
begin using unsigned arithmetics internally as much as possible (i.e. where signedness doesn’t matter, given -fwrapv) and note where there’s work to do; note future improvements and additions; optimise a little mostly untested
2013-03-31 20:33:13 +02:00
case O_TIMES:
case O_TIMESASN:
another intermediate step/commit to get arithmetics right: do the correct operations for comparisons (just keep using the signed/unsigned switch from bivui for them), division (by working on absolutes and adding the sign at the end), modulo (stupidly by divising in signed, multiplying and subtracting, to get the sign of the result right) also adds rotation XXX to check: do we need to AND before assigning the result in division?
2013-04-14 15:36:53 +02:00
res = t1 * t2;
break;
case O_MOD:
case O_MODASN:
if (es->natural) {
res = vl->val.u % vr->val.u;
break;
}
goto signed_division;
case O_DIV:
case O_DIVASN:
if (es->natural) {
res = vl->val.u / vr->val.u;
break;
}
signed_division:
/*
* a / b = abs(a) / abs(b) * sgn((u)a^(u)b)
*/
t3 = t1 / t2;
#ifndef MKSH_LEGACY_MODE
res = ((vl->val.u ^ vr->val.u) & 0x80000000) ? -t3 : t3;
#else
res = ((t1 == vl->val.u ? 0 : 1) ^
(t2 == vr->val.u ? 0 : 1)) ? -t3 : t3;
#endif
if (op == O_MOD || op == O_MODASN) {
/*
* primitive modulo, to get the sign of
* the result correct:
* (a % b) = a - ((a / b) * b)
* the subtraction and multiplication
* are, amazingly enough, sign ignorant
*/
res = vl->val.u - (res * vr->val.u);
}
Add mirbsdksh R21, which was developed in a temporary external CVS repo- sitory whose ChangeLog follows. mksh R21 is licenced under the MirOS li- cence, shown in "sh.h", and a two-clause UCB-style licence by Marc Espie as shown in "alloc.c". This executable is a fair bit smaller and shorter than our /bin/ksh that it is designed to eventually replace (as /bin/sh hardlink), with the old /bin/ksh to completely vanish. It is still in beta testing though, and I don't think it will compile on other operating systems. mksh R21 is a completely new port, bringing together the OpenBSD-current /bin/ksh, the MirOS-current /bin/ksh and the older mksh R20 (which still was portable, ocvs-based).
2005-05-23 05:06:10 +02:00
break;
case O_PLUS:
case O_PLUSASN:
another intermediate step/commit to get arithmetics right: do the correct operations for comparisons (just keep using the signed/unsigned switch from bivui for them), division (by working on absolutes and adding the sign at the end), modulo (stupidly by divising in signed, multiplying and subtracting, to get the sign of the result right) also adds rotation XXX to check: do we need to AND before assigning the result in division?
2013-04-14 15:36:53 +02:00
res = t1 + t2;
Add mirbsdksh R21, which was developed in a temporary external CVS repo- sitory whose ChangeLog follows. mksh R21 is licenced under the MirOS li- cence, shown in "sh.h", and a two-clause UCB-style licence by Marc Espie as shown in "alloc.c". This executable is a fair bit smaller and shorter than our /bin/ksh that it is designed to eventually replace (as /bin/sh hardlink), with the old /bin/ksh to completely vanish. It is still in beta testing though, and I don't think it will compile on other operating systems. mksh R21 is a completely new port, bringing together the OpenBSD-current /bin/ksh, the MirOS-current /bin/ksh and the older mksh R20 (which still was portable, ocvs-based).
2005-05-23 05:06:10 +02:00
break;
case O_MINUS:
case O_MINUSASN:
another intermediate step/commit to get arithmetics right: do the correct operations for comparisons (just keep using the signed/unsigned switch from bivui for them), division (by working on absolutes and adding the sign at the end), modulo (stupidly by divising in signed, multiplying and subtracting, to get the sign of the result right) also adds rotation XXX to check: do we need to AND before assigning the result in division?
2013-04-14 15:36:53 +02:00
res = t1 - t2;
break;
#ifndef MKSH_LEGACY_MODE
case O_ROL:
case O_ROLASN:
res = (t1 << t2) | (t1 >> (32 - t2));
break;
case O_ROR:
case O_RORASN:
res = (t1 >> t2) | (t1 << (32 - t2));
Add mirbsdksh R21, which was developed in a temporary external CVS repo- sitory whose ChangeLog follows. mksh R21 is licenced under the MirOS li- cence, shown in "sh.h", and a two-clause UCB-style licence by Marc Espie as shown in "alloc.c". This executable is a fair bit smaller and shorter than our /bin/ksh that it is designed to eventually replace (as /bin/sh hardlink), with the old /bin/ksh to completely vanish. It is still in beta testing though, and I don't think it will compile on other operating systems. mksh R21 is a completely new port, bringing together the OpenBSD-current /bin/ksh, the MirOS-current /bin/ksh and the older mksh R20 (which still was portable, ocvs-based).
2005-05-23 05:06:10 +02:00
break;
another intermediate step/commit to get arithmetics right: do the correct operations for comparisons (just keep using the signed/unsigned switch from bivui for them), division (by working on absolutes and adding the sign at the end), modulo (stupidly by divising in signed, multiplying and subtracting, to get the sign of the result right) also adds rotation XXX to check: do we need to AND before assigning the result in division?
2013-04-14 15:36:53 +02:00
#endif
Add mirbsdksh R21, which was developed in a temporary external CVS repo- sitory whose ChangeLog follows. mksh R21 is licenced under the MirOS li- cence, shown in "sh.h", and a two-clause UCB-style licence by Marc Espie as shown in "alloc.c". This executable is a fair bit smaller and shorter than our /bin/ksh that it is designed to eventually replace (as /bin/sh hardlink), with the old /bin/ksh to completely vanish. It is still in beta testing though, and I don't think it will compile on other operating systems. mksh R21 is a completely new port, bringing together the OpenBSD-current /bin/ksh, the MirOS-current /bin/ksh and the older mksh R20 (which still was portable, ocvs-based).
2005-05-23 05:06:10 +02:00
case O_LSHIFT:
case O_LSHIFTASN:
another intermediate step/commit to get arithmetics right: do the correct operations for comparisons (just keep using the signed/unsigned switch from bivui for them), division (by working on absolutes and adding the sign at the end), modulo (stupidly by divising in signed, multiplying and subtracting, to get the sign of the result right) also adds rotation XXX to check: do we need to AND before assigning the result in division?
2013-04-14 15:36:53 +02:00
res = t1 << t2;
Add mirbsdksh R21, which was developed in a temporary external CVS repo- sitory whose ChangeLog follows. mksh R21 is licenced under the MirOS li- cence, shown in "sh.h", and a two-clause UCB-style licence by Marc Espie as shown in "alloc.c". This executable is a fair bit smaller and shorter than our /bin/ksh that it is designed to eventually replace (as /bin/sh hardlink), with the old /bin/ksh to completely vanish. It is still in beta testing though, and I don't think it will compile on other operating systems. mksh R21 is a completely new port, bringing together the OpenBSD-current /bin/ksh, the MirOS-current /bin/ksh and the older mksh R20 (which still was portable, ocvs-based).
2005-05-23 05:06:10 +02:00
break;
case O_RSHIFT:
case O_RSHIFTASN:
got an SAR, thanks to dalias on IRC
2013-04-01 04:28:35 +02:00
res = es->natural || vl->val.i >= 0 ?
another intermediate step/commit to get arithmetics right: do the correct operations for comparisons (just keep using the signed/unsigned switch from bivui for them), division (by working on absolutes and adding the sign at the end), modulo (stupidly by divising in signed, multiplying and subtracting, to get the sign of the result right) also adds rotation XXX to check: do we need to AND before assigning the result in division?
2013-04-14 15:36:53 +02:00
t1 >> t2 :
~(~t1 >> t2);
Add mirbsdksh R21, which was developed in a temporary external CVS repo- sitory whose ChangeLog follows. mksh R21 is licenced under the MirOS li- cence, shown in "sh.h", and a two-clause UCB-style licence by Marc Espie as shown in "alloc.c". This executable is a fair bit smaller and shorter than our /bin/ksh that it is designed to eventually replace (as /bin/sh hardlink), with the old /bin/ksh to completely vanish. It is still in beta testing though, and I don't think it will compile on other operating systems. mksh R21 is a completely new port, bringing together the OpenBSD-current /bin/ksh, the MirOS-current /bin/ksh and the older mksh R20 (which still was portable, ocvs-based).
2005-05-23 05:06:10 +02:00
break;
case O_LT:
another intermediate step/commit to get arithmetics right: do the correct operations for comparisons (just keep using the signed/unsigned switch from bivui for them), division (by working on absolutes and adding the sign at the end), modulo (stupidly by divising in signed, multiplying and subtracting, to get the sign of the result right) also adds rotation XXX to check: do we need to AND before assigning the result in division?
2013-04-14 15:36:53 +02:00
res = cmpop(<);
Add mirbsdksh R21, which was developed in a temporary external CVS repo- sitory whose ChangeLog follows. mksh R21 is licenced under the MirOS li- cence, shown in "sh.h", and a two-clause UCB-style licence by Marc Espie as shown in "alloc.c". This executable is a fair bit smaller and shorter than our /bin/ksh that it is designed to eventually replace (as /bin/sh hardlink), with the old /bin/ksh to completely vanish. It is still in beta testing though, and I don't think it will compile on other operating systems. mksh R21 is a completely new port, bringing together the OpenBSD-current /bin/ksh, the MirOS-current /bin/ksh and the older mksh R20 (which still was portable, ocvs-based).
2005-05-23 05:06:10 +02:00
break;
case O_LE:
another intermediate step/commit to get arithmetics right: do the correct operations for comparisons (just keep using the signed/unsigned switch from bivui for them), division (by working on absolutes and adding the sign at the end), modulo (stupidly by divising in signed, multiplying and subtracting, to get the sign of the result right) also adds rotation XXX to check: do we need to AND before assigning the result in division?
2013-04-14 15:36:53 +02:00
res = cmpop(<=);
Add mirbsdksh R21, which was developed in a temporary external CVS repo- sitory whose ChangeLog follows. mksh R21 is licenced under the MirOS li- cence, shown in "sh.h", and a two-clause UCB-style licence by Marc Espie as shown in "alloc.c". This executable is a fair bit smaller and shorter than our /bin/ksh that it is designed to eventually replace (as /bin/sh hardlink), with the old /bin/ksh to completely vanish. It is still in beta testing though, and I don't think it will compile on other operating systems. mksh R21 is a completely new port, bringing together the OpenBSD-current /bin/ksh, the MirOS-current /bin/ksh and the older mksh R20 (which still was portable, ocvs-based).
2005-05-23 05:06:10 +02:00
break;
case O_GT:
another intermediate step/commit to get arithmetics right: do the correct operations for comparisons (just keep using the signed/unsigned switch from bivui for them), division (by working on absolutes and adding the sign at the end), modulo (stupidly by divising in signed, multiplying and subtracting, to get the sign of the result right) also adds rotation XXX to check: do we need to AND before assigning the result in division?
2013-04-14 15:36:53 +02:00
res = cmpop(>);
Add mirbsdksh R21, which was developed in a temporary external CVS repo- sitory whose ChangeLog follows. mksh R21 is licenced under the MirOS li- cence, shown in "sh.h", and a two-clause UCB-style licence by Marc Espie as shown in "alloc.c". This executable is a fair bit smaller and shorter than our /bin/ksh that it is designed to eventually replace (as /bin/sh hardlink), with the old /bin/ksh to completely vanish. It is still in beta testing though, and I don't think it will compile on other operating systems. mksh R21 is a completely new port, bringing together the OpenBSD-current /bin/ksh, the MirOS-current /bin/ksh and the older mksh R20 (which still was portable, ocvs-based).
2005-05-23 05:06:10 +02:00
break;
case O_GE:
another intermediate step/commit to get arithmetics right: do the correct operations for comparisons (just keep using the signed/unsigned switch from bivui for them), division (by working on absolutes and adding the sign at the end), modulo (stupidly by divising in signed, multiplying and subtracting, to get the sign of the result right) also adds rotation XXX to check: do we need to AND before assigning the result in division?
2013-04-14 15:36:53 +02:00
res = cmpop(>=);
Add mirbsdksh R21, which was developed in a temporary external CVS repo- sitory whose ChangeLog follows. mksh R21 is licenced under the MirOS li- cence, shown in "sh.h", and a two-clause UCB-style licence by Marc Espie as shown in "alloc.c". This executable is a fair bit smaller and shorter than our /bin/ksh that it is designed to eventually replace (as /bin/sh hardlink), with the old /bin/ksh to completely vanish. It is still in beta testing though, and I don't think it will compile on other operating systems. mksh R21 is a completely new port, bringing together the OpenBSD-current /bin/ksh, the MirOS-current /bin/ksh and the older mksh R20 (which still was portable, ocvs-based).
2005-05-23 05:06:10 +02:00
break;
case O_EQ:
another intermediate step/commit to get arithmetics right: do the correct operations for comparisons (just keep using the signed/unsigned switch from bivui for them), division (by working on absolutes and adding the sign at the end), modulo (stupidly by divising in signed, multiplying and subtracting, to get the sign of the result right) also adds rotation XXX to check: do we need to AND before assigning the result in division?
2013-04-14 15:36:53 +02:00
res = t1 == t2;
Add mirbsdksh R21, which was developed in a temporary external CVS repo- sitory whose ChangeLog follows. mksh R21 is licenced under the MirOS li- cence, shown in "sh.h", and a two-clause UCB-style licence by Marc Espie as shown in "alloc.c". This executable is a fair bit smaller and shorter than our /bin/ksh that it is designed to eventually replace (as /bin/sh hardlink), with the old /bin/ksh to completely vanish. It is still in beta testing though, and I don't think it will compile on other operating systems. mksh R21 is a completely new port, bringing together the OpenBSD-current /bin/ksh, the MirOS-current /bin/ksh and the older mksh R20 (which still was portable, ocvs-based).
2005-05-23 05:06:10 +02:00
break;
case O_NE:
another intermediate step/commit to get arithmetics right: do the correct operations for comparisons (just keep using the signed/unsigned switch from bivui for them), division (by working on absolutes and adding the sign at the end), modulo (stupidly by divising in signed, multiplying and subtracting, to get the sign of the result right) also adds rotation XXX to check: do we need to AND before assigning the result in division?
2013-04-14 15:36:53 +02:00
res = t1 != t2;
Add mirbsdksh R21, which was developed in a temporary external CVS repo- sitory whose ChangeLog follows. mksh R21 is licenced under the MirOS li- cence, shown in "sh.h", and a two-clause UCB-style licence by Marc Espie as shown in "alloc.c". This executable is a fair bit smaller and shorter than our /bin/ksh that it is designed to eventually replace (as /bin/sh hardlink), with the old /bin/ksh to completely vanish. It is still in beta testing though, and I don't think it will compile on other operating systems. mksh R21 is a completely new port, bringing together the OpenBSD-current /bin/ksh, the MirOS-current /bin/ksh and the older mksh R20 (which still was portable, ocvs-based).
2005-05-23 05:06:10 +02:00
break;
case O_BAND:
case O_BANDASN:
another intermediate step/commit to get arithmetics right: do the correct operations for comparisons (just keep using the signed/unsigned switch from bivui for them), division (by working on absolutes and adding the sign at the end), modulo (stupidly by divising in signed, multiplying and subtracting, to get the sign of the result right) also adds rotation XXX to check: do we need to AND before assigning the result in division?
2013-04-14 15:36:53 +02:00
res = t1 & t2;
Add mirbsdksh R21, which was developed in a temporary external CVS repo- sitory whose ChangeLog follows. mksh R21 is licenced under the MirOS li- cence, shown in "sh.h", and a two-clause UCB-style licence by Marc Espie as shown in "alloc.c". This executable is a fair bit smaller and shorter than our /bin/ksh that it is designed to eventually replace (as /bin/sh hardlink), with the old /bin/ksh to completely vanish. It is still in beta testing though, and I don't think it will compile on other operating systems. mksh R21 is a completely new port, bringing together the OpenBSD-current /bin/ksh, the MirOS-current /bin/ksh and the older mksh R20 (which still was portable, ocvs-based).
2005-05-23 05:06:10 +02:00
break;
case O_BXOR:
case O_BXORASN:
another intermediate step/commit to get arithmetics right: do the correct operations for comparisons (just keep using the signed/unsigned switch from bivui for them), division (by working on absolutes and adding the sign at the end), modulo (stupidly by divising in signed, multiplying and subtracting, to get the sign of the result right) also adds rotation XXX to check: do we need to AND before assigning the result in division?
2013-04-14 15:36:53 +02:00
res = t1 ^ t2;
Add mirbsdksh R21, which was developed in a temporary external CVS repo- sitory whose ChangeLog follows. mksh R21 is licenced under the MirOS li- cence, shown in "sh.h", and a two-clause UCB-style licence by Marc Espie as shown in "alloc.c". This executable is a fair bit smaller and shorter than our /bin/ksh that it is designed to eventually replace (as /bin/sh hardlink), with the old /bin/ksh to completely vanish. It is still in beta testing though, and I don't think it will compile on other operating systems. mksh R21 is a completely new port, bringing together the OpenBSD-current /bin/ksh, the MirOS-current /bin/ksh and the older mksh R20 (which still was portable, ocvs-based).
2005-05-23 05:06:10 +02:00
break;
case O_BOR:
case O_BORASN:
another intermediate step/commit to get arithmetics right: do the correct operations for comparisons (just keep using the signed/unsigned switch from bivui for them), division (by working on absolutes and adding the sign at the end), modulo (stupidly by divising in signed, multiplying and subtracting, to get the sign of the result right) also adds rotation XXX to check: do we need to AND before assigning the result in division?
2013-04-14 15:36:53 +02:00
res = t1 | t2;
Add mirbsdksh R21, which was developed in a temporary external CVS repo- sitory whose ChangeLog follows. mksh R21 is licenced under the MirOS li- cence, shown in "sh.h", and a two-clause UCB-style licence by Marc Espie as shown in "alloc.c". This executable is a fair bit smaller and shorter than our /bin/ksh that it is designed to eventually replace (as /bin/sh hardlink), with the old /bin/ksh to completely vanish. It is still in beta testing though, and I don't think it will compile on other operating systems. mksh R21 is a completely new port, bringing together the OpenBSD-current /bin/ksh, the MirOS-current /bin/ksh and the older mksh R20 (which still was portable, ocvs-based).
2005-05-23 05:06:10 +02:00
break;
case O_LAND:
another intermediate step/commit to get arithmetics right: do the correct operations for comparisons (just keep using the signed/unsigned switch from bivui for them), division (by working on absolutes and adding the sign at the end), modulo (stupidly by divising in signed, multiplying and subtracting, to get the sign of the result right) also adds rotation XXX to check: do we need to AND before assigning the result in division?
2013-04-14 15:36:53 +02:00
if (!t1)
Add mirbsdksh R21, which was developed in a temporary external CVS repo- sitory whose ChangeLog follows. mksh R21 is licenced under the MirOS li- cence, shown in "sh.h", and a two-clause UCB-style licence by Marc Espie as shown in "alloc.c". This executable is a fair bit smaller and shorter than our /bin/ksh that it is designed to eventually replace (as /bin/sh hardlink), with the old /bin/ksh to completely vanish. It is still in beta testing though, and I don't think it will compile on other operating systems. mksh R21 is a completely new port, bringing together the OpenBSD-current /bin/ksh, the MirOS-current /bin/ksh and the older mksh R20 (which still was portable, ocvs-based).
2005-05-23 05:06:10 +02:00
es->noassign++;
fix lazy evaluation with side effects; spotted by ormaaj via IRC
2016-11-07 17:58:48 +01:00
exprtoken(es);
don’t do arithmetics on an enumerated type, sez the MIPSpro complainer
2008-03-28 14:33:37 +01:00
vr = intvar(es, evalexpr(es, prec - 1));
another intermediate step/commit to get arithmetics right: do the correct operations for comparisons (just keep using the signed/unsigned switch from bivui for them), division (by working on absolutes and adding the sign at the end), modulo (stupidly by divising in signed, multiplying and subtracting, to get the sign of the result right) also adds rotation XXX to check: do we need to AND before assigning the result in division?
2013-04-14 15:36:53 +02:00
res = t1 && vr->val.u;
if (!t1)
Add mirbsdksh R21, which was developed in a temporary external CVS repo- sitory whose ChangeLog follows. mksh R21 is licenced under the MirOS li- cence, shown in "sh.h", and a two-clause UCB-style licence by Marc Espie as shown in "alloc.c". This executable is a fair bit smaller and shorter than our /bin/ksh that it is designed to eventually replace (as /bin/sh hardlink), with the old /bin/ksh to completely vanish. It is still in beta testing though, and I don't think it will compile on other operating systems. mksh R21 is a completely new port, bringing together the OpenBSD-current /bin/ksh, the MirOS-current /bin/ksh and the older mksh R20 (which still was portable, ocvs-based).
2005-05-23 05:06:10 +02:00
es->noassign--;
break;
case O_LOR:
another intermediate step/commit to get arithmetics right: do the correct operations for comparisons (just keep using the signed/unsigned switch from bivui for them), division (by working on absolutes and adding the sign at the end), modulo (stupidly by divising in signed, multiplying and subtracting, to get the sign of the result right) also adds rotation XXX to check: do we need to AND before assigning the result in division?
2013-04-14 15:36:53 +02:00
if (t1)
Add mirbsdksh R21, which was developed in a temporary external CVS repo- sitory whose ChangeLog follows. mksh R21 is licenced under the MirOS li- cence, shown in "sh.h", and a two-clause UCB-style licence by Marc Espie as shown in "alloc.c". This executable is a fair bit smaller and shorter than our /bin/ksh that it is designed to eventually replace (as /bin/sh hardlink), with the old /bin/ksh to completely vanish. It is still in beta testing though, and I don't think it will compile on other operating systems. mksh R21 is a completely new port, bringing together the OpenBSD-current /bin/ksh, the MirOS-current /bin/ksh and the older mksh R20 (which still was portable, ocvs-based).
2005-05-23 05:06:10 +02:00
es->noassign++;
fix lazy evaluation with side effects; spotted by ormaaj via IRC
2016-11-07 17:58:48 +01:00
exprtoken(es);
don’t do arithmetics on an enumerated type, sez the MIPSpro complainer
2008-03-28 14:33:37 +01:00
vr = intvar(es, evalexpr(es, prec - 1));
another intermediate step/commit to get arithmetics right: do the correct operations for comparisons (just keep using the signed/unsigned switch from bivui for them), division (by working on absolutes and adding the sign at the end), modulo (stupidly by divising in signed, multiplying and subtracting, to get the sign of the result right) also adds rotation XXX to check: do we need to AND before assigning the result in division?
2013-04-14 15:36:53 +02:00
res = t1 || vr->val.u;
if (t1)
Add mirbsdksh R21, which was developed in a temporary external CVS repo- sitory whose ChangeLog follows. mksh R21 is licenced under the MirOS li- cence, shown in "sh.h", and a two-clause UCB-style licence by Marc Espie as shown in "alloc.c". This executable is a fair bit smaller and shorter than our /bin/ksh that it is designed to eventually replace (as /bin/sh hardlink), with the old /bin/ksh to completely vanish. It is still in beta testing though, and I don't think it will compile on other operating systems. mksh R21 is a completely new port, bringing together the OpenBSD-current /bin/ksh, the MirOS-current /bin/ksh and the older mksh R20 (which still was portable, ocvs-based).
2005-05-23 05:06:10 +02:00
es->noassign--;
break;
case O_ASN:
case O_COMMA:
another intermediate step/commit to get arithmetics right: do the correct operations for comparisons (just keep using the signed/unsigned switch from bivui for them), division (by working on absolutes and adding the sign at the end), modulo (stupidly by divising in signed, multiplying and subtracting, to get the sign of the result right) also adds rotation XXX to check: do we need to AND before assigning the result in division?
2013-04-14 15:36:53 +02:00
res = t2;
Add mirbsdksh R21, which was developed in a temporary external CVS repo- sitory whose ChangeLog follows. mksh R21 is licenced under the MirOS li- cence, shown in "sh.h", and a two-clause UCB-style licence by Marc Espie as shown in "alloc.c". This executable is a fair bit smaller and shorter than our /bin/ksh that it is designed to eventually replace (as /bin/sh hardlink), with the old /bin/ksh to completely vanish. It is still in beta testing though, and I don't think it will compile on other operating systems. mksh R21 is a completely new port, bringing together the OpenBSD-current /bin/ksh, the MirOS-current /bin/ksh and the older mksh R20 (which still was portable, ocvs-based).
2005-05-23 05:06:10 +02:00
break;
}
begin using unsigned arithmetics internally as much as possible (i.e. where signedness doesn’t matter, given -fwrapv) and note where there’s work to do; note future improvements and additions; optimise a little mostly untested
2013-03-31 20:33:13 +02:00
another intermediate step/commit to get arithmetics right: do the correct operations for comparisons (just keep using the signed/unsigned switch from bivui for them), division (by working on absolutes and adding the sign at the end), modulo (stupidly by divising in signed, multiplying and subtracting, to get the sign of the result right) also adds rotation XXX to check: do we need to AND before assigning the result in division?
2013-04-14 15:36:53 +02:00
#undef cmpop
Add mirbsdksh R21, which was developed in a temporary external CVS repo- sitory whose ChangeLog follows. mksh R21 is licenced under the MirOS li- cence, shown in "sh.h", and a two-clause UCB-style licence by Marc Espie as shown in "alloc.c". This executable is a fair bit smaller and shorter than our /bin/ksh that it is designed to eventually replace (as /bin/sh hardlink), with the old /bin/ksh to completely vanish. It is still in beta testing though, and I don't think it will compile on other operating systems. mksh R21 is a completely new port, bringing together the OpenBSD-current /bin/ksh, the MirOS-current /bin/ksh and the older mksh R20 (which still was portable, ocvs-based).
2005-05-23 05:06:10 +02:00
if (IS_ASSIGNOP(op)) {
even more hacks to pass “-O666 -fstrict-overflow -Wstrict-overflow=9 -flto=jobserver” with “gcc version 4.8.0 20120930 (experimental) [trunk revision 191865] (Debian 20120930-1)” ☹ plus make the rtchecks mandatory
2012-10-03 19:24:23 +02:00
vr->val.u = res;
fix lazy evaluation of assignments in ternary ops
2009-10-04 15:19:33 +02:00
if (!es->noassign) {
if (vasn->flag & INTEGER)
setint_v(vasn, vr, es->arith);
else
one can’t cast an unsigned int to a signed int portably either, if the value is larger than the positive range of the latter (implementation-defined), so avoid them in all explicit cases and rearrange stuff and check for it (I’m gonna have to revise lots more code…)
2013-04-01 04:37:53 +02:00
setint(vasn, vr->val.i);
fix lazy evaluation of assignments in ternary ops
2009-10-04 15:19:33 +02:00
}
Add mirbsdksh R21, which was developed in a temporary external CVS repo- sitory whose ChangeLog follows. mksh R21 is licenced under the MirOS li- cence, shown in "sh.h", and a two-clause UCB-style licence by Marc Espie as shown in "alloc.c". This executable is a fair bit smaller and shorter than our /bin/ksh that it is designed to eventually replace (as /bin/sh hardlink), with the old /bin/ksh to completely vanish. It is still in beta testing though, and I don't think it will compile on other operating systems. mksh R21 is a completely new port, bringing together the OpenBSD-current /bin/ksh, the MirOS-current /bin/ksh and the older mksh R20 (which still was portable, ocvs-based).
2005-05-23 05:06:10 +02:00
vl = vr;
begin using unsigned arithmetics internally as much as possible (i.e. where signedness doesn’t matter, given -fwrapv) and note where there’s work to do; note future improvements and additions; optimise a little mostly untested
2013-03-31 20:33:13 +02:00
} else
even more hacks to pass “-O666 -fstrict-overflow -Wstrict-overflow=9 -flto=jobserver” with “gcc version 4.8.0 20120930 (experimental) [trunk revision 191865] (Debian 20120930-1)” ☹ plus make the rtchecks mandatory
2012-10-03 19:24:23 +02:00
vl->val.u = res;
Add mirbsdksh R21, which was developed in a temporary external CVS repo- sitory whose ChangeLog follows. mksh R21 is licenced under the MirOS li- cence, shown in "sh.h", and a two-clause UCB-style licence by Marc Espie as shown in "alloc.c". This executable is a fair bit smaller and shorter than our /bin/ksh that it is designed to eventually replace (as /bin/sh hardlink), with the old /bin/ksh to completely vanish. It is still in beta testing though, and I don't think it will compile on other operating systems. mksh R21 is a completely new port, bringing together the OpenBSD-current /bin/ksh, the MirOS-current /bin/ksh and the older mksh R20 (which still was portable, ocvs-based).
2005-05-23 05:06:10 +02:00
}
• remove strcasestr.c, use home-grown implementation¹, call it stricmp, and have it return an API-correct const char * • enhance and stylify comments • a little KNF and simplifications • #ifdef DEBUG: replace strchr and strstr with ucstrchr and ucstrstr that take and return a non-const char *, and fix the violations • new cstrchr, cstrstr (take and give const char *) • new vstrchr, vstrstr (take const or not, give boolean value) • new afreechk(x) = afreechv(x,x) = if (x1) afree(x2, ATEMP) • new ksh_isdash(str) = (str != NULL) && !strcmp(str, "-") • replace the only use of strrchr with inlined code to shrink • minor man page fixes • Minix 3 signames are autogenerated with gcc • rename strlfun.c to strlcpy.c since we don't do strlcat(3) anyway, only strlcpy(3), and shorten it • dot.mkshrc: move MKSH=… down to the export line to not disturb the PS1 visual impression ☺ • dot.mkshrc: Lstripcom(): optimise • bump version ¹) side effect from creating API-correct cstrchr, cstrstr, etc. uses goto so it must be better ☻ tested on mirbsd-current via both Makefile and Build.sh
2007-03-04 04:04:28 +01:00
return (vl);
Add mirbsdksh R21, which was developed in a temporary external CVS repo- sitory whose ChangeLog follows. mksh R21 is licenced under the MirOS li- cence, shown in "sh.h", and a two-clause UCB-style licence by Marc Espie as shown in "alloc.c". This executable is a fair bit smaller and shorter than our /bin/ksh that it is designed to eventually replace (as /bin/sh hardlink), with the old /bin/ksh to completely vanish. It is still in beta testing though, and I don't think it will compile on other operating systems. mksh R21 is a completely new port, bringing together the OpenBSD-current /bin/ksh, the MirOS-current /bin/ksh and the older mksh R20 (which still was portable, ocvs-based).
2005-05-23 05:06:10 +02:00
}
static void
don't have two functions token(), helps ctags
2007-03-03 22:12:51 +01:00
exprtoken(Expr_state *es)
Add mirbsdksh R21, which was developed in a temporary external CVS repo- sitory whose ChangeLog follows. mksh R21 is licenced under the MirOS li- cence, shown in "sh.h", and a two-clause UCB-style licence by Marc Espie as shown in "alloc.c". This executable is a fair bit smaller and shorter than our /bin/ksh that it is designed to eventually replace (as /bin/sh hardlink), with the old /bin/ksh to completely vanish. It is still in beta testing though, and I don't think it will compile on other operating systems. mksh R21 is a completely new port, bringing together the OpenBSD-current /bin/ksh, the MirOS-current /bin/ksh and the older mksh R20 (which still was portable, ocvs-based).
2005-05-23 05:06:10 +02:00
{
implement unsigned arithmetics as an mksh extension
2008-12-17 20:39:23 +01:00
const char *cp = es->tokp;
Add mirbsdksh R21, which was developed in a temporary external CVS repo- sitory whose ChangeLog follows. mksh R21 is licenced under the MirOS li- cence, shown in "sh.h", and a two-clause UCB-style licence by Marc Espie as shown in "alloc.c". This executable is a fair bit smaller and shorter than our /bin/ksh that it is designed to eventually replace (as /bin/sh hardlink), with the old /bin/ksh to completely vanish. It is still in beta testing though, and I don't think it will compile on other operating systems. mksh R21 is a completely new port, bringing together the OpenBSD-current /bin/ksh, the MirOS-current /bin/ksh and the older mksh R20 (which still was portable, ocvs-based).
2005-05-23 05:06:10 +02:00
int c;
char *tvar;
another intermediate step/commit to get arithmetics right: do the correct operations for comparisons (just keep using the signed/unsigned switch from bivui for them), division (by working on absolutes and adding the sign at the end), modulo (stupidly by divising in signed, multiplying and subtracting, to get the sign of the result right) also adds rotation XXX to check: do we need to AND before assigning the result in division?
2013-04-14 15:36:53 +02:00
/* skip whitespace */
implement unsigned arithmetics as an mksh extension
2008-12-17 20:39:23 +01:00
skip_spaces:
while ((c = *cp), ksh_isspace(c))
++cp;
if (es->tokp == es->expression && c == '#') {
/* expression begins with # */
another intermediate step/commit to get arithmetics right: do the correct operations for comparisons (just keep using the signed/unsigned switch from bivui for them), division (by working on absolutes and adding the sign at the end), modulo (stupidly by divising in signed, multiplying and subtracting, to get the sign of the result right) also adds rotation XXX to check: do we need to AND before assigning the result in division?
2013-04-14 15:36:53 +02:00
/* switch to unsigned */
es->natural = true;
implement unsigned arithmetics as an mksh extension
2008-12-17 20:39:23 +01:00
++cp;
goto skip_spaces;
}
Add mirbsdksh R21, which was developed in a temporary external CVS repo- sitory whose ChangeLog follows. mksh R21 is licenced under the MirOS li- cence, shown in "sh.h", and a two-clause UCB-style licence by Marc Espie as shown in "alloc.c". This executable is a fair bit smaller and shorter than our /bin/ksh that it is designed to eventually replace (as /bin/sh hardlink), with the old /bin/ksh to completely vanish. It is still in beta testing though, and I don't think it will compile on other operating systems. mksh R21 is a completely new port, bringing together the OpenBSD-current /bin/ksh, the MirOS-current /bin/ksh and the older mksh R20 (which still was portable, ocvs-based).
2005-05-23 05:06:10 +02:00
es->tokp = cp;
if (c == '\0')
es->tok = END;
hand-sorted ctypes/chtypes upgrade; use table-driven where they make sense and preprocessored otherwise; unify the logic saves 144t 1i and lots of cpp(1) time, as well as improves readability
2006-11-10 08:52:04 +01:00
else if (ksh_isalphx(c)) {
small character classes overhaul: • make fast character classes even faster by removing the C_SUBOP2 hack in favour of a separate seldom-used ksh_issubop2 macro (which also makes ctype() side-effect-safe) which is a slower class (no change there) • optimise cases of ksh_isalphx followed by a ksh_isalnux loop (used parsing variable names) • remove a misleading comment in initctypes() about \0 from pdksh • rename C_ALPHA to C_ALPHX to make it more clear the underscore is included • sprinkle a few ord() in there • add new ksh_isalpha() which tests for [A-Za-z] (slow character class) • there is no '_:\' drive on OS/2 (which inspired the whole changeset)
2017-03-26 01:10:26 +01:00
do {
c = *++cp;
} while (ksh_isalnux(c));
Add mirbsdksh R21, which was developed in a temporary external CVS repo- sitory whose ChangeLog follows. mksh R21 is licenced under the MirOS li- cence, shown in "sh.h", and a two-clause UCB-style licence by Marc Espie as shown in "alloc.c". This executable is a fair bit smaller and shorter than our /bin/ksh that it is designed to eventually replace (as /bin/sh hardlink), with the old /bin/ksh to completely vanish. It is still in beta testing though, and I don't think it will compile on other operating systems. mksh R21 is a completely new port, bringing together the OpenBSD-current /bin/ksh, the MirOS-current /bin/ksh and the older mksh R20 (which still was portable, ocvs-based).
2005-05-23 05:06:10 +02:00
if (c == '[') {
patch most of Jerker Bäck’s concerns out, unless not applicable
2011-08-27 20:06:52 +02:00
size_t len;
Add mirbsdksh R21, which was developed in a temporary external CVS repo- sitory whose ChangeLog follows. mksh R21 is licenced under the MirOS li- cence, shown in "sh.h", and a two-clause UCB-style licence by Marc Espie as shown in "alloc.c". This executable is a fair bit smaller and shorter than our /bin/ksh that it is designed to eventually replace (as /bin/sh hardlink), with the old /bin/ksh to completely vanish. It is still in beta testing though, and I don't think it will compile on other operating systems. mksh R21 is a completely new port, bringing together the OpenBSD-current /bin/ksh, the MirOS-current /bin/ksh and the older mksh R20 (which still was portable, ocvs-based).
2005-05-23 05:06:10 +02:00
len = array_ref_len(cp);
if (len == 0)
evalerr(es, ET_STR, "missing ]");
cp += len;
}
if (es->noassign) {
plug a few display problems with special parameter name expansions reported by Stéphane Chazelas
2016-02-26 19:48:14 +01:00
es->val = tempvar("");
Add mirbsdksh R21, which was developed in a temporary external CVS repo- sitory whose ChangeLog follows. mksh R21 is licenced under the MirOS li- cence, shown in "sh.h", and a two-clause UCB-style licence by Marc Espie as shown in "alloc.c". This executable is a fair bit smaller and shorter than our /bin/ksh that it is designed to eventually replace (as /bin/sh hardlink), with the old /bin/ksh to completely vanish. It is still in beta testing though, and I don't think it will compile on other operating systems. mksh R21 is a completely new port, bringing together the OpenBSD-current /bin/ksh, the MirOS-current /bin/ksh and the older mksh R20 (which still was portable, ocvs-based).
2005-05-23 05:06:10 +02:00
es->val->flag |= EXPRLVALUE;
} else {
• rewrite code to no longer use statements-as-expressions • optimise a little • Build.sh: remove HAVE_EXPSTMT test • Build.sh, */Makefile: sort tests, regenerate • mksh.hts: sync clog
2008-10-28 15:32:43 +01:00
strndupx(tvar, es->tokp, cp - es->tokp, ATEMP);
Add mirbsdksh R21, which was developed in a temporary external CVS repo- sitory whose ChangeLog follows. mksh R21 is licenced under the MirOS li- cence, shown in "sh.h", and a two-clause UCB-style licence by Marc Espie as shown in "alloc.c". This executable is a fair bit smaller and shorter than our /bin/ksh that it is designed to eventually replace (as /bin/sh hardlink), with the old /bin/ksh to completely vanish. It is still in beta testing though, and I don't think it will compile on other operating systems. mksh R21 is a completely new port, bringing together the OpenBSD-current /bin/ksh, the MirOS-current /bin/ksh and the older mksh R20 (which still was portable, ocvs-based).
2005-05-23 05:06:10 +02:00
es->val = global(tvar);
afree(tvar, ATEMP);
}
es->tok = VAR;
• more unsigned → unsigned int • more int → bool • more regression tests: check if the utf8-hack flag is really disabled at non-interactive startup, enabled at interactive startup, if the current locale is a UTF-8 one • make the mksh-local multibyte handling functions globally accessible, change their names, syntax and semantics a little (XXX more work needed) • optimise • utf_wctomb: src → dst, as we’re writing to that char array (pasto?) • edit.c:x_e_getmbc(): if the second byte of a 2- or 3-byte multibyte sequence is invalid utf-8, ungetc it (not possible for the 3rd byte yet) • edit.c:x_zotc3(): easier (and faster) handling of UTF-8 • implement, document and test for base-1 numbers: they just get the ASCII (8-bit) or Unicode (UTF-8) value of the octet(s) after the ‘1#’, or do the same as print \x## or \u#### (depending on the utf8-hack flag), plus support the PUA assignment of EF80‥EFFF for the MirBSD encoding “hack” (print doesn’t, as it has \x## and \u#### to distinguish, but we cannot use base-0 numbers which I had planned to use for raw octets first, as they are used internally): http://thread.gmane.org/gmane.os.miros.general/7938 • as an application example, add a hexdumper to the regression tests ☺
2008-04-20 00:15:06 +02:00
} else if (c == '1' && cp[1] == '#') {
• rewrite code to no longer use statements-as-expressions • optimise a little • Build.sh: remove HAVE_EXPSTMT test • Build.sh, */Makefile: sort tests, regenerate • mksh.hts: sync clog
2008-10-28 15:32:43 +01:00
cp += 2;
fix buffer overrun (LP#1533394)
2016-01-14 22:17:50 +01:00
if (*cp)
cp += utf_ptradj(cp);
• rewrite code to no longer use statements-as-expressions • optimise a little • Build.sh: remove HAVE_EXPSTMT test • Build.sh, */Makefile: sort tests, regenerate • mksh.hts: sync clog
2008-10-28 15:32:43 +01:00
strndupx(tvar, es->tokp, cp - es->tokp, ATEMP);
• more unsigned → unsigned int • more int → bool • more regression tests: check if the utf8-hack flag is really disabled at non-interactive startup, enabled at interactive startup, if the current locale is a UTF-8 one • make the mksh-local multibyte handling functions globally accessible, change their names, syntax and semantics a little (XXX more work needed) • optimise • utf_wctomb: src → dst, as we’re writing to that char array (pasto?) • edit.c:x_e_getmbc(): if the second byte of a 2- or 3-byte multibyte sequence is invalid utf-8, ungetc it (not possible for the 3rd byte yet) • edit.c:x_zotc3(): easier (and faster) handling of UTF-8 • implement, document and test for base-1 numbers: they just get the ASCII (8-bit) or Unicode (UTF-8) value of the octet(s) after the ‘1#’, or do the same as print \x## or \u#### (depending on the utf8-hack flag), plus support the PUA assignment of EF80‥EFFF for the MirBSD encoding “hack” (print doesn’t, as it has \x## and \u#### to distinguish, but we cannot use base-0 numbers which I had planned to use for raw octets first, as they are used internally): http://thread.gmane.org/gmane.os.miros.general/7938 • as an application example, add a hexdumper to the regression tests ☺
2008-04-20 00:15:06 +02:00
goto process_tvar;
* shrink MKSH_SMALL even further by removing functionality like some GNU bash extensions (suggested by cnuke@) and bind macros * make the random cache more efficient (and the code potentially smaller, although we have a new implementation of the oaat hash function, alongside the old one, now) and pushb only if needed (i.e. state has changed or user has set $RANDOM, but not onfork)
2009-09-23 20:04:58 +02:00
#ifndef MKSH_SMALL
Support Dave Korn’s alternative 「'a'」 (or 「'…'」) form for base-one integers in addition to my 「1#a」 (or 「1#…」), which also allows for finer end-of-character checking. Note that this is locale-dependent in ksh93, set ±U dependent in mksh, and mksh’s OPTU-16 encoding is used.
2009-09-06 19:55:55 +02:00
} else if (c == '\'') {
fix invalid read for ksh93-style base-1 integers (valgrind; reported by fmunozs via IRC, thanks!)
2016-03-01 19:29:38 +01:00
if (*++cp == '\0') {
es->tok = END;
evalerr(es, ET_UNEXPECTED, NULL);
}
Support Dave Korn’s alternative 「'a'」 (or 「'…'」) form for base-one integers in addition to my 「1#a」 (or 「1#…」), which also allows for finer end-of-character checking. Note that this is locale-dependent in ksh93, set ±U dependent in mksh, and mksh’s OPTU-16 encoding is used.
2009-09-06 19:55:55 +02:00
cp += utf_ptradj(cp);
if (*cp++ != '\'')
evalerr(es, ET_STR,
"multi-character character constant");
/* 'x' -> 1#x (x = one multibyte character) */
c = cp - es->tokp;
tvar = alloc(c + /* NUL */ 1, ATEMP);
tvar[0] = '1';
tvar[1] = '#';
memcpy(tvar + 2, es->tokp + 1, c - 2);
tvar[c] = '\0';
goto process_tvar;
* shrink MKSH_SMALL even further by removing functionality like some GNU bash extensions (suggested by cnuke@) and bind macros * make the random cache more efficient (and the code potentially smaller, although we have a new implementation of the oaat hash function, alongside the old one, now) and pushb only if needed (i.e. state has changed or user has set $RANDOM, but not onfork)
2009-09-23 20:04:58 +02:00
#endif
hand-sorted ctypes/chtypes upgrade; use table-driven where they make sense and preprocessored otherwise; unify the logic saves 144t 1i and lots of cpp(1) time, as well as improves readability
2006-11-10 08:52:04 +01:00
} else if (ksh_isdigit(c)) {
• more unsigned → unsigned int • more int → bool • more regression tests: check if the utf8-hack flag is really disabled at non-interactive startup, enabled at interactive startup, if the current locale is a UTF-8 one • make the mksh-local multibyte handling functions globally accessible, change their names, syntax and semantics a little (XXX more work needed) • optimise • utf_wctomb: src → dst, as we’re writing to that char array (pasto?) • edit.c:x_e_getmbc(): if the second byte of a 2- or 3-byte multibyte sequence is invalid utf-8, ungetc it (not possible for the 3rd byte yet) • edit.c:x_zotc3(): easier (and faster) handling of UTF-8 • implement, document and test for base-1 numbers: they just get the ASCII (8-bit) or Unicode (UTF-8) value of the octet(s) after the ‘1#’, or do the same as print \x## or \u#### (depending on the utf8-hack flag), plus support the PUA assignment of EF80‥EFFF for the MirBSD encoding “hack” (print doesn’t, as it has \x## and \u#### to distinguish, but we cannot use base-0 numbers which I had planned to use for raw octets first, as they are used internally): http://thread.gmane.org/gmane.os.miros.general/7938 • as an application example, add a hexdumper to the regression tests ☺
2008-04-20 00:15:06 +02:00
while (c != '_' && (ksh_isalnux(c) || c == '#'))
c = *cp++;
• rewrite code to no longer use statements-as-expressions • optimise a little • Build.sh: remove HAVE_EXPSTMT test • Build.sh, */Makefile: sort tests, regenerate • mksh.hts: sync clog
2008-10-28 15:32:43 +01:00
strndupx(tvar, es->tokp, --cp - es->tokp, ATEMP);
• more unsigned → unsigned int • more int → bool • more regression tests: check if the utf8-hack flag is really disabled at non-interactive startup, enabled at interactive startup, if the current locale is a UTF-8 one • make the mksh-local multibyte handling functions globally accessible, change their names, syntax and semantics a little (XXX more work needed) • optimise • utf_wctomb: src → dst, as we’re writing to that char array (pasto?) • edit.c:x_e_getmbc(): if the second byte of a 2- or 3-byte multibyte sequence is invalid utf-8, ungetc it (not possible for the 3rd byte yet) • edit.c:x_zotc3(): easier (and faster) handling of UTF-8 • implement, document and test for base-1 numbers: they just get the ASCII (8-bit) or Unicode (UTF-8) value of the octet(s) after the ‘1#’, or do the same as print \x## or \u#### (depending on the utf8-hack flag), plus support the PUA assignment of EF80‥EFFF for the MirBSD encoding “hack” (print doesn’t, as it has \x## and \u#### to distinguish, but we cannot use base-0 numbers which I had planned to use for raw octets first, as they are used internally): http://thread.gmane.org/gmane.os.miros.general/7938 • as an application example, add a hexdumper to the regression tests ☺
2008-04-20 00:15:06 +02:00
process_tvar:
plug a few display problems with special parameter name expansions reported by Stéphane Chazelas
2016-02-26 19:48:14 +01:00
es->val = tempvar("");
Add mirbsdksh R21, which was developed in a temporary external CVS repo- sitory whose ChangeLog follows. mksh R21 is licenced under the MirOS li- cence, shown in "sh.h", and a two-clause UCB-style licence by Marc Espie as shown in "alloc.c". This executable is a fair bit smaller and shorter than our /bin/ksh that it is designed to eventually replace (as /bin/sh hardlink), with the old /bin/ksh to completely vanish. It is still in beta testing though, and I don't think it will compile on other operating systems. mksh R21 is a completely new port, bringing together the OpenBSD-current /bin/ksh, the MirOS-current /bin/ksh and the older mksh R20 (which still was portable, ocvs-based).
2005-05-23 05:06:10 +02:00
es->val->flag &= ~INTEGER;
es->val->type = 0;
es->val->val.s = tvar;
if (setint_v(es->val, es->val, es->arith) == NULL)
evalerr(es, ET_BADLIT, tvar);
afree(tvar, ATEMP);
es->tok = LIT;
} else {
int i, n0;
shave off 12 bytes (with fixed gcc) by making the definitions more legible (and dropping struct padding, tbh)
2016-07-27 02:55:27 +02:00
for (i = 0; (n0 = opname[i][0]); i++)
if (c == n0 && strncmp(cp, opname[i],
(size_t)oplen[i]) == 0) {
implement unsigned arithmetics as an mksh extension
2008-12-17 20:39:23 +01:00
es->tok = (enum token)i;
shave off 12 bytes (with fixed gcc) by making the definitions more legible (and dropping struct padding, tbh)
2016-07-27 02:55:27 +02:00
cp += oplen[i];
Add mirbsdksh R21, which was developed in a temporary external CVS repo- sitory whose ChangeLog follows. mksh R21 is licenced under the MirOS li- cence, shown in "sh.h", and a two-clause UCB-style licence by Marc Espie as shown in "alloc.c". This executable is a fair bit smaller and shorter than our /bin/ksh that it is designed to eventually replace (as /bin/sh hardlink), with the old /bin/ksh to completely vanish. It is still in beta testing though, and I don't think it will compile on other operating systems. mksh R21 is a completely new port, bringing together the OpenBSD-current /bin/ksh, the MirOS-current /bin/ksh and the older mksh R20 (which still was portable, ocvs-based).
2005-05-23 05:06:10 +02:00
break;
}
if (!n0)
es->tok = BAD;
}
es->tokp = cp;
}
static void
assign_check(Expr_state *es, enum token op, struct tbl *vasn)
{
prevent more access to invalid memories (Debian #700604)
2013-02-15 19:36:48 +01:00
if (es->tok == END || !vasn ||
merge fix from oksh: "let --" was crashing ksh; found by phy0@rambler.ru. Various other expressions involving ++ and -- also ran into this. Insufficient checks for end of parse in the tokenizer made it assume that an lvalue had been found
2009-06-08 22:13:07 +02:00
(vasn->name[0] == '\0' && !(vasn->flag & EXPRLVALUE)))
shave off 12 bytes (with fixed gcc) by making the definitions more legible (and dropping struct padding, tbh)
2016-07-27 02:55:27 +02:00
evalerr(es, ET_LVALUE, opname[(int)op]);
Add mirbsdksh R21, which was developed in a temporary external CVS repo- sitory whose ChangeLog follows. mksh R21 is licenced under the MirOS li- cence, shown in "sh.h", and a two-clause UCB-style licence by Marc Espie as shown in "alloc.c". This executable is a fair bit smaller and shorter than our /bin/ksh that it is designed to eventually replace (as /bin/sh hardlink), with the old /bin/ksh to completely vanish. It is still in beta testing though, and I don't think it will compile on other operating systems. mksh R21 is a completely new port, bringing together the OpenBSD-current /bin/ksh, the MirOS-current /bin/ksh and the older mksh R20 (which still was portable, ocvs-based).
2005-05-23 05:06:10 +02:00
else if (vasn->flag & RDONLY)
shave off 12 bytes (with fixed gcc) by making the definitions more legible (and dropping struct padding, tbh)
2016-07-27 02:55:27 +02:00
evalerr(es, ET_RDONLY, opname[(int)op]);
Add mirbsdksh R21, which was developed in a temporary external CVS repo- sitory whose ChangeLog follows. mksh R21 is licenced under the MirOS li- cence, shown in "sh.h", and a two-clause UCB-style licence by Marc Espie as shown in "alloc.c". This executable is a fair bit smaller and shorter than our /bin/ksh that it is designed to eventually replace (as /bin/sh hardlink), with the old /bin/ksh to completely vanish. It is still in beta testing though, and I don't think it will compile on other operating systems. mksh R21 is a completely new port, bringing together the OpenBSD-current /bin/ksh, the MirOS-current /bin/ksh and the older mksh R20 (which still was portable, ocvs-based).
2005-05-23 05:06:10 +02:00
}
make tempvar() and vtemp global
2012-06-28 22:02:29 +02:00
struct tbl *
plug a few display problems with special parameter name expansions reported by Stéphane Chazelas
2016-02-26 19:48:14 +01:00
tempvar(const char *vname)
Add mirbsdksh R21, which was developed in a temporary external CVS repo- sitory whose ChangeLog follows. mksh R21 is licenced under the MirOS li- cence, shown in "sh.h", and a two-clause UCB-style licence by Marc Espie as shown in "alloc.c". This executable is a fair bit smaller and shorter than our /bin/ksh that it is designed to eventually replace (as /bin/sh hardlink), with the old /bin/ksh to completely vanish. It is still in beta testing though, and I don't think it will compile on other operating systems. mksh R21 is a completely new port, bringing together the OpenBSD-current /bin/ksh, the MirOS-current /bin/ksh and the older mksh R20 (which still was portable, ocvs-based).
2005-05-23 05:06:10 +02:00
{
struct tbl *vp;
plug a few display problems with special parameter name expansions reported by Stéphane Chazelas
2016-02-26 19:48:14 +01:00
size_t vsize;
Add mirbsdksh R21, which was developed in a temporary external CVS repo- sitory whose ChangeLog follows. mksh R21 is licenced under the MirOS li- cence, shown in "sh.h", and a two-clause UCB-style licence by Marc Espie as shown in "alloc.c". This executable is a fair bit smaller and shorter than our /bin/ksh that it is designed to eventually replace (as /bin/sh hardlink), with the old /bin/ksh to completely vanish. It is still in beta testing though, and I don't think it will compile on other operating systems. mksh R21 is a completely new port, bringing together the OpenBSD-current /bin/ksh, the MirOS-current /bin/ksh and the older mksh R20 (which still was portable, ocvs-based).
2005-05-23 05:06:10 +02:00
plug a few display problems with special parameter name expansions reported by Stéphane Chazelas
2016-02-26 19:48:14 +01:00
vsize = strlen(vname) + 1;
vp = alloc(offsetof(struct tbl, name[0]) + vsize, ATEMP);
memcpy(vp->name, vname, vsize);
Add mirbsdksh R21, which was developed in a temporary external CVS repo- sitory whose ChangeLog follows. mksh R21 is licenced under the MirOS li- cence, shown in "sh.h", and a two-clause UCB-style licence by Marc Espie as shown in "alloc.c". This executable is a fair bit smaller and shorter than our /bin/ksh that it is designed to eventually replace (as /bin/sh hardlink), with the old /bin/ksh to completely vanish. It is still in beta testing though, and I don't think it will compile on other operating systems. mksh R21 is a completely new port, bringing together the OpenBSD-current /bin/ksh, the MirOS-current /bin/ksh and the older mksh R20 (which still was portable, ocvs-based).
2005-05-23 05:06:10 +02:00
vp->flag = ISSET|INTEGER;
vp->type = 0;
vp->areap = ATEMP;
… but since I liked the bonus of having the hval stored so much, merge it with the array index; var.c says that │ 1244 /* The table entry is always [0] */ so that we can have a special flag and a union which stores hval for the table index, the array index otherwise (coïncidentally *hint hint* they have the same size)
2009-08-28 23:01:27 +02:00
vp->ua.hval = 0;
Add mirbsdksh R21, which was developed in a temporary external CVS repo- sitory whose ChangeLog follows. mksh R21 is licenced under the MirOS li- cence, shown in "sh.h", and a two-clause UCB-style licence by Marc Espie as shown in "alloc.c". This executable is a fair bit smaller and shorter than our /bin/ksh that it is designed to eventually replace (as /bin/sh hardlink), with the old /bin/ksh to completely vanish. It is still in beta testing though, and I don't think it will compile on other operating systems. mksh R21 is a completely new port, bringing together the OpenBSD-current /bin/ksh, the MirOS-current /bin/ksh and the older mksh R20 (which still was portable, ocvs-based).
2005-05-23 05:06:10 +02:00
vp->val.i = 0;
• remove strcasestr.c, use home-grown implementation¹, call it stricmp, and have it return an API-correct const char * • enhance and stylify comments • a little KNF and simplifications • #ifdef DEBUG: replace strchr and strstr with ucstrchr and ucstrstr that take and return a non-const char *, and fix the violations • new cstrchr, cstrstr (take and give const char *) • new vstrchr, vstrstr (take const or not, give boolean value) • new afreechk(x) = afreechv(x,x) = if (x1) afree(x2, ATEMP) • new ksh_isdash(str) = (str != NULL) && !strcmp(str, "-") • replace the only use of strrchr with inlined code to shrink • minor man page fixes • Minix 3 signames are autogenerated with gcc • rename strlfun.c to strlcpy.c since we don't do strlcat(3) anyway, only strlcpy(3), and shorten it • dot.mkshrc: move MKSH=… down to the export line to not disturb the PS1 visual impression ☺ • dot.mkshrc: Lstripcom(): optimise • bump version ¹) side effect from creating API-correct cstrchr, cstrstr, etc. uses goto so it must be better ☻ tested on mirbsd-current via both Makefile and Build.sh
2007-03-04 04:04:28 +01:00
return (vp);
Add mirbsdksh R21, which was developed in a temporary external CVS repo- sitory whose ChangeLog follows. mksh R21 is licenced under the MirOS li- cence, shown in "sh.h", and a two-clause UCB-style licence by Marc Espie as shown in "alloc.c". This executable is a fair bit smaller and shorter than our /bin/ksh that it is designed to eventually replace (as /bin/sh hardlink), with the old /bin/ksh to completely vanish. It is still in beta testing though, and I don't think it will compile on other operating systems. mksh R21 is a completely new port, bringing together the OpenBSD-current /bin/ksh, the MirOS-current /bin/ksh and the older mksh R20 (which still was portable, ocvs-based).
2005-05-23 05:06:10 +02:00
}
/* cast (string) variable to temporary integer variable */
static struct tbl *
intvar(Expr_state *es, struct tbl *vp)
{
struct tbl *vq;
/* try to avoid replacing a temp var with another temp var */
if (vp->name[0] == '\0' &&
(vp->flag & (ISSET|INTEGER|EXPRLVALUE)) == (ISSET|INTEGER))
• remove strcasestr.c, use home-grown implementation¹, call it stricmp, and have it return an API-correct const char * • enhance and stylify comments • a little KNF and simplifications • #ifdef DEBUG: replace strchr and strstr with ucstrchr and ucstrstr that take and return a non-const char *, and fix the violations • new cstrchr, cstrstr (take and give const char *) • new vstrchr, vstrstr (take const or not, give boolean value) • new afreechk(x) = afreechv(x,x) = if (x1) afree(x2, ATEMP) • new ksh_isdash(str) = (str != NULL) && !strcmp(str, "-") • replace the only use of strrchr with inlined code to shrink • minor man page fixes • Minix 3 signames are autogenerated with gcc • rename strlfun.c to strlcpy.c since we don't do strlcat(3) anyway, only strlcpy(3), and shorten it • dot.mkshrc: move MKSH=… down to the export line to not disturb the PS1 visual impression ☺ • dot.mkshrc: Lstripcom(): optimise • bump version ¹) side effect from creating API-correct cstrchr, cstrstr, etc. uses goto so it must be better ☻ tested on mirbsd-current via both Makefile and Build.sh
2007-03-04 04:04:28 +01:00
return (vp);
Add mirbsdksh R21, which was developed in a temporary external CVS repo- sitory whose ChangeLog follows. mksh R21 is licenced under the MirOS li- cence, shown in "sh.h", and a two-clause UCB-style licence by Marc Espie as shown in "alloc.c". This executable is a fair bit smaller and shorter than our /bin/ksh that it is designed to eventually replace (as /bin/sh hardlink), with the old /bin/ksh to completely vanish. It is still in beta testing though, and I don't think it will compile on other operating systems. mksh R21 is a completely new port, bringing together the OpenBSD-current /bin/ksh, the MirOS-current /bin/ksh and the older mksh R20 (which still was portable, ocvs-based).
2005-05-23 05:06:10 +02:00
plug a few display problems with special parameter name expansions reported by Stéphane Chazelas
2016-02-26 19:48:14 +01:00
vq = tempvar("");
Add mirbsdksh R21, which was developed in a temporary external CVS repo- sitory whose ChangeLog follows. mksh R21 is licenced under the MirOS li- cence, shown in "sh.h", and a two-clause UCB-style licence by Marc Espie as shown in "alloc.c". This executable is a fair bit smaller and shorter than our /bin/ksh that it is designed to eventually replace (as /bin/sh hardlink), with the old /bin/ksh to completely vanish. It is still in beta testing though, and I don't think it will compile on other operating systems. mksh R21 is a completely new port, bringing together the OpenBSD-current /bin/ksh, the MirOS-current /bin/ksh and the older mksh R20 (which still was portable, ocvs-based).
2005-05-23 05:06:10 +02:00
if (setint_v(vq, vp, es->arith) == NULL) {
if (vp->flag & EXPRINEVAL)
evalerr(es, ET_RECURSIVE, vp->name);
es->evaling = vp;
vp->flag |= EXPRINEVAL;
v_evaluate(vq, str_val(vp), KSH_UNWIND_ERROR, es->arith);
vp->flag &= ~EXPRINEVAL;
es->evaling = NULL;
}
• remove strcasestr.c, use home-grown implementation¹, call it stricmp, and have it return an API-correct const char * • enhance and stylify comments • a little KNF and simplifications • #ifdef DEBUG: replace strchr and strstr with ucstrchr and ucstrstr that take and return a non-const char *, and fix the violations • new cstrchr, cstrstr (take and give const char *) • new vstrchr, vstrstr (take const or not, give boolean value) • new afreechk(x) = afreechv(x,x) = if (x1) afree(x2, ATEMP) • new ksh_isdash(str) = (str != NULL) && !strcmp(str, "-") • replace the only use of strrchr with inlined code to shrink • minor man page fixes • Minix 3 signames are autogenerated with gcc • rename strlfun.c to strlcpy.c since we don't do strlcat(3) anyway, only strlcpy(3), and shorten it • dot.mkshrc: move MKSH=… down to the export line to not disturb the PS1 visual impression ☺ • dot.mkshrc: Lstripcom(): optimise • bump version ¹) side effect from creating API-correct cstrchr, cstrstr, etc. uses goto so it must be better ☻ tested on mirbsd-current via both Makefile and Build.sh
2007-03-04 04:04:28 +01:00
return (vq);
Add mirbsdksh R21, which was developed in a temporary external CVS repo- sitory whose ChangeLog follows. mksh R21 is licenced under the MirOS li- cence, shown in "sh.h", and a two-clause UCB-style licence by Marc Espie as shown in "alloc.c". This executable is a fair bit smaller and shorter than our /bin/ksh that it is designed to eventually replace (as /bin/sh hardlink), with the old /bin/ksh to completely vanish. It is still in beta testing though, and I don't think it will compile on other operating systems. mksh R21 is a completely new port, bringing together the OpenBSD-current /bin/ksh, the MirOS-current /bin/ksh and the older mksh R20 (which still was portable, ocvs-based).
2005-05-23 05:06:10 +02:00
}
* move the utf_* functions to a smaller file, to reduce the pain the CPU has to endure while gcc is crunching on edit.c * comment on mksh not using _exactly_ OPTU-8/OPTU-16 (XXX)
2009-09-26 06:01:34 +02:00
/*
* UTF-8 support code: high-level functions
*/
int
utf_widthadj(const char *src, const char **dst)
{
size_t len;
unsigned int wc;
int width;
if (!UTFMODE || (len = utf_mbtowc(&wc, src)) == (size_t)-1 ||
wc == 0)
len = width = 1;
else if ((width = utf_wcwidth(wc)) < 0)
/* XXX use 2 for x_zotc3 here? */
width = 1;
if (dst)
*dst = src + len;
return (width);
}
patch most of Jerker Bäck’s concerns out, unless not applicable
2011-08-27 20:06:52 +02:00
size_t
/me is annoyed I read, IIRC in the Cederqvist, that 'cvs tag' sets a sticky tag onto the cwd… it doesn’t, apparently. (I actually like it better this way, but one needs to know!)
2009-11-28 15:28:03 +01:00
utf_mbswidth(const char *s)
* move the utf_* functions to a smaller file, to reduce the pain the CPU has to endure while gcc is crunching on edit.c * comment on mksh not using _exactly_ OPTU-8/OPTU-16 (XXX)
2009-09-26 06:01:34 +02:00
{
patch most of Jerker Bäck’s concerns out, unless not applicable
2011-08-27 20:06:52 +02:00
size_t len, width = 0;
* move the utf_* functions to a smaller file, to reduce the pain the CPU has to endure while gcc is crunching on edit.c * comment on mksh not using _exactly_ OPTU-8/OPTU-16 (XXX)
2009-09-26 06:01:34 +02:00
unsigned int wc;
patch most of Jerker Bäck’s concerns out, unless not applicable
2011-08-27 20:06:52 +02:00
int cw;
* move the utf_* functions to a smaller file, to reduce the pain the CPU has to endure while gcc is crunching on edit.c * comment on mksh not using _exactly_ OPTU-8/OPTU-16 (XXX)
2009-09-26 06:01:34 +02:00
if (!UTFMODE)
return (strlen(s));
while (*s)
/me is annoyed I read, IIRC in the Cederqvist, that 'cvs tag' sets a sticky tag onto the cwd… it doesn’t, apparently. (I actually like it better this way, but one needs to know!)
2009-11-28 15:28:03 +01:00
if (((len = utf_mbtowc(&wc, s)) == (size_t)-1) ||
((cw = utf_wcwidth(wc)) == -1)) {
* move the utf_* functions to a smaller file, to reduce the pain the CPU has to endure while gcc is crunching on edit.c * comment on mksh not using _exactly_ OPTU-8/OPTU-16 (XXX)
2009-09-26 06:01:34 +02:00
s++;
width += 1;
} else {
s += len;
width += cw;
}
return (width);
}
const char *
fix utf_widthadj/utf_skipcols handling for the remaining cases I can spot
2016-05-06 00:56:15 +02:00
utf_skipcols(const char *p, int cols, int *colp)
* move the utf_* functions to a smaller file, to reduce the pain the CPU has to endure while gcc is crunching on edit.c * comment on mksh not using _exactly_ OPTU-8/OPTU-16 (XXX)
2009-09-26 06:01:34 +02:00
{
int c = 0;
handle combining characters at the end of the string correctly
2016-05-05 23:33:46 +02:00
const char *q;
* move the utf_* functions to a smaller file, to reduce the pain the CPU has to endure while gcc is crunching on edit.c * comment on mksh not using _exactly_ OPTU-8/OPTU-16 (XXX)
2009-09-26 06:01:34 +02:00
attempt a better fix: break off widthadj upon encountering NUL, add remaining columns as octets (should also speed optimise)
2009-12-05 21:17:59 +01:00
while (c < cols) {
fix utf_widthadj/utf_skipcols handling for the remaining cases I can spot
2016-05-06 00:56:15 +02:00
if (!*p) {
/* end of input; special handling for edit.c */
if (!colp)
return (p + cols - c);
*colp = c;
return (p);
}
* move the utf_* functions to a smaller file, to reduce the pain the CPU has to endure while gcc is crunching on edit.c * comment on mksh not using _exactly_ OPTU-8/OPTU-16 (XXX)
2009-09-26 06:01:34 +02:00
c += utf_widthadj(p, &p);
attempt a better fix: break off widthadj upon encountering NUL, add remaining columns as octets (should also speed optimise)
2009-12-05 21:17:59 +01:00
}
handle combining characters at the end of the string correctly
2016-05-05 23:33:46 +02:00
if (UTFMODE)
while (utf_widthadj(p, &q) == 0)
p = q;
fix utf_widthadj/utf_skipcols handling for the remaining cases I can spot
2016-05-06 00:56:15 +02:00
if (colp)
*colp = c;
* move the utf_* functions to a smaller file, to reduce the pain the CPU has to endure while gcc is crunching on edit.c * comment on mksh not using _exactly_ OPTU-8/OPTU-16 (XXX)
2009-09-26 06:01:34 +02:00
return (p);
}
size_t
utf_ptradj(const char *src)
{
register size_t n;
if (!UTFMODE ||
*(const unsigned char *)(src) < 0xC2 ||
(n = utf_mbtowc(NULL, src)) == (size_t)-1)
n = 1;
return (n);
}
/*
* UTF-8 support code: low-level functions
*/
/* CESU-8 multibyte and wide character conversion crafted for mksh */
size_t
utf_mbtowc(unsigned int *dst, const char *src)
{
const unsigned char *s = (const unsigned char *)src;
unsigned int c, wc;
if ((wc = *s++) < 0x80) {
out:
if (dst != NULL)
*dst = wc;
return (wc ? ((const char *)s - src) : 0);
}
if (wc < 0xC2 || wc >= 0xF0)
/* < 0xC0: spurious second byte */
/* < 0xC2: non-minimalistic mapping error in 2-byte seqs */
/* > 0xEF: beyond BMP */
goto ilseq;
if (wc < 0xE0) {
wc = (wc & 0x1F) << 6;
if (((c = *s++) & 0xC0) != 0x80)
goto ilseq;
wc |= c & 0x3F;
goto out;
}
wc = (wc & 0x0F) << 12;
if (((c = *s++) & 0xC0) != 0x80)
goto ilseq;
wc |= (c & 0x3F) << 6;
if (((c = *s++) & 0xC0) != 0x80)
goto ilseq;
wc |= c & 0x3F;
/* Check for non-minimalistic mapping error in 3-byte seqs */
if (wc >= 0x0800 && wc <= 0xFFFD)
goto out;
ilseq:
return ((size_t)(-1));
}
size_t
utf_wctomb(char *dst, unsigned int wc)
{
unsigned char *d;
if (wc < 0x80) {
*dst = wc;
return (1);
}
d = (unsigned char *)dst;
if (wc < 0x0800)
*d++ = (wc >> 6) | 0xC0;
else {
*d++ = ((wc = wc > 0xFFFD ? 0xFFFD : wc) >> 12) | 0xE0;
*d++ = ((wc >> 6) & 0x3F) | 0x80;
}
*d++ = (wc & 0x3F) | 0x80;
return ((char *)d - dst);
}
• access(2) is broken in at least kFreeBSD 9.0 as “modern” OS, so bring back the wrapper code as well as refactor most other code calling it • apparently, names can’t end in ‘_’ or contain ‘__’ anywhere…
2011-09-07 17:24:22 +02:00
/*
* Wrapper around access(2) because it says root can execute everything
* on some operating systems. Does not set errno, no user needs it. Use
* this iff mode can have the X_OK bit set, access otherwise.
*/
int
ksh_access(const char *fn, int mode)
{
int rv;
struct stat sb;
if ((rv = access(fn, mode)) == 0 && kshuid == 0 && (mode & X_OK) &&
(rv = stat(fn, &sb)) == 0 && !S_ISDIR(sb.st_mode) &&
(sb.st_mode & (S_IXUSR|S_IXGRP|S_IXOTH)) == 0)
rv = -1;
return (rv);
}
Replace wcwidth code by mine based on Unicode 6.2.0
2013-06-01 01:27:14 +02:00
save ~1½K from the bootfloppy by reusing MirBSD libkern wcwidth(3) but don’t bother for this for the regular /bin/mksh either to keep the generic code path tested well
2015-10-24 21:45:23 +02:00
#ifndef MIRBSD_BOOTFLOPPY
Unicode 9.0.0 (code and data part; FixedMisc font tbd)
2016-09-01 14:55:21 +02:00
/* From: X11/xc/programs/xterm/wcwidth.c,v 1.9 */
Replace wcwidth code by mine based on Unicode 6.2.0
2013-06-01 01:27:14 +02:00
struct mb_ucsrange {
unsigned short beg;
unsigned short end;
};
static int mb_ucsbsearch(const struct mb_ucsrange arr[], size_t elems,
• fix ${12345678901234567890} segfault (OOB access / integer overflow) ‣ not like oksh did, but using mksh’s built-in features • handle suggested __pure additions • revert cid 1004F7F096867C83CF0 ‣ always use our wcwidth code ‣ only use our strlcpy code if none found • fix a couple of gcc-snapshot and clang/scan-build warnings • mksh R49~rc1
2014-01-05 22:57:29 +01:00
unsigned int val) MKSH_A_PURE;
Replace wcwidth code by mine based on Unicode 6.2.0
2013-06-01 01:27:14 +02:00
/*
Unicode 9.0.0 (code and data part; FixedMisc font tbd)
2016-09-01 14:55:21 +02:00
* Generated from the Unicode Character Database, Version 9.0.0, by
* MirOS: contrib/code/Snippets/eawparse,v 1.3 2014/11/16 12:16:24 tg Exp $
Replace wcwidth code by mine based on Unicode 6.2.0
2013-06-01 01:27:14 +02:00
*/
static const struct mb_ucsrange mb_ucs_combining[] = {
{ 0x0300, 0x036F },
{ 0x0483, 0x0489 },
{ 0x0591, 0x05BD },
{ 0x05BF, 0x05BF },
{ 0x05C1, 0x05C2 },
{ 0x05C4, 0x05C5 },
{ 0x05C7, 0x05C7 },
Unicode 7.0.0
2014-06-24 21:53:19 +02:00
{ 0x0600, 0x0605 },
Replace wcwidth code by mine based on Unicode 6.2.0
2013-06-01 01:27:14 +02:00
{ 0x0610, 0x061A },
Unicode 6.3.0
2013-12-01 00:20:04 +01:00
{ 0x061C, 0x061C },
Replace wcwidth code by mine based on Unicode 6.2.0
2013-06-01 01:27:14 +02:00
{ 0x064B, 0x065F },
{ 0x0670, 0x0670 },
{ 0x06D6, 0x06DD },
{ 0x06DF, 0x06E4 },
{ 0x06E7, 0x06E8 },
{ 0x06EA, 0x06ED },
{ 0x070F, 0x070F },
{ 0x0711, 0x0711 },
{ 0x0730, 0x074A },
{ 0x07A6, 0x07B0 },
{ 0x07EB, 0x07F3 },
{ 0x0816, 0x0819 },
{ 0x081B, 0x0823 },
{ 0x0825, 0x0827 },
{ 0x0829, 0x082D },
{ 0x0859, 0x085B },
Unicode 9.0.0 (code and data part; FixedMisc font tbd)
2016-09-01 14:55:21 +02:00
{ 0x08D4, 0x0902 },
Replace wcwidth code by mine based on Unicode 6.2.0
2013-06-01 01:27:14 +02:00
{ 0x093A, 0x093A },
{ 0x093C, 0x093C },
{ 0x0941, 0x0948 },
{ 0x094D, 0x094D },
{ 0x0951, 0x0957 },
{ 0x0962, 0x0963 },
{ 0x0981, 0x0981 },
{ 0x09BC, 0x09BC },
{ 0x09C1, 0x09C4 },
{ 0x09CD, 0x09CD },
{ 0x09E2, 0x09E3 },
{ 0x0A01, 0x0A02 },
{ 0x0A3C, 0x0A3C },
{ 0x0A41, 0x0A42 },
{ 0x0A47, 0x0A48 },
{ 0x0A4B, 0x0A4D },
{ 0x0A51, 0x0A51 },
{ 0x0A70, 0x0A71 },
{ 0x0A75, 0x0A75 },
{ 0x0A81, 0x0A82 },
{ 0x0ABC, 0x0ABC },
{ 0x0AC1, 0x0AC5 },
{ 0x0AC7, 0x0AC8 },
{ 0x0ACD, 0x0ACD },
{ 0x0AE2, 0x0AE3 },
{ 0x0B01, 0x0B01 },
{ 0x0B3C, 0x0B3C },
{ 0x0B3F, 0x0B3F },
{ 0x0B41, 0x0B44 },
{ 0x0B4D, 0x0B4D },
{ 0x0B56, 0x0B56 },
{ 0x0B62, 0x0B63 },
{ 0x0B82, 0x0B82 },
{ 0x0BC0, 0x0BC0 },
{ 0x0BCD, 0x0BCD },
Unicode 7.0.0
2014-06-24 21:53:19 +02:00
{ 0x0C00, 0x0C00 },
Replace wcwidth code by mine based on Unicode 6.2.0
2013-06-01 01:27:14 +02:00
{ 0x0C3E, 0x0C40 },
{ 0x0C46, 0x0C48 },
{ 0x0C4A, 0x0C4D },
{ 0x0C55, 0x0C56 },
{ 0x0C62, 0x0C63 },
Unicode 7.0.0
2014-06-24 21:53:19 +02:00
{ 0x0C81, 0x0C81 },
Replace wcwidth code by mine based on Unicode 6.2.0
2013-06-01 01:27:14 +02:00
{ 0x0CBC, 0x0CBC },
{ 0x0CBF, 0x0CBF },
{ 0x0CC6, 0x0CC6 },
{ 0x0CCC, 0x0CCD },
{ 0x0CE2, 0x0CE3 },
Unicode 7.0.0
2014-06-24 21:53:19 +02:00
{ 0x0D01, 0x0D01 },
Replace wcwidth code by mine based on Unicode 6.2.0
2013-06-01 01:27:14 +02:00
{ 0x0D41, 0x0D44 },
{ 0x0D4D, 0x0D4D },
{ 0x0D62, 0x0D63 },
{ 0x0DCA, 0x0DCA },
{ 0x0DD2, 0x0DD4 },
{ 0x0DD6, 0x0DD6 },
{ 0x0E31, 0x0E31 },
{ 0x0E34, 0x0E3A },
{ 0x0E47, 0x0E4E },
{ 0x0EB1, 0x0EB1 },
{ 0x0EB4, 0x0EB9 },
{ 0x0EBB, 0x0EBC },
{ 0x0EC8, 0x0ECD },
{ 0x0F18, 0x0F19 },
{ 0x0F35, 0x0F35 },
{ 0x0F37, 0x0F37 },
{ 0x0F39, 0x0F39 },
{ 0x0F71, 0x0F7E },
{ 0x0F80, 0x0F84 },
{ 0x0F86, 0x0F87 },
{ 0x0F8D, 0x0F97 },
{ 0x0F99, 0x0FBC },
{ 0x0FC6, 0x0FC6 },
{ 0x102D, 0x1030 },
{ 0x1032, 0x1037 },
{ 0x1039, 0x103A },
{ 0x103D, 0x103E },
{ 0x1058, 0x1059 },
{ 0x105E, 0x1060 },
{ 0x1071, 0x1074 },
{ 0x1082, 0x1082 },
{ 0x1085, 0x1086 },
{ 0x108D, 0x108D },
{ 0x109D, 0x109D },
{ 0x1160, 0x11FF },
{ 0x135D, 0x135F },
{ 0x1712, 0x1714 },
{ 0x1732, 0x1734 },
{ 0x1752, 0x1753 },
{ 0x1772, 0x1773 },
{ 0x17B4, 0x17B5 },
{ 0x17B7, 0x17BD },
{ 0x17C6, 0x17C6 },
{ 0x17C9, 0x17D3 },
{ 0x17DD, 0x17DD },
Unicode 6.3.0
2013-12-01 00:20:04 +01:00
{ 0x180B, 0x180E },
Unicode 9.0.0 (code and data part; FixedMisc font tbd)
2016-09-01 14:55:21 +02:00
{ 0x1885, 0x1886 },
Replace wcwidth code by mine based on Unicode 6.2.0
2013-06-01 01:27:14 +02:00
{ 0x18A9, 0x18A9 },
{ 0x1920, 0x1922 },
{ 0x1927, 0x1928 },
{ 0x1932, 0x1932 },
{ 0x1939, 0x193B },
{ 0x1A17, 0x1A18 },
Unicode 6.3.0
2013-12-01 00:20:04 +01:00
{ 0x1A1B, 0x1A1B },
Replace wcwidth code by mine based on Unicode 6.2.0
2013-06-01 01:27:14 +02:00
{ 0x1A56, 0x1A56 },
{ 0x1A58, 0x1A5E },
{ 0x1A60, 0x1A60 },
{ 0x1A62, 0x1A62 },
{ 0x1A65, 0x1A6C },
{ 0x1A73, 0x1A7C },
{ 0x1A7F, 0x1A7F },
Unicode 7.0.0
2014-06-24 21:53:19 +02:00
{ 0x1AB0, 0x1ABE },
Replace wcwidth code by mine based on Unicode 6.2.0
2013-06-01 01:27:14 +02:00
{ 0x1B00, 0x1B03 },
{ 0x1B34, 0x1B34 },
{ 0x1B36, 0x1B3A },
{ 0x1B3C, 0x1B3C },
{ 0x1B42, 0x1B42 },
{ 0x1B6B, 0x1B73 },
{ 0x1B80, 0x1B81 },
{ 0x1BA2, 0x1BA5 },
{ 0x1BA8, 0x1BA9 },
Unicode 7.0.0
2014-06-24 21:53:19 +02:00
{ 0x1BAB, 0x1BAD },
Replace wcwidth code by mine based on Unicode 6.2.0
2013-06-01 01:27:14 +02:00
{ 0x1BE6, 0x1BE6 },
{ 0x1BE8, 0x1BE9 },
{ 0x1BED, 0x1BED },
{ 0x1BEF, 0x1BF1 },
{ 0x1C2C, 0x1C33 },
{ 0x1C36, 0x1C37 },
{ 0x1CD0, 0x1CD2 },
{ 0x1CD4, 0x1CE0 },
{ 0x1CE2, 0x1CE8 },
{ 0x1CED, 0x1CED },
{ 0x1CF4, 0x1CF4 },
Unicode 7.0.0
2014-06-24 21:53:19 +02:00
{ 0x1CF8, 0x1CF9 },
{ 0x1DC0, 0x1DF5 },
Unicode 9.0.0 (code and data part; FixedMisc font tbd)
2016-09-01 14:55:21 +02:00
{ 0x1DFB, 0x1DFF },
Replace wcwidth code by mine based on Unicode 6.2.0
2013-06-01 01:27:14 +02:00
{ 0x200B, 0x200F },
{ 0x202A, 0x202E },
{ 0x2060, 0x2064 },
Unicode 6.3.0
2013-12-01 00:20:04 +01:00
{ 0x2066, 0x206F },
Replace wcwidth code by mine based on Unicode 6.2.0
2013-06-01 01:27:14 +02:00
{ 0x20D0, 0x20F0 },
{ 0x2CEF, 0x2CF1 },
{ 0x2D7F, 0x2D7F },
{ 0x2DE0, 0x2DFF },
{ 0x302A, 0x302D },
{ 0x3099, 0x309A },
{ 0xA66F, 0xA672 },
{ 0xA674, 0xA67D },
Unicode 9.0.0 (code and data part; FixedMisc font tbd)
2016-09-01 14:55:21 +02:00
{ 0xA69E, 0xA69F },
Replace wcwidth code by mine based on Unicode 6.2.0
2013-06-01 01:27:14 +02:00
{ 0xA6F0, 0xA6F1 },
{ 0xA802, 0xA802 },
{ 0xA806, 0xA806 },
{ 0xA80B, 0xA80B },
{ 0xA825, 0xA826 },
Unicode 9.0.0 (code and data part; FixedMisc font tbd)
2016-09-01 14:55:21 +02:00
{ 0xA8C4, 0xA8C5 },
Replace wcwidth code by mine based on Unicode 6.2.0
2013-06-01 01:27:14 +02:00
{ 0xA8E0, 0xA8F1 },
{ 0xA926, 0xA92D },
{ 0xA947, 0xA951 },
{ 0xA980, 0xA982 },
{ 0xA9B3, 0xA9B3 },
{ 0xA9B6, 0xA9B9 },
{ 0xA9BC, 0xA9BC },
Unicode 7.0.0
2014-06-24 21:53:19 +02:00
{ 0xA9E5, 0xA9E5 },
Replace wcwidth code by mine based on Unicode 6.2.0
2013-06-01 01:27:14 +02:00
{ 0xAA29, 0xAA2E },
{ 0xAA31, 0xAA32 },
{ 0xAA35, 0xAA36 },
{ 0xAA43, 0xAA43 },
{ 0xAA4C, 0xAA4C },
Unicode 7.0.0
2014-06-24 21:53:19 +02:00
{ 0xAA7C, 0xAA7C },
Replace wcwidth code by mine based on Unicode 6.2.0
2013-06-01 01:27:14 +02:00
{ 0xAAB0, 0xAAB0 },
{ 0xAAB2, 0xAAB4 },
{ 0xAAB7, 0xAAB8 },
{ 0xAABE, 0xAABF },
{ 0xAAC1, 0xAAC1 },
{ 0xAAEC, 0xAAED },
{ 0xAAF6, 0xAAF6 },
{ 0xABE5, 0xABE5 },
{ 0xABE8, 0xABE8 },
{ 0xABED, 0xABED },
{ 0xFB1E, 0xFB1E },
{ 0xFE00, 0xFE0F },
Unicode 9.0.0 (code and data part; FixedMisc font tbd)
2016-09-01 14:55:21 +02:00
{ 0xFE20, 0xFE2F },
Replace wcwidth code by mine based on Unicode 6.2.0
2013-06-01 01:27:14 +02:00
{ 0xFEFF, 0xFEFF },
{ 0xFFF9, 0xFFFB }
};
static const struct mb_ucsrange mb_ucs_fullwidth[] = {
{ 0x1100, 0x115F },
Unicode 9.0.0 (code and data part; FixedMisc font tbd)
2016-09-01 14:55:21 +02:00
{ 0x231A, 0x231B },
Replace wcwidth code by mine based on Unicode 6.2.0
2013-06-01 01:27:14 +02:00
{ 0x2329, 0x232A },
Unicode 9.0.0 (code and data part; FixedMisc font tbd)
2016-09-01 14:55:21 +02:00
{ 0x23E9, 0x23EC },
{ 0x23F0, 0x23F0 },
{ 0x23F3, 0x23F3 },
{ 0x25FD, 0x25FE },
{ 0x2614, 0x2615 },
{ 0x2648, 0x2653 },
{ 0x267F, 0x267F },
{ 0x2693, 0x2693 },
{ 0x26A1, 0x26A1 },
{ 0x26AA, 0x26AB },
{ 0x26BD, 0x26BE },
{ 0x26C4, 0x26C5 },
{ 0x26CE, 0x26CE },
{ 0x26D4, 0x26D4 },
{ 0x26EA, 0x26EA },
{ 0x26F2, 0x26F3 },
{ 0x26F5, 0x26F5 },
{ 0x26FA, 0x26FA },
{ 0x26FD, 0x26FD },
{ 0x2705, 0x2705 },
{ 0x270A, 0x270B },
{ 0x2728, 0x2728 },
{ 0x274C, 0x274C },
{ 0x274E, 0x274E },
{ 0x2753, 0x2755 },
{ 0x2757, 0x2757 },
{ 0x2795, 0x2797 },
{ 0x27B0, 0x27B0 },
{ 0x27BF, 0x27BF },
{ 0x2B1B, 0x2B1C },
{ 0x2B50, 0x2B50 },
{ 0x2B55, 0x2B55 },
Replace wcwidth code by mine based on Unicode 6.2.0
2013-06-01 01:27:14 +02:00
{ 0x2E80, 0x303E },
{ 0x3040, 0xA4CF },
{ 0xA960, 0xA97F },
{ 0xAC00, 0xD7A3 },
{ 0xF900, 0xFAFF },
{ 0xFE10, 0xFE19 },
{ 0xFE30, 0xFE6F },
{ 0xFF00, 0xFF60 },
{ 0xFFE0, 0xFFE6 }
};
/* simple binary search in ranges, with bounds optimisation */
static int
mb_ucsbsearch(const struct mb_ucsrange arr[], size_t elems, unsigned int val)
{
size_t min = 0, mid, max = elems;
if (val < arr[min].beg || val > arr[max - 1].end)
return (0);
while (min < max) {
mid = (min + max) / 2;
if (val < arr[mid].beg)
max = mid;
else if (val > arr[mid].end)
min = mid + 1;
else
return (1);
}
return (0);
}
/* Unix column width of a wide character (Unicode code point, really) */
int
utf_wcwidth(unsigned int wc)
{
/* except NUL, C0/C1 control characters and DEL yield -1 */
if (wc < 0x20 || (wc >= 0x7F && wc < 0xA0))
return (wc ? -1 : 0);
/* combining characters use 0 screen columns */
if (mb_ucsbsearch(mb_ucs_combining, NELEM(mb_ucs_combining), wc))
return (0);
/* all others use 1 or 2 screen columns */
if (mb_ucsbsearch(mb_ucs_fullwidth, NELEM(mb_ucs_fullwidth), wc))
return (2);
return (1);
}
save ~1½K from the bootfloppy by reusing MirBSD libkern wcwidth(3) but don’t bother for this for the regular /bin/mksh either to keep the generic code path tested well
2015-10-24 21:45:23 +02:00
#endif