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

2775 lines
85 KiB
C
Raw Normal View History

partial oksh sync, up to commit 80be547da108d5c241ae068290ca3e331446aa41?
2015-10-09 18:11:19 +02:00
/* $OpenBSD: sh.h,v 1.35 2015/09/10 22:48:58 nicm Exp $ */
sync with OpenBSD: remove unused code and vars; name clash with libc compiles under MirBSD
2006-01-29 21:04:54 +01:00
/* $OpenBSD: shf.h,v 1.6 2005/12/11 18:53:51 deraadt Exp $ */
RCSID sync from oksh; reduce hash table #elements if !MKSH_SMALL to speed up
2012-03-03 22:30:59 +01:00
/* $OpenBSD: table.h,v 1.8 2012/02/19 07:52:30 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
/* $OpenBSD: tree.h,v 1.10 2005/03/28 21:28:22 deraadt Exp $ */
oksh sync, simplify *all* if(x)free(x); constructs, simplify x_push() and sync boilerplate while here
2015-09-05 21:19:12 +02:00
/* $OpenBSD: expand.h,v 1.7 2015/09/01 13:12:31 tedu Exp $ */
pull some quoting fixes from oksh; original patch from Alexander Polakov
2013-06-01 02:15:58 +02:00
/* $OpenBSD: lex.h,v 1.13 2013/03/03 19:11:34 guenther Exp $ */
integrate latest changes from oksh: Wed Sep 4 15:49:19 2013 UTC by millert Add a proper suspend builtin that saves/restores the tty and pgrp as needed instead of an alias that just sends SIGSTOP. Login shells may be suspended if they are not running in an orphan process group.
2013-09-10 19:33:04 +02:00
/* $OpenBSD: proto.h,v 1.35 2013/09/04 15:49:19 millert 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
/* $OpenBSD: c_test.h,v 1.4 2004/12/20 11:34:26 otto Exp $ */
/* $OpenBSD: tty.h,v 1.5 2004/12/20 11:34:26 otto Exp $ */
• 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
/*-
move linkage check (which uses sh.h INCLUDES_ONLY) to when all of its prerequisites are actually fulfilled, i.e. evrn further down than with the last commit doing this, and move some prerequisites of stuff that has wandered outside the !INCLUDES_ONLY block with the compile-time assert changes to the outside, too fixes FTBFS on MSYS which has neither <stdint.h> nor uint32_t reported by RT
2012-01-03 01:58:09 +01:00
* Copyright © 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010,
fixup relation between lksh and mksh (somewhat minimal delta)
2017-02-18 03:33:15 +01:00
* 2011, 2012, 2013, 2014, 2015, 2016, 2017
stop using issetugid(2) for ±p check as it’s probably not the right tool
2015-10-05 19:59:00 +02: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
replace uses of OAAT hash in all its variants by NZAT (mksh internal) or NZAAT (all others)
2011-07-07 00:22:02 +02:00
* is granted to deal in this work without restriction, including un‐
• 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
* limited rights to use, publicly perform, distribute, sell, modify,
* merge, give away, or sublicence.
*
replace uses of OAAT hash in all its variants by NZAT (mksh internal) or NZAAT (all others)
2011-07-07 00:22:02 +02:00
* This work is provided “AS IS” and WITHOUT WARRANTY of any kind, to
• 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
* 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
replace uses of OAAT hash in all its variants by NZAT (mksh internal) or NZAAT (all others)
2011-07-07 00:22:02 +02:00
* of said person’s immediate fault when using the work as intended.
• 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
*/
I’m sorta shocked…
2008-05-17 22:10:52 +02:00
#ifdef __dietlibc__
* improve CPPFLAGS vs #define handling again: do not touch CPPFLAGS from Build.sh but use 'if defined(PRECOND) && !defined(TOBEDEFINED)'if possible * for all of the source code, drop annotations "imake style" (if we check for specific OSes, bad, instead of using mirtoconf checks proper) and "conditions correct?" (if I'm not entirely sure if that #if catches all cases and no false positives) where I can see it by grepping immediately * bump mksh patchlevel * refresh Makefiles
2009-07-25 23:31:27 +02:00
/* XXX imake style */
replace uses of OAAT hash in all its variants by NZAT (mksh internal) or NZAAT (all others)
2011-07-07 00:22:02 +02:00
#define _BSD_SOURCE /* live, BSD, live❣ */
I’m sorta shocked…
2008-05-17 22:10:52 +02:00
#endif
* instead of including <sys/cdefs.h> (not in Solaris), we hope <sys/types.h> includes it for us * autoconf-test for <sys/param.h> (not in SUSv3) existence
2006-11-09 01:11:39 +01:00
#if HAVE_SYS_PARAM_H
#include <sys/param.h>
#endif
#include <sys/types.h>
merge/genericise RT’s port to Minix-vmd
2012-12-17 22:55:06 +01:00
#if HAVE_BOTH_TIME_H
* move _all_ #include stuff into sh.h * sort out #include stuff which isn't necessary on MirOS into compat.h
2005-10-25 21:53:29 +02:00
#include <sys/time.h>
merge/genericise RT’s port to Minix-vmd
2012-12-17 22:55:06 +01:00
#include <time.h>
#elif HAVE_SYS_TIME_H
#include <sys/time.h>
#elif HAVE_TIME_H
#include <time.h>
#endif
* move _all_ #include stuff into sh.h * sort out #include stuff which isn't necessary on MirOS into compat.h
2005-10-25 21:53:29 +02:00
#include <sys/ioctl.h>
on Linux 2.0, <sys/sysmacros.h> defines makedev(), but on Solaris, both it and <sys/mkdev.h> do it, where the latter seems to contain the newer ones, it undefines them before redefining too, so move its inclusion up a little
2007-06-05 21:35:13 +02:00
#if HAVE_SYS_SYSMACROS_H
#include <sys/sysmacros.h>
#endif
header overhaul: replace all #ifdef __OS__ with mirtoconf checks (except the persistent history one)
2007-01-18 16:50:32 +01:00
#if HAVE_SYS_MKDEV_H
#include <sys/mkdev.h>
#endif
• Minix 3 doesn't have <sys/mman.h> • Some OSes might need <stdint.h> for int32_t (Minix 3 with GCC)
2007-03-04 05:36:45 +01:00
#if HAVE_SYS_MMAN_H
* move _all_ #include stuff into sh.h * sort out #include stuff which isn't necessary on MirOS into compat.h
2005-10-25 21:53:29 +02:00
#include <sys/mman.h>
• Minix 3 doesn't have <sys/mman.h> • Some OSes might need <stdint.h> for int32_t (Minix 3 with GCC)
2007-03-04 05:36:45 +01:00
#endif
merge/genericise RT’s port to Minix-vmd
2012-12-17 22:55:06 +01:00
#if HAVE_SYS_RESOURCE_H
* move _all_ #include stuff into sh.h * sort out #include stuff which isn't necessary on MirOS into compat.h
2005-10-25 21:53:29 +02:00
#include <sys/resource.h>
merge/genericise RT’s port to Minix-vmd
2012-12-17 22:55:06 +01:00
#endif
* move _all_ #include stuff into sh.h * sort out #include stuff which isn't necessary on MirOS into compat.h
2005-10-25 21:53:29 +02:00
#include <sys/stat.h>
#include <sys/wait.h>
#include <dirent.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
#include <errno.h>
#include <fcntl.h>
harden the crlf vs lf tests even more; use binary mode explicitly on OS/2
2015-07-09 22:52:43 +02:00
#if HAVE_IO_H
#include <io.h>
#endif
* 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
#if HAVE_LIBGEN_H
* move _all_ #include stuff into sh.h * sort out #include stuff which isn't necessary on MirOS into compat.h
2005-10-25 21:53:29 +02:00
#include <libgen.h>
* 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
#endif
• fix display problem • add <libutil.h> if it exists – revoke(2) on UWIN • add <stdlib.h> for NULL in test of mmap(2) • regen CPPFLAGS for MirBSD native builds
2007-07-01 23:47:08 +02:00
#if HAVE_LIBUTIL_H
#include <libutil.h>
#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
#include <limits.h>
header overhaul: replace all #ifdef __OS__ with mirtoconf checks (except the persistent history one)
2007-01-18 16:50:32 +01:00
#if HAVE_PATHS_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
#include <paths.h>
#endif
* move _all_ #include stuff into sh.h * sort out #include stuff which isn't necessary on MirOS into compat.h
2005-10-25 21:53:29 +02:00
#include <pwd.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
#include <setjmp.h>
#include <signal.h>
#include <stdarg.h>
#include <stddef.h>
• Minix 3 doesn't have <sys/mman.h> • Some OSes might need <stdint.h> for int32_t (Minix 3 with GCC)
2007-03-04 05:36:45 +01:00
#if HAVE_STDINT_H
#include <stdint.h>
#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
#include <stdio.h>
#include <stdlib.h>
#include <string.h>
experimental support for <strings.h> cf. http://www.opengroup.org/onlinepubs/009695399/basedefs/strings.h.html QNX seems to bury some functions in there
2008-11-02 23:29:36 +01:00
#if HAVE_STRINGS_H
#include <strings.h>
#endif
last parts of Coherent patchkit: O_ACCMODE and termio
2012-05-05 00:18:27 +02:00
#if HAVE_TERMIOS_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
#include <termios.h>
last parts of Coherent patchkit: O_ACCMODE and termio
2012-05-05 00:18:27 +02:00
#else
keep up
2012-05-05 00:44:34 +02:00
/* shudder… */
last parts of Coherent patchkit: O_ACCMODE and termio
2012-05-05 00:18:27 +02:00
#include <termio.h>
#endif
thanks to ISC (Interactive) Unix, we now know a few samples of errnos that get used, plus one for the realpath-1 regression test; also make sys_siglist_decl detection nicer and poison strerror() with non-const return value ifdef DEBUG, make it always const
2012-12-18 00:18:11 +01:00
#ifdef _ISC_UNIX
/* XXX imake style */
#include <sys/sioctl.h>
#endif
header overhaul: replace all #ifdef __OS__ with mirtoconf checks (except the persistent history one)
2007-01-18 16:50:32 +01:00
#if HAVE_ULIMIT_H
* remove redundancy * integrate compat.h, version.h into sh.h (dependency trick didn't work anyway) * mention #ksh in mksh(1) since the founder (twkm) said it's on topic too (don't remove mention of #mksh despite it's usually empty because of control)
2006-08-23 00:49:38 +02:00
#include <ulimit.h>
#endif
header overhaul: replace all #ifdef __OS__ with mirtoconf checks (except the persistent history one)
2007-01-18 16:50:32 +01:00
#include <unistd.h>
#if HAVE_VALUES_H
* remove redundancy * integrate compat.h, version.h into sh.h (dependency trick didn't work anyway) * mention #ksh in mksh(1) since the founder (twkm) said it's on topic too (don't remove mention of #mksh despite it's usually empty because of control)
2006-08-23 00:49:38 +02:00
#include <values.h>
#endif
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
#ifdef MIRBSD_BOOTFLOPPY
#include <wchar.h>
#endif
* remove redundancy * integrate compat.h, version.h into sh.h (dependency trick didn't work anyway) * mention #ksh in mksh(1) since the founder (twkm) said it's on topic too (don't remove mention of #mksh despite it's usually empty because of control)
2006-08-23 00:49:38 +02:00
monkey-patch offsetof for a klibc/dietlibc warning; bump to R56b (bugfixes)
2017-08-29 15:38:31 +02:00
/* monkey-patch known-bad offsetof versions to quell a warning */
#if (defined(__KLIBC__) || defined(__dietlibc__)) && \
((defined(__GNUC__) && (__GNUC__ > 3)) || defined(__NWCC__))
#undef offsetof
#define offsetof(s, e) __builtin_offsetof(s, e)
#endif
When compiling native MirOS BSD binaries with SUNpro 12 (don't look like a car only slower, yes this is possible, and the resulting binary passes the testsuite just fine), the definition of __RCSID() in <sys/cdefs.h> expands to something with __attribute__((used)), which triggers a warning, because __attribute__ in general is supported but the used attribute isn't. Thusly always use our own strings and get rid of the MULTI_RCSID test (introduced because __RCSID() on Darwin is inferiour). Maybe we should fix <sys/cdefs.h> too? #ifdef __SUNPRO_C helps here.
2007-06-04 23:27:53 +02:00
#undef __attribute__
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
#if HAVE_ATTRIBUTE_BOUNDED
adapt most __attribute__((…)) occurrences to new KNF style(9)
2013-10-31 21:05:39 +01:00
#define MKSH_A_BOUNDED(x,y,z) __attribute__((__bounded__(x, y, z)))
When compiling native MirOS BSD binaries with SUNpro 12 (don't look like a car only slower, yes this is possible, and the resulting binary passes the testsuite just fine), the definition of __RCSID() in <sys/cdefs.h> expands to something with __attribute__((used)), which triggers a warning, because __attribute__ in general is supported but the used attribute isn't. Thusly always use our own strings and get rid of the MULTI_RCSID test (introduced because __RCSID() on Darwin is inferiour). Maybe we should fix <sys/cdefs.h> too? #ifdef __SUNPRO_C helps here.
2007-06-04 23:27:53 +02:00
#else
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
#define MKSH_A_BOUNDED(x,y,z) /* nothing */
When compiling native MirOS BSD binaries with SUNpro 12 (don't look like a car only slower, yes this is possible, and the resulting binary passes the testsuite just fine), the definition of __RCSID() in <sys/cdefs.h> expands to something with __attribute__((used)), which triggers a warning, because __attribute__ in general is supported but the used attribute isn't. Thusly always use our own strings and get rid of the MULTI_RCSID test (introduced because __RCSID() on Darwin is inferiour). Maybe we should fix <sys/cdefs.h> too? #ifdef __SUNPRO_C helps here.
2007-06-04 23:27:53 +02:00
#endif
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
#if HAVE_ATTRIBUTE_FORMAT
adapt most __attribute__((…)) occurrences to new KNF style(9)
2013-10-31 21:05:39 +01:00
#define MKSH_A_FORMAT(x,y,z) __attribute__((__format__(x, y, z)))
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
#else
#define MKSH_A_FORMAT(x,y,z) /* nothing */
#endif
#if HAVE_ATTRIBUTE_NORETURN
avoid namespace conflicts with __attribute__(…)
2011-04-09 23:01:03 +02:00
#define MKSH_A_NORETURN __attribute__((__noreturn__))
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
#else
#define MKSH_A_NORETURN /* nothing */
#endif
• 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
#if HAVE_ATTRIBUTE_PURE
#define MKSH_A_PURE __attribute__((__pure__))
#else
#define MKSH_A_PURE /* nothing */
#endif
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
#if HAVE_ATTRIBUTE_UNUSED
avoid namespace conflicts with __attribute__(…)
2011-04-09 23:01:03 +02:00
#define MKSH_A_UNUSED __attribute__((__unused__))
When compiling native MirOS BSD binaries with SUNpro 12 (don't look like a car only slower, yes this is possible, and the resulting binary passes the testsuite just fine), the definition of __RCSID() in <sys/cdefs.h> expands to something with __attribute__((used)), which triggers a warning, because __attribute__ in general is supported but the used attribute isn't. Thusly always use our own strings and get rid of the MULTI_RCSID test (introduced because __RCSID() on Darwin is inferiour). Maybe we should fix <sys/cdefs.h> too? #ifdef __SUNPRO_C helps here.
2007-06-04 23:27:53 +02:00
#else
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
#define MKSH_A_UNUSED /* nothing */
When compiling native MirOS BSD binaries with SUNpro 12 (don't look like a car only slower, yes this is possible, and the resulting binary passes the testsuite just fine), the definition of __RCSID() in <sys/cdefs.h> expands to something with __attribute__((used)), which triggers a warning, because __attribute__ in general is supported but the used attribute isn't. Thusly always use our own strings and get rid of the MULTI_RCSID test (introduced because __RCSID() on Darwin is inferiour). Maybe we should fix <sys/cdefs.h> too? #ifdef __SUNPRO_C helps here.
2007-06-04 23:27:53 +02:00
#endif
#if HAVE_ATTRIBUTE_USED
avoid namespace conflicts with __attribute__(…)
2011-04-09 23:01:03 +02:00
#define MKSH_A_USED __attribute__((__used__))
When compiling native MirOS BSD binaries with SUNpro 12 (don't look like a car only slower, yes this is possible, and the resulting binary passes the testsuite just fine), the definition of __RCSID() in <sys/cdefs.h> expands to something with __attribute__((used)), which triggers a warning, because __attribute__ in general is supported but the used attribute isn't. Thusly always use our own strings and get rid of the MULTI_RCSID test (introduced because __RCSID() on Darwin is inferiour). Maybe we should fix <sys/cdefs.h> too? #ifdef __SUNPRO_C helps here.
2007-06-04 23:27:53 +02:00
#else
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
#define MKSH_A_USED /* nothing */
When compiling native MirOS BSD binaries with SUNpro 12 (don't look like a car only slower, yes this is possible, and the resulting binary passes the testsuite just fine), the definition of __RCSID() in <sys/cdefs.h> expands to something with __attribute__((used)), which triggers a warning, because __attribute__ in general is supported but the used attribute isn't. Thusly always use our own strings and get rid of the MULTI_RCSID test (introduced because __RCSID() on Darwin is inferiour). Maybe we should fix <sys/cdefs.h> too? #ifdef __SUNPRO_C helps here.
2007-06-04 23:27:53 +02:00
#endif
No, __attribute__((used)) with SUNWcc on MirBSD still won’t work…
2010-01-28 16:13:25 +01:00
#if defined(MirBSD) && (MirBSD >= 0x09A1) && \
defined(__ELF__) && defined(__GNUC__) && \
!defined(__llvm__) && !defined(__NWCC__)
* add __COPYRIGHT * if MirBSD is recent enough, use OS' RCSID macros
2009-07-30 20:42:31 +02:00
/*
* We got usable __IDSTRING __COPYRIGHT __RCSID __SCCSID macros
* which work for all cases; no need to redefine them using the
* "portable" macros from below when we might have the "better"
* gcc+ELF specific macros or other system dependent ones.
*/
#else
When compiling native MirOS BSD binaries with SUNpro 12 (don't look like a car only slower, yes this is possible, and the resulting binary passes the testsuite just fine), the definition of __RCSID() in <sys/cdefs.h> expands to something with __attribute__((used)), which triggers a warning, because __attribute__ in general is supported but the used attribute isn't. Thusly always use our own strings and get rid of the MULTI_RCSID test (introduced because __RCSID() on Darwin is inferiour). Maybe we should fix <sys/cdefs.h> too? #ifdef __SUNPRO_C helps here.
2007-06-04 23:27:53 +02:00
#undef __IDSTRING
#undef __IDSTRING_CONCAT
#undef __IDSTRING_EXPAND
* add __COPYRIGHT * if MirBSD is recent enough, use OS' RCSID macros
2009-07-30 20:42:31 +02:00
#undef __COPYRIGHT
When compiling native MirOS BSD binaries with SUNpro 12 (don't look like a car only slower, yes this is possible, and the resulting binary passes the testsuite just fine), the definition of __RCSID() in <sys/cdefs.h> expands to something with __attribute__((used)), which triggers a warning, because __attribute__ in general is supported but the used attribute isn't. Thusly always use our own strings and get rid of the MULTI_RCSID test (introduced because __RCSID() on Darwin is inferiour). Maybe we should fix <sys/cdefs.h> too? #ifdef __SUNPRO_C helps here.
2007-06-04 23:27:53 +02:00
#undef __RCSID
#undef __SCCSID
#define __IDSTRING_CONCAT(l,p) __LINTED__ ## l ## _ ## p
#define __IDSTRING_EXPAND(l,p) __IDSTRING_CONCAT(l,p)
add size optimisation hacks by me from Android except ifdef’d (note, I’d prefer everyone to keep IDSTRINGs around though)
2010-09-14 23:15:11 +02:00
#ifdef MKSH_DONT_EMIT_IDSTRING
#define __IDSTRING(prefix, string) /* nothing */
#else
When compiling native MirOS BSD binaries with SUNpro 12 (don't look like a car only slower, yes this is possible, and the resulting binary passes the testsuite just fine), the definition of __RCSID() in <sys/cdefs.h> expands to something with __attribute__((used)), which triggers a warning, because __attribute__ in general is supported but the used attribute isn't. Thusly always use our own strings and get rid of the MULTI_RCSID test (introduced because __RCSID() on Darwin is inferiour). Maybe we should fix <sys/cdefs.h> too? #ifdef __SUNPRO_C helps here.
2007-06-04 23:27:53 +02:00
#define __IDSTRING(prefix, string) \
static const char __IDSTRING_EXPAND(__LINE__,prefix) [] \
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_USED = "@(""#)" #prefix ": " string
add size optimisation hacks by me from Android except ifdef’d (note, I’d prefer everyone to keep IDSTRINGs around though)
2010-09-14 23:15:11 +02:00
#endif
* add __COPYRIGHT * if MirBSD is recent enough, use OS' RCSID macros
2009-07-30 20:42:31 +02:00
#define __COPYRIGHT(x) __IDSTRING(copyright,x)
#define __RCSID(x) __IDSTRING(rcsid,x)
#define __SCCSID(x) __IDSTRING(sccsid,x)
#endif
When compiling native MirOS BSD binaries with SUNpro 12 (don't look like a car only slower, yes this is possible, and the resulting binary passes the testsuite just fine), the definition of __RCSID() in <sys/cdefs.h> expands to something with __attribute__((used)), which triggers a warning, because __attribute__ in general is supported but the used attribute isn't. Thusly always use our own strings and get rid of the MULTI_RCSID test (introduced because __RCSID() on Darwin is inferiour). Maybe we should fix <sys/cdefs.h> too? #ifdef __SUNPRO_C helps here.
2007-06-04 23:27:53 +02:00
sh.h can provide its rcsid itself, no need for that ugly hack
2008-04-22 20:57:26 +02:00
#ifdef EXTERN
handle drive-qualified nōn-absolute pathnames in do_realpath(), untested the idea here is that: - /foo/bar and a:/foo/bar are absolute - foo/bar is relative - a:foo/bar needs to be handled specially, mostly per making it into an absolute (“a:/” + getcwd(a:) + “foo/bar”)
2017-10-12 01:23:03 +02:00
__RCSID("$MirOS: src/bin/mksh/sh.h,v 1.847 2017/10/11 23:23:03 tg Exp $");
sh.h can provide its rcsid itself, no need for that ugly hack
2008-04-22 20:57:26 +02:00
#endif
monkey-patch offsetof for a klibc/dietlibc warning; bump to R56b (bugfixes)
2017-08-29 15:38:31 +02:00
#define MKSH_VERSION "R56 2017/08/29"
sh.h can provide its rcsid itself, no need for that ugly hack
2008-04-22 20:57:26 +02:00
move linkage check (which uses sh.h INCLUDES_ONLY) to when all of its prerequisites are actually fulfilled, i.e. evrn further down than with the last commit doing this, and move some prerequisites of stuff that has wandered outside the !INCLUDES_ONLY block with the compile-time assert changes to the outside, too fixes FTBFS on MSYS which has neither <stdint.h> nor uint32_t reported by RT
2012-01-03 01:58:09 +01:00
/* arithmetic types: C implementation */
#if !HAVE_CAN_INTTYPES
#if !HAVE_CAN_UCBINTS
typedef signed int int32_t;
typedef unsigned int uint32_t;
#else
typedef u_int32_t uint32_t;
#endif
#endif
/* arithmetic types: shell arithmetics */
(mksh) tighten 32-bit requirements; (lksh) switch to long; allow any bitness
2012-06-28 22:17:39 +02:00
#ifdef MKSH_LEGACY_MODE
add a note that mksh_{,u}ari_t are, sadly, not currently configurable
2012-03-28 00:49:47 +02:00
/*
(mksh) tighten 32-bit requirements; (lksh) switch to long; allow any bitness
2012-06-28 22:17:39 +02:00
* POSIX demands these to be the C environment's long type
*/
typedef long mksh_ari_t;
typedef unsigned long mksh_uari_t;
#else
/*
* These types are exactly 32 bit wide; signed and unsigned
* integer wraparound, even across division and modulo, for
* any shell code using them, is guaranteed.
add a note that mksh_{,u}ari_t are, sadly, not currently configurable
2012-03-28 00:49:47 +02:00
*/
move compile-time assertions out of misc.c(#ifdef DEBUG) into Build.sh
2011-12-03 01:01:28 +01:00
typedef int32_t mksh_ari_t;
typedef uint32_t mksh_uari_t;
(mksh) tighten 32-bit requirements; (lksh) switch to long; allow any bitness
2012-06-28 22:17:39 +02:00
#endif
move compile-time assertions out of misc.c(#ifdef DEBUG) into Build.sh
2011-12-03 01:01:28 +01:00
/* boolean type (no <stdbool.h> deliberately) */
typedef unsigned char mksh_bool;
#undef bool
gc-sections found size optimisation chances
2011-12-31 01:27:27 +01:00
/* false MUST equal the same 0 as written by static storage initialisation */
move compile-time assertions out of misc.c(#ifdef DEBUG) into Build.sh
2011-12-03 01:01:28 +01:00
#undef false
#undef true
/* access macros for boolean type */
#define bool mksh_bool
/* values must have identity mapping between mksh_bool and short */
#define false 0
#define true 1
/* make any-type into bool or short */
#define tobool(cond) ((cond) ? true : false)
move linkage check (which uses sh.h INCLUDES_ONLY) to when all of its prerequisites are actually fulfilled, i.e. evrn further down than with the last commit doing this, and move some prerequisites of stuff that has wandered outside the !INCLUDES_ONLY block with the compile-time assert changes to the outside, too fixes FTBFS on MSYS which has neither <stdint.h> nor uint32_t reported by RT
2012-01-03 01:58:09 +01:00
/* char (octet) type: C implementation */
#if !HAVE_CAN_INT8TYPE
#if !HAVE_CAN_UCBINT8
typedef unsigned char uint8_t;
#else
typedef u_int8_t uint8_t;
#endif
#endif
/* other standard types */
#if !HAVE_RLIM_T
Susv3mon says: rlim_t are unsigned
2012-03-26 23:10:44 +02:00
typedef unsigned long rlim_t;
move linkage check (which uses sh.h INCLUDES_ONLY) to when all of its prerequisites are actually fulfilled, i.e. evrn further down than with the last commit doing this, and move some prerequisites of stuff that has wandered outside the !INCLUDES_ONLY block with the compile-time assert changes to the outside, too fixes FTBFS on MSYS which has neither <stdint.h> nor uint32_t reported by RT
2012-01-03 01:58:09 +01:00
#endif
#if !HAVE_SIG_T
#undef sig_t
typedef void (*sig_t)(int);
#endif
if the OS does not provide sig_atomic_t and/or ssize_t, you can now define MKSH_TYPEDEF_SIG_ATOMIC_T and MKSH_TYPEDEF_SSIZE_T via CPPFLAGS to the *correct* definitions (it’s absolutely critical they be correct!)
2012-04-14 16:02:40 +02:00
#ifdef MKSH_TYPEDEF_SIG_ATOMIC_T
typedef MKSH_TYPEDEF_SIG_ATOMIC_T sig_atomic_t;
#endif
#ifdef MKSH_TYPEDEF_SSIZE_T
typedef MKSH_TYPEDEF_SSIZE_T ssize_t;
#endif
#undef flock (LP: #912691)
2012-03-28 00:41:17 +02:00
/* un-do vendor damage */
#undef BAD /* AIX defines that somewhere */
LynxOS defines PRINT somewhere, undef it
2012-04-06 13:51:43 +02:00
#undef PRINT /* LynxOS defines that somewhere */
#undef flock (LP: #912691)
2012-03-28 00:41:17 +02:00
#undef flock /* SCO UnixWare defines that to flock64 but ENOENT */
AIX has sys_siglist[] but doesn't define it anywhere, so add a means to scan for defns and use it here; bug reported by Kurt Telep
2007-04-23 22:37:16 +02:00
#ifndef MKSH_INCLUDES_ONLY
apply most of the remaining parts of the EBCDIC patch, sans the CTRL() changes
2017-04-28 04:24:58 +02:00
/* EBCDIC fun */
sprinkle tons more ord() around this is really not funny… mksh-ng will use even more “unsigned only”
2017-05-06 00:53:32 +02:00
/* see the large comment in shf.c for an EBCDIC primer */
apply most of the remaining parts of the EBCDIC patch, sans the CTRL() changes
2017-04-28 04:24:58 +02:00
#if defined(MKSH_FOR_Z_OS) && defined(__MVS__) && defined(__IBMC__) && defined(__CHARSET_LIB)
# if !__CHARSET_LIB && !defined(MKSH_EBCDIC)
# error "Please compile with Build.sh -E for EBCDIC!"
# endif
# if __CHARSET_LIB && defined(MKSH_EBCDIC)
# error "Please compile without -E argument to Build.sh for ASCII!"
# endif
# if __CHARSET_LIB && !defined(_ENHANCED_ASCII_EXT)
/* go all-out on ASCII */
# define _ENHANCED_ASCII_EXT 0xFFFFFFFF
# endif
#endif
if we don't have rlim_t, assume it's long
2007-01-18 00:18:55 +01:00
/* extra types */
more easy OS/2 fixes From: KO Myung-Hun <komh@chollian.net>
2015-07-09 21:46:43 +02:00
/* getrusage does not exist on OS/2 kLIBC */
#if !HAVE_GETRUSAGE && !defined(__OS2__)
(experimental) implement getrusage via times if not found
2009-04-03 11:39:07 +02:00
#undef rusage
#undef RUSAGE_SELF
#undef RUSAGE_CHILDREN
#define rusage mksh_rusage
jg71 reported -DMKSH_ASSUME_UTF8=* breaks defining stristr
2011-08-27 19:30:07 +02:00
#define RUSAGE_SELF 0
#define RUSAGE_CHILDREN -1
(experimental) implement getrusage via times if not found
2009-04-03 11:39:07 +02:00
struct rusage {
struct timeval ru_utime;
struct timeval ru_stime;
};
#endif
* remove redundancy * integrate compat.h, version.h into sh.h (dependency trick didn't work anyway) * mention #ksh in mksh(1) since the founder (twkm) said it's on topic too (don't remove mention of #mksh despite it's usually empty because of control)
2006-08-23 00:49:38 +02:00
/* extra macros */
initial support for PW32, not quite working yet (same issues as Minix 3 and Plan 9, I think)
2007-07-24 23:47:14 +02:00
#ifndef timerclear
* back out almost all of the memory allocator related changes, as aalloc was hard to type and hard to fix, galloc is also hard to fix, and some things I learned will probably improve things more but make me use the original form as base (especially for space savings) * let sizeofN die though, remove even more casts * optimise, polish * regen Makefiles * sprinkle a few /* CONSTCOND */ while here
2008-12-13 18:02:18 +01:00
#define timerclear(tvp) \
do { \
(tvp)->tv_sec = (tvp)->tv_usec = 0; \
} while (/* CONSTCOND */ 0)
initial support for PW32, not quite working yet (same issues as Minix 3 and Plan 9, I think)
2007-07-24 23:47:14 +02:00
#endif
* remove redundancy * integrate compat.h, version.h into sh.h (dependency trick didn't work anyway) * mention #ksh in mksh(1) since the founder (twkm) said it's on topic too (don't remove mention of #mksh despite it's usually empty because of control)
2006-08-23 00:49:38 +02:00
#ifndef timeradd
whitespace fixes
2006-11-16 14:35:00 +01:00
#define timeradd(tvp, uvp, vvp) \
* remove redundancy * integrate compat.h, version.h into sh.h (dependency trick didn't work anyway) * mention #ksh in mksh(1) since the founder (twkm) said it's on topic too (don't remove mention of #mksh despite it's usually empty because of control)
2006-08-23 00:49:38 +02:00
do { \
(vvp)->tv_sec = (tvp)->tv_sec + (uvp)->tv_sec; \
(vvp)->tv_usec = (tvp)->tv_usec + (uvp)->tv_usec; \
if ((vvp)->tv_usec >= 1000000) { \
(vvp)->tv_sec++; \
(vvp)->tv_usec -= 1000000; \
} \
* back out almost all of the memory allocator related changes, as aalloc was hard to type and hard to fix, galloc is also hard to fix, and some things I learned will probably improve things more but make me use the original form as base (especially for space savings) * let sizeofN die though, remove even more casts * optimise, polish * regen Makefiles * sprinkle a few /* CONSTCOND */ while here
2008-12-13 18:02:18 +01:00
} while (/* CONSTCOND */ 0)
* remove redundancy * integrate compat.h, version.h into sh.h (dependency trick didn't work anyway) * mention #ksh in mksh(1) since the founder (twkm) said it's on topic too (don't remove mention of #mksh despite it's usually empty because of control)
2006-08-23 00:49:38 +02:00
#endif
#ifndef timersub
whitespace fixes
2006-11-16 14:35:00 +01:00
#define timersub(tvp, uvp, vvp) \
* remove redundancy * integrate compat.h, version.h into sh.h (dependency trick didn't work anyway) * mention #ksh in mksh(1) since the founder (twkm) said it's on topic too (don't remove mention of #mksh despite it's usually empty because of control)
2006-08-23 00:49:38 +02:00
do { \
(vvp)->tv_sec = (tvp)->tv_sec - (uvp)->tv_sec; \
(vvp)->tv_usec = (tvp)->tv_usec - (uvp)->tv_usec; \
if ((vvp)->tv_usec < 0) { \
(vvp)->tv_sec--; \
(vvp)->tv_usec += 1000000; \
} \
* back out almost all of the memory allocator related changes, as aalloc was hard to type and hard to fix, galloc is also hard to fix, and some things I learned will probably improve things more but make me use the original form as base (especially for space savings) * let sizeofN die though, remove even more casts * optimise, polish * regen Makefiles * sprinkle a few /* CONSTCOND */ while here
2008-12-13 18:02:18 +01:00
} while (/* CONSTCOND */ 0)
* remove redundancy * integrate compat.h, version.h into sh.h (dependency trick didn't work anyway) * mention #ksh in mksh(1) since the founder (twkm) said it's on topic too (don't remove mention of #mksh despite it's usually empty because of control)
2006-08-23 00:49:38 +02:00
#endif
sprinkle CONSERVATIVE_FDS for many older OSes; DISABLE_TTY_WARNING for BeOS and Coherent (probably more to come); NO_CMDLINE_EDITING to Plan 9; put Hurd NO_PATH_MAX into MKSH__ private namespace
2012-05-05 19:37:44 +02:00
#ifdef MKSH__NO_PATH_MAX
do not use PATH_MAX on GNU/Hurd (even if it *was* defined), but use some glibc-only functions that don’t require its use instead tested on gnubber, where (admittedly) sysconf(_PC_PATH_MAX) == 1024…
2009-10-27 18:00:02 +01:00
#undef PATH_MAX
#else
add new builtin “realpath” calling realpath(3) on its argument, skipping over “--” for compatibility to Debian realpath(1) and possibly busybox’ “sounds handy” replaced@TNF
2008-05-17 20:27:57 +02:00
#ifndef PATH_MAX
rcsid sync from obsd; misc sync; small improvements • mksh testsuite no longer uses printf, again • use MAXPATHLEN from <sys/param.h> as PATH_MAX fallback
2015-01-25 16:23:43 +01:00
#ifdef MAXPATHLEN
#define PATH_MAX MAXPATHLEN
#else
add new builtin “realpath” calling realpath(3) on its argument, skipping over “--” for compatibility to Debian realpath(1) and possibly busybox’ “sounds handy” replaced@TNF
2008-05-17 20:27:57 +02:00
#define PATH_MAX 1024
#endif
do not use PATH_MAX on GNU/Hurd (even if it *was* defined), but use some glibc-only functions that don’t require its use instead tested on gnubber, where (admittedly) sysconf(_PC_PATH_MAX) == 1024…
2009-10-27 18:00:02 +01:00
#endif
rcsid sync from obsd; misc sync; small improvements • mksh testsuite no longer uses printf, again • use MAXPATHLEN from <sys/param.h> as PATH_MAX fallback
2015-01-25 16:23:43 +01:00
#endif
globalise SIZE_MAX definition
2009-04-07 20:46:07 +02:00
#ifndef SIZE_MAX
#ifdef SIZE_T_MAX
#define SIZE_MAX SIZE_T_MAX
#else
#define SIZE_MAX ((size_t)-1)
#endif
#endif
• Add support for Ultrix 4.5 and ucode cc (?) ‣ I/O redirection seems broken: $ (date; date >/dev/null; date) | wc -l 1 (expected: 2) ‣ other than that: working fine ‣ -YBSD (default) and -YSYSTEM_FIVE don’t work, just -YPOSIX, somehow • Fix $(…) to `…` for OSF/1 V2.0 /bin/sh ‣ this compiler is FUBAR though: $ cat >t.c main() { return (foo()); } $ cc t.c ld: Unresolved : foo $ echo $? 0 $ ls -l a.out -rwxr-xr-x 1 mirbsd users 10835 Jul 21 17:12 a.out ‣ it seems to have ucode, but man is not installed • new mirtoconf check: mkstemp(3) • if !HAVE_MKSTEMP (Ultrix), use tempnam(3) • only use printf(1) if it exists (it doesn’t on Ultrix) • a few more signals • add S_ISLNK if the OS doesn’t define it • add strcasecmp(3) proto for Ultrix (it _is_ in <portability.h>, but only for -YBSD I think) • fgrep(1) on Ultrix doesn’t do “-e ① -e ②” 10x DEChengst:#UnixNL for giving access
2008-03-25 22:34:45 +01:00
#ifndef S_ISLNK
#define S_ISLNK(m) ((m & 0170000) == 0120000)
#endif
Minix 3 has no S_ISSOCK (probably not even UNIX® domain sockets) and lacks other things (rlimit stuff), so it won't make it today
2007-03-04 06:14:10 +01:00
#ifndef S_ISSOCK
#define S_ISSOCK(m) ((m & 0170000) == 0140000)
#endif
don’t leak memory (pdksh did), and forgot a hunk
2011-03-27 03:30:38 +02:00
#if !defined(S_ISCDF) && defined(S_CDF)
#define S_ISCDF(m) (S_ISDIR(m) && ((m) & S_CDF))
#endif
first attempts at more autoconf'isation
2006-11-09 00:23:41 +01:00
#ifndef DEFFILEMODE
• 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
#define DEFFILEMODE (S_IRUSR|S_IWUSR|S_IRGRP|S_IWGRP|S_IROTH|S_IWOTH)
first attempts at more autoconf'isation
2006-11-09 00:23:41 +01:00
#endif
* remove redundancy * integrate compat.h, version.h into sh.h (dependency trick didn't work anyway) * mention #ksh in mksh(1) since the founder (twkm) said it's on topic too (don't remove mention of #mksh despite it's usually empty because of control)
2006-08-23 00:49:38 +02:00
overhaul the signal handling: • support NSIG_MAX from http://austingroupbugs.net/view.php?id=741 and make a TODO for later to use sysconf(_SC_NSIG) at runtime • bounds-check signals (e.g. no smaller than 1, but smaller than NSIG) • align trap errorlevel with other shells • make trap match what’s in POSIX and fixup the manpage • refactor some code related to signals • hide from kill builtin both EXIT and ERR pseudo-signals
2015-04-29 22:44:37 +02:00
/* determine ksh_NSIG: first, use the traditional definitions */
#undef ksh_NSIG
#if defined(NSIG)
be more careful with signals and errorlevels; bounds-check them better; don’t trust the OS as POSuX comes up with more-than-8-bit exit codes now; also, one more int → bool
2015-08-13 23:38:19 +02:00
#define ksh_NSIG (NSIG)
overhaul the signal handling: • support NSIG_MAX from http://austingroupbugs.net/view.php?id=741 and make a TODO for later to use sysconf(_SC_NSIG) at runtime • bounds-check signals (e.g. no smaller than 1, but smaller than NSIG) • align trap errorlevel with other shells • make trap match what’s in POSIX and fixup the manpage • refactor some code related to signals • hide from kill builtin both EXIT and ERR pseudo-signals
2015-04-29 22:44:37 +02:00
#elif defined(_NSIG)
be more careful with signals and errorlevels; bounds-check them better; don’t trust the OS as POSuX comes up with more-than-8-bit exit codes now; also, one more int → bool
2015-08-13 23:38:19 +02:00
#define ksh_NSIG (_NSIG)
• now this builds fine on DEChengst’s Tru64 box: | OSF1 rubbereendje.dechengst.nl V5.1 2650 alpha with the vendor compiler: | Compaq C V6.5-011 on HP Tru64 UNIX V5.1B (Rev. 2650) | Compiler Driver V6.5-003 (sys) cc Driver • the platform’s sig_t is incompatible too (simplify check) • no compile warnings at all • results in: $ size mksh | text data bss dec hex | 327680 16384 17808 361872 58590 $ file mksh | mksh: COFF format alpha dynamically linked, demand paged executable or object module not stripped - version 3.13-14 $ ldd mksh | | Main => mksh | libc.so => /usr/shlib/libc.so $ ls -l mksh | -rwxr-xr-x 1 mirbsd users 395200 Mar 5 19:18 mksh • minor testsuite issues: FAIL ./check.t:regression-13 unexpected stderr - got too much output wanted nothing got: Successful cat: output error ⇒ probably harmless • works like a charm!
2008-03-05 19:21:45 +01:00
#elif defined(SIGMAX)
overhaul the signal handling: • support NSIG_MAX from http://austingroupbugs.net/view.php?id=741 and make a TODO for later to use sysconf(_SC_NSIG) at runtime • bounds-check signals (e.g. no smaller than 1, but smaller than NSIG) • align trap errorlevel with other shells • make trap match what’s in POSIX and fixup the manpage • refactor some code related to signals • hide from kill builtin both EXIT and ERR pseudo-signals
2015-04-29 22:44:37 +02:00
#define ksh_NSIG (SIGMAX + 1)
RT says QNX 4 has _SIGMAX not SIGMAX or NSIG
2012-12-28 04:35:34 +01:00
#elif defined(_SIGMAX)
overhaul the signal handling: • support NSIG_MAX from http://austingroupbugs.net/view.php?id=741 and make a TODO for later to use sysconf(_SC_NSIG) at runtime • bounds-check signals (e.g. no smaller than 1, but smaller than NSIG) • align trap errorlevel with other shells • make trap match what’s in POSIX and fixup the manpage • refactor some code related to signals • hide from kill builtin both EXIT and ERR pseudo-signals
2015-04-29 22:44:37 +02:00
#define ksh_NSIG (_SIGMAX + 1)
#elif defined(NSIG_MAX)
be more careful with signals and errorlevels; bounds-check them better; don’t trust the OS as POSuX comes up with more-than-8-bit exit codes now; also, one more int → bool
2015-08-13 23:38:19 +02:00
#define ksh_NSIG (NSIG_MAX)
apply most of the remaining parts of the EBCDIC patch, sans the CTRL() changes
2017-04-28 04:24:58 +02:00
#elif defined(MKSH_FOR_Z_OS)
#define ksh_NSIG 40
fix some of the signal stuff (still didn’t get rid of awk(1) and printf(1) calls in Build.sh, we need HOSTCC for that… which we should do, using BER or something encoded for integers, and pregenerated hashtables as planned) also, bump to R50 beta, due to today’s language changes
2014-06-09 15:25:53 +02:00
#else
# error Please have your platform define NSIG.
• now this builds fine on DEChengst’s Tru64 box: | OSF1 rubbereendje.dechengst.nl V5.1 2650 alpha with the vendor compiler: | Compaq C V6.5-011 on HP Tru64 UNIX V5.1B (Rev. 2650) | Compiler Driver V6.5-003 (sys) cc Driver • the platform’s sig_t is incompatible too (simplify check) • no compile warnings at all • results in: $ size mksh | text data bss dec hex | 327680 16384 17808 361872 58590 $ file mksh | mksh: COFF format alpha dynamically linked, demand paged executable or object module not stripped - version 3.13-14 $ ldd mksh | | Main => mksh | libc.so => /usr/shlib/libc.so $ ls -l mksh | -rwxr-xr-x 1 mirbsd users 395200 Mar 5 19:18 mksh • minor testsuite issues: FAIL ./check.t:regression-13 unexpected stderr - got too much output wanted nothing got: Successful cat: output error ⇒ probably harmless • works like a charm!
2008-03-05 19:21:45 +01:00
#endif
overhaul the signal handling: • support NSIG_MAX from http://austingroupbugs.net/view.php?id=741 and make a TODO for later to use sysconf(_SC_NSIG) at runtime • bounds-check signals (e.g. no smaller than 1, but smaller than NSIG) • align trap errorlevel with other shells • make trap match what’s in POSIX and fixup the manpage • refactor some code related to signals • hide from kill builtin both EXIT and ERR pseudo-signals
2015-04-29 22:44:37 +02:00
/* range-check them */
#if (ksh_NSIG < 1)
fix some of the signal stuff (still didn’t get rid of awk(1) and printf(1) calls in Build.sh, we need HOSTCC for that… which we should do, using BER or something encoded for integers, and pregenerated hashtables as planned) also, bump to R50 beta, due to today’s language changes
2014-06-09 15:25:53 +02:00
# error Your NSIG value is not positive.
overhaul the signal handling: • support NSIG_MAX from http://austingroupbugs.net/view.php?id=741 and make a TODO for later to use sysconf(_SC_NSIG) at runtime • bounds-check signals (e.g. no smaller than 1, but smaller than NSIG) • align trap errorlevel with other shells • make trap match what’s in POSIX and fixup the manpage • refactor some code related to signals • hide from kill builtin both EXIT and ERR pseudo-signals
2015-04-29 22:44:37 +02:00
#undef ksh_NSIG
#endif
/* second, see if the new POSIX definition is available */
#ifdef NSIG_MAX
#if (NSIG_MAX < 2)
/* and usable */
# error Your NSIG_MAX value is too small.
#undef NSIG_MAX
#elif (ksh_NSIG > NSIG_MAX)
/* and realistic */
# error Your NSIG value is larger than your NSIG_MAX value.
#undef NSIG_MAX
#else
/* since it’s usable, prefer it */
#undef ksh_NSIG
be more careful with signals and errorlevels; bounds-check them better; don’t trust the OS as POSuX comes up with more-than-8-bit exit codes now; also, one more int → bool
2015-08-13 23:38:19 +02:00
#define ksh_NSIG (NSIG_MAX)
overhaul the signal handling: • support NSIG_MAX from http://austingroupbugs.net/view.php?id=741 and make a TODO for later to use sysconf(_SC_NSIG) at runtime • bounds-check signals (e.g. no smaller than 1, but smaller than NSIG) • align trap errorlevel with other shells • make trap match what’s in POSIX and fixup the manpage • refactor some code related to signals • hide from kill builtin both EXIT and ERR pseudo-signals
2015-04-29 22:44:37 +02:00
#endif
/* if NSIG_MAX is now still defined, use sysconf(_SC_NSIG) at runtime */
#endif
/* third, for cpp without the error directive, default */
#ifndef ksh_NSIG
#define ksh_NSIG 64
more NSIG
2007-03-04 06:04:54 +01:00
#endif
incorporate more feedback from schily
2016-01-15 00:18:11 +01:00
#define ksh_sigmask(sig) (((sig) < 1 || (sig) > 127) ? 255 : 128 + (sig))
part of the AIX clean-up with help of <Gurft> on freenode (Kurt)
2007-04-23 16:04:38 +02:00
• arc4random, arc4random_push: use our own protos to check XXX u_int32_t is not ISO C99, but seems to work well enough XXX if it fails anywhere, we'll see in the build logs XXX apple doesn't have the standard uint32_t and API doesn't specify it • sys_siglist_defn: rename to sys_siglist_decl as we're really checking for the declaration in the headers; change wording to “check if … does not need to be declared” since we don't need to declare if we don't use • scan for arc4random, arc4random_push, confstr declarations too • sh.h: confstr declaration is no longer #ifdef __sun__; sort
2007-04-24 12:42:02 +02:00
/* OS-dependent additions (functions, variables, by OS) */
a few more mksh-os2 inspired fixes
2015-07-09 21:28:21 +02:00
#ifdef MKSH_EXE_EXT
#undef MKSH_EXE_EXT
merge OS/2 style PATH (absolute with drive letters, ‘;’ as separator) From: KO Myung-Hun <komh@chollian.net>
2015-07-10 21:36:38 +02:00
#define MKSH_EXE_EXT ".exe"
a few more mksh-os2 inspired fixes
2015-07-09 21:28:21 +02:00
#else
merge OS/2 style PATH (absolute with drive letters, ‘;’ as separator) From: KO Myung-Hun <komh@chollian.net>
2015-07-10 21:36:38 +02:00
#define MKSH_EXE_EXT ""
#endif
#ifdef __OS2__
split path-specific ('C:\FOO' instead of '/foo') stuff into MKSH_DOSPATH: • backslashes as directory separators • semicolon as $PATH separator • drive letters are absolute paths
2017-04-02 15:08:07 +02:00
#define MKSH_UNIXROOT "/@unixroot"
#else
#define MKSH_UNIXROOT ""
#endif
#ifdef MKSH_DOSPATH
#ifndef __GNUC__
# error GCC extensions needed later on
#endif
merge OS/2 style PATH (absolute with drive letters, ‘;’ as separator) From: KO Myung-Hun <komh@chollian.net>
2015-07-10 21:36:38 +02:00
#define MKSH_PATHSEPS ";"
#define MKSH_PATHSEPC ';'
#else
#define MKSH_PATHSEPS ":"
#define MKSH_PATHSEPC ':'
a few more mksh-os2 inspired fixes
2015-07-09 21:28:21 +02:00
#endif
• check for flock decl too (weird on OSF/1: if !POSIX and BSD) • un-experimental Tru64
2008-03-05 19:49:15 +01:00
#if !HAVE_FLOCK_DECL
extern int flock(int, int);
#endif
RT tells me Minix 2 (i386) also doesn’t have gettimeofday(2)
2012-11-20 19:50:46 +01:00
#if !HAVE_GETTIMEOFDAY
#define mksh_TIME(tv) do { \
(tv).tv_usec = 0; \
(tv).tv_sec = time(NULL); \
} while (/* CONSTCOND */ 0)
#else
#define mksh_TIME(tv) gettimeofday(&(tv), NULL)
#endif
(experimental) implement getrusage via times if not found
2009-04-03 11:39:07 +02:00
#if !HAVE_GETRUSAGE
extern int getrusage(int, struct rusage *);
#endif
RT also said what was missing on SunOS 4.1.1 (it also needs -DMKSH_UNEMPLOYED?)
2012-12-17 23:14:27 +01:00
#if !HAVE_MEMMOVE
/* we assume either memmove or bcopy exist, at the moment */
#define memmove(dst, src, len) bcopy((src), (dst), (len))
#endif
OSF/1 doesn’t seem to declare revoke(2) anywhere
2008-03-05 18:06:50 +01:00
#if !HAVE_REVOKE_DECL
extern int revoke(const char *);
#endif
thanks to ISC (Interactive) Unix, we now know a few samples of errnos that get used, plus one for the realpath-1 regression test; also make sys_siglist_decl detection nicer and poison strerror() with non-const return value ifdef DEBUG, make it always const
2012-12-18 00:18:11 +01:00
#if defined(DEBUG) || !HAVE_STRERROR
work around a workaround in dietlibc that works around brokenness in GNU tar /* no comment… */
2013-04-26 19:23:15 +02:00
#undef strerror
let printf stuff compile again after cstrerror-related change
2012-12-22 23:15:21 +01:00
#define strerror /* poisoned */ dontuse_strerror
#define cstrerror /* replaced */ cstrerror
thanks to ISC (Interactive) Unix, we now know a few samples of errnos that get used, plus one for the realpath-1 regression test; also make sys_siglist_decl detection nicer and poison strerror() with non-const return value ifdef DEBUG, make it always const
2012-12-18 00:18:11 +01:00
extern const char *cstrerror(int);
#else
#define cstrerror(errnum) ((const char *)strerror(errnum))
RT also said what was missing on SunOS 4.1.1 (it also needs -DMKSH_UNEMPLOYED?)
2012-12-17 23:14:27 +01:00
#endif
can use short form here
2006-11-09 00:50:47 +01:00
#if !HAVE_STRLCPY
* remove redundancy * integrate compat.h, version.h into sh.h (dependency trick didn't work anyway) * mention #ksh in mksh(1) since the founder (twkm) said it's on topic too (don't remove mention of #mksh despite it's usually empty because of control)
2006-08-23 00:49:38 +02:00
size_t strlcpy(char *, const char *, size_t);
#endif
#ifdef __INTERIX
* improve CPPFLAGS vs #define handling again: do not touch CPPFLAGS from Build.sh but use 'if defined(PRECOND) && !defined(TOBEDEFINED)'if possible * for all of the source code, drop annotations "imake style" (if we check for specific OSes, bad, instead of using mirtoconf checks proper) and "conditions correct?" (if I'm not entirely sure if that #if catches all cases and no false positives) where I can see it by grepping immediately * bump mksh patchlevel * refresh Makefiles
2009-07-25 23:31:27 +02:00
/* XXX imake style */
header overhaul: replace all #ifdef __OS__ with mirtoconf checks (except the persistent history one)
2007-01-18 16:50:32 +01:00
#define makedev mkdev
* remove redundancy * integrate compat.h, version.h into sh.h (dependency trick didn't work anyway) * mention #ksh in mksh(1) since the founder (twkm) said it's on topic too (don't remove mention of #mksh despite it's usually empty because of control)
2006-08-23 00:49:38 +02:00
extern int __cdecl seteuid(uid_t);
extern int __cdecl setegid(gid_t);
#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
provide for Coherent not having gettimeofday(2), imake style (bad, but this is not for others to use without a second thought anyway)
2012-05-04 23:47:04 +02:00
#if defined(__COHERENT__)
last parts of Coherent patchkit: O_ACCMODE and termio
2012-05-05 00:18:27 +02:00
#ifndef O_ACCMODE
/* this need not work everywhere, take care */
#define O_ACCMODE (O_RDONLY | O_WRONLY | O_RDWR)
#endif
provide for Coherent not having gettimeofday(2), imake style (bad, but this is not for others to use without a second thought anyway)
2012-05-04 23:47:04 +02:00
#endif
add O_BINARY to all open() calls except tty_fd cf. http://svn.netlabs.org/libc/wiki/Faq#Whydoesntreadfdbufsize_of_filereturnsize_of_file
2013-10-09 13:59:30 +02:00
#ifndef O_BINARY
#define O_BINARY 0
#endif
more symlink(7) nonexistence support code
2012-05-05 00:05:02 +02:00
#ifdef MKSH__NO_SYMLINK
#undef S_ISLNK
#define S_ISLNK(m) (/* CONSTCOND */ 0)
#define mksh_lstat stat
#else
#define mksh_lstat lstat
#endif
last parts of Coherent patchkit: O_ACCMODE and termio
2012-05-05 00:18:27 +02:00
#if HAVE_TERMIOS_H
#define mksh_ttyst struct termios
#define mksh_tcget(fd,st) tcgetattr((fd), (st))
#define mksh_tcset(fd,st) tcsetattr((fd), TCSADRAIN, (st))
#else
#define mksh_ttyst struct termio
#define mksh_tcget(fd,st) ioctl((fd), TCGETA, (st))
#define mksh_tcset(fd,st) ioctl((fd), TCSETAW, (st))
#endif
apply patch by Steffen Daode Nurpmeso to drop ISTRIP termios mode
2013-11-17 23:23:29 +01:00
#ifndef ISTRIP
#define ISTRIP 0
#endif
BEL was, and Vi mode is, not EBCDIC-safe
2017-04-28 02:49:33 +02:00
#ifdef MKSH_EBCDIC
#define KSH_BEL '\a'
apply most of the remaining parts of the EBCDIC patch, sans the CTRL() changes
2017-04-28 04:24:58 +02:00
#define KSH_ESC 047
#define KSH_ESC_STRING "\047"
#define KSH_VTAB '\v'
BEL was, and Vi mode is, not EBCDIC-safe
2017-04-28 02:49:33 +02:00
#else
/*
* According to the comments in pdksh, \007 seems to be more portable
* than \a (HP-UX cc, Ultrix cc, old pcc, etc.) so we avoid the escape
* sequence if ASCII can be assumed.
*/
#define KSH_BEL 7
apply most of the remaining parts of the EBCDIC patch, sans the CTRL() changes
2017-04-28 04:24:58 +02:00
#define KSH_ESC 033
#define KSH_ESC_STRING "\033"
#define KSH_VTAB 11
BEL was, and Vi mode is, not EBCDIC-safe
2017-04-28 02:49:33 +02:00
#endif
on MirBSD we can use the system wcwidth() and save ~800by on the ramdisc
2010-08-14 23:35: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
/* some useful #defines */
#ifdef EXTERN
• 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
# define E_INIT(i) = 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
#else
• 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
# define E_INIT(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
# define EXTERN extern
# define EXTERN_DEFINED
#endif
save more whitespace and make it compile again (oops)
2006-08-23 00:21:20 +02:00
re-indent comments
2011-06-21 23:10:12 +02:00
/* define bit in flag */
fixup the remaining issues and last optimisations
2017-04-28 01:12:49 +02:00
#define BIT(i) (1U << (i))
some rather mechanical KNF, now that style(9) clarified on the status of sizeof() as a function-like unary operator; use parenthesēs around sizeof and return args consistently too
2009-06-08 22:06:50 +02:00
#define NELEM(a) (sizeof(a) / sizeof((a)[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
re-indent comments
2011-06-21 23:10:12 +02:00
/*
* Make MAGIC a char that might be printed to make bugs more obvious, but
* version.h doesn't need an RCS ID * compat.h does, add it to misc.c, always include it, move if NEED_COMPAT * major whitespace cleanup in sh.h
2006-08-23 00:16:04 +02:00
* not a char that is used often. Also, can't use the high bit as it causes
g/c magic definitions for simple chars (as opposed to e.g. tokens/lexems) some (such as NOT) were already gone; this should unconfuse; most were unused anyway…
2012-03-28 00:58:39 +02:00
* portability problems (calling strchr(x, 0x80 | 'x') is error prone).
amend MAGIC comment
2017-04-20 18:50:48 +02:00
*
* MAGIC can be followed by MAGIC (to escape the octet itself) or one of:
* ' !)*,-?[]{|}' 0x80|' !*+?@' (probably… hysteric raisins abound)
BEL was, and Vi mode is, not EBCDIC-safe
2017-04-28 02:49:33 +02:00
*
* The |0x80 is likely unsafe on EBCDIC :( though the listed chars are
* low-bit7 at least on cp1047 so YMMV
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
*/
BEL was, and Vi mode is, not EBCDIC-safe
2017-04-28 02:49:33 +02:00
#define MAGIC KSH_BEL /* prefix for *?[!{,} during expand */
#define ISMAGIC(c) (ord(c) == ord(MAGIC))
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
EXTERN const char *safe_prompt; /* safe prompt if PS1 substitution fails */
add basic LEGACY KSH mode (Build.sh -L), no changes yet
2012-06-25 18:05:10 +02:00
#ifdef MKSH_LEGACY_MODE
introduce the -T flag to set TEXTMODE (ASCII CR+LF newline support)
2017-04-02 16:14:08 +02:00
#define KSH_VERSIONNAME_ISLEGACY "LEGACY"
add basic LEGACY KSH mode (Build.sh -L), no changes yet
2012-06-25 18:05:10 +02:00
#else
introduce the -T flag to set TEXTMODE (ASCII CR+LF newline support)
2017-04-02 16:14:08 +02:00
#define KSH_VERSIONNAME_ISLEGACY "MIRBSD"
add basic LEGACY KSH mode (Build.sh -L), no changes yet
2012-06-25 18:05:10 +02:00
#endif
introduce the -T flag to set TEXTMODE (ASCII CR+LF newline support)
2017-04-02 16:14:08 +02:00
#ifdef MKSH_WITH_TEXTMODE
#define KSH_VERSIONNAME_TEXTMODE " +TEXTMODE"
#else
#define KSH_VERSIONNAME_TEXTMODE ""
#endif
commit the optimisation result from the new fast character classes
2017-04-28 02:38:33 +02:00
#ifdef MKSH_EBCDIC
#define KSH_VERSIONNAME_EBCDIC " +EBCDIC"
#else
#define KSH_VERSIONNAME_EBCDIC ""
#endif
introduce the -T flag to set TEXTMODE (ASCII CR+LF newline support)
2017-04-02 16:14:08 +02:00
#ifndef KSH_VERSIONNAME_VENDOR_EXT
#define KSH_VERSIONNAME_VENDOR_EXT ""
#endif
EXTERN const char initvsn[] E_INIT("KSH_VERSION=@(#)" KSH_VERSIONNAME_ISLEGACY \
commit the optimisation result from the new fast character classes
2017-04-28 02:38:33 +02:00
" KSH " MKSH_VERSION KSH_VERSIONNAME_EBCDIC KSH_VERSIONNAME_TEXTMODE \
KSH_VERSIONNAME_VENDOR_EXT);
• 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
#define KSH_VERSION (initvsn + /* "KSH_VERSION=@(#)" */ 16)
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
• 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
EXTERN const char digits_uc[] E_INIT("0123456789ABCDEFGHIJKLMNOPQRSTUVWXYZ");
EXTERN const char digits_lc[] E_INIT("0123456789abcdefghijklmnopqrstuvwxyz");
only one digits instance, thank you very much
2009-09-20 15:08:12 +02:00
merge the const branch +- a few
2007-03-04 01:13:17 +01:00
/*
* Evil hack for const correctness due to API brokenness
*/
union mksh_cchack {
char *rw;
const char *ro;
};
union mksh_ccphack {
char **rw;
const char **ro;
};
• 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
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
/*
* Evil hack since casting uint to sint is implementation-defined
*/
typedef union {
mksh_ari_t i;
mksh_uari_t u;
} mksh_ari_u;
• 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
/* for const debugging */
from sunpro 12 on linux: optimise use of the const-vs-unconst catcher thanks cnuke@ for testing
2007-06-09 23:59:21 +02:00
#if defined(DEBUG) && defined(__GNUC__) && !defined(__ICC) && \
!defined(__INTEL_COMPILER) && !defined(__SUNPRO_C)
• 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
char *ucstrchr(char *, int);
char *ucstrstr(char *, const char *);
strchr related fixes
2009-12-05 23:19:42 +01:00
#undef strchr
• 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
#define strchr ucstrchr
#define strstr ucstrstr
don't use __extension__, cought by sunpro on linux
2007-06-10 00:01:42 +02:00
#define cstrchr(s,c) ({ \
merge the const branch +- a few
2007-03-04 01:13:17 +01:00
union mksh_cchack in, out; \
\
in.ro = (s); \
from sunpro 12 on linux: optimise use of the const-vs-unconst catcher thanks cnuke@ for testing
2007-06-09 23:59:21 +02:00
out.rw = ucstrchr(in.rw, (c)); \
merge the const branch +- a few
2007-03-04 01:13:17 +01:00
(out.ro); \
})
don't use __extension__, cought by sunpro on linux
2007-06-10 00:01:42 +02:00
#define cstrstr(b,l) ({ \
• 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
union mksh_cchack in, out; \
\
in.ro = (b); \
from sunpro 12 on linux: optimise use of the const-vs-unconst catcher thanks cnuke@ for testing
2007-06-09 23:59:21 +02:00
out.rw = ucstrstr(in.rw, (l)); \
• 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
(out.ro); \
})
#define vstrchr(s,c) (cstrchr((s), (c)) != NULL)
#define vstrstr(b,l) (cstrstr((b), (l)) != NULL)
from sunpro 12 on linux: optimise use of the const-vs-unconst catcher thanks cnuke@ for testing
2007-06-09 23:59:21 +02:00
#else /* !DEBUG, !gcc */
fix for the SUNpro 8 on yofuh's E420: cc: Sun C 5.8 Patch 121015-04 2007/01/10
2007-06-05 21:48:47 +02:00
#define cstrchr(s,c) ((const char *)strchr((s), (c)))
#define cstrstr(s,c) ((const char *)strstr((s), (c)))
from sunpro 12 on linux: optimise use of the const-vs-unconst catcher thanks cnuke@ for testing
2007-06-09 23:59:21 +02:00
#define vstrchr(s,c) (strchr((s), (c)) != NULL)
#define vstrstr(b,l) (strstr((b), (l)) != NULL)
Add assertions and shuffle code around for LLVM+Clang scan-build.
2012-12-04 02:18:34 +01:00
#endif
#if defined(DEBUG) || defined(__COVERITY__)
call it DEBUG_LEAKS so Android can always enable it
2013-02-10 18:41:06 +01:00
#ifndef DEBUG_LEAKS
#define DEBUG_LEAKS
#endif
• 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
#endif
merge the const branch +- a few
2007-03-04 01:13:17 +01:00
monkey-patch offsetof for a klibc/dietlibc warning; bump to R56b (bugfixes)
2017-08-29 15:38:31 +02:00
#if (!defined(MKSH_BUILDMAKEFILE4BSD) && !defined(MKSH_BUILDSH)) || (MKSH_BUILD_R != 562)
You have this ↓ guy a lot to thank for. 00:45 -!- variable [root@freebsd/developer/variable] has joined #!/bin/mksh • +b *!*root@*, +b $a:root, +b $r:root on one more channel • certain checks to prevent: 00:47 < variable> wjcw: sh.h:308: error: conflicting types for 'getrusage' 01:19 < variable> oh 01:19 < variable> I needed to run Build.sh
2012-03-27 23:23:52 +02:00
#error Must run Build.sh to compile this.
declare thiswillneverbedefinedIhope to silence some configure time warnings
2013-05-08 13:16:19 +02:00
extern void thiswillneverbedefinedIhope(void);
fail in a clean way even on b0rken compilers
2012-03-29 01:09:24 +02:00
int
im_sorry_dave(void)
{
/* I’m sorry, Dave. I’m afraid I can’t do that. */
return (thiswillneverbedefinedIhope());
}
You have this ↓ guy a lot to thank for. 00:45 -!- variable [root@freebsd/developer/variable] has joined #!/bin/mksh • +b *!*root@*, +b $a:root, +b $r:root on one more channel • certain checks to prevent: 00:47 < variable> wjcw: sh.h:308: error: conflicting types for 'getrusage' 01:19 < variable> oh 01:19 < variable> I needed to run Build.sh
2012-03-27 23:23:52 +02:00
#endif
fix Coverity CID #8, #9 it's wrong to use strchr(s, 0) to look for the NUL byte, because in some environments it apparently might return NULL use new macro strnul = s+strlen(s) instead (not side-effect safe tho)
2007-05-13 21:14:05 +02:00
/* use this ipv strchr(s, 0) but no side effects in s! */
use strnul(); optimise
2017-04-30 00:04:31 +02:00
#define strnul(s) ((s) + strlen((const void *)s))
fix Coverity CID #8, #9 it's wrong to use strchr(s, 0) to look for the NUL byte, because in some environments it apparently might return NULL use new macro strnul = s+strlen(s) instead (not side-effect safe tho)
2007-05-13 21:14:05 +02:00
• 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
#define utf_ptradjx(src, dst) do { \
split utf_ptradjx into utf_ptradj function (to save space) and self-assignment macro; remove some uses of the macro in favour of foo += utf_ptradj(foo)
2009-05-16 17:09:07 +02:00
(dst) = (src) + utf_ptradj(src); \
• 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
} while (/* CONSTCOND */ 0)
lesson learned from http://k1024.org/~iusty/blog/entry/perf-null/ – add -DMKSH_SMALL_BUT_FAST which gives more speed (8/20K less cycles, 5/9K less insns, 1.8/2.4k less branches, 65/275 less branch misses) on Debian/amd64 (klibc-static/eglibc) at cost of 0/2 more page faults and 6K/6K more text size
2012-07-01 17:55:00 +02:00
#if defined(MKSH_SMALL) && !defined(MKSH_SMALL_BUT_FAST)
rename more identifiers with trailing underscores
2011-10-26 00:36:39 +02:00
#define strdupx(d, s, ap) do { \
(d) = strdup_i((s), (ap)); \
save 1640 .text bytes in MKSH_SMALL case by not inlining strdupx, strndupx
2008-10-28 15:51:06 +01:00
} while (/* CONSTCOND */ 0)
rename more identifiers with trailing underscores
2011-10-26 00:36:39 +02:00
#define strndupx(d, s, n, ap) do { \
(d) = strndup_i((s), (n), (ap)); \
save 1640 .text bytes in MKSH_SMALL case by not inlining strdupx, strndupx
2008-10-28 15:51:06 +01:00
} while (/* CONSTCOND */ 0)
#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
/* be careful to evaluate arguments only once! */
#define strdupx(d, s, ap) do { \
fix a GCC 7 pointer target signedness warning
2017-08-07 23:56:54 +02:00
const char *strdup_src = (const void *)(s); \
• 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
char *strdup_dst = NULL; \
\
if (strdup_src != NULL) { \
more use of memcpy(3) when we know destination and source sizes
2009-08-01 22:32:45 +02:00
size_t strdup_len = strlen(strdup_src) + 1; \
strdup_dst = alloc(strdup_len, (ap)); \
if duplicating strings, it’s idiotic to use strlcpy(3) when we know the sizes (checked)
2009-08-01 22:29:25 +02:00
memcpy(strdup_dst, strdup_src, strdup_len); \
• 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
} \
(d) = strdup_dst; \
} while (/* CONSTCOND */ 0)
#define strndupx(d, s, n, ap) do { \
fix a GCC 7 pointer target signedness warning
2017-08-07 23:56:54 +02:00
const char *strdup_src = (const void *)(s); \
• 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
char *strdup_dst = NULL; \
\
if (strdup_src != NULL) { \
more use of memcpy(3) when we know destination and source sizes
2009-08-01 22:32:45 +02:00
size_t strndup_len = (n); \
strdup_dst = alloc(strndup_len + 1, (ap)); \
memcpy(strdup_dst, strdup_src, strndup_len); \
strdup_dst[strndup_len] = '\0'; \
• 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
} \
(d) = strdup_dst; \
} while (/* CONSTCOND */ 0)
save 1640 .text bytes in MKSH_SMALL case by not inlining strdupx, strndupx
2008-10-28 15:51:06 +01:00
#endif
• 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
improve MKSH_NOPWNAM handling, whether MKSH_SMALL or not; it will cause the entire ~fac/ expansion code to be omitted
2009-07-25 22:26:33 +02:00
#ifdef MKSH_SMALL
#ifndef MKSH_NOPWNAM
change undef/def MKSH_NOVI into 0/1 MKSH_S_NOVI flag (with more to come: MKSH_S_EDIT for small (Emacs) editing mode, MKSH_S_FEAT for all the dis- abled language features), which can be set to 0 despite MKSH_SMALL being defined to re-enable the Vi command line editing mode (which I wouldn't, but fits into the general mastermind scheme)
2009-09-24 19:15:33 +02:00
#define MKSH_NOPWNAM /* defined */
improve MKSH_NOPWNAM handling, whether MKSH_SMALL or not; it will cause the entire ~fac/ expansion code to be omitted
2009-07-25 22:26:33 +02:00
#endif
change undef/def MKSH_NOVI into 0/1 MKSH_S_NOVI flag (with more to come: MKSH_S_EDIT for small (Emacs) editing mode, MKSH_S_FEAT for all the dis- abled language features), which can be set to 0 despite MKSH_SMALL being defined to re-enable the Vi command line editing mode (which I wouldn't, but fits into the general mastermind scheme)
2009-09-24 19:15:33 +02:00
#ifndef MKSH_S_NOVI
#define MKSH_S_NOVI 1
• check.t: add some FPOSIX regression tests (1 still fails) • all: remove vi editing mode #if defined(MKSH_SMALL) || defined(MKSH_NOVI) saves 12608 byts on i386 • check.t: add $0 quoting
2007-06-15 23:55:20 +02:00
#endif
improve MKSH_NOPWNAM handling, whether MKSH_SMALL or not; it will cause the entire ~fac/ expansion code to be omitted
2009-07-25 22:26:33 +02:00
#endif
• check.t: add some FPOSIX regression tests (1 still fails) • all: remove vi editing mode #if defined(MKSH_SMALL) || defined(MKSH_NOVI) saves 12608 byts on i386 • check.t: add $0 quoting
2007-06-15 23:55:20 +02:00
change undef/def MKSH_NOVI into 0/1 MKSH_S_NOVI flag (with more to come: MKSH_S_EDIT for small (Emacs) editing mode, MKSH_S_FEAT for all the dis- abled language features), which can be set to 0 despite MKSH_SMALL being defined to re-enable the Vi command line editing mode (which I wouldn't, but fits into the general mastermind scheme)
2009-09-24 19:15:33 +02:00
#ifndef MKSH_S_NOVI
#define MKSH_S_NOVI 0
#endif
introduce MKSH_NOPROSPECTOFWORK which is like pdksh’s JOB_SIGS in reverse, like MKSH_UNEMPLOYED is pdksh’s JOBS in reverse; allows mksh to work (hah! no pun intended…) with klibc (and possibly, Syllable Desktop and Plan 9) for now, until they fix their bugs
2011-01-30 02:35:35 +01:00
#if defined(MKSH_NOPROSPECTOFWORK) && !defined(MKSH_UNEMPLOYED)
jg71 reported -DMKSH_ASSUME_UTF8=* breaks defining stristr
2011-08-27 19:30:07 +02:00
#define MKSH_UNEMPLOYED 1
introduce MKSH_NOPROSPECTOFWORK which is like pdksh’s JOB_SIGS in reverse, like MKSH_UNEMPLOYED is pdksh’s JOBS in reverse; allows mksh to work (hah! no pun intended…) with klibc (and possibly, Syllable Desktop and Plan 9) for now, until they fix their bugs
2011-01-30 02:35:35 +01:00
#endif
bugfix: make CONSERVATIVE_FDS implied by MKSH_SMALL actually work
2012-07-01 17:41:56 +02:00
#define NUFILE 32 /* Number of user-accessible files */
#define FDBASE 10 /* First file usable by Shell */
* back out almost all of the memory allocator related changes, as aalloc was hard to type and hard to fix, galloc is also hard to fix, and some things I learned will probably improve things more but make me use the original form as base (especially for space savings) * let sizeofN die though, remove even more casts * optimise, polish * regen Makefiles * sprinkle a few /* CONSTCOND */ while here
2008-12-13 18:02:18 +01:00
/*
remove espie's double-linked-list based allocator and write a similarily simple one from scratch, which however performs better than espie's with AFREE_DEBUG enabled which took away the benefit of the double-linked-list approach all of (core) mksh is now MirOS licenced
2009-03-22 17:55:38 +01:00
* simple grouping allocator
* back out almost all of the memory allocator related changes, as aalloc was hard to type and hard to fix, galloc is also hard to fix, and some things I learned will probably improve things more but make me use the original form as base (especially for space savings) * let sizeofN die though, remove even more casts * optimise, polish * regen Makefiles * sprinkle a few /* CONSTCOND */ while here
2008-12-13 18:02:18 +01:00
*/
employ some "nice" constants and comment lalloc.c
2009-04-07 20:56:51 +02:00
introduce macros for malloc, realloc, free to hide them from mksh no code may henceforth use memory (de-)allocation functions directly use these macros, porters can change them for abstraction
2011-03-05 22:43:18 +01:00
/* 0. OS API: where to get memory from and how to free it (grouped) */
split malloc_os and friends further into • functions called by mksh’s grouping memory allocator • functions called by mksh code itself the latter may be changed to call the internal grouping allocator, if a porter so desires (but if this were recommended, the code in question would already do so, so…)
2011-03-05 22:48:09 +01:00
/* malloc(3)/realloc(3) -> free(3) for use by the memory allocator */
#define malloc_osi(sz) malloc(sz)
#define realloc_osi(p,sz) realloc((p), (sz))
#define free_osimalloc(p) free(p)
/* malloc(3)/realloc(3) -> free(3) for use by mksh code */
#define malloc_osfunc(sz) malloc(sz)
#define realloc_osfunc(p,sz) realloc((p), (sz))
#define free_osfunc(p) free(p)
introduce macros for malloc, realloc, free to hide them from mksh no code may henceforth use memory (de-)allocation functions directly use these macros, porters can change them for abstraction
2011-03-05 22:43:18 +01:00
#if HAVE_MKNOD
/* setmode(3) -> free(3) */
#define free_ossetmode(p) free(p)
#endif
sprinkle CONSERVATIVE_FDS for many older OSes; DISABLE_TTY_WARNING for BeOS and Coherent (probably more to come); NO_CMDLINE_EDITING to Plan 9; put Hurd NO_PATH_MAX into MKSH__ private namespace
2012-05-05 19:37:44 +02:00
#ifdef MKSH__NO_PATH_MAX
introduce macros for malloc, realloc, free to hide them from mksh no code may henceforth use memory (de-)allocation functions directly use these macros, porters can change them for abstraction
2011-03-05 22:43:18 +01:00
/* GNU libc: get_current_dir_name(3) -> free(3) */
#define free_gnu_gcdn(p) free(p)
#endif
employ some "nice" constants and comment lalloc.c
2009-04-07 20:56:51 +02:00
/* 1. internal structure */
share structures better, less (void *) casts when we can stay typed
2016-02-24 03:08:39 +01:00
struct lalloc_common {
struct lalloc_common *next;
implement mmap-using mechanism to catch buffer underruns inside mksh (pulls stdio, is rather BSD-specific and memory-hungry and a bit slow)
2016-02-24 02:44:46 +01:00
};
clean up, avoid aliasing concerns in non-debug case
2016-02-26 22:53:37 +01:00
#ifdef MKSH_ALLOC_CATCH_UNDERRUNS
share structures better, less (void *) casts when we can stay typed
2016-02-24 03:08:39 +01:00
struct lalloc_item {
struct lalloc_common *next;
implement mmap-using mechanism to catch buffer underruns inside mksh (pulls stdio, is rather BSD-specific and memory-hungry and a bit slow)
2016-02-24 02:44:46 +01:00
size_t len;
share structures better, less (void *) casts when we can stay typed
2016-02-24 03:08:39 +01:00
char dummy[8192 - sizeof(struct lalloc_common *) - sizeof(size_t)];
employ some "nice" constants and comment lalloc.c
2009-04-07 20:56:51 +02:00
};
clean up, avoid aliasing concerns in non-debug case
2016-02-26 22:53:37 +01:00
#endif
employ some "nice" constants and comment lalloc.c
2009-04-07 20:56:51 +02:00
/* 2. sizes */
clean up, avoid aliasing concerns in non-debug case
2016-02-26 22:53:37 +01:00
#ifdef MKSH_ALLOC_CATCH_UNDERRUNS
share structures better, less (void *) casts when we can stay typed
2016-02-24 03:08:39 +01:00
#define ALLOC_ITEM struct lalloc_item
implement mmap-using mechanism to catch buffer underruns inside mksh (pulls stdio, is rather BSD-specific and memory-hungry and a bit slow)
2016-02-24 02:44:46 +01:00
#define ALLOC_OVERHEAD 0
clean up, avoid aliasing concerns in non-debug case
2016-02-26 22:53:37 +01:00
#else
#define ALLOC_ITEM struct lalloc_common
#define ALLOC_OVERHEAD (sizeof(ALLOC_ITEM))
implement mmap-using mechanism to catch buffer underruns inside mksh (pulls stdio, is rather BSD-specific and memory-hungry and a bit slow)
2016-02-24 02:44:46 +01:00
#endif
employ some "nice" constants and comment lalloc.c
2009-04-07 20:56:51 +02:00
implement mmap-using mechanism to catch buffer underruns inside mksh (pulls stdio, is rather BSD-specific and memory-hungry and a bit slow)
2016-02-24 02:44:46 +01:00
/* 3. group structure */
share structures better, less (void *) casts when we can stay typed
2016-02-24 03:08:39 +01:00
typedef struct lalloc_common Area;
employ some "nice" constants and comment lalloc.c
2009-04-07 20:56:51 +02:00
* back out almost all of the memory allocator related changes, as aalloc was hard to type and hard to fix, galloc is also hard to fix, and some things I learned will probably improve things more but make me use the original form as base (especially for space savings) * let sizeofN die though, remove even more casts * optimise, polish * regen Makefiles * sprinkle a few /* CONSTCOND */ while here
2008-12-13 18:02:18 +01:00
EXTERN Area aperm; /* permanent object space */
#define APERM &aperm
#define ATEMP &e->area
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
to speed up mksh, get rid of arc4random(3) uses and use the LCG always; depend on ASLR for seeding
2010-07-04 19:33:58 +02:00
/*
* flags (the order of these enums MUST match the order in misc.c(options[]))
*/
enum sh_flag {
#define SHFLAGS_ENUMS
static option creating for cmdline and set, too (in preparation of doing something real with set ±p)
2013-11-17 23:22:56 +01:00
#include "sh_flags.gen"
to speed up mksh, get rid of arc4random(3) uses and use the LCG always; depend on ASLR for seeding
2010-07-04 19:33:58 +02:00
FNFLAGS /* (place holder: how many flags are there) */
};
• implement KSHEGID, KSHGID, KSHUID variables by suggestion of Richard K. (KSHEUID aka USER_ID already exists) • simplify, speed up LCG and $RANDOM handling again
2011-01-21 22:04:48 +01:00
#define Flag(f) (shell_flags[(int)(f)])
to speed up mksh, get rid of arc4random(3) uses and use the LCG always; depend on ASLR for seeding
2010-07-04 19:33:58 +02:00
#define UTFMODE Flag(FUNICODE)
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
/*
* parsing & execution environment
note that some longjmp don’t handle 0 properly cf. <500C1B2E.9030602@zytor.com>
2012-07-22 17:56:51 +02:00
*
* note that kshlongjmp MUST NOT be passed 0 as second argument!
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
*/
genericise MKSH_NO_SIGSETJMP
2012-04-14 16:07:47 +02:00
#ifdef MKSH_NO_SIGSETJMP
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
#define kshjmp_buf jmp_buf
#define kshsetjmp(jbuf) _setjmp(jbuf)
#define kshlongjmp _longjmp
#else
#define kshjmp_buf sigjmp_buf
#define kshsetjmp(jbuf) sigsetjmp((jbuf), 0)
#define kshlongjmp siglongjmp
#endif
who would’ve thought proper ^C handling be so hard?
2012-10-30 21:49:44 +01:00
struct sretrace_info;
restore yyrecursive context in quitenv (LP#1069428)
2012-10-30 21:07:15 +01:00
struct yyrecursive_state;
move three variables into common data, meaning .bss (hopefully)
2017-04-28 13:51:40 +02:00
EXTERN struct sretrace_info *retrace_info;
EXTERN int subshell_nesting_type;
who would’ve thought proper ^C handling be so hard?
2012-10-30 21:49:44 +01:00
use less stack storage, prefer .bss storage (saves us a memset() call) and .data instead of another initialisation; this was prompted by a bug in scan-build (the value can never be NULL, but it doesn’t realise it), although this doesn’t fix it, but less stack usage is always good
2008-10-15 12:25:01 +02:00
extern struct env {
• 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
ALLOC_ITEM alloc_INT; /* internal, do not touch */
* back out almost all of the memory allocator related changes, as aalloc was hard to type and hard to fix, galloc is also hard to fix, and some things I learned will probably improve things more but make me use the original form as base (especially for space savings) * let sizeofN die though, remove even more casts * optimise, polish * regen Makefiles * sprinkle a few /* CONSTCOND */ while here
2008-12-13 18:02:18 +01:00
Area area; /* temporary allocation area */
"evil" workaround to the alignment issues: embed an ALLOC_ITEM into struct env (other structures defined have no "foreign type with pos- sible alignment constraints" members) and take care of it while dea- ling in a struct env instance
2009-04-07 21:43:28 +02:00
struct env *oenv; /* link to previous environment */
save more whitespace and make it compile again (oops)
2006-08-23 00:21:20 +02:00
struct block *loc; /* local variables and functions */
short *savefd; /* original redirected fds */
struct temp *temps; /* temp files */
restore yyrecursive context in quitenv (LP#1069428)
2012-10-30 21:07:15 +01:00
/* saved parser recursion state */
struct yyrecursive_state *yyrecursive_statep;
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
kshjmp_buf jbuf; /* long jump back to env creator */
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
uint8_t type; /* environment type - see below */
uint8_t flags; /* EF_* */
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
} *e;
/* struct env.type values */
whitespace fixes
2006-11-16 14:35:00 +01:00
#define E_NONE 0 /* dummy environment */
#define E_PARSE 1 /* parsing command # */
#define E_FUNC 2 /* executing function # */
#define E_INCL 3 /* including a file via . # */
#define E_EXEC 4 /* executing command tree */
#define E_LOOP 5 /* executing for/while # */
#define E_ERRH 6 /* general error handler # */
when leak debugging, free everything even in builtins
2013-02-10 22:17:07 +01:00
#define E_GONE 7 /* hidden in child */
allow 'eval break', from Martijn Dekker also, more string pooling, while here
2017-04-08 03:07:18 +02:00
#define E_EVAL 8 /* running eval # */
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
/* # indicates env has valid jbuf (see unwind()) */
/* struct env.flag values */
#define EF_BRKCONT_PASS BIT(1) /* set if E_LOOP must pass break/continue on */
#define EF_FAKE_SIGDIE BIT(2) /* hack to get info from unwind to quitenv */
/* Do breaks/continues stop at env type e? */
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
#define STOP_BRKCONT(t) ((t) == E_NONE || (t) == E_PARSE || \
(t) == E_FUNC || (t) == E_INCL)
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
/* Do returns stop at env type e? */
#define STOP_RETURN(t) ((t) == E_FUNC || (t) == E_INCL)
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
/* values for kshlongjmp(e->jbuf, i) */
note that some longjmp don’t handle 0 properly cf. <500C1B2E.9030602@zytor.com>
2012-07-22 17:56:51 +02:00
/* note that i MUST NOT be zero */
save more whitespace and make it compile again (oops)
2006-08-23 00:21:20 +02:00
#define LRETURN 1 /* return statement */
whitespace fixes
2006-11-16 14:35:00 +01:00
#define LEXIT 2 /* exit statement */
save more whitespace and make it compile again (oops)
2006-08-23 00:21:20 +02:00
#define LERROR 3 /* errorf() called */
#define LLEAVE 4 /* untrappable exit/error */
#define LINTR 5 /* ^C noticed */
whitespace fixes
2006-11-16 14:35:00 +01:00
#define LBREAK 6 /* break statement */
#define LCONTIN 7 /* continue statement */
save more whitespace and make it compile again (oops)
2006-08-23 00:21:20 +02:00
#define LSHELL 8 /* return to interactive shell() */
#define LAEXPR 9 /* error in arithmetic expression */
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 KSHEGID, KSHGID, KSHUID variables by suggestion of Richard K. (KSHEUID aka USER_ID already exists) • simplify, speed up LCG and $RANDOM handling again
2011-01-21 22:04:48 +01:00
/* sort of shell global state */
EXTERN pid_t procpid; /* PID of executing process */
EXTERN int exstat; /* exit status */
EXTERN int subst_exstat; /* exit status of last $(..)/`..` */
• add -u option (POSIX: unbuffered ⇒ nop) to the built-in cat • PIPESTATUS now supported (like bash 2) whose last member may actually differ from $? since the latter may not be the result of a pipeline partial command • add regression tests, documentation, etc.
2011-02-18 23:26:13 +01:00
EXTERN struct tbl *vp_pipest; /* global PIPESTATUS array */
• implement KSHEGID, KSHGID, KSHUID variables by suggestion of Richard K. (KSHEUID aka USER_ID already exists) • simplify, speed up LCG and $RANDOM handling again
2011-01-21 22:04:48 +01:00
EXTERN short trap_exstat; /* exit status before running a trap */
EXTERN uint8_t trap_nested; /* running nested traps */
EXTERN uint8_t shell_flags[FNFLAGS];
EXTERN const char *kshname; /* $0 */
EXTERN struct {
• 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
uid_t kshuid_v; /* real UID of shell */
uid_t ksheuid_v; /* effective UID of shell */
gid_t kshgid_v; /* real GID of shell */
gid_t kshegid_v; /* effective GID of shell */
pid_t kshpgrp_v; /* process group of shell */
pid_t kshppid_v; /* PID of parent of shell */
pid_t kshpid_v; /* $$, shell PID */
• implement KSHEGID, KSHGID, KSHUID variables by suggestion of Richard K. (KSHEUID aka USER_ID already exists) • simplify, speed up LCG and $RANDOM handling again
2011-01-21 22:04:48 +01:00
} rndsetupstate;
• 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
#define kshpid rndsetupstate.kshpid_v
#define kshpgrp rndsetupstate.kshpgrp_v
#define kshuid rndsetupstate.kshuid_v
#define ksheuid rndsetupstate.ksheuid_v
#define kshgid rndsetupstate.kshgid_v
#define kshegid rndsetupstate.kshegid_v
#define kshppid rndsetupstate.kshppid_v
to speed up mksh, get rid of arc4random(3) uses and use the LCG always; depend on ASLR for seeding
2010-07-04 19:33:58 +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
/* option processing */
#define OF_CMDLINE 0x01 /* command line */
#define OF_SET 0x02 /* set builtin */
#define OF_SPECIAL 0x04 /* a special variable changing */
#define OF_INTERNAL 0x08 /* set internally by shell */
#define OF_FIRSTTIME 0x10 /* as early as possible, once */
#define OF_ANY (OF_CMDLINE | OF_SET | OF_SPECIAL | OF_INTERNAL)
dict.leo.org says this is correct
2011-08-14 00:19:41 +02:00
/* null value for variable; comparison pointer for unset */
• 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
EXTERN char null[] E_INIT("");
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
/* string pooling: do we rely on the compiler? */
#ifndef HAVE_STRING_POOLING
/* no, we use our own, saves quite some space */
#elif HAVE_STRING_POOLING == 2
/* “on demand” */
#ifdef __GNUC__
/* only for GCC 4 or later, older ones can get by without */
#if __GNUC__ < 4
#undef HAVE_STRING_POOLING
#endif
• Build.sh: fix a compiler warning which, had it not been irrelevant in a mirtoconf check, would’ve been a real problem on an LP64 platform • sh.h: work around a bad interaction between -Wformat on gcc and manual string pooling for T_synerr, which is used in place of a format string in some places
2010-10-01 21:04:38 +02:00
#else
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
/* not GCC, default to on */
• 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
#endif
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
#elif HAVE_STRING_POOLING == 0
/* default to on, unless explicitly set to 0 */
#undef HAVE_STRING_POOLING
#endif
#ifndef HAVE_STRING_POOLING /* helpers for pooled strings */
EXTERN const char T4spaces[] E_INIT(" ");
add a “\builtin” builtin, make it forward assignments, fix some bugs related to that: • while AT&T ksh may do it, POSIX says nothing about allowing declaration commands only without vars and redirections, and “without vars” especially seems against which commands they are • fix relationship between forwarders and real declaration commands • clean up c_builtin vs shcomexec mess Also, re-run “make repool” with a fixed src/scripts/stringpool.sh,v 1.3
2017-03-12 03:04:15 +01:00
#define T1space (Treal_sp2 + 5)
#define Tcolsp (Tf_sD_ + 2)
convert to the new fast character classes
2017-04-27 21:16:10 +02:00
#define TC_IFSWS (TinitIFS + 4)
prepare the new fast character classes, not live yet: need sanity check unfortunately we need at least 21 or so, maybe 19, classes, so sizing things down to short is not possible; we can splurge with 32 bit thus
2017-04-22 02:07:10 +02:00
EXTERN const char TinitIFS[] E_INIT("IFS= \t\n");
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
EXTERN const char TFCEDIT_dollaru[] E_INIT("${FCEDIT:-/bin/ed} $_");
#define Tspdollaru (TFCEDIT_dollaru + 18)
EXTERN const char Tsgdot[] E_INIT("*=.");
EXTERN const char Taugo[] E_INIT("augo");
EXTERN const char Tbracket[] E_INIT("[");
#define Tdot (Tsgdot + 2)
add a “\builtin” builtin, make it forward assignments, fix some bugs related to that: • while AT&T ksh may do it, POSIX says nothing about allowing declaration commands only without vars and redirections, and “without vars” especially seems against which commands they are • fix relationship between forwarders and real declaration commands • clean up c_builtin vs shcomexec mess Also, re-run “make repool” with a fixed src/scripts/stringpool.sh,v 1.3
2017-03-12 03:04:15 +01:00
#define Talias (Tunalias + 2)
string pooling, and more consistent look for error messages
2017-04-02 18:47:43 +02:00
EXTERN const char Tbadnum[] E_INIT("bad number");
add a “\builtin” builtin, make it forward assignments, fix some bugs related to that: • while AT&T ksh may do it, POSIX says nothing about allowing declaration commands only without vars and redirections, and “without vars” especially seems against which commands they are • fix relationship between forwarders and real declaration commands • clean up c_builtin vs shcomexec mess Also, re-run “make repool” with a fixed src/scripts/stringpool.sh,v 1.3
2017-03-12 03:04:15 +01:00
#define Tbadsubst (Tfg_badsubst + 10)
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
EXTERN const char Tbg[] E_INIT("bg");
EXTERN const char Tbad_bsize[] E_INIT("bad shf/buf/bsize");
#define Tbsize (Tbad_bsize + 12)
EXTERN const char Tbad_sig_ss[] E_INIT("%s: bad signal '%s'");
#define Tbad_sig_s (Tbad_sig_ss + 4)
allow 'eval break', from Martijn Dekker also, more string pooling, while here
2017-04-08 03:07:18 +02:00
EXTERN const char Tsgbreak[] E_INIT("*=break");
#define Tbreak (Tsgbreak + 2)
add a “\builtin” builtin, make it forward assignments, fix some bugs related to that: • while AT&T ksh may do it, POSIX says nothing about allowing declaration commands only without vars and redirections, and “without vars” especially seems against which commands they are • fix relationship between forwarders and real declaration commands • clean up c_builtin vs shcomexec mess Also, re-run “make repool” with a fixed src/scripts/stringpool.sh,v 1.3
2017-03-12 03:04:15 +01:00
EXTERN const char T__builtin[] E_INIT("-\\builtin");
fixup “\builtin” on OS/2; thanks komh for spotting this
2017-03-22 01:20:53 +01:00
#define T_builtin (T__builtin + 1)
add a “\builtin” builtin, make it forward assignments, fix some bugs related to that: • while AT&T ksh may do it, POSIX says nothing about allowing declaration commands only without vars and redirections, and “without vars” especially seems against which commands they are • fix relationship between forwarders and real declaration commands • clean up c_builtin vs shcomexec mess Also, re-run “make repool” with a fixed src/scripts/stringpool.sh,v 1.3
2017-03-12 03:04:15 +01:00
#define Tbuiltin (T__builtin + 2)
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
EXTERN const char Toomem[] E_INIT("can't allocate %zu data bytes");
EXTERN const char Tcant_cd[] E_INIT("restricted shell - can't cd");
EXTERN const char Tcant_find[] E_INIT("can't find");
EXTERN const char Tcant_open[] E_INIT("can't open");
#define Tbytes (Toomem + 24)
EXTERN const char Tbcat[] E_INIT("!cat");
#define Tcat (Tbcat + 1)
#define Tcd (Tcant_cd + 25)
add a “\builtin” builtin, make it forward assignments, fix some bugs related to that: • while AT&T ksh may do it, POSIX says nothing about allowing declaration commands only without vars and redirections, and “without vars” especially seems against which commands they are • fix relationship between forwarders and real declaration commands • clean up c_builtin vs shcomexec mess Also, re-run “make repool” with a fixed src/scripts/stringpool.sh,v 1.3
2017-03-12 03:04:15 +01:00
#define T_command (T_funny_command + 9)
#define Tcommand (T_funny_command + 10)
allow 'eval break', from Martijn Dekker also, more string pooling, while here
2017-04-08 03:07:18 +02:00
EXTERN const char Tsgcontinue[] E_INIT("*=continue");
#define Tcontinue (Tsgcontinue + 2)
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
EXTERN const char Tcreate[] E_INIT("create");
EXTERN const char TELIF_unexpected[] E_INIT("TELIF unexpected");
EXTERN const char TEXECSHELL[] E_INIT("EXECSHELL");
add a “\builtin” builtin, make it forward assignments, fix some bugs related to that: • while AT&T ksh may do it, POSIX says nothing about allowing declaration commands only without vars and redirections, and “without vars” especially seems against which commands they are • fix relationship between forwarders and real declaration commands • clean up c_builtin vs shcomexec mess Also, re-run “make repool” with a fixed src/scripts/stringpool.sh,v 1.3
2017-03-12 03:04:15 +01:00
EXTERN const char Tdsgexport[] E_INIT("^*=export");
#define Texport (Tdsgexport + 3)
more easy OS/2 fixes From: KO Myung-Hun <komh@chollian.net>
2015-07-09 21:46:43 +02:00
#ifdef __OS2__
EXTERN const char Textproc[] E_INIT("extproc");
#endif
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
EXTERN const char Tfalse[] E_INIT("false");
EXTERN const char Tfg[] E_INIT("fg");
EXTERN const char Tfg_badsubst[] E_INIT("fileglob: bad substitution");
add a “\builtin” builtin, make it forward assignments, fix some bugs related to that: • while AT&T ksh may do it, POSIX says nothing about allowing declaration commands only without vars and redirections, and “without vars” especially seems against which commands they are • fix relationship between forwarders and real declaration commands • clean up c_builtin vs shcomexec mess Also, re-run “make repool” with a fixed src/scripts/stringpool.sh,v 1.3
2017-03-12 03:04:15 +01:00
#define Tfile (Tfile_fd + 20)
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
EXTERN const char Tfile_fd[] E_INIT("function definition file");
EXTERN const char TFPATH[] E_INIT("FPATH");
• 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
EXTERN const char T_function[] E_INIT(" function");
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
#define Tfunction (T_function + 1)
add a “\builtin” builtin, make it forward assignments, fix some bugs related to that: • while AT&T ksh may do it, POSIX says nothing about allowing declaration commands only without vars and redirections, and “without vars” especially seems against which commands they are • fix relationship between forwarders and real declaration commands • clean up c_builtin vs shcomexec mess Also, re-run “make repool” with a fixed src/scripts/stringpool.sh,v 1.3
2017-03-12 03:04:15 +01:00
EXTERN const char T_funny_command[] E_INIT("funny $()-command");
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
EXTERN const char Tgetopts[] E_INIT("getopts");
add a “\builtin” builtin, make it forward assignments, fix some bugs related to that: • while AT&T ksh may do it, POSIX says nothing about allowing declaration commands only without vars and redirections, and “without vars” especially seems against which commands they are • fix relationship between forwarders and real declaration commands • clean up c_builtin vs shcomexec mess Also, re-run “make repool” with a fixed src/scripts/stringpool.sh,v 1.3
2017-03-12 03:04:15 +01:00
#define Thistory (Tnot_in_history + 7)
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
EXTERN const char Tintovfl[] E_INIT("integer overflow %zu %c %zu prevented");
streamline some error messages
2017-04-06 02:41:42 +02:00
EXTERN const char Tinvname[] E_INIT("%s: invalid %s name");
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
EXTERN const char Tjobs[] E_INIT("jobs");
EXTERN const char Tjob_not_started[] E_INIT("job not started");
EXTERN const char Tmksh[] E_INIT("mksh");
streamline some error messages
2017-04-06 02:41:42 +02:00
#define Tname (Tinvname + 15)
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
EXTERN const char Tno_args[] E_INIT("missing argument");
EXTERN const char Tno_OLDPWD[] E_INIT("no OLDPWD");
EXTERN const char Tnot_ident[] E_INIT("is not an identifier");
EXTERN const char Tnot_in_history[] E_INIT("not in history");
EXTERN const char Tnot_found_s[] E_INIT("%s not found");
#define Tnot_found (Tnot_found_s + 3)
#define Tnot_started (Tjob_not_started + 4)
#define TOLDPWD (Tno_OLDPWD + 3)
#define Topen (Tcant_open + 6)
#define TPATH (TFPATH + 1)
add a “\builtin” builtin, make it forward assignments, fix some bugs related to that: • while AT&T ksh may do it, POSIX says nothing about allowing declaration commands only without vars and redirections, and “without vars” especially seems against which commands they are • fix relationship between forwarders and real declaration commands • clean up c_builtin vs shcomexec mess Also, re-run “make repool” with a fixed src/scripts/stringpool.sh,v 1.3
2017-03-12 03:04:15 +01:00
#define Tpv (TpVv + 1)
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
EXTERN const char TpVv[] E_INIT("Vpv");
#define TPWD (Tno_OLDPWD + 6)
add a “\builtin” builtin, make it forward assignments, fix some bugs related to that: • while AT&T ksh may do it, POSIX says nothing about allowing declaration commands only without vars and redirections, and “without vars” especially seems against which commands they are • fix relationship between forwarders and real declaration commands • clean up c_builtin vs shcomexec mess Also, re-run “make repool” with a fixed src/scripts/stringpool.sh,v 1.3
2017-03-12 03:04:15 +01:00
#define Tread (Tshf_read + 4)
EXTERN const char Tdsgreadonly[] E_INIT("^*=readonly");
#define Treadonly (Tdsgreadonly + 3)
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
EXTERN const char Tredirection_dup[] E_INIT("can't finish (dup) redirection");
#define Tredirection (Tredirection_dup + 19)
add a “\builtin” builtin, make it forward assignments, fix some bugs related to that: • while AT&T ksh may do it, POSIX says nothing about allowing declaration commands only without vars and redirections, and “without vars” especially seems against which commands they are • fix relationship between forwarders and real declaration commands • clean up c_builtin vs shcomexec mess Also, re-run “make repool” with a fixed src/scripts/stringpool.sh,v 1.3
2017-03-12 03:04:15 +01:00
#define Treal_sp1 (Treal_sp2 + 1)
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
EXTERN const char Treal_sp2[] E_INIT(" real ");
EXTERN const char Treq_arg[] E_INIT("requires an argument");
EXTERN const char Tselect[] E_INIT("select");
EXTERN const char Tsgset[] E_INIT("*=set");
add a “\builtin” builtin, make it forward assignments, fix some bugs related to that: • while AT&T ksh may do it, POSIX says nothing about allowing declaration commands only without vars and redirections, and “without vars” especially seems against which commands they are • fix relationship between forwarders and real declaration commands • clean up c_builtin vs shcomexec mess Also, re-run “make repool” with a fixed src/scripts/stringpool.sh,v 1.3
2017-03-12 03:04:15 +01:00
#define Tset (Tf_parm + 18)
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
#define Tsh (Tmksh + 2)
#define TSHELL (TEXECSHELL + 4)
allow 'eval break', from Martijn Dekker also, more string pooling, while here
2017-04-08 03:07:18 +02:00
#define Tshell (Ttoo_many_files + 23)
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
EXTERN const char Tshf_read[] E_INIT("shf_read");
EXTERN const char Tshf_write[] E_INIT("shf_write");
allow 'eval break', from Martijn Dekker also, more string pooling, while here
2017-04-08 03:07:18 +02:00
EXTERN const char Tgsource[] E_INIT("=source");
#define Tsource (Tgsource + 1)
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
EXTERN const char Tj_suspend[] E_INIT("j_suspend");
#define Tsuspend (Tj_suspend + 2)
EXTERN const char Tsynerr[] E_INIT("syntax error");
EXTERN const char Ttime[] E_INIT("time");
EXTERN const char Ttoo_many_args[] E_INIT("too many arguments");
allow 'eval break', from Martijn Dekker also, more string pooling, while here
2017-04-08 03:07:18 +02:00
EXTERN const char Ttoo_many_files[] E_INIT("too many open files in shell");
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
EXTERN const char Ttrue[] E_INIT("true");
EXTERN const char Ttty_fd_dupof[] E_INIT("dup of tty fd");
#define Ttty_fd (Ttty_fd_dupof + 7)
add a “\builtin” builtin, make it forward assignments, fix some bugs related to that: • while AT&T ksh may do it, POSIX says nothing about allowing declaration commands only without vars and redirections, and “without vars” especially seems against which commands they are • fix relationship between forwarders and real declaration commands • clean up c_builtin vs shcomexec mess Also, re-run “make repool” with a fixed src/scripts/stringpool.sh,v 1.3
2017-03-12 03:04:15 +01:00
EXTERN const char Tdgtypeset[] E_INIT("^=typeset");
#define Ttypeset (Tdgtypeset + 2)
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
#define Tugo (Taugo + 1)
EXTERN const char Tunalias[] E_INIT("unalias");
#define Tunexpected (TELIF_unexpected + 6)
allow 'eval break', from Martijn Dekker also, more string pooling, while here
2017-04-08 03:07:18 +02:00
EXTERN const char Tunexpected_type[] E_INIT("%s: unexpected %s type %d");
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
EXTERN const char Tunknown_option[] E_INIT("unknown option");
allow 'eval break', from Martijn Dekker also, more string pooling, while here
2017-04-08 03:07:18 +02:00
EXTERN const char Tunwind[] E_INIT("unwind");
add a “\builtin” builtin, make it forward assignments, fix some bugs related to that: • while AT&T ksh may do it, POSIX says nothing about allowing declaration commands only without vars and redirections, and “without vars” especially seems against which commands they are • fix relationship between forwarders and real declaration commands • clean up c_builtin vs shcomexec mess Also, re-run “make repool” with a fixed src/scripts/stringpool.sh,v 1.3
2017-03-12 03:04:15 +01:00
#define Tuser_sp1 (Tuser_sp2 + 1)
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
EXTERN const char Tuser_sp2[] E_INIT(" user ");
#define Twrite (Tshf_write + 4)
EXTERN const char Tf__S[] E_INIT(" %S");
allow 'eval break', from Martijn Dekker also, more string pooling, while here
2017-04-08 03:07:18 +02:00
#define Tf__d (Tunexpected_type + 22)
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
EXTERN const char Tf__ss[] E_INIT(" %s%s");
add a “\builtin” builtin, make it forward assignments, fix some bugs related to that: • while AT&T ksh may do it, POSIX says nothing about allowing declaration commands only without vars and redirections, and “without vars” especially seems against which commands they are • fix relationship between forwarders and real declaration commands • clean up c_builtin vs shcomexec mess Also, re-run “make repool” with a fixed src/scripts/stringpool.sh,v 1.3
2017-03-12 03:04:15 +01:00
#define Tf__sN (Tf_s_s_sN + 5)
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
EXTERN const char Tf_sSs[] E_INIT("%s/%s");
add a “\builtin” builtin, make it forward assignments, fix some bugs related to that: • while AT&T ksh may do it, POSIX says nothing about allowing declaration commands only without vars and redirections, and “without vars” especially seems against which commands they are • fix relationship between forwarders and real declaration commands • clean up c_builtin vs shcomexec mess Also, re-run “make repool” with a fixed src/scripts/stringpool.sh,v 1.3
2017-03-12 03:04:15 +01:00
#define Tf_T (Tf_s_T + 3)
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
EXTERN const char Tf_dN[] E_INIT("%d\n");
EXTERN const char Tf_s_[] E_INIT("%s ");
EXTERN const char Tf_s_T[] E_INIT("%s %T");
EXTERN const char Tf_s_s_sN[] E_INIT("%s %s %s\n");
add a “\builtin” builtin, make it forward assignments, fix some bugs related to that: • while AT&T ksh may do it, POSIX says nothing about allowing declaration commands only without vars and redirections, and “without vars” especially seems against which commands they are • fix relationship between forwarders and real declaration commands • clean up c_builtin vs shcomexec mess Also, re-run “make repool” with a fixed src/scripts/stringpool.sh,v 1.3
2017-03-12 03:04:15 +01:00
#define Tf_s_s (Tf_sD_s_s + 4)
allow 'eval break', from Martijn Dekker also, more string pooling, while here
2017-04-08 03:07:18 +02:00
#define Tf_s_sD_s (Tf_cant_ss_s + 6)
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
EXTERN const char Tf_optfoo[] E_INIT("%s%s-%c: %s");
EXTERN const char Tf_sD_[] E_INIT("%s: ");
EXTERN const char Tf_szs[] E_INIT("%s: %zd %s");
EXTERN const char Tf_parm[] E_INIT("%s: parameter not set");
EXTERN const char Tf_coproc[] E_INIT("-p: %s");
allow 'eval break', from Martijn Dekker also, more string pooling, while here
2017-04-08 03:07:18 +02:00
EXTERN const char Tf_cant_s[] E_INIT("%s: can't %s");
EXTERN const char Tf_cant_ss_s[] E_INIT("can't %s %s: %s");
streamline some error messages
2017-04-06 02:41:42 +02:00
EXTERN const char Tf_heredoc[] E_INIT("here document '%s' unclosed");
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
#if HAVE_MKNOD
EXTERN const char Tf_nonnum[] E_INIT("non-numeric %s %s '%s'");
#endif
EXTERN const char Tf_S_[] E_INIT("%S ");
#define Tf_S (Tf__S + 1)
add a “\builtin” builtin, make it forward assignments, fix some bugs related to that: • while AT&T ksh may do it, POSIX says nothing about allowing declaration commands only without vars and redirections, and “without vars” especially seems against which commands they are • fix relationship between forwarders and real declaration commands • clean up c_builtin vs shcomexec mess Also, re-run “make repool” with a fixed src/scripts/stringpool.sh,v 1.3
2017-03-12 03:04:15 +01:00
#define Tf_lu (Tf_toolarge + 17)
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
EXTERN const char Tf_toolarge[] E_INIT("%s %s too large: %lu");
EXTERN const char Tf_ldfailed[] E_INIT("%s %s(%d, %ld) failed: %s");
add a “\builtin” builtin, make it forward assignments, fix some bugs related to that: • while AT&T ksh may do it, POSIX says nothing about allowing declaration commands only without vars and redirections, and “without vars” especially seems against which commands they are • fix relationship between forwarders and real declaration commands • clean up c_builtin vs shcomexec mess Also, re-run “make repool” with a fixed src/scripts/stringpool.sh,v 1.3
2017-03-12 03:04:15 +01:00
#define Tf_ss (Tf_sss + 2)
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
EXTERN const char Tf_sss[] E_INIT("%s%s%s");
EXTERN const char Tf_sD_s_sD_s[] E_INIT("%s: %s %s: %s");
streamline some error messages
2017-04-06 02:41:42 +02:00
EXTERN const char Tf_toomany[] E_INIT("too many %ss");
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
EXTERN const char Tf_sd[] E_INIT("%s %d");
add a “\builtin” builtin, make it forward assignments, fix some bugs related to that: • while AT&T ksh may do it, POSIX says nothing about allowing declaration commands only without vars and redirections, and “without vars” especially seems against which commands they are • fix relationship between forwarders and real declaration commands • clean up c_builtin vs shcomexec mess Also, re-run “make repool” with a fixed src/scripts/stringpool.sh,v 1.3
2017-03-12 03:04:15 +01:00
#define Tf_s (Tf_temp + 28)
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
EXTERN const char Tft_end[] E_INIT("%;");
EXTERN const char Tft_R[] E_INIT("%R");
allow 'eval break', from Martijn Dekker also, more string pooling, while here
2017-04-08 03:07:18 +02:00
#define Tf_d (Tunexpected_type + 23)
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
EXTERN const char Tf_sD_s_qs[] E_INIT("%s: %s '%s'");
EXTERN const char Tf_ro[] E_INIT("read-only: %s");
EXTERN const char Tf_flags[] E_INIT("%s: flags 0x%X");
EXTERN const char Tf_temp[] E_INIT("can't %s temporary file %s: %s");
EXTERN const char Tf_ssfaileds[] E_INIT("%s: %s failed: %s");
EXTERN const char Tf_sD_sD_s[] E_INIT("%s: %s: %s");
EXTERN const char Tf__c_[] E_INIT("-%c ");
EXTERN const char Tf_sD_s_s[] E_INIT("%s: %s %s");
add a “\builtin” builtin, make it forward assignments, fix some bugs related to that: • while AT&T ksh may do it, POSIX says nothing about allowing declaration commands only without vars and redirections, and “without vars” especially seems against which commands they are • fix relationship between forwarders and real declaration commands • clean up c_builtin vs shcomexec mess Also, re-run “make repool” with a fixed src/scripts/stringpool.sh,v 1.3
2017-03-12 03:04:15 +01:00
#define Tf_sN (Tf_s_s_sN + 6)
#define Tf_sD_s (Tf_temp + 24)
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
EXTERN const char T_devtty[] E_INIT("/dev/tty");
#else /* helpers for string pooling */
#define T4spaces " "
#define T1space " "
#define Tcolsp ": "
#define TC_IFSWS " \t\n"
prepare the new fast character classes, not live yet: need sanity check unfortunately we need at least 21 or so, maybe 19, classes, so sizing things down to short is not possible; we can splurge with 32 bit thus
2017-04-22 02:07:10 +02:00
#define TinitIFS "IFS= \t\n"
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
#define TFCEDIT_dollaru "${FCEDIT:-/bin/ed} $_"
#define Tspdollaru " $_"
#define Tsgdot "*=."
#define Taugo "augo"
#define Tbracket "["
#define Tdot "."
#define Talias "alias"
string pooling, and more consistent look for error messages
2017-04-02 18:47:43 +02:00
#define Tbadnum "bad number"
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
#define Tbadsubst "bad substitution"
#define Tbg "bg"
#define Tbad_bsize "bad shf/buf/bsize"
#define Tbsize "bsize"
#define Tbad_sig_ss "%s: bad signal '%s'"
#define Tbad_sig_s "bad signal '%s'"
allow 'eval break', from Martijn Dekker also, more string pooling, while here
2017-04-08 03:07:18 +02:00
#define Tsgbreak "*=break"
#define Tbreak "break"
add a “\builtin” builtin, make it forward assignments, fix some bugs related to that: • while AT&T ksh may do it, POSIX says nothing about allowing declaration commands only without vars and redirections, and “without vars” especially seems against which commands they are • fix relationship between forwarders and real declaration commands • clean up c_builtin vs shcomexec mess Also, re-run “make repool” with a fixed src/scripts/stringpool.sh,v 1.3
2017-03-12 03:04:15 +01:00
#define T__builtin "-\\builtin"
fixup “\builtin” on OS/2; thanks komh for spotting this
2017-03-22 01:20:53 +01:00
#define T_builtin "\\builtin"
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
#define Tbuiltin "builtin"
#define Toomem "can't allocate %zu data bytes"
#define Tcant_cd "restricted shell - can't cd"
#define Tcant_find "can't find"
#define Tcant_open "can't open"
#define Tbytes "bytes"
#define Tbcat "!cat"
#define Tcat "cat"
#define Tcd "cd"
add a “\builtin” builtin, make it forward assignments, fix some bugs related to that: • while AT&T ksh may do it, POSIX says nothing about allowing declaration commands only without vars and redirections, and “without vars” especially seems against which commands they are • fix relationship between forwarders and real declaration commands • clean up c_builtin vs shcomexec mess Also, re-run “make repool” with a fixed src/scripts/stringpool.sh,v 1.3
2017-03-12 03:04:15 +01:00
#define T_command "-command"
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
#define Tcommand "command"
allow 'eval break', from Martijn Dekker also, more string pooling, while here
2017-04-08 03:07:18 +02:00
#define Tsgcontinue "*=continue"
#define Tcontinue "continue"
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
#define Tcreate "create"
#define TELIF_unexpected "TELIF unexpected"
#define TEXECSHELL "EXECSHELL"
add a “\builtin” builtin, make it forward assignments, fix some bugs related to that: • while AT&T ksh may do it, POSIX says nothing about allowing declaration commands only without vars and redirections, and “without vars” especially seems against which commands they are • fix relationship between forwarders and real declaration commands • clean up c_builtin vs shcomexec mess Also, re-run “make repool” with a fixed src/scripts/stringpool.sh,v 1.3
2017-03-12 03:04:15 +01:00
#define Tdsgexport "^*=export"
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
#define Texport "export"
#ifdef __OS2__
#define Textproc "extproc"
#endif
#define Tfalse "false"
#define Tfg "fg"
#define Tfg_badsubst "fileglob: bad substitution"
#define Tfile "file"
#define Tfile_fd "function definition file"
#define TFPATH "FPATH"
#define T_function " function"
#define Tfunction "function"
add a “\builtin” builtin, make it forward assignments, fix some bugs related to that: • while AT&T ksh may do it, POSIX says nothing about allowing declaration commands only without vars and redirections, and “without vars” especially seems against which commands they are • fix relationship between forwarders and real declaration commands • clean up c_builtin vs shcomexec mess Also, re-run “make repool” with a fixed src/scripts/stringpool.sh,v 1.3
2017-03-12 03:04:15 +01:00
#define T_funny_command "funny $()-command"
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
#define Tgetopts "getopts"
#define Thistory "history"
#define Tintovfl "integer overflow %zu %c %zu prevented"
streamline some error messages
2017-04-06 02:41:42 +02:00
#define Tinvname "%s: invalid %s name"
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
#define Tjobs "jobs"
#define Tjob_not_started "job not started"
#define Tmksh "mksh"
#define Tname "name"
#define Tno_args "missing argument"
#define Tno_OLDPWD "no OLDPWD"
#define Tnot_ident "is not an identifier"
#define Tnot_in_history "not in history"
#define Tnot_found_s "%s not found"
#define Tnot_found "not found"
#define Tnot_started "not started"
#define TOLDPWD "OLDPWD"
#define Topen "open"
#define TPATH "PATH"
#define Tpv "pv"
#define TpVv "Vpv"
#define TPWD "PWD"
#define Tread "read"
add a “\builtin” builtin, make it forward assignments, fix some bugs related to that: • while AT&T ksh may do it, POSIX says nothing about allowing declaration commands only without vars and redirections, and “without vars” especially seems against which commands they are • fix relationship between forwarders and real declaration commands • clean up c_builtin vs shcomexec mess Also, re-run “make repool” with a fixed src/scripts/stringpool.sh,v 1.3
2017-03-12 03:04:15 +01:00
#define Tdsgreadonly "^*=readonly"
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
#define Treadonly "readonly"
#define Tredirection_dup "can't finish (dup) redirection"
#define Tredirection "redirection"
#define Treal_sp1 "real "
#define Treal_sp2 " real "
#define Treq_arg "requires an argument"
#define Tselect "select"
#define Tsgset "*=set"
#define Tset "set"
#define Tsh "sh"
#define TSHELL "SHELL"
allow 'eval break', from Martijn Dekker also, more string pooling, while here
2017-04-08 03:07:18 +02:00
#define Tshell "shell"
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
#define Tshf_read "shf_read"
#define Tshf_write "shf_write"
allow 'eval break', from Martijn Dekker also, more string pooling, while here
2017-04-08 03:07:18 +02:00
#define Tgsource "=source"
#define Tsource "source"
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
#define Tj_suspend "j_suspend"
#define Tsuspend "suspend"
#define Tsynerr "syntax error"
#define Ttime "time"
#define Ttoo_many_args "too many arguments"
allow 'eval break', from Martijn Dekker also, more string pooling, while here
2017-04-08 03:07:18 +02:00
#define Ttoo_many_files "too many open files in shell"
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
#define Ttrue "true"
#define Ttty_fd_dupof "dup of tty fd"
#define Ttty_fd "tty fd"
add a “\builtin” builtin, make it forward assignments, fix some bugs related to that: • while AT&T ksh may do it, POSIX says nothing about allowing declaration commands only without vars and redirections, and “without vars” especially seems against which commands they are • fix relationship between forwarders and real declaration commands • clean up c_builtin vs shcomexec mess Also, re-run “make repool” with a fixed src/scripts/stringpool.sh,v 1.3
2017-03-12 03:04:15 +01:00
#define Tdgtypeset "^=typeset"
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
#define Ttypeset "typeset"
#define Tugo "ugo"
#define Tunalias "unalias"
#define Tunexpected "unexpected"
allow 'eval break', from Martijn Dekker also, more string pooling, while here
2017-04-08 03:07:18 +02:00
#define Tunexpected_type "%s: unexpected %s type %d"
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
#define Tunknown_option "unknown option"
allow 'eval break', from Martijn Dekker also, more string pooling, while here
2017-04-08 03:07:18 +02:00
#define Tunwind "unwind"
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
#define Tuser_sp1 "user "
#define Tuser_sp2 " user "
#define Twrite "write"
#define Tf__S " %S"
#define Tf__d " %d"
#define Tf__ss " %s%s"
#define Tf__sN " %s\n"
#define Tf_sSs "%s/%s"
#define Tf_T "%T"
#define Tf_dN "%d\n"
#define Tf_s_ "%s "
#define Tf_s_T "%s %T"
#define Tf_s_s_sN "%s %s %s\n"
#define Tf_s_s "%s %s"
#define Tf_s_sD_s "%s %s: %s"
#define Tf_optfoo "%s%s-%c: %s"
#define Tf_sD_ "%s: "
#define Tf_szs "%s: %zd %s"
#define Tf_parm "%s: parameter not set"
#define Tf_coproc "-p: %s"
allow 'eval break', from Martijn Dekker also, more string pooling, while here
2017-04-08 03:07:18 +02:00
#define Tf_cant_s "%s: can't %s"
#define Tf_cant_ss_s "can't %s %s: %s"
streamline some error messages
2017-04-06 02:41:42 +02:00
#define Tf_heredoc "here document '%s' unclosed"
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
#if HAVE_MKNOD
#define Tf_nonnum "non-numeric %s %s '%s'"
#endif
#define Tf_S_ "%S "
#define Tf_S "%S"
#define Tf_lu "%lu"
#define Tf_toolarge "%s %s too large: %lu"
#define Tf_ldfailed "%s %s(%d, %ld) failed: %s"
#define Tf_ss "%s%s"
#define Tf_sss "%s%s%s"
#define Tf_sD_s_sD_s "%s: %s %s: %s"
streamline some error messages
2017-04-06 02:41:42 +02:00
#define Tf_toomany "too many %ss"
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
#define Tf_sd "%s %d"
#define Tf_s "%s"
#define Tft_end "%;"
#define Tft_R "%R"
#define Tf_d "%d"
#define Tf_sD_s_qs "%s: %s '%s'"
#define Tf_ro "read-only: %s"
#define Tf_flags "%s: flags 0x%X"
#define Tf_temp "can't %s temporary file %s: %s"
#define Tf_ssfaileds "%s: %s failed: %s"
#define Tf_sD_sD_s "%s: %s: %s"
#define Tf__c_ "-%c "
#define Tf_sD_s_s "%s: %s %s"
#define Tf_sN "%s\n"
#define Tf_sD_s "%s: %s"
#define T_devtty "/dev/tty"
#endif /* end of string pooling */
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
rewrite maketemp() obsoleting tempnam(3) and mkstemp(3) external deps
2012-04-14 18:07:48 +02:00
typedef uint8_t Temp_type;
/* expanded heredoc */
#define TT_HEREDOC_EXP 0
bring back ${ foo;} sans dot.mkshrc patch, using a temporary file, and as experimental feature
2012-10-22 22:19:18 +02:00
/* temporary file used for history editing (fc -e) */
rewrite maketemp() obsoleting tempnam(3) and mkstemp(3) external deps
2012-04-14 18:07:48 +02:00
#define TT_HIST_EDIT 1
bring back ${ foo;} sans dot.mkshrc patch, using a temporary file, and as experimental feature
2012-10-22 22:19:18 +02:00
/* temporary file used during in-situ command substitution */
#define TT_FUNSUB 2
rewrite maketemp() obsoleting tempnam(3) and mkstemp(3) external deps
2012-04-14 18:07:48 +02:00
* version.h doesn't need an RCS ID * compat.h does, add it to misc.c, always include it, move if NEED_COMPAT * major whitespace cleanup in sh.h
2006-08-23 00:16:04 +02:00
/* temp/heredoc files. The file is removed when the struct is freed. */
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 temp {
* version.h doesn't need an RCS ID * compat.h does, add it to misc.c, always include it, move if NEED_COMPAT * major whitespace cleanup in sh.h
2006-08-23 00:16:04 +02:00
struct temp *next;
struct shf *shf;
rewrite maketemp() obsoleting tempnam(3) and mkstemp(3) external deps
2012-04-14 18:07:48 +02:00
/* pid of process parsed here-doc */
pid_t pid;
* version.h doesn't need an RCS ID * compat.h does, add it to misc.c, always include it, move if NEED_COMPAT * major whitespace cleanup in sh.h
2006-08-23 00:16:04 +02:00
Temp_type type;
rewrite maketemp() obsoleting tempnam(3) and mkstemp(3) external deps
2012-04-14 18:07:48 +02:00
/* actually longer: name (variable length) */
char tffn[3];
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
};
/*
* stdio and our IO routines
*/
Fix most “set -x” problems (LP#1179287) • “set -x” manually (cmdline too) snapshots fd#2 now • “set -o inherit-xtrace” introduced; default still enabled • reverted iodup printing to pre-R45 behaviour • made Flag(FXTRACE) a proper state machine
2013-07-21 20:47:24 +02:00
#define shl_xtrace (&shf_iob[0]) /* for set -x */
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 shl_stdout (&shf_iob[1])
#define shl_out (&shf_iob[2])
efficient debug-to-file output (/tmp racy, but hey)
2012-03-23 20:38:12 +01:00
#ifdef DF
#define shl_dbg (&shf_iob[3]) /* for DF() */
#endif
int → bool
2010-08-28 17:39:20 +02:00
EXTERN bool shl_stdout_ok;
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
/*
* trap handlers
*/
typedef struct trap {
const char *name; /* short name */
const char *mess; /* descriptive name */
* version.h doesn't need an RCS ID * compat.h does, add it to misc.c, always include it, move if NEED_COMPAT * major whitespace cleanup in sh.h
2006-08-23 00:16:04 +02:00
char *trap; /* trap command */
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
sig_t cursig; /* current handler (valid if TF_ORIG_* set) */
sig_t shtrap; /* shell signal handler */
try to do some optimum struct packing except for struct env (pointers, longs, size_t first; time_t next; int etc. then enum, bool)
2009-04-07 20:41:37 +02:00
int signal; /* signal number */
int flags; /* TF_* */
volatile sig_atomic_t set; /* trap pending */
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
} Trap;
/* values for Trap.flags */
#define TF_SHELL_USES BIT(0) /* shell uses signal, user can't change */
#define TF_USER_SET BIT(1) /* user has (tried to) set trap */
#define TF_ORIG_IGN BIT(2) /* original action was SIG_IGN */
#define TF_ORIG_DFL BIT(3) /* original action was SIG_DFL */
#define TF_EXEC_IGN BIT(4) /* restore SIG_IGN just before exec */
#define TF_EXEC_DFL BIT(5) /* restore SIG_DFL just before exec */
#define TF_DFL_INTR BIT(6) /* when received, default action is LINTR */
#define TF_TTY_INTR BIT(7) /* tty generated signal (see j_waitj) */
#define TF_CHANGED BIT(8) /* used by runtrap() to detect trap changes */
#define TF_FATAL BIT(9) /* causes termination if not trapped */
/* values for setsig()/setexecsig() flags argument */
#define SS_RESTORE_MASK 0x3 /* how to restore a signal before an exec() */
#define SS_RESTORE_CURR 0 /* leave current handler in place */
#define SS_RESTORE_ORIG 1 /* restore original handler */
#define SS_RESTORE_DFL 2 /* restore to SIG_DFL */
#define SS_RESTORE_IGN 3 /* restore to SIG_IGN */
#define SS_FORCE BIT(3) /* set signal even if original signal ignored */
#define SS_USER BIT(4) /* user is doing the set (ie, trap command) */
implement “live” SIGWINCH handling in the Emacs editing mode for winstonw from IRC #!/bin/mksh
2010-07-04 19:45:17 +02:00
#define SS_SHTRAP BIT(5) /* trap for internal use (ALRM, CHLD, WINCH) */
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
overhaul the signal handling: • support NSIG_MAX from http://austingroupbugs.net/view.php?id=741 and make a TODO for later to use sysconf(_SC_NSIG) at runtime • bounds-check signals (e.g. no smaller than 1, but smaller than NSIG) • align trap errorlevel with other shells • make trap match what’s in POSIX and fixup the manpage • refactor some code related to signals • hide from kill builtin both EXIT and ERR pseudo-signals
2015-04-29 22:44:37 +02:00
#define ksh_SIGEXIT 0 /* for trap EXIT */
#define ksh_SIGERR ksh_NSIG /* for trap ERR */
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
EXTERN volatile sig_atomic_t trap; /* traps pending? */
EXTERN volatile sig_atomic_t intrsig; /* pending trap interrupts command */
whitespace
2010-08-28 17:48:20 +02:00
EXTERN volatile sig_atomic_t fatal_trap; /* received a fatal signal */
overhaul the signal handling: • support NSIG_MAX from http://austingroupbugs.net/view.php?id=741 and make a TODO for later to use sysconf(_SC_NSIG) at runtime • bounds-check signals (e.g. no smaller than 1, but smaller than NSIG) • align trap errorlevel with other shells • make trap match what’s in POSIX and fixup the manpage • refactor some code related to signals • hide from kill builtin both EXIT and ERR pseudo-signals
2015-04-29 22:44:37 +02:00
extern Trap sigtraps[ksh_NSIG + 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
a tad annoying, when external programmes such as GNU screen are running, we don’t get SIGWINCH when the window size changes during the runtime of that, so, the signal is only usable reliably during editing in the shell and we re-check the window size before each interactive edit line again
2010-07-25 13:35:43 +02:00
/* got_winch = 1 when we need to re-adjust the window size */
implement “live” SIGWINCH handling in the Emacs editing mode for winstonw from IRC #!/bin/mksh
2010-07-04 19:45:17 +02:00
#ifdef SIGWINCH
• 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
EXTERN volatile sig_atomic_t got_winch E_INIT(1);
implement “live” SIGWINCH handling in the Emacs editing mode for winstonw from IRC #!/bin/mksh
2010-07-04 19:45:17 +02:00
#else
#define got_winch true
#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
/*
* TMOUT support
*/
/* values for ksh_tmout_state */
enum tmout_enum {
• 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
TMOUT_EXECUTING = 0, /* executing commands */
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
TMOUT_READING, /* waiting for input */
TMOUT_LEAVING /* have timed out */
};
EXTERN unsigned int ksh_tmout;
move three variables into common data, meaning .bss (hopefully)
2017-04-28 13:51:40 +02:00
EXTERN enum tmout_enum ksh_tmout_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
/* For "You have stopped jobs" message */
more int→bool while trying to let ^D output CR+LF (which shan’t be, oh my…)
2012-05-04 23:15:34 +02:00
EXTERN bool really_exit;
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
/*
* fast character classes
*/
prepare the new fast character classes, not live yet: need sanity check unfortunately we need at least 21 or so, maybe 19, classes, so sizing things down to short is not possible; we can splurge with 32 bit thus
2017-04-22 02:07:10 +02:00
/* internal types, do not reference */
fixup the remaining issues and last optimisations
2017-04-28 01:12:49 +02:00
prepare the new fast character classes, not live yet: need sanity check unfortunately we need at least 21 or so, maybe 19, classes, so sizing things down to short is not possible; we can splurge with 32 bit thus
2017-04-22 02:07:10 +02:00
/* initially empty — filled at runtime from $IFS */
fixup the remaining issues and last optimisations
2017-04-28 01:12:49 +02:00
#define CiIFS BIT(0)
#define CiCNTRL BIT(1) /* \x01‥\x08\x0E‥\x1F\x7F */
#define CiUPPER BIT(2) /* A‥Z */
#define CiLOWER BIT(3) /* a‥z */
#define CiHEXLT BIT(4) /* A‥Fa‥f */
#define CiOCTAL BIT(5) /* 0‥7 */
#define CiQCL BIT(6) /* &();| */
#define CiALIAS BIT(7) /* !,.@ */
#define CiQCX BIT(8) /* *[\\ */
#define CiVAR1 BIT(9) /* !*@ */
#define CiQCM BIT(10) /* /^~ */
#define CiDIGIT BIT(11) /* 89 */
#define CiQC BIT(12) /* "' */
#define CiSPX BIT(13) /* \x0B\x0C */
#define CiCURLY BIT(14) /* {} */
#define CiANGLE BIT(15) /* <> */
#define CiNUL BIT(16) /* \x00 */
#define CiTAB BIT(17) /* \x09 */
#define CiNL BIT(18) /* \x0A */
#define CiCR BIT(19) /* \x0D */
#define CiSP BIT(20) /* \x20 */
#define CiHASH BIT(21) /* # */
#define CiSS BIT(22) /* $ */
#define CiPERCT BIT(23) /* % */
#define CiPLUS BIT(24) /* + */
#define CiMINUS BIT(25) /* - */
#define CiCOLON BIT(26) /* : */
#define CiEQUAL BIT(27) /* = */
#define CiQUEST BIT(28) /* ? */
allow : and [ in alias names (but forbid [[ explicitly) to make 'enable' completely work again
2017-04-28 01:33:22 +02:00
#define CiBRACK BIT(29) /* ] */
fixup the remaining issues and last optimisations
2017-04-28 01:12:49 +02:00
#define CiUNDER BIT(30) /* _ */
#define CiGRAVE BIT(31) /* ` */
commit the optimisation result from the new fast character classes
2017-04-28 02:38:33 +02:00
/* out of space, but one for *@ would make sense, possibly others */
prepare the new fast character classes, not live yet: need sanity check unfortunately we need at least 21 or so, maybe 19, classes, so sizing things down to short is not possible; we can splurge with 32 bit thus
2017-04-22 02:07:10 +02:00
/* compile-time initialised, ASCII only */
extern const uint32_t tpl_ctypes[128];
/* run-time, contains C_IFS as well, full 2⁸ octet range */
EXTERN uint32_t ksh_ctypes[256];
convert to the new fast character classes
2017-04-27 21:16:10 +02:00
/* first octet of $IFS, for concatenating "$*" */
EXTERN char ifs0;
prepare the new fast character classes, not live yet: need sanity check unfortunately we need at least 21 or so, maybe 19, classes, so sizing things down to short is not possible; we can splurge with 32 bit thus
2017-04-22 02:07:10 +02:00
/* external types */
allow : and [ in alias names (but forbid [[ explicitly) to make 'enable' completely work again
2017-04-28 01:33:22 +02:00
/* !%,-.0‥9:@A‥Z[]_a‥z valid characters in alias names */
#define C_ALIAS (CiALIAS | CiBRACK | CiCOLON | CiDIGIT | CiLOWER | CiMINUS | CiOCTAL | CiPERCT | CiUNDER | CiUPPER)
prepare the new fast character classes, not live yet: need sanity check unfortunately we need at least 21 or so, maybe 19, classes, so sizing things down to short is not possible; we can splurge with 32 bit thus
2017-04-22 02:07:10 +02:00
/* 0‥9A‥Za‥z alphanumerical */
fixup the remaining issues and last optimisations
2017-04-28 01:12:49 +02:00
#define C_ALNUM (CiDIGIT | CiLOWER | CiOCTAL | CiUPPER)
/* 0‥9A‥Z_a‥z alphanumerical plus underscore (“word character”) */
#define C_ALNUX (CiDIGIT | CiLOWER | CiOCTAL | CiUNDER | CiUPPER)
prepare the new fast character classes, not live yet: need sanity check unfortunately we need at least 21 or so, maybe 19, classes, so sizing things down to short is not possible; we can splurge with 32 bit thus
2017-04-22 02:07:10 +02:00
/* A‥Za‥z alphabetical (upper plus lower) */
fixup the remaining issues and last optimisations
2017-04-28 01:12:49 +02:00
#define C_ALPHA (CiLOWER | CiUPPER)
/* A‥Z_a‥z alphabetical plus underscore (identifier lead) */
#define C_ALPHX (CiLOWER | CiUNDER | CiUPPER)
add C_ASCII (0x01 .. 0x7F: 7-bit ASCII except NUL)
2017-04-28 14:02:41 +02:00
/* \x01‥\x7F 7-bit ASCII except NUL */
#define C_ASCII (CiALIAS | CiANGLE | CiBRACK | CiCNTRL | CiCOLON | CiCR | CiCURLY | CiDIGIT | CiEQUAL | CiGRAVE | CiHASH | CiLOWER | CiMINUS | CiNL | CiOCTAL | CiPERCT | CiPLUS | CiQC | CiQCL | CiQCM | CiQCX | CiQUEST | CiSP | CiSPX | CiSS | CiTAB | CiUNDER | CiUPPER)
prepare the new fast character classes, not live yet: need sanity check unfortunately we need at least 21 or so, maybe 19, classes, so sizing things down to short is not possible; we can splurge with 32 bit thus
2017-04-22 02:07:10 +02:00
/* \x09\x20 tab and space */
fixup the remaining issues and last optimisations
2017-04-28 01:12:49 +02:00
#define C_BLANK (CiSP | CiTAB)
prepare the new fast character classes, not live yet: need sanity check unfortunately we need at least 21 or so, maybe 19, classes, so sizing things down to short is not possible; we can splurge with 32 bit thus
2017-04-22 02:07:10 +02:00
/* \x09\x20"' separator for completion */
fixup the remaining issues and last optimisations
2017-04-28 01:12:49 +02:00
#define C_CFS (CiQC | CiSP | CiTAB)
prepare the new fast character classes, not live yet: need sanity check unfortunately we need at least 21 or so, maybe 19, classes, so sizing things down to short is not possible; we can splurge with 32 bit thus
2017-04-22 02:07:10 +02:00
/* \x00‥\x1F\x7F POSIX control characters */
fixup the remaining issues and last optimisations
2017-04-28 01:12:49 +02:00
#define C_CNTRL (CiCNTRL | CiCR | CiNL | CiNUL | CiSPX | CiTAB)
prepare the new fast character classes, not live yet: need sanity check unfortunately we need at least 21 or so, maybe 19, classes, so sizing things down to short is not possible; we can splurge with 32 bit thus
2017-04-22 02:07:10 +02:00
/* 0‥9 decimal digits */
#define C_DIGIT (CiDIGIT | CiOCTAL)
fixup the remaining issues and last optimisations
2017-04-28 01:12:49 +02:00
/* &();`| editor x_locate_word() command */
#define C_EDCMD (CiGRAVE | CiQCL)
/* \x09\x0A\x20"&'():;<=>`| editor non-word characters */
#define C_EDNWC (CiANGLE | CiCOLON | CiEQUAL | CiGRAVE | CiNL | CiQC | CiQCL | CiSP | CiTAB)
/* "#$&'()*:;<=>?[\\`{|} editor quotes for tab completion */
#define C_EDQ (CiANGLE | CiCOLON | CiCURLY | CiEQUAL | CiGRAVE | CiHASH | CiQC | CiQCL | CiQCX | CiQUEST | CiSS)
prepare the new fast character classes, not live yet: need sanity check unfortunately we need at least 21 or so, maybe 19, classes, so sizing things down to short is not possible; we can splurge with 32 bit thus
2017-04-22 02:07:10 +02:00
/* !‥~ POSIX graphical (alphanumerical plus punctuation) */
fixup the remaining issues and last optimisations
2017-04-28 01:12:49 +02:00
#define C_GRAPH (C_PUNCT | CiDIGIT | CiLOWER | CiOCTAL | CiUPPER)
prepare the new fast character classes, not live yet: need sanity check unfortunately we need at least 21 or so, maybe 19, classes, so sizing things down to short is not possible; we can splurge with 32 bit thus
2017-04-22 02:07:10 +02:00
/* A‥Fa‥f hex letter */
#define C_HEXLT CiHEXLT
/* \x00 + $IFS IFS whitespace, IFS non-whitespace, NUL */
#define C_IFS (CiIFS | CiNUL)
/* \x09\x0A\x20 IFS whitespace */
fixup the remaining issues and last optimisations
2017-04-28 01:12:49 +02:00
#define C_IFSWS (CiNL | CiSP | CiTAB)
fix C_LEX1 which does STILL N̲O̲T̲ include the NUL…
2017-04-27 21:19:05 +02:00
/* \x09\x0A\x20&();<>| (for the lexer) */
fixup the remaining issues and last optimisations
2017-04-28 01:12:49 +02:00
#define C_LEX1 (CiANGLE | CiNL | CiQCL | CiSP | CiTAB)
prepare the new fast character classes, not live yet: need sanity check unfortunately we need at least 21 or so, maybe 19, classes, so sizing things down to short is not possible; we can splurge with 32 bit thus
2017-04-22 02:07:10 +02:00
/* a‥z lowercase letters */
#define C_LOWER CiLOWER
/* not alnux or dollar separator for motion */
allow : and [ in alias names (but forbid [[ explicitly) to make 'enable' completely work again
2017-04-28 01:33:22 +02:00
#define C_MFS (CiALIAS | CiANGLE | CiBRACK | CiCNTRL | CiCOLON | CiCR | CiCURLY | CiEQUAL | CiGRAVE | CiHASH | CiMINUS | CiNL | CiNUL | CiPERCT | CiPLUS | CiQC | CiQCL | CiQCM | CiQCX | CiQUEST | CiSP | CiSPX | CiTAB)
prepare the new fast character classes, not live yet: need sanity check unfortunately we need at least 21 or so, maybe 19, classes, so sizing things down to short is not possible; we can splurge with 32 bit thus
2017-04-22 02:07:10 +02:00
/* 0‥7 octal digit */
#define C_OCTAL CiOCTAL
commit the optimisation result from the new fast character classes
2017-04-28 02:38:33 +02:00
/* !*+?@ pattern magical operator, except space */
#define C_PATMO (CiPLUS | CiQUEST | CiVAR1)
fixup the remaining issues and last optimisations
2017-04-28 01:12:49 +02:00
/* \x20‥~ POSIX printable characters (graph plus space) */
prepare the new fast character classes, not live yet: need sanity check unfortunately we need at least 21 or so, maybe 19, classes, so sizing things down to short is not possible; we can splurge with 32 bit thus
2017-04-22 02:07:10 +02:00
#define C_PRINT (C_GRAPH | CiSP)
/* !"#$%&'()*+,-./:;<=>?@[\\]^_`{|}~ POSIX punctuation */
allow : and [ in alias names (but forbid [[ explicitly) to make 'enable' completely work again
2017-04-28 01:33:22 +02:00
#define C_PUNCT (CiALIAS | CiANGLE | CiBRACK | CiCOLON | CiCURLY | CiEQUAL | CiGRAVE | CiHASH | CiMINUS | CiPERCT | CiPLUS | CiQC | CiQCL | CiQCM | CiQCX | CiQUEST | CiSS | CiUNDER)
batch of optimisations
2017-04-27 22:22:28 +02:00
/* \x09\x0A"#$&'()*;<=>?[\\]`| characters requiring quoting, minus space */
allow : and [ in alias names (but forbid [[ explicitly) to make 'enable' completely work again
2017-04-28 01:33:22 +02:00
#define C_QUOTE (CiANGLE | CiBRACK | CiEQUAL | CiGRAVE | CiHASH | CiNL | CiQC | CiQCL | CiQCX | CiQUEST | CiSS | CiTAB)
prepare the new fast character classes, not live yet: need sanity check unfortunately we need at least 21 or so, maybe 19, classes, so sizing things down to short is not possible; we can splurge with 32 bit thus
2017-04-22 02:07:10 +02:00
/* 0‥9A‥Fa‥f hexadecimal digit */
fixup the remaining issues and last optimisations
2017-04-28 01:12:49 +02:00
#define C_SEDEC (CiDIGIT | CiHEXLT | CiOCTAL)
prepare the new fast character classes, not live yet: need sanity check unfortunately we need at least 21 or so, maybe 19, classes, so sizing things down to short is not possible; we can splurge with 32 bit thus
2017-04-22 02:07:10 +02:00
/* \x09‥\x0D\x20 POSIX space class */
fixup the remaining issues and last optimisations
2017-04-28 01:12:49 +02:00
#define C_SPACE (CiCR | CiNL | CiSP | CiSPX | CiTAB)
prepare the new fast character classes, not live yet: need sanity check unfortunately we need at least 21 or so, maybe 19, classes, so sizing things down to short is not possible; we can splurge with 32 bit thus
2017-04-22 02:07:10 +02:00
/* +-=? substitution operations with word */
fixup the remaining issues and last optimisations
2017-04-28 01:12:49 +02:00
#define C_SUB1 (CiEQUAL | CiMINUS | CiPLUS | CiQUEST)
prepare the new fast character classes, not live yet: need sanity check unfortunately we need at least 21 or so, maybe 19, classes, so sizing things down to short is not possible; we can splurge with 32 bit thus
2017-04-22 02:07:10 +02:00
/* #% substitution operations with pattern */
fixup the remaining issues and last optimisations
2017-04-28 01:12:49 +02:00
#define C_SUB2 (CiHASH | CiPERCT)
prepare the new fast character classes, not live yet: need sanity check unfortunately we need at least 21 or so, maybe 19, classes, so sizing things down to short is not possible; we can splurge with 32 bit thus
2017-04-22 02:07:10 +02:00
/* A‥Z uppercase letters */
#define C_UPPER CiUPPER
/* !#$*-?@ substitution parameters, other than positional */
fixup the remaining issues and last optimisations
2017-04-28 01:12:49 +02:00
#define C_VAR1 (CiHASH | CiMINUS | CiQUEST | CiSS | CiVAR1)
prepare the new fast character classes, not live yet: need sanity check unfortunately we need at least 21 or so, maybe 19, classes, so sizing things down to short is not possible; we can splurge with 32 bit thus
2017-04-22 02:07:10 +02:00
/* individual chars you might like */
commit the optimisation result from the new fast character classes
2017-04-28 02:38:33 +02:00
#define C_ANGLE CiANGLE /* <> angle brackets */
fixup the remaining issues and last optimisations
2017-04-28 01:12:49 +02:00
#define C_COLON CiCOLON /* : colon */
commit the optimisation result from the new fast character classes
2017-04-28 02:38:33 +02:00
#define C_CR CiCR /* \x0D ASCII carriage return */
prepare the new fast character classes, not live yet: need sanity check unfortunately we need at least 21 or so, maybe 19, classes, so sizing things down to short is not possible; we can splurge with 32 bit thus
2017-04-22 02:07:10 +02:00
#define C_DOLAR CiSS /* $ dollar sign */
fixup the remaining issues and last optimisations
2017-04-28 01:12:49 +02:00
#define C_EQUAL CiEQUAL /* = equals sign */
commit the optimisation result from the new fast character classes
2017-04-28 02:38:33 +02:00
#define C_GRAVE CiGRAVE /* ` accent gravis */
fixup the remaining issues and last optimisations
2017-04-28 01:12:49 +02:00
#define C_HASH CiHASH /* # hash sign */
prepare the new fast character classes, not live yet: need sanity check unfortunately we need at least 21 or so, maybe 19, classes, so sizing things down to short is not possible; we can splurge with 32 bit thus
2017-04-22 02:07:10 +02:00
#define C_LF CiNL /* \x0A ASCII line feed */
fixup the remaining issues and last optimisations
2017-04-28 01:12:49 +02:00
#define C_MINUS CiMINUS /* - hyphen-minus */
prepare the new fast character classes, not live yet: need sanity check unfortunately we need at least 21 or so, maybe 19, classes, so sizing things down to short is not possible; we can splurge with 32 bit thus
2017-04-22 02:07:10 +02:00
#ifdef MKSH_WITH_TEXTMODE
fixup the remaining issues and last optimisations
2017-04-28 01:12:49 +02:00
#define C_NL (CiNL | CiCR) /* CR or LF under OS/2 TEXTMODE */
prepare the new fast character classes, not live yet: need sanity check unfortunately we need at least 21 or so, maybe 19, classes, so sizing things down to short is not possible; we can splurge with 32 bit thus
2017-04-22 02:07:10 +02:00
#else
fixup the remaining issues and last optimisations
2017-04-28 01:12:49 +02:00
#define C_NL CiNL /* LF only like under Unix */
prepare the new fast character classes, not live yet: need sanity check unfortunately we need at least 21 or so, maybe 19, classes, so sizing things down to short is not possible; we can splurge with 32 bit thus
2017-04-22 02:07:10 +02:00
#endif
#define C_NUL CiNUL /* \x00 ASCII NUL */
fixup the remaining issues and last optimisations
2017-04-28 01:12:49 +02:00
#define C_PLUS CiPLUS /* + plus sign */
prepare the new fast character classes, not live yet: need sanity check unfortunately we need at least 21 or so, maybe 19, classes, so sizing things down to short is not possible; we can splurge with 32 bit thus
2017-04-22 02:07:10 +02:00
#define C_QC CiQC /* "' quote characters */
commit the optimisation result from the new fast character classes
2017-04-28 02:38:33 +02:00
#define C_QUEST CiQUEST /* ? question mark */
prepare the new fast character classes, not live yet: need sanity check unfortunately we need at least 21 or so, maybe 19, classes, so sizing things down to short is not possible; we can splurge with 32 bit thus
2017-04-22 02:07:10 +02:00
#define C_SPC CiSP /* \x20 ASCII space */
#define C_TAB CiTAB /* \x09 ASCII horizontal tabulator */
#define C_UNDER CiUNDER /* _ underscore */
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
convert to the new fast character classes
2017-04-27 21:16:10 +02:00
/* identity transform of octet */
make ord() result unsigned int; add asc() which is: • not designed to be emitted, only used in comparisons with other asc() results • on EBCDIC platforms, the mapping of an EBCDIC octet to their corresponding ASCII or Unicode/UCS-4 codepoint or, if there is no mapping, a distinct value above all valid Unicode codepoints • on nōn-EBCDIC platforms, just the identity mapping of the input octet into their ord() value Intended use are ASCII-ish character ops, including ranges (“A-Z”), mapping from those to the corresponding digit offset, and sorting of things in an ASCIIbetical way
2017-04-21 21:50:09 +02:00
#define ord(c) ((unsigned int)(unsigned char)(c))
add -DMKSH_FAUX_EBCDIC to test the codepaths better waking up to: Lanfear - Just Another Broken Shell
2017-04-28 13:13:49 +02:00
#if defined(MKSH_EBCDIC) || defined(MKSH_FAUX_EBCDIC)
commit the EBCDIC run-time table conversion code, so it can be reviewed XXX there’s still the issue of compile-time character conversion, and XXX that runtime m̲u̲s̲t̲ use a compatible codepage, which we cannot check, XXX and that we need the POSIX portable character set mapped, which we XXX decide to not check (due to the above, mostly)
2017-04-28 03:15:51 +02:00
EXTERN unsigned short ebcdic_map[256];
fill two complete round-trip maps EBCDIC <-> ASCII
2017-04-28 04:40:26 +02:00
EXTERN unsigned char ebcdic_rtt_toascii[256];
EXTERN unsigned char ebcdic_rtt_fromascii[256];
commit the EBCDIC run-time table conversion code, so it can be reviewed XXX there’s still the issue of compile-time character conversion, and XXX that runtime m̲u̲s̲t̲ use a compatible codepage, which we cannot check, XXX and that we need the POSIX portable character set mapped, which we XXX decide to not check (due to the above, mostly)
2017-04-28 03:15:51 +02:00
extern void ebcdic_init(void);
rename asc() to asciibetical() to make clear it’s for POSIX ordering only and switch remaining consumers, except the allowed one, to rtt2asc()
2017-04-28 05:46:50 +02:00
/* one-way to-ascii-or-high conversion, for POSIX locale ordering */
#define asciibetical(c) ((unsigned int)ebcdic_map[(unsigned char)(c)])
/* two-way round-trip conversion, for general use */
fill two complete round-trip maps EBCDIC <-> ASCII
2017-04-28 04:40:26 +02:00
#define rtt2asc(c) ebcdic_rtt_toascii[(unsigned char)(c)]
#define asc2rtt(c) ebcdic_rtt_fromascii[(unsigned char)(c)]
commit the EBCDIC run-time table conversion code, so it can be reviewed XXX there’s still the issue of compile-time character conversion, and XXX that runtime m̲u̲s̲t̲ use a compatible codepage, which we cannot check, XXX and that we need the POSIX portable character set mapped, which we XXX decide to not check (due to the above, mostly)
2017-04-28 03:15:51 +02:00
/* case-independent char comparison */
fixup the remaining issues and last optimisations
2017-04-28 01:12:49 +02:00
#define ksh_eq(c,u,l) (ord(c) == ord(u) || ord(c) == ord(l))
#else
rename asc() to asciibetical() to make clear it’s for POSIX ordering only and switch remaining consumers, except the allowed one, to rtt2asc()
2017-04-28 05:46:50 +02:00
#define asciibetical(c) ord(c)
fill two complete round-trip maps EBCDIC <-> ASCII
2017-04-28 04:40:26 +02:00
#define rtt2asc(c) ((unsigned char)(c))
#define asc2rtt(c) ((unsigned char)(c))
fixup the remaining issues and last optimisations
2017-04-28 01:12:49 +02:00
#define ksh_eq(c,u,l) ((ord(c) | 0x20) == ord(l))
#endif
add -DMKSH_FAUX_EBCDIC to test the codepaths better waking up to: Lanfear - Just Another Broken Shell
2017-04-28 13:13:49 +02:00
/* control character foo */
#ifdef MKSH_EBCDIC
#define ksh_isctrl(c) (ord(c) < 0x40 || ord(c) == 0xFF)
#else
#define ksh_isctrl(c) ((ord(c) & 0x7F) < 0x20 || (c) == 0x7F)
#endif
convert to the new fast character classes
2017-04-27 21:16:10 +02:00
/* new fast character classes */
keep ksh_ctypes[] array keys in EBCDIC we set $IFS massively less often than use ctype()
2017-04-28 13:31:53 +02:00
#define ctype(c,t) tobool(ksh_ctypes[ord(c)] & (t))
convert to the new fast character classes
2017-04-27 21:16:10 +02:00
/* helper functions */
#define ksh_isdash(s) tobool(ord((s)[0]) == '-' && ord((s)[1]) == '\0')
/* invariant distance even in EBCDIC */
batch of optimisations
2017-04-27 22:22:28 +02:00
#define ksh_tolower(c) (ctype(c, C_UPPER) ? (c) - 'A' + 'a' : (c))
#define ksh_toupper(c) (ctype(c, C_LOWER) ? (c) - 'a' + 'A' : (c))
rename asc() to asciibetical() to make clear it’s for POSIX ordering only and switch remaining consumers, except the allowed one, to rtt2asc()
2017-04-28 05:46:50 +02:00
/* strictly speaking rtt2asc() here, but this works even in EBCDIC */
prepare the new fast character classes, not live yet: need sanity check unfortunately we need at least 21 or so, maybe 19, classes, so sizing things down to short is not possible; we can splurge with 32 bit thus
2017-04-22 02:07:10 +02:00
#define ksh_numdig(c) (ord(c) - ord('0'))
rename asc() to asciibetical() to make clear it’s for POSIX ordering only and switch remaining consumers, except the allowed one, to rtt2asc()
2017-04-28 05:46:50 +02:00
#define ksh_numuc(c) (rtt2asc(c) - rtt2asc('A'))
#define ksh_numlc(c) (rtt2asc(c) - rtt2asc('a'))
control character madness, but more compiler-friendly
2017-04-28 05:28:19 +02:00
#define ksh_toctrl(c) asc2rtt(ord(c) == ord('?') ? 0x7F : rtt2asc(c) & 0x9F)
#define ksh_unctrl(c) asc2rtt(rtt2asc(c) ^ 0x40U)
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
/* Argument parsing for built-in commands and getopts command */
/* Values for Getopt.flags */
#define GF_ERROR BIT(0) /* call errorf() if there is an error */
#define GF_PLUSOPT BIT(1) /* allow +c as an option */
#define GF_NONAME BIT(2) /* don't print argv[0] in errors */
/* Values for Getopt.info */
#define GI_MINUS BIT(0) /* an option started with -... */
#define GI_PLUS BIT(1) /* an option started with +... */
#define GI_MINUSMINUS BIT(2) /* arguments were ended with -- */
patch most of Jerker Bäck’s concerns out, unless not applicable
2011-08-27 20:06:52 +02:00
/* in case some OS defines these */
#undef optarg
#undef optind
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
typedef struct {
whitespace
2010-08-28 17:48:20 +02:00
const char *optarg;
int optind;
int uoptind; /* what user sees in $OPTIND */
int flags; /* see GF_* */
int info; /* see GI_* */
unsigned int p; /* 0 or index into argv[optind - 1] */
char buf[2]; /* for bad option OPTARG value */
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
} Getopt;
EXTERN Getopt builtin_opt; /* for shell builtin commands */
EXTERN Getopt user_opt; /* parsing state for getopts builtin command */
/* This for co-processes */
re-indent comments
2011-06-21 23:10:12 +02:00
/* something that won't (realisticly) wrap */
partial oksh sync, up to commit 80be547da108d5c241ae068290ca3e331446aa41?
2015-10-09 18:11:19 +02:00
typedef int Coproc_id;
re-indent comments
2011-06-21 23:10:12 +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
struct coproc {
try to do some optimum struct packing except for struct env (pointers, longs, size_t first; time_t next; int etc. then enum, bool)
2009-04-07 20:41:37 +02:00
void *job; /* 0 or job of co-process using input pipe */
* version.h doesn't need an RCS ID * compat.h does, add it to misc.c, always include it, move if NEED_COMPAT * major whitespace cleanup in sh.h
2006-08-23 00:16:04 +02:00
int read; /* pipe from co-process's stdout */
int readw; /* other side of read (saved temporarily) */
int write; /* pipe to co-process's stdin */
int njobs; /* number of live jobs using output pipe */
try to do some optimum struct packing except for struct env (pointers, longs, size_t first; time_t next; int etc. then enum, bool)
2009-04-07 20:41:37 +02:00
Coproc_id id; /* id of current output pipe */
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
};
EXTERN struct coproc coproc;
introduce MKSH_NOPROSPECTOFWORK which is like pdksh’s JOB_SIGS in reverse, like MKSH_UNEMPLOYED is pdksh’s JOBS in reverse; allows mksh to work (hah! no pun intended…) with klibc (and possibly, Syllable Desktop and Plan 9) for now, until they fix their bugs
2011-01-30 02:35:35 +01:00
#ifndef MKSH_NOPROSPECTOFWORK
add a sleep builtin that can deal with fractions too
2011-02-11 01:41:38 +01:00
/* used in jobs.c and by coprocess stuff in exec.c and select() calls */
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
EXTERN sigset_t sm_default, sm_sigchld;
introduce MKSH_NOPROSPECTOFWORK which is like pdksh’s JOB_SIGS in reverse, like MKSH_UNEMPLOYED is pdksh’s JOBS in reverse; allows mksh to work (hah! no pun intended…) with klibc (and possibly, Syllable Desktop and Plan 9) for now, until they fix their bugs
2011-01-30 02:35:35 +01: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
/* name of called builtin function (used by error functions) */
merge the const branch +- a few
2007-03-04 01:13:17 +01:00
EXTERN const char *builtin_argv0;
add a “\builtin” builtin, make it forward assignments, fix some bugs related to that: • while AT&T ksh may do it, POSIX says nothing about allowing declaration commands only without vars and redirections, and “without vars” especially seems against which commands they are • fix relationship between forwarders and real declaration commands • clean up c_builtin vs shcomexec mess Also, re-run “make repool” with a fixed src/scripts/stringpool.sh,v 1.3
2017-03-12 03:04:15 +01:00
/* is called builtin a POSIX special builtin? (error functions only) */
POSIX says “command” loses SPEC_BI and means it too reported by ormaaj, who even asked on the austin ML http://thread.gmane.org/gmane.comp.standards.posix.austin.general/9907/focus=9931 clarified by jilles; also make errorlevels match ksh93
2014-10-12 23:58:53 +02:00
EXTERN bool builtin_spec;
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
this is about the amount -Wl,--gc-sections can help me to eliminate
2011-04-22 14:21:55 +02:00
/* current working directory */
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
EXTERN char *current_wd;
• Completely overhaul prompt length calculation and prompt display routines; make Emacs and Vi share code, permitting reducing of duplication and code removal as well as more consistent behaviour; put some common code into shared helper functions, too • New x_adjust() logic (Emacs mode): when determining what portion of a line to render use a much more sophisticated algorithm and try to fill up ⅔ of the total screen width (with line and prompt both) also as wished from Steffen Daode Nurpmeso
2013-07-26 22:33:39 +02:00
/* input line size */
increase default input line, from PLD Linux (for as long as we still have the size static, and !MKSH_SMALL)
2016-06-26 01:49:50 +02:00
#ifdef MKSH_SMALL
implement mmap-using mechanism to catch buffer underruns inside mksh (pulls stdio, is rather BSD-specific and memory-hungry and a bit slow)
2016-02-24 02:44:46 +01:00
#define LINE (4096 - ALLOC_OVERHEAD)
increase default input line, from PLD Linux (for as long as we still have the size static, and !MKSH_SMALL)
2016-06-26 01:49:50 +02:00
#else
#define LINE (16384 - ALLOC_OVERHEAD)
#endif
experimentally use MKSH_CLRTOEOL_STRING instead of lots of spaces followed by lots of backspaces for many clearing scenarios; requested by tmux user slagtc on IRC
2016-07-13 01:07:10 +02:00
/* columns and lines of the tty */
EXTERN mksh_ari_t x_cols E_INIT(80);
EXTERN mksh_ari_t x_lins E_INIT(24);
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
‣ merge from mksh R40-stable move /etc/{,suid_}profile to /system/etc/ for Android (but do not make the location of /etc configurable); rewrite manpage section about /etc/{,suid_}profile, .profile, .mkshrc
2011-07-16 19:08:21 +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
/* Determine the location of the system (common) profile */
‣ merge from mksh R40-stable move /etc/{,suid_}profile to /system/etc/ for Android (but do not make the location of /etc configurable); rewrite manpage section about /etc/{,suid_}profile, .profile, .mkshrc
2011-07-16 19:08:21 +02:00
allow overriding /etc location (LP#1039713), but don’t do it
2012-08-24 21:09:10 +02:00
#ifndef MKSH_DEFAULT_PROFILEDIR
collective R54 release preparation multi-merger: install both lksh and mksh manpages from Build.sh (Martijn Dekker) spelling fixes (Larry Hynes) manpage improvements (Martijn Dekker) initial port to Harvey-OS’ APEX (Ronald G. Minnich, Elbing Miss, Álvaro Jurado) more from komh’s OS/2 port (KO Myung-Hun)
2016-11-12 00:31:39 +01:00
#define MKSH_DEFAULT_PROFILEDIR MKSH_UNIXROOT "/etc"
allow overriding /etc location (LP#1039713), but don’t do it
2012-08-24 21:09:10 +02:00
#endif
‣ merge from mksh R40-stable move /etc/{,suid_}profile to /system/etc/ for Android (but do not make the location of /etc configurable); rewrite manpage section about /etc/{,suid_}profile, .profile, .mkshrc
2011-07-16 19:08:21 +02:00
allow overriding /etc location (LP#1039713), but don’t do it
2012-08-24 21:09:10 +02:00
#define MKSH_SYSTEM_PROFILE MKSH_DEFAULT_PROFILEDIR "/profile"
#define MKSH_SUID_PROFILE MKSH_DEFAULT_PROFILEDIR "/suid_profile"
‣ merge from mksh R40-stable move /etc/{,suid_}profile to /system/etc/ for Android (but do not make the location of /etc configurable); rewrite manpage section about /etc/{,suid_}profile, .profile, .mkshrc
2011-07-16 19:08:21 +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
/* Used by v_evaluate() and setstr() to control action when error occurs */
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
#define KSH_UNWIND_ERROR 0 /* unwind the stack (kshlongjmp) */
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 KSH_RETURN_ERROR 1 /* return 1/0 for success/failure */
/*
* Shell file I/O routines
*/
‣ merge from mksh R40-stable use common macro bodies shf_{get,put}c_ for definition of shf_{put,get}c as functions (MKSH_SMALL) or macros, respectively
2011-07-16 19:07:35 +02:00
#define SHF_BSIZE 512
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
‣ merge from mksh R40-stable use common macro bodies shf_{get,put}c_ for definition of shf_{put,get}c as functions (MKSH_SMALL) or macros, respectively
2011-07-16 19:07:35 +02:00
#define shf_fileno(shf) ((shf)->fd)
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 shf_setfileno(shf,nfd) ((shf)->fd = (nfd))
rename more identifiers with trailing underscores
2011-10-26 00:36:39 +02:00
#define shf_getc_i(shf) ((shf)->rnleft > 0 ? \
remove some more of this ugliness
2010-01-29 10:34:31 +01:00
(shf)->rnleft--, *(shf)->rp++ : \
shf_getchar(shf))
rename more identifiers with trailing underscores
2011-10-26 00:36:39 +02:00
#define shf_putc_i(c, shf) ((shf)->wnleft == 0 ? \
fix the occasional issue printing \xFF from a string
2016-08-01 22:23:15 +02:00
shf_putchar((uint8_t)(c), (shf)) : \
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
((shf)->wnleft--, *(shf)->wp++ = (c)))
#define shf_eof(shf) ((shf)->flags & SHF_EOF)
#define shf_error(shf) ((shf)->flags & SHF_ERROR)
• 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
#define shf_errno(shf) ((shf)->errnosv)
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 shf_clearerr(shf) ((shf)->flags &= ~(SHF_EOF | SHF_ERROR))
/* Flags passed to shf_*open() */
#define SHF_RD 0x0001
#define SHF_WR 0x0002
#define SHF_RDWR (SHF_RD|SHF_WR)
#define SHF_ACCMODE 0x0003 /* mask */
#define SHF_GETFL 0x0004 /* use fcntl() to figure RD/WR flags */
#define SHF_UNBUF 0x0008 /* unbuffered I/O */
#define SHF_CLEXEC 0x0010 /* set close on exec flag */
#define SHF_MAPHI 0x0020 /* make fd > FDBASE (and close orig)
* (shf_open() only) */
#define SHF_DYNAMIC 0x0040 /* string: increase buffer as needed */
#define SHF_INTERRUPT 0x0080 /* EINTR in read/write causes error */
/* Flags used internally */
#define SHF_STRING 0x0100 /* a string, not a file */
#define SHF_ALLOCS 0x0200 /* shf and shf->buf were alloc()ed */
#define SHF_ALLOCB 0x0400 /* shf->buf was alloc()ed */
#define SHF_ERROR 0x0800 /* read()/write() error */
#define SHF_EOF 0x1000 /* read eof (sticky) */
#define SHF_READING 0x2000 /* currently reading: rnleft,rp valid */
#define SHF_WRITING 0x4000 /* currently writing: wnleft,wp valid */
struct shf {
try to do some optimum struct packing except for struct env (pointers, longs, size_t first; time_t next; int etc. then enum, bool)
2009-04-07 20:41:37 +02:00
Area *areap; /* area shf/buf were allocated in */
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
unsigned char *rp; /* read: current position in buffer */
try to do some optimum struct packing except for struct env (pointers, longs, size_t first; time_t next; int etc. then enum, bool)
2009-04-07 20:41:37 +02:00
unsigned char *wp; /* write: current position in buffer */
unsigned char *buf; /* buffer */
patch most of Jerker Bäck’s concerns out, unless not applicable
2011-08-27 20:06:52 +02:00
ssize_t bsize; /* actual size of buf */
ssize_t rbsize; /* size of buffer (1 if SHF_UNBUF) */
ssize_t rnleft; /* read: how much data left in buffer */
ssize_t wbsize; /* size of buffer (0 if SHF_UNBUF) */
ssize_t wnleft; /* write: how much space left in buffer */
try to do some optimum struct packing except for struct env (pointers, longs, size_t first; time_t next; int etc. then enum, bool)
2009-04-07 20:41:37 +02:00
int flags; /* see SHF_* */
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 fd; /* file descriptor */
• 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
int errnosv; /* saved value of errno after error */
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
};
extern struct shf shf_iob[];
struct table {
* back out almost all of the memory allocator related changes, as aalloc was hard to type and hard to fix, galloc is also hard to fix, and some things I learned will probably improve things more but make me use the original form as base (especially for space savings) * let sizeofN die though, remove even more casts * optimise, polish * regen Makefiles * sprinkle a few /* CONSTCOND */ while here
2008-12-13 18:02:18 +01:00
Area *areap; /* area to allocate entries */
* version.h doesn't need an RCS ID * compat.h does, add it to misc.c, always include it, move if NEED_COMPAT * major whitespace cleanup in sh.h
2006-08-23 00:16:04 +02:00
struct tbl **tbls; /* hashed table items */
patch most of Jerker Bäck’s concerns out, unless not applicable
2011-08-27 20:06:52 +02:00
size_t nfree; /* free table entries */
• rework hash table interna to avoid gcc-4.1 on Debian etch bug • also improve behaviour with _a lot_ (>2²⁸) entries • while here, improve comments and whitespace
2011-06-05 21:58:21 +02:00
uint8_t tshift; /* table size (2^tshift) */
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
};
• bump patchlevel to today’s • while here, reformat 'struct tbl' comment-wise and placement-wise and drop the Tflag typedef • while here, write regression test for the "global" built-in, which does what typeset is supposed to do except that it doubles as "local"
2011-07-05 22:12:20 +02:00
/* table item */
struct tbl {
/* Area to allocate from */
Area *areap;
/* value */
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
union {
• bump patchlevel to today’s • while here, reformat 'struct tbl' comment-wise and placement-wise and drop the Tflag typedef • while here, write regression test for the "global" built-in, which does what typeset is supposed to do except that it doubles as "local"
2011-07-05 22:12:20 +02:00
char *s; /* string */
mksh_ari_t i; /* integer */
mksh_uari_t u; /* unsigned integer */
int (*f)(const char **); /* built-in command */
struct op *t; /* "function" tree */
} val;
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
union {
struct tbl *array; /* array values */
remove all but these __CRAZY=Yes build warnings: main.c: In function 'main': main.c:208: warning: cast discards qualifiers from pointer target type main.c:329: warning: cast discards qualifiers from pointer target type no warnings at autoconf time left either; will take care of these two later (might revisit changes from this commit), maybe change declararion for the builtins to have their argv[] be const strings, and go through strict type and qualifier checking again. this'll further improve stability. XXX these changes might have introduced (more?) memory leaks, XXX someone who knows about these tools should verify with XXX automatic memory usage analysers (valgrind?) still passes testsuite
2006-11-12 15:58:16 +01:00
const char *fpath; /* temporary path to undef function */
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
} u;
shuffle fields of struct tbl around for better padding results
2009-08-28 20:33:05 +02:00
union {
• bump patchlevel to today’s • while here, reformat 'struct tbl' comment-wise and placement-wise and drop the Tflag typedef • while here, write regression test for the "global" built-in, which does what typeset is supposed to do except that it doubles as "local"
2011-07-05 22:12:20 +02:00
int field; /* field with for -L/-R/-Z */
• 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
int errnov; /* CEXEC/CTALIAS */
shuffle fields of struct tbl around for better padding results
2009-08-28 20:33:05 +02:00
} u2;
… 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
union {
uint32_t hval; /* hash(name) */
uint32_t index; /* index for an array */
} ua;
• bump patchlevel to today’s • while here, reformat 'struct tbl' comment-wise and placement-wise and drop the Tflag typedef • while here, write regression test for the "global" built-in, which does what typeset is supposed to do except that it doubles as "local"
2011-07-05 22:12:20 +02:00
/*
* command type (see below), base (if INTEGER),
* offset from val.s of value (if EXPORT)
*/
int type;
/* flags (see below) */
uint32_t flag;
/* actually longer: name (variable length) */
char name[4];
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
EXTERN struct tbl *vtemp;
string pooling, and more consistent look for error messages
2017-04-02 18:47:43 +02:00
/* set by isglobal(), global() and local() */
permit 'read -A/-a arr[idx]' as long as only one element is read; fix corruption of array indicēs with this construct (LP#1533396)
2016-01-14 23:49:33 +01:00
EXTERN bool last_lookup_was_array;
make tempvar() and vtemp global
2012-06-28 22:02:29 +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
/* common flag bits */
whitespace fixes
2006-11-16 14:35:00 +01:00
#define ALLOC BIT(0) /* val.s has been allocated */
#define DEFINED BIT(1) /* is defined in block */
#define ISSET BIT(2) /* has value, vp->val.[si] */
#define EXPORT BIT(3) /* exported variable/function */
#define TRACE BIT(4) /* var: user flagged, func: execution tracing */
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
/* (start non-common flags at 8) */
/* flag bits used for variables */
whitespace fixes
2006-11-16 14:35:00 +01:00
#define SPECIAL BIT(8) /* PATH, IFS, SECONDS, etc */
#define INTEGER BIT(9) /* val.i contains integer value */
#define RDONLY BIT(10) /* read-only variable */
#define LOCAL BIT(11) /* for local typeset() */
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 ARRAY BIT(13) /* array */
#define LJUST BIT(14) /* left justify */
#define RJUST BIT(15) /* right justify */
#define ZEROFIL BIT(16) /* 0 filled if RJUSTIFY, strip 0s if LJUSTIFY */
#define LCASEV BIT(17) /* convert to lower case */
shuffle fields of struct tbl around for better padding results
2009-08-28 20:33:05 +02:00
#define UCASEV_AL BIT(18) /* convert to upper case / autoload function */
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 INT_U BIT(19) /* unsigned integer */
• add -u option (POSIX: unbuffered ⇒ nop) to the built-in cat • PIPESTATUS now supported (like bash 2) whose last member may actually differ from $? since the latter may not be the result of a pipeline partial command • add regression tests, documentation, etc.
2011-02-18 23:26:13 +01:00
#define INT_L BIT(20) /* long integer (no-op but used as magic) */
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 IMPORT BIT(21) /* flag to typeset(): no arrays, must have = */
#define LOCAL_COPY BIT(22) /* with LOCAL - copy attrs from existing var */
#define EXPRINEVAL BIT(23) /* contents currently being evaluated */
#define EXPRLVALUE BIT(24) /* useable as lvalue (temp flag) */
… 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
#define AINDEX BIT(25) /* array index >0 = ua.index filled in */
merge the nameref code, using mksh standard scoping as discussed
2009-09-06 19:42:15 +02:00
#define ASSOC BIT(26) /* ARRAY ? associative : reference */
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
/* flag bits used for taliases/builtins/aliases/keywords/functions */
#define KEEPASN BIT(8) /* keep command assignments (eg, var=x cmd) */
#define FINUSE BIT(9) /* function being executed */
#define FDELETE BIT(10) /* function deleted while it was executing */
#define FKSH BIT(11) /* function defined with function x (vs x()) */
#define SPEC_BI BIT(12) /* a POSIX special builtin */
invent builtin flags instead of special-casing cat and printf for prefer-external-over-builtin stuff
2016-07-25 01:10:04 +02:00
#define LOWER_BI BIT(13) /* (with LOW_BI) override even w/o flags */
#define LOW_BI BIT(14) /* external utility overrides built-in one */
add a “\builtin” builtin, make it forward assignments, fix some bugs related to that: • while AT&T ksh may do it, POSIX says nothing about allowing declaration commands only without vars and redirections, and “without vars” especially seems against which commands they are • fix relationship between forwarders and real declaration commands • clean up c_builtin vs shcomexec mess Also, re-run “make repool” with a fixed src/scripts/stringpool.sh,v 1.3
2017-03-12 03:04:15 +01:00
#define DECL_UTIL BIT(15) /* is declaration utility */
#define DECL_FWDR BIT(16) /* is declaration utility forwarder */
invent builtin flags instead of special-casing cat and printf for prefer-external-over-builtin stuff
2016-07-25 01:10:04 +02:00
re-indent comments
2011-06-21 23:10:12 +02:00
/*
* Attributes that can be set by the user (used to decide if an unset
* param should be repoted by set/typeset). Does not include ARRAY or
* LOCAL.
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
*/
more KNF, mostly whitespace, this time more manual labour applying style(9)
2009-06-10 20:12:51 +02:00
#define USERATTRIB (EXPORT|INTEGER|RDONLY|LJUST|RJUST|ZEROFIL|\
LCASEV|UCASEV_AL|INT_U|INT_L)
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
merge the nameref code, using mksh standard scoping as discussed
2009-09-06 19:42:15 +02:00
#define arrayindex(vp) ((unsigned long)((vp)->flag & AINDEX ? \
(vp)->ua.index : 0))
fix LP#1277691 (“nameref RHS not syntax checked”) and the inability to use errorf() while nameref states were being changed (by almost completely eliminating the global variable) and the readonly first array variable bypass (typo/refactoro); also, whitespace, one int → bool, and add a comment wrt. the parser rewrite talked about with igli during a fever ;)
2014-05-27 15:22:46 +02:00
enum namerefflag {
make set_refflag an enum to get easier to understand code
2011-06-21 23:11:21 +02:00
SRF_NOP,
SRF_ENABLE,
SRF_DISABLE
fix LP#1277691 (“nameref RHS not syntax checked”) and the inability to use errorf() while nameref states were being changed (by almost completely eliminating the global variable) and the readonly first array variable bypass (typo/refactoro); also, whitespace, one int → bool, and add a comment wrt. the parser rewrite talked about with igli during a fever ;)
2014-05-27 15:22:46 +02:00
};
make set_refflag an enum to get easier to understand code
2011-06-21 23:11:21 +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
/* command types */
• 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
#define CNONE 0 /* undefined */
#define CSHELL 1 /* built-in */
#define CFUNC 2 /* function */
#define CEXEC 4 /* executable command */
#define CALIAS 5 /* alias */
#define CKEYWD 6 /* keyword */
#define CTALIAS 7 /* tracked alias */
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
/* Flags for findcom()/comexec() */
#define FC_SPECBI BIT(0) /* special builtin */
Oh well… this looks well, is done done, and gcc-snapshot doesn’t complain: • correct order of built-in commands; use POSIX special versus “all others” plus “keeps assignments” as distinction, no longer play POSIX regular vs. others game; sync manpage • fix LP#1156707: map (( internally to “let]” which is no valid function name and so can’t be overridden but is unlikely to be used otherwhere and not strictly permitted (by POSIX) anyway • we do not need -Wno-overflow any more, either • bump to R45
2013-04-26 23:22:50 +02:00
#define FC_FUNC BIT(1) /* function */
#define FC_NORMBI BIT(2) /* not special builtin */
#define FC_BI (FC_SPECBI | FC_NORMBI)
#define FC_PATH BIT(3) /* do path search */
#define FC_DEFPATH BIT(4) /* use default path in path search */
I didn’t like the code behind command -[Vv] and whence, so I rewrote it. Bugreport by Martijn Dekker <martijn@inlv.org> about POSIX non-compliance
2016-02-26 21:56:45 +01:00
#define FC_WHENCE BIT(5) /* for use by command and whence */
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 AF_ARGV_ALLOC 0x1 /* argv[] array allocated */
#define AF_ARGS_ALLOCED 0x2 /* argument strings allocated */
#define AI_ARGV(a, i) ((i) == 0 ? (a).argv[0] : (a).argv[(i) - (a).skip])
• 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
#define AI_ARGC(a) ((a).ai_argc - (a).skip)
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
* version.h doesn't need an RCS ID * compat.h does, add it to misc.c, always include it, move if NEED_COMPAT * major whitespace cleanup in sh.h
2006-08-23 00:16:04 +02:00
/* Argument info. Used for $#, $* for shell, functions, includes, etc. */
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 arg_info {
• 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
const char **argv;
try to do some optimum struct packing except for struct env (pointers, longs, size_t first; time_t next; int etc. then enum, bool)
2009-04-07 20:41:37 +02:00
int flags; /* AF_* */
• 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
int ai_argc;
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 skip; /* first arg is argv[0], second is argv[1 + skip] */
};
/*
* activation record for function blocks
*/
struct block {
* back out almost all of the memory allocator related changes, as aalloc was hard to type and hard to fix, galloc is also hard to fix, and some things I learned will probably improve things more but make me use the original form as base (especially for space savings) * let sizeofN die though, remove even more casts * optimise, polish * regen Makefiles * sprinkle a few /* CONSTCOND */ while here
2008-12-13 18:02:18 +01:00
Area area; /* area to allocate things */
merge the const branch +- a few
2007-03-04 01:13:17 +01:00
const char **argv;
* version.h doesn't need an RCS ID * compat.h does, add it to misc.c, always include it, move if NEED_COMPAT * major whitespace cleanup in sh.h
2006-08-23 00:16:04 +02:00
char *error; /* error handler */
char *exit; /* exit handler */
struct block *next; /* enclosing block */
try to do some optimum struct packing except for struct env (pointers, longs, size_t first; time_t next; int etc. then enum, bool)
2009-04-07 20:41:37 +02:00
struct table vars; /* local variables */
struct table funs; /* local functions */
Getopt getopts_state;
int argc;
int flags; /* see BF_* */
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
};
/* Values for struct block.flags */
#define BF_DOGETOPTS BIT(0) /* save/restore getopts state */
add getopts for exec (unbreaks “exec -- /bin/ls”) and steal -a and -c from ksh93
2015-02-06 11:56:49 +01:00
#define BF_STOPENV BIT(1) /* do not export further */
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 with OpenBSD: remove unused code and vars; name clash with libc compiles under MirBSD
2006-01-29 21:04:54 +01:00
* Used by ktwalk() and ktnext() routines.
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 tstate {
struct tbl **next;
this wants a size_t (but ssize_t is enough, since order(size_t) elements is pretty much impossible… I estimate at most a million, but not more than 16 million, array or keytab entries)
2009-08-28 20:59:01 +02:00
ssize_t left;
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
EXTERN struct table taliases; /* tracked aliases */
EXTERN struct table builtins; /* built-in commands */
EXTERN struct table aliases; /* aliases */
EXTERN struct table keywords; /* keywords */
improve MKSH_NOPWNAM handling, whether MKSH_SMALL or not; it will cause the entire ~fac/ expansion code to be omitted
2009-07-25 22:26:33 +02:00
#ifndef MKSH_NOPWNAM
• 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
EXTERN struct table homedirs; /* homedir() cache */
expand ~foo to getpwnam("foo")->dir only #if !defined(MKSH_SMALL) this makes it possible to build a (small) mksh on glibc systems statically
2007-01-11 01:32:31 +01: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
struct builtin {
* version.h doesn't need an RCS ID * compat.h does, add it to misc.c, always include it, move if NEED_COMPAT * major whitespace cleanup in sh.h
2006-08-23 00:16:04 +02:00
const char *name;
merge the const branch +- a few
2007-03-04 01:13:17 +01:00
int (*func)(const char **);
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
};
new builtin “rename” (this name sounds better than “mksh_mv_rescue” ☻) to just call rename(2) directly, e.g. if /bin/mv needs /lib/ld-uClibc.so.0 some assorted code cleanup
2007-08-20 00:06:27 +02:00
extern const struct builtin mkshbuiltins[];
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
/* values for set_prompt() */
save more whitespace and make it compile again (oops)
2006-08-23 00:21:20 +02:00
#define PS1 0 /* command */
#define PS2 1 /* command continuation */
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
EXTERN char *path; /* copy of either PATH or def_path */
EXTERN const char *def_path; /* path to use if PATH not set */
EXTERN char *tmpdir; /* TMPDIR value */
EXTERN const char *prompt;
ordinarily, lineno must be mksh_uari_t, but edit.c most of all isn’t ready, so we mitigate a bit (in var.c mostly) and tweak another type already, and add some checks (mksh_{,u}ari_t must fit into {,unsigned }long) and print line numbers with %lu already
2015-04-19 20:50:38 +02:00
EXTERN uint8_t cur_prompt; /* PS1 or PS2 */
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
EXTERN int current_lineno; /* LINENO value */
/*
* Description of a command or an operation on commands.
*/
struct op {
merge the const branch +- a few
2007-03-04 01:13:17 +01:00
const char **args; /* arguments to a command */
* version.h doesn't need an RCS ID * compat.h does, add it to misc.c, always include it, move if NEED_COMPAT * major whitespace cleanup in sh.h
2006-08-23 00:16:04 +02:00
char **vars; /* variable assignments */
struct ioword **ioact; /* IO actions (eg, < > >>) */
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 op *left, *right; /* descendents */
* version.h doesn't need an RCS ID * compat.h does, add it to misc.c, always include it, move if NEED_COMPAT * major whitespace cleanup in sh.h
2006-08-23 00:16:04 +02:00
char *str; /* word for case; identifier for for,
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
* select, and functions;
* path to execute for TEXEC;
* time hook for TCOM.
*/
* version.h doesn't need an RCS ID * compat.h does, add it to misc.c, always include it, move if NEED_COMPAT * major whitespace cleanup in sh.h
2006-08-23 00:16:04 +02:00
int lineno; /* TCOM/TFUNC: LINENO for this */
optimise (struct padding, function→macro, etc.)
2007-10-25 17:19:16 +02:00
short type; /* operation type, see below */
mksh R40 Release Candidate 1 Testsuite: • add new need-pass: {yes|no} attribute, default yes • exit with 1 if a need-pass test failed unexpectedly idea by Kacper Kornet <draenog@pld-linux.org> • mark utf8bom-2 as need-pass: no Infrstructure: • add housekeeping function for making a tty raw • switch functions with unused results to void • struct op: u.charflag contains last char of ;; in TPAT • var.c:arraysearch is now a global function Language: • add ;& (fall through) and ;| (examine next) delimiters in addition to ;; (end case) as zsh extensions, because POSIX standardised on ;& already • add -A (read into array), -N (read exactly n bytes), -n (read up to n bytes), -t (timeout) flags for read from ksh93 • allow read -N -1 or -n -1 to slurp the entire input • add -a (read into array the input characters) extension specific to mksh to read, idea by David Korn • add -e (exit with error if PWD was not set correctly after a physical cd) to cd builtin, mandated by next POSIX, and change error codes accordingly Rewrites: • full rewrite of read builtin and its manpage section • add regression tetss for most of the new functionality • duplicate hexdump demo tests for use of read -a • use read -raN-1 in dot.mkshrc to get NUL safe base64, DJB cdb hash and Jenkins one-at-a-time hash functions
2011-05-29 04:18:57 +02:00
/* WARNING: newtp(), tcopy() use evalflags = 0 to clear union */
• no longer use <stdbool.h> even if it’s available • ensure that bool/true/false are cpp macros, overriding any pre-defined • document the requirement that tobool(x) must map any-type 'x' into bool • document the requirement that a bool must only be true or false, and that it (tobool() rather) must have an identity mapping to 'short' • possibly fix ksh_func for/and fpFUNCTf – maybe spotted by cnuke@
2011-04-09 17:14:55 +02:00
union {
mksh R40 Release Candidate 1 Testsuite: • add new need-pass: {yes|no} attribute, default yes • exit with 1 if a need-pass test failed unexpectedly idea by Kacper Kornet <draenog@pld-linux.org> • mark utf8bom-2 as need-pass: no Infrstructure: • add housekeeping function for making a tty raw • switch functions with unused results to void • struct op: u.charflag contains last char of ;; in TPAT • var.c:arraysearch is now a global function Language: • add ;& (fall through) and ;| (examine next) delimiters in addition to ;; (end case) as zsh extensions, because POSIX standardised on ;& already • add -A (read into array), -N (read exactly n bytes), -n (read up to n bytes), -t (timeout) flags for read from ksh93 • allow read -N -1 or -n -1 to slurp the entire input • add -a (read into array the input characters) extension specific to mksh to read, idea by David Korn • add -e (exit with error if PWD was not set correctly after a physical cd) to cd builtin, mandated by next POSIX, and change error codes accordingly Rewrites: • full rewrite of read builtin and its manpage section • add regression tetss for most of the new functionality • duplicate hexdump demo tests for use of read -a • use read -raN-1 in dot.mkshrc to get NUL safe base64, DJB cdb hash and Jenkins one-at-a-time hash functions
2011-05-29 04:18:57 +02:00
/* TCOM: arg expansion eval() flags */
short evalflags;
/* TFUNC: function x (vs x()) */
short ksh_func;
/* TPAT: termination character */
char charflag;
optimise (struct padding, function→macro, etc.)
2007-10-25 17:19:16 +02:00
} 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
};
/* Tree.type values */
whitespace fixes
2006-11-16 14:35:00 +01:00
#define TEOF 0
#define TCOM 1 /* command */
#define TPAREN 2 /* (c-list) */
#define TPIPE 3 /* a | b */
#define TLIST 4 /* a ; b */
#define TOR 5 /* || */
#define TAND 6 /* && */
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 TBANG 7 /* ! */
#define TDBRACKET 8 /* [[ .. ]] */
whitespace fixes
2006-11-16 14:35:00 +01:00
#define TFOR 9
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 TSELECT 10
whitespace fixes
2006-11-16 14:35:00 +01:00
#define TCASE 11
#define TIF 12
#define TWHILE 13
#define TUNTIL 14
#define TELIF 15
#define TPAT 16 /* pattern in case */
#define TBRACE 17 /* {c-list} */
#define TASYNC 18 /* c & */
#define TFUNCT 19 /* function name { command; } */
#define TTIME 20 /* time pipeline */
#define TEXEC 21 /* fork/exec eval'd TCOM */
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 TCOPROC 22 /* coprocess |& */
/*
* prefix codes for words in command tree
*/
whitespace fixes
2006-11-16 14:35:00 +01:00
#define EOS 0 /* end of string */
#define CHAR 1 /* unquoted character */
#define QCHAR 2 /* quoted character */
#define COMSUB 3 /* $() substitution (0 terminated) */
• back out the EXPRSUB change • optimise some code • split testcase into two, one with expected-fail
2011-03-13 00:04:48 +01:00
#define EXPRSUB 4 /* $(()) substitution (0 terminated) */
whitespace fixes
2006-11-16 14:35:00 +01:00
#define OQUOTE 5 /* opening " or ' */
#define CQUOTE 6 /* closing " or ' */
#define OSUBST 7 /* opening ${ subst (followed by { or X) */
#define CSUBST 8 /* closing } of above (followed by } or X) */
save more whitespace and make it compile again (oops)
2006-08-23 00:21:20 +02:00
#define OPAT 9 /* open pattern: *(, @(, etc. */
#define SPAT 10 /* separate pattern: | */
#define CPAT 11 /* close pattern: ) */
make this pass varexpand-substr-1 and ‘c’ of varexpand-substr-2 by actually using the lexer and parser for that
2007-07-06 03:53:36 +02:00
#define ADELIM 12 /* arbitrary delimiter: ${foo:2:3} ${foo/bar/baz} */
bring back ${ foo;} sans dot.mkshrc patch, using a temporary file, and as experimental feature
2012-10-22 22:19:18 +02:00
#define FUNSUB 14 /* ${ foo;} substitution (NUL terminated) */
implement VALSUBs
2013-05-02 23:59:54 +02:00
#define VALSUB 15 /* ${|foo;} substitution (NUL terminated) */
fix reentrancy of 'typeset -f' output in the face of aliases; also, move alias handling for COMSUBs and friends to parse time by request of Martijn Dekker (and for consistency with function definitions)
2017-04-06 03:59:58 +02:00
#define COMASUB 16 /* `…` substitution (COMSUB but expand aliases) */
#define FUNASUB 17 /* function substitution but expand aliases */
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
/*
* IO redirection
*/
struct ioword {
tweak some iop/conservative_fds-related things I picked up while thinking lksh
2015-10-09 21:29:50 +02:00
char *ioname; /* filename (unused if heredoc) */
SECURITY: fix integer overflows related to file descriptor parsing bug initially found by Pawel Wylecial (LP#1440685) additional bug found and suggested fix by enh (elliott hughes) This commit also renames struct ioword.flag to ioflag to disambiguate it from other members named “flag”, changes it to an unsigned type, and packs ioflag and unit into shorts each, to make the struct smaller (aligned even: 16 bytes on 32-bit systems) and reviews some of the code involved in fd handling, though there wasn’t much to be found.
2015-04-12 00:03:32 +02:00
char *delim; /* delimiter for <<, <<- */
char *heredoc; /* content of heredoc */
unsigned short ioflag; /* action (below) */
short unit; /* unit (fd) affected */
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
};
/* ioword.flag - type of redirection */
• use a flag for determining here strings, don’t parse delimiter every time • don’t leak memory parsing possible I/O redirection tokens • get rid of volatile by using more const (also helps codegen, methinks) • support empty here document markers (mksh extension) • pimp the manpage
2011-05-05 02:05:01 +02:00
#define IOTYPE 0xF /* type: bits 0:3 */
#define IOREAD 0x1 /* < */
#define IOWRITE 0x2 /* > */
#define IORDWR 0x3 /* <>: todo */
#define IOHERE 0x4 /* << (here file) */
#define IOCAT 0x5 /* >> */
#define IODUP 0x6 /* <&/>& */
#define IOEVAL BIT(4) /* expand in << */
#define IOSKIP BIT(5) /* <<-, skip ^\t* */
#define IOCLOB BIT(6) /* >|, override -o noclobber */
#define IORDUP BIT(7) /* x<&y (as opposed to x>&y) */
#define IONAMEXP BIT(8) /* name has been expanded */
#define IOBASH BIT(9) /* &> etc. */
#define IOHERESTR BIT(10) /* <<< (here string) */
#define IONDELIM BIT(11) /* null delimiter (<<) */
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
/* execute/exchild flags */
whitespace fixes
2006-11-16 14:35:00 +01:00
#define XEXEC BIT(0) /* execute without forking */
#define XFORK BIT(1) /* fork before executing */
#define XBGND BIT(2) /* command & */
#define XPIPEI BIT(3) /* input is pipe */
#define XPIPEO BIT(4) /* output is pipe */
#define XXCOM BIT(5) /* `...` command */
#define XPCLOSE BIT(6) /* exchild: close close_fd in parent */
#define XCCLOSE BIT(7) /* exchild: close close_fd in child */
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 XERROK BIT(8) /* non-zero exit ok (for set -e) */
#define XCOPROC BIT(9) /* starting a co-process */
#define XTIME BIT(10) /* timing TCOM command */
• add -u option (POSIX: unbuffered ⇒ nop) to the built-in cat • PIPESTATUS now supported (like bash 2) whose last member may actually differ from $? since the latter may not be the result of a pipeline partial command • add regression tests, documentation, etc.
2011-02-18 23:26:13 +01:00
#define XPIPEST BIT(11) /* want PIPESTATUS */
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
/*
* flags to control expansion of words (assumed by t->evalflags to fit
* in a short)
*/
whitespace fixes
2006-11-16 14:35:00 +01:00
#define DOBLANK BIT(0) /* perform blank interpretation */
#define DOGLOB BIT(1) /* expand [?* */
#define DOPAT BIT(2) /* quote *?[ */
#define DOTILDE BIT(3) /* normal ~ expansion (first char) */
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 DONTRUNCOMMAND BIT(4) /* do not run $(command) things */
#define DOASNTILDE BIT(5) /* assignment ~ expansion (after =, :) */
• 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
#define DOBRACE BIT(6) /* used by expand(): do brace expansion */
#define DOMAGIC BIT(7) /* used by expand(): string contains MAGIC */
#define DOTEMP BIT(8) /* dito: in word part of ${..[%#=?]..} */
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 DOVACHECK BIT(9) /* var assign check (for typeset, set, etc) */
#define DOMARKDIRS BIT(10) /* force markdirs behaviour */
EXPERIMENTAL optimisation for “sh -c 'foo'” to equal “sh -c 'exit foo'” iff several conditions are met as outlined below; for more background, refer to http://www.FreeBSD.org/cgi/query-pr.cgi?pr=113860 We don’t yet optimise 「% sh -c '{ echo a; sleep 10;}&'; sleep 1; ps T」 so the FreeBSD® sh approach cannot work for us, but scanning the “sh -c” argu‐ ment for disallowed characters and, if not, setting a flag that enables the shell to exec the tree when parsed as TCOM *and not c_trap()* was possible. Disallowed characters are currently C_QUOTE except space, that is: Tab Newline " # $ & ' ( ) * ; < = > ? [ \ ] ` | This should catch all cases of magic, variables, subshells, pipelines, etc.
2012-10-21 23:26:41 +02:00
#define DOTCOMEXEC BIT(11) /* not an eval flag, used by sh -c hack */
first cut at LP#1381993 (probably incomplete) plus test coverage also remove fbsd testsuite link, it’s gone during cvs→svn of theirs ☹
2014-10-19 23:53:08 +02:00
#define DOSCALAR BIT(12) /* change field handling to non-list context */
• fixup here document expansion (regression wrt. pdksh 5.2.14) • adjust testsuite (and write tons of new tests) after today’s commits
2015-02-19 23:26:50 +01:00
#define DOHEREDOC BIT(13) /* change scalar handling to heredoc body */
replace the code related to << changes and <<< with cleaner code, fixing a few bugs also (including new testcases, except x=<< issue)
2015-09-06 21:47:01 +02:00
#define DOHERESTR BIT(14) /* append a newline char */
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
New functionality: assign here document to string variable directly, without cat and temp files. Hacked in Lëtzebuerg ☺ This was the third try. Where to put this was not palpable… same for =(…)
2011-01-09 22:57:29 +01:00
#define X_EXTRA 20 /* this many extra bytes in X string */
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
typedef struct XString {
fix English (thanks to Andreas Buschka); TIL: • to start ⇒ a start • to begin ⇒ a beginning
2016-09-01 14:59:12 +02:00
/* beginning of string */
fixup a bad OpenBSD reaction on a bug afl showed: set source to NULL only if the memory backing source is actually reclaimed; fixes segfault due to NULL(+24) pointer dereference reported by Score_Under (simplified testcase added; thanks!)
2016-08-04 22:51:35 +02:00
char *beg;
/* length of allocated area, minus safety margin */
size_t len;
/* end of string */
char *end;
/* memory area used */
Area *areap;
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
} XString;
* revert some of the const-warning cleanup which must be done with different means (reads, tricky magical kludgery) YES, THIS BREAKS -rHEAD, I KNOW. * while here, fix spelling
2007-01-12 11:18:22 +01:00
/* initialise expandable string */
• fix one more of the enum arithmetics complaints • split Xinit into XinitN and Xinit macro, the former not initialising the “xp” argument of the latter, and use this to get rid of two variables that are only assigned but never referenced (gcc doesn’t see this, but MIPSpro and IIRC SUNWcc do) • re-indent while here • bump patchlevel
2008-03-28 14:46:53 +01:00
#define XinitN(xs, length, area) do { \
(xs).len = (length); \
(xs).areap = (area); \
* back out almost all of the memory allocator related changes, as aalloc was hard to type and hard to fix, galloc is also hard to fix, and some things I learned will probably improve things more but make me use the original form as base (especially for space savings) * let sizeofN die though, remove even more casts * optimise, polish * regen Makefiles * sprinkle a few /* CONSTCOND */ while here
2008-12-13 18:02:18 +01:00
(xs).beg = alloc((xs).len + X_EXTRA, (xs).areap); \
• fix one more of the enum arithmetics complaints • split Xinit into XinitN and Xinit macro, the former not initialising the “xp” argument of the latter, and use this to get rid of two variables that are only assigned but never referenced (gcc doesn’t see this, but MIPSpro and IIRC SUNWcc do) • re-indent while here • bump patchlevel
2008-03-28 14:46:53 +01:00
(xs).end = (xs).beg + (xs).len; \
* back out almost all of the memory allocator related changes, as aalloc was hard to type and hard to fix, galloc is also hard to fix, and some things I learned will probably improve things more but make me use the original form as base (especially for space savings) * let sizeofN die though, remove even more casts * optimise, polish * regen Makefiles * sprinkle a few /* CONSTCOND */ while here
2008-12-13 18:02:18 +01:00
} while (/* CONSTCOND */ 0)
• fix one more of the enum arithmetics complaints • split Xinit into XinitN and Xinit macro, the former not initialising the “xp” argument of the latter, and use this to get rid of two variables that are only assigned but never referenced (gcc doesn’t see this, but MIPSpro and IIRC SUNWcc do) • re-indent while here • bump patchlevel
2008-03-28 14:46:53 +01:00
#define Xinit(xs, xp, length, area) do { \
XinitN((xs), (length), (area)); \
(xp) = (xs).beg; \
* back out almost all of the memory allocator related changes, as aalloc was hard to type and hard to fix, galloc is also hard to fix, and some things I learned will probably improve things more but make me use the original form as base (especially for space savings) * let sizeofN die though, remove even more casts * optimise, polish * regen Makefiles * sprinkle a few /* CONSTCOND */ while here
2008-12-13 18:02:18 +01:00
} while (/* CONSTCOND */ 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
/* stuff char into string */
whitespace fixes
2006-11-16 14:35:00 +01:00
#define Xput(xs, xp, c) (*xp++ = (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
/* check if there are at least n bytes left */
• fix one more of the enum arithmetics complaints • split Xinit into XinitN and Xinit macro, the former not initialising the “xp” argument of the latter, and use this to get rid of two variables that are only assigned but never referenced (gcc doesn’t see this, but MIPSpro and IIRC SUNWcc do) • re-indent while here • bump patchlevel
2008-03-28 14:46:53 +01:00
#define XcheckN(xs, xp, n) do { \
patch most of Jerker Bäck’s concerns out, unless not applicable
2011-08-27 20:06:52 +02:00
ssize_t more = ((xp) + (n)) - (xs).end; \
• fix one more of the enum arithmetics complaints • split Xinit into XinitN and Xinit macro, the former not initialising the “xp” argument of the latter, and use this to get rid of two variables that are only assigned but never referenced (gcc doesn’t see this, but MIPSpro and IIRC SUNWcc do) • re-indent while here • bump patchlevel
2008-03-28 14:46:53 +01:00
if (more > 0) \
• 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
(xp) = Xcheck_grow(&(xs), (xp), (size_t)more); \
* back out almost all of the memory allocator related changes, as aalloc was hard to type and hard to fix, galloc is also hard to fix, and some things I learned will probably improve things more but make me use the original form as base (especially for space savings) * let sizeofN die though, remove even more casts * optimise, polish * regen Makefiles * sprinkle a few /* CONSTCOND */ while here
2008-12-13 18:02:18 +01:00
} while (/* CONSTCOND */ 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
/* check for overflow, expand string */
• fix one more of the enum arithmetics complaints • split Xinit into XinitN and Xinit macro, the former not initialising the “xp” argument of the latter, and use this to get rid of two variables that are only assigned but never referenced (gcc doesn’t see this, but MIPSpro and IIRC SUNWcc do) • re-indent while here • bump patchlevel
2008-03-28 14:46:53 +01:00
#define Xcheck(xs, xp) XcheckN((xs), (xp), 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
/* free string */
switch to a (nmemb,size) API from a (nmemb*size) API cost: text += (308, 256, 4, -100)
2008-11-12 01:54:52 +01:00
#define Xfree(xs, xp) afree((xs).beg, (xs).areap)
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
/* close, return string */
* back out almost all of the memory allocator related changes, as aalloc was hard to type and hard to fix, galloc is also hard to fix, and some things I learned will probably improve things more but make me use the original form as base (especially for space savings) * let sizeofN die though, remove even more casts * optimise, polish * regen Makefiles * sprinkle a few /* CONSTCOND */ while here
2008-12-13 18:02:18 +01:00
#define Xclose(xs, xp) aresize((xs).beg, (xp) - (xs).beg, (xs).areap)
fix English (thanks to Andreas Buschka); TIL: • to start ⇒ a start • to begin ⇒ a beginning
2016-09-01 14:59:12 +02:00
/* beginning of string */
whitespace fixes
2006-11-16 14:35:00 +01:00
#define Xstring(xs, xp) ((xs).beg)
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
* back out almost all of the memory allocator related changes, as aalloc was hard to type and hard to fix, galloc is also hard to fix, and some things I learned will probably improve things more but make me use the original form as base (especially for space savings) * let sizeofN die though, remove even more casts * optimise, polish * regen Makefiles * sprinkle a few /* CONSTCOND */ while here
2008-12-13 18:02:18 +01:00
#define Xnleft(xs, xp) ((xs).end - (xp)) /* may be less than 0 */
#define Xlength(xs, xp) ((xp) - (xs).beg)
#define Xsize(xs, xp) ((xs).end - (xs).beg)
#define Xsavepos(xs, xp) ((xp) - (xs).beg)
#define Xrestpos(xs, xp, n) ((xs).beg + (n))
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
also Xcheck_grow_ may not end with an underscore
2011-10-26 00:25:07 +02:00
char *Xcheck_grow(XString *, const char *, size_t);
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
/*
* expandable vector of generic pointers
*/
rewrite XPtrV to use size_t instead of pointer arithmetic, for gcc-snapshot (20120930-1) -fstrict-overflow -Wstrict-overflow=9
2012-10-03 17:50:32 +02:00
typedef struct {
fix English (thanks to Andreas Buschka); TIL: • to start ⇒ a start • to begin ⇒ a beginning
2016-09-01 14:59:12 +02:00
/* beginning of allocated area */
rewrite XPtrV to use size_t instead of pointer arithmetic, for gcc-snapshot (20120930-1) -fstrict-overflow -Wstrict-overflow=9
2012-10-03 17:50:32 +02:00
void **beg;
/* currently used number of entries */
size_t len;
/* allocated number of entries */
size_t siz;
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
} XPtrV;
rewrite XPtrV to use size_t instead of pointer arithmetic, for gcc-snapshot (20120930-1) -fstrict-overflow -Wstrict-overflow=9
2012-10-03 17:50:32 +02:00
#define XPinit(x, n) do { \
(x).siz = (n); \
(x).len = 0; \
(x).beg = alloc2((x).siz, sizeof(void *), ATEMP); \
} while (/* CONSTCOND */ 0) \
#define XPput(x, p) do { \
if ((x).len == (x).siz) { \
(x).beg = aresize2((x).beg, (x).siz, \
2 * sizeof(void *), ATEMP); \
(x).siz <<= 1; \
• fix one more of the enum arithmetics complaints • split Xinit into XinitN and Xinit macro, the former not initialising the “xp” argument of the latter, and use this to get rid of two variables that are only assigned but never referenced (gcc doesn’t see this, but MIPSpro and IIRC SUNWcc do) • re-indent while here • bump patchlevel
2008-03-28 14:46:53 +01:00
} \
rewrite XPtrV to use size_t instead of pointer arithmetic, for gcc-snapshot (20120930-1) -fstrict-overflow -Wstrict-overflow=9
2012-10-03 17:50:32 +02:00
(x).beg[(x).len++] = (p); \
* back out almost all of the memory allocator related changes, as aalloc was hard to type and hard to fix, galloc is also hard to fix, and some things I learned will probably improve things more but make me use the original form as base (especially for space savings) * let sizeofN die though, remove even more casts * optimise, polish * regen Makefiles * sprinkle a few /* CONSTCOND */ while here
2008-12-13 18:02:18 +01:00
} while (/* CONSTCOND */ 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
whitespace fixes
2006-11-16 14:35:00 +01:00
#define XPptrv(x) ((x).beg)
rewrite XPtrV to use size_t instead of pointer arithmetic, for gcc-snapshot (20120930-1) -fstrict-overflow -Wstrict-overflow=9
2012-10-03 17:50:32 +02:00
#define XPsize(x) ((x).len)
• Address concerns of Chris Palmer from the Android security team – possible integer overflows in memory allocation, mostly ‣ multiplication: all are checked now ‣ addition: reviewed them, most were “proven” or guessed to be “almost” impossible to run over (e.g. when we have a string whose length is taken it is assumed that the length will be more than only a few bytes below SIZE_MAX, since code and stack have to fit); some are checked now (e.g. when one of the summands is an off_t); most of the unchecked ones are annotated now ⇒ cost (MirBSD/i386 static): +76 .text ⇒ cost (Debian sid/i386): +779 .text -4 .data – on Linux targets, setuid() setresuid() setresgid() can fail with EAGAIN; check for that and, if so, warn once and retry infinitely (other targets to be added later once we know that they are “insane”) ⇒ cost (Debian sid/i386): +192 .text (includes .rodata) • setmode.c: Do overflow checking for realloc() too; switch back from calloc() to a checked malloc() for simplification while there • define -DIN_MKSH and let setmode.c look a tad nicer while here
2010-09-14 23:26:19 +02:00
#define XPclose(x) aresize2((x).beg, XPsize(x), sizeof(void *), ATEMP)
switch to a (nmemb,size) API from a (nmemb*size) API cost: text += (308, 256, 4, -100)
2008-11-12 01:54:52 +01:00
#define XPfree(x) afree((x).beg, 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
collective R54 release preparation multi-merger: install both lksh and mksh manpages from Build.sh (Martijn Dekker) spelling fixes (Larry Hynes) manpage improvements (Martijn Dekker) initial port to Harvey-OS’ APEX (Ronald G. Minnich, Elbing Miss, Álvaro Jurado) more from komh’s OS/2 port (KO Myung-Hun)
2016-11-12 00:31:39 +01:00
/* for print_columns */
struct columnise_opts {
struct shf *shf;
char linesep;
bool do_last;
bool prefcol;
};
rewrite XPtrV to use size_t instead of pointer arithmetic, for gcc-snapshot (20120930-1) -fstrict-overflow -Wstrict-overflow=9
2012-10-03 17:50:32 +02:00
/*
* Lexer internals
*/
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
typedef struct source Source;
struct source {
fixup a bad OpenBSD reaction on a bug afl showed: set source to NULL only if the memory backing source is actually reclaimed; fixes segfault due to NULL(+24) pointer dereference reported by Score_Under (simplified testcase added; thanks!)
2016-08-04 22:51:35 +02:00
/* input buffer */
XString xs;
/* memory area, also checked in reclaim() */
Area *areap;
/* stacked source */
Source *next;
/* input pointer */
const char *str;
/* start of current buffer */
const char *start;
/* input file name */
const char *file;
/* extra data */
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
union {
fixup a bad OpenBSD reaction on a bug afl showed: set source to NULL only if the memory backing source is actually reclaimed; fixes segfault due to NULL(+24) pointer dereference reported by Score_Under (simplified testcase added; thanks!)
2016-08-04 22:51:35 +02:00
/* string[] */
const char **strv;
/* shell file */
struct shf *shf;
/* alias (SF_HASALIAS) */
struct tbl *tblp;
/* (also for SREREAD) */
char *freeme;
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
} u;
fixup a bad OpenBSD reaction on a bug afl showed: set source to NULL only if the memory backing source is actually reclaimed; fixes segfault due to NULL(+24) pointer dereference reported by Score_Under (simplified testcase added; thanks!)
2016-08-04 22:51:35 +02:00
/* flags */
int flags;
/* input type */
int type;
/* line number */
int line;
/* line the error occurred on (0 if not set) */
int errline;
/* buffer for ungetsc() (SREREAD) and alias (SALIAS) */
char ugbuf[2];
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
};
/* Source.type values */
whitespace fixes
2006-11-16 14:35:00 +01:00
#define SEOF 0 /* input EOF */
#define SFILE 1 /* file input */
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 SSTDIN 2 /* read stdin */
whitespace fixes
2006-11-16 14:35:00 +01:00
#define SSTRING 3 /* string */
#define SWSTR 4 /* string without \n */
#define SWORDS 5 /* string[] */
#define SWORDSEP 6 /* string[] separator */
#define SALIAS 7 /* alias expansion */
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 SREREAD 8 /* read ahead to be re-scanned */
hackish work-around the lexer to make alias definitions in mksh -c work (Closes: #517009) and mention in the manpage why they sometimes do not work (doing so for COMSUBs is not worth the effort)
2012-06-28 22:05:11 +02:00
#define SSTRINGCMDLINE 9 /* string from "mksh -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
/* Source.flags values */
#define SF_ECHO BIT(0) /* echo input to shlout */
#define SF_ALIAS BIT(1) /* faking space at end of alias */
#define SF_ALIASEND BIT(2) /* faking space at end of alias */
#define SF_TTY BIT(3) /* type == SSTDIN & it is a tty */
• speed optimisation: drop SF_FIRST flag, factor out skipping the UTF-8 BOM instead (UTFMODE has a separate value now for activated during BOM skipping) • parsing a COMSUB now skips UTF-8 BOM, too, but only temporarily
2011-03-13 17:03:54 +01:00
#define SF_HASALIAS BIT(4) /* u.tblp valid (SALIAS, SEOF) */
EXPERIMENTAL optimisation for “sh -c 'foo'” to equal “sh -c 'exit foo'” iff several conditions are met as outlined below; for more background, refer to http://www.FreeBSD.org/cgi/query-pr.cgi?pr=113860 We don’t yet optimise 「% sh -c '{ echo a; sleep 10;}&'; sleep 1; ps T」 so the FreeBSD® sh approach cannot work for us, but scanning the “sh -c” argu‐ ment for disallowed characters and, if not, setting a flag that enables the shell to exec the tree when parsed as TCOM *and not c_trap()* was possible. Disallowed characters are currently C_QUOTE except space, that is: Tab Newline " # $ & ' ( ) * ; < = > ? [ \ ] ` | This should catch all cases of magic, variables, subshells, pipelines, etc.
2012-10-21 23:26:41 +02:00
#define SF_MAYEXEC BIT(5) /* special sh -c optimisation hack */
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
typedef union {
* version.h doesn't need an RCS ID * compat.h does, add it to misc.c, always include it, move if NEED_COMPAT * major whitespace cleanup in sh.h
2006-08-23 00:16:04 +02:00
int i;
char *cp;
char **wp;
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 op *o;
struct ioword *iop;
} YYSTYPE;
/* If something is added here, add it to tokentab[] in syn.c as well */
whitespace fixes
2006-11-16 14:35:00 +01:00
#define LWORD 256
#define LOGAND 257 /* && */
#define LOGOR 258 /* || */
#define BREAK 259 /* ;; */
#define IF 260
#define THEN 261
#define ELSE 262
#define ELIF 263
#define FI 264
#define CASE 265
#define ESAC 266
#define FOR 267
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 SELECT 268
whitespace fixes
2006-11-16 14:35:00 +01:00
#define WHILE 269
#define UNTIL 270
#define DO 271
#define DONE 272
#define IN 273
#define FUNCTION 274
#define TIME 275
#define REDIR 276
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 MDPAREN 277 /* (( )) */
#define BANG 278 /* ! */
#define DBRACKET 279 /* [[ .. ]] */
#define COPROC 280 /* |& */
mksh R40 Release Candidate 1 Testsuite: • add new need-pass: {yes|no} attribute, default yes • exit with 1 if a need-pass test failed unexpectedly idea by Kacper Kornet <draenog@pld-linux.org> • mark utf8bom-2 as need-pass: no Infrstructure: • add housekeeping function for making a tty raw • switch functions with unused results to void • struct op: u.charflag contains last char of ;; in TPAT • var.c:arraysearch is now a global function Language: • add ;& (fall through) and ;| (examine next) delimiters in addition to ;; (end case) as zsh extensions, because POSIX standardised on ;& already • add -A (read into array), -N (read exactly n bytes), -n (read up to n bytes), -t (timeout) flags for read from ksh93 • allow read -N -1 or -n -1 to slurp the entire input • add -a (read into array the input characters) extension specific to mksh to read, idea by David Korn • add -e (exit with error if PWD was not set correctly after a physical cd) to cd builtin, mandated by next POSIX, and change error codes accordingly Rewrites: • full rewrite of read builtin and its manpage section • add regression tetss for most of the new functionality • duplicate hexdump demo tests for use of read -a • use read -raN-1 in dot.mkshrc to get NUL safe base64, DJB cdb hash and Jenkins one-at-a-time hash functions
2011-05-29 04:18:57 +02:00
#define BRKEV 281 /* ;| */
#define BRKFT 282 /* ;& */
whitespace fixes
2006-11-16 14:35:00 +01:00
#define YYERRCODE 300
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
/* flags to yylex */
whitespace fixes
2006-11-16 14:35:00 +01:00
#define CONTIN BIT(0) /* skip new lines to complete command */
#define ONEWORD BIT(1) /* single word for substitute() */
* revert some of the const-warning cleanup which must be done with different means (reads, tricky magical kludgery) YES, THIS BREAKS -rHEAD, I KNOW. * while here, fix spelling
2007-01-12 11:18:22 +01:00
#define ALIAS BIT(2) /* recognise alias */
#define KEYWORD BIT(3) /* recognise keywords */
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 LETEXPR BIT(4) /* get expression inside (( )) */
align with future POSIX on http://austingroupbugs.net/view.php?id=351 with accepted interpretation (*sigh*); merge VARASN|ARRAYVAR→CMDASN
2016-01-20 00:12:15 +01:00
#define CMDASN BIT(5) /* parse x[1 & 2] as one word, for typeset */
#define HEREDOC BIT(6) /* parsing a here document body */
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 ESACONLY BIT(7) /* only accept esac keyword */
revert most of commitid 3ec342c92b3a8874 and fixup the rest; this should bring us closer to POSIX again
2015-10-09 19:48:53 +02:00
#define CMDWORD BIT(8) /* parsing simple command (alias related) */
#define HEREDELIM BIT(9) /* parsing <<,<<- delimiter */
#define LQCHAR BIT(10) /* source string contains QCHAR */
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
better parsing for x=(…) – bug noted by Frank Terbeck
2011-06-04 18:11:20 +02:00
#define HERES 10 /* max number of << in line */
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
control character madness, but more compiler-friendly
2017-04-28 05:28:19 +02:00
#ifdef MKSH_EBCDIC
sprinkle tons more ord() around this is really not funny… mksh-ng will use even more “unsigned only”
2017-05-06 00:53:32 +02:00
#define CTRL_AT (0x00U)
#define CTRL_A (0x01U)
#define CTRL_B (0x02U)
#define CTRL_C (0x03U)
#define CTRL_D (0x37U)
#define CTRL_E (0x2DU)
#define CTRL_F (0x2EU)
#define CTRL_G (0x2FU)
#define CTRL_H (0x16U)
#define CTRL_I (0x05U)
#define CTRL_J (0x15U)
#define CTRL_K (0x0BU)
#define CTRL_L (0x0CU)
#define CTRL_M (0x0DU)
#define CTRL_N (0x0EU)
#define CTRL_O (0x0FU)
#define CTRL_P (0x10U)
#define CTRL_Q (0x11U)
#define CTRL_R (0x12U)
#define CTRL_S (0x13U)
#define CTRL_T (0x3CU)
#define CTRL_U (0x3DU)
#define CTRL_V (0x32U)
#define CTRL_W (0x26U)
#define CTRL_X (0x18U)
#define CTRL_Y (0x19U)
#define CTRL_Z (0x3FU)
#define CTRL_BO (0x27U)
#define CTRL_BK (0x1CU)
#define CTRL_BC (0x1DU)
#define CTRL_CA (0x1EU)
#define CTRL_US (0x1FU)
#define CTRL_QM (0x07U)
control character madness, but more compiler-friendly
2017-04-28 05:28:19 +02:00
#else
sprinkle tons more ord() around this is really not funny… mksh-ng will use even more “unsigned only”
2017-05-06 00:53:32 +02:00
#define CTRL_AT (0x00U)
#define CTRL_A (0x01U)
#define CTRL_B (0x02U)
#define CTRL_C (0x03U)
#define CTRL_D (0x04U)
#define CTRL_E (0x05U)
#define CTRL_F (0x06U)
#define CTRL_G (0x07U)
#define CTRL_H (0x08U)
#define CTRL_I (0x09U)
#define CTRL_J (0x0AU)
#define CTRL_K (0x0BU)
#define CTRL_L (0x0CU)
#define CTRL_M (0x0DU)
#define CTRL_N (0x0EU)
#define CTRL_O (0x0FU)
#define CTRL_P (0x10U)
#define CTRL_Q (0x11U)
#define CTRL_R (0x12U)
#define CTRL_S (0x13U)
#define CTRL_T (0x14U)
#define CTRL_U (0x15U)
#define CTRL_V (0x16U)
#define CTRL_W (0x17U)
#define CTRL_X (0x18U)
#define CTRL_Y (0x19U)
#define CTRL_Z (0x1AU)
#define CTRL_BO (0x1BU)
#define CTRL_BK (0x1CU)
#define CTRL_BC (0x1DU)
#define CTRL_CA (0x1EU)
#define CTRL_US (0x1FU)
#define CTRL_QM (0x7FU)
#endif
#define IDENT 64
rewrite XPtrV to use size_t instead of pointer arithmetic, for gcc-snapshot (20120930-1) -fstrict-overflow -Wstrict-overflow=9
2012-10-03 17:50:32 +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
EXTERN Source *source; /* yyparse/yylex source */
patch most of Jerker Bäck’s concerns out, unless not applicable
2011-08-27 20:06:52 +02:00
EXTERN YYSTYPE yylval; /* result from yylex */
EXTERN struct ioword *heres[HERES], **herep;
rewrite XPtrV to use size_t instead of pointer arithmetic, for gcc-snapshot (20120930-1) -fstrict-overflow -Wstrict-overflow=9
2012-10-03 17:50:32 +02:00
EXTERN char ident[IDENT + 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
put a bit of type safety into the history code
2011-12-30 22:00:32 +01:00
EXTERN char **history; /* saved commands */
EXTERN char **histptr; /* last history item */
EXTERN mksh_ari_t histsize; /* history size */
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 completely new multiline code by delaying history store this commit is valgrind-tested
2015-07-05 21:37:18 +02:00
/* flags to histsave */
#define HIST_FLUSH 0
#define HIST_QUEUE 1
#define HIST_APPEND 2
#define HIST_STORE 3
#define HIST_NOTE 4
some gcc 4.1.2pre warning shutup
2007-03-10 19:16:28 +01:00
/* user and system time of last j_waitjed job */
EXTERN struct timeval j_usrtime, j_systime;
rewrite some code to avoid gcc 4.8 complaining
2012-10-03 18:16:15 +02:00
#define notok2mul(max, val, c) (((val) != 0) && ((c) != 0) && \
(((max) / (c)) < (val)))
#define notok2add(max, val, c) ((val) > ((max) - (c)))
#define notoktomul(val, cnst) notok2mul(SIZE_MAX, (val), (cnst))
#define notoktoadd(val, cnst) notok2add(SIZE_MAX, (val), (cnst))
• Address concerns of Chris Palmer from the Android security team – possible integer overflows in memory allocation, mostly ‣ multiplication: all are checked now ‣ addition: reviewed them, most were “proven” or guessed to be “almost” impossible to run over (e.g. when we have a string whose length is taken it is assumed that the length will be more than only a few bytes below SIZE_MAX, since code and stack have to fit); some are checked now (e.g. when one of the summands is an off_t); most of the unchecked ones are annotated now ⇒ cost (MirBSD/i386 static): +76 .text ⇒ cost (Debian sid/i386): +779 .text -4 .data – on Linux targets, setuid() setresuid() setresgid() can fail with EAGAIN; check for that and, if so, warn once and retry infinitely (other targets to be added later once we know that they are “insane”) ⇒ cost (Debian sid/i386): +192 .text (includes .rodata) • setmode.c: Do overflow checking for realloc() too; switch back from calloc() to a checked malloc() for simplification while there • define -DIN_MKSH and let setmode.c look a tad nicer while here
2010-09-14 23:26:19 +02:00
#define checkoktoadd(val, cnst) do { \
if (notoktoadd((val), (cnst))) \
• 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
internal_errorf(Tintovfl, (size_t)(val), \
patch most of Jerker Bäck’s concerns out, unless not applicable
2011-08-27 20:06:52 +02:00
'+', (size_t)(cnst)); \
• Address concerns of Chris Palmer from the Android security team – possible integer overflows in memory allocation, mostly ‣ multiplication: all are checked now ‣ addition: reviewed them, most were “proven” or guessed to be “almost” impossible to run over (e.g. when we have a string whose length is taken it is assumed that the length will be more than only a few bytes below SIZE_MAX, since code and stack have to fit); some are checked now (e.g. when one of the summands is an off_t); most of the unchecked ones are annotated now ⇒ cost (MirBSD/i386 static): +76 .text ⇒ cost (Debian sid/i386): +779 .text -4 .data – on Linux targets, setuid() setresuid() setresgid() can fail with EAGAIN; check for that and, if so, warn once and retry infinitely (other targets to be added later once we know that they are “insane”) ⇒ cost (Debian sid/i386): +192 .text (includes .rodata) • setmode.c: Do overflow checking for realloc() too; switch back from calloc() to a checked malloc() for simplification while there • define -DIN_MKSH and let setmode.c look a tad nicer while here
2010-09-14 23:26:19 +02:00
} while (/* CONSTCOND */ 0)
replace uses of OAAT hash in all its variants by NZAT (mksh internal) or NZAAT (all others)
2011-07-07 00:22:02 +02:00
remove espie's double-linked-list based allocator and write a similarily simple one from scratch, which however performs better than espie's with AFREE_DEBUG enabled which took away the benefit of the double-linked-list approach all of (core) mksh is now MirOS licenced
2009-03-22 17:55:38 +01:00
/* lalloc.c */
void ainit(Area *);
* back out almost all of the memory allocator related changes, as aalloc was hard to type and hard to fix, galloc is also hard to fix, and some things I learned will probably improve things more but make me use the original form as base (especially for space savings) * let sizeofN die though, remove even more casts * optimise, polish * regen Makefiles * sprinkle a few /* CONSTCOND */ while here
2008-12-13 18:02:18 +01:00
void afreeall(Area *);
remove espie's double-linked-list based allocator and write a similarily simple one from scratch, which however performs better than espie's with AFREE_DEBUG enabled which took away the benefit of the double-linked-list approach all of (core) mksh is now MirOS licenced
2009-03-22 17:55:38 +01:00
/* these cannot fail and can take NULL (not for ap) */
• Address concerns of Chris Palmer from the Android security team – possible integer overflows in memory allocation, mostly ‣ multiplication: all are checked now ‣ addition: reviewed them, most were “proven” or guessed to be “almost” impossible to run over (e.g. when we have a string whose length is taken it is assumed that the length will be more than only a few bytes below SIZE_MAX, since code and stack have to fit); some are checked now (e.g. when one of the summands is an off_t); most of the unchecked ones are annotated now ⇒ cost (MirBSD/i386 static): +76 .text ⇒ cost (Debian sid/i386): +779 .text -4 .data – on Linux targets, setuid() setresuid() setresgid() can fail with EAGAIN; check for that and, if so, warn once and retry infinitely (other targets to be added later once we know that they are “insane”) ⇒ cost (Debian sid/i386): +192 .text (includes .rodata) • setmode.c: Do overflow checking for realloc() too; switch back from calloc() to a checked malloc() for simplification while there • define -DIN_MKSH and let setmode.c look a tad nicer while here
2010-09-14 23:26:19 +02:00
#define alloc(n, ap) aresize(NULL, (n), (ap))
#define alloc2(m, n, ap) aresize2(NULL, (m), (n), (ap))
* back out almost all of the memory allocator related changes, as aalloc was hard to type and hard to fix, galloc is also hard to fix, and some things I learned will probably improve things more but make me use the original form as base (especially for space savings) * let sizeofN die though, remove even more casts * optimise, polish * regen Makefiles * sprinkle a few /* CONSTCOND */ while here
2008-12-13 18:02:18 +01:00
void *aresize(void *, size_t, Area *);
• Address concerns of Chris Palmer from the Android security team – possible integer overflows in memory allocation, mostly ‣ multiplication: all are checked now ‣ addition: reviewed them, most were “proven” or guessed to be “almost” impossible to run over (e.g. when we have a string whose length is taken it is assumed that the length will be more than only a few bytes below SIZE_MAX, since code and stack have to fit); some are checked now (e.g. when one of the summands is an off_t); most of the unchecked ones are annotated now ⇒ cost (MirBSD/i386 static): +76 .text ⇒ cost (Debian sid/i386): +779 .text -4 .data – on Linux targets, setuid() setresuid() setresgid() can fail with EAGAIN; check for that and, if so, warn once and retry infinitely (other targets to be added later once we know that they are “insane”) ⇒ cost (Debian sid/i386): +192 .text (includes .rodata) • setmode.c: Do overflow checking for realloc() too; switch back from calloc() to a checked malloc() for simplification while there • define -DIN_MKSH and let setmode.c look a tad nicer while here
2010-09-14 23:26:19 +02:00
void *aresize2(void *, size_t, size_t, Area *);
* back out almost all of the memory allocator related changes, as aalloc was hard to type and hard to fix, galloc is also hard to fix, and some things I learned will probably improve things more but make me use the original form as base (especially for space savings) * let sizeofN die though, remove even more casts * optimise, polish * regen Makefiles * sprinkle a few /* CONSTCOND */ while here
2008-12-13 18:02:18 +01:00
void afree(void *, Area *); /* can take NULL */
follow OpenBSD and add mknod as mksh builtin (mknod <file> p acts as mkfifo) but write a good chunk of that code myself (better structured, better error handling, more gotos, less function calls, int -> bool) passes all tests on mirbsd; this will become mksh R25 once tested on other supported OSes
2005-10-21 14:41:56 +02:00
/* edit.c */
new MKSH_NO_CMDLINE_EDITING to disable command line editing in its entirety mainly for the Plan 9 port though it may also help the WinAPI variant, other porting efforts, as well as a new project I cannot say yet
2012-05-04 22:49:08 +02:00
#ifndef MKSH_NO_CMDLINE_EDITING
x_bind cannot have the nonnull attribute cought by Frank “enstein” Terbeck «ft:#grml» (efftee), 10x
2010-02-23 19:13:04 +01:00
#ifndef MKSH_SMALL
int x_bind(const char *, const char *, bool, bool);
#else
int x_bind(const char *, const char *, bool);
#endif
* version.h doesn't need an RCS ID * compat.h does, add it to misc.c, always include it, move if NEED_COMPAT * major whitespace cleanup in sh.h
2006-08-23 00:16:04 +02:00
void x_init(void);
call it DEBUG_LEAKS so Android can always enable it
2013-02-10 18:41:06 +01:00
#ifdef DEBUG_LEAKS
call afreeall(AEDIT) upon close; related to LP#1106116
2013-02-10 18:38:15 +01:00
void x_done(void);
actually, only needed #ifdef DEBUG
2013-02-10 18:39:38 +01:00
#endif
reduce amount of .bss memory needed; initialise via AEDIT at x_init or even first run of x_vi
2013-08-10 15:44:33 +02:00
int x_read(char *);
new MKSH_NO_CMDLINE_EDITING to disable command line editing in its entirety mainly for the Plan 9 port though it may also help the WinAPI variant, other porting efforts, as well as a new project I cannot say yet
2012-05-04 22:49:08 +02:00
#endif
last parts of Coherent patchkit: O_ACCMODE and termio
2012-05-05 00:18:27 +02:00
void x_mkraw(int, mksh_ttyst *, bool);
make tmux hack workable for now (libtermcap is… ugly) • track $TERM for the types tmux uses /^screen(-.*)?$/ • when tmux is in use (or GNU screen, really), use the, now hardcoded, clear-to-EOL string; otherwise, use the old behaviour • drop unnecessary x_e_rebuildline() carefully tested to behave no worse than R52b
2016-07-25 22:43:54 +02:00
void x_initterm(const char *);
follow OpenBSD and add mknod as mksh builtin (mknod <file> p acts as mkfifo) but write a good chunk of that code myself (better structured, better error handling, more gotos, less function calls, int -> bool) passes all tests on mirbsd; this will become mksh R25 once tested on other supported OSes
2005-10-21 14:41:56 +02:00
/* eval.c */
* version.h doesn't need an RCS ID * compat.h does, add it to misc.c, always include it, move if NEED_COMPAT * major whitespace cleanup in sh.h
2006-08-23 00:16:04 +02:00
char *substitute(const char *, int);
merge the const branch +- a few
2007-03-04 01:13:17 +01:00
char **eval(const char **, int);
char *evalstr(const char *cp, int);
char *evalonestr(const char *cp, int);
* version.h doesn't need an RCS ID * compat.h does, add it to misc.c, always include it, move if NEED_COMPAT * major whitespace cleanup in sh.h
2006-08-23 00:16:04 +02:00
char *debunk(char *, const char *, size_t);
merge the const branch +- a few
2007-03-04 01:13:17 +01:00
void expand(const char *, XPtrV *, int);
more int → bool
2012-08-24 21:02:57 +02:00
int glob_str(char *, XPtrV *, bool);
rename the “tilde” function; apparently, some system headers define it
2014-11-19 22:49:12 +01:00
char *do_tilde(char *);
follow OpenBSD and add mknod as mksh builtin (mknod <file> p acts as mkfifo) but write a good chunk of that code myself (better structured, better error handling, more gotos, less function calls, int -> bool) passes all tests on mirbsd; this will become mksh R25 once tested on other supported OSes
2005-10-21 14:41:56 +02:00
/* exec.c */
... and it did in fact require DEC ucode cc to spot this! gcc, SUNWcc, pcc, llvm-gcc, clang, etc. all didn't say a thing! now compiles warning-free (testsuite pass) on ULTRIX 4.5 (1986), and OSF/1 X2.0-8 (testsuite norun: perl missing) has only the usual bitchings about "volatile sig_atomic_t" because the latter part is already volatile, but otherwise warning-free compile, works fine
2009-03-25 22:45:28 +01:00
int execute(struct op * volatile, volatile int, volatile int * volatile);
add a “\builtin” builtin, make it forward assignments, fix some bugs related to that: • while AT&T ksh may do it, POSIX says nothing about allowing declaration commands only without vars and redirections, and “without vars” especially seems against which commands they are • fix relationship between forwarders and real declaration commands • clean up c_builtin vs shcomexec mess Also, re-run “make repool” with a fixed src/scripts/stringpool.sh,v 1.3
2017-03-12 03:04:15 +01:00
int c_builtin(const char **);
struct tbl *get_builtin(const char *);
much better solution: save tablep and hash value¹ in the struct tbl entry ① also saves time during texpand :D XXX this doesn’t work well with the current indexed-array implementation
2009-08-28 22:30:59 +02:00
struct tbl *findfunc(const char *, uint32_t, bool);
* version.h doesn't need an RCS ID * compat.h does, add it to misc.c, always include it, move if NEED_COMPAT * major whitespace cleanup in sh.h
2006-08-23 00:16:04 +02:00
int define(const char *, struct op *);
• more comment and int→bool cleanup, add and improve some comments • in interactive mode, always look up {LC_{ALL,CTYPE},LANG} environment variables if setlocale/nl_langinfo(CODESET) doesn’t suffice • add the ability to call any builtin (some don't make sense or wouldn't work) directly by analysing argv[0] • for direct builtin calls, the {LC_{ALL,CTYPE},LANG} environment variables determine utf8-mode, even if MKSH_ASSUME_UTF8 was set • when called as builtin, echo behaves POSIXish • add domainname as alias for true on MirBSD only, to be able to link it • sync mksh Makefiles with Build.sh output • adjust manpage wrt release plans • link some things to mksh now that we have callable builtins: bin/echo bin/kill bin/pwd bin/sleep (exact matches) bin/test bin/[ (were scripts before) bin/domainname=usr/bin/true usr/bin/false (move to /bin/ now) • drop linked utilities and, except for echo and kill, their manpages • adjust instbin and link a few more there as well
2011-02-11 02:18:23 +01:00
const char *builtin(const char *, int (*)(const char **));
* version.h doesn't need an RCS ID * compat.h does, add it to misc.c, always include it, move if NEED_COMPAT * major whitespace cleanup in sh.h
2006-08-23 00:16:04 +02:00
struct tbl *findcom(const char *, int);
• more comment and int→bool cleanup, add and improve some comments • in interactive mode, always look up {LC_{ALL,CTYPE},LANG} environment variables if setlocale/nl_langinfo(CODESET) doesn’t suffice • add the ability to call any builtin (some don't make sense or wouldn't work) directly by analysing argv[0] • for direct builtin calls, the {LC_{ALL,CTYPE},LANG} environment variables determine utf8-mode, even if MKSH_ASSUME_UTF8 was set • when called as builtin, echo behaves POSIXish • add domainname as alias for true on MirBSD only, to be able to link it • sync mksh Makefiles with Build.sh output • adjust manpage wrt release plans • link some things to mksh now that we have callable builtins: bin/echo bin/kill bin/pwd bin/sleep (exact matches) bin/test bin/[ (were scripts before) bin/domainname=usr/bin/true usr/bin/false (move to /bin/ now) • drop linked utilities and, except for echo and kill, their manpages • adjust instbin and link a few more there as well
2011-02-11 02:18:23 +01:00
void flushcom(bool);
make “source” into a built-in command (keepasn, to match ksh93 and “dot”); remove the “stop” alias and drop old Android and OS/2 hacks and auto-unalias
2015-10-09 23:36:59 +02:00
int search_access(const char *, int);
• 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
const char *search_path(const char *, const char *, int, int *);
repair choiceless select builtin
2012-10-03 17:13:34 +02:00
void pr_menu(const char * const *);
collective R54 release preparation multi-merger: install both lksh and mksh manpages from Build.sh (Martijn Dekker) spelling fixes (Larry Hynes) manpage improvements (Martijn Dekker) initial port to Harvey-OS’ APEX (Ronald G. Minnich, Elbing Miss, Álvaro Jurado) more from komh’s OS/2 port (KO Myung-Hun)
2016-11-12 00:31:39 +01:00
void pr_list(struct columnise_opts *, char * const *);
efficient $(<<<foo) and $(<<EOF … ) implementation, requested by izabera
2016-06-26 02:44:59 +02:00
int herein(struct ioword *, char **);
follow OpenBSD and add mknod as mksh builtin (mknod <file> p acts as mkfifo) but write a good chunk of that code myself (better structured, better error handling, more gotos, less function calls, int -> bool) passes all tests on mirbsd; this will become mksh R25 once tested on other supported OSes
2005-10-21 14:41:56 +02:00
/* expr.c */
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
int evaluate(const char *, mksh_ari_t *, int, bool);
* version.h doesn't need an RCS ID * compat.h does, add it to misc.c, always include it, move if NEED_COMPAT * major whitespace cleanup in sh.h
2006-08-23 00:16:04 +02:00
int v_evaluate(struct tbl *, const char *, volatile int, bool);
* 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 stuff */
size_t utf_mbtowc(unsigned int *, const char *);
size_t utf_wctomb(char *, unsigned int);
int utf_widthadj(const char *, const char **);
• 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
size_t utf_mbswidth(const char *) MKSH_A_PURE;
fix utf_widthadj/utf_skipcols handling for the remaining cases I can spot
2016-05-06 00:56:15 +02:00
const char *utf_skipcols(const char *, int, int *);
• 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
size_t utf_ptradj(const char *) MKSH_A_PURE;
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
#ifdef MIRBSD_BOOTFLOPPY
#define utf_wcwidth(i) wcwidth((wchar_t)(i))
#else
• 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
int utf_wcwidth(unsigned int) MKSH_A_PURE;
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
• 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
int ksh_access(const char *, int);
plug a few display problems with special parameter name expansions reported by Stéphane Chazelas
2016-02-26 19:48:14 +01:00
struct tbl *tempvar(const char *);
follow OpenBSD and add mknod as mksh builtin (mknod <file> p acts as mkfifo) but write a good chunk of that code myself (better structured, better error handling, more gotos, less function calls, int -> bool) passes all tests on mirbsd; this will become mksh R25 once tested on other supported OSes
2005-10-21 14:41:56 +02:00
/* funcs.c */
merge the const branch +- a few
2007-03-04 01:13:17 +01:00
int c_hash(const char **);
int c_pwd(const char **);
int c_print(const char **);
"official" but unsupported printf-as-builtin code, cleaner API than in the branch; USE_PRINTF_BUILTIN=1 to enable it (Build.sh + Makefile)
2009-07-30 21:11:12 +02:00
#ifdef MKSH_PRINTF_BUILTIN
int c_printf(const char **);
#endif
merge the const branch +- a few
2007-03-04 01:13:17 +01:00
int c_whence(const char **);
int c_command(const char **);
int c_typeset(const char **);
fix reentrancy of 'typeset -f' output in the face of aliases; also, move alias handling for COMSUBs and friends to parse time by request of Martijn Dekker (and for consistency with function definitions)
2017-04-06 03:59:58 +02:00
bool valid_alias_name(const char *);
merge the const branch +- a few
2007-03-04 01:13:17 +01:00
int c_alias(const char **);
int c_unalias(const char **);
int c_let(const char **);
int c_jobs(const char **);
fix jobless mksh so much to make it work on Minix 3
2009-04-05 14:35:32 +02:00
#ifndef MKSH_UNEMPLOYED
merge the const branch +- a few
2007-03-04 01:13:17 +01:00
int c_fgbg(const char **);
fix jobless mksh so much to make it work on Minix 3
2009-04-05 14:35:32 +02:00
#endif
merge the const branch +- a few
2007-03-04 01:13:17 +01:00
int c_kill(const char **);
* version.h doesn't need an RCS ID * compat.h does, add it to misc.c, always include it, move if NEED_COMPAT * major whitespace cleanup in sh.h
2006-08-23 00:16:04 +02:00
void getopts_reset(int);
merge the const branch +- a few
2007-03-04 01:13:17 +01:00
int c_getopts(const char **);
new MKSH_NO_CMDLINE_EDITING to disable command line editing in its entirety mainly for the Plan 9 port though it may also help the WinAPI variant, other porting efforts, as well as a new project I cannot say yet
2012-05-04 22:49:08 +02:00
#ifndef MKSH_NO_CMDLINE_EDITING
merge the const branch +- a few
2007-03-04 01:13:17 +01:00
int c_bind(const char **);
new MKSH_NO_CMDLINE_EDITING to disable command line editing in its entirety mainly for the Plan 9 port though it may also help the WinAPI variant, other porting efforts, as well as a new project I cannot say yet
2012-05-04 22:49:08 +02:00
#endif
merge the const branch +- a few
2007-03-04 01:13:17 +01:00
int c_shift(const char **);
int c_umask(const char **);
int c_dot(const char **);
int c_wait(const char **);
int c_read(const char **);
int c_eval(const char **);
int c_trap(const char **);
int c_brkcont(const char **);
int c_exitreturn(const char **);
int c_set(const char **);
int c_unset(const char **);
int c_ulimit(const char **);
int c_times(const char **);
patch from oksh (except manpage, I'll merge that later): pass "xerrok" status across the execution call stack to more closely match what both POSIX and [18]ksh.1 already describe in regards to set -e/errexit's behavior in determining when to exit from nonzero return values. specifically, the truth values tested as operands to &&' and ||', as well as the resulting compound expression itself, along with the truth value resulting from a negated command (i.e. a pipeline prefixed !'), should not make the shell exit when -e is in effect. issue reported by matthieu. testing matthieu, naddy. ok miod (earlier version), otto. man page ok jmc.
2009-03-22 18:47:38 +01:00
int timex(struct op *, int, volatile int *);
* version.h doesn't need an RCS ID * compat.h does, add it to misc.c, always include it, move if NEED_COMPAT * major whitespace cleanup in sh.h
2006-08-23 00:16:04 +02:00
void timex_hook(struct op *, char ** volatile *);
merge the const branch +- a few
2007-03-04 01:13:17 +01:00
int c_exec(const char **);
int c_test(const char **);
new builtin “rename” (this name sounds better than “mksh_mv_rescue” ☻) to just call rename(2) directly, e.g. if /bin/mv needs /lib/ld-uClibc.so.0 some assorted code cleanup
2007-08-20 00:06:27 +02:00
#if HAVE_MKNOD
int c_mknod(const char **);
#endif
add new builtin “realpath” calling realpath(3) on its argument, skipping over “--” for compatibility to Debian realpath(1) and possibly busybox’ “sounds handy” replaced@TNF
2008-05-17 20:27:57 +02:00
int c_realpath(const char **);
new builtin “rename” (this name sounds better than “mksh_mv_rescue” ☻) to just call rename(2) directly, e.g. if /bin/mv needs /lib/ld-uClibc.so.0 some assorted code cleanup
2007-08-20 00:06:27 +02:00
int c_rename(const char **);
make cat an mksh builtin, for things like here documents if any options are given, the external programme is invoked instead
2010-08-28 19:21:46 +02:00
int c_cat(const char **);
add a sleep builtin that can deal with fractions too
2011-02-11 01:41:38 +01:00
int c_sleep(const char **);
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
/* histrap.c */
* version.h doesn't need an RCS ID * compat.h does, add it to misc.c, always include it, move if NEED_COMPAT * major whitespace cleanup in sh.h
2006-08-23 00:16:04 +02:00
void init_histvec(void);
void hist_init(Source *);
mirtoconf the checks if to use persistent history support
2007-03-03 22:36:08 +01:00
#if HAVE_PERSISTENT_HISTORY
* version.h doesn't need an RCS ID * compat.h does, add it to misc.c, always include it, move if NEED_COMPAT * major whitespace cleanup in sh.h
2006-08-23 00:16:04 +02:00
void hist_finish(void);
if MKSH_SMALL, disable persistent history code as well (like on Solaris, where it can't work anyway), and fix that code to shrink saves 2071t 20d 5i
2006-11-10 06:23:14 +01:00
#endif
implement completely new multiline code by delaying history store this commit is valgrind-tested
2015-07-05 21:37:18 +02:00
void histsave(int *, const char *, int, bool);
when using persistent history (and not MKSH_SMALL), let the shells concurrently accessing the same $HISTFILE be more synchronised with each other: empty lines (just pressing Return) and duplicates (that are split and written twice by the lines loaded from $HISTFILE in the meantime); requested by Maximilian “mxey” Gaß in #!/bin/mksh
2010-01-25 17:12:57 +01:00
#if !defined(MKSH_SMALL) && HAVE_PERSISTENT_HISTORY
bool histsync(void);
#endif
merge the const branch +- a few
2007-03-04 01:13:17 +01:00
int c_fc(const char **);
put a bit of type safety into the history code
2011-12-30 22:00:32 +01:00
void sethistsize(mksh_ari_t);
mirtoconf the checks if to use persistent history support
2007-03-03 22:36:08 +01:00
#if HAVE_PERSISTENT_HISTORY
* version.h doesn't need an RCS ID * compat.h does, add it to misc.c, always include it, move if NEED_COMPAT * major whitespace cleanup in sh.h
2006-08-23 00:16:04 +02:00
void sethistfile(const char *);
if MKSH_SMALL, disable persistent history code as well (like on Solaris, where it can't work anyway), and fix that code to shrink saves 2071t 20d 5i
2006-11-10 06:23:14 +01:00
#endif
new MKSH_NO_CMDLINE_EDITING to disable command line editing in its entirety mainly for the Plan 9 port though it may also help the WinAPI variant, other porting efforts, as well as a new project I cannot say yet
2012-05-04 22:49:08 +02:00
#if !defined(MKSH_NO_CMDLINE_EDITING) && !MKSH_S_NOVI
• 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
char **histpos(void) MKSH_A_PURE;
* version.h doesn't need an RCS ID * compat.h does, add it to misc.c, always include it, move if NEED_COMPAT * major whitespace cleanup in sh.h
2006-08-23 00:16:04 +02:00
int histnum(int);
gc-sections found size optimisation chances
2011-12-31 01:27:27 +01:00
#endif
• 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
int findhist(int, int, const char *, bool) MKSH_A_PURE;
when using persistent history (and not MKSH_SMALL), let the shells concurrently accessing the same $HISTFILE be more synchronised with each other: empty lines (just pressing Return) and duplicates (that are split and written twice by the lines loaded from $HISTFILE in the meantime); requested by Maximilian “mxey” Gaß in #!/bin/mksh
2010-01-25 17:12:57 +01:00
char **hist_get_newest(bool);
* version.h doesn't need an RCS ID * compat.h does, add it to misc.c, always include it, move if NEED_COMPAT * major whitespace cleanup in sh.h
2006-08-23 00:16:04 +02:00
void inittraps(void);
void alarm_init(void);
overhaul the signal handling: • support NSIG_MAX from http://austingroupbugs.net/view.php?id=741 and make a TODO for later to use sysconf(_SC_NSIG) at runtime • bounds-check signals (e.g. no smaller than 1, but smaller than NSIG) • align trap errorlevel with other shells • make trap match what’s in POSIX and fixup the manpage • refactor some code related to signals • hide from kill builtin both EXIT and ERR pseudo-signals
2015-04-29 22:44:37 +02:00
Trap *gettrap(const char *, bool, bool);
* version.h doesn't need an RCS ID * compat.h does, add it to misc.c, always include it, move if NEED_COMPAT * major whitespace cleanup in sh.h
2006-08-23 00:16:04 +02:00
void trapsig(int);
void intrcheck(void);
int fatal_trap_check(void);
int trap_pending(void);
void runtraps(int intr);
change behaviour of argument-less exit in traps to match SUSv4; Debian #599484 (original patch from Jonathan Nieder, thanks!) in a variant that appears to handle nested traps well
2010-11-01 18:29:05 +01:00
void runtrap(Trap *, bool);
* version.h doesn't need an RCS ID * compat.h does, add it to misc.c, always include it, move if NEED_COMPAT * major whitespace cleanup in sh.h
2006-08-23 00:16:04 +02:00
void cleartraps(void);
void restoresigs(void);
merge the const branch +- a few
2007-03-04 01:13:17 +01:00
void settrap(Trap *, const char *);
collective R54 release preparation multi-merger: install both lksh and mksh manpages from Build.sh (Martijn Dekker) spelling fixes (Larry Hynes) manpage improvements (Martijn Dekker) initial port to Harvey-OS’ APEX (Ronald G. Minnich, Elbing Miss, Álvaro Jurado) more from komh’s OS/2 port (KO Myung-Hun)
2016-11-12 00:31:39 +01:00
bool block_pipe(void);
void restore_pipe(void);
* version.h doesn't need an RCS ID * compat.h does, add it to misc.c, always include it, move if NEED_COMPAT * major whitespace cleanup in sh.h
2006-08-23 00:16:04 +02:00
int setsig(Trap *, sig_t, int);
void setexecsig(Trap *, int);
• implement fcntl(2)-based advisory locking as an alternative iff flock(2) is not found, from a suggestion by RT (LP: #912691) • try harder (in a loop) to acquire a file lock if the locking mechanism documents EINTR is a possibility (fcntl always, flock on Linux not .Ox) • use -std=c99 not -std=gnu99 if it must be at all
2012-03-28 00:36:53 +02:00
#if HAVE_FLOCK || HAVE_LOCK_FCNTL
void mksh_lockfd(int);
void mksh_unlkfd(int);
#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
/* jobs.c */
fix jobless mksh so much to make it work on Minix 3
2009-04-05 14:35:32 +02:00
void j_init(void);
* version.h doesn't need an RCS ID * compat.h does, add it to misc.c, always include it, move if NEED_COMPAT * major whitespace cleanup in sh.h
2006-08-23 00:16:04 +02:00
void j_exit(void);
fix jobless mksh so much to make it work on Minix 3
2009-04-05 14:35:32 +02:00
#ifndef MKSH_UNEMPLOYED
* version.h doesn't need an RCS ID * compat.h does, add it to misc.c, always include it, move if NEED_COMPAT * major whitespace cleanup in sh.h
2006-08-23 00:16:04 +02:00
void j_change(void);
fix jobless mksh so much to make it work on Minix 3
2009-04-05 14:35:32 +02:00
#endif
patch from oksh (except manpage, I'll merge that later): pass "xerrok" status across the execution call stack to more closely match what both POSIX and [18]ksh.1 already describe in regards to set -e/errexit's behavior in determining when to exit from nonzero return values. specifically, the truth values tested as operands to &&' and ||', as well as the resulting compound expression itself, along with the truth value resulting from a negated command (i.e. a pipeline prefixed !'), should not make the shell exit when -e is in effect. issue reported by matthieu. testing matthieu, naddy. ok miod (earlier version), otto. man page ok jmc.
2009-03-22 18:47:38 +01:00
int exchild(struct op *, int, volatile int *, int);
* version.h doesn't need an RCS ID * compat.h does, add it to misc.c, always include it, move if NEED_COMPAT * major whitespace cleanup in sh.h
2006-08-23 00:16:04 +02:00
void startlast(void);
int waitlast(void);
int waitfor(const char *, int *);
int j_kill(const char *, int);
fix jobless mksh so much to make it work on Minix 3
2009-04-05 14:35:32 +02:00
#ifndef MKSH_UNEMPLOYED
* version.h doesn't need an RCS ID * compat.h does, add it to misc.c, always include it, move if NEED_COMPAT * major whitespace cleanup in sh.h
2006-08-23 00:16:04 +02:00
int j_resume(const char *, int);
detect getsid(2), also spotted by RT, this on MSYS
2013-11-30 18:41:35 +01:00
#endif
#if !defined(MKSH_UNEMPLOYED) && HAVE_GETSID
integrate latest changes from oksh: Wed Sep 4 15:49:19 2013 UTC by millert Add a proper suspend builtin that saves/restores the tty and pgrp as needed instead of an alias that just sends SIGSTOP. Login shells may be suspended if they are not running in an orphan process group.
2013-09-10 19:33:04 +02:00
void j_suspend(void);
fix jobless mksh so much to make it work on Minix 3
2009-04-05 14:35:32 +02:00
#endif
* version.h doesn't need an RCS ID * compat.h does, add it to misc.c, always include it, move if NEED_COMPAT * major whitespace cleanup in sh.h
2006-08-23 00:16:04 +02:00
int j_jobs(const char *, int, int);
void j_notify(void);
pid_t j_async(void);
int j_stopped_running(void);
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
/* lex.c */
* version.h doesn't need an RCS ID * compat.h does, add it to misc.c, always include it, move if NEED_COMPAT * major whitespace cleanup in sh.h
2006-08-23 00:16:04 +02:00
int yylex(int);
shuffle declarations around (all shared between even only two files go into sh.h even if they’re not supposed to be used elsewhere) and make some static; libFirm/cparser has -Wmissing-declarations against it
2012-12-05 19:54:10 +01:00
void yyskiputf8bom(void);
* 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
void yyerror(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
avoid namespace conflicts with __attribute__(…)
2011-04-09 23:01:03 +02:00
MKSH_A_FORMAT(__printf__, 1, 2);
* back out almost all of the memory allocator related changes, as aalloc was hard to type and hard to fix, galloc is also hard to fix, and some things I learned will probably improve things more but make me use the original form as base (especially for space savings) * let sizeofN die though, remove even more casts * optimise, polish * regen Makefiles * sprinkle a few /* CONSTCOND */ while here
2008-12-13 18:02:18 +01:00
Source *pushs(int, Area *);
* version.h doesn't need an RCS ID * compat.h does, add it to misc.c, always include it, move if NEED_COMPAT * major whitespace cleanup in sh.h
2006-08-23 00:16:04 +02:00
void set_prompt(int, Source *);
• Completely overhaul prompt length calculation and prompt display routines; make Emacs and Vi share code, permitting reducing of duplication and code removal as well as more consistent behaviour; put some common code into shared helper functions, too • New x_adjust() logic (Emacs mode): when determining what portion of a line to render use a much more sophisticated algorithm and try to fill up ⅔ of the total screen width (with line and prompt both) also as wished from Steffen Daode Nurpmeso
2013-07-26 22:33:39 +02:00
int pprompt(const char *, int);
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
/* main.c */
int → bool
2012-10-30 21:13:20 +01:00
int include(const char *, int, const char **, bool);
apply diff from manuel giraud via oksh to keep track of LINENO in a trap
2010-05-22 14:49:16 +02:00
int command(const char *, int);
allow 'eval break', from Martijn Dekker also, more string pooling, while here
2017-04-08 03:07:18 +02:00
int shell(Source * volatile, volatile int);
note that some longjmp don’t handle 0 properly cf. <500C1B2E.9030602@zytor.com>
2012-07-22 17:56:51 +02:00
/* argument MUST NOT be 0 */
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
void unwind(int) MKSH_A_NORETURN;
* version.h doesn't need an RCS ID * compat.h does, add it to misc.c, always include it, move if NEED_COMPAT * major whitespace cleanup in sh.h
2006-08-23 00:16:04 +02:00
void newenv(int);
void quitenv(struct shf *);
void cleanup_parents_env(void);
void cleanup_proc_env(void);
* 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
void errorf(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
avoid namespace conflicts with __attribute__(…)
2011-04-09 23:01:03 +02:00
MKSH_A_FORMAT(__printf__, 1, 2);
• Implement http://austingroupbugs.net/view.php?id=367 and align things a bit more with POSIX and the other shells I considered http://austingroupbugs.net/view.php?id=253 but the use of bi_errorf() is interesting, especially as it’s often enough a noreturn function, and funnily enough, 'cd -P /foo' returns 0 while 'chdir -P /foo' fails (so idk where to put -e)…
2011-03-27 20:50:06 +02:00
void errorfx(int, const char *, ...)
MKSH_A_NORETURN
avoid namespace conflicts with __attribute__(…)
2011-04-09 23:01:03 +02:00
MKSH_A_FORMAT(__printf__, 2, 3);
* check.t: add new regression test "typeset-padding-1" according to TFM * edit.c: remove debug stuff again; next time better use shl.c functions ;) * sh.h: add format attributes to a few shf functions * histrap.c, var.c: fix format string mistakes * main.c, sh.h: error_prefix and warningf take bool not int * misc.c: make chvt() stuff use shf_* functions * misc.c: rewrite the TIOCSTTY stuff to be better integrated in mksh, since it originally was an external patch * misc.c: chvt() no longer fails if e.g. chown fails due to e.g. R/O / fs * var.c: fix typeset padding for right-justified zero-filled
2006-11-10 02:13:52 +01:00
void warningf(bool, const char *, ...)
avoid namespace conflicts with __attribute__(…)
2011-04-09 23:01:03 +02:00
MKSH_A_FORMAT(__printf__, 2, 3);
* version.h doesn't need an RCS ID * compat.h does, add it to misc.c, always include it, move if NEED_COMPAT * major whitespace cleanup in sh.h
2006-08-23 00:16:04 +02:00
void bi_errorf(const char *, ...)
avoid namespace conflicts with __attribute__(…)
2011-04-09 23:01:03 +02:00
MKSH_A_FORMAT(__printf__, 1, 2);
… oh well, but MidnightBSD gcc picks on "" too, so just stick to NULL, it’s cheapest
2012-11-30 20:58:48 +01:00
#define errorfz() errorf(NULL)
#define errorfxz(rc) errorfx((rc), NULL)
#define bi_errorfz() bi_errorf(NULL)
Fix for Coverity CID#2: false bug, but still a problem. Analysis: internal_errorf(int, fmt, ...) was only a __dead function if the int argument was non-0, which the Prevent probably was unable to follow. Change all uses of internal_errorf(0, fmt, ...) to internal_warningf(fmt, ...); change the pro- totype of internal_errorf() to internal_errorf(fmt, ...) and all remaining uses remove the non-0 int argument; add __dead to internal_errorf() proto; flesh out guts of internal_errorf() and internal_warningf() into a new local function for optimisation purposes. Some whitespace cleanup and dead code removal (return after internal_errorf(1))
2007-05-13 19:51:24 +02:00
void internal_errorf(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
avoid namespace conflicts with __attribute__(…)
2011-04-09 23:01:03 +02:00
MKSH_A_FORMAT(__printf__, 1, 2);
Fix for Coverity CID#2: false bug, but still a problem. Analysis: internal_errorf(int, fmt, ...) was only a __dead function if the int argument was non-0, which the Prevent probably was unable to follow. Change all uses of internal_errorf(0, fmt, ...) to internal_warningf(fmt, ...); change the pro- totype of internal_errorf() to internal_errorf(fmt, ...) and all remaining uses remove the non-0 int argument; add __dead to internal_errorf() proto; flesh out guts of internal_errorf() and internal_warningf() into a new local function for optimisation purposes. Some whitespace cleanup and dead code removal (return after internal_errorf(1))
2007-05-13 19:51:24 +02:00
void internal_warningf(const char *, ...)
avoid namespace conflicts with __attribute__(…)
2011-04-09 23:01:03 +02:00
MKSH_A_FORMAT(__printf__, 1, 2);
* check.t: add new regression test "typeset-padding-1" according to TFM * edit.c: remove debug stuff again; next time better use shl.c functions ;) * sh.h: add format attributes to a few shf functions * histrap.c, var.c: fix format string mistakes * main.c, sh.h: error_prefix and warningf take bool not int * misc.c: make chvt() stuff use shf_* functions * misc.c: rewrite the TIOCSTTY stuff to be better integrated in mksh, since it originally was an external patch * misc.c: chvt() no longer fails if e.g. chown fails due to e.g. R/O / fs * var.c: fix typeset padding for right-justified zero-filled
2006-11-10 02:13:52 +01:00
void error_prefix(bool);
* version.h doesn't need an RCS ID * compat.h does, add it to misc.c, always include it, move if NEED_COMPAT * major whitespace cleanup in sh.h
2006-08-23 00:16:04 +02:00
void shellf(const char *, ...)
avoid namespace conflicts with __attribute__(…)
2011-04-09 23:01:03 +02:00
MKSH_A_FORMAT(__printf__, 1, 2);
* version.h doesn't need an RCS ID * compat.h does, add it to misc.c, always include it, move if NEED_COMPAT * major whitespace cleanup in sh.h
2006-08-23 00:16:04 +02:00
void shprintf(const char *, ...)
avoid namespace conflicts with __attribute__(…)
2011-04-09 23:01:03 +02:00
MKSH_A_FORMAT(__printf__, 1, 2);
* version.h doesn't need an RCS ID * compat.h does, add it to misc.c, always include it, move if NEED_COMPAT * major whitespace cleanup in sh.h
2006-08-23 00:16:04 +02:00
int can_seek(int);
void initio(void);
• unify ksh_dup2() usage, use bool where appropriate • apply diff from mirbsdksh-1.11: #ifdef DUP2_BROKEN /* Ultrix systems like to preserve the close-on-exec flag */ ‣ XXX we do #ifdef __ultrix here (imake-style) instead of mirtoconfing it (but does anyone know of any other OS with the same problem? plus we’d see it as we now know the symptoms) • remove ultrix Build.hs warn=' but might work…' in the hope it DOES
2008-04-01 22:40:22 +02:00
int ksh_dup2(int, int, bool);
ok, icc _did_ track down a few ones, and I fixed errno abuse a little too however, bad S/N ratio side effect bonus: smaller code size now
2007-06-07 01:28:17 +02:00
short savefd(int);
* version.h doesn't need an RCS ID * compat.h does, add it to misc.c, always include it, move if NEED_COMPAT * major whitespace cleanup in sh.h
2006-08-23 00:16:04 +02:00
void restfd(int, int);
void openpipe(int *);
void closepipe(int *);
merge the const branch +- a few
2007-03-04 01:13:17 +01:00
int check_fd(const char *, int, const char **);
* version.h doesn't need an RCS ID * compat.h does, add it to misc.c, always include it, move if NEED_COMPAT * major whitespace cleanup in sh.h
2006-08-23 00:16:04 +02:00
void coproc_init(void);
void coproc_read_close(int);
void coproc_readw_close(int);
void coproc_write_close(int);
int coproc_getfd(int, const char **);
void coproc_cleanup(int);
* back out almost all of the memory allocator related changes, as aalloc was hard to type and hard to fix, galloc is also hard to fix, and some things I learned will probably improve things more but make me use the original form as base (especially for space savings) * let sizeofN die though, remove even more casts * optimise, polish * regen Makefiles * sprinkle a few /* CONSTCOND */ while here
2008-12-13 18:02:18 +01:00
struct temp *maketemp(Area *, Temp_type, struct temp **);
dissolve the hashtab nonsense, ¾ is good, and mirkev will also use that
2012-07-01 17:38:09 +02:00
void ktinit(Area *, struct table *, uint8_t);
• rework hash table interna to avoid gcc-4.1 on Debian etch bug • also improve behaviour with _a lot_ (>2²⁸) entries • while here, improve comments and whitespace
2011-06-05 21:58:21 +02:00
struct tbl *ktscan(struct table *, const char *, uint32_t, struct tbl ***);
/* table, name (key) to search for, hash(n) */
#define ktsearch(tp, s, h) ktscan((tp), (s), (h), NULL)
much better solution: save tablep and hash value¹ in the struct tbl entry ① also saves time during texpand :D XXX this doesn’t work well with the current indexed-array implementation
2009-08-28 22:30:59 +02:00
struct tbl *ktenter(struct table *, const char *, uint32_t);
for now, until we really use kt*() otherwise, ifdef out tablep/hval
2009-08-28 22:38:43 +02:00
#define ktdelete(p) do { p->flag = 0; } while (/* CONSTCOND */ 0)
* version.h doesn't need an RCS ID * compat.h does, add it to misc.c, always include it, move if NEED_COMPAT * major whitespace cleanup in sh.h
2006-08-23 00:16:04 +02:00
void ktwalk(struct tstate *, struct table *);
struct tbl *ktnext(struct tstate *);
struct tbl **ktsort(struct table *);
efficient debug-to-file output (/tmp racy, but hey)
2012-03-23 20:38:12 +01:00
#ifdef DF
void DF(const char *, ...)
MKSH_A_FORMAT(__printf__, 1, 2);
#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
/* misc.c */
• 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
size_t option(const char *) MKSH_A_PURE;
* version.h doesn't need an RCS ID * compat.h does, add it to misc.c, always include it, move if NEED_COMPAT * major whitespace cleanup in sh.h
2006-08-23 00:16:04 +02:00
char *getoptions(void);
fix libFirm/cparser -Wsign-compare
2012-12-05 20:38:25 +01:00
void change_flag(enum sh_flag, int, bool);
Fix most “set -x” problems (LP#1179287) • “set -x” manually (cmdline too) snapshots fd#2 now • “set -o inherit-xtrace” introduced; default still enabled • reverted iodup printing to pre-R45 behaviour • made Flag(FXTRACE) a proper state machine
2013-07-21 20:47:24 +02:00
void change_xtrace(unsigned char, bool);
llvm/clang scan-build is now content…
2009-12-05 18:43:50 +01:00
int parse_args(const char **, int, bool *);
* version.h doesn't need an RCS ID * compat.h does, add it to misc.c, always include it, move if NEED_COMPAT * major whitespace cleanup in sh.h
2006-08-23 00:16:04 +02:00
int getn(const char *, int *);
I _think_ this implements ${foo/bar/baz} logic (bar is a glob pattern) todo tomorrow: • test case (compare with e.g. GNU bash) • manpage • version bump sqchar is a bit ugly, but \/ must be preserved, as we don’t get wdencoded strings later on in the process (eval.c CSUBST) and I didn’t want to have an implementation like ${foo: 2: 3} this time
2008-02-27 02:00:10 +01:00
int gmatchx(const char *, const char *, bool);
reimplement has_globbing() with proper bracket expression parsing, and take ahead parsing collating symbols, equivalence classes and character classes already (heck my first draft of this already did better than GNU bash, ksh93 I still don’t grok its code at all)
2017-04-29 23:49:07 +02:00
bool has_globbing(const char *) MKSH_A_PURE;
now actually do comparisons for sorting ASCIIbetically
2017-04-21 22:06:06 +02:00
int ascstrcmp(const void *, const void *) MKSH_A_PURE;
int ascpstrcmp(const void *, const void *) MKSH_A_PURE;
* version.h doesn't need an RCS ID * compat.h does, add it to misc.c, always include it, move if NEED_COMPAT * major whitespace cleanup in sh.h
2006-08-23 00:16:04 +02:00
void ksh_getopt_reset(Getopt *, int);
merge the const branch +- a few
2007-03-04 01:13:17 +01:00
int ksh_getopt(const char **, Getopt *, const char *);
give dumptree an dumpioact helper
2011-12-29 23:54:22 +01:00
void print_value_quoted(struct shf *, const char *);
New functionality: assign here document to string variable directly, without cat and temp files. Hacked in Lëtzebuerg ☺ This was the third try. Where to put this was not palpable… same for =(…)
2011-01-09 22:57:29 +01:00
char *quote_value(const char *);
collective R54 release preparation multi-merger: install both lksh and mksh manpages from Build.sh (Martijn Dekker) spelling fixes (Larry Hynes) manpage improvements (Martijn Dekker) initial port to Harvey-OS’ APEX (Ronald G. Minnich, Elbing Miss, Álvaro Jurado) more from komh’s OS/2 port (KO Myung-Hun)
2016-11-12 00:31:39 +01:00
void print_columns(struct columnise_opts *, unsigned int,
simplify print_columns func argument: no need to return the first arg any more
2015-07-05 16:43:08 +02:00
void (*)(char *, size_t, unsigned int, const void *),
collective R54 release preparation multi-merger: install both lksh and mksh manpages from Build.sh (Martijn Dekker) spelling fixes (Larry Hynes) manpage improvements (Martijn Dekker) initial port to Harvey-OS’ APEX (Ronald G. Minnich, Elbing Miss, Álvaro Jurado) more from komh’s OS/2 port (KO Myung-Hun)
2016-11-12 00:31:39 +01:00
const void *, size_t, size_t);
oksh rcsid-only sync, plus bonus rewrite of strip_nuls (uses size_t ipv int for buffer size now, and no extra calls to memchr/memmove, input is typically small)
2015-03-20 22:46:41 +01:00
void strip_nuls(char *, size_t)
MKSH_A_BOUNDED(__string__, 1, 2);
fix blocking_read prototype
2010-08-28 18:47:11 +02:00
ssize_t blocking_read(int, char *, size_t)
avoid namespace conflicts with __attribute__(…)
2011-04-09 23:01:03 +02:00
MKSH_A_BOUNDED(__buffer__, 2, 3);
* version.h doesn't need an RCS ID * compat.h does, add it to misc.c, always include it, move if NEED_COMPAT * major whitespace cleanup in sh.h
2006-08-23 00:16:04 +02:00
int reset_nonblock(int);
• move funcs.c:do_realpath() to misc.c and make it global ⇒ consider merging simplify_path() • move funcs.c:c_cd() to misc.c • make misc.c:make_path() static, c_cd() is its only user ⇒ mark as obsolete • tweak misc.c:set_current_wd() to drop ksh_get_wd() argument should be no code change, but the entire path stuff is a mess… so expect actual implementation changes or even rewrites shortly
2011-03-24 20:05:49 +01:00
char *ksh_get_wd(void);
char *do_realpath(const char *);
* version.h doesn't need an RCS ID * compat.h does, add it to misc.c, always include it, move if NEED_COMPAT * major whitespace cleanup in sh.h
2006-08-23 00:16:04 +02:00
void simplify_path(char *);
simplify code to use existing $PWD
2011-03-26 20:43:49 +01:00
void set_current_wd(const char *);
• move funcs.c:do_realpath() to misc.c and make it global ⇒ consider merging simplify_path() • move funcs.c:c_cd() to misc.c • make misc.c:make_path() static, c_cd() is its only user ⇒ mark as obsolete • tweak misc.c:set_current_wd() to drop ksh_get_wd() argument should be no code change, but the entire path stuff is a mess… so expect actual implementation changes or even rewrites shortly
2011-03-24 20:05:49 +01:00
int c_cd(const char **);
lesson learned from http://k1024.org/~iusty/blog/entry/perf-null/ – add -DMKSH_SMALL_BUT_FAST which gives more speed (8/20K less cycles, 5/9K less insns, 1.8/2.4k less branches, 65/275 less branch misses) on Debian/amd64 (klibc-static/eglibc) at cost of 0/2 more page faults and 6K/6K more text size
2012-07-01 17:55:00 +02:00
#if defined(MKSH_SMALL) && !defined(MKSH_SMALL_BUT_FAST)
rename more identifiers with trailing underscores
2011-10-26 00:36:39 +02:00
char *strdup_i(const char *, Area *);
char *strndup_i(const char *, size_t, Area *);
save 1640 .text bytes in MKSH_SMALL case by not inlining strdupx, strndupx
2008-10-28 15:51:06 +01:00
#endif
$'…' functionality, documentation improvements, fixes for backslash expansion in all modes, regression tests for both kinds of backslash expansion; unbksl() revamp; make CTRL macro available globally
2009-09-19 23:54:46 +02:00
int unbksl(bool, int (*)(void), void (*)(int));
Try to append executable suffixes if not having extension on OS/2
2015-05-07 05:59:55 +02:00
#ifdef __OS2__
/* os2.c */
Support a response file on OS/2
2015-05-11 09:06:22 +02:00
void os2_init(int *, const char ***);
Support BEGINLIBPATH, ENDLIBPATH and LIBPATHSTRICT on OS/2
2015-06-03 05:20:05 +02:00
void setextlibpath(const char *, const char *);
Try to append executable suffixes if not having extension on OS/2
2015-05-07 05:59:55 +02:00
int access_ex(int (*)(const char *, int), const char *, int);
Consider executable extensions in case of some test commands on OS/2 -r, -w, -x, -a, -e, -f.
2015-05-11 06:43:56 +02:00
int stat_ex(const char *, struct stat *);
Try to append executable suffixes if not having extension on OS/2
2015-05-07 05:59:55 +02:00
const char *real_exec_name(const char *);
handle drive-qualified nōn-absolute pathnames in do_realpath(), untested the idea here is that: - /foo/bar and a:/foo/bar are absolute - foo/bar is relative - a:foo/bar needs to be handled specially, mostly per making it into an absolute (“a:/” + getcwd(a:) + “foo/bar”)
2017-10-12 01:23:03 +02:00
int getdrvwd(char **, unsigned int);
Try to append executable suffixes if not having extension on OS/2
2015-05-07 05:59:55 +02:00
#endif
follow OpenBSD and add mknod as mksh builtin (mknod <file> p acts as mkfifo) but write a good chunk of that code myself (better structured, better error handling, more gotos, less function calls, int -> bool) passes all tests on mirbsd; this will become mksh R25 once tested on other supported OSes
2005-10-21 14:41:56 +02:00
/* shf.c */
struct shf *shf_open(const char *, int, int, int);
struct shf *shf_fdopen(int, int, struct shf *);
struct shf *shf_reopen(int, int, struct shf *);
patch most of Jerker Bäck’s concerns out, unless not applicable
2011-08-27 20:06:52 +02:00
struct shf *shf_sopen(char *, ssize_t, int, struct shf *);
* version.h doesn't need an RCS ID * compat.h does, add it to misc.c, always include it, move if NEED_COMPAT * major whitespace cleanup in sh.h
2006-08-23 00:16:04 +02:00
int shf_close(struct shf *);
int shf_fdclose(struct shf *);
char *shf_sclose(struct shf *);
int shf_flush(struct shf *);
patch most of Jerker Bäck’s concerns out, unless not applicable
2011-08-27 20:06:52 +02:00
ssize_t shf_read(char *, ssize_t, struct shf *);
char *shf_getse(char *, ssize_t, struct shf *);
* version.h doesn't need an RCS ID * compat.h does, add it to misc.c, always include it, move if NEED_COMPAT * major whitespace cleanup in sh.h
2006-08-23 00:16:04 +02:00
int shf_getchar(struct shf *s);
int shf_ungetc(int, struct shf *);
lesson learned from http://k1024.org/~iusty/blog/entry/perf-null/ – add -DMKSH_SMALL_BUT_FAST which gives more speed (8/20K less cycles, 5/9K less insns, 1.8/2.4k less branches, 65/275 less branch misses) on Debian/amd64 (klibc-static/eglibc) at cost of 0/2 more page faults and 6K/6K more text size
2012-07-01 17:55:00 +02:00
#if defined(MKSH_SMALL) && !defined(MKSH_SMALL_BUT_FAST)
‣ merge from mksh R40-stable use common macro bodies shf_{get,put}c_ for definition of shf_{put,get}c as functions (MKSH_SMALL) or macros, respectively
2011-07-16 19:07:35 +02:00
int shf_getc(struct shf *);
int shf_putc(int, struct shf *);
#else
rename more identifiers with trailing underscores
2011-10-26 00:36:39 +02:00
#define shf_getc shf_getc_i
#define shf_putc shf_putc_i
‣ merge from mksh R40-stable use common macro bodies shf_{get,put}c_ for definition of shf_{put,get}c as functions (MKSH_SMALL) or macros, respectively
2011-07-16 19:07:35 +02:00
#endif
* version.h doesn't need an RCS ID * compat.h does, add it to misc.c, always include it, move if NEED_COMPAT * major whitespace cleanup in sh.h
2006-08-23 00:16:04 +02:00
int shf_putchar(int, struct shf *);
patch most of Jerker Bäck’s concerns out, unless not applicable
2011-08-27 20:06:52 +02:00
ssize_t shf_puts(const char *, struct shf *);
ssize_t shf_write(const char *, ssize_t, struct shf *);
ssize_t shf_fprintf(struct shf *, const char *, ...)
avoid namespace conflicts with __attribute__(…)
2011-04-09 23:01:03 +02:00
MKSH_A_FORMAT(__printf__, 2, 3);
patch most of Jerker Bäck’s concerns out, unless not applicable
2011-08-27 20:06:52 +02:00
ssize_t shf_snprintf(char *, ssize_t, const char *, ...)
avoid namespace conflicts with __attribute__(…)
2011-04-09 23:01:03 +02:00
MKSH_A_FORMAT(__printf__, 3, 4)
MKSH_A_BOUNDED(__string__, 1, 2);
* check.t: add new regression test "typeset-padding-1" according to TFM * edit.c: remove debug stuff again; next time better use shl.c functions ;) * sh.h: add format attributes to a few shf functions * histrap.c, var.c: fix format string mistakes * main.c, sh.h: error_prefix and warningf take bool not int * misc.c: make chvt() stuff use shf_* functions * misc.c: rewrite the TIOCSTTY stuff to be better integrated in mksh, since it originally was an external patch * misc.c: chvt() no longer fails if e.g. chown fails due to e.g. R/O / fs * var.c: fix typeset padding for right-justified zero-filled
2006-11-10 02:13:52 +01:00
char *shf_smprintf(const char *, ...)
avoid namespace conflicts with __attribute__(…)
2011-04-09 23:01:03 +02:00
MKSH_A_FORMAT(__printf__, 1, 2);
patch most of Jerker Bäck’s concerns out, unless not applicable
2011-08-27 20:06:52 +02:00
ssize_t shf_vfprintf(struct shf *, const char *, va_list)
avoid namespace conflicts with __attribute__(…)
2011-04-09 23:01:03 +02:00
MKSH_A_FORMAT(__printf__, 2, 0);
prepare the new fast character classes, not live yet: need sanity check unfortunately we need at least 21 or so, maybe 19, classes, so sizing things down to short is not possible; we can splurge with 32 bit thus
2017-04-22 02:07:10 +02:00
void set_ifs(const char *);
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
/* syn.c */
* version.h doesn't need an RCS ID * compat.h does, add it to misc.c, always include it, move if NEED_COMPAT * major whitespace cleanup in sh.h
2006-08-23 00:16:04 +02:00
void initkeywords(void);
fix reentrancy of 'typeset -f' output in the face of aliases; also, move alias handling for COMSUBs and friends to parse time by request of Martijn Dekker (and for consistency with function definitions)
2017-04-06 03:59:58 +02:00
struct op *compile(Source *, bool, bool);
add a sleep builtin that can deal with fractions too
2011-02-11 01:41:38 +01:00
bool parse_usec(const char *, struct timeval *);
bring back ${ foo;} sans dot.mkshrc patch, using a temporary file, and as experimental feature
2012-10-22 22:19:18 +02:00
char *yyrecursive(int);
who would’ve thought proper ^C handling be so hard?
2012-10-30 21:49:44 +01:00
void yyrecursive_pop(bool);
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
/* tree.c */
• more fixes (some regression, some new) • more testcases, stricter testcases
2011-03-06 18:08:14 +01:00
void fptreef(struct shf *, int, const char *, ...);
patch most of Jerker Bäck’s concerns out, unless not applicable
2011-08-27 20:06:52 +02:00
char *snptreef(char *, ssize_t, const char *, ...);
* back out almost all of the memory allocator related changes, as aalloc was hard to type and hard to fix, galloc is also hard to fix, and some things I learned will probably improve things more but make me use the original form as base (especially for space savings) * let sizeofN die though, remove even more casts * optimise, polish * regen Makefiles * sprinkle a few /* CONSTCOND */ while here
2008-12-13 18:02:18 +01:00
struct op *tcopy(struct op *, Area *);
char *wdcopy(const char *, Area *);
remove all but these __CRAZY=Yes build warnings: main.c: In function 'main': main.c:208: warning: cast discards qualifiers from pointer target type main.c:329: warning: cast discards qualifiers from pointer target type no warnings at autoconf time left either; will take care of these two later (might revisit changes from this commit), maybe change declararion for the builtins to have their argv[] be const strings, and go through strict type and qualifier checking again. this'll further improve stability. XXX these changes might have introduced (more?) memory leaks, XXX someone who knows about these tools should verify with XXX automatic memory usage analysers (valgrind?) still passes testsuite
2006-11-12 15:58:16 +01:00
const char *wdscan(const char *, int);
• fix wtf(1) by keeping the paren in ${foo#\(} properly escaped in COMSUB • merge tputS and wdstrip_internal ⇒ net save: 604 .text 0 .data 0 .bss (MirBSD/i386)
2011-05-03 00:52:54 +02:00
#define WDS_TPUTS BIT(0) /* tputS (dumpwdvar) mode */
char *wdstrip(const char *, int);
* back out almost all of the memory allocator related changes, as aalloc was hard to type and hard to fix, galloc is also hard to fix, and some things I learned will probably improve things more but make me use the original form as base (especially for space savings) * let sizeofN die though, remove even more casts * optimise, polish * regen Makefiles * sprinkle a few /* CONSTCOND */ while here
2008-12-13 18:02:18 +01:00
void tfree(struct op *, Area *);
• make DEBUG:dumpchar() not static (consider rolling into shf?)
2011-03-17 22:58:40 +01:00
void dumpchar(struct shf *, int);
• add a tree debugging dumper #ifdef DEBUG • use shf_putc (macro), shf_putchar (function) ipv tputc • replace shf_putchar(x,y) calls for side-effect-less x with shf_putc • plug another bug in the tree code – '\' → "\\" (backslashes must be escaped inside double quotes, too) • adjust testsuite (and, I _had_ wondered…)
2011-03-08 19:49:51 +01:00
void dumptree(struct shf *, struct op *);
• make EXPRSUB not initiate an ASCIIZ string any more but a wdstring (token stream, lexer output / parser input), EOS terminated, let SASPAREN use the same lexing as SBASE (e.g. COMSUB recursively) • make wdstrip recursive • fix processing of COMSUB in wdstrip ⇒ pass comsub-1 test • expose another debugging function
2011-03-12 22:41:15 +01:00
void dumpwdvar(struct shf *, const char *);
give dumptree an dumpioact helper
2011-12-29 23:54:22 +01:00
void dumpioact(struct shf *shf, struct op *t);
• more fixes (some regression, some new) • more testcases, stricter testcases
2011-03-06 18:08:14 +01:00
void vistree(char *, size_t, struct op *)
avoid namespace conflicts with __attribute__(…)
2011-04-09 23:01:03 +02:00
MKSH_A_BOUNDED(__string__, 1, 2);
• more fixes (some regression, some new) • more testcases, stricter testcases
2011-03-06 18:08:14 +01:00
void fpFUNCTf(struct shf *, int, bool, const char *, struct 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
/* var.c */
* version.h doesn't need an RCS ID * compat.h does, add it to misc.c, always include it, move if NEED_COMPAT * major whitespace cleanup in sh.h
2006-08-23 00:16:04 +02:00
void newblock(void);
void popblock(void);
void initvar(void);
Fix typeset issues (LP: #993847) This was actually more evil: • use a recursive function to display blocks in reverse order, so that local variable values overwrite global ones • add array support to typeset -p (from typeset -p -) • display 'set -A varname' line before setting values, for -p • if -p got arguments, only display those (from the innermost scope) Also, the usual amount of code cleanup…
2012-05-10 01:21:00 +02:00
struct block *varsearch(struct block *, struct tbl **, const char *, uint32_t);
* version.h doesn't need an RCS ID * compat.h does, add it to misc.c, always include it, move if NEED_COMPAT * major whitespace cleanup in sh.h
2006-08-23 00:16:04 +02:00
struct tbl *global(const char *);
string pooling, and more consistent look for error messages
2017-04-02 18:47:43 +02:00
struct tbl *isglobal(const char *, bool);
* version.h doesn't need an RCS ID * compat.h does, add it to misc.c, always include it, move if NEED_COMPAT * major whitespace cleanup in sh.h
2006-08-23 00:16:04 +02:00
struct tbl *local(const char *, bool);
char *str_val(struct tbl *);
int setstr(struct tbl *, const char *, int);
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 *setint_v(struct tbl *, struct tbl *, bool);
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
void setint(struct tbl *, mksh_ari_t);
cid 1004E0F5C27271F5B00 broke integer-base handling of built-in parameters mksh -c 'echo a=$RANDOM; RANDOM=0x12; echo b=$RANDOM' # behaviour changed
2011-11-08 23:07:15 +01:00
void setint_n(struct tbl *, mksh_ari_t, int);
remove *all* nonnull assertions and other workarounds for clang scan-build this beast evolved in the last 2½ years, and we’ve had trouble with some of them earlier
2012-12-01 02:36:30 +01:00
struct tbl *typeset(const char *, uint32_t, uint32_t, int, int);
* version.h doesn't need an RCS ID * compat.h does, add it to misc.c, always include it, move if NEED_COMPAT * major whitespace cleanup in sh.h
2006-08-23 00:16:04 +02:00
void unset(struct tbl *, int);
fix LP#1277691 (“nameref RHS not syntax checked”) and the inability to use errorf() while nameref states were being changed (by almost completely eliminating the global variable) and the readonly first array variable bypass (typo/refactoro); also, whitespace, one int → bool, and add a comment wrt. the parser rewrite talked about with igli during a fever ;)
2014-05-27 15:22:46 +02:00
const char *skip_varname(const char *, bool) MKSH_A_PURE;
• 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
const char *skip_wdvarname(const char *, bool) MKSH_A_PURE;
int is_wdvarname(const char *, bool) MKSH_A_PURE;
int is_wdvarassign(const char *) MKSH_A_PURE;
mksh R40 Release Candidate 1 Testsuite: • add new need-pass: {yes|no} attribute, default yes • exit with 1 if a need-pass test failed unexpectedly idea by Kacper Kornet <draenog@pld-linux.org> • mark utf8bom-2 as need-pass: no Infrstructure: • add housekeeping function for making a tty raw • switch functions with unused results to void • struct op: u.charflag contains last char of ;; in TPAT • var.c:arraysearch is now a global function Language: • add ;& (fall through) and ;| (examine next) delimiters in addition to ;; (end case) as zsh extensions, because POSIX standardised on ;& already • add -A (read into array), -N (read exactly n bytes), -n (read up to n bytes), -t (timeout) flags for read from ksh93 • allow read -N -1 or -n -1 to slurp the entire input • add -a (read into array the input characters) extension specific to mksh to read, idea by David Korn • add -e (exit with error if PWD was not set correctly after a physical cd) to cd builtin, mandated by next POSIX, and change error codes accordingly Rewrites: • full rewrite of read builtin and its manpage section • add regression tetss for most of the new functionality • duplicate hexdump demo tests for use of read -a • use read -raN-1 in dot.mkshrc to get NUL safe base64, DJB cdb hash and Jenkins one-at-a-time hash functions
2011-05-29 04:18:57 +02:00
struct tbl *arraysearch(struct tbl *, uint32_t);
* version.h doesn't need an RCS ID * compat.h does, add it to misc.c, always include it, move if NEED_COMPAT * major whitespace cleanup in sh.h
2006-08-23 00:16:04 +02:00
char **makenv(void);
use a more common/generic routine for TIOCGWINSZ; ensure x_cols and x_lins always have a sane value after them (even if not tty_fd)
2008-12-29 22:05:15 +01:00
void change_winsz(void);
• 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
size_t array_ref_len(const char *) MKSH_A_PURE;
* version.h doesn't need an RCS ID * compat.h does, add it to misc.c, always include it, move if NEED_COMPAT * major whitespace cleanup in sh.h
2006-08-23 00:16:04 +02:00
char *arrayname(const char *);
fix type (array indices should be of the unsigned arithmetic type)
2009-08-29 00:23:34 +02:00
mksh_uari_t set_array(const char *, bool, const char **);
• 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
uint32_t hash(const void *) MKSH_A_PURE;
• use BAFH for hash ipv NZAAT • prep for release • fix minor nits in manpage and tests
2014-01-11 19:09:43 +01:00
uint32_t chvt_rndsetup(const void *, size_t) MKSH_A_PURE;
factor out rndget() code, for adding users XXX in the future, the entire scheme must be rethinked when we need more XXX entropy for the hash tables; possibly a cheap add using NZAT and re- XXX initialise the LCG only on access and when added (so keep NZAT state XXX separate from LCG state); also, then we will need a more elaborate XXX scheme, such as adding from environment, editor keypresses and timing
2012-04-14 16:35:13 +02:00
mksh_ari_t rndget(void);
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
void rndset(unsigned long);
• use BAFH for hash ipv NZAAT • prep for release • fix minor nits in manpage and tests
2014-01-11 19:09:43 +01:00
void rndpush(const void *);
implement $KSH_MATCH and, to make it usable, ${foo@/bar/baz}; add a real-life example (for slagtc’s programmable tab completion) to the manpage
2016-08-01 23:38:07 +02:00
void record_match(const char *);
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 Test_op {
re-indent comments
2011-06-21 23:10:12 +02:00
/* non-operator */
TO_NONOP = 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
/* unary operators */
add test -v, initially from Martijn Dekker
2017-04-12 19:38:46 +02:00
TO_STNZE, TO_STZER, TO_ISSET, TO_OPTION,
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
TO_FILAXST,
TO_FILEXST,
TO_FILREG, TO_FILBDEV, TO_FILCDEV, TO_FILSYM, TO_FILFIFO, TO_FILSOCK,
TO_FILCDF, TO_FILID, TO_FILGID, TO_FILSETG, TO_FILSTCK, TO_FILUID,
TO_FILRD, TO_FILGZ, TO_FILTT, TO_FILSETU, TO_FILWR, TO_FILEX,
/* binary operators */
TO_STEQL, TO_STNEQ, TO_STLT, TO_STGT, TO_INTEQ, TO_INTNE, TO_INTGT,
• merge printf from OpenBSD • deactivate %a and %A since our libc doesn’t have it • rewrite the mksh integration code to use shf instead of stdio, removing floating point support always in the process, as shf doesn’t support it ⇒ saves 11114 (6706 text, 168 data, 4240 bss) with dietlibc on Debian • fix -Wall -Wextra -Wformat -Wstrict-aliasing=2 for gcc (Debian 4.4.4-7) • fix these and -Wc++-compat for gcc version 4.6.0 20100711 (experimental) [trunk revision 162057] (Debian 20100711-1) except: – a few enum warnings that relate to eglibc’s {g,s}etrlimit() functions taking an enum instead of an int because they’re too stupid to adhere to POSIX interfaces they design by themselves – all “request for implicit conversion” involving a "void *" on one side • tweak the manual page somewhat more
2010-07-18 00:09:40 +02:00
TO_INTGE, TO_INTLT, TO_INTLE, TO_FILEQ, TO_FILNT, TO_FILOT,
/* not an operator */
TO_NONNULL /* !TO_NONOP */
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
};
typedef enum Test_op Test_op;
/* Used by Test_env.isa() (order important - used to index *_tokens[] arrays) */
enum Test_meta {
TM_OR, /* -o or || */
TM_AND, /* -a or && */
TM_NOT, /* ! */
TM_OPAREN, /* ( */
TM_CPAREN, /* ) */
TM_UNOP, /* unary operator */
TM_BINOP, /* binary operator */
TM_END /* end of input */
};
typedef enum Test_meta Test_meta;
#define TEF_ERROR BIT(0) /* set if we've hit an error */
#define TEF_DBRACKET BIT(1) /* set if [[ .. ]] test */
• merge printf from OpenBSD • deactivate %a and %A since our libc doesn’t have it • rewrite the mksh integration code to use shf instead of stdio, removing floating point support always in the process, as shf doesn’t support it ⇒ saves 11114 (6706 text, 168 data, 4240 bss) with dietlibc on Debian • fix -Wall -Wextra -Wformat -Wstrict-aliasing=2 for gcc (Debian 4.4.4-7) • fix these and -Wc++-compat for gcc version 4.6.0 20100711 (experimental) [trunk revision 162057] (Debian 20100711-1) except: – a few enum warnings that relate to eglibc’s {g,s}etrlimit() functions taking an enum instead of an int because they’re too stupid to adhere to POSIX interfaces they design by themselves – all “request for implicit conversion” involving a "void *" on one side • tweak the manual page somewhat more
2010-07-18 00:09:40 +02:00
typedef struct test_env {
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
union {
whitespace
2010-08-28 17:48:20 +02:00
const char **wp; /* used by ptest_* */
XPtrV *av; /* used by dbtestp_* */
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
} pos;
whitespace
2010-08-28 17:48:20 +02:00
const char **wp_end; /* used by ptest_* */
• merge printf from OpenBSD • deactivate %a and %A since our libc doesn’t have it • rewrite the mksh integration code to use shf instead of stdio, removing floating point support always in the process, as shf doesn’t support it ⇒ saves 11114 (6706 text, 168 data, 4240 bss) with dietlibc on Debian • fix -Wall -Wextra -Wformat -Wstrict-aliasing=2 for gcc (Debian 4.4.4-7) • fix these and -Wc++-compat for gcc version 4.6.0 20100711 (experimental) [trunk revision 162057] (Debian 20100711-1) except: – a few enum warnings that relate to eglibc’s {g,s}etrlimit() functions taking an enum instead of an int because they’re too stupid to adhere to POSIX interfaces they design by themselves – all “request for implicit conversion” involving a "void *" on one side • tweak the manual page somewhat more
2010-07-18 00:09:40 +02:00
Test_op (*isa)(struct test_env *, Test_meta);
const char *(*getopnd) (struct test_env *, Test_op, bool);
int (*eval)(struct test_env *, Test_op, const char *, const char *, bool);
void (*error)(struct test_env *, int, const char *);
whitespace
2010-08-28 17:48:20 +02:00
int flags; /* TEF_* */
• merge printf from OpenBSD • deactivate %a and %A since our libc doesn’t have it • rewrite the mksh integration code to use shf instead of stdio, removing floating point support always in the process, as shf doesn’t support it ⇒ saves 11114 (6706 text, 168 data, 4240 bss) with dietlibc on Debian • fix -Wall -Wextra -Wformat -Wstrict-aliasing=2 for gcc (Debian 4.4.4-7) • fix these and -Wc++-compat for gcc version 4.6.0 20100711 (experimental) [trunk revision 162057] (Debian 20100711-1) except: – a few enum warnings that relate to eglibc’s {g,s}etrlimit() functions taking an enum instead of an int because they’re too stupid to adhere to POSIX interfaces they design by themselves – all “request for implicit conversion” involving a "void *" on one side • tweak the manual page somewhat more
2010-07-18 00:09:40 +02:00
} Test_env;
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
harmonise sys_{sig,err}list ⓐ checks, ⓑ uses, ⓒ _decl values when not needed, ⓓ prototypes; ⓔ “const” is a keyword and thus space-separated from the preceding ‘*’ pointer indicator
2012-12-28 03:28:39 +01:00
extern const char * const dbtest_tokens[];
ok, icc _did_ track down a few ones, and I fixed errno abuse a little too however, bad S/N ratio side effect bonus: smaller code size now
2007-06-07 01:28:17 +02:00
• 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
Test_op test_isop(Test_meta, const char *) MKSH_A_PURE;
some more code “folding” should decrease size
2008-04-02 00:20:20 +02:00
int test_eval(Test_env *, Test_op, const char *, const char *, bool);
* version.h doesn't need an RCS ID * compat.h does, add it to misc.c, always include it, move if NEED_COMPAT * major whitespace cleanup in sh.h
2006-08-23 00:16:04 +02:00
int test_parse(Test_env *);
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
add O_BINARY to all open() calls except tty_fd cf. http://svn.netlabs.org/libc/wiki/Faq#Whydoesntreadfdbufsize_of_filereturnsize_of_file
2013-10-09 13:59:30 +02:00
/* tty_fd is not opened O_BINARY, it's thus never read/written */
• 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
EXTERN int tty_fd E_INIT(-1); /* dup'd tty file descriptor */
fix UWIN: don’t close fd #3 (also, int→bool)
2011-02-27 20:29:32 +01:00
EXTERN bool tty_devtty; /* true if tty_fd is from /dev/tty */
last parts of Coherent patchkit: O_ACCMODE and termio
2012-05-05 00:18:27 +02:00
EXTERN mksh_ttyst tty_state; /* saved tty state */
implement tty tracking and bump to R41 for feature completeness • tty_fd is now never closed • new tty_hasstate tracks tty_state (cf. thread around http://article.gmane.org/gmane.os.miros.mksh/79 and PLD bug) • as users requested, importing COLUMNS or LINES from the environment now removes its special-ness as does unsetting it • otherwise, setting COLUMNS or LINES is honoured until the next SIGWINCH arrives or change_winsz is otherwise run (e.g. before displaying the prompt in the interactive command line editing modes) • SIGWINCH is now honoured before each reading of $COLUMNS and $LINES too • change the Uhr to match – it no longer calls stty(1) ☺
2012-11-30 20:25:08 +01:00
EXTERN bool tty_hasstate; /* true if tty_state is valid */
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 tty tracking and bump to R41 for feature completeness • tty_fd is now never closed • new tty_hasstate tracks tty_state (cf. thread around http://article.gmane.org/gmane.os.miros.mksh/79 and PLD bug) • as users requested, importing COLUMNS or LINES from the environment now removes its special-ness as does unsetting it • otherwise, setting COLUMNS or LINES is honoured until the next SIGWINCH arrives or change_winsz is otherwise run (e.g. before displaying the prompt in the interactive command line editing modes) • SIGWINCH is now honoured before each reading of $COLUMNS and $LINES too • change the Uhr to match – it no longer calls stty(1) ☺
2012-11-30 20:25:08 +01:00
extern int tty_init_fd(void); /* initialise tty_fd, tty_devtty */
move version definition into extra file
2006-08-01 14:22:26 +02:00
harden the crlf vs lf tests even more; use binary mode explicitly on OS/2
2015-07-09 22:52:43 +02:00
#ifdef __OS2__
#define binopen2(path,flags) __extension__({ \
int binopen2_fd = open((path), (flags) | O_BINARY); \
if (binopen2_fd >= 0) \
setmode(binopen2_fd, O_BINARY); \
(binopen2_fd); \
})
#define binopen3(path,flags,mode) __extension__({ \
int binopen3_fd = open((path), (flags) | O_BINARY, (mode)); \
if (binopen3_fd >= 0) \
setmode(binopen3_fd, O_BINARY); \
(binopen3_fd); \
})
split path-specific ('C:\FOO' instead of '/foo') stuff into MKSH_DOSPATH: • backslashes as directory separators • semicolon as $PATH separator • drive letters are absolute paths
2017-04-02 15:08:07 +02:00
#else
#define binopen2(path,flags) open((path), (flags) | O_BINARY)
#define binopen3(path,flags,mode) open((path), (flags) | O_BINARY, (mode))
#endif
#ifdef MKSH_DOSPATH
introduce mksh_drvltr(s) short-hand macro
2017-10-11 22:29:05 +02:00
#define mksh_drvltr(s) __extension__({ \
const char *mksh_drvltr_s = (s); \
(ctype(mksh_drvltr_s[0], C_ALPHA) && mksh_drvltr_s[1] == ':'); \
})
merge OS/2 style PATH (absolute with drive letters, ‘;’ as separator) From: KO Myung-Hun <komh@chollian.net>
2015-07-10 21:36:38 +02:00
#define mksh_abspath(s) __extension__({ \
const char *mksh_abspath_s = (s); \
collective R54 release preparation multi-merger: install both lksh and mksh manpages from Build.sh (Martijn Dekker) spelling fixes (Larry Hynes) manpage improvements (Martijn Dekker) initial port to Harvey-OS’ APEX (Ronald G. Minnich, Elbing Miss, Álvaro Jurado) more from komh’s OS/2 port (KO Myung-Hun)
2016-11-12 00:31:39 +01:00
(mksh_cdirsep(mksh_abspath_s[0]) || \
mksh_abspath() on OS/2 now requires a dir separator after the drive letter and colon for it to recognise a pathname as absolute, as it should be XXX make_path() unreviewed wrt this change
2017-10-11 23:52:46 +02:00
(mksh_drvltr(mksh_abspath_s) && \
mksh_cdirsep(mksh_abspath_s[2]))); \
merge OS/2 style PATH (absolute with drive letters, ‘;’ as separator) From: KO Myung-Hun <komh@chollian.net>
2015-07-10 21:36:38 +02:00
})
collective R54 release preparation multi-merger: install both lksh and mksh manpages from Build.sh (Martijn Dekker) spelling fixes (Larry Hynes) manpage improvements (Martijn Dekker) initial port to Harvey-OS’ APEX (Ronald G. Minnich, Elbing Miss, Álvaro Jurado) more from komh’s OS/2 port (KO Myung-Hun)
2016-11-12 00:31:39 +01:00
#define mksh_cdirsep(c) __extension__({ \
char mksh_cdirsep_c = (c); \
(mksh_cdirsep_c == '/' || mksh_cdirsep_c == '\\'); \
})
eval.c has the only mksh_sdirsep caller and uses it on substrings, so OS/2 drive letter checks are not correct there
2017-10-11 22:55:06 +02:00
#define mksh_sdirsep(s) strpbrk((s), "/\\")
inline OS/2’s mksh_sdirsep() into its mksh_vdirsep() because we must separate these two
2017-10-11 22:50:46 +02:00
#define mksh_vdirsep(s) __extension__({ \
const char *mksh_vdirsep_s = (s); \
all uses of mksh_vdirsep should exclude “\builtin” from triggering it
2017-10-11 23:09:24 +02:00
(((mksh_drvltr(mksh_vdirsep_s) && \
!mksh_cdirsep(mksh_vdirsep_s[2])) ? (!0) : \
(mksh_sdirsep(mksh_vdirsep_s) != NULL)) && \
(strcmp(mksh_vdirsep_s, T_builtin) != 0)); \
inline OS/2’s mksh_sdirsep() into its mksh_vdirsep() because we must separate these two
2017-10-11 22:50:46 +02:00
})
harden the crlf vs lf tests even more; use binary mode explicitly on OS/2
2015-07-09 22:52:43 +02:00
#else
commit the optimisation result from the new fast character classes
2017-04-28 02:38:33 +02:00
#define mksh_abspath(s) (ord((s)[0]) == ord('/'))
#define mksh_cdirsep(c) (ord(c) == ord('/'))
collective R54 release preparation multi-merger: install both lksh and mksh manpages from Build.sh (Martijn Dekker) spelling fixes (Larry Hynes) manpage improvements (Martijn Dekker) initial port to Harvey-OS’ APEX (Ronald G. Minnich, Elbing Miss, Álvaro Jurado) more from komh’s OS/2 port (KO Myung-Hun)
2016-11-12 00:31:39 +01:00
#define mksh_sdirsep(s) strchr((s), '/')
#define mksh_vdirsep(s) vstrchr((s), '/')
harden the crlf vs lf tests even more; use binary mode explicitly on OS/2
2015-07-09 22:52:43 +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
/* be sure not to interfere with anyone else's idea about EXTERN */
#ifdef EXTERN_DEFINED
# undef EXTERN_DEFINED
# undef EXTERN
#endif
• 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
#undef E_INIT
AIX has sys_siglist[] but doesn't define it anywhere, so add a means to scan for defns and use it here; bug reported by Kurt Telep
2007-04-23 22:37:16 +02:00
#endif /* !MKSH_INCLUDES_ONLY */